araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 06:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x

Browse Source
This commit is contained in:
Shauren
2012-07-04 22:20:21 +02:00
parent 138375c045 c3cb82b926
commit ed6f3e2def
360 changed files with 19813 additions and 7203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/map_extractor/System.cpp
+5 -5
View File
@@ -50,9 +50,9 @@ char output_path[128] = ".";
char input_path[128] = ".";
uint32 maxAreaId = 0;
//**************************************************
// **************************************************
// Extractor options
//**************************************************
// **************************************************
enum Extract
{
EXTRACT_MAP = 1,
@@ -294,7 +294,7 @@ void ReadAreaTableDBC()
areas[dbc.getRecord(x).getUInt(0)] = dbc.getRecord(x).getUInt(3);
SFileCloseFile(dbcFile);
printf("Done! (%u areas loaded)\n", area_count);
printf("Done! (%zu areas loaded)\n", area_count);
}
void ReadLiquidTypeTableDBC()
@@ -420,7 +420,7 @@ uint8 liquid_flags[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
bool liquid_show[ADT_GRID_SIZE][ADT_GRID_SIZE];
float liquid_height[ADT_GRID_SIZE+1][ADT_GRID_SIZE+1];
bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32 build)
bool ConvertADT(char *filename, char *filename2, int /*cell_y*/, int /*cell_x*/, uint32 build)
{
ADT_file adt;
@@ -624,7 +624,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x, uint32
// Try store as packed in uint16 or uint8 values
if (!(heightHeader.flags & MAP_HEIGHT_NO_HEIGHT))
{
float step;
float step = 0;
// Try Store as uint values
if (CONF_allow_float_to_int)
{