[Scummvm-git-logs] scummvm master -> d0da9069cefb16930b55b4fdb38b126b4802dff1

[sev-]

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

Summary:
a5d9834780 FULLPIPE: Optimize savegame loading
a4fd712a8f FULLPIPE: Fix inventory transparency
25d1522166 FULLPIPE: Remove obsolete warning
d0da9069ce FULLPIPE: Fix alpha data type


Commit: a5d9834780e236016fe3953232e950b97dbd238c
    https://github.com/scummvm/scummvm/commit/a5d9834780e236016fe3953232e950b97dbd238c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-21T08:11:55+02:00

Commit Message:
FULLPIPE: Optimize savegame loading

Changed paths:
    engines/fullpipe/stateloader.cpp



diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 4df9763..c383442 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -186,10 +186,8 @@ bool readSavegameHeader(Common::InSaveFile *in, FullpipeSavegameHeader &header)
 	uint oldPos = in->pos();
 
 	// SEEK_END doesn't work with zipped savegames, so simulate it
-	while (!in->eos())
-		in->readByte();
+	in->seek(in->size() - 4, SEEK_SET);
 
-	in->seek(-4, SEEK_CUR);
 	uint headerOffset = in->readUint32LE();
 
 	// Sanity check


Commit: a4fd712a8f13009864da2e549fa7fca5a54c152a
    https://github.com/scummvm/scummvm/commit/a4fd712a8f13009864da2e549fa7fca5a54c152a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-21T08:11:55+02:00

Commit Message:
FULLPIPE: Fix inventory transparency

Changed paths:
    engines/fullpipe/gfx.cpp



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 5681e3c..0007389 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -1180,15 +1180,7 @@ void BigPicture::draw(int x, int y, int style, int angle) {
 		if (y != -1)
 			ny = y;
 
-		if (_alpha < 0xFF) {
-			//vrtSetAlphaBlendMode(g_vrtDrawHandle, 1, v9);
-		}
-
-		_bitmap->putDib(nx, ny, 0, 0xff);
-
-		if (_alpha < 0xFF) {
-			//vrtSetAlphaBlendMode(g_vrtDrawHandle, 0, 255);
-		}
+		_bitmap->putDib(nx, ny, 0, _alpha);
 	}
 }
 


Commit: 25d1522166ef911852bfaa0c67e08f340923b32d
    https://github.com/scummvm/scummvm/commit/25d1522166ef911852bfaa0c67e08f340923b32d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-21T08:11:55+02:00

Commit Message:
FULLPIPE: Remove obsolete warning

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 620cb50..d976e2f 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -538,11 +538,6 @@ void Movement::draw(bool flipFlag, int angle) {
 	if (_currDynamicPhase->getPaletteData())
 		g_fp->_globalPalette = _currDynamicPhase->getPaletteData();
 
-	if (_currDynamicPhase->getAlpha() < 0xFF) {
-		warning("Movement::draw: alpha < 0xff: %d", _currDynamicPhase->getAlpha());
-		//vrtSetAlphaBlendMode(g_vrtDrawHandle, 1, _currDynamicPhase->getAlpha());
-	}
-
 	Bitmap *bmp;
 	if (_currMovement) {
 		bmp = _currDynamicPhase->getPixelData()->reverseImage();


Commit: d0da9069cefb16930b55b4fdb38b126b4802dff1
    https://github.com/scummvm/scummvm/commit/d0da9069cefb16930b55b4fdb38b126b4802dff1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-21T08:11:55+02:00

Commit Message:
FULLPIPE: Fix alpha data type

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



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 0007389..4dec4b6 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -833,7 +833,7 @@ void Bitmap::decode(int32 *palette) {
 		putDibCB(palette);
 }
 
-void Bitmap::putDib(int x, int y, int32 *palette, int alpha) {
+void Bitmap::putDib(int x, int y, int32 *palette, byte alpha) {
 	debugC(7, kDebugDrawing, "Bitmap::putDib(%d, %d)", x, y);
 
 	int x1 = x - g_fp->_sceneRect.left;
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index cbba550..566586f 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -47,7 +47,7 @@ struct Bitmap {
 
 	void load(Common::ReadStream *s);
 	void decode(int32 *palette);
-	void putDib(int x, int y, int32 *palette, int alpha);
+	void putDib(int x, int y, int32 *palette, byte alpha);
 	bool putDibRB(int32 *palette);
 	void putDibCB(int32 *palette);