thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ACS: Add SIDE_BOTH support for SetSideProperty

Browse source
This commit is contained in:
Sally Coolatta 2023-04-29 13:37:35 -04:00
parent 4f2c47fde0
commit 8588881f4d
1 changed files with 55 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/acs/call-funcs.cpp
View file

@ -1892,6 +1892,13 @@ bool CallFunc_SetLineProperty(ACSVM::Thread *thread, const ACSVM::Word *argV, AC
Generic side property management. Generic side property management.
--------------------------------------------------*/ --------------------------------------------------*/
enum
{
SIDE_FRONT = 0,
SIDE_BACK = 1,
SIDE_BOTH,
};
enum enum
{ {
SIDE_PROP_XOFFSET, SIDE_PROP_XOFFSET,
@ -1932,9 +1939,20 @@ bool CallFunc_GetSideProperty(ACSVM::Thread *thread, const ACSVM::Word *argV, AC
} }
sideID = argV[1]; sideID = argV[1];
if (sideID < 0 || sideID > 1) switch (sideID)
{ {
sideID = info->side; default: // Activator
case SIDE_BOTH: // Wouldn't make sense for this function.
{
sideID = info->side;
break;
}
case SIDE_FRONT:
case SIDE_BACK:
{
// Keep sideID as is.
break;
}
} }
if (line != NULL && line->sidenum[sideID] != 0xffff) if (line != NULL && line->sidenum[sideID] != 0xffff)
@ -2005,6 +2023,7 @@ bool CallFunc_SetSideProperty(ACSVM::Thread *thread, const ACSVM::Word *argV, AC
UINT8 sideID = 0; UINT8 sideID = 0;
side_t *side = NULL; side_t *side = NULL;
boolean tryBoth = false;
INT32 property = SIDE_PROP__MAX; INT32 property = SIDE_PROP__MAX;
INT32 value = 0; INT32 value = 0;
@ -2022,9 +2041,25 @@ bool CallFunc_SetSideProperty(ACSVM::Thread *thread, const ACSVM::Word *argV, AC
} }
sideID = argV[1]; sideID = argV[1];
if (sideID < 0 || sideID > 1) switch (sideID)
{ {
sideID = info->side; default: // Activator
{
sideID = info->side;
break;
}
case SIDE_BOTH:
{
sideID = SIDE_FRONT;
tryBoth = true;
break;
}
case SIDE_FRONT:
case SIDE_BACK:
{
// Keep sideID as is.
break;
}
} }
if (line != NULL && line->sidenum[sideID] != 0xffff) if (line != NULL && line->sidenum[sideID] != 0xffff)
@ -2095,9 +2130,25 @@ bool CallFunc_SetSideProperty(ACSVM::Thread *thread, const ACSVM::Word *argV, AC
} }
} }
if (tryBoth == true && sideID == SIDE_FRONT)
{
sideID = SIDE_BACK;
if (line->sidenum[sideID] != 0xffff)
{
side = &sides[line->sidenum[sideID]];
continue;
}
}
if ((lineID = NextLine(tag, lineID, activatorID)) != -1) if ((lineID = NextLine(tag, lineID, activatorID)) != -1)
{ {
line = &lines[ lineID ]; line = &lines[ lineID ];
if (tryBoth == true)
{
sideID = SIDE_FRONT;
}
} }
else else
{ {