Mercurial > mm7
diff mm7_2.cpp @ 462:37090bd974f9
Merge
author | Gloval |
---|---|
date | Sun, 24 Feb 2013 20:47:46 +0400 |
parents | 197461e5acec a7869569e912 |
children | f7b91ef98ab2 |
line wrap: on
line diff
--- a/mm7_2.cpp Sun Feb 24 20:47:01 2013 +0400 +++ b/mm7_2.cpp Sun Feb 24 20:47:46 2013 +0400 @@ -4251,7 +4251,7 @@ pKeyActionMap->ResetKeys(); _5C3420_pDecoration = 0; ptr_F8B1E8 = 0; - if ( array_5913D8[6] ) + if ( pDialogueNPCCount ) { v0 = dword_F8B19C; if ( dword_F8B19C != 2 @@ -4269,7 +4269,7 @@ { if ( v0 == -1 ) { - _4B4224_UpdateNPCTopics((int)((char *)array_5913D8[6] - 1)); + _4B4224_UpdateNPCTopics((int)((char *)pDialogueNPCCount - 1)); LABEL_33: pVideoPlayer->_4BF5B2(); return 1; @@ -4303,7 +4303,7 @@ UI_CreateEndConversationButton(); goto LABEL_28; } - array_5913D8[6] = 0; + pDialogueNPCCount = 0; pDialogueWindow->Release(); dword_F8B19C = 0; pDialogueWindow = 0; @@ -4318,7 +4318,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;