diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
| commit | 81c99b333826d6055932aef8a93c128cadb806ba (patch) | |
| tree | f684897696c25d64e10901f54f21b45cd16870a3 /src/server/collision | |
| parent | 40a29a3c99412b18b96341cefefb76bd9407531a (diff) | |
| parent | e25416ee2346fd361d47ef6873814b67d7086ea0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/dbcfile.h
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/adtfile.h
src/tools/vmap4_extractor/loadlib/loadlib.h
Diffstat (limited to 'src/server/collision')
| -rw-r--r-- | src/server/collision/Maps/MapTree.h | 4 | ||||
| -rw-r--r-- | src/server/collision/Models/WorldModel.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index 90d61cbb88b..62fa3c97987 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/src/server/collision/Maps/MapTree.h @@ -81,6 +81,10 @@ namespace VMAP bool isTiled() const { return iIsTiled; } uint32 numLoadedTiles() const { return iLoadedTiles.size(); } void getModelInstances(ModelInstance* &models, uint32 &count); + + private: + StaticMapTree(StaticMapTree const& right) DELETE_MEMBER; + StaticMapTree& operator=(StaticMapTree const& right) DELETE_MEMBER; }; struct AreaInfo diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h index 8778998a6b7..da1f58a79c6 100644 --- a/src/server/collision/Models/WorldModel.h +++ b/src/server/collision/Models/WorldModel.h @@ -59,7 +59,7 @@ namespace VMAP bool writeToFile(FILE* wf); static bool readFromFile(FILE* rf, WmoLiquid* &liquid); private: - WmoLiquid(): iTilesX(0), iTilesY(0), iType(0), iHeight(0), iFlags(0) { } + WmoLiquid() : iTilesX(0), iTilesY(0), iCorner(), iType(0), iHeight(NULL), iFlags(NULL) { } uint32 iTilesX; //!< number of tiles in x direction, each uint32 iTilesY; G3D::Vector3 iCorner; //!< the lower corner @@ -74,10 +74,10 @@ namespace VMAP class GroupModel { public: - GroupModel(): iMogpFlags(0), iGroupWMOID(0), iLiquid(0) { } + GroupModel() : iBound(), iMogpFlags(0), iGroupWMOID(0), iLiquid(NULL) { } GroupModel(const GroupModel &other); GroupModel(uint32 mogpFlags, uint32 groupWMOID, const G3D::AABox &bound): - iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(0) { } + iBound(bound), iMogpFlags(mogpFlags), iGroupWMOID(groupWMOID), iLiquid(NULL) { } ~GroupModel() { delete iLiquid; } //! pass mesh data to object and create BIH. Passed vectors get get swapped with old geometry! |