diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt index 764415976..1962685ec 100644 --- a/assets/CMakeLists.txt +++ b/assets/CMakeLists.txt @@ -3,8 +3,10 @@ # MD5 generation set(SRB2_ASSET_ALL ${CMAKE_CURRENT_SOURCE_DIR}/srb2.srb - ${CMAKE_CURRENT_SOURCE_DIR}/chars.kart + ${CMAKE_CURRENT_SOURCE_DIR}/patch.dta ${CMAKE_CURRENT_SOURCE_DIR}/gfx.kart + ${CMAKE_CURRENT_SOURCE_DIR}/textures.kart + ${CMAKE_CURRENT_SOURCE_DIR}/chars.kart ${CMAKE_CURRENT_SOURCE_DIR}/maps.kart ${CMAKE_CURRENT_SOURCE_DIR}/sounds.kart ${CMAKE_CURRENT_SOURCE_DIR}/music.dta @@ -13,10 +15,11 @@ set(SRB2_ASSET_ALL set(SRB2_ASSET_HASHED srb2.srb - chars.kart + patch.dta gfx.kart + textures.kart + chars.kart maps.kart - sounds.kart ) foreach(SRB2_ASSET ${SRB2_ASSET_HASHED}) diff --git a/src/Makefile b/src/Makefile index 85ecb49aa..c37e9827c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -389,11 +389,6 @@ ifdef NOPOSTPROCESSING OPTS+=-DNOPOSTPROCESSING endif -# srb2kart, remove before release -ifdef NOFOURPLAYER - OPTS+=-DNOFOURPLAYER -endif - OPTS:=-fno-exceptions $(OPTS) ifdef MOBJCONSISTANCY diff --git a/src/config.h.in b/src/config.h.in index 22a0dfa01..e72970f33 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -11,34 +11,48 @@ #ifdef CMAKECONFIG -#define ASSET_HASH_SRB2_SRB "${SRB2_ASSET_srb2.srb_HASH}" -#define ASSET_HASH_PLAYER_DTA "${SRB2_ASSET_player.dta_HASH}" -#define ASSET_HASH_RINGS_DTA "${SRB2_ASSET_rings.dta_HASH}" -#define ASSET_HASH_ZONES_DTA "${SRB2_ASSET_zones.dta_HASH}" +// Base SRB2 hashes +#define ASSET_HASH_SRB2_SRB "${SRB2_ASSET_srb2.srb_HASH}" #ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_DTA "${SRB2_ASSET_patch.dta_HASH}" +#define ASSET_HASH_PATCH_DTA "${SRB2_ASSET_patch.dta_HASH}" #endif -#define SRB2_COMP_REVISION "${SRB2_COMP_REVISION}" -#define SRB2_COMP_BRANCH "${SRB2_COMP_BRANCH}" -#define SRB2_GIT_DESCRIBE "${SRB2_GIT_DESCRIBE}" -#define SRB2_GIT_BRANCH "${SRB2_GIT_BRANCH}" +// SRB2Kart-specific hashes +#define ASSET_HASH_GFX_KART "${SRB2_ASSET_gfx.kart_HASH}" +#define ASSET_HASH_TEXTURES_KART "${SRB2_ASSET_textures.kart_HASH}" +#define ASSET_HASH_CHARS_KART "${SRB2_ASSET_chars.kart_HASH}" +#define ASSET_HASH_MAPS_KART "${SRB2_ASSET_maps.kart_HASH}" +#ifdef USE_PATCH_KART +#define ASSET_HASH_PATCH_KART "${SRB2_ASSET_patch.kart_HASH}" +#endif -#define CMAKE_ASSETS_DIR "${CMAKE_SOURCE_DIR}/assets" +#define SRB2_COMP_REVISION "${SRB2_COMP_REVISION}" +#define SRB2_COMP_BRANCH "${SRB2_COMP_BRANCH}" +#define SRB2_GIT_DESCRIBE "${SRB2_GIT_DESCRIBE}" +#define SRB2_GIT_BRANCH "${SRB2_GIT_BRANCH}" + +#define CMAKE_ASSETS_DIR "${CMAKE_SOURCE_DIR}/assets" #else -/* Manually defined asset hashes for non-CMake builds - Still used in SRB2kart. +/* Manually defined asset hashes for non-CMake builds * YYYY MM DD * Last updated 2017 / 02 / 20 */ -#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7" -#define ASSET_HASH_GFX_DTA "ff653bb9c0dcb685fb7c1c5880bcaff1" -#define ASSET_HASH_CHARS_DTA "24c2641472bc187980eedc3c86691863" -#define ASSET_HASH_MAPS_DTA "13db5d4427f568f1c8f0599f2d14a7aa" +// Base SRB2 hashes +#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7" #ifdef USE_PATCH_DTA -#define ASSET_HASH_PATCH_DTA "dbbf8bc6121618ee3be2d5b14650429b" +#define ASSET_HASH_PATCH_DTA "dbbf8bc6121618ee3be2d5b14650429b" +#endif + +// SRB2Kart-specific hashes +#define ASSET_HASH_GFX_KART "00000000000000000000000000000000" +#define ASSET_HASH_TEXTURES_KART "00000000000000000000000000000000" +#define ASSET_HASH_CHARS_KART "00000000000000000000000000000000" +#define ASSET_HASH_MAPS_KART "00000000000000000000000000000000" +#ifdef USE_PATCH_KART +#define ASSET_HASH_PATCH_KART "00000000000000000000000000000000" #endif #endif diff --git a/src/d_main.c b/src/d_main.c index e1bcce8c6..b3c5fb80d 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -954,6 +954,7 @@ static void IdentifyVersion(void) // SRB2kart - Add graphics (temp) // The command for md5 checks is "W_VerifyFileMD5" - looks for ASSET_HASH_SRB2_SRB in config.h.in D_AddFile(va(pandf,srb2waddir,"gfx.kart")); + D_AddFile(va(pandf,srb2waddir,"textures.kart")); D_AddFile(va(pandf,srb2waddir,"chars.kart")); D_AddFile(va(pandf,srb2waddir,"maps.kart")); //D_AddFile(va(pandf,srb2waddir,"sounds.kart")); @@ -1234,6 +1235,7 @@ void D_SRB2Main(void) mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_DTA); // patch.dta #endif mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_GFX_KART); // gfx.kart + mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_TEXTURES_KART); // textures.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_KART); // chars.kart mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_KART); // maps.kart mainwads++; //W_VerifyFileMD5(5, ASSET_HASH_SOUNDS_KART); -- sounds.kart - doesn't trigger modifiedgame, doesn't need an MD5...? @@ -1248,9 +1250,10 @@ void D_SRB2Main(void) #ifdef USE_PATCH_DTA mainwads++; // patch.dta #endif - mainwads++; // gfx.kart + mainwads++; // gfx.kart + mainwads++; // textures.kart mainwads++; // chars.kart - mainwads++; // maps.kart + mainwads++; // maps.kart mainwads++; // sounds.kart #ifdef USE_PATCH_KART mainwads++; // patch.kart diff --git a/src/doomdef.h b/src/doomdef.h index 0d98c31ef..9921f1c29 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -142,17 +142,17 @@ extern FILE *logstream; #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 #ifdef DEVELOP -#define VERSION 104 // Game version -#define SUBVERSION 8 // more precise version number +#define VERSION 0 // Game version +#define SUBVERSION 0 // more precise version number #define VERSIONSTRING "Development EXE" -#define VERSIONSTRINGW "v1.4.8" +#define VERSIONSTRINGW L"Development EXE" // most interface strings are ignored in development mode. // we use comprevision and compbranch instead. #else -#define VERSION 104 // Game version -#define SUBVERSION 8 // more precise version number -#define VERSIONSTRING "DevEXE v1.4.8" -#define VERSIONSTRINGW L"v1.4.8" +#define VERSION 100 // Game version +#define SUBVERSION 0 // more precise version number +#define VERSIONSTRING "Kart v1.0.0" +#define VERSIONSTRINGW L"Kart v1.0.0" // Hey! If you change this, add 1 to the MODVERSION below! // Otherwise we can't force updates! #endif @@ -162,7 +162,7 @@ extern FILE *logstream; //#define USE_PATCH_DTA // Kart has it's own, as well. -#define USE_PATCH_KART +//#define USE_PATCH_KART // Modification options // If you want to take advantage of the Master Server's ability to force clients to update @@ -176,7 +176,7 @@ extern FILE *logstream; // Please change to apply to your modification (we don't want everyone asking where your mod is on SRB2.org!). #define UPDATE_ALERT_STRING \ "A new update is available for SRB2Kart.\n"\ -"Please visit the forums on SRB2.org to download it.\n"\ +"Please visit mb.srb2.org to download it.\n"\ "\n"\ "You are using version: %s\n"\ "The newest version is: %s\n"\ @@ -193,7 +193,7 @@ extern FILE *logstream; // Generally less filled with newlines, since Windows gives you lots more room to work with. #define UPDATE_ALERT_STRING_CONSOLE \ "A new update is available for SRB2Kart.\n"\ -"Please visit the forums on SRB2.org to download it.\n"\ +"Please visit mb.srb2.org to download it.\n"\ "\n"\ "You are using version: %s\n"\ "The newest version is: %s\n"\ @@ -211,7 +211,8 @@ extern FILE *logstream; // The Modification ID; must be obtained from Rob ( https://mb.srb2.org/private.php?do=newpm&u=546 ). // DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server. // "12" is the default mod ID for version 2.1 -#define MODID 12 +// "17" is the 2.1 Kart's mod ID +#define MODID 17 // The Modification Version, starting from 1. Do not follow your version string for this, // it's only for detection of the version the player is using so the MS can alert them of an update. @@ -545,7 +546,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; #define SECTORSPECIALSAFTERTHINK /// SRB2Kart: Camera always has noclip. -/// \note Kind of problematic. If we decide to keep this on, we'll need serious map changes. #define NOCLIPCAM #endif // __DOOMDEF__ diff --git a/src/m_menu.c b/src/m_menu.c index 9c6635e10..5dc09a83d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2804,8 +2804,8 @@ void M_Drawer(void) else { #ifdef DEVELOP // Development -- show revision / branch info - V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, "KART DEV EXE"); - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRINGW)); + V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch); + V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision); #else // Regular build V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING)); #endif