diff --git a/Code/Game/GameLogic/Portal.cpp b/Code/Game/GameLogic/Portal.cpp index 1edd1717..61229256 100644 --- a/Code/Game/GameLogic/Portal.cpp +++ b/Code/Game/GameLogic/Portal.cpp @@ -10,8 +10,8 @@ Portal::Portal(void) } -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) +Portal::Portal(Oyster::Physics::ICustomBody *rigidBody, ObjectSpecialType type,int objectID ,Oyster::Math::Float3 portalExit) + :StaticObject(rigidBody, Portal::PortalActivated, type, objectID) { this->portalExit = portalExit; } diff --git a/Code/Game/GameLogic/Portal.h b/Code/Game/GameLogic/Portal.h index ab88d934..0f228c21 100644 --- a/Code/Game/GameLogic/Portal.h +++ b/Code/Game/GameLogic/Portal.h @@ -8,8 +8,7 @@ namespace GameLogic public: Portal(void); - Portal(Oyster::Physics::ICustomBody *rigidBody - ,void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss) + Portal(Oyster::Physics::ICustomBody *rigidBody ,ObjectSpecialType type,int objectID ,Oyster::Math::Float3 portalExit); ~Portal(void);