From 02d3e7a3710dcbb4642926b45669e97762799fdb Mon Sep 17 00:00:00 2001 From: "auria.mg" Date: Sun, 15 Jan 2017 19:22:06 -0500 Subject: [PATCH] Fix restarting race not resetting kart velocity during a cannon ride. Fixes #2738 --- src/karts/abstract_kart.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/karts/abstract_kart.cpp b/src/karts/abstract_kart.cpp index c1157bd8b..3361112d9 100644 --- a/src/karts/abstract_kart.cpp +++ b/src/karts/abstract_kart.cpp @@ -78,12 +78,15 @@ AbstractKart::~AbstractKart() // ---------------------------------------------------------------------------- void AbstractKart::reset() { - Moveable::reset(); + // important to delete animations before calling reset, as some animations + // set the kart velocity in their destructor (e.g. cannon) which "reset" + // can then cancel. See #2738 if(m_kart_animation) { delete m_kart_animation; m_kart_animation = NULL; } + Moveable::reset(); } // reset // ----------------------------------------------------------------------------