From b3ec2f3aa1a2e3163312d0ef9cfebf09c85bf8c4 Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Thu, 28 Nov 2013 08:41:20 +0100 Subject: [PATCH] fix --- Code/GameLogic/CollisionManager.cpp | 3 --- Code/GameLogic/Object.h | 11 +---------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Code/GameLogic/CollisionManager.cpp b/Code/GameLogic/CollisionManager.cpp index cc5b75e2..7e0ad977 100644 --- a/Code/GameLogic/CollisionManager.cpp +++ b/Code/GameLogic/CollisionManager.cpp @@ -18,7 +18,6 @@ void CollisionManager::ColisionEvent(Oyster::Physics::ICustomBody &obj1, Oyster: Object *realObj1 = refManager->GetMap(obj1); Object *realObj2 = refManager->GetMap(obj2); - switch(realObj1->GetType()) { case Object::OBJECT_TYPE_PLAYER: @@ -28,8 +27,6 @@ void CollisionManager::ColisionEvent(Oyster::Physics::ICustomBody &obj1, Oyster: PlayerVBox(*((Player*)realObj1),*((DynamicObject*)realObj2)); } - - break; case Object::OBJECT_TYPE_BOX: diff --git a/Code/GameLogic/Object.h b/Code/GameLogic/Object.h index 60c06a00..61b58a5e 100644 --- a/Code/GameLogic/Object.h +++ b/Code/GameLogic/Object.h @@ -27,12 +27,7 @@ namespace GameLogic OBJECT_TYPE_BOX, }; -<<<<<<< HEAD - void Render(); - void Update(); -======= Oyster::Graphics::Model::Model* Render(); ->>>>>>> 01515a4d2d309cfebf4e3dab3ad68787f93050e1 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 //rigidBody -<<<<<<< HEAD Utility::DynamicMemory::UniquePointer rigidBody; Utility::DynamicMemory::UniquePointer model; -======= - Oyster::Physics::ICustomBody* rigidBody; - Oyster::Graphics::Model::Model* model; ->>>>>>> 01515a4d2d309cfebf4e3dab3ad68787f93050e1 + }; }