Mercurial > mm7

diff Player.cpp @ 151:9abdd40a107b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pCurrentScreen
author Ritor1
date Tue, 12 Feb 2013 15:28:08 +0600
parents 9b0d651821f1
children f102bbff6fd8
line wrap: on
line diff
--- a/Player.cpp	Tue Feb 12 10:17:35 2013 +0600
+++ b/Player.cpp	Tue Feb 12 15:28:08 2013 +0600
@@ -7688,7 +7688,7 @@
     v21 = v67;
     goto LABEL_83;
   }
-  if ( pCurrentScreen == 23 )
+  if ( pCurrentScreen == SCREEN_CASTING )
     return;
   if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() )
     goto LABEL_89;
@@ -7704,7 +7704,7 @@
     pMouse->RemoveHoldingItem();
     pGUIWindow_CurrentMenu->Release();
     pIcons_LOD->_4114F2();
-    pCurrentScreen = 0;
+    pCurrentScreen = SCREEN_GAME;
     viewparams->bRedrawGameUI = 1;
     _42777D_CastSpell_UseWand_ShootArrow(v24, a2 - 1, 0x85u, 1, 0);
   }