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

sev- sev at scummvm.org
Thu Sep 12 00:01:34 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:
ad43f25c0f FULLPIPE: Fix debug scene


Commit: ad43f25c0ff435fc6a51ce4d9ef07d35a5ccef99
    https://github.com/scummvm/scummvm/commit/ad43f25c0ff435fc6a51ce4d9ef07d35a5ccef99
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-11T15:00:20-07:00

Commit Message:
FULLPIPE: Fix debug scene

Changed paths:
    engines/fullpipe/gameloader.cpp
    engines/fullpipe/gfx.cpp
    engines/fullpipe/interaction.cpp



diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index a44501b..142c278 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -163,7 +163,7 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) {
 		return false;
 
 	if (!_sc2array[sc2idx]._isLoaded)
-		return 0;
+		return false;
 
 	if (_sc2array[sc2idx]._entranceDataCount < 1) {
 		g_fullpipe->_currentScene = st->_scene;
@@ -173,14 +173,12 @@ bool CGameLoader::gotoScene(int sceneId, int entranceId) {
 	if (_sc2array[sc2idx]._entranceDataCount <= 0)
 		return false;
 
-	if (sceneId == 726)
-		return true;
-
-	int entranceIdx;
-	for (entranceIdx = 0; _sc2array[sc2idx]._entranceData[entranceIdx]->_field_4 != entranceId; entranceIdx++) {
-		if (entranceIdx >= _sc2array[sc2idx]._entranceDataCount)
-			return false;
-	}
+	int entranceIdx = 0;
+	if (sceneId != 726) // WORKAROUND
+		for (entranceIdx = 0; _sc2array[sc2idx]._entranceData[entranceIdx]->_field_4 != entranceId; entranceIdx++) {
+			if (entranceIdx >= _sc2array[sc2idx]._entranceDataCount)
+				return false;
+		}
 
 	CGameVar *sg = _gameVar->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
 
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index e16d56c..2ab038b 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -794,8 +794,10 @@ bool Bitmap::putDibRB(int32 *palette, int pX, int pY) {
 	uint16 *srcPtr2;
 	uint16 *srcPtr;
 
-	if (!palette && pX == -1)
-		error("Bitmap::putDibRB(): Both global and local palettes are empty");
+	if (!palette && pX == -1) {
+		warning("Bitmap::putDibRB(): Both global and local palettes are empty");
+		return false;
+	}
 
 	debug(8, "Bitmap::putDibRB()");
 
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index f392a08..dcc7e90 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -99,9 +99,6 @@ bool CInteractionController::handleInteraction(StaticANIObject *subj, GameObject
 	if (subj) {
 		if (!subj->isIdle() || (subj->_flags & 0x100))
 			return false;
-	} else {
-		error("CInteractionController::handleInteraction(): subj is null");
-		return false;
 	}
 
 	if (!_interactions.size())






More information about the Scummvm-git-logs mailing list