[Scummvm-cvs-logs] scummvm master -> a22d7f2d5f27701766dbf36d50e0a31ea7b26d69

dreammaster dreammaster at scummvm.org
Sat Mar 7 02:59:13 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:
a22d7f2d5f MADS: Fix crash on leaving planeet


Commit: a22d7f2d5f27701766dbf36d50e0a31ea7b26d69
    https://github.com/scummvm/scummvm/commit/a22d7f2d5f27701766dbf36d50e0a31ea7b26d69
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-06T20:55:53-05:00

Commit Message:
MADS: Fix crash on leaving planeet

Changed paths:
    engines/mads/nebular/nebular_scenes8.cpp



diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 64b6c26..4b8d7d5 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -1604,7 +1604,8 @@ void Scene810::enter() {
 }
 
 void Scene810::step() {
-	if ((_scene->_activeAnimation->getCurrentFrame() == 200) && _moveAllowed) {
+	if (_scene->_activeAnimation && (_scene->_activeAnimation->getCurrentFrame() == 200) 
+			&& _moveAllowed) {
 		_scene->_sequences.addTimer(100, 70);
 		_moveAllowed = false;
 	}






More information about the Scummvm-git-logs mailing list