Added disable_timer checks to doors override functions

This commit is contained in:
Uleat 2017-04-08 22:35:37 -04:00
parent 58e1d9501d
commit 6ae2ff2b75

View File

@ -459,16 +459,19 @@ void Doors::NPCOpen(NPC* sender, bool alt_mode)
if(!alt_mode) { // original function if(!alt_mode) { // original function
if(!isopen) { if(!isopen) {
close_timer.Start(); if (!disable_timer)
close_timer.Start();
isopen=true; isopen=true;
} }
else { else {
close_timer.Disable(); close_timer.Disable();
isopen=false; if (!disable_timer)
isopen=false;
} }
} }
else { // alternative function else { // alternative function
close_timer.Start(); if (!disable_timer)
close_timer.Start();
isopen=true; isopen=true;
} }
} }
@ -485,16 +488,19 @@ void Doors::ForceOpen(Mob *sender, bool alt_mode)
if(!alt_mode) { // original function if(!alt_mode) { // original function
if(!isopen) { if(!isopen) {
close_timer.Start(); if (!disable_timer)
close_timer.Start();
isopen=true; isopen=true;
} }
else { else {
close_timer.Disable(); close_timer.Disable();
isopen=false; if (!disable_timer)
isopen=false;
} }
} }
else { // alternative function else { // alternative function
close_timer.Start(); if (!disable_timer)
close_timer.Start();
isopen=true; isopen=true;
} }
} }
@ -510,7 +516,8 @@ void Doors::ForceClose(Mob *sender, bool alt_mode)
if(!alt_mode) { // original function if(!alt_mode) { // original function
if(!isopen) { if(!isopen) {
close_timer.Start(); if (!disable_timer)
close_timer.Start();
isopen=true; isopen=true;
} }
else { else {