From 13413452161f57a40d76c6b5ed755ca6a761714c Mon Sep 17 00:00:00 2001 From: silviu2009 Date: Thu, 9 Sep 2010 22:38:30 +0200 Subject: [PATCH] [10461] Fix error message in extractor tool Signed-off-by: Lynx3d --- contrib/extractor/System.cpp | 8 ++++---- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/extractor/System.cpp b/contrib/extractor/System.cpp index 5f2885f1b..3a9650c2c 100644 --- a/contrib/extractor/System.cpp +++ b/contrib/extractor/System.cpp @@ -400,7 +400,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 area_flags[i][j] = areas[areaid]; continue; } - printf("File: filename\nCan't find area flag for areaid %u [%d, %d].\n", filename, areaid, cell->ix, cell->iy); + printf("File: %s\nCan't find area flag for areaid %u [%d, %d].\n", filename, areaid, cell->ix, cell->iy); } area_flags[i][j] = 0xffff; } @@ -655,7 +655,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 // Dark water detect if (type == LIQUID_TYPE_OCEAN) { - uint8 *lm = h2o->getLiquidLightMap(h); + uint8 *lm = h2o->getLiquidLightMap(h); if (!lm) liquid_type[i][j]|=MAP_LIQUID_TYPE_DARK_WATER; } @@ -813,7 +813,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 liquidHeader.liquidType = type; else map.liquidMapSize+=sizeof(liquid_type); - + if (!(liquidHeader.flags & MAP_LIQUID_NO_HEIGHT)) map.liquidMapSize += sizeof(float)*liquidHeader.width*liquidHeader.height; } @@ -917,7 +917,7 @@ void ExtractMapsFromMpq(uint32 build) delete [] map_ids; } -bool ExtractFile( char const* mpq_name, std::string const& filename ) +bool ExtractFile( char const* mpq_name, std::string const& filename ) { FILE *output = fopen(filename.c_str(), "wb"); if(!output) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 96270b744..1af37c7ee 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10460" + #define REVISION_NR "10461" #endif // __REVISION_NR_H__