From 47a8f70f0fbf4d4f984da3a595851b89c732ff54 Mon Sep 17 00:00:00 2001 From: tomangelo2 Date: Sat, 20 May 2017 20:41:30 +0200 Subject: [PATCH] Display warning if there is not enough energy to shoot Fix issue #949 --- src/script/scriptfunc.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index e93d5fac..ee9bc305 100644 --- a/src/script/scriptfunc.cpp +++ b/src/script/scriptfunc.cpp @@ -2382,6 +2382,11 @@ bool CScriptFunctions::rFire(CBotVar* var, CBotVar* result, int& exception, void if ( err != ERR_OK ) { script->m_taskExecutor->StopForegroundTask(); + if ( script->m_errMode == ERM_STOP ) + { + exception = err; + return false; + } return true; } }