Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision

2016-06-21 17:01:08 +02:00
parent 4249e35653 ec900f7410
commit 02a537dc60
6 changed files with 63 additions and 3 deletions
@@ -8,7 +8,7 @@
 class Enemy : public Entity
 {
 public:
-	Enemy(const std::string &fileName, const std::string &fileMusic, const Vec3f &position, const Vec3f &rotation, const float &scale);
+	Enemy(const std::string &fileName, const std::string &fileMusic, float damage, float health, const Vec3f &position, const Vec3f &rotation, const float &scale);
 	~Enemy();

 	Sound* music;
@@ -16,6 +16,8 @@ public:
 	bool hasTarget;
 	Vec3f target;
 	float speed,radius;
+	float health;
+	float damage;
 	int xp;
 	bool attack;