From: sf17k <sf171k@gmail.com>
Date: Tue, 10 May 2011 20:19:25 +0000 (-0400)
Subject: merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=54cbb28b51da68b2280068a41e7964f78dec6858;p=lugaru.git

merge
---

54cbb28b51da68b2280068a41e7964f78dec6858
diff --cc Source/GameDraw.cpp
index a278a2e,42200ae..23692b3
--- a/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];