stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 12:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add textures.kart, re-define DEVELOP mode,

Browse source 
Disabling DEVELOP can be another branch; this means this can get in master quicker
This commit is contained in:
TehRealSalt 2018-11-03 03:17:20 -04:00
parent 0eab0c5a14
commit 9de7a9d5cc
4 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/CMakeLists.txt
View file

@ -5,6 +5,7 @@ set(SRB2_ASSET_ALL
${CMAKE_CURRENT_SOURCE_DIR}/srb2.srb
${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
@ -16,6 +17,7 @@ set(SRB2_ASSET_HASHED
srb2.srb
patch.dta
gfx.kart
textures.kart
chars.kart
maps.kart
)

4
src/config.h.in
View file

@ -19,6 +19,7 @@
// 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
@ -34,7 +35,7 @@
#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
*/
@ -47,6 +48,7 @@
// 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

3
src/d_main.c
View file

@ -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...?
@ -1249,6 +1251,7 @@ void D_SRB2Main(void)
mainwads++; // patch.dta
#endif
mainwads++; // gfx.kart
mainwads++; // textures.kart
mainwads++; // chars.kart
mainwads++; // maps.kart
mainwads++; // sounds.kart

3
src/doomdef.h
View file

@ -140,7 +140,7 @@
extern FILE *logstream;
#endif
//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#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 0 // Game version
#define SUBVERSION 0 // more precise version number
@ -546,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__