Mercurial > mm7

diff mm7_data.h @ 712:e7c86528a2b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Thu, 21 Mar 2013 23:11:54 +0400
parents a5e587c8e30e 735dab8d3c9a
children 9d13d2ec35a6
line wrap: on
line diff
--- a/mm7_data.h	Thu Mar 21 23:10:57 2013 +0400
+++ b/mm7_data.h	Thu Mar 21 23:11:54 2013 +0400
@@ -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();