comparison mm7_data.h @ 454:5e5dfedcc0ad

Слияние
author Ritor1
date Sun, 24 Feb 2013 09:18:17 +0600
parents 9dc0dffaf7c6 137c59c3dbc4
children 20d96ec810c8
comparison
equal deleted inserted replaced
453:eaadcb39312f 454:5e5dfedcc0ad
799 extern unsigned int saveload_dlg_xs[2]; 799 extern unsigned int saveload_dlg_xs[2];
800 extern unsigned int saveload_dlg_ys[2]; 800 extern unsigned int saveload_dlg_ys[2];
801 extern unsigned int saveload_dlg_zs[2]; 801 extern unsigned int saveload_dlg_zs[2];
802 extern unsigned int saveload_dlg_ws[2]; 802 extern unsigned int saveload_dlg_ws[2];
803 extern int dword_4E98BC_bApplicationActive; // weak 803 extern int dword_4E98BC_bApplicationActive; // weak
804 extern char *off_4EB080; // idb 804 extern char *pTransitionStrings[]; // 4EB080
805 extern char *pTransitionStrings[464];
806 extern char aAwards_txt[]; // idb 805 extern char aAwards_txt[]; // idb
807 extern char aScroll_txt[]; // idb 806 extern char aScroll_txt[]; // idb
808 extern char aMerchant_txt[]; // idb 807 extern char aMerchant_txt[]; // idb
809 extern char aTrans_txt[]; // idb 808 extern char aTrans_txt[]; // idb
810 extern char aTeacher[]; // idb 809 extern char aTeacher[]; // idb
1323 extern int dword_591084; // weak 1322 extern int dword_591084; // weak
1324 extern struct Actor *pDialogue_SpeakingActor; 1323 extern struct Actor *pDialogue_SpeakingActor;
1325 extern unsigned int uDialogueType; 1324 extern unsigned int uDialogueType;
1326 extern unsigned int uDialogue_SpeakingActorNPC_ID; 1325 extern unsigned int uDialogue_SpeakingActorNPC_ID;
1327 extern struct LevelDecoration *_591094_decoration; 1326 extern struct LevelDecoration *_591094_decoration;
1328 extern char byte_591098[200]; // idb 1327 extern char sHouseName[200]; // idb
1329 extern int uCurrentHouse_Animation; // weak 1328 extern int uCurrentHouse_Animation; // weak
1330 extern char *dword_591164_teleport_map_name; // idb 1329 extern char *dword_591164_teleport_map_name; // idb
1331 extern int dword_591168_teleport_speedz; // weak 1330 extern int dword_591168_teleport_speedz; // weak
1332 extern int dword_59116C_teleport_directionx; // weak 1331 extern int dword_59116C_teleport_directionx; // weak
1333 extern int dword_591170_teleport_directiony; // weak 1332 extern int dword_591170_teleport_directiony; // weak
1343 extern struct Texture *pTexture_Dialogue_Background; 1342 extern struct Texture *pTexture_Dialogue_Background;
1344 extern _UNKNOWN unk_597F10; // weak 1343 extern _UNKNOWN unk_597F10; // weak
1345 extern int start_event_seq_number; // weak 1344 extern int start_event_seq_number; // weak
1346 extern char byte_5B0938[2000]; 1345 extern char byte_5B0938[2000];
1347 extern int dword_5B5920; // weak 1346 extern int dword_5B5920; // weak
1348 extern int dword_5B5924; // weak 1347 extern int _unused_5B5924_is_travel_ui_drawn; // 005B5924
1349 extern int _5B65A8_npcdata_uflags_or_other; // weak 1348 extern int _5B65A8_npcdata_uflags_or_other; // weak
1350 extern int _5B65AC_npcdata_fame_or_other; // weak 1349 extern int _5B65AC_npcdata_fame_or_other; // weak
1351 extern int _5B65B0_npcdata_rep_or_other; // weak 1350 extern int _5B65B0_npcdata_rep_or_other; // weak
1352 extern int _5B65B4_npcdata_loword_house_or_other; // weak 1351 extern int _5B65B4_npcdata_loword_house_or_other; // weak
1353 extern int _5B65B8_npcdata_hiword_house_or_other; // weak 1352 extern int _5B65B8_npcdata_hiword_house_or_other; // weak
2009 void __cdecl OnMapLeave(); 2008 void __cdecl OnMapLeave();
2010 void /*__usercall*/ OnMapLoad(); 2009 void /*__usercall*/ OnMapLoad();
2011 void __thiscall Level_LoadEvtAndStr(const char *pLevelName); 2010 void __thiscall Level_LoadEvtAndStr(const char *pLevelName);
2012 char *__cdecl _4443D5_GetMinimapRightClickText(); 2011 char *__cdecl _4443D5_GetMinimapRightClickText();
2013 const char *__cdecl sub_444564(); 2012 const char *__cdecl sub_444564();
2014 char *__thiscall _444732_GetEventHintString(unsigned int uEventID); // idb 2013 char *__thiscall GetEventHintString(unsigned int uEventID); // idb
2015 unsigned int __fastcall sub_444839_move_map(unsigned int a1, int a2, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName); // idb 2014 unsigned int __fastcall sub_444839_move_map(unsigned int a1, int a2, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName); // idb
2016 char *__cdecl TransitionUI_Draw(); 2015 void TransitionUI_Draw();
2017 struct GUIWindow *__cdecl UI_CreateTravelDialogue(); 2016 struct GUIWindow *__cdecl UI_CreateTravelDialogue();
2018 signed int __cdecl GetTravelTime(); 2017 signed int __cdecl GetTravelTime();
2019 void __cdecl TravelUI_Draw(); 2018 void __cdecl TravelUI_Draw();
2020 void __cdecl DrawBranchlessDialogueUI(); 2019 void __cdecl DrawBranchlessDialogueUI();
2021 void __fastcall sub_4451A8_press_any_key(int a1, int a2, int a4); 2020 void __fastcall sub_4451A8_press_any_key(int a1, int a2, int a4);
2029 void PrepareHouse(enum HOUSE_TYPE house); // idb 2028 void PrepareHouse(enum HOUSE_TYPE house); // idb
2030 bool __fastcall EnterHouse(enum HOUSE_TYPE uHouseID); 2029 bool __fastcall EnterHouse(enum HOUSE_TYPE uHouseID);
2031 int sub_4465DF_check_season(int a1); 2030 int sub_4465DF_check_season(int a1);
2032 int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive); // idb 2031 int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive); // idb
2033 // void __cdecl crt_construct_5773C4(); 2032 // void __cdecl crt_construct_5773C4();
2034 bool __thiscall sub_4466C4(void *_this); 2033 int NPC_EventProcessor(int npc_event_id);
2035 2034
2036 void __fastcall sub_448518_npc_set_item(int npc, unsigned int item, int a3); 2035 void __fastcall sub_448518_npc_set_item(int npc, unsigned int item, int a3);
2037 void __fastcall sub_44861E_set_texture(unsigned int uFaceCog, const char *pFilename); 2036 void __fastcall sub_44861E_set_texture(unsigned int uFaceCog, const char *pFilename);
2038 void __fastcall SetDecorationSprite(unsigned int uCog, int a2, const char *pFileName); // idb 2037 void __fastcall SetDecorationSprite(unsigned int uCog, int a2, const char *pFileName); // idb
2039 void __fastcall sub_44892E_set_faces_bit(int sCogNumber, int bit, int on); 2038 void __fastcall sub_44892E_set_faces_bit(int sCogNumber, int bit, int on);
2315 int __fastcall sub_4B3B42(signed int a1); 2314 int __fastcall sub_4B3B42(signed int a1);
2316 void __cdecl sub_4B3E1E(); 2315 void __cdecl sub_4B3E1E();
2317 void __fastcall sub_4B3EF0(int a4); 2316 void __fastcall sub_4B3EF0(int a4);
2318 void __fastcall sub_4B3FE5(int a4); 2317 void __fastcall sub_4B3FE5(int a4);
2319 void __cdecl sub_4B40E6(); 2318 void __cdecl sub_4B40E6();
2320 struct GUIButton *__thiscall _4B4224_UpdateNPCTopics(int _this); 2319 void _4B4224_UpdateNPCTopics(int _this);
2321 char __fastcall sub_4B46A5(const char *Str, int a5); 2320 char __fastcall sub_4B46A5(const char *Str, int a5);
2322 int __fastcall sub_4B46F8(int a1); 2321 int __fastcall sub_4B46F8(int a1);
2323 int __cdecl TrainingDialog(); 2322 int __cdecl TrainingDialog();
2324 char *__cdecl sub_4B4F4F(); 2323 char *__cdecl sub_4B4F4F();
2325 int __cdecl MagicShopDialog(); 2324 int __cdecl MagicShopDialog();
2340 const char *sub_4BBA85_bounties(); 2339 const char *sub_4BBA85_bounties();
2341 void __cdecl sub_4BBCDD(); 2340 void __cdecl sub_4BBCDD();
2342 void __fastcall _4BBF61_summon_actor(int a1, __int16 x, int y, int z); // idb 2341 void __fastcall _4BBF61_summon_actor(int a1, __int16 x, int y, int z); // idb
2343 void __cdecl ArenaFight(); 2342 void __cdecl ArenaFight();
2344 struct Texture *__cdecl sub_4BC8D5(); 2343 struct Texture *__cdecl sub_4BC8D5();
2345 struct GUIButton *__cdecl sub_4BCA33(); 2344 struct GUIButton *__cdecl UI_CreateEndConversationButton();
2346 void __fastcall sub_4BCACC_bounties(signed int a1); 2345 void __fastcall sub_4BCACC_bounties(signed int a1);
2347 signed int __cdecl sub_4BD8B5(); 2346 signed int __cdecl sub_4BD8B5();
2348 bool __fastcall sub_4BDAAF(ItemGen *a1, int _2da_idx); 2347 bool __fastcall sub_4BDAAF(ItemGen *a1, int _2da_idx);
2349 void __cdecl sub_4BDB56_buy_skill____(); 2348 void __cdecl sub_4BDB56_buy_skill____();
2350 struct FrameTableTxtLine *__thiscall texture_frame_table_txt_parser(const char *_this, FrameTableTxtLine *a2); 2349 struct FrameTableTxtLine *__thiscall texture_frame_table_txt_parser(const char *_this, FrameTableTxtLine *a2);