From 5eec9fdd758d195660c6795f7e68dd5d8aa7a34f Mon Sep 17 00:00:00 2001 From: Dander7BD Date: Fri, 14 Feb 2014 10:11:39 +0100 Subject: [PATCH] compilation fix --- Code/Game/GameLogic/Portal.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Code/Game/GameLogic/Portal.cpp b/Code/Game/GameLogic/Portal.cpp index 66671a8d..55ca7c90 100644 --- a/Code/Game/GameLogic/Portal.cpp +++ b/Code/Game/GameLogic/Portal.cpp @@ -9,13 +9,8 @@ Portal::Portal(void) this->portalExit = Float3(0,0,0); } -<<<<<<< HEAD -Portal::Portal(Oyster::Physics::ICustomBody *rigidBody, void (*collisionFuncAfter)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type, Oyster::Math::Float3 portalExit) - :StaticObject(rigidBody, collisionFuncAfter, type) -======= Portal::Portal(Oyster::Physics::ICustomBody *rigidBody, void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type,int objectID ,Oyster::Math::Float3 portalExit) :StaticObject(rigidBody, EventOnCollision, type, objectID) ->>>>>>> GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction { this->portalExit = portalExit; }