[Scummvm-cvs-logs] scummvm master -> 6c2ce625d86e81af3b351c59d1b8ea5c7cede625

Strangerke Strangerke at scummvm.org
Thu Jan 30 08:03:17 CET 2014


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:
6c2ce625d8 TSAGE: R2R - Fix bug #6504 - Crash when deciding to attack right after the ARM scan


Commit: 6c2ce625d86e81af3b351c59d1b8ea5c7cede625
    https://github.com/scummvm/scummvm/commit/6c2ce625d86e81af3b351c59d1b8ea5c7cede625
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-01-29T23:01:55-08:00

Commit Message:
TSAGE: R2R - Fix bug #6504 - Crash when deciding to attack right after the ARM scan

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 2fbce06..d595132 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3486,7 +3486,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 						R2_GLOBALS.clearFlag(60);
 						R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 						_sceneMode = 16;
-						_stripManager.start(404, this);
+						_stripManager.start3(404, this, R2_GLOBALS._stripManager_lookupList);
 					} else {
 						R2_GLOBALS._player.enableControl();
 						R2_GLOBALS._player._canWalk = false;






More information about the Scummvm-git-logs mailing list