[Scummvm-cvs-logs] scummvm master -> 549b5d435a897e1f6d306d2bdb902cac18159491
dreammaster
dreammaster at scummvm.org
Sat Feb 21 22:16:37 CET 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
549b5d435a MADS: Fix crash when trapping bouncy native in pit
Commit: 549b5d435a897e1f6d306d2bdb902cac18159491
https://github.com/scummvm/scummvm/commit/549b5d435a897e1f6d306d2bdb902cac18159491
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-02-21T16:14:59-05:00
Commit Message:
MADS: Fix crash when trapping bouncy native in pit
Changed paths:
engines/mads/nebular/nebular_scenes2.cpp
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 94e30aa..d00857f 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -1745,7 +1745,8 @@ void Scene208::enter() {
}
void Scene208::step() {
- if (_boundingFl && (_rhotundaTime <= _scene->_activeAnimation->getCurrentFrame())) {
+ if (_boundingFl && _scene->_activeAnimation &&
+ (_rhotundaTime <= _scene->_activeAnimation->getCurrentFrame())) {
_rhotundaTime = _scene->_activeAnimation->getCurrentFrame();
if (_rhotundaTime == 125)
More information about the Scummvm-git-logs
mailing list