diff mm7_data.h @ 184:428cbb33872c

Слияние
author Ritor1
date Fri, 15 Feb 2013 18:34:53 +0600
parents c5bd7a825ef2
children d65528fc3bda 038a4d09406f
line wrap: on
line diff
--- a/mm7_data.h	Fri Feb 15 18:34:31 2013 +0600
+++ b/mm7_data.h	Fri Feb 15 18:34:53 2013 +0600
@@ -310,7 +310,7 @@
 
 //-------------------------------------------------------------------------
 // Data declarations
-extern int (__cdecl *sprintfex)(char *a1, const char *a2, ...);
+//extern int (__cdecl *sprintfex)(char *a1, const char *a2, ...);
 
 extern int pWindowList_at_506F50_minus1_indexing[1];
 extern int dword_4C9890[10]; // weak
@@ -2054,8 +2054,8 @@
 signed int __cdecl const_2();
 bool __cdecl sub_44C28F_open_nwc_dungeon();
 // int __cdecl crt_deconstruct_44C42C();
-struct GUIFont *LoadFont(const char *pFontFile, const char *pFontPalette, ...);
-char *__fastcall FitTextInAWindow(const char *pInString, GUIFont *pFont, GUIWindow *pWindow, unsigned int uX, int a5);
+
+
 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();