From 872b0e61fd876377e4712852bc6b1480b9a8be59 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 30 May 2017 23:43:14 -0500 Subject: [PATCH] rej cleanup, etc. --- code/controllers/subsystem/mapping.dm | 4 +++- code/controllers/subsystem/mapping.dm.rej | 13 ------------- code/controllers/subsystem/ticker.dm | 2 ++ code/controllers/subsystem/ticker.dm.rej | 10 ---------- code/controllers/subsystem/vote.dm.rej | 10 ---------- code/world.dm | 1 - code/world.dm.rej | 10 ---------- 7 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 code/controllers/subsystem/mapping.dm.rej delete mode 100644 code/controllers/subsystem/ticker.dm.rej delete mode 100644 code/controllers/subsystem/vote.dm.rej delete mode 100644 code/world.dm.rej diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 6dde8e6b2d..9c2f3d2845 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -119,7 +119,9 @@ SUBSYSTEM_DEF(mapping) INIT_ANNOUNCE("Loading [config.map_name]...") TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION) INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!") - SSblackbox.add_details("map_name", config.map_name) + if(SSdbcore.Connect()) + var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]") + query_round_map_name.Execute() if(config.minetype != "lavaland") INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!") diff --git a/code/controllers/subsystem/mapping.dm.rej b/code/controllers/subsystem/mapping.dm.rej deleted file mode 100644 index d519f200c7..0000000000 --- a/code/controllers/subsystem/mapping.dm.rej +++ /dev/null @@ -1,13 +0,0 @@ -diff a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm (rejected hunks) -@@ -119,8 +119,9 @@ SUBSYSTEM_DEF(mapping) - INIT_ANNOUNCE("Loading [config.map_name]...") - TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION) - INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!") -- var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]") -- query_round_map_name.Execute() -+ if(SSdbcore.Connect()) -+ var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]") -+ query_round_map_name.Execute() - - if(config.minetype != "lavaland") - INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!") diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 686f50200a..6340c9c9d0 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -60,6 +60,8 @@ SUBSYSTEM_DEF(ticker) var/round_start_time = 0 var/list/round_start_events + var/mode_result = "undefined" + var/end_state = "undefined" var/modevoted = FALSE //Have we sent a vote for the gamemode? diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej deleted file mode 100644 index 2253e2573e..0000000000 --- a/code/controllers/subsystem/ticker.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) -@@ -60,6 +60,8 @@ SUBSYSTEM_DEF(ticker) - - var/round_start_time = 0 - var/list/round_start_events -+ var/mode_result = "undefined" -+ var/end_state = "undefined" - - /datum/controller/subsystem/ticker/Initialize(timeofday) - load_mode() diff --git a/code/controllers/subsystem/vote.dm.rej b/code/controllers/subsystem/vote.dm.rej deleted file mode 100644 index 8a7e0bf9d4..0000000000 --- a/code/controllers/subsystem/vote.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm (rejected hunks) -@@ -3,7 +3,7 @@ SUBSYSTEM_DEF(vote) - wait = 10 - - flags = SS_KEEP_TIMING|SS_NO_INIT -- -+ - runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT - - var/initiator = null diff --git a/code/world.dm b/code/world.dm index bb26507045..3196d7d1c4 100644 --- a/code/world.dm +++ b/code/world.dm @@ -56,7 +56,6 @@ /world/proc/SetRoundID() if(config.sql_enabled) if(SSdbcore.Connect()) - log_world("Database connection established.") var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), INET_ATON('[world.internet_address]'), '[world.port]')") query_round_start.Execute() var/datum/DBQuery/query_round_last_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()") diff --git a/code/world.dm.rej b/code/world.dm.rej deleted file mode 100644 index 9a112e381a..0000000000 --- a/code/world.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/world.dm b/code/world.dm (rejected hunks) -@@ -82,7 +82,7 @@ - if(fexists(GLOB.config_error_log)) - fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log") - fdel(GLOB.config_error_log) -- -+ - if(GLOB.round_id) - log_game("Round ID: [GLOB.round_id]") -