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

fix

This commit is contained in:
Erik Persson 2013-11-28 08:41:20 +01:00
parent 899e833fca
commit b3ec2f3aa1
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Code/GameLogic/CollisionManager.cpp
View File

@ -18,7 +18,6 @@ void CollisionManager::ColisionEvent(Oyster::Physics::ICustomBody &obj1, Oyster:
Object *realObj1 = refManager->GetMap(obj1); Object *realObj1 = refManager->GetMap(obj1);
Object *realObj2 = refManager->GetMap(obj2); Object *realObj2 = refManager->GetMap(obj2);
switch(realObj1->GetType()) switch(realObj1->GetType())
{ {
case Object::OBJECT_TYPE_PLAYER: case Object::OBJECT_TYPE_PLAYER:
@ -28,8 +27,6 @@ void CollisionManager::ColisionEvent(Oyster::Physics::ICustomBody &obj1, Oyster:
PlayerVBox(*((Player*)realObj1),*((DynamicObject*)realObj2)); PlayerVBox(*((Player*)realObj1),*((DynamicObject*)realObj2));
} }
break; break;
case Object::OBJECT_TYPE_BOX: case Object::OBJECT_TYPE_BOX:

11
Code/GameLogic/Object.h
View File

@ -27,12 +27,7 @@ namespace GameLogic
OBJECT_TYPE_BOX, OBJECT_TYPE_BOX,
}; };
<<<<<<< HEAD
void Render();
void Update();
=======
Oyster::Graphics::Model::Model* Render(); Oyster::Graphics::Model::Model* Render();
>>>>>>> 01515a4d2d309cfebf4e3dab3ad68787f93050e1
OBJECT_TYPE GetType(); OBJECT_TYPE GetType();
@ -43,13 +38,9 @@ namespace GameLogic
//either a model pointer or an ID to an arraypos filled with models that are to be rendered //either a model pointer or an ID to an arraypos filled with models that are to be rendered
//rigidBody //rigidBody
<<<<<<< HEAD
Utility::DynamicMemory::UniquePointer<Oyster::Physics::ICustomBody> rigidBody; Utility::DynamicMemory::UniquePointer<Oyster::Physics::ICustomBody> rigidBody;
Utility::DynamicMemory::UniquePointer<Oyster::Graphics::Model::Model> model; Utility::DynamicMemory::UniquePointer<Oyster::Graphics::Model::Model> model;
=======
Oyster::Physics::ICustomBody* rigidBody;
Oyster::Graphics::Model::Model* model;
>>>>>>> 01515a4d2d309cfebf4e3dab3ad68787f93050e1
}; };
} }