Mercurial > mm7
comparison mm7_2.cpp @ 827:085eb19b7ffd
mr.Malvik
author | Ritor1 |
---|---|
date | Wed, 27 Mar 2013 01:39:54 +0600 |
parents | fe4c8b113548 |
children | 9c3f28b31b4a 3233927402e5 |
comparison
equal
deleted
inserted
replaced
826:1133e34a7560 | 827:085eb19b7ffd |
---|---|
825 if ( pMessageQueue_50CBD0->uNumMessages ) | 825 if ( pMessageQueue_50CBD0->uNumMessages ) |
826 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; | 826 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; |
827 pKeyActionMap->_459ED1(3); | 827 pKeyActionMap->_459ED1(3); |
828 pKeyActionMap->ResetKeys(); | 828 pKeyActionMap->ResetKeys(); |
829 activeLevelDecoration = NULL; | 829 activeLevelDecoration = NULL; |
830 ptr_F8B1E8 = 0; | 830 current_npc_text = 0; |
831 if ( pDialogueNPCCount ) | 831 if ( pDialogueNPCCount ) |
832 { | 832 { |
833 v0 = dialog_menu_id; | 833 v0 = dialog_menu_id; |
834 if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD | 834 if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD |
835 && dialog_menu_id != HOUSE_DIALOGUE_SHOP_SELL | 835 && dialog_menu_id != HOUSE_DIALOGUE_SHOP_SELL |