From 119a09b784ad3f3c6bfd327f32164cb099f47f10 Mon Sep 17 00:00:00 2001
From: orwell96 <orwell@bleipb.de>
Date: Thu, 30 Jan 2020 08:45:16 +0100
Subject: Simplify Signal Aspect Table (H#132) [breaks compatibility with
 signal API]

---
 advtrains_interlocking/demosignals.lua | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

(limited to 'advtrains_interlocking/demosignals.lua')

diff --git a/advtrains_interlocking/demosignals.lua b/advtrains_interlocking/demosignals.lua
index ab7a8b6..d5e1065 100644
--- a/advtrains_interlocking/demosignals.lua
+++ b/advtrains_interlocking/demosignals.lua
@@ -6,10 +6,10 @@
 
 
 local setaspect = function(pos, node, asp)
-	if not asp.main.free then
+	if asp.main == 0 then
 		advtrains.ndb.swap_node(pos, {name="advtrains_interlocking:ds_danger"})
 	else
-		if asp.dst.free and asp.main.speed == -1 then
+		if asp.dst != 0 and asp.main == -1 then
 			advtrains.ndb.swap_node(pos, {name="advtrains_interlocking:ds_free"})
 		else
 			advtrains.ndb.swap_node(pos, {name="advtrains_interlocking:ds_slow"})
@@ -22,18 +22,10 @@ local setaspect = function(pos, node, asp)
 end
 
 local suppasp = {
-		main = {
-			free = nil,
-			speed = {6, -1},
-		},
-		dst = {
-			free = nil,
-			speed = nil,
-		},
-		shunt = {
-			free = false,
-			proceed_as_main = true,
-		},
+		main = {0, 6, -1},
+		dst = {0, false},
+		shunt = false,
+		proceed_as_main = true,
 		info = {
 			call_on = false,
 			dead_end = false,
@@ -74,10 +66,7 @@ minetest.register_node("advtrains_interlocking:ds_free", {
 		supported_aspects = suppasp,
 		get_aspect = function(pos, node)
 			return {
-				main = {
-					free = true,
-					speed = -1,
-				}
+				main = -1,
 			}
 		end,
 	},
@@ -98,10 +87,7 @@ minetest.register_node("advtrains_interlocking:ds_slow", {
 		supported_aspects = suppasp,
 		get_aspect = function(pos, node)
 			return {
-				main = {
-					free = true,
-					speed = 6,
-				}
+				main = 6,
 			}
 		end,
 	},
-- 
cgit v1.2.3