From 3f5ed23bba9bfdfade61b2aaff1bfa1edaa9769d Mon Sep 17 00:00:00 2001 From: Panzerschrek Date: Sun, 3 Dec 2017 11:49:18 +0700 Subject: [PATCH] =?UTF-8?q?Nebolj=C5=A1oje=20ispravlenije=20otkl=C3=BCceni?= =?UTF-8?q?ja=20pro=C3=A7edur=20dl=C3=A4=20pocinki=20proho=C5=BEdenija=20u?= =?UTF-8?q?rovn=C3=A4=206.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PanzerChasm/server/map.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PanzerChasm/server/map.cpp b/PanzerChasm/server/map.cpp index f971dd21..3de636e5 100644 --- a/PanzerChasm/server/map.cpp +++ b/PanzerChasm/server/map.cpp @@ -2111,11 +2111,16 @@ void Map::TryActivateProcedure( ( !procedure. red_key_required || player.HaveRedKey() ) && ( !procedure.green_key_required || player.HaveGreenKey() ) && ( !procedure. blue_key_required || player.HaveBlueKey() ); + const bool any_key_required= procedure.red_key_required || procedure.green_key_required || procedure. blue_key_required; + + // Really, unlocked, if "locked" flag is set, but procedure requires keys and we have these keys. + // Combination of "lock" and "AnyKey" appears only on map #6. + const bool really_unlocked= !procedure_state.locked || ( any_key_required && have_necessary_keys ); if( // Can open if have keys, procedure not locked. // All proceduras are unlocked in deathmatch. - ( ( have_necessary_keys && !procedure_state.locked ) || game_rules_ == GameRules::Deathmatch ) && + ( ( have_necessary_keys && really_unlocked ) || game_rules_ == GameRules::Deathmatch ) && procedure_state.movement_state == ProcedureState::MovementState::None ) { ActivateProcedure( procedure_number, current_time );