From eaf0ae1479dd34edbdab1c9724ca39224fc465c7 Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Fri, 17 Jan 2014 08:52:34 +0100 Subject: [PATCH] GL - can now compile --- Code/Game/GameLogic/CollisionManager.cpp | 2 +- Code/Game/GameLogic/Game.cpp | 2 +- Code/Game/GameLogic/Game.h | 1 + Code/Game/GameLogic/GameLogic.vcxproj | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Code/Game/GameLogic/CollisionManager.cpp b/Code/Game/GameLogic/CollisionManager.cpp index a16d63fe..4cdb3689 100644 --- a/Code/Game/GameLogic/CollisionManager.cpp +++ b/Code/Game/GameLogic/CollisionManager.cpp @@ -56,7 +56,7 @@ using namespace GameLogic; return Physics::ICustomBody::SubscriptMessage_none; } - Oyster::Physics::ICustomBody::SubscriptMessage LevelCollision(const Oyster::Physics::ICustomBody *rigidBodyLevel, const Oyster::Physics::ICustomBody *obj) + Oyster::Physics::ICustomBody::SubscriptMessage CollisionManager::LevelCollision(const Oyster::Physics::ICustomBody *rigidBodyLevel, const Oyster::Physics::ICustomBody *obj) { return Physics::ICustomBody::SubscriptMessage_ignore_collision_response; } diff --git a/Code/Game/GameLogic/Game.cpp b/Code/Game/GameLogic/Game.cpp index d102aa16..af1e9d8c 100644 --- a/Code/Game/GameLogic/Game.cpp +++ b/Code/Game/GameLogic/Game.cpp @@ -55,7 +55,7 @@ struct Game::PrivateData } DynamicArray players; - SmartPointer level; + LevelData* level; Utility::WinTimer timer; }myData; diff --git a/Code/Game/GameLogic/Game.h b/Code/Game/GameLogic/Game.h index 0cd9b2a8..1550001d 100644 --- a/Code/Game/GameLogic/Game.h +++ b/Code/Game/GameLogic/Game.h @@ -12,6 +12,7 @@ namespace GameLogic { class Player; + class Level; class DANBIAS_GAMELOGIC_DLL Game { diff --git a/Code/Game/GameLogic/GameLogic.vcxproj b/Code/Game/GameLogic/GameLogic.vcxproj index f4e65b40..3c5ae258 100644 --- a/Code/Game/GameLogic/GameLogic.vcxproj +++ b/Code/Game/GameLogic/GameLogic.vcxproj @@ -193,6 +193,7 @@ +