aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.h
diff options
context:
space:
mode:
authorSpp- <u84280@epreinf21.(none)>2011-07-27 11:00:39 +0200
committerSpp- <u84280@epreinf21.(none)>2011-07-27 11:00:39 +0200
commitfa50c0a4646fd87da807130a043db2d89c022ccb (patch)
tree922e4e90a5adcf67e7b2e9194f588b0a01ecdbe3 /src/server/game/Maps/Map.h
parent39be30a39f1a04d0d432ff74952110a44ef6abf6 (diff)
Fix some warnings here and there
Diffstat (limited to 'src/server/game/Maps/Map.h')
-rwxr-xr-xsrc/server/game/Maps/Map.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 4ce4f3ea357..63cb10a8f89 100755
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -63,12 +63,6 @@ struct ScriptAction
// ******************************************
// Map file format defines
// ******************************************
-#define MAP_MAGIC 'SPAM'
-#define MAP_VERSION_MAGIC '1.1v'
-#define MAP_AREA_MAGIC 'AERA'
-#define MAP_HEIGHT_MAGIC 'TGHM'
-#define MAP_LIQUID_MAGIC 'QILM'
-
struct map_fileheader
{
uint32 mapMagic;
@@ -201,7 +195,7 @@ public:
struct CreatureMover
{
- CreatureMover() : x(0), y(0), z(0), ang(0) {}
+ CreatureMover() : x(0.0f), y(0.0f), z(0.0f), ang(0.0f) {}
CreatureMover(float _x, float _y, float _z, float _ang) : x(_x), y(_y), z(_z), ang(_ang) {}
float x, y, z, ang;
@@ -625,16 +619,6 @@ class BattlegroundMap : public Map
Battleground* m_bg;
};
-/*inline
-uint64
-Map::CalculateGridMask(const uint32 &y) const
-{
- uint64 mask = 1;
- mask <<= y;
- return mask;
-}
-*/
-
template<class T, class CONTAINER>
inline void
Map::Visit(const Cell& cell, TypeContainerVisitor<T, CONTAINER> &visitor)