comparison mm7_data.h @ 466:91e1ba340f39

Слияние
author Ritor1
date Mon, 25 Feb 2013 09:09:08 +0600
parents e65d75206263 c0ab5f64b37b
children 5d2667144526
comparison
equal deleted inserted replaced
465:e65d75206263 466:91e1ba340f39
679 extern char aBardataB[]; // idb 679 extern char aBardataB[]; // idb
680 extern char aBardata[8]; // weak 680 extern char aBardata[8]; // weak
681 extern char aBardataC[10]; // weak 681 extern char aBardataC[10]; // weak
682 extern char aLoadprog[]; // idb 682 extern char aLoadprog[]; // idb
683 extern char aLoadingD_pcx[]; // idb 683 extern char aLoadingD_pcx[]; // idb
684 extern int pNPCPortraits_x; // idb 684 extern int pNPCPortraits_x[6][6]; // 004E5E50
685 extern int dword_4E5EC8[]; // weak 685 extern int pNPCPortraits_y[6][6]; // 004E5EE0
686 extern int pNPCPortraits_y; // idb
687 extern const char *pHouse_ExitPictures[11]; 686 extern const char *pHouse_ExitPictures[11];
688 extern const char *_4E6BDC_loc_names[11]; 687 extern const char *_4E6BDC_loc_names[11];
689 extern char aOutside[]; // idb 688 extern char aOutside[]; // idb
690 extern char aMer[]; // idb 689 extern char aMer[]; // idb
691 extern char aMir[]; // idb 690 extern char aMir[]; // idb
785 extern char aSpriteOutlineC[]; // idb 784 extern char aSpriteOutlineC[]; // idb
786 extern char aUndefinedCobje[]; // idb 785 extern char aUndefinedCobje[]; // idb
787 extern char aEWorkMsdevMm_7[]; // idb 786 extern char aEWorkMsdevMm_7[]; // idb
788 extern char aGammaControlNo[]; // idb 787 extern char aGammaControlNo[]; // idb
789 extern __int16 word_4E8152[11]; 788 extern __int16 word_4E8152[11];
790 extern char byte_4E8168[116]; 789 extern char byte_4E8168[7][14];
791 extern char aD3dTextureName[]; // idb 790 extern char aD3dTextureName[]; // idb
792 extern char aLogd3d_txt[]; // idb 791 extern char aLogd3d_txt[]; // idb
793 extern char byte_4E8394[]; // weak 792 extern char byte_4E8394[]; // weak
794 #include "Texture.h" 793 #include "Texture.h"
795 extern stru355 stru_4E82A4;// = {0x20, 0x41, 0, 0x20, 0xFF0000, 0xFF00, 0xFF, 0xFF000000}; 794 extern stru355 stru_4E82A4;// = {0x20, 0x41, 0, 0x20, 0xFF0000, 0xFF00, 0xFF, 0xFF000000};
800 extern unsigned int saveload_dlg_xs[2]; 799 extern unsigned int saveload_dlg_xs[2];
801 extern unsigned int saveload_dlg_ys[2]; 800 extern unsigned int saveload_dlg_ys[2];
802 extern unsigned int saveload_dlg_zs[2]; 801 extern unsigned int saveload_dlg_zs[2];
803 extern unsigned int saveload_dlg_ws[2]; 802 extern unsigned int saveload_dlg_ws[2];
804 extern int dword_4E98BC_bApplicationActive; // weak 803 extern int dword_4E98BC_bApplicationActive; // weak
805 extern char *off_4EB080; // idb 804 extern char *pTransitionStrings[]; // 4EB080
806 extern char *pTransitionStrings[464];
807 extern char aAwards_txt[]; // idb 805 extern char aAwards_txt[]; // idb
808 extern char aScroll_txt[]; // idb 806 extern char aScroll_txt[]; // idb
809 extern char aMerchant_txt[]; // idb 807 extern char aMerchant_txt[]; // idb
810 extern char aTrans_txt[]; // idb 808 extern char aTrans_txt[]; // idb
811 extern char aTeacher[]; // idb 809 extern char aTeacher[]; // idb
998 extern int dword_4EFA80; // weak 996 extern int dword_4EFA80; // weak
999 extern int dword_4EFA84; // weak 997 extern int dword_4EFA84; // weak
1000 extern void *off_4EFDB0; // weak 998 extern void *off_4EFDB0; // weak
1001 extern int dword_4F031C[]; // weak 999 extern int dword_4F031C[]; // weak
1002 extern const char *off_4F03B8[]; // idb 1000 extern const char *off_4F03B8[]; // idb
1003 extern __int16 word_4F03FE[]; // weak 1001 //extern __int16 word_4F03FE[]; // weak
1004 extern __int16 word_4F0400[]; // weak 1002 //extern __int16 word_4F0400[]; // weak
1003 extern __int16 word_4F0404[];
1005 extern __int16 word_4F0498[]; // weak 1004 extern __int16 word_4F0498[]; // weak
1006 extern __int16 word_4F0576[]; // weak 1005 extern __int16 word_4F0576[]; // weak
1007 extern __int16 word_4F0578[]; // weak 1006 extern __int16 word_4F0578[]; // weak
1008 extern __int16 word_4F05AE[]; // weak 1007 extern __int16 word_4F05AE[]; // weak
1009 extern char _4F063C_smthn_by_2da_uType[3]; // weak 1008 extern char _4F063C_smthn_by_2da_uType[3]; // weak
1068 extern int dword_4F5BF4_xs[]; // idb 1067 extern int dword_4F5BF4_xs[]; // idb
1069 extern int dword_4F5CC4_ys[]; // idb 1068 extern int dword_4F5CC4_ys[]; // idb
1070 extern int dword_4F5D98_xs[]; // idb 1069 extern int dword_4F5D98_xs[]; // idb
1071 extern int ai_array_4F5E68[500]; 1070 extern int ai_array_4F5E68[500];
1072 extern int ai_array_4F6638_actor_ids[500]; 1071 extern int ai_array_4F6638_actor_ids[500];
1073 extern int dword_4F6E08[500]; 1072 extern int ai_near_actors_targets_pid[500];
1074 extern int ai_arrays_size; // weak 1073 extern int ai_arrays_size; // weak
1075 extern int ai_array_4F75E0[500]; 1074 extern int ai_near_actors_distances[500];
1076 extern unsigned int ai_array_4F7DB0_actor_ids[500]; 1075 extern unsigned int ai_near_actors_ids[500];
1077 extern int dword_4F8580[]; // weak 1076 extern int dword_4F8580[]; // weak
1078 extern int dword_4FA9B0[]; // weak 1077 extern int dword_4FA9B0[]; // weak
1079 extern int dword_4FA9B4[]; // weak 1078 extern int dword_4FA9B4[]; // weak
1080 extern char byte_4FAA00; // weak 1079 extern char byte_4FAA00; // weak
1081 extern __int16 am_sounds[12]; 1080 extern __int16 am_sounds[12];
1276 extern int dword_50C9D4; // weak 1275 extern int dword_50C9D4; // weak
1277 extern int dword_50C9D8; // weak 1276 extern int dword_50C9D8; // weak
1278 extern int dword_50C9DC; // weak 1277 extern int dword_50C9DC; // weak
1279 extern struct NPCData *ptr_50C9E0; 1278 extern struct NPCData *ptr_50C9E0;
1280 extern int dword_50C9E8; // idb 1279 extern int dword_50C9E8; // idb
1281 extern int dword_50C9EC[]; // weak 1280 extern int dword_50C9EC[]; // 50C9EC
1282 extern int dword_50C9F0[120]; // idb 1281 extern int dword_50CDC8;
1283 extern int dword_50CDC8; // weak
1284 extern int dword_50CDCC; // weak 1282 extern int dword_50CDCC; // weak
1285 extern int bProcessorIsNotIntel; // weak 1283 extern int bProcessorIsNotIntel; // weak
1286 extern Vec3_int_ layingitem_vel_50FDFC; 1284 extern Vec3_int_ layingitem_vel_50FDFC;
1287 extern char pStartingMapName[]; // idb 1285 extern char pStartingMapName[]; // idb
1288 extern unsigned __int8 IsPlayerWearingWatersuit[5]; 1286 extern unsigned __int8 IsPlayerWearingWatersuit[5];
1323 extern int dword_591084; // weak 1321 extern int dword_591084; // weak
1324 extern struct Actor *pDialogue_SpeakingActor; 1322 extern struct Actor *pDialogue_SpeakingActor;
1325 extern unsigned int uDialogueType; 1323 extern unsigned int uDialogueType;
1326 extern unsigned int uDialogue_SpeakingActorNPC_ID; 1324 extern unsigned int uDialogue_SpeakingActorNPC_ID;
1327 extern struct LevelDecoration *_591094_decoration; 1325 extern struct LevelDecoration *_591094_decoration;
1328 extern char byte_591098[200]; // idb 1326 extern char sHouseName[200]; // idb
1329 extern int uCurrentHouse_Animation; // weak 1327 extern int uCurrentHouse_Animation; // weak
1330 extern char *dword_591164_teleport_map_name; // idb 1328 extern char *dword_591164_teleport_map_name; // idb
1331 extern int dword_591168_teleport_speedz; // weak 1329 extern int dword_591168_teleport_speedz; // weak
1332 extern int dword_59116C_teleport_directionx; // weak 1330 extern int dword_59116C_teleport_directionx; // weak
1333 extern int dword_591170_teleport_directiony; // weak 1331 extern int dword_591170_teleport_directiony; // weak
1334 extern int dword_591174_teleportz; // weak 1332 extern int dword_591174_teleportz; // weak
1335 extern int dword_591178_teleporty; // weak 1333 extern int dword_591178_teleporty; // weak
1336 extern int dword_59117C_teleportx; // weak 1334 extern int dword_59117C_teleportx; // weak
1337 extern char byte_591180[600]; // idb 1335 extern char byte_591180[600]; // idb
1338 extern struct NPCData *array_5913D8[12]; 1336 extern struct NPCData *HouseNPCData[6];
1337 extern int pDialogueNPCCount;
1339 extern struct Texture *pDialogueNPCPortraits[6]; 1338 extern struct Texture *pDialogueNPCPortraits[6];
1340 extern int uNumDialogueNPCPortraits; // weak 1339 extern int uNumDialogueNPCPortraits; // weak
1341 extern struct Texture *pTexture_591428; 1340 extern struct Texture *pTexture_591428;
1342 extern struct Texture *pTexture_outside; // idb 1341 extern struct Texture *pTexture_outside; // idb
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
1751 // Function declarations 1750 // Function declarations
1752 1751
1753 #define __thiscall __cdecl // Test compile in C mode 1752 #define __thiscall __cdecl // Test compile in C mode
1754 1753
1755 void __stdcall mm7__vector_constructor(void *a1, int objSize, int numObjs, int (__thiscall *constructor)(int)); 1754 void __stdcall mm7__vector_constructor(void *a1, int objSize, int numObjs, int (__thiscall *constructor)(int));
1756 int __cdecl ODM_4014E6_AI(); 1755 void MakeActorAIList_ODM();
1757 int __cdecl BLV_4016FA_AI(); 1756 int __cdecl MakeActorAIList_BLV();
1758 void __cdecl sub_401A91_AI(); 1757 void __cdecl sub_401A91_AI();
1759 bool __fastcall sub_4070EF_prolly_collide_objects(unsigned int uObjID, unsigned int uObj2ID); 1758 bool __fastcall sub_4070EF_prolly_collide_objects(unsigned int uObjID, unsigned int uObj2ID);
1760 bool __fastcall sub_4075DB(int a1, int a2, int a3, struct BLVFace *a4); 1759 bool __fastcall sub_4075DB(int a1, int a2, int a3, struct BLVFace *a4);
1761 bool __fastcall sub_4077F1(int a1, int a2, int a3, struct ODMFace *a4, struct BSPVertexBuffer *a5); 1760 bool __fastcall sub_4077F1(int a1, int a2, int a3, struct ODMFace *a4, struct BSPVertexBuffer *a5);
1762 bool __fastcall sub_407A1C(int x, int z, int y, struct Vec3_int_ v); // idb 1761 bool __fastcall sub_407A1C(int x, int z, int y, struct Vec3_int_ v); // idb
1913 bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem(); 1912 bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem();
1914 void __fastcall GameUI_OnPlayerPortraitLeftClick(unsigned int uPlayerID); // idb 1913 void __fastcall GameUI_OnPlayerPortraitLeftClick(unsigned int uPlayerID); // idb
1915 void __cdecl sub_421EA6_OnInventoryLeftClick(); 1914 void __cdecl sub_421EA6_OnInventoryLeftClick();
1916 void __cdecl OnGameViewportClick(); 1915 void __cdecl OnGameViewportClick();
1917 bool PauseGameDrawing(); 1916 bool PauseGameDrawing();
1918 void __fastcall SetUserInterface(int a1, bool bReplace); 1917 void SetUserInterface(enum PartyAlignment alignment, bool bReplace);
1919 void __cdecl reset_some_strus_flt_2Cs(); 1918 void __cdecl reset_some_strus_flt_2Cs();
1920 void __cdecl j_sub_423B4A(); 1919 void __cdecl j_sub_423B4A();
1921 void __cdecl sub_423B4A(); 1920 void __cdecl sub_423B4A();
1922 int __fastcall sub_423B5D(unsigned int uFaceID); 1921 int __fastcall sub_423B5D(unsigned int uFaceID);
1923 signed int __fastcall sub_424579(int uFaceID, struct stru320 *a2); 1922 signed int __fastcall sub_424579(int uFaceID, struct stru320 *a2);
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);
2302 void __cdecl sub_4B1A2D(); 2301 void __cdecl sub_4B1A2D();
2303 void __stdcall RestAndHeal(__int64 uNumMinutes); // idb 2302 void __stdcall RestAndHeal(__int64 uNumMinutes); // idb
2304 void __cdecl sub_4B1D27(); 2303 void __cdecl sub_4B1D27();
2305 void __fastcall HousePlaySomeSound(unsigned int uHouseID, int a2); // idb 2304 void __fastcall HousePlaySomeSound(unsigned int uHouseID, int a2); // idb
2306 void __cdecl sub_4B1ECE(); 2305 void __cdecl sub_4B1ECE();
2307 void __fastcall sub_4B2001(signed int a1); 2306 void __fastcall ClickNPCTopic(signed int uMessageParam);
2308 char *__thiscall _4B254D_SkillMasteryTeacher(int _this); 2307 char *__thiscall _4B254D_SkillMasteryTeacher(int _this);
2309 const char *__fastcall sub_4B29F2(int a1); 2308 const char *__fastcall ContractSelectText(int pEventNumber);
2310 char __cdecl sub_4B2A74(); 2309 char __cdecl SimpleHouseAndBoatsDialog();
2311 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2); 2310 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2);
2312 int __thiscall sub_4B3703(void *_this); 2311 int __thiscall sub_4B3703(void *_this);
2313 int __thiscall sub_4B3A72(int a1); // idb 2312 int __thiscall sub_4B3A72(int a1); // idb
2314 int __fastcall sub_4B3AD4(signed int a1); 2313 int __fastcall sub_4B3AD4(signed int a1);
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 DrawJoinGuildWindow(int pEventNumber);
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 ui_training(); 2322 int __cdecl TrainingDialog();
2324 char *__cdecl sub_4B4F4F(); 2323 char *__cdecl sub_4B4F4F();
2325 int __cdecl ui_shop_teachers(); 2324 int __cdecl MagicShopDialog();
2326 int __cdecl sub_4B5D7C(); 2325 int __cdecl GuildDialog();
2327 int __cdecl sub_4B6478(); 2326 int __cdecl sub_4B6478();
2328 bool __fastcall sub_4B68EA(int a1); 2327 bool __fastcall sub_4B68EA(int a1);
2329 void __cdecl TravelByTransport(); 2328 void __cdecl TravelByTransport();
2330 int __cdecl sub_4B705E(); 2329 int __cdecl TampleDialog();
2331 void __cdecl sub_4B7911(); 2330 void __cdecl sub_4B7911();
2332 void __cdecl _4B7D7E_bank(); 2331 void __cdecl _4B7D7E_bank();
2333 void __cdecl sub_4B8285_prolly_draw_arcomage_result(); 2332 void __cdecl TavernDialog();
2334 void *__cdecl GenerateShopItems(); 2333 void *__cdecl GenerateShopItems();
2335 void *__cdecl sub_4B8F94(); 2334 void sub_4B8F94();
2336 char *__cdecl _4B910F_shop_interaction(); 2335 char *__cdecl WeaponShopDialog();
2337 POINT *__cdecl sub_4B9CC6(); 2336 POINT *__cdecl AlchemistDialog();
2338 void __cdecl sub_4BA928(); 2337 void __cdecl ArmorShopDialog();
2339 signed int __fastcall sub_4BB756(signed int a1); 2338 signed int __fastcall sub_4BB756(signed int a1);
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);