From dc4acfca93fa8fdf05a48c39879b65c1c06ea025 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 27 Sep 2020 06:36:40 -0400 Subject: [PATCH] Use args[1] for Battle capsules speed --- src/k_battle.c | 4 ++-- src/p_mobj.c | 2 +- src/p_setup.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/k_battle.c b/src/k_battle.c index f99205cea..98cc10a3b 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -474,8 +474,8 @@ void K_RunBattleOvertime(void) void K_SetupMovingCapsule(mapthing_t *mt, mobj_t *mobj) { - UINT8 sequence = mt->args[0]-1; - fixed_t speed = (FRACUNIT >> 3) * mt->angle; + UINT8 sequence = mt->args[0] - 1; + fixed_t speed = (FRACUNIT >> 3) * mt->args[1]; boolean backandforth = (mt->options & MTF_AMBUSH); boolean reverse = (mt->options & MTF_OBJECTSPECIAL); mobj_t *mo2; diff --git a/src/p_mobj.c b/src/p_mobj.c index 14bbc0f1c..050ed3581 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -11507,7 +11507,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean } // Moving capsules! - if (mthing->args[0] && mthing->angle) + if (mthing->args[0] && mthing->args[1]) { K_SetupMovingCapsule(mthing, mobj); } diff --git a/src/p_setup.c b/src/p_setup.c index f532f7ef8..0edd182d6 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3184,6 +3184,7 @@ static void P_ConvertBinaryMap(void) break; case 2333: // MT_BATTLECAPSULE mapthings[i].args[0] = mapthings[i].extrainfo; + mapthings[i].args[1] = mapthings[i].angle; break; default: break;