Mercurial > mm7
comparison mm7_4.cpp @ 651:2bf48d11d742
Training hall UI fixed
author | Nomad |
---|---|
date | Tue, 12 Mar 2013 03:10:35 +0200 |
parents | 35ce4761382c |
children | 1ff57450f090 |
comparison
equal
deleted
inserted
replaced
650:14d13880daa9 | 651:2bf48d11d742 |
---|---|
9290 if ( v0 > &_4F0882_evt_VAR_PlayerItemInHands_vals[53] ) | 9290 if ( v0 > &_4F0882_evt_VAR_PlayerItemInHands_vals[53] ) |
9291 break; | 9291 break; |
9292 } | 9292 } |
9293 if ( v0 <= &_4F0882_evt_VAR_PlayerItemInHands_vals[53] ) | 9293 if ( v0 <= &_4F0882_evt_VAR_PlayerItemInHands_vals[53] ) |
9294 { | 9294 { |
9295 ptr_F8B1E8 = (char *)pNPCTopics[666].pText; | 9295 ptr_F8B1E8 = (char *)pNPCTopics[666].pText; // Here's %s that you lost. Be careful |
9296 v4 = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11]; | 9296 v4 = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11]; |
9297 contract_approved = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11]; | 9297 contract_approved = _4F0882_evt_VAR_PlayerItemInHands_vals[2 * v11]; |
9298 pParty->pPlayers[0].AddVariable(VAR_PlayerItemInHands, v4); | 9298 pParty->pPlayers[0].AddVariable(VAR_PlayerItemInHands, v4); |
9299 } | 9299 } |
9300 if ( contract_approved == 601 ) | 9300 if ( contract_approved == 601 ) |
10809 return 1000 * v1; | 10809 return 1000 * v1; |
10810 } | 10810 } |
10811 | 10811 |
10812 | 10812 |
10813 //----- (004BC49B) -------------------------------------------------------- | 10813 //----- (004BC49B) -------------------------------------------------------- |
10814 void OnSelectDialogueOption(DIALOGUE_TYPE newDialogueType) | 10814 void OnSelectNPCDialogueOption(DIALOGUE_TYPE newDialogueType) |
10815 { | 10815 { |
10816 //unsigned int v1; // esi@1 | 10816 //unsigned int v1; // esi@1 |
10817 NPCData *speakingNPC; // ebp@1 | 10817 NPCData *speakingNPC; // ebp@1 |
10818 //unsigned int v3; // eax@1 | 10818 //unsigned int v3; // eax@1 |
10819 int npc_event_id; // ecx@10 | 10819 int npc_event_id; // ecx@10 |