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

GL - Player pushed by weapon

This commit is contained in:
Erik Persson 2014-02-27 13:40:51 +01:00
parent edd6169c44
commit 84a462de6c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Code/Game/GameLogic/CollisionManager.cpp
View File

@ -304,13 +304,19 @@ using namespace GameLogic;
Object *realObj = (Object*)obj->GetCustomTag(); Object *realObj = (Object*)obj->GetCustomTag();
if(realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_Player || realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_World) if(realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_World)
return; return;
if(realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_Player)
{
obj->ApplyImpulse(((forcePushData*)(args))->pushForce* 0.5);
((Player*)obj->GetCustomTag())->DamageLife(10);
}
else
{
obj->ApplyImpulse(((forcePushData*)(args))->pushForce);
}
obj->ApplyImpulse(((forcePushData*)(args))->pushForce);
DynamicObject *dynamicObj = dynamic_cast<DynamicObject*>(realObj); DynamicObject *dynamicObj = dynamic_cast<DynamicObject*>(realObj);