incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove redundant KVOICE_ check, automatically allocate KARTVOICE fields in SOCs

Browse source
This commit is contained in:
yamamama 2025-11-16 11:24:36 -05:00
parent 27c2c68a99
commit f2f6ba9a72
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/deh_soc.c
View file

@ -32,6 +32,7 @@
#include "r_picformats.h"
#include "r_things.h" // R_Char2Frame
#include "r_sky.h"
#include "r_skins.h" // R_AllocVoice
#include "fastcmp.h"
#include "lua_script.h" // Reluctantly included for LUA_EvalMath
#include "d_clisrv.h"
@ -4606,11 +4607,15 @@ useoddsfunc_f *get_useoddsfunc(const char *word)
kartvoicetype_e get_kartvoice(const char *word)
{ // Returns the value of KVOICE_ enumerations
kartvoicetype_e i;
if (fastncmp("KVOICE_",word,7))
word += 7; // take off the KVOICE_
i = DEH_FindVoice(word);
if (i == MAXSKINVOICES)
deh_warning("Couldn't find voice named 'KVOICE_%s'", word);
{
// Freeslot voices that don't exist yet.
const INT32 allocresult = R_AllocVoice(false, word, &i);
if (allocresult < 0)
deh_warning("Voice '%s' could not be allocated.", word);
}
return i;
}

4
src/dehacked.c
View file

@ -391,10 +391,6 @@ INT32 DEH_ReadFreeslot(const char *type, const char *word, INT32 *out)
K_RegisterItem(numkartitems);
*out = numkartitems++;
}
else if (fastcmp(type, "KVOICE"))
{
return R_AllocVoice(false, word, out);
}
return -2;
}