aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-06-28 22:01:47 +0200
committerjackpoz <giacomopoz@gmail.com>2015-06-28 22:01:47 +0200
commit80761849cc3a40bd51b16a60fc0bb0f9052faa9e (patch)
tree3c2231e3838db537d7232140d561cee086d39dd5 /src
parentdfa556aaa2fd60f881845d381f71294b945396f6 (diff)
Tools/Misc: Fix build warnings
Diffstat (limited to 'src')
-rw-r--r--src/tools/map_extractor/adt.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h
index 9212784ab9e..cad773fbee4 100644
--- a/src/tools/map_extractor/adt.h
+++ b/src/tools/map_extractor/adt.h
@@ -67,8 +67,8 @@ class adt_MCLQ
uint32 fcc;
char fcc_txt[4];
};
- uint32 size;
public:
+ uint32 size;
float height1;
float height2;
struct liquid_data{
@@ -96,8 +96,8 @@ class adt_MCNK
uint32 fcc;
char fcc_txt[4];
};
- uint32 size;
public:
+ uint32 size;
uint32 flags;
uint32 ix;
uint32 iy;
@@ -155,8 +155,8 @@ class adt_MCIN
uint32 fcc;
char fcc_txt[4];
};
- uint32 size;
public:
+ uint32 size;
struct adt_CELLS{
uint32 offsMCNK;
uint32 size;
@@ -271,6 +271,7 @@ class adt_MHDR
uint32 fcc;
char fcc_txt[4];
};
+public:
uint32 size;
uint32 pad;
@@ -289,7 +290,6 @@ class adt_MHDR
uint32 data3;
uint32 data4;
uint32 data5;
-public:
bool prepareLoadedData();
adt_MCIN *getMCIN(){ return (adt_MCIN *)((uint8 *)&pad+offsMCIN);}
adt_MH2O *getMH2O(){ return offsMH2O ? (adt_MH2O *)((uint8 *)&pad+offsMH2O) : 0;}