1 files changed, 7 insertions, 3 deletions
diff --git a/main.cpp b/main.cpp
index 9a71729..14c67c5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -167,7 +167,10 @@ void mainLoop(void);
 
 vec2 offset;																			/*	OFFSET!!!!!!!!!!!!!!!!!!!! */
 
+float shit = 0;
 std::vector<menuItem>pauseMenu;
+std::vector<menuItem>optionsMenu;
+
 
 extern WEATHER weather;
 
@@ -488,8 +491,6 @@ void mainLoop(void){
 	*/
 	
 	currentWorld->update(player,deltaTime);
-
-	MENU:
 	
 	/*
 	 * 	Update debug variables if necessary
@@ -504,6 +505,8 @@ void mainLoop(void){
 		debugY = player->loc.y;
 	}	
 
+	MENU:
+
 	render();	// Call the render loop;
 }
 
@@ -746,7 +749,8 @@ void render(){
 	}
 
 	if(ui::menu){
-		if(ui::pMenu)ui::drawMenu(pauseMenu);
+		if(ui::oMenu)ui::drawMenu(optionsMenu);
+		else if(ui::pMenu)ui::drawMenu(pauseMenu);
 	}
 
 	/*