From c63112aa3f3a263a48216dcc1310d264b3679cf7 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 28 Apr 2018 12:44:03 -0400 Subject: [PATCH 1/2] Remove legacy tgs version header --- src/DMAPI/tgs/core/core.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/DMAPI/tgs/core/core.dm b/src/DMAPI/tgs/core/core.dm index ffeab4289b..faea16e3b9 100644 --- a/src/DMAPI/tgs/core/core.dm +++ b/src/DMAPI/tgs/core/core.dm @@ -15,6 +15,9 @@ TGS_WRITE_GLOBAL(tgs, new_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]) From 4f6595ba87264e8cc3928c5d1614a94558c8160a Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 1 May 2018 17:45:41 -0400 Subject: [PATCH 2/2] Fix version indexing --- src/DMAPI/tgs/core/core.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/DMAPI/tgs/core/core.dm b/src/DMAPI/tgs/core/core.dm index faea16e3b9..b15fd2c261 100644 --- a/src/DMAPI/tgs/core/core.dm +++ b/src/DMAPI/tgs/core/core.dm @@ -6,6 +6,7 @@ var/path = SelectTgsApi(tgs_version) 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.") + return var/datum/tgs_api/new_api = new path TGS_INFO_LOG("Activated tgstation-server API for version [tgs_version]") @@ -20,10 +21,10 @@ 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)