From 312e4d37cc964bbc5bd4e20fd25500b08dc70268 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 9 Apr 2014 00:35:55 -0700 Subject: Add @source command to help modified verions satisfy the AGPL --- src/mmo/version.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/mmo') diff --git a/src/mmo/version.cpp b/src/mmo/version.cpp index dd18fe1..6f42f11 100644 --- a/src/mmo/version.cpp +++ b/src/mmo/version.cpp @@ -14,7 +14,7 @@ Version CURRENT_VERSION = VERSION_DEVEL, 0, 0, - VENDOR_VERSION, + VENDOR_POINT, }; Version CURRENT_LOGIN_SERVER_VERSION = { @@ -22,7 +22,7 @@ Version CURRENT_LOGIN_SERVER_VERSION = VERSION_DEVEL, 0, TMWA_SERVER_LOGIN, - VENDOR_VERSION, + VENDOR_POINT, }; Version CURRENT_CHAR_SERVER_VERSION = { @@ -30,7 +30,7 @@ Version CURRENT_CHAR_SERVER_VERSION = VERSION_DEVEL, 0, TMWA_SERVER_CHAR | TMWA_SERVER_INTER, - VENDOR_VERSION, + VENDOR_POINT, }; Version CURRENT_MAP_SERVER_VERSION = { @@ -38,18 +38,15 @@ Version CURRENT_MAP_SERVER_VERSION = VERSION_DEVEL, 0, TMWA_SERVER_MAP, - VENDOR_VERSION, + VENDOR_POINT, }; -#define S2(a) #a -#define S(a) S2(a) - -const char CURRENT_VERSION_STRING[] = "TMWA " - S(VERSION_MAJOR) "." S(VERSION_MINOR) "." S(VERSION_PATCH) - " dev" S(VERSION_DEVEL) " (" VENDOR " " S(VENDOR_VERSION) ")"; +const char CURRENT_VERSION_STRING[] = VERSION_STRING; bool extract(XString str, Version *vers) { *vers = {}; + // TODO should I try to extract dev and vend also? + // It would've been useful during the magic migration. return extract(str, record<'.'>(&vers->major, &vers->minor, &vers->patch)); } -- cgit v1.2.3-60-g2f50