Merge branch 'master' of https://github.com/tcsullivan/gamedev

1 files changed, 3 insertions, 7 deletions

diff --git a/main.cpp b/main.cpp
index e17b910..30e19f9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -15,6 +15,8 @@ using namespace std::literals::chrono_literals;
 #include <config.hpp>
 #include <common.hpp>
 #include <engine.hpp>
+#include <error.hpp>
+#include <fileio.hpp>
 #include <gametime.hpp>
 #include <window.hpp>
 #include <world.hpp>
@@ -52,11 +54,6 @@ public:
 std::string xmlFolder = "xml/";
 
 /**
- * The current menu, if any are open (TODO why is this here)
- */
-Menu *currentMenu;
-
-/**
  * The current center of the screen, updated in main render.
  */
 vec2 offset;
@@ -134,8 +131,7 @@ int main(int argc, char *argv[])
 	/////////////////////////////
 
 
-	game::engine.getSystem<InventorySystem>()->add("Debug", 3);
-
+	game::engine.getSystem<InventorySystem>()->add("Debug", 9);
 
 	std::list<SDL_Event> eventQueue;