thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'scripts-first' into 'master'

Browse source 
Scripts.pk3 first

See merge request KartKrew/Kart!901
This commit is contained in:
toaster 2023-01-27 22:48:03 +00:00
commit b689e0adf2
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/d_main.c
View file

@ -1127,6 +1127,9 @@ static void IdentifyVersion(void)
//// ////
#endif #endif
//// ////
#ifdef USE_PATCH_FILE
D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME));
#endif
#if !defined (TESTERS) && !defined (HOSTTESTERS) #if !defined (TESTERS) && !defined (HOSTTESTERS)
D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3"));
#endif #endif
@ -1134,9 +1137,6 @@ static void IdentifyVersion(void)
D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3"));
D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3"));
#ifdef USE_PATCH_FILE
D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME));
#endif
#define UNLOCKTESTING #define UNLOCKTESTING
#if defined(DEVELOP) && defined(UNLOCKTESTING) #if defined(DEVELOP) && defined(UNLOCKTESTING)
D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME));
@ -1439,6 +1439,9 @@ void D_SRB2Main(void)
mainwads = 0; mainwads = 0;
#ifndef DEVELOP #ifndef DEVELOP
#ifdef USE_PATCH_FILE
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3); // patch.pk3
#endif
// Check MD5s of autoloaded files // Check MD5s of autoloaded files
// Note: Do not add any files that ignore MD5! // Note: Do not add any files that ignore MD5!
W_VerifyFileMD5(mainwads, ASSET_HASH_MAIN_KART); // main.kart W_VerifyFileMD5(mainwads, ASSET_HASH_MAIN_KART); // main.kart
@ -1447,11 +1450,10 @@ void D_SRB2Main(void)
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_PK3); // chars.pk3 mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_CHARS_PK3); // chars.pk3
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_PK3); // maps.pk3 -- 4 - If you touch this, make sure to touch up the majormods stuff below. mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_MAPS_PK3); // maps.pk3 -- 4 - If you touch this, make sure to touch up the majormods stuff below.
mainwads++; W_VerifyFileMd5(mainwads, ASSET_HASH_FOLLOWERS_PK3); // followers.pk3 mainwads++; W_VerifyFileMd5(mainwads, ASSET_HASH_FOLLOWERS_PK3); // followers.pk3
#ifdef USE_PATCH_FILE
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3); // patch.pk3
#endif
#else #else
#ifdef USE_PATCH_FILE
mainwads++; // scripts.pk3
#endif
#if !defined (TESTERS) && !defined (HOSTTESTERS) #if !defined (TESTERS) && !defined (HOSTTESTERS)
mainwads++; // gfx.pk3 mainwads++; // gfx.pk3
#endif #endif
@ -1459,9 +1461,6 @@ void D_SRB2Main(void)
mainwads++; // chars.pk3 mainwads++; // chars.pk3
mainwads++; // maps.pk3 mainwads++; // maps.pk3
mainwads++; // followers.pk3 mainwads++; // followers.pk3
#ifdef USE_PATCH_FILE
mainwads++; // scripts.pk3
#endif
#ifdef UNLOCKTESTING #ifdef UNLOCKTESTING
mainwads++; // unlocks.pk3 mainwads++; // unlocks.pk3
#endif #endif

5
src/deh_lua.c
View file

@ -41,6 +41,11 @@ static inline int lib_freeslot(lua_State *L)
if (!lua_lumploading) if (!lua_lumploading)
return luaL_error(L, "This function cannot be called from within a hook or coroutine!"); return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
if (!deh_loaded)
initfreeslots();
deh_loaded = true;
while (n-- > 0) while (n-- > 0)
{ {
s = Z_StrDup(luaL_checkstring(L,1)); s = Z_StrDup(luaL_checkstring(L,1));