[Scummvm-git-logs] scummvm master -> 804c6ab7130ac88ad66e2424f79f9cc48c0689f1

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d367f0fb7c FULLPIPE: Fix loading saves
804c6ab713 FULLPIPE: Remove redundant debug output


Commit: d367f0fb7c1726769f86700abeb5ba78d12ae015
    https://github.com/scummvm/scummvm/commit/d367f0fb7c1726769f86700abeb5ba78d12ae015
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-25T20:03:50+02:00

Commit Message:
FULLPIPE: Fix loading saves

Changed paths:
    engines/fullpipe/stateloader.cpp



diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 32c611f..145dcc3 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -117,6 +117,8 @@ void GameLoader::readSavegame(const char *fname) {
 			_sc2array[i]._picAniInfos[j] = new PicAniInfo();
 			_sc2array[i]._picAniInfos[j]->load(*archive);
 		}
+
+		_sc2array[i]._isLoaded = 0;
 	}
 
 	int num = 2;


Commit: 804c6ab7130ac88ad66e2424f79f9cc48c0689f1
    https://github.com/scummvm/scummvm/commit/804c6ab7130ac88ad66e2424f79f9cc48c0689f1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-25T20:05:55+02:00

Commit Message:
FULLPIPE: Remove redundant debug output

Changed paths:
    engines/fullpipe/stateloader.cpp
    engines/fullpipe/statesaver.cpp



diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 145dcc3..30c7bc8 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -121,14 +121,6 @@ void GameLoader::readSavegame(const char *fname) {
 		_sc2array[i]._isLoaded = 0;
 	}
 
-	int num = 2;
-	for (int k = 0; k < _sc2array[num]._picAniInfosCount; k++) {
-		debugC(4, kDebugLoading, "num: %d", k);
-		debugC(4, kDebugLoading, "type: %d id: %d", _sc2array[num]._picAniInfos[k]->type, _sc2array[num]._picAniInfos[k]->objectId);
-		debugC(4, kDebugLoading, "staticsId: %d movid: %d movphase: %d", _sc2array[num]._picAniInfos[k]->staticsId,
-				_sc2array[num]._picAniInfos[k]->movementId, _sc2array[num]._picAniInfos[k]->dynamicPhaseIndex);
-	}
-
 	delete archive;
 
 	getGameLoaderInventory()->rebuildItemRects();
@@ -600,8 +592,6 @@ bool PicAniInfo::load(MfcArchive &file) {
 	oy = file.readSint32LE();
 	priority = file.readUint32LE();
 	staticsId = file.readUint16LE();
-	if (objectId == 334)
-		warning("objid: %d stid: %d", objectId, staticsId);
 	movementId = file.readUint16LE();
 	dynamicPhaseIndex = file.readUint16LE();
 	flags = file.readUint16LE();
diff --git a/engines/fullpipe/statesaver.cpp b/engines/fullpipe/statesaver.cpp
index cbededf..fb9163d 100644
--- a/engines/fullpipe/statesaver.cpp
+++ b/engines/fullpipe/statesaver.cpp
@@ -98,14 +98,6 @@ void GameLoader::writeSavegame(Scene *sc, const char *fname) {
 		}
 	}
 
-	int num = 2;
-	for (int k = 0; k < _sc2array[num]._picAniInfosCount; k++) {
-		debugC(4, kDebugLoading, "num: %d", k);
-		debugC(4, kDebugLoading, "type: %d id: %d", _sc2array[num]._picAniInfos[k]->type, _sc2array[num]._picAniInfos[k]->objectId);
-		debugC(4, kDebugLoading, "staticsId: %d movid: %d movphase: %d", _sc2array[num]._picAniInfos[k]->staticsId,
-				_sc2array[num]._picAniInfos[k]->movementId, _sc2array[num]._picAniInfos[k]->dynamicPhaseIndex);
-	}
-
 	header.encSize = stream.size();
 
 	// Now obfuscate the data
@@ -178,8 +170,6 @@ void PicAniInfo::save(MfcArchive &file) {
 	file.writeSint32LE(oy);
 	file.writeUint32LE(priority);
 	file.writeUint16LE(staticsId);
-	if (objectId == 334)
-		warning("objid: %d stid: %d", objectId, staticsId);
 	file.writeUint16LE(movementId);
 	file.writeUint16LE(dynamicPhaseIndex);
 	file.writeUint16LE(flags);