Fix RWT initialization when creating new world (H#142)

2 files changed, 9 insertions, 1 deletions

diff --git a/advtrains_line_automation/railwaytime.lua b/advtrains_line_automation/railwaytime.lua
index 3a044b6..258009e 100644
--- a/advtrains_line_automation/railwaytime.lua
+++ b/advtrains_line_automation/railwaytime.lua
@@ -39,6 +39,7 @@ local rwt = {}
 
 --Time Stamp (Seconds since start of world)
 local e_time = 0
+local e_has_loaded = false
 
 local setting_rwt_real = minetest.settings:get("advtrains_lines_rwt_realtime")
 if setting_rwt_real=="" then
@@ -71,6 +72,8 @@ function rwt.set_time(t)
 	end
 	atlog("[lines][rwt] Initialized railway time: ",rwt.to_string(e_time))
 	e_last_epoch = os.time()
+	
+	e_has_loaded = true
 end
 
 function rwt.get_time()
@@ -78,6 +81,10 @@ function rwt.get_time()
 end
 
 function rwt.step(dt)
+	if not e_has_loaded then
+		rwt.set_time(0)
+	end
+
 	if setting_rwt_real=="independent" then
 		-- Regular stepping with dtime
 		e_time = e_time + dt		
diff --git a/advtrains_luaautomation/init.lua b/advtrains_luaautomation/init.lua
index 75cf30a..573a553 100644
--- a/advtrains_luaautomation/init.lua
+++ b/advtrains_luaautomation/init.lua
@@ -44,7 +44,8 @@ local filename=minetest.get_worldpath().."/advtrains_luaautomation"
 function atlatc.load()
 	local file, err = io.open(filename, "r")
 	if not file then
-		minetest.log("error", " Failed to read advtrains_luaautomation save data from file "..filename..": "..(err or "Unknown Error"))
+		minetest.log("warning", " Failed to read advtrains_luaautomation save data from file "..filename..": "..(err or "Unknown Error"))
+		minetest.log("warning", " (this is normal when first enabling advtrains on this world)")
 	else
 		atprint("luaautomation reading file:",filename)
 		local tbl = minetest.deserialize(file:read("*a"))