aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/main.cpp b/main.cpp
index 3037c77..8e07818 100644
--- a/main.cpp
+++ b/main.cpp
@@ -31,12 +31,6 @@ World *currentWorld = NULL,
Player *player;
/**
- * TODO
- */
-
-extern Menu *currentMenu;
-
-/**
* The current number of ticks, used for logic operations and day/night cycles.
*/
@@ -101,6 +95,7 @@ unsigned int loops = 0;
vec2 offset;
+//std::shared_ptr<Menu>currentMenu;
Menu *currentMenu;
Menu optionsMenu;
Menu pauseMenu;
@@ -421,7 +416,6 @@ void mainLoop(void){
if(!prevTime){
prevTime=currentTime;
}
-
/*
* Update timing values. This is crucial to calling logic and updating the window (basically
* the entire game).
@@ -633,7 +627,7 @@ void render() {
glBegin(GL_LINES);
/*glColor3ub(255,0,0);
glVertex2i(0,0);
- glVertex2i(0,SCREEN_HEIGHT);*/
+ glVertexdw2i(0,SCREEN_HEIGHT);*/
/*glColor3ub(255,255,255);
glVertex2i(player->loc.x + player->width/2,0);