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

GL - player inherits dynamicobject instead of object

This commit is contained in:
Erik Persson 2014-01-20 08:40:41 +01:00
parent eaf0ae1479
commit ce4c57bab3
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Code/Game/GameLogic/Level.cpp
View File

@ -21,13 +21,13 @@ struct Level::PrivateData
{ {
} }
SmartPointer<TeamManager> teamManager; //SmartPointer<TeamManager> teamManager;
DynamicArray<SmartPointer<StaticObject>> staticObjects; //DynamicArray<SmartPointer<StaticObject>> staticObjects;
DynamicArray<SmartPointer<DynamicObject>> dynamicObjects; //DynamicArray<SmartPointer<DynamicObject>> dynamicObjects;
SmartPointer<GameMode> gameMode; //SmartPointer<GameMode> gameMode;
SmartPointer<ICustomBody> rigidBodyLevel; SmartPointer<ICustomBody> rigidBodyLevel;
@ -72,17 +72,17 @@ void Level::InitiateLevel(float radius)
void Level::AddPlayerToTeam(Player *player, int teamID) void Level::AddPlayerToTeam(Player *player, int teamID)
{ {
myData->teamManager->AddPlayerToTeam(player,teamID); //myData->teamManager->AddPlayerToTeam(player,teamID);
} }
void Level::CreateTeam(int teamSize) void Level::CreateTeam(int teamSize)
{ {
myData->teamManager->CreateTeam(teamSize); //myData->teamManager->CreateTeam(teamSize);
} }
void Level::RespawnPlayer(Player *player) void Level::RespawnPlayer(Player *player)
{ {
myData->teamManager->RespawnPlayerRandom(player); //myData->teamManager->RespawnPlayerRandom(player);
} }

2
Code/Game/GameLogic/Player.cpp
View File

@ -6,7 +6,7 @@ using namespace GameLogic;
using namespace Oyster::Physics; using namespace Oyster::Physics;
Player::Player() Player::Player()
:Object(CollisionManager::PlayerCollision, OBJECT_TYPE::OBJECT_TYPE_PLAYER) :DynamicObject(CollisionManager::PlayerCollision, OBJECT_TYPE::OBJECT_TYPE_PLAYER)
{ {
weapon = new Weapon(); weapon = new Weapon();

5
Code/Game/GameLogic/Player.h
View File

@ -6,7 +6,7 @@
#include "GameLogicStates.h" #include "GameLogicStates.h"
#include "OysterMath.h" #include "OysterMath.h"
#include "Object.h" #include "DynamicObject.h"
#include "OysterMath.h" #include "OysterMath.h"
#include "CollisionManager.h" #include "CollisionManager.h"
@ -15,9 +15,8 @@
namespace GameLogic namespace GameLogic
{ {
class Weapon; class Weapon;
class Player : public Object class Player : public DynamicObject
{ {
public: public:
Player(void); Player(void);
~Player(void); ~Player(void);