This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 47a8f70f0fbf4d4f984da3a595851b89c732ff54
Author: tomangelo2 <tomang...@wp.pl>
Date: Sat May 20 20:41:30 2017 +0200
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 e93d5fa..ee9bc30 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;
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
