Mercurial > mm7
diff mm7_2.cpp @ 457:e5cf03a3d98e
m
author | Ritor1 |
---|---|
date | Sun, 24 Feb 2013 20:39:03 +0600 |
parents | 17c90e543e28 |
children | c0ab5f64b37b |
line wrap: on
line diff
--- a/mm7_2.cpp Sun Feb 24 13:53:18 2013 +0600 +++ b/mm7_2.cpp Sun Feb 24 20:39:03 2013 +0600 @@ -4311,7 +4311,7 @@ pKeyActionMap->ResetKeys(); _5C3420_pDecoration = 0; ptr_F8B1E8 = 0; - if ( array_5913D8[6] ) + if ( pDialogueNPCCount ) { v0 = dword_F8B19C; if ( dword_F8B19C != 2 @@ -4329,7 +4329,7 @@ { if ( v0 == -1 ) { - _4B4224_UpdateNPCTopics((int)((char *)array_5913D8[6] - 1)); + _4B4224_UpdateNPCTopics((int)((char *)pDialogueNPCCount - 1)); LABEL_33: pVideoPlayer->_4BF5B2(); return 1; @@ -4363,7 +4363,7 @@ UI_CreateEndConversationButton(); goto LABEL_28; } - array_5913D8[6] = 0; + pDialogueNPCCount = 0; pDialogueWindow->Release(); dword_F8B19C = 0; pDialogueWindow = 0; @@ -4378,7 +4378,7 @@ v3 = byte_591180; do { - array_5913D8[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2], + HouseNPCData[v2 + 7] = (NPCData *)window_SpeakInHouse->CreateButton(pNPCPortraits_x[v1 - 1][v2], pNPCPortraits_y[v1 - 1][v2], 0x3Fu, 0x49u, 1, 0, 0x19Au, v2, 0, v3, 0, 0, 0); v1 = uNumDialogueNPCPortraits; ++v2; @@ -11957,7 +11957,7 @@ } if ( wParam == 27 ) { - pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, !v12, 0); + pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) { v12 = window_SpeakInHouse == 0;