diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-01-22 19:07:40 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-01-22 19:07:40 +0100 |
| commit | 5b9159e165ea4bca3ab32317b180d9d543f99dbf (patch) | |
| tree | af6d9a57c77f6e4481cfa9df73ff7327aca69b0c | |
| parent | 10d4d2e5b74ef682f5db5364dd52547ec39f4510 (diff) | |
Tools: Build fix
| -rw-r--r-- | src/tools/mesh_extractor/MPQManager.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mesh_extractor/Utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQManager.cpp index 0fe07cd8b85..5ae8558d749 100644 --- a/src/tools/mesh_extractor/MPQManager.cpp +++ b/src/tools/mesh_extractor/MPQManager.cpp @@ -14,7 +14,7 @@ char* MPQManager::Files[] = { "patch-3.MPQ" }; -char* MPQManager::Languages[] = { "enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU" }; +char const* MPQManager::Languages[] = { "enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU" }; void MPQManager::Initialize() { diff --git a/src/tools/mesh_extractor/Utils.h b/src/tools/mesh_extractor/Utils.h index 41ea33e6157..64fb1bb35ba 100644 --- a/src/tools/mesh_extractor/Utils.h +++ b/src/tools/mesh_extractor/Utils.h @@ -15,7 +15,7 @@ struct WorldModelDefinition; class DoodadInstance; -#define ASSERT(assertion) { if (!(assertion)) { ACE_Stack_Trace st; fprintf(stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n", __FILE__, __LINE__, __FUNCTION__, #assertion, st.c_str()); *((volatile int*)NULL) = 0; } } +#define ASSERT(assertion) { if (!(assertion)) { ACE_Stack_Trace st; fprintf(stderr, "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__, __FUNCTION__, #assertion, st.c_str()); *((volatile int*)NULL) = 0; } } struct Vector3 { |