# HG changeset patch # User Ruby Dennington # Date 2022-05-10 12:49:19 # Node ID dbf3641db994da308db3fad051d0a3aff421b94d # Parent 9fdb2190ff85547ec27ca3714d98b2bfd0756fb7 Replace the Ginever branding with TheleTTD because Ginever is now closed diff --git a/src/lang/english.txt b/src/lang/english.txt --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -2128,7 +2128,7 @@ STR_VIDEO_DRIVER_ERROR STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... no compatible GPU found. Hardware acceleration disabled # Intro window -STR_INTRO_CAPTION :{WHITE}Ginever.net OpenTTD Patchpack :: {REV} +STR_INTRO_CAPTION :{WHITE}{REV} STR_INTRO_NEW_GAME :{BLACK}New Game STR_INTRO_LOAD_GAME :{BLACK}Load Game @@ -3103,7 +3103,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED # About OpenTTD window STR_ABOUT_OPENTTD :{WHITE}About OpenTTD STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved -STR_ABOUT_VERSION :{BLACK}Ginever.net OpenTTD Patchpack :: {REV} +STR_ABOUT_VERSION :{BLACK}{REV} STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-{RAW_STRING} The OpenTTD team # Framerate display window diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -408,14 +408,19 @@ static const char * const _credits[] = { u8"Original design by Chris Sawyer", u8"Original graphics by Simon Foster", u8"", - u8"Ginever.net OpenTTD Patchpack team:", + u8"", + u8"", + u8"TheleTTD - a custom patchpack for OpenTTD", + u8"(formerly known as the Ginever.net OpenTTD Patchpack)", + u8"", + u8"The TheleTTD team:", u8" Ruby Dennington (Theleruby) - Patch implementation", u8" Paul Dennington (Paulicus25) - Lead tester", - u8" Assorted testers from Ginever Entertainment", u8"", u8"The latest version of this patchpack can be obtained from:", - u8" https://hg.ginever.net/public/openttd (source)", - u8" https://hg.ginever.net/public/openttd-binaries (Windows binaries)", + u8" https://code.theleruby.com/cpp/openttd-patchpack", + u8"", + u8"", u8"", u8"The OpenTTD team (in alphabetical order):", u8" Grzegorz Duczy\u0144ski (adf88) - General coding (since 1.7.2)", diff --git a/src/rev.cpp.in b/src/rev.cpp.in --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -71,7 +71,7 @@ const char _openttd_revision_year[] = "$ * (compiling from sources without any version control software) * and 2 is for modified revision. * - * Ginever patchpack uses value 3 for hg unmodified and 4 for hg modified + * The patchpack uses value 3 for hg unmodified and 4 for hg modified */ const byte _openttd_revision_modified = ${REV_MODIFIED}; diff --git a/src/saveload/extended_ver_sl.cpp b/src/saveload/extended_ver_sl.cpp --- a/src/saveload/extended_ver_sl.cpp +++ b/src/saveload/extended_ver_sl.cpp @@ -62,6 +62,7 @@ static void loadVL(const SlxiSubChunkInf static uint32 saveVL(const SlxiSubChunkInfo* info, bool dry_run); const SlxiSubChunkInfo _sl_xv_sub_chunk_infos[] = { + // it's necessary to keep 'ginever' here - changing it would break save compatibility { XSLFI_VERSION_LABEL, XSCF_IGNORABLE_ALL, 1, 1, "version_label", saveVL, loadVL, nullptr }, { XSLFI_PATCHPACK_MAJOR_VERSION, XSCF_NULL, 6, 6, "ginever_patchpack_version", nullptr, nullptr, nullptr }, { XSLFI_DAYLENGTH, XSCF_NULL, 1, 1, "ginever_daylength", nullptr, nullptr, nullptr }, @@ -396,7 +397,7 @@ void SlXvCheckSpecialSavegameVersionsB() Debug(sl, 1, "This doesn't appear to be a patchpack save"); _load_check_data.save_version_label = _sl_xv_version_label; - // now we have to restore the original OTTD invalid save version check for non-Ginever patchpacks since we had to previously disable it + // now we have to restore the original OTTD invalid save version to check for other patchpacks since we had to previously disable it if (original_version >= SLV_START_PATCHPACKS && original_version < SLV_END_PATCHPACKS) SlError(STR_GAME_SAVELOAD_ERROR_PATCHPACK); } diff --git a/versiondump.py b/versiondump.py --- a/versiondump.py +++ b/versiondump.py @@ -14,7 +14,7 @@ import sys # save version to end 'pre' for unreleased builds with the version number being that of the next likely release -VERSION_TAG = "ginever-6.0.1pre" +VERSION_TAG = "TheleTTD-6.0.1pre" #================================ @@ -47,5 +47,5 @@ version_file = open('.ottdrev-gpp', 'w') version_file.write("{}\t{}\t{}\t{}\t{}\t{}\t{}\n".format(VERSION_TAG, HG_DATE[:10].replace("-",""), "4" if "+" in HG_REVISION else "3", HG_CHANGESET, "1" if IS_TAGGED_VERSION else "0", "0", HG_DATE[:4])) version_file.close() -print('This is Ginever.net OpenTTD Patchpack hg r' + HG_REVISION + ' (' + HG_CHANGESET + ') in branch ' + HG_BRANCH) +print('This is TheleTTD hg r' + HG_REVISION + ' (' + HG_CHANGESET + ') in branch ' + HG_BRANCH) print('This build is being performed by: ' + HG_REPO_OWNER)