(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 653c8aa..a4b70d6 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -246,7 +246,7 @@ void processLightEvents(int id) {
 \r
 }\r
 \r
-int makeSubmenuFromArray( const char menuEntries[], void *callback ) {\r
+int makeSubmenuFromArray( const char *menuEntries[], void *callback ) {\r
   int menuEntriesSize = sizeof(menuEntries) / sizeof(menuEntries[0]);\r
   int menuNumber = menuEntriesSize / 10 + 1;\r
   int submenuObjects[menuNumber-1];\r
@@ -266,7 +266,7 @@ int makeSubmenuFromArray( const char menuEntries[], void *callback ) {
     int startNum = i*11 - (i-1);\r
     int endNum = startNum + 9;\r
     if ( i == menuNumber - 1 ) { // We're on the last one\r
-      endNum = startNum + 3;\r
+      endNum = startNum + (menuEntriesSize - startNum);\r
     }\r
     sprintf(name, "%d-%d", startNum, endNum);\r
     glutAddSubMenu( name, submenuObjects[i] );\r
@@ -295,7 +295,7 @@ void makeMenu() {
   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 addObjectMenu = makeSubmenuFromArray( objectMenuEntries, processObjectEvents );\r
 \r
   // Construct texture/ground texture submenus\r
 /*  int textureMenuEntries = sizeof(textureMenuEntries) / sizeof(textureMenuEntries[0]);\r