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

csnover csnover at users.noreply.github.com
Fri Sep 30 20:55:35 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:
5baff4a1e5 SCI32: Fix some buildbot compiler warnings
988865cdc7 SCI32: Reset saved parts of GfxPalette32 when loading save games
b6b9e2fce4 SCI32: Give savegame-only methods internal linkage


Commit: 5baff4a1e5b1635334be2c9590e1aa765a9cdcab
    https://github.com/scummvm/scummvm/commit/5baff4a1e5b1635334be2c9590e1aa765a9cdcab
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-09-30T13:54:06-05:00

Commit Message:
SCI32: Fix some buildbot compiler warnings

Changed paths:
    engines/sci/engine/kfile.cpp
    engines/sci/engine/kgraphics32.cpp
    engines/sci/engine/savegame.cpp
    engines/sci/graphics/cursor32.h



diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 2d2f885..76cae6c 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -534,7 +534,7 @@ reg_t kFileIOWriteRaw(EngineState *s, int argc, reg_t *argv) {
 #ifdef ENABLE_SCI32
 	if (getSciVersion() >= SCI_VERSION_2) {
 		if (!success) {
-			return make_reg(0, -1);
+			return SIGNAL_REG;
 		}
 
 		return make_reg(0, bytesWritten);
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 49215b2..b8dc3e4 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -75,10 +75,7 @@ reg_t kBaseSetter32(EngineState *s, int argc, reg_t *argv) {
 	CelObjView celObj(viewId, loopNo, celNo);
 
 	const int16 scriptWidth = g_sci->_gfxFrameout->getCurrentBuffer().scriptWidth;
-	const int16 scriptHeight = g_sci->_gfxFrameout->getCurrentBuffer().scriptHeight;
-
 	const Ratio scaleX(scriptWidth, celObj._scaledWidth);
-	const Ratio scaleY(scriptHeight, celObj._scaledHeight);
 
 	int16 brLeft;
 
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 36c35e4..4153b8e 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -667,32 +667,32 @@ void ArrayTable::saveLoadWithSerializer(Common::Serializer &ser) {
 }
 
 void SciArray::saveLoadWithSerializer(Common::Serializer &s) {
-	uint16 size;
+	uint16 savedSize;
 
 	if (s.isSaving()) {
-		size = _size;
+		savedSize = _size;
 	}
 
 	s.syncAsByte(_type);
 	s.syncAsByte(_elementSize);
-	s.syncAsUint16LE(size);
+	s.syncAsUint16LE(savedSize);
 
 	if (s.isLoading()) {
-		resize(size);
+		resize(savedSize);
 	}
 
 	switch (_type) {
 	case kArrayTypeByte:
 	case kArrayTypeString:
-		s.syncBytes((byte *)_data, size);
+		s.syncBytes((byte *)_data, savedSize);
 		break;
 	case kArrayTypeInt16:
-		for (int i = 0; i < size; ++i) {
+		for (int i = 0; i < savedSize; ++i) {
 			s.syncAsUint16LE(((int16 *)_data)[i]);
 		}
 		break;
 	case kArrayTypeID:
-		for (int i = 0; i < size; ++i) {
+		for (int i = 0; i < savedSize; ++i) {
 			syncWithSerializer(s, ((reg_t *)_data)[i]);
 		}
 		break;
diff --git a/engines/sci/graphics/cursor32.h b/engines/sci/graphics/cursor32.h
index 88a75be..00a8b9b 100644
--- a/engines/sci/graphics/cursor32.h
+++ b/engines/sci/graphics/cursor32.h
@@ -31,7 +31,7 @@
 
 namespace Sci {
 
-class GfxCursor32 : Common::Serializable {
+class GfxCursor32 : public Common::Serializable {
 public:
 	GfxCursor32();
 	~GfxCursor32();


Commit: 988865cdc76877983456d457d4f64c10e4deea3a
    https://github.com/scummvm/scummvm/commit/988865cdc76877983456d457d4f64c10e4deea3a
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-09-30T13:54:10-05:00

Commit Message:
SCI32: Reset saved parts of GfxPalette32 when loading save games

Changed paths:
    engines/sci/engine/savegame.cpp



diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 4153b8e..ba8b75f 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -802,6 +802,16 @@ void GfxPalette32::saveLoadWithSerializer(Common::Serializer &s) {
 
 	if (s.isLoading()) {
 		++_version;
+
+		for (int i = 0; i < kNumCyclers; ++i) {
+			delete _cyclers[i];
+			_cyclers[i] = nullptr;
+		}
+
+		delete _varyTargetPalette;
+		_varyTargetPalette = nullptr;
+		delete _varyStartPalette;
+		_varyStartPalette = nullptr;
 	}
 
 	s.syncAsSint16LE(_varyDirection);


Commit: b6b9e2fce484b8e11f056700f5a6cc54bebb4fbd
    https://github.com/scummvm/scummvm/commit/b6b9e2fce484b8e11f056700f5a6cc54bebb4fbd
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-09-30T13:54:10-05:00

Commit Message:
SCI32: Give savegame-only methods internal linkage

Changed paths:
    engines/sci/engine/savegame.cpp



diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index ba8b75f..a238d76 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -771,7 +771,7 @@ void GfxPalette::saveLoadWithSerializer(Common::Serializer &s) {
 }
 
 #ifdef ENABLE_SCI32
-void saveLoadPalette32(Common::Serializer &s, Palette *const palette) {
+static void saveLoadPalette32(Common::Serializer &s, Palette *const palette) {
 	s.syncAsUint32LE(palette->timestamp);
 	for (int i = 0; i < ARRAYSIZE(palette->colors); ++i) {
 		s.syncAsByte(palette->colors[i].used);
@@ -781,7 +781,7 @@ void saveLoadPalette32(Common::Serializer &s, Palette *const palette) {
 	}
 }
 
-void saveLoadOptionalPalette32(Common::Serializer &s, Palette **const palette) {
+static void saveLoadOptionalPalette32(Common::Serializer &s, Palette **const palette) {
 	bool hasPalette;
 	if (s.isSaving()) {
 		hasPalette = (*palette != nullptr);





More information about the Scummvm-git-logs mailing list