aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Models/ModelInstance.h
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-08-30 23:06:19 +0100
committerNay <dnpd.dd@gmail.com>2012-08-30 23:06:19 +0100
commitd61f3131fb3b149c5c075dee5507cbed29927a80 (patch)
tree9ef1d57bbcdcf9ab8f255f7349036f3ef5fb50ff /src/server/collision/Models/ModelInstance.h
parent872c239dbe0a0a289ed72b3204986df2a612f546 (diff)
parente3d9768a50a3b2b700d65e0cc96e697a5c9d22dc (diff)
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Server/Protocol/Opcodes.h src/server/scripts/EasternKingdoms/silverpine_forest.cpp src/server/scripts/Kalimdor/silithus.cpp src/server/shared/DataStores/DBCFileLoader.h src/server/shared/Database/Implementation/WorldDatabase.cpp src/tools/map_extractor/System.cpp src/tools/map_extractor/dbcfile.cpp src/tools/vmap4_extractor/adtfile.cpp src/tools/vmap4_extractor/dbcfile.cpp src/tools/vmap4_extractor/wdtfile.cpp
Diffstat (limited to 'src/server/collision/Models/ModelInstance.h')
-rwxr-xr-xsrc/server/collision/Models/ModelInstance.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h
index 1118b654578..2745628ac7e 100755
--- a/src/server/collision/Models/ModelInstance.h
+++ b/src/server/collision/Models/ModelInstance.h
@@ -63,7 +63,7 @@ namespace VMAP
class ModelInstance: public ModelSpawn
{
public:
- ModelInstance(): iModel(0) {}
+ ModelInstance(): iModel(0), iInvScale(0.0f) {}
ModelInstance(const ModelSpawn &spawn, WorldModel* model);
void setUnloaded() { iModel = 0; }
bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const;