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

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

View file

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