From 6ae2ff2b7596b225ef7ce9cdd373113da2a4840b Mon Sep 17 00:00:00 2001 From: Uleat Date: Sat, 8 Apr 2017 22:35:37 -0400 Subject: [PATCH] Added `disable_timer` checks to doors override functions --- zone/doors.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/zone/doors.cpp b/zone/doors.cpp index 489c65c37..b2dd3379b 100644 --- a/zone/doors.cpp +++ b/zone/doors.cpp @@ -459,16 +459,19 @@ void Doors::NPCOpen(NPC* sender, bool alt_mode) if(!alt_mode) { // original function if(!isopen) { - close_timer.Start(); + if (!disable_timer) + close_timer.Start(); isopen=true; } else { close_timer.Disable(); - isopen=false; + if (!disable_timer) + isopen=false; } } else { // alternative function - close_timer.Start(); + if (!disable_timer) + close_timer.Start(); isopen=true; } } @@ -485,16 +488,19 @@ void Doors::ForceOpen(Mob *sender, bool alt_mode) if(!alt_mode) { // original function if(!isopen) { - close_timer.Start(); + if (!disable_timer) + close_timer.Start(); isopen=true; } else { close_timer.Disable(); - isopen=false; + if (!disable_timer) + isopen=false; } } else { // alternative function - close_timer.Start(); + if (!disable_timer) + close_timer.Start(); isopen=true; } } @@ -510,7 +516,8 @@ void Doors::ForceClose(Mob *sender, bool alt_mode) if(!alt_mode) { // original function if(!isopen) { - close_timer.Start(); + if (!disable_timer) + close_timer.Start(); isopen=true; } else {