comparison mm7_3.cpp @ 836:b66abf8b7d50

Слияние
author Ritor1
date Wed, 27 Mar 2013 23:20:27 +0600
parents 72f6df90df98 dfd683c4f538
children d061180f2b42
comparison
equal deleted inserted replaced
835:72f6df90df98 836:b66abf8b7d50
2 2
3 #include "MapInfo.h" 3 #include "MapInfo.h"
4 #include "Game.h" 4 #include "Game.h"
5 #include "GUIWindow.h" 5 #include "GUIWindow.h"
6 #include "GUIFont.h" 6 #include "GUIFont.h"
7 #include "GUIButton.h"
8 #include "GUIProgressBar.h" 7 #include "GUIProgressBar.h"
9 #include "Party.h" 8 #include "Party.h"
10 #include "AudioPlayer.h" 9 #include "AudioPlayer.h"
11 #include "Outdoor.h" 10 #include "Outdoor.h"
12 #include "IndoorCamera.h" 11 #include "IndoorCamera.h"
12492 pEventTimer->Pause(); 12491 pEventTimer->Pause();
12493 dword_5C3418 = v4; 12492 dword_5C3418 = v4;
12494 dword_5C341C = v3; 12493 dword_5C341C = v3;
12495 _591094_decoration = activeLevelDecoration; 12494 _591094_decoration = activeLevelDecoration;
12496 pGUIWindow2 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_GreetingNPC, a4, 0); 12495 pGUIWindow2 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_GreetingNPC, a4, 0);
12497 pGUIWindow2->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); 12496 pGUIWindow2->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 1u, 0x31u, "", 0);
12498 pGUIWindow2->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); 12497 pGUIWindow2->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 2u, 0x32u, "", 0);
12499 pGUIWindow2->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); 12498 pGUIWindow2->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 3u, 0x33u, "", 0);
12500 pGUIWindow2->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); 12499 pGUIWindow2->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, UIMSG_SelectCharacter, 4u, 0x34u, "", 0);
12501 } 12500 }
12502 } 12501 }
12503 12502
12504 //----- (004452BB) -------------------------------------------------------- 12503 //----- (004452BB) --------------------------------------------------------
12505 void __cdecl sub_4452BB() 12504 void __cdecl sub_4452BB()
12704 { 12703 {
12705 v14 = v52.GetControl(i); 12704 v14 = v52.GetControl(i);
12706 //v15 = v14; 12705 //v15 = v14;
12707 if ( !v14 ) 12706 if ( !v14 )
12708 break; 12707 break;
12709 v16 = v14->uControlParam; 12708 v16 = v14->msg_param;
12710 12709
12711 if ( v16 > 88 ) 12710 if ( v16 > 88 )
12712 v14->pButtonName[0] = 0; 12711 v14->pButtonName[0] = 0;
12713 else if (v16 == 88) 12712 else if (v16 == 88)
12714 strcpy(v14->pButtonName, pGlobalTXT_LocalizationStrings[581]); // Lord 12713 strcpy(v14->pButtonName, pGlobalTXT_LocalizationStrings[581]); // Lord
12732 __debugbreak(); // learn conditions of this event 12731 __debugbreak(); // learn conditions of this event
12733 auto topic = pNPCTopics[pNPC->evt_F - 1].pTopic;//(&dword_721660)[8 * v23]; 12732 auto topic = pNPCTopics[pNPC->evt_F - 1].pTopic;//(&dword_721660)[8 * v23];
12734 if (!topic) 12733 if (!topic)
12735 { 12734 {
12736 v14->pButtonName[0] = 0; 12735 v14->pButtonName[0] = 0;
12737 v14->uControlParam = 0; 12736 v14->msg_param = 0;
12738 } 12737 }
12739 else 12738 else
12740 strcpy(v14->pButtonName, topic); 12739 strcpy(v14->pButtonName, topic);
12741 } 12740 }
12742 else if (v16 == 9) 12741 else if (v16 == 9)
12746 // __debugbreak(); // learn conditions of this event Scavenger Hunt 12745 // __debugbreak(); // learn conditions of this event Scavenger Hunt
12747 auto topic = pNPCTopics[pNPC->evt_A - 1].pTopic;//(&dword_721660)[8 * v23]; 12746 auto topic = pNPCTopics[pNPC->evt_A - 1].pTopic;//(&dword_721660)[8 * v23];
12748 if (!topic) 12747 if (!topic)
12749 { 12748 {
12750 v14->pButtonName[0] = 0; 12749 v14->pButtonName[0] = 0;
12751 v14->uControlParam = 0; 12750 v14->msg_param = 0;
12752 } 12751 }
12753 else strcpy(v14->pButtonName, topic); 12752 else strcpy(v14->pButtonName, topic);
12754 } 12753 }
12755 else if (v16 == 20) 12754 else if (v16 == 20)
12756 { 12755 {
12757 //__debugbreak(); // learn conditions of this event instruments 12756 //__debugbreak(); // learn conditions of this event instruments
12758 auto topic = pNPCTopics[pNPC->evt_B - 1].pTopic;//(&dword_721660)[8 * v23]; 12757 auto topic = pNPCTopics[pNPC->evt_B - 1].pTopic;//(&dword_721660)[8 * v23];
12759 if (!topic) 12758 if (!topic)
12760 { 12759 {
12761 v14->pButtonName[0] = 0; 12760 v14->pButtonName[0] = 0;
12762 v14->uControlParam = 0; 12761 v14->msg_param = 0;
12763 } 12762 }
12764 else strcpy(v14->pButtonName, topic); 12763 else strcpy(v14->pButtonName, topic);
12765 } 12764 }
12766 else if (v16 == 21) 12765 else if (v16 == 21)
12767 { 12766 {
12768 //__debugbreak(); // learn conditions of this event 12767 //__debugbreak(); // learn conditions of this event
12769 auto topic = pNPCTopics[pNPC->evt_C - 1].pTopic;//(&dword_721660)[8 * v23]; 12768 auto topic = pNPCTopics[pNPC->evt_C - 1].pTopic;//(&dword_721660)[8 * v23];
12770 if (!topic) 12769 if (!topic)
12771 { 12770 {
12772 v14->pButtonName[0] = 0; 12771 v14->pButtonName[0] = 0;
12773 v14->uControlParam = 0; 12772 v14->msg_param = 0;
12774 } 12773 }
12775 else strcpy(v14->pButtonName, topic); 12774 else strcpy(v14->pButtonName, topic);
12776 } 12775 }
12777 else if (v16 == 22) 12776 else if (v16 == 22)
12778 { 12777 {
12779 //__debugbreak(); // learn conditions of this event 12778 //__debugbreak(); // learn conditions of this event
12780 auto topic = pNPCTopics[pNPC->evt_D - 1].pTopic;//(&dword_721660)[8 * v23]; 12779 auto topic = pNPCTopics[pNPC->evt_D - 1].pTopic;//(&dword_721660)[8 * v23];
12781 if (!topic) 12780 if (!topic)
12782 { 12781 {
12783 v14->pButtonName[0] = 0; 12782 v14->pButtonName[0] = 0;
12784 v14->uControlParam = 0; 12783 v14->msg_param = 0;
12785 } 12784 }
12786 else strcpy(v14->pButtonName, topic); 12785 else strcpy(v14->pButtonName, topic);
12787 } 12786 }
12788 else if (v16 == 23) 12787 else if (v16 == 23)
12789 { 12788 {
12790 //__debugbreak(); // learn conditions of this event 12789 //__debugbreak(); // learn conditions of this event
12791 auto topic = pNPCTopics[pNPC->evt_E - 1].pTopic;//(&dword_721660)[8 * v23]; 12790 auto topic = pNPCTopics[pNPC->evt_E - 1].pTopic;//(&dword_721660)[8 * v23];
12792 if (!topic) 12791 if (!topic)
12793 { 12792 {
12794 v14->pButtonName[0] = 0; 12793 v14->pButtonName[0] = 0;
12795 v14->uControlParam = 0; 12794 v14->msg_param = 0;
12796 } 12795 }
12797 else strcpy(v14->pButtonName, topic); 12796 else strcpy(v14->pButtonName, topic);
12798 } 12797 }
12799 else if (v16 == 13) 12798 else if (v16 == 13)
12800 { 12799 {