From d17c96231397e870837b4da19d4cc1bd301e6d23 Mon Sep 17 00:00:00 2001 From: LuytenKy Date: Sat, 11 Apr 2026 18:29:02 +0300 Subject: [PATCH 1/2] add departure check to shockwave_move --- code/weapon/shockwave.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/weapon/shockwave.cpp b/code/weapon/shockwave.cpp index 272fcf4847d..42c0e98b2e0 100644 --- a/code/weapon/shockwave.cpp +++ b/code/weapon/shockwave.cpp @@ -389,8 +389,11 @@ void shockwave_move(object *shockwave_objp, float frametime) } ship_apply_global_damage(objp, shockwave_objp, &sw->pos, damage, sw->damage_type_idx); - weapon_area_apply_blast(nullptr, objp, &sw->pos, blast, true); - break; + // Don't jostle the ship during warpout + if (!shipp->flags[Ship::Ship_Flags::Depart_warp]) { + weapon_area_apply_blast(nullptr, objp, &sw->pos, blast, true); + break; + } } case OBJ_ASTEROID: weapon_area_apply_blast(nullptr, objp, &sw->pos, blast, true); From 41d10c9953a305f0cf5e5b49b87e5201a28c867e Mon Sep 17 00:00:00 2001 From: LuytenKy Date: Sat, 11 Apr 2026 18:36:30 +0300 Subject: [PATCH 2/2] misplaced break --- code/weapon/shockwave.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/weapon/shockwave.cpp b/code/weapon/shockwave.cpp index 42c0e98b2e0..f2be25d096e 100644 --- a/code/weapon/shockwave.cpp +++ b/code/weapon/shockwave.cpp @@ -392,8 +392,8 @@ void shockwave_move(object *shockwave_objp, float frametime) // Don't jostle the ship during warpout if (!shipp->flags[Ship::Ship_Flags::Depart_warp]) { weapon_area_apply_blast(nullptr, objp, &sw->pos, blast, true); - break; } + break; } case OBJ_ASTEROID: weapon_area_apply_blast(nullptr, objp, &sw->pos, blast, true);