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

Changed readfreeslots error checking to work like lib_freeslot

Browse source 
Uses loop variable to determine error condition
Also small change to lib_freeslot for SFX for consistent use of I_Error
This commit is contained in:
Ashnal 2021-09-05 19:21:02 -04:00
parent 4b750e0504
commit 6e7bdc6031
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/dehacked.c
View file

@ -597,7 +597,6 @@ static void readfreeslots(MYFILE *f)
char *word,*type; char *word,*type;
char *tmp; char *tmp;
int i; int i;
boolean allocated = false;
do do
{ {
@ -646,11 +645,9 @@ static void readfreeslots(MYFILE *f)
//sprnames[i][4] = 0; //sprnames[i][4] = 0;
CONS_Printf("Sprite SPR_%s allocated.\n",word); CONS_Printf("Sprite SPR_%s allocated.\n",word);
used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now. used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now.
allocated = true;
break; break;
} }
if (i > SPR_LASTFREESLOT)
if (!allocated)
I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
} }
else if (fastcmp(type, "S")) else if (fastcmp(type, "S"))
@ -661,11 +658,10 @@ static void readfreeslots(MYFILE *f)
FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL); FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
strcpy(FREE_STATES[i],word); strcpy(FREE_STATES[i],word);
freeslotusage[0][0]++; freeslotusage[0][0]++;
allocated = true;
break; break;
} }
if (!allocated) if (i == NUMSTATEFREESLOTS)
I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
} }
else if (fastcmp(type, "MT")) else if (fastcmp(type, "MT"))
@ -676,11 +672,10 @@ static void readfreeslots(MYFILE *f)
FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL); FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
strcpy(FREE_MOBJS[i],word); strcpy(FREE_MOBJS[i],word);
freeslotusage[1][0]++; freeslotusage[1][0]++;
allocated = true;
break; break;
} }
if (!allocated) if (i == NUMMOBJFREESLOTS)
I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
} }
else else
@ -9262,7 +9257,7 @@ static inline int lib_freeslot(lua_State *L)
lua_pushinteger(L, sfx); lua_pushinteger(L, sfx);
r++; r++;
} else } else
return luaL_error(L, "Out of Sfx Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); I_Error("Out of Sfx Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); //Should never get here since S_AddSoundFx was changed to throw I_Error when it can't allocate
} }
else if (fastcmp(type, "SPR")) else if (fastcmp(type, "SPR"))
{ {