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

[8272] Fixed typos in world 'height' by code.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>

Also some other code style fixes.
This commit is contained in:
Sorya 2009-07-29 09:55:11 +04:00 • committed by VladimirMangos
parent 707c9f315d
commit 7f38da23fd
5 changed files with 49 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

47
contrib/extractor/System.cpp
View file

@ -241,10 +241,11 @@ void ReadLiquidTypeTableDBC()
#define MAP_MAGIC 'SPAM' #define MAP_MAGIC 'SPAM'
#define MAP_VERSION_MAGIC '0.1w' #define MAP_VERSION_MAGIC '0.1w'
#define MAP_AREA_MAGIC 'AERA' #define MAP_AREA_MAGIC 'AERA'
#define MAP_HEIGTH_MAGIC 'TGHM' #define MAP_HEIGHT_MAGIC 'TGHM'
#define MAP_LIQUID_MAGIC 'QILM' #define MAP_LIQUID_MAGIC 'QILM'
struct map_fileheader{ struct map_fileheader
{
uint32 mapMagic; uint32 mapMagic;
uint32 versionMagic; uint32 versionMagic;
uint32 areaMapOffset; uint32 areaMapOffset;
@ -256,17 +257,20 @@ struct map_fileheader{
}; };
#define MAP_AREA_NO_AREA 0x0001 #define MAP_AREA_NO_AREA 0x0001
struct map_areaHeader{
struct map_areaHeader
{
uint32 fourcc; uint32 fourcc;
uint16 flags; uint16 flags;
uint16 gridArea; uint16 gridArea;
}; };
#define MAP_HEIGHT_NO_HIGHT 0x0001 #define MAP_HEIGHT_NO_HEIGHT 0x0001
#define MAP_HEIGHT_AS_INT16 0x0002 #define MAP_HEIGHT_AS_INT16 0x0002
#define MAP_HEIGHT_AS_INT8 0x0004 #define MAP_HEIGHT_AS_INT8 0x0004
struct map_heightHeader{ struct map_heightHeader
{
uint32 fourcc; uint32 fourcc;
uint32 flags; uint32 flags;
float gridHeight; float gridHeight;
@ -284,9 +288,10 @@ struct map_heightHeader{
#define MAP_LIQUID_NO_TYPE 0x0001 #define MAP_LIQUID_NO_TYPE 0x0001
#define MAP_LIQUID_NO_HIGHT 0x0002 #define MAP_LIQUID_NO_HEIGHT 0x0002
struct map_liquidHeader{ struct map_liquidHeader
{
uint32 fourcc; uint32 fourcc;
uint16 flags; uint16 flags;
uint16 liquidType; uint16 liquidType;
@ -511,20 +516,20 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x)
map.heightMapSize = sizeof(map_heightHeader); map.heightMapSize = sizeof(map_heightHeader);
map_heightHeader heightHeader; map_heightHeader heightHeader;
heightHeader.fourcc = MAP_HEIGTH_MAGIC; heightHeader.fourcc = MAP_HEIGHT_MAGIC;
heightHeader.flags = 0; heightHeader.flags = 0;
heightHeader.gridHeight = minHeight; heightHeader.gridHeight = minHeight;
heightHeader.gridMaxHeight = maxHeight; heightHeader.gridMaxHeight = maxHeight;
if (maxHeight == minHeight) if (maxHeight == minHeight)
heightHeader.flags |=MAP_HEIGHT_NO_HIGHT; heightHeader.flags |= MAP_HEIGHT_NO_HEIGHT;
// Not need store if flat surface // Not need store if flat surface
if (CONF_allow_float_to_int && (maxHeight - minHeight) < CONF_flat_height_delta_limit) if (CONF_allow_float_to_int && (maxHeight - minHeight) < CONF_flat_height_delta_limit)
heightHeader.flags |=MAP_HEIGHT_NO_HIGHT; heightHeader.flags |= MAP_HEIGHT_NO_HEIGHT;
// Try store as packed in uint16 or uint8 values // Try store as packed in uint16 or uint8 values
if (!(heightHeader.flags&MAP_HEIGHT_NO_HIGHT)) if (!(heightHeader.flags & MAP_HEIGHT_NO_HEIGHT))
{ {
float step; float step;
// Try Store as uint values // Try Store as uint values
@ -756,22 +761,22 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x)
liquidHeader.liquidLevel = minHeight; liquidHeader.liquidLevel = minHeight;
if (maxHeight == minHeight) if (maxHeight == minHeight)
liquidHeader.flags|=MAP_LIQUID_NO_HIGHT; liquidHeader.flags |= MAP_LIQUID_NO_HEIGHT;
// Not need store if flat surface // Not need store if flat surface
if (CONF_allow_float_to_int && (maxHeight - minHeight) < CONF_flat_liquid_delta_limit) if (CONF_allow_float_to_int && (maxHeight - minHeight) < CONF_flat_liquid_delta_limit)
liquidHeader.flags|=MAP_LIQUID_NO_HIGHT; liquidHeader.flags |= MAP_LIQUID_NO_HEIGHT;
if (!fullType) if (!fullType)
liquidHeader.flags|=MAP_LIQUID_NO_TYPE; liquidHeader.flags |= MAP_LIQUID_NO_TYPE;
if (liquidHeader.flags&MAP_LIQUID_NO_TYPE) if (liquidHeader.flags & MAP_LIQUID_NO_TYPE)
liquidHeader.liquidType = type; liquidHeader.liquidType = type;
else else
map.liquidMapSize+=sizeof(liquid_type); map.liquidMapSize+=sizeof(liquid_type);
if (!(liquidHeader.flags&MAP_LIQUID_NO_HIGHT)) if (!(liquidHeader.flags & MAP_LIQUID_NO_HEIGHT))
map.liquidMapSize+=sizeof(float)*liquidHeader.width*liquidHeader.height; map.liquidMapSize += sizeof(float)*liquidHeader.width*liquidHeader.height;
} }
// Ok all data prepared - store it // Ok all data prepared - store it
@ -789,14 +794,14 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x)
// Store height data // Store height data
fwrite(&heightHeader, sizeof(heightHeader), 1, output); fwrite(&heightHeader, sizeof(heightHeader), 1, output);
if (!(heightHeader.flags&MAP_HEIGHT_NO_HIGHT)) if (!(heightHeader.flags & MAP_HEIGHT_NO_HEIGHT))
{ {
if (heightHeader.flags&MAP_HEIGHT_AS_INT16) if (heightHeader.flags & MAP_HEIGHT_AS_INT16)
{ {
fwrite(uint16_V9, sizeof(uint16_V9), 1, output); fwrite(uint16_V9, sizeof(uint16_V9), 1, output);
fwrite(uint16_V8, sizeof(uint16_V8), 1, output); fwrite(uint16_V8, sizeof(uint16_V8), 1, output);
} }
else if (heightHeader.flags&MAP_HEIGHT_AS_INT8) else if (heightHeader.flags & MAP_HEIGHT_AS_INT8)
{ {
fwrite(uint8_V9, sizeof(uint8_V9), 1, output); fwrite(uint8_V9, sizeof(uint8_V9), 1, output);
fwrite(uint8_V8, sizeof(uint8_V8), 1, output); fwrite(uint8_V8, sizeof(uint8_V8), 1, output);
@ -814,7 +819,7 @@ bool ConvertADT(char *filename, char *filename2, int cell_y, int cell_x)
fwrite(&liquidHeader, sizeof(liquidHeader), 1, output); fwrite(&liquidHeader, sizeof(liquidHeader), 1, output);
if (!(liquidHeader.flags&MAP_LIQUID_NO_TYPE)) if (!(liquidHeader.flags&MAP_LIQUID_NO_TYPE))
fwrite(liquid_type, sizeof(liquid_type), 1, output); fwrite(liquid_type, sizeof(liquid_type), 1, output);
if (!(liquidHeader.flags&MAP_LIQUID_NO_HIGHT)) if (!(liquidHeader.flags&MAP_LIQUID_NO_HEIGHT))
{ {
for (int y=0; y<liquidHeader.height;y++) for (int y=0; y<liquidHeader.height;y++)
fwrite(&liquid_height[y+liquidHeader.offsetY][liquidHeader.offsetX], sizeof(float), liquidHeader.width, output); fwrite(&liquid_height[y+liquidHeader.offsetY][liquidHeader.offsetX], sizeof(float), liquidHeader.width, output);

8
src/game/Map.cpp
View file

@ -1190,11 +1190,11 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size)
map_heightHeader header; map_heightHeader header;
fseek(in, offset, SEEK_SET); fseek(in, offset, SEEK_SET);
fread(&header, sizeof(header), 1, in); fread(&header, sizeof(header), 1, in);
if (header.fourcc != uint32(MAP_HEIGTH_MAGIC)) if (header.fourcc != uint32(MAP_HEIGHT_MAGIC))
return false; return false;
m_gridHeight = header.gridHeight; m_gridHeight = header.gridHeight;
if (!(header.flags & MAP_HEIGHT_NO_HIGHT)) if (!(header.flags & MAP_HEIGHT_NO_HEIGHT))
{ {
if ((header.flags & MAP_HEIGHT_AS_INT16)) if ((header.flags & MAP_HEIGHT_AS_INT16))
{ {
@ -1243,12 +1243,12 @@ bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size)
m_liquid_height= header.height; m_liquid_height= header.height;
m_liquidLevel = header.liquidLevel; m_liquidLevel = header.liquidLevel;
if (!(header.flags&MAP_LIQUID_NO_TYPE)) if (!(header.flags & MAP_LIQUID_NO_TYPE))
{ {
m_liquid_type = new uint8 [16*16]; m_liquid_type = new uint8 [16*16];
fread(m_liquid_type, sizeof(uint8), 16*16, in); fread(m_liquid_type, sizeof(uint8), 16*16, in);
} }
if (!(header.flags&MAP_LIQUID_NO_HIGHT)) if (!(header.flags & MAP_LIQUID_NO_HEIGHT))
{ {
m_liquid_map = new float [m_liquid_width*m_liquid_height]; m_liquid_map = new float [m_liquid_width*m_liquid_height];
fread(m_liquid_map, sizeof(float), m_liquid_width*m_liquid_height, in); fread(m_liquid_map, sizeof(float), m_liquid_width*m_liquid_height, in);

26
src/game/Map.h
View file

@ -71,10 +71,11 @@ typedef MaNGOS::SingleThreaded<GridRWLock>::Lock NullGuard;
#define MAP_MAGIC 'SPAM' #define MAP_MAGIC 'SPAM'
#define MAP_VERSION_MAGIC '0.1w' #define MAP_VERSION_MAGIC '0.1w'
#define MAP_AREA_MAGIC 'AERA' #define MAP_AREA_MAGIC 'AERA'
#define MAP_HEIGTH_MAGIC 'TGHM' #define MAP_HEIGHT_MAGIC 'TGHM'
#define MAP_LIQUID_MAGIC 'QILM' #define MAP_LIQUID_MAGIC 'QILM'
struct map_fileheader{ struct map_fileheader
{
uint32 mapMagic; uint32 mapMagic;
uint32 versionMagic; uint32 versionMagic;
uint32 areaMapOffset; uint32 areaMapOffset;
@ -86,17 +87,20 @@ struct map_fileheader{
}; };
#define MAP_AREA_NO_AREA 0x0001 #define MAP_AREA_NO_AREA 0x0001
struct map_areaHeader{
struct map_areaHeader
{
uint32 fourcc; uint32 fourcc;
uint16 flags; uint16 flags;
uint16 gridArea; uint16 gridArea;
}; };
#define MAP_HEIGHT_NO_HIGHT 0x0001 #define MAP_HEIGHT_NO_HEIGHT 0x0001
#define MAP_HEIGHT_AS_INT16 0x0002 #define MAP_HEIGHT_AS_INT16 0x0002
#define MAP_HEIGHT_AS_INT8 0x0004 #define MAP_HEIGHT_AS_INT8 0x0004
struct map_heightHeader{ struct map_heightHeader
{
uint32 fourcc; uint32 fourcc;
uint32 flags; uint32 flags;
float gridHeight; float gridHeight;
@ -104,8 +108,10 @@ struct map_heightHeader{
}; };
#define MAP_LIQUID_NO_TYPE 0x0001 #define MAP_LIQUID_NO_TYPE 0x0001
#define MAP_LIQUID_NO_HIGHT 0x0002 #define MAP_LIQUID_NO_HEIGHT 0x0002
struct map_liquidHeader{
struct map_liquidHeader
{
uint32 fourcc; uint32 fourcc;
uint16 flags; uint16 flags;
uint16 liquidType; uint16 liquidType;
@ -116,7 +122,8 @@ struct map_liquidHeader{
float liquidLevel; float liquidLevel;
}; };
enum ZLiquidStatus{ enum ZLiquidStatus
{
LIQUID_MAP_NO_WATER = 0x00000000, LIQUID_MAP_NO_WATER = 0x00000000,
LIQUID_MAP_ABOVE_WATER = 0x00000001, LIQUID_MAP_ABOVE_WATER = 0x00000001,
LIQUID_MAP_WATER_WALK = 0x00000002, LIQUID_MAP_WATER_WALK = 0x00000002,
@ -135,7 +142,8 @@ enum ZLiquidStatus{
#define MAP_LIQUID_TYPE_DARK_WATER 0x10 #define MAP_LIQUID_TYPE_DARK_WATER 0x10
#define MAP_LIQUID_TYPE_WMO_WATER 0x20 #define MAP_LIQUID_TYPE_WMO_WATER 0x20
struct LiquidData{ struct LiquidData
{
uint32 type; uint32 type;
float level; float level;
float depth_level; float depth_level;

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 "8271" #define REVISION_NR "8272"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

2
src/shared/vmap/VMapManager.cpp
View file

@ -444,7 +444,7 @@ namespace VMAP
//========================================================= //=========================================================
/** /**
get height or INVALID_HEIGHT if to hight was calculated get height or INVALID_HEIGHT if to height was calculated
*/ */
//int gGetHeightCounter = 0; //int gGetHeightCounter = 0;