cancel current use action if pilot is removed (#1954)

openclonk · Nov 17, 2017 · f6b15a90513880a2a8ff43c3dfb3070e0fc7983b · f6b15a9
1 parent bc3d0bb
commit f6b15a90513880a2a8ff43c3dfb3070e0fc7983b
Unified Split

Showing with 3 additions and 0 deletions.

+3 −0 planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
diff --git a/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c b/planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
@@ -1172,6 +1172,9 @@ public func PlaneDismount(object clonk)
 	clonk->StopAnimation(clonk->GetRootAnimation(15));
 	DetachMesh(clonkmesh);
 	clonkmesh = nil;
+	// Ensure the current use is cancelled.
+	if (clonk == pilot)
+		ContainedUseCancel(pilot, 0, 0);
 	pilot = nil;
 	CancelFlight();
 	return true;