Mercurial > mm7
diff Player.cpp @ 437:0a1ea44b4a0a
ui mesages & spellcasting
author | Nomad |
---|---|
date | Sun, 24 Feb 2013 09:51:42 +0200 |
parents | 243418228760 |
children | 17c90e543e28 |
line wrap: on
line diff
--- a/Player.cpp Sun Feb 24 03:07:03 2013 +0200 +++ b/Player.cpp Sun Feb 24 09:51:42 2013 +0200 @@ -7598,13 +7598,14 @@ { if ( !v73 ) goto LABEL_187; - if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) + /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) { pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; ++pMessageQueue_50CBD0->uNumMessages; - } + }*/ + pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); } if ( v73 ) { @@ -7679,27 +7680,23 @@ if ( dword_50C9E8 < 40 ) { dword_50C9EC[3 * dword_50C9E8] = 146; - dword_50C9F0[3 * dword_50C9E8] = v24; - *(&dword_50C9E8 + 3 * dword_50C9E8 + 3) = a2 - 1; + dword_50C9EC[3 * dword_50C9E8 + 1] = v24; + dword_50C9EC[3 * dword_50C9E8 + 2] = a2 - 1; ++dword_50C9E8; } if ( pCurrentScreen && pGUIWindow_CurrentMenu - && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null - && (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) - { - pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; + && pGUIWindow_CurrentMenu->eWindowType != WINDOW_null) + //&& (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) + { + /*pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; - ++pMessageQueue_50CBD0->uNumMessages; - } - } -} -// 4E28F8: using guessed type int pCurrentScreen; -// 50C9AC: using guessed type int dword_50C9AC; -// 50C9EC: using guessed type int dword_50C9EC[]; -// 6BE3C4: using guessed type char bUnderwater; -// 720984: using guessed type int 720984_unused; + ++pMessageQueue_50CBD0->uNumMessages;*/ + pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); + } + } +}