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

Move around the args

Browse source
This commit is contained in:
Sally Coolatta 2020-09-27 05:58:36 -04:00
parent 728d4a9435
commit 586bb71b4b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_mobj.c
View file

@ -11324,8 +11324,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
const fixed_t mobjscale = const fixed_t mobjscale =
mapheaderinfo[gamemap-1]->default_waypoint_radius; mapheaderinfo[gamemap-1]->default_waypoint_radius;
if (mthing->args[0] > 0) if (mthing->args[1] > 0)
mobj->radius = (mthing->args[0]) * FRACUNIT; mobj->radius = (mthing->args[1]) * FRACUNIT;
else if (mobjscale > 0) else if (mobjscale > 0)
mobj->radius = mobjscale; mobj->radius = mobjscale;
else else
@ -11337,7 +11337,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
// lastlook is used for indicating the waypoint is a shortcut // lastlook is used for indicating the waypoint is a shortcut
// extravalue1 is used for indicating the waypoint is disabled // extravalue1 is used for indicating the waypoint is disabled
// extravalue2 is used for indicating the waypoint is the finishline // extravalue2 is used for indicating the waypoint is the finishline
mobj->threshold = mthing->angle; mobj->threshold = mthing->args[0];
mobj->movecount = mthing->tag; mobj->movecount = mthing->tag;
if (mthing->options & MTF_EXTRA) if (mthing->options & MTF_EXTRA)
{ {
@ -11363,7 +11363,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
{ {
mobj->reactiontime = 1; mobj->reactiontime = 1;
} }
if (mthing->args[1] == 1) if (mthing->args[2] == 1)
{ {
mobj->extravalue2 = 1; // args[1] of 1 means the waypoint is at the finish line mobj->extravalue2 = 1; // args[1] of 1 means the waypoint is at the finish line
} }

6
src/p_setup.c
View file

@ -3162,8 +3162,8 @@ static void P_ConvertBinaryMap(void)
INT32 firstline = P_FindSpecialLineFromTag(2000, mapthings[i].angle, -1); INT32 firstline = P_FindSpecialLineFromTag(2000, mapthings[i].angle, -1);
mapthings[i].tag = mapthings[i].angle; mapthings[i].tag = mapthings[i].angle;
mapthings[i].angle = mapthings[i].z; mapthings[i].args[0] = mapthings[i].z;
mapthings[i].args[1] = mapthings[i].extrainfo; mapthings[i].args[2] = mapthings[i].extrainfo;
mapthings[i].z = 0; mapthings[i].z = 0;
if (firstline != -1) if (firstline != -1)
@ -3172,7 +3172,7 @@ static void P_ConvertBinaryMap(void)
fixed_t linez = sides[lines[firstline].sidenum[0]].rowoffset; fixed_t linez = sides[lines[firstline].sidenum[0]].rowoffset;
if (lineradius > 0) if (lineradius > 0)
mapthings[i].args[0] = lineradius / FRACUNIT; mapthings[i].args[1] = lineradius / FRACUNIT;
mapthings[i].z = linez / FRACUNIT; mapthings[i].z = linez / FRACUNIT;
} }