Merge branch 'scripts.pk3' into 'master'

Rename patch.pk3 to scripts.pk3

Closes #344

See merge request KartKrew/Kart!823
This commit is contained in:
Sal 2022-12-18 17:08:07 +00:00
commit 2a6e33490a
2 changed files with 4 additions and 3 deletions

View file

@ -1129,14 +1129,14 @@ static void IdentifyVersion(void)
////
#define TEXTURESNAME "MISC_TEXTURES.pk3"
#define MAPSNAME "MISC_MAPS.pk3"
#define PATCHNAME "MISC_PATCH.pk3"
#define PATCHNAME "MISC_SCRIPTS.pk3"
#define MUSICNAME "MISC_MUSIC.PK3"
////
#else
////
#define TEXTURESNAME "textures.pk3"
#define MAPSNAME "maps.pk3"
#define PATCHNAME "patch.pk3"
#define PATCHNAME "scripts.pk3"
#define MUSICNAME "music.pk3"
////
#endif
@ -1454,7 +1454,7 @@ void D_SRB2Main(void)
mainwads++; // maps.pk3
mainwads++; // followers.pk3
#ifdef USE_PATCH_FILE
mainwads++; // patch.pk3
mainwads++; // scripts.pk3
#endif
#endif //ifndef DEVELOP

View file

@ -1416,6 +1416,7 @@ void PT_FileFragment(void)
|| !strcmp(filename, "chars.pk3")
|| !strcmp(filename, "maps.pk3")
|| !strcmp(filename, "patch.pk3")
|| !strcmp(filename, "scripts.pk3")
|| !strcmp(filename, "sounds.pk3")
|| !strcmp(filename, "music.pk3")
)