stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-19 08:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename XPivot and YPivot to RotationXPivot and RotationYPivot

Browse source 
XPivot and YPivot have been kept for backwards compatibility.
This commit is contained in:
Lactozilla 2025-01-29 23:14:24 -03:00
parent d400ee30ab
commit e531c5d4e3
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/r_picformats.c
View file

@ -1583,6 +1583,8 @@ static void R_ParseSpriteInfoFrame(struct ParseSpriteInfoState *parser, boolean
UINT16 frameID = 0;
UINT16 frameEndID = UINT16_MAX;
boolean usingDeprecatedPivot = false;
struct ParsedSpriteInfoFrame frame = {
.pivotX = INT32_MAX,
.pivotY = INT32_MAX
@ -1673,17 +1675,33 @@ static void R_ParseSpriteInfoFrame(struct ParseSpriteInfoState *parser, boolean
}
while (strcmp(sprinfoToken,"}")!=0)
{
if (stricmp(sprinfoToken, "XPIVOT")==0)
if (stricmp(sprinfoToken, "ROTATIONXPIVOT")==0)
{
Z_Free(sprinfoToken);
sprinfoToken = M_GetToken(NULL);
frame.pivotX = atoi(sprinfoToken);
}
else if (stricmp(sprinfoToken, "ROTATIONYPIVOT")==0)
{
Z_Free(sprinfoToken);
sprinfoToken = M_GetToken(NULL);
frame.pivotY = atoi(sprinfoToken);
}
// TODO: 2.3: Delete
else if (stricmp(sprinfoToken, "XPIVOT")==0)
{
Z_Free(sprinfoToken);
sprinfoToken = M_GetToken(NULL);
frame.pivotX = atoi(sprinfoToken);
usingDeprecatedPivot = true;
}
// TODO: 2.3: Delete
else if (stricmp(sprinfoToken, "YPIVOT")==0)
{
Z_Free(sprinfoToken);
sprinfoToken = M_GetToken(NULL);
frame.pivotY = atoi(sprinfoToken);
usingDeprecatedPivot = true;
}
// TODO: 2.3: Delete
else if (stricmp(sprinfoToken, "ROTAXIS")==0)
@ -1722,6 +1740,13 @@ static void R_ParseSpriteInfoFrame(struct ParseSpriteInfoState *parser, boolean
}
}
// TODO: 2.3: Delete
if (usingDeprecatedPivot)
{
parser->info->frames[SPRINFO_DEFAULT_FRAME].pivot.available = true;
set_bit_array(parser->info->available, SPRINFO_DEFAULT_FRAME);
}
if (parser->spr2)
{
INT32 i;