From 8c525621c8109c8caa43011d1d069cd661e3edf8 Mon Sep 17 00:00:00 2001 From: Lat Date: Sat, 6 Jan 2024 13:04:11 +0100 Subject: [PATCH 1/2] Fix wrong variable assignment and literally decrementing the wrong variable on dlz rockets --- src/objects/dlzrocket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/dlzrocket.c b/src/objects/dlzrocket.c index dc5325713..9712007e5 100644 --- a/src/objects/dlzrocket.c +++ b/src/objects/dlzrocket.c @@ -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_SetPlayerAngle(p->mo->player, mo->angle); - p->dlzrocket = true; + p->dlzrocket = 1; p->dlzrocketangle = mo->angle; p->dlzrocketanglev = 0; p->dlzrocketspd = DLZROCKETSPEED; @@ -119,7 +119,7 @@ void Obj_playerDLZRocket(player_t *p) if (p->dlzrocketspd < maxspd) p->dlzrocketspd++; else if (p->dlzrocketspd > maxspd) - p->dlzrocket--; + p->dlzrocketspd--; // 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. From 94e7a8e8976ac0ef4de1d0e295d5a29e62bba944 Mon Sep 17 00:00:00 2001 From: Lat Date: Sat, 6 Jan 2024 13:09:01 +0100 Subject: [PATCH 2/2] Change respawn check on turbines, unset tracer if respawnstate is set mid-turbine somehow --- src/objects/wpzturbine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/wpzturbine.c b/src/objects/wpzturbine.c index c3ac18987..f7cb7f119 100644 --- a/src/objects/wpzturbine.c +++ b/src/objects/wpzturbine.c @@ -153,7 +153,7 @@ void Obj_WPZTurbineThinker(mobj_t *mo) if (R_PointToDist2(pmo->x, pmo->y, mo->x, mo->y) < range && !p->turbine - && !p->respawn.timer) + && p->respawn.state == RESPAWNST_NONE) { P_SetTarget(&pmo->tracer, mo); p->turbine = turbinetime; @@ -206,7 +206,7 @@ void Obj_playerWPZTurbine(player_t *p) fixed_t momz; - if (!t || P_MobjWasRemoved(t)) + if (!t || P_MobjWasRemoved(t) || p->respawn.state != RESPAWNST_NONE) { p->turbine = false; P_SetTarget(&pmo->tracer, NULL);