Mercurial > mm7
diff mm7_6.cpp @ 151:9abdd40a107b
pCurrentScreen
author | Ritor1 |
---|---|
date | Tue, 12 Feb 2013 15:28:08 +0600 |
parents | cca78efb377e |
children | a0e7ad5425d4 |
line wrap: on
line diff
--- a/mm7_6.cpp Tue Feb 12 10:17:35 2013 +0600 +++ b/mm7_6.cpp Tue Feb 12 15:28:08 2013 +0600 @@ -9184,7 +9184,7 @@ pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)404; goto _send_message; } - if ( pCurrentScreen == 4 ) + if ( pCurrentScreen == SCREEN_NPC_DIALOGUE ) { v11 = pMessageQueue_50CBD0->uNumMessages; if ( pMessageQueue_50CBD0->uNumMessages ) @@ -9210,7 +9210,7 @@ break; case INPUT_CharCycle: //__debugbreak(); - if ( pCurrentScreen == 8 + if ( pCurrentScreen == SCREEN_SPELL_BOOK || dword_50C9E8 >= 40 ) break; dword_50C9EC[3 * dword_50C9E8] = 176; @@ -9311,8 +9311,8 @@ ++pMessageQueue_50CBD0->uNumMessages; goto LABEL_175; } - if ( pCurrentScreen == 4 - || pCurrentScreen == 19 ) + if ( pCurrentScreen == SCREEN_NPC_DIALOGUE + || pCurrentScreen == SCREEN_BRANCHLESS_NPC_DIALOG ) { v15 = pMessageQueue_50CBD0->uNumMessages; if ( pMessageQueue_50CBD0->uNumMessages )