From 9cffc1f661f0fea973feac0dbb472aeb060400e9 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 4 Mar 2017 02:29:57 +0200 Subject: [PATCH] [Client] Don't open up main menu when player's death animation finishes --- apps/openmw/mwmechanics/actors.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp index ca6ea9cdb..b0f9b1d50 100644 --- a/apps/openmw/mwmechanics/actors.cpp +++ b/apps/openmw/mwmechanics/actors.cpp @@ -1379,7 +1379,17 @@ namespace MWMechanics if( iter->first == getPlayer()) { //player's death animation is over - MWBase::Environment::get().getStateManager()->askLoadRecent(); + + /* + Start of tes3mp change (major) + + The main menu no longer opens when the local player dies, + because of automatic respawning by default + */ + //MWBase::Environment::get().getStateManager()->askLoadRecent(); + /* + End of tes3mp change (major) + */ } else {