git.ucc.asn.au
/
atyndall
/
cits2231.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a4f6bea
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Sat, 8 Oct 2011 06:41:20 +0000
(14:41 +0800)
committer
Ash Tyndall
<
[email protected]
>
Sat, 8 Oct 2011 06:41:20 +0000
(14:41 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
a4b70d6
..
bc91f1e
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-246,8
+246,9
@@
void processLightEvents(int id) {
\r
}
\r
\r
\r
}
\r
\r
-int makeSubmenuFromArray( const char *menuEntries[], void *callback ) {
\r
- int menuEntriesSize = sizeof(menuEntries) / sizeof(menuEntries[0]);
\r
+int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSize, void *callback ) {
\r
+ if ( menuEntriesSize == 0 ) return -1;
\r
+
\r
int menuNumber = menuEntriesSize / 10 + 1;
\r
int submenuObjects[menuNumber-1];
\r
\r
int menuNumber = menuEntriesSize / 10 + 1;
\r
int submenuObjects[menuNumber-1];
\r
\r
@@
-295,7
+296,8
@@
void makeMenu() {
glutAddMenuEntry("R/G/B/All Light 2", LIGHT_RGBALL_LIGHT_2);
\r
\r
// Construct add object submenus
\r
glutAddMenuEntry("R/G/B/All Light 2", LIGHT_RGBALL_LIGHT_2);
\r
\r
// Construct add object submenus
\r
- int addObjectMenu = makeSubmenuFromArray( objectMenuEntries, processObjectEvents );
\r
+ int objectMenuEntriesSize = sizeof(objectMenuEntries) / sizeof(objectMenuEntries[0]);
\r
+ int addObjectMenu = makeSubmenuFromArray( objectMenuEntries, objectMenuEntriesSize, processObjectEvents );
\r
\r
// Construct texture/ground texture submenus
\r
/* int textureMenuEntries = sizeof(textureMenuEntries) / sizeof(textureMenuEntries[0]);
\r
\r
// Construct texture/ground texture submenus
\r
/* int textureMenuEntries = sizeof(textureMenuEntries) / sizeof(textureMenuEntries[0]);
\r
UCC
git Repository :: git.ucc.asn.au