diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
| commit | b1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch) | |
| tree | 468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/collision/Models/ModelInstance.h | |
| parent | f237a57f51c0473bda90bae7a06bd5b9c187754b (diff) | |
| parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/collision/Models/ModelInstance.h')
| -rwxr-xr-x | src/server/collision/Models/ModelInstance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h index 2abd83ba377..92591a91b93 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), iInvScale(0.0f) {} + ModelInstance(): iInvScale(0.0f), iModel(0) {} ModelInstance(const ModelSpawn &spawn, WorldModel* model); void setUnloaded() { iModel = 0; } bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const; |