diff mm7_data.h @ 364:3abebb74fd09

Merge
author Gloval
date Fri, 22 Feb 2013 00:52:35 +0400
parents 38bfbee60146 2bc1c8d68f41
children 85edec9da96b
line wrap: on
line diff
--- a/mm7_data.h	Fri Feb 22 01:28:48 2013 +0600
+++ b/mm7_data.h	Fri Feb 22 00:52:35 2013 +0400
@@ -1720,6 +1720,8 @@
 extern int dword_F93F20; // weak
 extern int dword_F93F70; // weak
 
+extern volatile bool initing; //ADDED
+
 //extern int crt_F94004; // weak
 //extern int crtdword_F9400C; // weak
 extern FARPROC lpfn; // idb
@@ -1821,7 +1823,7 @@
 void __fastcall ZBuffer_DoFill(int *pZBuffer, Texture *pTex, int uZValue);
 void __fastcall sub_40F92A(int *pZBuffer, struct Texture *a2, int a3); // idb
 void __cdecl SetMoonPhaseNames();
-void __thiscall DrawSpellDescriptionPopup(void *_this);
+void DrawSpellDescriptionPopup(int spell_index);
 signed int __fastcall sub_410D99_get_map_index(int a1);
 unsigned int __cdecl DrawLloydBeaconsScreen();
 char *__cdecl DrawTownPortalScreen();