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

Sealed Stars: fix string comparisons

Browse source 
- Use strlcpy instead of strcpy
- Use stricmp instead of strcmp (parity with original Lua script)
This commit is contained in:
James R 2024-01-11 01:26:43 -08:00
parent fb7a38873d
commit a2c88952c5
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/objects/sealed-star.c
View file

@ -60,7 +60,7 @@ void Obj_SSHologramRotatorMapThingSpawn(mobj_t* mo, mapthing_t* mt)
} }
memset(stringarg, 0, sizeof(stringarg)); memset(stringarg, 0, sizeof(stringarg));
strcpy(stringarg, mt->thing_stringargs[0]); strlcpy(stringarg, mt->thing_stringargs[0], sizeof(stringarg));
for (i = 0; i < (int)(sizeof(stringarg)); i++) for (i = 0; i < (int)(sizeof(stringarg)); i++)
{ {
if (stringarg[i] == ' ' || stringarg[i] == ',') if (stringarg[i] == ' ' || stringarg[i] == ',')
@ -74,22 +74,22 @@ void Obj_SSHologramRotatorMapThingSpawn(mobj_t* mo, mapthing_t* mt)
{ {
char *next = token + strlen(token) + 1; char *next = token + strlen(token) + 1;
if (strcmp(token, "bird") == 0) if (stricmp(token, "bird") == 0)
{ {
mystates[numStates] = S_HOLOGRAM_BIRD; mystates[numStates] = S_HOLOGRAM_BIRD;
numStates += 1; numStates += 1;
} }
else if (strcmp(token, "fish") == 0) else if (stricmp(token, "fish") == 0)
{ {
mystates[numStates] = S_HOLOGRAM_FISH; mystates[numStates] = S_HOLOGRAM_FISH;
numStates += 1; numStates += 1;
} }
else if (strcmp(token, "crab") == 0) else if (stricmp(token, "crab") == 0)
{ {
mystates[numStates] = S_HOLOGRAM_CRAB; mystates[numStates] = S_HOLOGRAM_CRAB;
numStates += 1; numStates += 1;
} }
else if (strcmp(token, "squid") == 0) else if (stricmp(token, "squid") == 0)
{ {
mystates[numStates] = S_HOLOGRAM_SQUID; mystates[numStates] = S_HOLOGRAM_SQUID;
numStates += 1; numStates += 1;
@ -193,19 +193,19 @@ void Obj_SSHologramMapThingSpawn(mobj_t* mo, mapthing_t* mt)
{ {
P_SetMobjState(mo, S_HOLOGRAM_CRAB); P_SetMobjState(mo, S_HOLOGRAM_CRAB);
} }
else if (strcmp(stringarg0, "bird")) else if (stricmp(stringarg0, "bird"))
{ {
P_SetMobjState(mo, S_HOLOGRAM_BIRD); P_SetMobjState(mo, S_HOLOGRAM_BIRD);
} }
else if (strcmp(stringarg0, "crab") == 0) else if (stricmp(stringarg0, "crab") == 0)
{ {
P_SetMobjState(mo, S_HOLOGRAM_CRAB); P_SetMobjState(mo, S_HOLOGRAM_CRAB);
} }
else if (strcmp(stringarg0, "fish") == 0) else if (stricmp(stringarg0, "fish") == 0)
{ {
P_SetMobjState(mo, S_HOLOGRAM_FISH); P_SetMobjState(mo, S_HOLOGRAM_FISH);
} }
else if (strcmp(stringarg0, "squid") == 0) else if (stricmp(stringarg0, "squid") == 0)
{ {
P_SetMobjState(mo, S_HOLOGRAM_SQUID); P_SetMobjState(mo, S_HOLOGRAM_SQUID);
} }