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

compilation fix

This commit is contained in:
Dander7BD 2014-02-14 10:11:39 +01:00
parent 14661a86f8
commit 5eec9fdd75
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}