Mercurial > mm7

comparison Player.cpp @ 437:0a1ea44b4a0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui mesages & spellcasting
author Nomad
date Sun, 24 Feb 2013 09:51:42 +0200
parents 243418228760
children 17c90e543e28
comparison
equal deleted inserted replaced
435:4f451a616d3d 437:0a1ea44b4a0a
7596 LABEL_178: 7596 LABEL_178:
7597 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) 7597 if ( pGUIWindow_CurrentMenu && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)
7598 { 7598 {
7599 if ( !v73 ) 7599 if ( !v73 )
7600 goto LABEL_187; 7600 goto LABEL_187;
7601 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 7601 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
7602 { 7602 {
7603 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 7603 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
7604 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; 7604 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
7605 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 7605 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
7606 ++pMessageQueue_50CBD0->uNumMessages; 7606 ++pMessageQueue_50CBD0->uNumMessages;
7607 } 7607 }*/
7608 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
7608 } 7609 }
7609 if ( v73 ) 7610 if ( v73 )
7610 { 7611 {
7611 if ( pParty->bTurnBasedModeOn ) 7612 if ( pParty->bTurnBasedModeOn )
7612 { 7613 {
7677 _720984_unused = pParty->pPickedItem.uItemID; 7678 _720984_unused = pParty->pPickedItem.uItemID;
7678 pMouse->RemoveHoldingItem(); 7679 pMouse->RemoveHoldingItem();
7679 if ( dword_50C9E8 < 40 ) 7680 if ( dword_50C9E8 < 40 )
7680 { 7681 {
7681 dword_50C9EC[3 * dword_50C9E8] = 146; 7682 dword_50C9EC[3 * dword_50C9E8] = 146;
7682 dword_50C9F0[3 * dword_50C9E8] = v24; 7683 dword_50C9EC[3 * dword_50C9E8 + 1] = v24;
7683 *(&dword_50C9E8 + 3 * dword_50C9E8 + 3) = a2 - 1; 7684 dword_50C9EC[3 * dword_50C9E8 + 2] = a2 - 1;
7684 ++dword_50C9E8; 7685 ++dword_50C9E8;
7685 } 7686 }
7686 if ( pCurrentScreen 7687 if ( pCurrentScreen
7687 && pGUIWindow_CurrentMenu 7688 && pGUIWindow_CurrentMenu
7688 && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null 7689 && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null)
7689 && (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 7690 //&& (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
7690 { 7691 {
7691 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 7692 /*pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
7692 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; 7693 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
7693 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 7694 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
7694 ++pMessageQueue_50CBD0->uNumMessages; 7695 ++pMessageQueue_50CBD0->uNumMessages;*/
7695 } 7696 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
7696 } 7697 }
7697 } 7698 }
7698 // 4E28F8: using guessed type int pCurrentScreen; 7699 }
7699 // 50C9AC: using guessed type int dword_50C9AC;
7700 // 50C9EC: using guessed type int dword_50C9EC[];
7701 // 6BE3C4: using guessed type char bUnderwater;
7702 // 720984: using guessed type int 720984_unused;
7703 7700
7704 7701
7705 7702
7706 //----- (00449BB4) -------------------------------------------------------- 7703 //----- (00449BB4) --------------------------------------------------------
7707 char Player::CompareVariable(enum VariableType var, signed int a1) 7704 char Player::CompareVariable(enum VariableType var, signed int a1)