From 4d318a78602aec77ec41fae10c382d639a74d964 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 6 May 2018 09:12:26 -0400 Subject: [PATCH 1/3] Add missing TRUE return to v3202 API --- src/DMAPI/tgs/v3210/api.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/DMAPI/tgs/v3210/api.dm b/src/DMAPI/tgs/v3210/api.dm index 5f69889f07..2302249763 100644 --- a/src/DMAPI/tgs/v3210/api.dm +++ b/src/DMAPI/tgs/v3210/api.dm @@ -57,6 +57,8 @@ return splittext(trim_left(trim_right(file2text(filename))), "\n") /datum/tgs_api/v3210/OnWorldNew(datum/tgs_event_handler/event_handler) //don't use event handling in this version + . = FALSE + comms_key = world.params[SERVICE_WORLD_PARAM] instance_name = world.params[SERVICE_INSTANCE_PARAM] if(!instance_name) @@ -72,9 +74,10 @@ if(world.system_type != MS_WINDOWS) TGS_ERROR_LOG("This API version is only supported on Windows. Not running on Windows. Aborting initialization!") - return FALSE + return ListServiceCustomCommands(TRUE) ExportService("[SERVICE_REQUEST_API_VERSION] [ApiVersion()]", TRUE) + return TRUE //nothing to do for v3 /datum/tgs_api/v3210/OnInitializationComplete() From 9caa684eb82918967c5274035804ab677f0b333d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 6 May 2018 09:13:53 -0400 Subject: [PATCH 2/3] Fix activation message occuring for failed instatiations --- src/DMAPI/tgs/core/core.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DMAPI/tgs/core/core.dm b/src/DMAPI/tgs/core/core.dm index ffeab4289b..3061188e39 100644 --- a/src/DMAPI/tgs/core/core.dm +++ b/src/DMAPI/tgs/core/core.dm @@ -7,12 +7,14 @@ if(!path) TGS_ERROR_LOG("Found unsupported API version: [tgs_version]. If this is a valid version please report this, backporting is done on demand.") + TGS_INFO_LOG("Activating API for version [tgs_version]") var/datum/tgs_api/new_api = new path - TGS_INFO_LOG("Activated tgstation-server API for version [tgs_version]") var/result = new_api.OnWorldNew(event_handler ? event_handler : new /datum/tgs_event_handler/tgs_default) if(result && result != TGS_UNIMPLEMENTED) TGS_WRITE_GLOBAL(tgs, new_api) + else + TGS_ERROR_LOG("Failed to activate API!") /world/proc/SelectTgsApi(tgs_version) var/list/version_bits = splittext(tgs_version, ".") From 1e272e27471840016cf3645b2ac3290b0af8500b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 6 May 2018 11:24:19 -0400 Subject: [PATCH 3/3] oh man --- src/DMAPI/tgs/core/core.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/DMAPI/tgs/core/core.dm b/src/DMAPI/tgs/core/core.dm index 3061188e39..61f1e71d2e 100644 --- a/src/DMAPI/tgs/core/core.dm +++ b/src/DMAPI/tgs/core/core.dm @@ -17,12 +17,15 @@ TGS_ERROR_LOG("Failed to activate API!") /world/proc/SelectTgsApi(tgs_version) + //remove the old 3.0 header + tgs_version = replacetext(tgs_version, "/tg/station 13 Server v", "") + var/list/version_bits = splittext(tgs_version, ".") - var/super = text2num(version_bits[0]) - var/major = text2num(version_bits[1]) - var/minor = text2num(version_bits[2]) - var/patch = text2num(version_bits[3]) + var/super = text2num(version_bits[1]) + var/major = text2num(version_bits[2]) + var/minor = text2num(version_bits[3]) + var/patch = text2num(version_bits[4]) switch(super) if(3)