[Scummvm-cvs-logs] scummvm master -> 794811c28093e229379e94f6c745dcfe8c5449d4

dreammaster dreammaster at scummvm.org
Wed Sep 11 03:54:29 CEST 2013


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:
794811c280 TSAGE: Fixes for R2R Spill Mountains maze walk regions


Commit: 794811c28093e229379e94f6c745dcfe8c5449d4
    https://github.com/scummvm/scummvm/commit/794811c28093e229379e94f6c745dcfe8c5449d4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-09-10T18:51:05-07:00

Commit Message:
TSAGE: Fixes for R2R Spill Mountains maze walk regions

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



diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 5aaabc3..9c60177 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -285,7 +285,7 @@ void Scene2000::initExits() {
 	case 21:
 	case 26:
 		loadScene(2200);
-		R2_GLOBALS._walkRegions.load(2000);
+		R2_GLOBALS._walkRegions.load(2200);
 		_eastExit._enabled = false;
 		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1900)
 			_mazePlayerMode = 2;
@@ -1030,6 +1030,12 @@ void Scene2000::process(Event &event) {
 void Scene2000::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 
+	// Synchronise active walk regions
+	int regionsId = R2_GLOBALS._walkRegions._resNum;
+	s.syncAsUint16LE(regionsId);
+	if (s.isLoading())
+		R2_GLOBALS._walkRegions.load(regionsId);
+
 	s.syncAsByte(_exitingFlag);
 	s.syncAsSint16LE(_mazePlayerMode);
 }






More information about the Scummvm-git-logs mailing list