Merge pull request #125 from lonkaars/niels/game

missile alerts

1 files changed, 13 insertions, 8 deletions

diff --git a/game/missile/MissileScript.cpp b/game/missile/MissileScript.cpp
index 6d0e40e..bcc4f5b 100644
--- a/game/missile/MissileScript.cpp
+++ b/game/missile/MissileScript.cpp
@@ -1,18 +1,19 @@
 #include "MissileScript.h"
 #include "../Config.h"
-#include "api/BehaviorScript.h"
+#include <cmath>
 
+#include <crepe/api/AI.h>
 #include <crepe/api/Animator.h>
 #include <crepe/api/AudioSource.h>
+#include <crepe/api/BehaviorScript.h>
+#include <crepe/api/CircleCollider.h>
+#include <crepe/api/KeyCodes.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Sprite.h>
 #include <crepe/api/Transform.h>
 #include <crepe/system/CollisionSystem.h>
 #include <crepe/types.h>
 
-#include <cmath>
-#include <crepe/api/AI.h>
-#include <crepe/api/KeyCodes.h>
-#include <crepe/api/Sprite.h>
-
 using namespace std;
 using namespace crepe;
 
@@ -25,8 +26,9 @@ void MissileScript::init() {
 void MissileScript::kill_missile() {
 	auto animations = this->get_components<Animator>();
 	auto sprites = this->get_components<Sprite>();
+	auto collider = this->get_component<CircleCollider>();
 	auto & fly_sound = this->get_components<AudioSource>().front().get();
-	auto & this_script = this->get_components<BehaviorScript>().back().get();
+	auto & this_script = this->get_components<BehaviorScript>().front().get();
 
 	animations[0].get().active = false;
 	animations[1].get().active = false;
@@ -34,7 +36,7 @@ void MissileScript::kill_missile() {
 	sprites[0].get().active = false;
 	sprites[1].get().active = false;
 	sprites[2].get().active = true;
-
+	collider.active = false;
 	this_script.active = false;
 	this->seeking_disabled = false;
 
@@ -47,9 +49,12 @@ void MissileScript::activate() {
 	anim[0].get().active = true;
 	anim[1].get().active = true;
 	anim[2].get().stop();
+	//anim[3].get().active = true;
+
 	sprites[0].get().active = true;
 	sprites[1].get().active = true;
 	sprites[2].get().active = false;
+	//sprites[3].get().active = true;
 }
 
 bool MissileScript::on_collision(const CollisionEvent & ev) {