Mercurial > mm7

diff GUIFont.cpp @ 1545:c4ab816fcc5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assert, Abortf, AbortWithError -> Assert, Error refactors here and there
author Nomad
date Sat, 07 Sep 2013 20:05:20 +0200
parents dfc9484ed94c
children 259df09dfb50
line wrap: on
line diff
--- a/GUIFont.cpp	Sat Sep 07 15:20:57 2013 +0200
+++ b/GUIFont.cpp	Sat Sep 07 20:05:20 2013 +0200
@@ -3,7 +3,6 @@
 #endif
 
 #include <string>
-#include <assert.h>
 
 #include "LOD.h"
 #include "GUIFont.h"
@@ -49,10 +48,8 @@
         {
         pallete_index =pIcons_LOD->LoadTexture(pFontPalette, TEXTURE_16BIT_PALETTE);
         if (pallete_index == -1)
-            {
-            wsprintfA(pTmpBuf.data(), "Unable to open %s", pFontPalette);
-            Abortf(pTmpBuf.data());
-            }	
+            Error("Unable to open %s", pFontPalette);
+
         pFont->pFontPalettes[palletes_count] = pIcons_LOD->pTextures[pallete_index].pPalette16;
         ++palletes_count;
         }
@@ -285,7 +282,7 @@
       }
   currentFont=pFontMain; // esi@3
   uInStrLen = strlen(pString);
-  assert(uInStrLen < sizeof(pTmpBuf3));
+  Assert(uInStrLen < sizeof(pTmpBuf3));
   strcpy(pTmpBuf3.data(), pString);
   if (uInStrLen==0)
       return pTmpBuf3.data();