Mercurial > mm7

diff mm7_2.cpp @ 184:428cbb33872c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 15 Feb 2013 18:34:53 +0600
parents 27573ee0d434 c5bd7a825ef2
children d65528fc3bda 038a4d09406f
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Feb 15 18:34:31 2013 +0600
+++ b/mm7_2.cpp	Fri Feb 15 18:34:53 2013 +0600
@@ -5104,7 +5104,7 @@
   pWindow.uFrameHeight = 338;
   pWindow.uFrameZ = 543;
   pWindow.uFrameW = 397;
-  pFont = LoadFont("endgame.fnt", "FONTPAL", 0);
+  pFont = LoadFont("endgame.fnt", "FONTPAL", NULL);
   if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 99) )
   {
     v1 = pGlobalTXT_LocalizationStrings[675];
@@ -13898,9 +13898,11 @@
   unsigned int startms; // [sp+8h] [bp-24h]@55
   RECT Rect; // [sp+Ch] [bp-20h]@15
   int a2[4]; // [sp+1Ch] [bp-10h]@15
-
+#ifdef MM7_TEXT_DLL
   auto mm7text_dll = LoadLibraryW(L"mm7text.dll");
   sprintfex = (int (__cdecl *)(char *a1, const char *a2, ...))GetProcAddress(mm7text_dll, "_sprintfex");
+#endif
+
 
   if (pCmdLine && *pCmdLine)
   {