Mercurial > mm7
comparison mm7_1.cpp @ 1545:c4ab816fcc5e
assert, Abortf, AbortWithError -> Assert, Error
refactors here and there
author | Nomad |
---|---|
date | Sat, 07 Sep 2013 20:05:20 +0200 |
parents | 499761153844 |
children | e668660457dc |
comparison
equal
deleted
inserted
replaced
1544:499761153844 | 1545:c4ab816fcc5e |
---|---|
7 | 7 |
8 Detected compiler: Visual C++ | 8 Detected compiler: Visual C++ |
9 */ | 9 */ |
10 | 10 |
11 //#include <defs.h> | 11 //#include <defs.h> |
12 #include <assert.h> | |
13 | 12 |
14 #include "Texture.h" | 13 #include "Texture.h" |
15 #include "mm7_data.h" | 14 #include "mm7_data.h" |
16 #include "VideoPlayer.h" | 15 #include "VideoPlayer.h" |
17 #include "BSPModel.h" | 16 #include "BSPModel.h" |
405 v3 = TargetColor(0, 0, 0xC8u); | 404 v3 = TargetColor(0, 0, 0xC8u); |
406 v5 = 255; | 405 v5 = 255; |
407 v4 = 225; | 406 v4 = 225; |
408 v6 = 255; | 407 v6 = 255; |
409 } | 408 } |
410 else assert(false); | 409 else Error("Invalid alignment type: %u", align); |
411 | 410 |
412 uGameUIFontMain = v3; | 411 uGameUIFontMain = v3; |
413 uGameUIFontShadow = TargetColor(v5, v4, v6); | 412 uGameUIFontShadow = TargetColor(v5, v4, v6); |
414 } | 413 } |
415 | 414 |