From 41a81d104ef5fa4ed6db84c63a78bfe9a1626ef9 Mon Sep 17 00:00:00 2001 From: Aaldert Date: Tue, 21 Jun 2016 18:23:57 +0200 Subject: [PATCH] Enemy stops geluid als gedood --- Enemy.cpp | 3 +-- worlds/rock.json | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Enemy.cpp b/Enemy.cpp index f747679..af1bb5c 100644 --- a/Enemy.cpp +++ b/Enemy.cpp @@ -27,6 +27,7 @@ Enemy::Enemy(const std::string &fileName, Enemy::~Enemy() { + music->Stop(); CrystalPoint::GetSoundSystem().UnloadSound(hit_sound_id); if (model) Model::unload(model); @@ -106,8 +107,6 @@ void Enemy::update(float delta) { attack = true; } - rotation.y = atan2f(dx, dz) * 180 / M_PI; } - } \ No newline at end of file diff --git a/worlds/rock.json b/worlds/rock.json index c027630..d6d186e 100644 --- a/worlds/rock.json +++ b/worlds/rock.json @@ -92,10 +92,10 @@ }, "enemies": [ { - "file": "models/squid/Blooper.obj", - "pos": [ 20, 5, 10 ], - "scale": 0.01, - "music": "WAVE/ghostEnemy.wav" + "file": "models/squid/Blooper.obj", + "pos": [ 30, 10, 10 ], + "scale": 0.01, + "music": "WAVE/ghostEnemy.wav" }], "crystal": { "full texture": "models/crystal/Crystal.obj",