Mercurial > mm7

diff stru10.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 a109bb203e28
children afc1c3514dd5
line wrap: on
line diff
--- a/stru10.cpp	Sat Sep 07 15:20:57 2013 +0200
+++ b/stru10.cpp	Sat Sep 07 20:05:20 2013 +0200
@@ -1,10 +1,9 @@
-#include <assert.h>
-
 #include "stru10.h"
 #include "Render.h"
 #include "Indoor.h"
 #include "Game.h"
 #include "Party.h"
+#include "ErrorHandling.h"
 
 #include "mm7_data.h"
 
@@ -81,7 +80,7 @@
 //----- (0049CE9E) --------------------------------------------------------
 void stru10::_49CE9E(BLVFace *pFace, RenderVertexSoft *pVertices, unsigned int uNumVertices, RenderVertexSoft *pOutLimits)
 {
-  assert(sizeof(RenderVertexSoft) == 0x30);
+  Assert(sizeof(RenderVertexSoft) == 0x30);
   
   RenderVertexSoft pLimits[64];
   stru10::CalcPolygonLimits(pFace, pLimits);
@@ -273,7 +272,7 @@
     break;
 
     default:
-      assert(false);
+      Error("Invalid polygon type (%u)", pFace->uPolygonType);
   }