aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2013-01-12 02:15:10 +0100
committerSpp <spp@jorge.gr>2013-01-12 02:15:10 +0100
commite783349803e64d0fd1879a97dcb4749435a87f05 (patch)
tree0be3c1504374c2fb8bb40dadf65eda975e482deb
parentd6d2cb0490af96d4a858bab18b20ce9d8e7865c6 (diff)
Use correct initialization of some vars
-rw-r--r--src/tools/map_extractor/adt.cpp12
-rw-r--r--src/tools/map_extractor/loadlib.cpp2
-rw-r--r--src/tools/map_extractor/wdt.cpp6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp
index eeb69134fab..a93ead838fe 100644
--- a/src/tools/map_extractor/adt.cpp
+++ b/src/tools/map_extractor/adt.cpp
@@ -6,12 +6,12 @@
int holetab_h[4] = {0x1111, 0x2222, 0x4444, 0x8888};
int holetab_v[4] = {0x000F, 0x00F0, 0x0F00, 0xF000};
-u_map_fcc MHDRMagic = { {'M','H','D','R'} };
-u_map_fcc MCINMagic = { {'M','C','I','N'} };
-u_map_fcc MH2OMagic = { {'M','H','2','O'} };
-u_map_fcc MCNKMagic = { {'M','C','N','K'} };
-u_map_fcc MCVTMagic = { {'M','C','V','T'} };
-u_map_fcc MCLQMagic = { {'M','C','L','Q'} };
+u_map_fcc MHDRMagic = { {'R','D','H','M'} };
+u_map_fcc MCINMagic = { {'N','I','C','M'} };
+u_map_fcc MH2OMagic = { {'0','2','H','M'} };
+u_map_fcc MCNKMagic = { {'K','N','C','M'} };
+u_map_fcc MCVTMagic = { {'T','V','C','M'} };
+u_map_fcc MCLQMagic = { {'Q','L','C','M'} };
bool isHole(int holes, int i, int j)
{
diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
index d1ea40110de..5dcb479a11c 100644
--- a/src/tools/map_extractor/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib.cpp
@@ -6,7 +6,7 @@
class MPQFile;
-u_map_fcc MverMagic = { {'M','V','E','R'} };
+u_map_fcc MverMagic = { {'R','E','V','M'} };
FileLoader::FileLoader()
{
diff --git a/src/tools/map_extractor/wdt.cpp b/src/tools/map_extractor/wdt.cpp
index 90a07eafab3..ff255145583 100644
--- a/src/tools/map_extractor/wdt.cpp
+++ b/src/tools/map_extractor/wdt.cpp
@@ -2,9 +2,9 @@
#include "wdt.h"
-u_map_fcc MWMOMagic = { {'M', 'W', 'M', 'O'} };
-u_map_fcc MPHDMagic = { {'M', 'P', 'H', 'D'} };
-u_map_fcc MAINMagic = { {'M', 'A', 'I', 'N'} };
+u_map_fcc MWMOMagic = { {'O', 'M', 'W', 'M'} };
+u_map_fcc MPHDMagic = { {'D', 'H', 'P', 'M'} };
+u_map_fcc MAINMagic = { {'N', 'I', 'A', 'M'} };
bool wdt_MWMO::prepareLoadedData()
{