summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schinagl <oliver@schinagl.nl>2008-05-20 11:38:57 (GMT)
committerOliver Schinagl <oliver@schinagl.nl>2008-05-20 11:38:57 (GMT)
commit2018e9a939fa79518f6ce020f64714730d5be959 (patch)
tree22d682392cf7434f9680671c89da1569a3125b54
parentfeacf51e22520a397115fd8cc1a243c305bcb90d (diff)
download2iv55-2018e9a939fa79518f6ce020f64714730d5be959.zip
2iv55-2018e9a939fa79518f6ce020f64714730d5be959.tar.gz
2iv55-2018e9a939fa79518f6ce020f64714730d5be959.tar.bz2
voided gamestep
-rw-r--r--matchblox/engine/C_MatchBloxEngine.cpp2
-rw-r--r--matchblox/engine/C_MatchBloxEngine.h2
-rw-r--r--matchblox/main.cpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/matchblox/engine/C_MatchBloxEngine.cpp b/matchblox/engine/C_MatchBloxEngine.cpp
index 7e17b1b..52ffde9 100644
--- a/matchblox/engine/C_MatchBloxEngine.cpp
+++ b/matchblox/engine/C_MatchBloxEngine.cpp
@@ -60,7 +60,7 @@ C_MatchBloxEngine::~C_MatchBloxEngine()
DeleteModels();
}
-GameResult C_MatchBloxEngine::GameStep(msgQueue &f_Queue)
+GameResult C_MatchBloxEngine::GameStep(void)
{
//process message queue
return GR_ERROR;
diff --git a/matchblox/engine/C_MatchBloxEngine.h b/matchblox/engine/C_MatchBloxEngine.h
index 97aa892..21e6b3b 100644
--- a/matchblox/engine/C_MatchBloxEngine.h
+++ b/matchblox/engine/C_MatchBloxEngine.h
@@ -52,7 +52,7 @@ public:
const char *f_strLogFile);
~C_MatchBloxEngine();
- GameResult GameStep(msgQueue &f_Queue);
+ GameResult GameStep(void);
void Render(unsigned int f_uiElapsedTime);
bool NewGame(int f_iUserID, int f_iGameId, BoxSize f_BS);
diff --git a/matchblox/main.cpp b/matchblox/main.cpp
index 9bcfd5d..f2bfe54 100644
--- a/matchblox/main.cpp
+++ b/matchblox/main.cpp
@@ -54,8 +54,10 @@ void render_scene(void)
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
g_pEngine->Render(glutGet(GLUT_ELAPSED_TIME));
-
+
+ glDisable(GL_LIGHTING);
MenuRender();
+ glEnable(GL_LIGHTING);
glutSwapBuffers();