Merge branch 'freeslot-increase' into 'next'

Freeslot increase

See merge request KartKrew/Kart-Public!268
This commit is contained in:
Sal 2022-03-29 22:35:53 +00:00
commit 92c7a1dc80
2 changed files with 4 additions and 4 deletions

View file

@ -20097,7 +20097,7 @@ void P_PatchInfoTables(void)
INT32 i; INT32 i;
char *tempname; char *tempname;
#if NUMSPRITEFREESLOTS > 1000 #if NUMSPRITEFREESLOTS > 9999 //tempname numbering actually starts at SPR_FIRSTFREESLOT, so the limit is actually 9999 + SPR_FIRSTFREESLOT-1, but the preprocessor doesn't understand enums, so its left at 9999 for safety
#error "Update P_PatchInfoTables, you big dumb head" #error "Update P_PatchInfoTables, you big dumb head"
#endif #endif
@ -20105,8 +20105,8 @@ void P_PatchInfoTables(void)
for (i = SPR_FIRSTFREESLOT; i <= SPR_LASTFREESLOT; i++) for (i = SPR_FIRSTFREESLOT; i <= SPR_LASTFREESLOT; i++)
{ {
tempname = sprnames[i]; tempname = sprnames[i];
tempname[0] = 'F'; tempname[0] = (char)('0' + (char)((i-SPR_FIRSTFREESLOT+1)/1000));
tempname[1] = (char)('0' + (char)((i-SPR_FIRSTFREESLOT+1)/100)); tempname[1] = (char)('0' + (char)(((i-SPR_FIRSTFREESLOT+1)/100)%10));
tempname[2] = (char)('0' + (char)(((i-SPR_FIRSTFREESLOT+1)/10)%10)); tempname[2] = (char)('0' + (char)(((i-SPR_FIRSTFREESLOT+1)/10)%10));
tempname[3] = (char)('0' + (char)((i-SPR_FIRSTFREESLOT+1)%10)); tempname[3] = (char)('0' + (char)((i-SPR_FIRSTFREESLOT+1)%10));
tempname[4] = '\0'; tempname[4] = '\0';

View file

@ -226,7 +226,7 @@ void A_NapalmScatter();
void A_SpawnFreshCopy(); void A_SpawnFreshCopy();
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1 // ratio of states to sprites to mobj types is roughly 6 : 1 : 1
#define NUMMOBJFREESLOTS 512 #define NUMMOBJFREESLOTS 1024
#define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS #define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
#define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8) #define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)