diff mm7_data.h @ 726:9d13d2ec35a6

Слияние
author Ritor1
date Fri, 22 Mar 2013 01:29:46 +0600
parents 7037f22cd716 e7c86528a2b3
children 9f596a163257
line wrap: on
line diff
--- a/mm7_data.h	Fri Mar 22 01:29:25 2013 +0600
+++ b/mm7_data.h	Fri Mar 22 01:29:46 2013 +0600
@@ -1255,7 +1255,7 @@
 extern int dword_50BC10[]; // weak
 extern int dword_50BDA0[]; // weak
 extern int dword_50BF30[]; // weak
-extern char byte_50C0C0; // weak
+extern char town_portal_caster_id; // weak
 extern int some_active_character; // weak
 extern _UNKNOWN unk_50C190; // weak
 extern int dword_50C968; // weak
@@ -1824,7 +1824,7 @@
 void DrawSpellDescriptionPopup(int spell_index);
 signed int __fastcall sub_410D99_get_map_index(int a1);
 unsigned int __cdecl DrawLloydBeaconsScreen();
-char *__cdecl DrawTownPortalScreen();
+void DrawTownPortalScreen();
 void LoadSpellbook(unsigned int uID); // idb
 struct GUIWindow *__cdecl sub_41140B();
 void __cdecl sub_411473();
@@ -2276,7 +2276,7 @@
 struct Vec4_int_ *__thiscall sub_4AC277(unsigned int _this, Vec4_int_ *a2);
 struct Vec4_int_ *__thiscall sub_4AC33A_get_cpu_clocks_QPC(int _this, Vec4_int_ *a1);
 struct Vec4_int_ *__thiscall sub_4AC4FD_get_cpu_clocks_rdtsc(int _this, Vec4_int_ *a1);
-int __fastcall sub_4AD504(unsigned int uFaceID);
+int __fastcall sub_4AD504(signed int uFaceID);
 void __fastcall sub_4ADD1D(int uFaceID);
 int __fastcall sub_4AE1E7(int a1, int a2, int a3);
 int __fastcall sub_4AE313(int viewport_space_x, int viewport_space_y, struct stru337_stru0 *p);