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

GameLogic - Merge with sprint2.5

This commit is contained in:
Dennis Andersen 2014-01-20 16:17:01 +01:00
parent 7cdfa726ea a1128986d5
commit 386b27e2f7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,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,15 +6,14 @@
#include "GameLogicStates.h" #include "GameLogicStates.h"
#include "OysterMath.h" #include "OysterMath.h"
#include "Object.h" #include "DynamicObject.h"
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);