X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=scene.c;h=e6dee1f159de779c0467d25e5b5f1e764eef3237;hb=84de854b0db5bb503f3cdaf5864935dd7af4b303;hp=1dee027acee8797a3a68ff7362618ef74c92bc13;hpb=a1f68d35f178d86f004d9b3f97193afbcdf9a866;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 1dee027..e6dee1f 100644
--- a/scene.c
+++ b/scene.c
@@ -276,7 +276,7 @@ void makeMenu() {
     addObjectSubmenu[i] = glutCreateMenu(processObjectEvents);
     int startNum = i*11 - (i-1);
     for ( int j = startNum - 1; j < (startNum+9); j++ ) {
-      if ( !objectMenuEntries[j] ) break; // Detect if we've reached the end of the array
+      if ( j + 1 == objectMenuEntriesSize ) break; // Detect if we've reached the end of the array
       glutAddMenuEntry( objectMenuEntries[j], j );
     }
   }
@@ -285,7 +285,8 @@ void makeMenu() {
   int addObjectMenu = glutCreateMenu(processObjectEvents);
   for ( int i = 0; addObjectSubmenu[i]; i++ ) {
     char name[10]; // buffer to hold name
-    sprintf(name, "%d-%d", i*11 - (i-1), i*11 - (i-1) + 9);
+    int startNum = i*11 - (i-1);
+    sprintf(name, "%d-%d", startNum, startNum + 9);
     glutAddSubMenu( name, addObjectSubmenu[i] );
   }