Fix Travis warning: multi-character character constant [-Wmultichar]

(based on cmangos/mangos-wotlk@478752e31) Signed-off-by: Xfurry <xfurry.cmangos@outlook.com>
cmangos · Jan 3, 2018 · b5e9ae2 · b5e9ae2
1 parent bfd1390
commit b5e9ae2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/contrib/extractor/loadlib/adt.cpp b/contrib/extractor/loadlib/adt.cpp
@@ -74,7 +74,7 @@ bool ADT_file::prepareLoadedData()
 
 bool adt_MHDR::prepareLoadedData()
 {
-    if (fcc != 'MHDR')
+    if (fcc != uint32('MHDR'))
         return false;
 
     if (size != sizeof(adt_MHDR) - 8)
@@ -93,7 +93,7 @@ bool adt_MHDR::prepareLoadedData()
 
 bool adt_MCIN::prepareLoadedData()
 {
-    if (fcc != 'MCIN')
+    if (fcc != uint32('MCIN'))
         return false;
 
     // Check cells data
@@ -107,7 +107,7 @@ bool adt_MCIN::prepareLoadedData()
 
 bool adt_MH2O::prepareLoadedData()
 {
-    if (fcc != 'MH2O')
+    if (fcc != uint32('MH2O'))
         return false;
 
     // Check liquid data
@@ -119,7 +119,7 @@ bool adt_MH2O::prepareLoadedData()
 
 bool adt_MCNK::prepareLoadedData()
 {
-    if (fcc != 'MCNK')
+    if (fcc != uint32('MCNK'))
         return false;
 
     // Check height map
@@ -134,7 +134,7 @@ bool adt_MCNK::prepareLoadedData()
 
 bool adt_MCVT::prepareLoadedData()
 {
-    if (fcc != 'MCVT')
+    if (fcc != uint32('MCVT'))
         return false;
 
     if (size != sizeof(adt_MCVT) - 8)
@@ -145,8 +145,8 @@ bool adt_MCVT::prepareLoadedData()
 
 bool adt_MCLQ::prepareLoadedData()
 {
-    if (fcc != 'MCLQ')
+    if (fcc != uint32('MCLQ'))
         return false;
 
     return true;
-}
+}
diff --git a/contrib/extractor/loadlib/loadlib.cpp b/contrib/extractor/loadlib/loadlib.cpp
@@ -133,8 +133,7 @@ bool FileLoader::prepareLoadedData()
 {
     // Check version
     version = (file_MVER*) data;
-
-    if (version->fcc != 'MVER')
+    if (version->fcc != uint32('MVER'))
         return false;
 
     if (version->ver != FILE_FORMAT_VERSION)
@@ -148,4 +147,4 @@ void FileLoader::free()
     data = 0;
     data_size = 0;
     version = 0;
-}
+}
diff --git a/contrib/extractor/loadlib/wdt.cpp b/contrib/extractor/loadlib/wdt.cpp
@@ -4,21 +4,21 @@
 
 bool wdt_MWMO::prepareLoadedData()
 {
-    if (fcc != 'MWMO')
+    if (fcc != uint32('MWMO'))
         return false;
     return true;
 }
 
 bool wdt_MPHD::prepareLoadedData()
 {
-    if (fcc != 'MPHD')
+    if (fcc != uint32('MPHD'))
         return false;
     return true;
 }
 
 bool wdt_MAIN::prepareLoadedData()
 {
-    if (fcc != 'MAIN')
+    if (fcc != uint32('MAIN'))
         return false;
     return true;
 }
@@ -59,4 +59,4 @@ bool WDT_file::prepareLoadedData()
     if (!wmo->prepareLoadedData())
         return false;
     return true;
-}
+}