stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 01:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'supernamefix' into 'next'

Browse source 
fix some issues with supername code

See merge request STJr/SRB2!2123
This commit is contained in:
sphere 2023-08-23 09:32:41 +00:00
commit 56a0546e15
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/r_skins.c
View file

@ -772,12 +772,12 @@ void R_AddSkins(UINT16 wadnum, boolean mainfile)
strupr(skin->hudname); strupr(skin->hudname);
SYMBOLCONVERT(skin->hudname) SYMBOLCONVERT(skin->hudname)
} }
else if (!supername) if (!supername)
{ {
char super[7], someone[SKINNAMESIZE+1]; char superstring[SKINNAMESIZE+7];
strcpy(super, "Super "); strcpy(superstring, "Super ");
strcpy(someone, skin->realname); strlcat(superstring, skin->name, sizeof(superstring));
STRBUFCPY(skin->supername, strcat(super, someone)); STRBUFCPY(skin->supername, superstring);
} }
} }
else if (!stricmp(stoken, "supername")) else if (!stricmp(stoken, "supername"))
@ -795,10 +795,10 @@ void R_AddSkins(UINT16 wadnum, boolean mainfile)
HUDNAMEWRITE(skin->realname); HUDNAMEWRITE(skin->realname);
if (!supername) //copy over default to capitalise the name if (!supername) //copy over default to capitalise the name
{ {
char super[7], someone[SKINNAMESIZE+1]; char superstring[SKINNAMESIZE+7];
strcpy(super, "Super "); strcpy(superstring, "Super ");
strcpy(someone, skin->realname); strlcat(superstring, skin->realname, sizeof(superstring));
STRBUFCPY(skin->supername, strcat(super, someone)); STRBUFCPY(skin->supername, superstring);
} }
} }
else if (!stricmp(stoken, "hudname")) else if (!stricmp(stoken, "hudname"))
@ -930,10 +930,10 @@ void R_PatchSkins(UINT16 wadnum, boolean mainfile)
HUDNAMEWRITE(skin->realname); HUDNAMEWRITE(skin->realname);
if (!supername) //copy over default to capitalise the name if (!supername) //copy over default to capitalise the name
{ {
char super[7], someone[SKINNAMESIZE+1]; char superstring[SKINNAMESIZE+7];
strcpy(super, "Super "); strcpy(superstring, "Super ");
strcpy(someone, skin->realname); strlcat(superstring, skin->realname, sizeof(superstring));
STRBUFCPY(skin->supername, strcat(super, someone)); STRBUFCPY(skin->supername, superstring);
} }
} }
else if (!stricmp(stoken, "hudname")) else if (!stricmp(stoken, "hudname"))