NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GameLogic' into GameClient

This commit is contained in:
lindaandersson 2014-02-20 11:59:44 +01:00
parent 1079b20e15 4150ba0fc3
commit 50fc2fcc29
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Game/GameLogic/Object.cpp
View File

@ -30,6 +30,7 @@ Object::Object(Oyster::Physics::ICustomBody *rigidBody, void (*collisionFuncAfte
this->objectID = objectID; this->objectID = objectID;
this->extraDamageOnCollision = 0; this->extraDamageOnCollision = 0;
this->rigidBody->SetCustomTag(this); this->rigidBody->SetCustomTag(this);
this->scale = Float3(1.0f, 1.0f, 1.0f);
} }
@ -41,6 +42,7 @@ Object::Object(Oyster::Physics::ICustomBody *rigidBody , Oyster::Physics::ICusto
this->objectID = objectID; this->objectID = objectID;
this->extraDamageOnCollision = 0; this->extraDamageOnCollision = 0;
this->rigidBody->SetCustomTag(this); this->rigidBody->SetCustomTag(this);
this->scale = Float3(1.0f, 1.0f, 1.0f);
} }
Object::~Object(void) Object::~Object(void)