projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Move ILUT initialization down to below OpenGL initilization, to prevent segfaults.
[matthijs/ABM2.git]
/
ABM2
/
Playground.cpp
diff --git
a/ABM2/Playground.cpp
b/ABM2/Playground.cpp
index a115d520a757d77ccd4b8b5692693db1c6ba4be3..7b686e16f35c41620b1d37a483fba2958b6e2298 100755
(executable)
--- a/
ABM2/Playground.cpp
+++ b/
ABM2/Playground.cpp
@@
-66,7
+66,7
@@
bool Playground::Start()
\r
#endif
\r
// init playing field
\r
\r
#endif
\r
// init playing field
\r
- SchemeReader *scheme = new SchemeReader("
d
ata/schemes/BASIC.SCH");
\r
+ SchemeReader *scheme = new SchemeReader("
D
ata/schemes/BASIC.SCH");
\r
for (int i=0; i<PLAYGROUND_COLS; ++i)
\r
{
\r
for (int j=0; j<PLAYGROUND_ROWS; ++j)
\r
for (int i=0; i<PLAYGROUND_COLS; ++i)
\r
{
\r
for (int j=0; j<PLAYGROUND_ROWS; ++j)
\r
@@
-115,7
+115,6
@@
bool Playground::Start()
field[0][1] = NULL;
\r
}
\r
\r
field[0][1] = NULL;
\r
}
\r
\r
-
\r
old_counter = GetTickCount();
\r
return true;
\r
}
\r
old_counter = GetTickCount();
\r
return true;
\r
}
\r