From 172ffea5909acd547b4fe061d178398a094e71f5 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 15 Aug 2020 11:54:50 -0400 Subject: [PATCH] update srb2win.rc, D_ConvertVersionNumbers uses kart's 2 number style instead of vanilla's 3 number style --- src/d_main.c | 8 +------- src/win32/Srb2win.rc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 47ed9c073..57c098214 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1167,13 +1167,7 @@ D_ConvertVersionNumbers (void) { /* leave at defaults (0) under DEVELOP */ #ifndef DEVELOP - int major; - int minor; - - sscanf(SRB2VERSION, "%d.%d.%d", &major, &minor, &SUBVERSION); - - /* this is stupid */ - VERSION = ( major * 100 ) + minor; + sscanf(SRB2VERSION, "%d.%d", &VERSION, &SUBVERSION); #endif } diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc index 9816043e7..53eb1d3f8 100644 --- a/src/win32/Srb2win.rc +++ b/src/win32/Srb2win.rc @@ -78,8 +78,8 @@ END #include "../doomdef.h" // Needed for version string VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,6,0 - PRODUCTVERSION 2,2,6,0 + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -94,16 +94,16 @@ BEGIN BEGIN BLOCK "04090000" BEGIN - VALUE "Comments", "Visit our web site at www.srb2.org for news and updates!\0" - VALUE "CompanyName", "Sonic Team Junior\0" - VALUE "FileDescription", "Sonic Robo Blast 2\0" + VALUE "Comments", "Go go-karting with Dr. Eggman!\0" + VALUE "CompanyName", "Kart Krew\0" + VALUE "FileDescription", "SRB2Kart\0" VALUE "FileVersion", VERSIONSTRING VALUE "InternalName", "srb2\0" - VALUE "LegalCopyright", "Copyright 1998-2020 by Sonic Team Junior\0" + VALUE "LegalCopyright", "Copyright 1998-2020 by Kart Krew\0" VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0" - VALUE "OriginalFilename", "srb2win.exe\0" + VALUE "OriginalFilename", "srb2kart.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Sonic Robo Blast 2\0" + VALUE "ProductName", "SRB2Kart\0" VALUE "ProductVersion", VERSIONSTRING VALUE "SpecialBuild", "\0" END