aboutsummaryrefslogtreecommitdiff
path: root/src/tools/map_extractor
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-05-20 18:22:34 +0100
committerNay <dnpd.dd@gmail.com>2012-05-20 18:22:34 +0100
commit23be8c4fd719bb67e6a2dc9bc4114766bd62507f (patch)
treed569a4d8a4d0822fbbbca4208ee9d38e0ec14ee4 /src/tools/map_extractor
parente56b2cdd59c5c7673da1aaac5fe8a99d4891e260 (diff)
Scripts/VH: Add an 1 minute pause after each boss fight (instead of 5 seconds)
Revert one of the warning fixes (non standard C++)
Diffstat (limited to 'src/tools/map_extractor')
-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 66134180cb0..fde70681113 100644
--- a/src/tools/map_extractor/adt.cpp
+++ b/src/tools/map_extractor/adt.cpp
@@ -53,7 +53,7 @@ bool ADT_file::prepareLoadedData()
bool adt_MHDR::prepareLoadedData()
{
- if (fcc != "MHDR")
+ if (fcc != 'MHDR')
return false;
if (size!=sizeof(adt_MHDR)-8)
@@ -72,7 +72,7 @@ bool adt_MHDR::prepareLoadedData()
bool adt_MCIN::prepareLoadedData()
{
- if (fcc != "MCIN")
+ if (fcc != 'MCIN')
return false;
// Check cells data
@@ -86,7 +86,7 @@ bool adt_MCIN::prepareLoadedData()
bool adt_MH2O::prepareLoadedData()
{
- if (fcc != "MH2O")
+ if (fcc != 'MH2O')
return false;
// Check liquid data
@@ -98,7 +98,7 @@ bool adt_MH2O::prepareLoadedData()
bool adt_MCNK::prepareLoadedData()
{
- if (fcc != "MCNK")
+ if (fcc != 'MCNK')
return false;
// Check height map
@@ -113,7 +113,7 @@ bool adt_MCNK::prepareLoadedData()
bool adt_MCVT::prepareLoadedData()
{
- if (fcc != "MCVT")
+ if (fcc != 'MCVT')
return false;
if (size != sizeof(adt_MCVT)-8)
@@ -124,7 +124,7 @@ bool adt_MCVT::prepareLoadedData()
bool adt_MCLQ::prepareLoadedData()
{
- if (fcc != "MCLQ")
+ if (fcc != 'MCLQ')
return false;
return true;
diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
index 77dca04d4c8..465eb04083f 100644
--- a/src/tools/map_extractor/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib.cpp
@@ -49,7 +49,7 @@ bool FileLoader::prepareLoadedData()
{
// Check version
version = (file_MVER *) data;
- if (version->fcc != "MVER")
+ if (version->fcc != 'MVER')
return false;
if (version->ver != FILE_FORMAT_VERSION)
return false;
diff --git a/src/tools/map_extractor/wdt.cpp b/src/tools/map_extractor/wdt.cpp
index d9ad0f4c7d3..dedefbb64e5 100644
--- a/src/tools/map_extractor/wdt.cpp
+++ b/src/tools/map_extractor/wdt.cpp
@@ -4,21 +4,21 @@
bool wdt_MWMO::prepareLoadedData()
{
- if (fcc != "MWMO")
+ if (fcc != 'MWMO')
return false;
return true;
}
bool wdt_MPHD::prepareLoadedData()
{
- if (fcc != "MPHD")
+ if (fcc != 'MPHD')
return false;
return true;
}
bool wdt_MAIN::prepareLoadedData()
{
- if (fcc != "MAIN")
+ if (fcc != 'MAIN')
return false;
return true;
}