added weapon and connected it to player

changed player

Code/GameLogic/Game.cpp

@@ -4,6 +4,7 @@ using namespace GameLogic;
 
 Game::Game(void)
 {
+
 }
 
 

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
+		int life;
-		//weapon
+		Weapon *weapon;
 	};
 
 }

Code/GameLogic/Weapon.cpp

@@ -0,0 +1,12 @@
+#include "Weapon.h"
+
+using namespace GameLogic;
+
+Weapon::Weapon(void)
+{
+}
+
+
+Weapon::~Weapon(void)
+{
+}

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