From fd652537cbf2280d7924eb9e286cc193e7bf7995 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Tue, 22 Jan 2019 11:16:54 +0000
Subject: [PATCH] Optimize fire code, remove un-needed setprop in
 ground_services

---
 Nasal/fire.nas            | 43 +++++++++++++++++++++------------------
 Nasal/ground_services.nas |  3 ---
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Nasal/fire.nas b/Nasal/fire.nas
index 324cbf90..d888ff3a 100644
--- a/Nasal/fire.nas
+++ b/Nasal/fire.nas
@@ -81,24 +81,6 @@ var master_fire = func {
 	dcbat = getprop("/systems/electrical/bus/dcbat");
 	pause = getprop("/sim/freeze/master");
 	
-	###################
-	# Detection Logic #
-	###################
-	
-	if (fwddet) {
-		setprop("/controls/fire/cargo/fwdsmokeLight", 1);
-		setprop("/controls/fire/cargo/warnfwd", 1);
-	} else {
-		setprop("/controls/fire/cargo/fwdsmokeLight", 0);
-	}
-	
-	if (aftdet) {
-		setprop("/controls/fire/cargo/aftsmokeLight", 1);
-		setprop("/controls/fire/cargo/warnaft", 1);
-	} else {
-		setprop("/controls/fire/cargo/aftsmokeLight", 0);
-	}
-	
 	###############
 	# Discharging #
 	###############
@@ -192,6 +174,28 @@ var master_fire = func {
 	
 }
 
+###################
+# Detection Logic #
+###################
+
+setlistener("/systems/failures/cargo-fwd-fire", func() {
+	if (getprop("/systems/failures/cargo-fwd-fire")) {
+		setprop("/controls/fire/cargo/fwdsmokeLight", 1);
+		setprop("/controls/fire/cargo/warnfwd", 1);
+	} else {
+		setprop("/controls/fire/cargo/fwdsmokeLight", 0);
+	}
+}, 0, );
+
+setlistener("/systems/failures/cargo-aft-fire", func() {
+	if (getprop("/systems/failures/cargo-aft-fire")) {
+		setprop("/controls/fire/cargo/aftsmokeLight", 1);
+		setprop("/controls/fire/cargo/warnaft", 1);
+	} else {
+		setprop("/controls/fire/cargo/aftsmokeLight", 0);
+	}
+}, 0, );
+
 ###################
 # Update Function #
 ###################
@@ -200,5 +204,4 @@ var update_fire = func {
 	master_fire();
 }
 
-var fire_timer = maketimer(0.2, update_fire);
-
+var fire_timer = maketimer(0.2, update_fire);
\ No newline at end of file
diff --git a/Nasal/ground_services.nas b/Nasal/ground_services.nas
index 52721e2e..3a2751e6 100644
--- a/Nasal/ground_services.nas
+++ b/Nasal/ground_services.nas
@@ -62,9 +62,6 @@ var ground_services = {
 			if (me.ice_time == 900) {
 				ground_message("De-icing Completed!", 1, 1, 1);
 				setprop("/services/deicing_truck/de-ice", 0);
-				setprop("/controls/ice/wing/temp", 30);
-				setprop("/controls/ice/wing/eng1", 30);
-				setprop("/controls/ice/wing/eng2", 30);
 			}
 		
 		} else {