aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-04-15 08:49:26 -0400
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-04-15 08:49:26 -0400
commit56fd6a9d86ac57580ec2b91cc98db31dda5f5770 (patch)
tree359c86e617b993a07465dfc020a26704753a5320 /main.cpp
parent8b0f74445b509d8e59ec89854f2e149ad1948d4e (diff)
Fixed segfaults
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/main.cpp b/main.cpp
index 21dc546..2aa1e28 100644
--- a/main.cpp
+++ b/main.cpp
@@ -67,12 +67,6 @@ World *currentWorld = NULL,
Player *player;
/**
- * TODO
- */
-
-extern Menu *currentMenu;
-
-/**
* The current number of ticks, used for logic operations and day/night cycles.
*/
@@ -137,6 +131,7 @@ unsigned int loops = 0;
vec2 offset;
+//std::shared_ptr<Menu>currentMenu;
Menu *currentMenu;
Menu optionsMenu;
Menu pauseMenu;