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

GL - fixed portal constructor

This commit is contained in:
Erik Persson 2014-02-14 11:04:01 +01:00
parent c5e4580ada
commit 8d8fa78da0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Code/Game/GameLogic/Portal.cpp
View File

@ -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) Portal::Portal(Oyster::Physics::ICustomBody *rigidBody, ObjectSpecialType type,int objectID ,Oyster::Math::Float3 portalExit)
:StaticObject(rigidBody, EventOnCollision, type, objectID) :StaticObject(rigidBody, Portal::PortalActivated, type, objectID)
{ {
this->portalExit = portalExit; this->portalExit = portalExit;
} }

1
Code/Game/GameLogic/Portal.h
View File

@ -9,7 +9,6 @@ namespace GameLogic
Portal(void); Portal(void);
Portal(Oyster::Physics::ICustomBody *rigidBody 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); ,ObjectSpecialType type,int objectID ,Oyster::Math::Float3 portalExit);
~Portal(void); ~Portal(void);