merge

diff --cc Source/GameDraw.cpp
index a278a2eac2ccb2b3273083c0af9696af846dedf0,42200aee62703b5d49a4c8a16ca215f56f6848d4..23692b30bac3096fb0d9ce5b3f34f0be5e82a2c7
--- 1/Source/GameDraw.cpp
--- 2/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@@ -2497,9 -2583,10 +2495,8 @@@ void Game::DrawMenu(
                        starty[2]=320;
                        endx[2]=startx[2]+strlen(menustring[2])*10;
                        endy[2]=starty[2]+20;
 -                      movex[2]=0;
 -                      movey[2]=0;
                }
                if(mainmenu==9){                        
-                       int tempncl;
                        nummenuitems=2+numchallengelevels;
                        char temp[255];
  

diff --cc Source/GameTick.cpp
Simple merge