Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
150:d92c78ab54fe 151:9abdd40a107b
7686 v67 = 4; 7686 v67 = 4;
7687 } 7687 }
7688 v21 = v67; 7688 v21 = v67;
7689 goto LABEL_83; 7689 goto LABEL_83;
7690 } 7690 }
7691 if ( pCurrentScreen == 23 ) 7691 if ( pCurrentScreen == SCREEN_CASTING )
7692 return; 7692 return;
7693 if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() ) 7693 if ( !pParty->pPlayers[a2-1].CanAct() )//if ( !((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->CanAct() )
7694 goto LABEL_89; 7694 goto LABEL_89;
7695 if ( bUnderwater == 1 ) 7695 if ( bUnderwater == 1 )
7696 { 7696 {
7702 if ( pParty->pPickedItem.uItemID == 329 || v24 == 4 || v24 == 91 || v24 == 28 ) 7702 if ( pParty->pPickedItem.uItemID == 329 || v24 == 4 || v24 == 91 || v24 == 28 )
7703 { 7703 {
7704 pMouse->RemoveHoldingItem(); 7704 pMouse->RemoveHoldingItem();
7705 pGUIWindow_CurrentMenu->Release(); 7705 pGUIWindow_CurrentMenu->Release();
7706 pIcons_LOD->_4114F2(); 7706 pIcons_LOD->_4114F2();
7707 pCurrentScreen = 0; 7707 pCurrentScreen = SCREEN_GAME;
7708 viewparams->bRedrawGameUI = 1; 7708 viewparams->bRedrawGameUI = 1;
7709 _42777D_CastSpell_UseWand_ShootArrow(v24, a2 - 1, 0x85u, 1, 0); 7709 _42777D_CastSpell_UseWand_ShootArrow(v24, a2 - 1, 0x85u, 1, 0);
7710 } 7710 }
7711 else 7711 else
7712 { 7712 {