git.ucc.asn.au
/
atyndall
/
cits2231.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[atyndall/cits2231.git]
/
scene.c
diff --git
a/scene.c
b/scene.c
index
1dee027
..
e6dee1f
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-276,7
+276,7
@@
void makeMenu() {
addObjectSubmenu[i] = glutCreateMenu(processObjectEvents);
\r
int startNum = i*11 - (i-1);
\r
for ( int j = startNum - 1; j < (startNum+9); j++ ) {
\r
addObjectSubmenu[i] = glutCreateMenu(processObjectEvents);
\r
int startNum = i*11 - (i-1);
\r
for ( int j = startNum - 1; j < (startNum+9); j++ ) {
\r
- if (
!objectMenuEntries[j]
) break; // Detect if we've reached the end of the array
\r
+ if (
j + 1 == objectMenuEntriesSize
) break; // Detect if we've reached the end of the array
\r
glutAddMenuEntry( objectMenuEntries[j], j );
\r
}
\r
}
\r
glutAddMenuEntry( objectMenuEntries[j], j );
\r
}
\r
}
\r
@@
-285,7
+285,8
@@
void makeMenu() {
int addObjectMenu = glutCreateMenu(processObjectEvents);
\r
for ( int i = 0; addObjectSubmenu[i]; i++ ) {
\r
char name[10]; // buffer to hold name
\r
int addObjectMenu = glutCreateMenu(processObjectEvents);
\r
for ( int i = 0; addObjectSubmenu[i]; i++ ) {
\r
char name[10]; // buffer to hold name
\r
- sprintf(name, "%d-%d", i*11 - (i-1), i*11 - (i-1) + 9);
\r
+ int startNum = i*11 - (i-1);
\r
+ sprintf(name, "%d-%d", startNum, startNum + 9);
\r
glutAddSubMenu( name, addObjectSubmenu[i] );
\r
}
\r
\r
glutAddSubMenu( name, addObjectSubmenu[i] );
\r
}
\r
\r
UCC
git Repository :: git.ucc.asn.au