diff mm7_data.h @ 454:5e5dfedcc0ad

Слияние
author Ritor1
date Sun, 24 Feb 2013 09:18:17 +0600
parents 9dc0dffaf7c6 137c59c3dbc4
children 20d96ec810c8
line wrap: on
line diff
--- a/mm7_data.h	Sun Feb 24 09:18:03 2013 +0600
+++ b/mm7_data.h	Sun Feb 24 09:18:17 2013 +0600
@@ -801,8 +801,7 @@
 extern unsigned int saveload_dlg_zs[2];
 extern unsigned int saveload_dlg_ws[2];
 extern int dword_4E98BC_bApplicationActive; // weak
-extern char *off_4EB080; // idb
-extern char *pTransitionStrings[464];
+extern char *pTransitionStrings[]; // 4EB080
 extern char aAwards_txt[]; // idb
 extern char aScroll_txt[]; // idb
 extern char aMerchant_txt[]; // idb
@@ -1325,7 +1324,7 @@
 extern unsigned int uDialogueType;
 extern unsigned int uDialogue_SpeakingActorNPC_ID;
 extern struct LevelDecoration *_591094_decoration;
-extern char byte_591098[200]; // idb
+extern char sHouseName[200]; // idb
 extern int uCurrentHouse_Animation; // weak
 extern char *dword_591164_teleport_map_name; // idb
 extern int dword_591168_teleport_speedz; // weak
@@ -1345,7 +1344,7 @@
 extern int start_event_seq_number; // weak
 extern char byte_5B0938[2000];
 extern int dword_5B5920; // weak
-extern int dword_5B5924; // weak
+extern int _unused_5B5924_is_travel_ui_drawn; // 005B5924
 extern int _5B65A8_npcdata_uflags_or_other; // weak
 extern int _5B65AC_npcdata_fame_or_other; // weak
 extern int _5B65B0_npcdata_rep_or_other; // weak
@@ -2011,9 +2010,9 @@
 void __thiscall Level_LoadEvtAndStr(const char *pLevelName);
 char *__cdecl _4443D5_GetMinimapRightClickText();
 const char *__cdecl sub_444564();
-char *__thiscall _444732_GetEventHintString(unsigned int uEventID); // idb
+char *__thiscall GetEventHintString(unsigned int uEventID); // idb
 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
-char *__cdecl TransitionUI_Draw();
+void TransitionUI_Draw();
 struct GUIWindow *__cdecl UI_CreateTravelDialogue();
 signed int __cdecl GetTravelTime();
 void __cdecl TravelUI_Draw();
@@ -2031,7 +2030,7 @@
 int sub_4465DF_check_season(int a1);
 int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive); // idb
 // void __cdecl crt_construct_5773C4();
-bool __thiscall sub_4466C4(void *_this);
+int NPC_EventProcessor(int npc_event_id);
 
 void __fastcall sub_448518_npc_set_item(int npc, unsigned int item, int a3);
 void __fastcall sub_44861E_set_texture(unsigned int uFaceCog, const char *pFilename);
@@ -2317,7 +2316,7 @@
 void __fastcall sub_4B3EF0(int a4);
 void __fastcall sub_4B3FE5(int a4);
 void __cdecl sub_4B40E6();
-struct GUIButton *__thiscall _4B4224_UpdateNPCTopics(int _this);
+void  _4B4224_UpdateNPCTopics(int _this);
 char __fastcall sub_4B46A5(const char *Str, int a5);
 int __fastcall sub_4B46F8(int a1);
 int __cdecl TrainingDialog();
@@ -2342,7 +2341,7 @@
 void __fastcall _4BBF61_summon_actor(int a1, __int16 x, int y, int z); // idb
 void __cdecl ArenaFight();
 struct Texture *__cdecl sub_4BC8D5();
-struct GUIButton *__cdecl sub_4BCA33();
+struct GUIButton *__cdecl UI_CreateEndConversationButton();
 void __fastcall sub_4BCACC_bounties(signed int a1);
 signed int __cdecl sub_4BD8B5();
 bool __fastcall sub_4BDAAF(ItemGen *a1, int _2da_idx);