From 84a462de6c1905121a99aacd210bdd68aedb5c19 Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Thu, 27 Feb 2014 13:40:51 +0100 Subject: [PATCH] GL - Player pushed by weapon --- Code/Game/GameLogic/CollisionManager.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Code/Game/GameLogic/CollisionManager.cpp b/Code/Game/GameLogic/CollisionManager.cpp index 928ddaac..acdf030c 100644 --- a/Code/Game/GameLogic/CollisionManager.cpp +++ b/Code/Game/GameLogic/CollisionManager.cpp @@ -304,13 +304,19 @@ using namespace GameLogic; Object *realObj = (Object*)obj->GetCustomTag(); - if(realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_Player || realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_World) + if(realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_World) 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(realObj);