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

Merge branch 'lat-fix' into 'master'

Browse source 
Address DLZ and turbine issues

See merge request KartKrew/Kart!1791
This commit is contained in:
Oni 2024-01-07 19:22:41 +00:00
commit b064d133f1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/objects/dlzrocket.c
View file

@ -77,7 +77,7 @@ void Obj_DLZRocketSpecial(mobj_t *mo, player_t *p)
p->mo->z = mo->z + 16*P_MobjFlip(p->mo)*mapobjectscale; p->mo->z = mo->z + 16*P_MobjFlip(p->mo)*mapobjectscale;
P_SetPlayerAngle(p->mo->player, mo->angle); P_SetPlayerAngle(p->mo->player, mo->angle);
p->dlzrocket = true; p->dlzrocket = 1;
p->dlzrocketangle = mo->angle; p->dlzrocketangle = mo->angle;
p->dlzrocketanglev = 0; p->dlzrocketanglev = 0;
p->dlzrocketspd = DLZROCKETSPEED; p->dlzrocketspd = DLZROCKETSPEED;
@ -119,7 +119,7 @@ void Obj_playerDLZRocket(player_t *p)
if (p->dlzrocketspd < maxspd) if (p->dlzrocketspd < maxspd)
p->dlzrocketspd++; p->dlzrocketspd++;
else if (p->dlzrocketspd > maxspd) else if (p->dlzrocketspd > maxspd)
p->dlzrocket--; p->dlzrocketspd--;
// so long as PF_STASIS is applied, let the angle be overwritten freely. // so long as PF_STASIS is applied, let the angle be overwritten freely.
// this is used by seasaws but can be used for misc modding purposes too. // this is used by seasaws but can be used for misc modding purposes too.

4
src/objects/wpzturbine.c
View file

@ -153,7 +153,7 @@ void Obj_WPZTurbineThinker(mobj_t *mo)
if (R_PointToDist2(pmo->x, pmo->y, mo->x, mo->y) < range if (R_PointToDist2(pmo->x, pmo->y, mo->x, mo->y) < range
&& !p->turbine && !p->turbine
&& !p->respawn.timer) && p->respawn.state == RESPAWNST_NONE)
{ {
P_SetTarget(&pmo->tracer, mo); P_SetTarget(&pmo->tracer, mo);
p->turbine = turbinetime; p->turbine = turbinetime;
@ -206,7 +206,7 @@ void Obj_playerWPZTurbine(player_t *p)
fixed_t momz; fixed_t momz;
if (!t || P_MobjWasRemoved(t)) if (!t || P_MobjWasRemoved(t) || p->respawn.state != RESPAWNST_NONE)
{ {
p->turbine = false; p->turbine = false;
P_SetTarget(&pmo->tracer, NULL); P_SetTarget(&pmo->tracer, NULL);