diff --git a/Code/GameLogic/Game.cpp b/Code/GameLogic/Game.cpp index 805e25b9..c74958dd 100644 --- a/Code/GameLogic/Game.cpp +++ b/Code/GameLogic/Game.cpp @@ -4,6 +4,7 @@ using namespace GameLogic; Game::Game(void) { + } diff --git a/Code/GameLogic/Player.h b/Code/GameLogic/Player.h index 1b53740b..eca9d65b 100644 --- a/Code/GameLogic/Player.h +++ b/Code/GameLogic/Player.h @@ -2,6 +2,7 @@ #define PLAYER_H #include "Object.h" +#include "Weapon.h" namespace GameLogic { @@ -19,8 +20,8 @@ namespace GameLogic void Shoot(); private: - //Life - //weapon + int life; + Weapon *weapon; }; } diff --git a/Code/GameLogic/Weapon.cpp b/Code/GameLogic/Weapon.cpp new file mode 100644 index 00000000..2cbd4e71 --- /dev/null +++ b/Code/GameLogic/Weapon.cpp @@ -0,0 +1,12 @@ +#include "Weapon.h" + +using namespace GameLogic; + +Weapon::Weapon(void) +{ +} + + +Weapon::~Weapon(void) +{ +} diff --git a/Code/GameLogic/Weapon.h b/Code/GameLogic/Weapon.h new file mode 100644 index 00000000..72a335d4 --- /dev/null +++ b/Code/GameLogic/Weapon.h @@ -0,0 +1,21 @@ +#ifndef WEAPON_H +#define WEAPON_H + +#include "Object.h" + +namespace GameLogic +{ + + class Weapon : public Object + { + + public: + Weapon(void); + ~Weapon(void); + + private: + + }; + +} +#endif \ No newline at end of file