Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch

Code/GameLogic/DynamicObject.cpp

@@ -0,0 +1,11 @@
+#include "DynamicObject.h"
+
+
+DynamicObject::DynamicObject(void)
+{
+}
+
+
+DynamicObject::~DynamicObject(void)
+{
+}

Code/GameLogic/DynamicObject.h

@@ -0,0 +1,20 @@
+#ifndef DYNAMICOBJECT_H
+#define DYNAMICOBJECT_H
+
+#include "Object.h"
+
+namespace GameLogic
+{
+
+	class DynamicObject : public Object
+	{
+
+	public:
+		DynamicObject(void);
+		~DynamicObject(void);
+
+	};
+
+}
+
+#endif

Code/GameLogic/Game.cpp

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

Code/GameLogic/StaticObject.cpp

@@ -0,0 +1,11 @@
+#include "StaticObject.h"
+
+
+StaticObject::StaticObject(void)
+{
+}
+
+
+StaticObject::~StaticObject(void)
+{
+}

Code/GameLogic/StaticObject.h

@@ -0,0 +1,20 @@
+#ifndef STATICOBJECT_H
+#define STATICOBJECT_H
+
+#include "Object.h"
+
+namespace GameLogic
+{
+
+	class StaticObject : public Object
+	{
+	
+	public:
+		StaticObject(void);
+		~StaticObject(void);
+		
+	};
+
+}
+
+#endif

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

Code/GameLogic/WorldObject.cpp

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

Code/GameLogic/WorldObject.h

@@ -1,22 +0,0 @@
-#ifndef WORLDOBJECT_H
-#define WORLDOBJECT_H
-
-#include "Object.h"
-
-namespace GameLogic
-{
-
-	class WorldObject : public Object
-	{
-	
-	public:
-		WorldObject(void);
-		~WorldObject(void);
-
-	private:
-
-
-	};
-
-}
-#endif