Some clean up in the menu system and the drawing menu function.

[lugaru.git] / Source / GameTick.cpp

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 4d4747ca7222dabd74ff9eee5a21b66ded8ce2df..f4c3f6023c1ca303b93fa53b86de258f6c66145a 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -2151,17 +2151,17 @@ void Game::MenuTick(){
         case 1:
         case 2:
             if(Input::MouseClicked()&&selected==1){
-                if(!gameon){
-                    fireSound(firestartsound);
-                    flash();
-                    //new game
-                    mainmenu=accountactive?5:7;
-                    selected=-1;
-                }else{
+                               if(gameon) {
                     //resume
                     mainmenu=0;
                     pause_sound(stream_menutheme);
                     resume_stream(leveltheme);
+                               } else {
+                    fireSound(firestartsound);
+                    flash();
+                    //new game
+                    mainmenu=(accountactive?5:7);
+                    selected=-1;
                 }
             }
 
@@ -2170,12 +2170,12 @@ void Game::MenuTick(){
                 flash();
                 //options
                 mainmenu=3;
-                if(newdetail>2)newdetail=detail;
-                if(newdetail<0)newdetail=detail;
-                if(newscreenwidth>3000)newscreenwidth=screenwidth;
-                if(newscreenwidth<0)newscreenwidth=screenwidth;
-                if(newscreenheight>3000)newscreenheight=screenheight;
-                if(newscreenheight<0)newscreenheight=screenheight;
+                if(newdetail>2) newdetail=detail;
+                if(newdetail<0) newdetail=detail;
+                if(newscreenwidth>3000) newscreenwidth=screenwidth;
+                if(newscreenwidth<0) newscreenwidth=screenwidth;
+                if(newscreenheight>3000) newscreenheight=screenheight;
+                if(newscreenheight<0) newscreenheight=screenheight;
             }
 
             if(Input::MouseClicked()&&selected==3){