[Scummvm-git-logs] scummvm master -> 028576cdc82933e1112bb68ea52eee6908fafccf

sev- sev at scummvm.org
Wed Sep 14 18:54:31 CEST 2016


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

Summary:
ea4000088e FULLPIPE: Fixed decoding of extra wide pictures. (transporter scene29)
af286d86fa FULLPIPE: Remove now unused BallChain class
028576cdc8 FULLPIPE: Added more debug tracing to scene29


Commit: ea4000088e6a33cb827894081d7484374937527a
    https://github.com/scummvm/scummvm/commit/ea4000088e6a33cb827894081d7484374937527a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-14T10:51:28+02:00

Commit Message:
FULLPIPE: Fixed decoding of extra wide pictures. (transporter scene29)

Changed paths:
    engines/fullpipe/gfx.cpp



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 90b8ae5..5681e3c 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -925,7 +925,7 @@ bool Bitmap::putDibRB(int32 *palette) {
 				}
 
 				if (fillLen > 0 || start1 >= 0) {
-					if (x <= 799 + 1 || (fillLen += 799 - x + 1, fillLen > 0)) {
+					if (x <= _width + 1 || (fillLen += _width - x + 1, fillLen > 0)) {
 						if (y <= endy) {
 							int bgcolor = palette[(pixel >> 8) & 0xff];
 							curDestPtr = (uint32 *)_surface->getBasePtr(start1, y);
@@ -947,8 +947,8 @@ bool Bitmap::putDibRB(int32 *palette) {
 					}
 				}
 
-				if (x > 799 + 1) {
-					fillLen += 799 - x + 1;
+				if (x > _width + 1) {
+					fillLen += _width - x + 1;
 					if (fillLen <= 0)
 						continue;
 				}


Commit: af286d86fae92b6465d665dae8939afa313fc399
    https://github.com/scummvm/scummvm/commit/af286d86fae92b6465d665dae8939afa313fc399
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-14T10:58:36+02:00

Commit Message:
FULLPIPE: Remove now unused BallChain class

Changed paths:
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index c7c303f..d37f5db 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1436,76 +1436,4 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	}
 }
 
-void BallChain::init(Ball **ball) {
-	*ball = pTail;
-	pTail = (Ball *)ball;
-	numBalls--;
-
-	if (!numBalls) {
-		for (Ball *i = pHead; i; i = i->p0 )
-			;
-		numBalls = 0;
-		pTail = 0;
-		field_8 = 0;
-		pHead = 0;
-		free(cPlex);
-		cPlex = 0;
-	}
-}
-
-Ball *BallChain::sub04(Ball *ballP, Ball *ballN) {
-	if (!pTail) {
-		if (!cPlexLen)
-			error("BallChain::sub04: cPlexLen is 0");
-
-		cPlex = (byte *)calloc(cPlexLen, sizeof(Ball));
-
-		Ball *runPtr = (Ball *)&cPlex[(cPlexLen - 1) * sizeof(Ball)];
-
-		for (int i = 0; i < cPlexLen; i++) {
-			runPtr->p0 = pTail;
-			pTail = runPtr;
-
-			runPtr--;
-		}
-	}
-
-	Ball *res = pTail;
-
-	pTail = res->p0;
-	res->p1 = ballP;
-	res->p0 = ballN;
-	numBalls++;
-	res->ani = 0;
-
-	return res;
-}
-
-void BallChain::removeBall(Ball *ball) {
-	if (ball == pHead)
-		pHead = ball->p0;
-	else
-		ball->p1->p0 = ball->p0;
-
-	if (ball == field_8)
-		field_8 = ball->p1;
-	else
-		ball->p0->p1 = ball->p1;
-
-	ball->p0 = pTail;
-	pTail = ball;
-
-	numBalls--;
-
-	if (!numBalls) {
-		numBalls = 0;
-		pTail = 0;
-		field_8 = 0;
-		pHead = 0;
-		free(cPlex);
-		cPlex = 0;
-	}
-}
-
-
 } // End of namespace Fullpipe
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 43bdb38..fc593a6 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -211,33 +211,6 @@ int sceneHandlerFinal(ExCommand *cmd);
 void sceneDbgMenu_initScene(Scene *sc);
 int sceneHandlerDbgMenu(ExCommand *cmd);
 
-struct Ball {
-	Ball *p0;
-	Ball *p1;
-	StaticANIObject *ani;
-
-	Ball() : p0(0), p1(0), ani(0) {}
-};
-
-typedef Common::Array<StaticANIObject *> BallArray;
-
-struct BallChain {
-	Ball *pHead;
-	Ball *field_8;
-	int numBalls;
-	Ball *pTail;
-	byte *cPlex;
-	int cPlexLen;
-
-	BallChain() : pHead(0), field_8(0), pTail(0), numBalls(0), cPlex(0), cPlexLen(0) {}
-	~BallChain() { free(cPlex); }
-
-	void init(Ball **ball);
-	Ball *sub04(Ball *ballP, Ball *ballN);
-	void removeBall(Ball *ball);
-	void reset() { pHead = 0; pTail = 0; field_8 = 0; numBalls = 0; free(cPlex); cPlex = 0; cPlexLen = 0; }
-};
-
 class Vars {
 public:
 	Vars();


Commit: 028576cdc82933e1112bb68ea52eee6908fafccf
    https://github.com/scummvm/scummvm/commit/028576cdc82933e1112bb68ea52eee6908fafccf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-14T18:52:58+02:00

Commit Message:
FULLPIPE: Added more debug tracing to scene29

Changed paths:
    engines/fullpipe/scenes/scene29.cpp



diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index f77af6f..2e95deb 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -686,6 +686,8 @@ int sceneHandler29(ExCommand *cmd) {
 
 	case MSG_SC29_SHOWLASTRED:
 		if (g_vars->scene29_redBalls.size()) { // original checks size of the scene29_greenBalls which looks like a copy/paste error
+			debugC(2, kDebugSceneLogic, "scene29: showLastRed");
+
 			g_vars->scene29_redBalls.back()->show1(-1, -1, -1, 0);
 			g_vars->scene29_redBalls.back()->startAnim(MV_SHR_HITASS, 0, -1);
 		}
@@ -702,6 +704,8 @@ int sceneHandler29(ExCommand *cmd) {
 
 	case MSG_SC29_SHOWLASTGREEN:
 		if (g_vars->scene29_greenBalls.size()) {
+			debugC(2, kDebugSceneLogic, "scene29: showLastGreen");
+
 			g_vars->scene29_greenBalls.back()->show1(-1, -1, -1, 0);
 			g_vars->scene29_greenBalls.back()->startAnim(MV_SHG_HITASS, 0, -1);
 		}
@@ -714,6 +718,8 @@ int sceneHandler29(ExCommand *cmd) {
 		g_vars->scene29_reachedFarRight = false;
 		g_vars->scene29_rideBackEnabled = false;
 
+		debugC(2, kDebugSceneLogic, "scene29: stopRide");
+
 		getCurrSceneSc2MotionController()->activate();
 		getGameLoaderInteractionController()->enableFlag24();
 		break;





More information about the Scummvm-git-logs mailing list