Merge branch 'developer' into musicInclude

# Conflicts: # Enemy.cpp # World.cpp
2016-06-21 19:06:50 +02:00
parent 41a81d104e 0a0fdfc8b1
commit b09311d810
32 changed files with 4771 additions and 50 deletions
@@ -18,6 +18,7 @@ Enemy::Enemy(const std::string &fileName,
 	target = position;
 	speed = 1;
 	radius = 10;
+	xp = 10;
 	hasTarget = false;
 	hit_sound_id = CrystalPoint::GetSoundSystem().LoadSound(fileMusic.c_str(), false);
 	music = CrystalPoint::GetSoundSystem().GetSound(hit_sound_id);