mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10461] Fix error message in extractor tool

Browse source 
Signed-off-by: Lynx3d <lynx3d@some-imaginary-isp.org>
This commit is contained in:
silviu2009 2010-09-09 22:38:30 +02:00 • committed by Lynx3d
parent d334f9fab8
commit 1341345216
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
contrib/extractor/System.cpp
View file

@ -400,7 +400,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
area_flags[i][j] = areas[areaid]; area_flags[i][j] = areas[areaid];
continue; 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; 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 // Dark water detect
if (type == LIQUID_TYPE_OCEAN) if (type == LIQUID_TYPE_OCEAN)
{ {
uint8 *lm = h2o->getLiquidLightMap(h); uint8 *lm = h2o->getLiquidLightMap(h);
if (!lm) if (!lm)
liquid_type[i][j]|=MAP_LIQUID_TYPE_DARK_WATER; 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; liquidHeader.liquidType = type;
else else
map.liquidMapSize+=sizeof(liquid_type); map.liquidMapSize+=sizeof(liquid_type);
if (!(liquidHeader.flags & MAP_LIQUID_NO_HEIGHT)) if (!(liquidHeader.flags & MAP_LIQUID_NO_HEIGHT))
map.liquidMapSize += sizeof(float)*liquidHeader.width*liquidHeader.height; map.liquidMapSize += sizeof(float)*liquidHeader.width*liquidHeader.height;
} }
@ -917,7 +917,7 @@ void ExtractMapsFromMpq(uint32 build)
delete [] map_ids; 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"); FILE *output = fopen(filename.c_str(), "wb");
if(!output) if(!output)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10460" #define REVISION_NR "10461"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__