diff mm7_data.h @ 466:91e1ba340f39

Слияние
author Ritor1
date Mon, 25 Feb 2013 09:09:08 +0600
parents e65d75206263 c0ab5f64b37b
children 5d2667144526
line wrap: on
line diff
--- a/mm7_data.h	Mon Feb 25 09:08:13 2013 +0600
+++ b/mm7_data.h	Mon Feb 25 09:09:08 2013 +0600
@@ -681,9 +681,8 @@
 extern char aBardataC[10]; // weak
 extern char aLoadprog[]; // idb
 extern char aLoadingD_pcx[]; // idb
-extern int pNPCPortraits_x; // idb
-extern int dword_4E5EC8[]; // weak
-extern int pNPCPortraits_y; // idb
+extern int pNPCPortraits_x[6][6]; // 004E5E50
+extern int pNPCPortraits_y[6][6]; // 004E5EE0
 extern const char *pHouse_ExitPictures[11];
 extern const char *_4E6BDC_loc_names[11];
 extern char aOutside[]; // idb
@@ -787,7 +786,7 @@
 extern char aEWorkMsdevMm_7[]; // idb
 extern char aGammaControlNo[]; // idb
 extern __int16 word_4E8152[11];
-extern char byte_4E8168[116];
+extern char byte_4E8168[7][14];
 extern char aD3dTextureName[]; // idb
 extern char aLogd3d_txt[]; // idb
 extern char byte_4E8394[]; // weak
@@ -802,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
@@ -1000,8 +998,9 @@
 extern void *off_4EFDB0; // weak
 extern int dword_4F031C[]; // weak
 extern const char *off_4F03B8[]; // idb
-extern __int16 word_4F03FE[]; // weak
-extern __int16 word_4F0400[]; // weak
+//extern __int16 word_4F03FE[]; // weak
+//extern __int16 word_4F0400[]; // weak
+extern __int16 word_4F0404[];
 extern __int16 word_4F0498[]; // weak
 extern __int16 word_4F0576[]; // weak
 extern __int16 word_4F0578[]; // weak
@@ -1070,10 +1069,10 @@
 extern int dword_4F5D98_xs[]; // idb
 extern int ai_array_4F5E68[500];
 extern int ai_array_4F6638_actor_ids[500];
-extern int dword_4F6E08[500];
+extern int ai_near_actors_targets_pid[500];
 extern int ai_arrays_size; // weak
-extern int ai_array_4F75E0[500];
-extern unsigned int ai_array_4F7DB0_actor_ids[500];
+extern int ai_near_actors_distances[500];
+extern unsigned int ai_near_actors_ids[500];
 extern int dword_4F8580[]; // weak
 extern int dword_4FA9B0[]; // weak
 extern int dword_4FA9B4[]; // weak
@@ -1278,9 +1277,8 @@
 extern int dword_50C9DC; // weak
 extern struct NPCData *ptr_50C9E0;
 extern int dword_50C9E8; // idb
-extern int dword_50C9EC[]; // weak
-extern int dword_50C9F0[120]; // idb
-extern int dword_50CDC8; // weak
+extern int dword_50C9EC[]; // 50C9EC
+extern int dword_50CDC8;
 extern int dword_50CDCC; // weak
 extern int bProcessorIsNotIntel; // weak
 extern Vec3_int_ layingitem_vel_50FDFC;
@@ -1325,7 +1323,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
@@ -1335,7 +1333,8 @@
 extern int dword_591178_teleporty; // weak
 extern int dword_59117C_teleportx; // weak
 extern char byte_591180[600]; // idb
-extern struct NPCData *array_5913D8[12];
+extern struct NPCData *HouseNPCData[6];
+extern int pDialogueNPCCount;
 extern struct Texture *pDialogueNPCPortraits[6];
 extern int uNumDialogueNPCPortraits; // weak
 extern struct Texture *pTexture_591428;
@@ -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
@@ -1753,8 +1752,8 @@
 #define __thiscall __cdecl // Test compile in C mode
 
 void __stdcall mm7__vector_constructor(void *a1, int objSize, int numObjs, int (__thiscall *constructor)(int));
-int __cdecl ODM_4014E6_AI();
-int __cdecl BLV_4016FA_AI();
+void MakeActorAIList_ODM();
+int __cdecl MakeActorAIList_BLV();
 void __cdecl sub_401A91_AI();
 bool __fastcall sub_4070EF_prolly_collide_objects(unsigned int uObjID, unsigned int uObj2ID);
 bool __fastcall sub_4075DB(int a1, int a2, int a3, struct BLVFace *a4);
@@ -1915,7 +1914,7 @@
 void __cdecl sub_421EA6_OnInventoryLeftClick();
 void __cdecl OnGameViewportClick();
 bool PauseGameDrawing();
-void __fastcall SetUserInterface(int a1, bool bReplace);
+void SetUserInterface(enum PartyAlignment alignment, bool bReplace);
 void __cdecl reset_some_strus_flt_2Cs();
 void __cdecl j_sub_423B4A();
 void __cdecl sub_423B4A();
@@ -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);
@@ -2304,45 +2303,45 @@
 void __cdecl sub_4B1D27();
 void __fastcall HousePlaySomeSound(unsigned int uHouseID, int a2); // idb
 void __cdecl sub_4B1ECE();
-void __fastcall sub_4B2001(signed int a1);
+void __fastcall ClickNPCTopic(signed int uMessageParam);
 char *__thiscall _4B254D_SkillMasteryTeacher(int _this);
-const char *__fastcall sub_4B29F2(int a1);
-char __cdecl sub_4B2A74();
+const char *__fastcall ContractSelectText(int pEventNumber);
+char __cdecl SimpleHouseAndBoatsDialog();
 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2);
 int __thiscall sub_4B3703(void *_this);
 int __thiscall sub_4B3A72(int a1); // idb
 int __fastcall sub_4B3AD4(signed int a1);
 int __fastcall sub_4B3B42(signed int a1);
 void __cdecl sub_4B3E1E();
-void __fastcall sub_4B3EF0(int a4);
+void __fastcall DrawJoinGuildWindow(int pEventNumber);
 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 ui_training();
+int __cdecl TrainingDialog();
 char *__cdecl sub_4B4F4F();
-int __cdecl ui_shop_teachers();
-int __cdecl sub_4B5D7C();
+int __cdecl MagicShopDialog();
+int __cdecl GuildDialog();
 int __cdecl sub_4B6478();
 bool __fastcall sub_4B68EA(int a1);
 void __cdecl TravelByTransport();
-int __cdecl sub_4B705E();
+int __cdecl TampleDialog();
 void __cdecl sub_4B7911();
 void __cdecl _4B7D7E_bank();
-void __cdecl sub_4B8285_prolly_draw_arcomage_result();
+void __cdecl TavernDialog();
 void *__cdecl GenerateShopItems();
-void *__cdecl sub_4B8F94();
-char *__cdecl _4B910F_shop_interaction();
-POINT *__cdecl sub_4B9CC6();
-void __cdecl sub_4BA928();
+void sub_4B8F94();
+char *__cdecl WeaponShopDialog();
+POINT *__cdecl AlchemistDialog();
+void __cdecl ArmorShopDialog();
 signed int __fastcall sub_4BB756(signed int a1);
 const char *sub_4BBA85_bounties();
 void __cdecl sub_4BBCDD();
 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);