thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into rulesify

Browse source
This commit is contained in:
toaster 2022-12-26 23:31:50 +00:00
commit 2b32baffbb
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.c
View file

@ -1118,6 +1118,7 @@ static void IdentifyVersion(void)
#define TEXTURESNAME "MISC_TEXTURES.pk3" #define TEXTURESNAME "MISC_TEXTURES.pk3"
#define MAPSNAME "MISC_MAPS.pk3" #define MAPSNAME "MISC_MAPS.pk3"
#define PATCHNAME "MISC_SCRIPTS.pk3" #define PATCHNAME "MISC_SCRIPTS.pk3"
#define UNLOCKNAME "MISC_UNLOCKS.pk3"
#define MUSICNAME "MISC_MUSIC.PK3" #define MUSICNAME "MISC_MUSIC.PK3"
//// ////
#else #else
@ -1125,6 +1126,7 @@ static void IdentifyVersion(void)
#define TEXTURESNAME "textures.pk3" #define TEXTURESNAME "textures.pk3"
#define MAPSNAME "maps.pk3" #define MAPSNAME "maps.pk3"
#define PATCHNAME "scripts.pk3" #define PATCHNAME "scripts.pk3"
#define UNLOCKNAME "unlocks.pk3"
#define MUSICNAME "music.pk3" #define MUSICNAME "music.pk3"
//// ////
#endif #endif
@ -1141,7 +1143,7 @@ static void IdentifyVersion(void)
#endif #endif
#define UNLOCKTESTING #define UNLOCKTESTING
#if defined(DEVELOP) && defined(UNLOCKTESTING) #if defined(DEVELOP) && defined(UNLOCKTESTING)
D_AddFile(startupiwads, va(pandf,srb2waddir,"unlocks.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME));
#endif #endif
//// ////
#undef TEXTURESNAME #undef TEXTURESNAME

4
src/g_game.c
View file

@ -77,7 +77,9 @@ JoyType_t Joystick[MAXSPLITSCREENPLAYERS];
// SRB2kart // SRB2kart
char gamedatafilename[64] = char gamedatafilename[64] =
#ifdef DEVELOP #if defined (TESTERS) || defined (HOSTTESTERS)
"test"
#elif defined(DEVELOP)
"develop" "develop"
#endif #endif
"ringdata.dat"; "ringdata.dat";