diff mm7_data.h @ 552:bee46636df95

Merge
author Nomad
date Mon, 04 Mar 2013 20:29:31 +0200
parents f146781c5c2d
children 8b9cbf1f87fb
line wrap: on
line diff
--- a/mm7_data.h	Mon Mar 04 20:28:08 2013 +0200
+++ b/mm7_data.h	Mon Mar 04 20:29:31 2013 +0200
@@ -474,10 +474,7 @@
 extern char _4E2B21_buff_spell_tooltip_colors[80];
 extern char byte_4E2B70[]; // weak
 extern char byte_4E2BC8; // weak
-extern int pChestSmthn1ByType[8];
-extern int pChestSmthn2ByType[8];
-extern int pChestWidthsByType[8];
-extern int pChestHeightsByType[8];
+
 extern char aSS[]; // idb
 extern char ascii_4E2C54[6];
 extern char ascii_4E2C5C[7];
@@ -1005,7 +1002,7 @@
 extern __int16 word_4F0576[]; // weak
 
 //extern __int16 word_4F05AE[]; // weak
-extern char uItemsAmountPerShopType[]; // weak
+
 //extern __int16 word_4F063E[290];
 //extern __int16 word_4F06D8[22];
 extern int guild_mambership_flags[32];
@@ -1153,7 +1150,7 @@
 extern char byte_506360; // weak
 extern int dword_506364; // weak
 extern Texture *dword_50640C[]; // weak
-extern unsigned int uTextureID_506438;
+extern unsigned int uExitCancelTextureId;
 extern int dword_50651C; // weak
 extern int awards_count; // weak
 extern int awards_count2; // weak
@@ -1896,7 +1893,7 @@
 void __cdecl GameUI_DrawStatusBar();
 bool __thiscall sub_41CD4F(unsigned int _this);
 char __fastcall sub_41D20D_buff_remaining_time_string(int ecx0, struct GUIWindow *edx0, __int64 a3, struct GUIFont *a2);
-void GameUI_DrawItemInfo(struct ItemGen *_this); // idb
+void GameUI_DrawItemInfo(struct ItemGen* inspect_item); // idb
 char *__fastcall MonsterPopup_Draw(unsigned int uActorID, struct GUIWindow *edx0);
 void __cdecl nullsub_3(); // idb
 void __cdecl LoadActualSkyFrame();
@@ -1904,7 +1901,7 @@
 void __cdecl RestUI_Initialize();
 void __cdecl RestUI_Draw(); // idb
 void __cdecl sub_42038D();
-void __fastcall sub_420B13(int a1, int a2);
+
 void __fastcall party_finds_gold(unsigned int uNumGold, int _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal); // idb
 void __cdecl sub_420E01();
 void __cdecl GameUI_WritePointedObjectStatusString();
@@ -2055,7 +2052,7 @@
 // int __cdecl crt_deconstruct_44C42C();
 void SpawnEncounter(struct MapInfo *pMapInfo, struct SpawnPointMM7 *spawn, int a3, int a4, int a5);
 int __fastcall sub_44FA4C_spawn_light_elemental(int a1, int a2, int a3);
-void __cdecl sub_450218_prolly_generate_chests_loot();
+void  sub_450218_prolly_generate_chests_loot();
 signed int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6);
 int __fastcall sub_45063B(struct MapInfo *a1, int a2);
 void RespawnGlobalDecorations();