WINTERMUTE: Transfer Sint32s explicitly when saving/loading.

28 files changed, 100 insertions, 100 deletions

diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index 8c87cfb988..1455733461 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -418,8 +418,8 @@ bool BaseFrame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_editorExpanded));
 	persistMgr->transferBool(TMEMBER(_keyframe));
 	persistMgr->transferBool(TMEMBER(_killSound));
-	persistMgr->transfer(TMEMBER(_moveX));
-	persistMgr->transfer(TMEMBER(_moveY));
+	persistMgr->transferSint32(TMEMBER(_moveX));
+	persistMgr->transferSint32(TMEMBER(_moveY));
 	persistMgr->transferPtr(TMEMBER_PTR(_sound));
 	_subframes.persist(persistMgr);
 
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index d4ecca0d76..6b7e1cf803 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3056,7 +3056,7 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_cursorNoninteractive));
 	persistMgr->transferBool(TMEMBER(_editorMode));
 	persistMgr->transferPtr(TMEMBER_PTR(_fader));
-	persistMgr->transfer(TMEMBER(_freezeLevel));
+	persistMgr->transferSint32(TMEMBER(_freezeLevel));
 	persistMgr->transferPtr(TMEMBER_PTR(_focusedWindow));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontStorage));
 	persistMgr->transferBool(TMEMBER(_interactive));
@@ -3066,13 +3066,13 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	_musicSystem->persistChannels(persistMgr);
 	_musicSystem->persistCrossfadeSettings(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_offsetX));
-	persistMgr->transfer(TMEMBER(_offsetY));
+	persistMgr->transferSint32(TMEMBER(_offsetX));
+	persistMgr->transferSint32(TMEMBER(_offsetY));
 	persistMgr->transferFloat(TMEMBER(_offsetPercentX));
 	persistMgr->transferFloat(TMEMBER(_offsetPercentY));
 
 	persistMgr->transferBool(TMEMBER(_origInteractive));
-	persistMgr->transfer(TMEMBER_INT(_origState));
+	persistMgr->transferSint32(TMEMBER_INT(_origState));
 	persistMgr->transferBool(TMEMBER(_personalizedSave));
 	persistMgr->transferBool(TMEMBER(_quitting));
 
@@ -3080,10 +3080,10 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferPtr(TMEMBER_PTR(_scEngine));
 	//persistMgr->transfer(TMEMBER(_soundMgr));
-	persistMgr->transfer(TMEMBER_INT(_state));
+	persistMgr->transferSint32(TMEMBER_INT(_state));
 	//persistMgr->transfer(TMEMBER(_surfaceStorage));
 	persistMgr->transferBool(TMEMBER(_subtitles));
-	persistMgr->transfer(TMEMBER(_subtitlesSpeed));
+	persistMgr->transferSint32(TMEMBER(_subtitlesSpeed));
 	persistMgr->transferPtr(TMEMBER_PTR(_systemFont));
 	persistMgr->transferPtr(TMEMBER_PTR(_videoFont));
 	persistMgr->transferBool(TMEMBER(_videoSubtitles));
@@ -3093,10 +3093,10 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 
 	_renderer->persistSaveLoadImages(persistMgr);
 
-	persistMgr->transfer(TMEMBER_INT(_textEncoding));
+	persistMgr->transferSint32(TMEMBER_INT(_textEncoding));
 	persistMgr->transferBool(TMEMBER(_textRTL));
 
-	persistMgr->transfer(TMEMBER(_soundBufferSizeSec));
+	persistMgr->transferSint32(TMEMBER(_soundBufferSizeSec));
 	persistMgr->transferBool(TMEMBER(_suspendedRendering));
 
 	persistMgr->transferRect32(TMEMBER(_mouseLockRect));
diff --git a/engines/wintermute/base/base_game_music.cpp b/engines/wintermute/base/base_game_music.cpp
index a401da2d97..8894fb843f 100644
--- a/engines/wintermute/base/base_game_music.cpp
+++ b/engines/wintermute/base/base_game_music.cpp
@@ -224,8 +224,8 @@ bool BaseGameMusic::persistCrossfadeSettings(BasePersistenceManager *persistMgr)
 	persistMgr->transferBool(TMEMBER(_musicCrossfadeRunning));
 	persistMgr->transferUint32(TMEMBER(_musicCrossfadeStartTime));
 	persistMgr->transferUint32(TMEMBER(_musicCrossfadeLength));
-	persistMgr->transfer(TMEMBER(_musicCrossfadeChannel1));
-	persistMgr->transfer(TMEMBER(_musicCrossfadeChannel2));
+	persistMgr->transferSint32(TMEMBER(_musicCrossfadeChannel1));
+	persistMgr->transferSint32(TMEMBER(_musicCrossfadeChannel2));
 	persistMgr->transferBool(TMEMBER(_musicCrossfadeSwap));
 	return true;
 }
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index 802edfcf32..2e0c612da0 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -963,17 +963,17 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_editorAlwaysRegister));
 	persistMgr->transferBool(TMEMBER(_editorOnly));
 	persistMgr->transferBool(TMEMBER(_editorSelected));
-	persistMgr->transfer(TMEMBER(_iD));
+	persistMgr->transferSint32(TMEMBER(_iD));
 	persistMgr->transferBool(TMEMBER(_is3D));
 	persistMgr->transferBool(TMEMBER(_movable));
-	persistMgr->transfer(TMEMBER(_posX));
-	persistMgr->transfer(TMEMBER(_posY));
+	persistMgr->transferSint32(TMEMBER(_posX));
+	persistMgr->transferSint32(TMEMBER(_posY));
 	persistMgr->transferFloat(TMEMBER(_relativeScale));
 	persistMgr->transferBool(TMEMBER(_rotatable));
 	persistMgr->transferFloat(TMEMBER(_scale));
 	persistMgr->transferPtr(TMEMBER_PTR(_sFX));
 	persistMgr->transferUint32(TMEMBER(_sFXStart));
-	persistMgr->transfer(TMEMBER(_sFXVolume));
+	persistMgr->transferSint32(TMEMBER(_sFXVolume));
 	persistMgr->transferBool(TMEMBER(_ready));
 	persistMgr->transferRect32(TMEMBER(_rect));
 	persistMgr->transferBool(TMEMBER(_rectSet));
@@ -992,14 +992,14 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_saveState));
 	persistMgr->transferBool(TMEMBER(_nonIntMouseEvents));
 
-	persistMgr->transfer(TMEMBER_INT(_sFXType));
+	persistMgr->transferSint32(TMEMBER_INT(_sFXType));
 	persistMgr->transferFloat(TMEMBER(_sFXParam1));
 	persistMgr->transferFloat(TMEMBER(_sFXParam2));
 	persistMgr->transferFloat(TMEMBER(_sFXParam3));
 	persistMgr->transferFloat(TMEMBER(_sFXParam4));
 
 
-	persistMgr->transfer(TMEMBER_INT(_blendMode));
+	persistMgr->transferSint32(TMEMBER_INT(_blendMode));
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 1ee4b247e9..eb2bffeba5 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -606,7 +606,7 @@ bool BasePersistenceManager::transferBool(const char *name, bool *val) {
 
 //////////////////////////////////////////////////////////////////////////
 // int
-bool BasePersistenceManager::transfer(const char *name, int32 *val) {
+bool BasePersistenceManager::transferSint32(const char *name, int32 *val) {
 	if (_saving) {
 		_saveStream->writeSint32LE(*val);
 		if (_saveStream->err()) {
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 9d39670703..aba4776a31 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -74,7 +74,7 @@ public:
 	byte *_richBuffer;
 
 	bool transferPtr(const char *name, void *val);
-	bool transfer(const char *name, int32 *val);
+	bool transferSint32(const char *name, int32 *val);
 	bool transferUint32(const char *name, uint32 *val);
 	bool transferFloat(const char *name, float *val);
 	bool transferDouble(const char *name, double *val);
diff --git a/engines/wintermute/base/base_point.cpp b/engines/wintermute/base/base_point.cpp
index fe6ca941f3..84b6a629c7 100644
--- a/engines/wintermute/base/base_point.cpp
+++ b/engines/wintermute/base/base_point.cpp
@@ -54,8 +54,8 @@ BasePoint::BasePoint(int initX, int initY) {
 //////////////////////////////////////////////////////////////////////////
 bool BasePoint::persist(BasePersistenceManager *persistMgr) {
 
-	persistMgr->transfer(TMEMBER(x));
-	persistMgr->transfer(TMEMBER(y));
+	persistMgr->transferSint32(TMEMBER(x));
+	persistMgr->transferSint32(TMEMBER(y));
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index 2953adc8a5..dc17b18ea2 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -431,10 +431,10 @@ bool BaseRegion::persist(BasePersistenceManager *persistMgr) {
 	BaseObject::persist(persistMgr);
 
 	persistMgr->transferBool(TMEMBER(_active));
-	persistMgr->transfer(TMEMBER(_editorSelectedPoint));
+	persistMgr->transferSint32(TMEMBER(_editorSelectedPoint));
 	persistMgr->transferFloat(TMEMBER(_lastMimicScale));
-	persistMgr->transfer(TMEMBER(_lastMimicX));
-	persistMgr->transfer(TMEMBER(_lastMimicY));
+	persistMgr->transferSint32(TMEMBER(_lastMimicX));
+	persistMgr->transferSint32(TMEMBER(_lastMimicY));
 	_points.persist(persistMgr);
 
 	return STATUS_OK;
diff --git a/engines/wintermute/base/base_scriptable.cpp b/engines/wintermute/base/base_scriptable.cpp
index be1e18c2c4..d2ff627f0a 100644
--- a/engines/wintermute/base/base_scriptable.cpp
+++ b/engines/wintermute/base/base_scriptable.cpp
@@ -153,7 +153,7 @@ void BaseScriptable::scSetBool(bool val) {
 //////////////////////////////////////////////////////////////////////////
 bool BaseScriptable::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_gameRef));
-	persistMgr->transfer(TMEMBER(_refCount));
+	persistMgr->transferSint32(TMEMBER(_refCount));
 	persistMgr->transferPtr(TMEMBER_PTR(_scProp));
 	persistMgr->transferPtr(TMEMBER_PTR(_scValue));
 
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index afc33121ef..c8e0d8714a 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -524,12 +524,12 @@ bool BaseSprite::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_changed));
 	persistMgr->transferBool(TMEMBER(_paused));
 	persistMgr->transferBool(TMEMBER(_continuous));
-	persistMgr->transfer(TMEMBER(_currentFrame));
+	persistMgr->transferSint32(TMEMBER(_currentFrame));
 	persistMgr->transferBool(TMEMBER(_editorAllFrames));
-	persistMgr->transfer(TMEMBER(_editorBgAlpha));
+	persistMgr->transferSint32(TMEMBER(_editorBgAlpha));
 	persistMgr->transfer(TMEMBER(_editorBgFile));
-	persistMgr->transfer(TMEMBER(_editorBgOffsetX));
-	persistMgr->transfer(TMEMBER(_editorBgOffsetY));
+	persistMgr->transferSint32(TMEMBER(_editorBgOffsetX));
+	persistMgr->transferSint32(TMEMBER(_editorBgOffsetY));
 	persistMgr->transferBool(TMEMBER(_editorMuted));
 	persistMgr->transferBool(TMEMBER(_finished));
 
@@ -537,8 +537,8 @@ bool BaseSprite::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferUint32(TMEMBER(_lastFrameTime));
 	persistMgr->transferBool(TMEMBER(_looping));
-	persistMgr->transfer(TMEMBER(_moveX));
-	persistMgr->transfer(TMEMBER(_moveY));
+	persistMgr->transferSint32(TMEMBER(_moveX));
+	persistMgr->transferSint32(TMEMBER(_moveY));
 	persistMgr->transferPtr(TMEMBER_PTR(_owner));
 	persistMgr->transferBool(TMEMBER(_precise));
 	persistMgr->transferBool(TMEMBER(_streamed));
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index e214ef9d81..5d78dfa456 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -389,8 +389,8 @@ bool BaseSubFrame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferUint32(TMEMBER(_alpha));
 	persistMgr->transferBool(TMEMBER(_decoration));
 	persistMgr->transferBool(TMEMBER(_editorSelected));
-	persistMgr->transfer(TMEMBER(_hotspotX));
-	persistMgr->transfer(TMEMBER(_hotspotY));
+	persistMgr->transferSint32(TMEMBER(_hotspotX));
+	persistMgr->transferSint32(TMEMBER(_hotspotY));
 	persistMgr->transferRect32(TMEMBER(_rect));
 	persistMgr->transferBool(TMEMBER(_wantsDefaultRect));
 
@@ -399,7 +399,7 @@ bool BaseSubFrame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferByte(TMEMBER(_cKRed));
 	persistMgr->transferByte(TMEMBER(_cKGreen));
 	persistMgr->transferByte(TMEMBER(_cKBlue));
-	persistMgr->transfer(TMEMBER(_lifeTime));
+	persistMgr->transferSint32(TMEMBER(_lifeTime));
 
 	persistMgr->transferBool(TMEMBER(_keepLoaded));
 	persistMgr->transferBool(TMEMBER(_mirrorX));
diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp
index acc0ee7561..a6e8b17927 100644
--- a/engines/wintermute/base/base_viewport.cpp
+++ b/engines/wintermute/base/base_viewport.cpp
@@ -55,8 +55,8 @@ bool BaseViewport::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_gameRef));
 
 	persistMgr->transferPtr(TMEMBER_PTR(_mainObject));
-	persistMgr->transfer(TMEMBER(_offsetX));
-	persistMgr->transfer(TMEMBER(_offsetY));
+	persistMgr->transferSint32(TMEMBER(_offsetX));
+	persistMgr->transferSint32(TMEMBER(_offsetY));
 	persistMgr->transferRect32(TMEMBER(_rect));
 
 	return STATUS_OK;
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index dd54e5eb3f..95f9a83a6a 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -495,13 +495,13 @@ bool BaseFontBitmap::loadBuffer(char *buffer) {
 bool BaseFontBitmap::persist(BasePersistenceManager *persistMgr) {
 
 	BaseFont::persist(persistMgr);
-	persistMgr->transfer(TMEMBER(_numColumns));
+	persistMgr->transferSint32(TMEMBER(_numColumns));
 
 	persistMgr->transferPtr(TMEMBER_PTR(_subframe));
-	persistMgr->transfer(TMEMBER(_tileHeight));
-	persistMgr->transfer(TMEMBER(_tileWidth));
+	persistMgr->transferSint32(TMEMBER(_tileHeight));
+	persistMgr->transferSint32(TMEMBER(_tileWidth));
 	persistMgr->transferPtr(TMEMBER_PTR(_sprite));
-	persistMgr->transfer(TMEMBER(_widthsFrame));
+	persistMgr->transferSint32(TMEMBER(_widthsFrame));
 
 	if (persistMgr->getIsSaving()) {
 		persistMgr->putBytes(_widths, sizeof(_widths));
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 13e88f5734..ac975883a0 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -524,7 +524,7 @@ bool BaseFontTT::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_isItalic));
 	persistMgr->transferBool(TMEMBER(_isUnderline));
 	persistMgr->transferBool(TMEMBER(_isStriked));
-	persistMgr->transfer(TMEMBER(_fontHeight));
+	persistMgr->transferSint32(TMEMBER(_fontHeight));
 	persistMgr->transfer(TMEMBER(_fontFile));
 
 
@@ -532,13 +532,13 @@ bool BaseFontTT::persist(BasePersistenceManager *persistMgr) {
 	int32 numLayers;
 	if (persistMgr->getIsSaving()) {
 		numLayers = _layers.size();
-		persistMgr->transfer(TMEMBER(numLayers));
+		persistMgr->transferSint32(TMEMBER(numLayers));
 		for (int i = 0; i < numLayers; i++) {
 			_layers[i]->persist(persistMgr);
 		}
 	} else {
 		numLayers = _layers.size();
-		persistMgr->transfer(TMEMBER(numLayers));
+		persistMgr->transferSint32(TMEMBER(numLayers));
 		for (int i = 0; i < numLayers; i++) {
 			BaseTTFontLayer *layer = new BaseTTFontLayer;
 			layer->persist(persistMgr);
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h
index 47b9edd2b2..2d7ebba691 100644
--- a/engines/wintermute/base/font/base_font_truetype.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -84,8 +84,8 @@ public:
 		}
 
 		bool persist(BasePersistenceManager *persistMgr) {
-			persistMgr->transfer(TMEMBER(_offsetX));
-			persistMgr->transfer(TMEMBER(_offsetY));
+			persistMgr->transferSint32(TMEMBER(_offsetX));
+			persistMgr->transferSint32(TMEMBER(_offsetY));
 			persistMgr->transferUint32(TMEMBER(_color));
 			return STATUS_OK;
 		}
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 818010e00e..6bc27f06f4 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -175,10 +175,10 @@ void BaseRenderer::endSaveLoad() {
 void BaseRenderer::persistSaveLoadImages(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_loadImageName));
 	persistMgr->transfer(TMEMBER(_saveImageName));
-	persistMgr->transfer(TMEMBER(_saveImageX));
-	persistMgr->transfer(TMEMBER(_saveImageY));
-	persistMgr->transfer(TMEMBER(_loadImageX));
-	persistMgr->transfer(TMEMBER(_loadImageY));
+	persistMgr->transferSint32(TMEMBER(_saveImageX));
+	persistMgr->transferSint32(TMEMBER(_saveImageY));
+	persistMgr->transferSint32(TMEMBER(_loadImageX));
+	persistMgr->transferSint32(TMEMBER(_loadImageY));
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index bd59a7a667..73f98d15d9 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -1156,11 +1156,11 @@ const char *PartEmitter::scToString() {
 bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_width));
-	persistMgr->transfer(TMEMBER(_height));
+	persistMgr->transferSint32(TMEMBER(_width));
+	persistMgr->transferSint32(TMEMBER(_height));
 
-	persistMgr->transfer(TMEMBER(_angle1));
-	persistMgr->transfer(TMEMBER(_angle2));
+	persistMgr->transferSint32(TMEMBER(_angle1));
+	persistMgr->transferSint32(TMEMBER(_angle2));
 
 	persistMgr->transferFloat(TMEMBER(_velocity1));
 	persistMgr->transferFloat(TMEMBER(_velocity2));
@@ -1170,29 +1170,29 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferFloat(TMEMBER(_scale2));
 	persistMgr->transferBool(TMEMBER(_scaleZBased));
 
-	persistMgr->transfer(TMEMBER(_maxParticles));
+	persistMgr->transferSint32(TMEMBER(_maxParticles));
 
-	persistMgr->transfer(TMEMBER(_lifeTime1));
-	persistMgr->transfer(TMEMBER(_lifeTime2));
+	persistMgr->transferSint32(TMEMBER(_lifeTime1));
+	persistMgr->transferSint32(TMEMBER(_lifeTime2));
 	persistMgr->transferBool(TMEMBER(_lifeTimeZBased));
 
-	persistMgr->transfer(TMEMBER(_genInterval));
-	persistMgr->transfer(TMEMBER(_genAmount));
+	persistMgr->transferSint32(TMEMBER(_genInterval));
+	persistMgr->transferSint32(TMEMBER(_genAmount));
 
 	persistMgr->transferBool(TMEMBER(_running));
-	persistMgr->transfer(TMEMBER(_overheadTime));
+	persistMgr->transferSint32(TMEMBER(_overheadTime));
 
 	persistMgr->transferRect32(TMEMBER(_border));
-	persistMgr->transfer(TMEMBER(_borderThicknessLeft));
-	persistMgr->transfer(TMEMBER(_borderThicknessRight));
-	persistMgr->transfer(TMEMBER(_borderThicknessTop));
-	persistMgr->transfer(TMEMBER(_borderThicknessBottom));
+	persistMgr->transferSint32(TMEMBER(_borderThicknessLeft));
+	persistMgr->transferSint32(TMEMBER(_borderThicknessRight));
+	persistMgr->transferSint32(TMEMBER(_borderThicknessTop));
+	persistMgr->transferSint32(TMEMBER(_borderThicknessBottom));
 
-	persistMgr->transfer(TMEMBER(_fadeInTime));
-	persistMgr->transfer(TMEMBER(_fadeOutTime));
+	persistMgr->transferSint32(TMEMBER(_fadeInTime));
+	persistMgr->transferSint32(TMEMBER(_fadeOutTime));
 
-	persistMgr->transfer(TMEMBER(_alpha1));
-	persistMgr->transfer(TMEMBER(_alpha2));
+	persistMgr->transferSint32(TMEMBER(_alpha1));
+	persistMgr->transferSint32(TMEMBER(_alpha2));
 	persistMgr->transferBool(TMEMBER(_alphaTimeBased));
 
 	persistMgr->transferFloat(TMEMBER(_angVelocity1));
@@ -1207,8 +1207,8 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferBool(TMEMBER(_useRegion));
 
-	persistMgr->transfer(TMEMBER_INT(_maxBatches));
-	persistMgr->transfer(TMEMBER_INT(_batchesGenerated));
+	persistMgr->transferSint32(TMEMBER_INT(_maxBatches));
+	persistMgr->transferSint32(TMEMBER_INT(_batchesGenerated));
 
 	persistMgr->transfer(TMEMBER(_emitEvent));
 	persistMgr->transferPtr(TMEMBER_PTR(_owner));
diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp
index e7583e554a..4355e654c0 100644
--- a/engines/wintermute/base/particles/part_force.cpp
+++ b/engines/wintermute/base/particles/part_force.cpp
@@ -57,7 +57,7 @@ bool PartForce::persist(BasePersistenceManager *persistMgr) {
 	}
 	persistMgr->transferVector2(TMEMBER(_pos));
 	persistMgr->transferVector2(TMEMBER(_direction));
-	persistMgr->transfer(TMEMBER_INT(_type));
+	persistMgr->transferSint32(TMEMBER_INT(_type));
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 62faf73e7e..7c38f5477b 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -230,25 +230,25 @@ bool PartParticle::fadeOut(uint32 currentTime, int fadeTime) {
 
 //////////////////////////////////////////////////////////////////////////
 bool PartParticle::persist(BasePersistenceManager *persistMgr) {
-	persistMgr->transfer(TMEMBER(_alpha1));
-	persistMgr->transfer(TMEMBER(_alpha2));
+	persistMgr->transferSint32(TMEMBER(_alpha1));
+	persistMgr->transferSint32(TMEMBER(_alpha2));
 	persistMgr->transferRect32(TMEMBER(_border));
 	persistMgr->transferVector2(TMEMBER(_pos));
 	persistMgr->transferFloat(TMEMBER(_posZ));
 	persistMgr->transferVector2(TMEMBER(_velocity));
 	persistMgr->transferFloat(TMEMBER(_scale));
 	persistMgr->transferUint32(TMEMBER(_creationTime));
-	persistMgr->transfer(TMEMBER(_lifeTime));
+	persistMgr->transferSint32(TMEMBER(_lifeTime));
 	persistMgr->transferBool(TMEMBER(_isDead));
-	persistMgr->transfer(TMEMBER_INT(_state));
+	persistMgr->transferSint32(TMEMBER_INT(_state));
 	persistMgr->transferUint32(TMEMBER(_fadeStart));
-	persistMgr->transfer(TMEMBER(_fadeTime));
-	persistMgr->transfer(TMEMBER(_currentAlpha));
+	persistMgr->transferSint32(TMEMBER(_fadeTime));
+	persistMgr->transferSint32(TMEMBER(_currentAlpha));
 	persistMgr->transferFloat(TMEMBER(_angVelocity));
 	persistMgr->transferFloat(TMEMBER(_rotation));
 	persistMgr->transferFloat(TMEMBER(_growthRate));
 	persistMgr->transferBool(TMEMBER(_exponentialGrowth));
-	persistMgr->transfer(TMEMBER(_fadeStartAlpha));
+	persistMgr->transferSint32(TMEMBER(_fadeStartAlpha));
 
 	if (persistMgr->getIsSaving()) {
 		const char *filename = _sprite->getFilename();
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index e3f8219782..ebe9758c49 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -1254,7 +1254,7 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
 		} else {
 			// don't save idle/finished scripts
 			int32 bufferSize = 0;
-			persistMgr->transfer(TMEMBER(bufferSize));
+			persistMgr->transferSint32(TMEMBER(bufferSize));
 		}
 	} else {
 		persistMgr->transferUint32(TMEMBER(_bufferSize));
@@ -1270,7 +1270,7 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
 	}
 
 	persistMgr->transferPtr(TMEMBER_PTR(_callStack));
-	persistMgr->transfer(TMEMBER(_currentLine));
+	persistMgr->transferSint32(TMEMBER(_currentLine));
 	persistMgr->transferPtr(TMEMBER_PTR(_engine));
 	persistMgr->transfer(TMEMBER(_filename));
 	persistMgr->transferBool(TMEMBER(_freezable));
@@ -1278,9 +1278,9 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferUint32(TMEMBER(_iP));
 	persistMgr->transferPtr(TMEMBER_PTR(_scopeStack));
 	persistMgr->transferPtr(TMEMBER_PTR(_stack));
-	persistMgr->transfer(TMEMBER_INT(_state));
+	persistMgr->transferSint32(TMEMBER_INT(_state));
 	persistMgr->transferPtr(TMEMBER_PTR(_operand));
-	persistMgr->transfer(TMEMBER_INT(_origState));
+	persistMgr->transferSint32(TMEMBER_INT(_origState));
 	persistMgr->transferPtr(TMEMBER_PTR(_owner));
 	persistMgr->transferPtr(TMEMBER_PTR(_reg1));
 	persistMgr->transferBool(TMEMBER(_thread));
diff --git a/engines/wintermute/base/scriptables/script_ext_array.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp
index 7f1c769ec5..c4ad045557 100644
--- a/engines/wintermute/base/scriptables/script_ext_array.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_array.cpp
@@ -214,7 +214,7 @@ bool SXArray::scSetProperty(const char *name, ScValue *value) {
 bool SXArray::persist(BasePersistenceManager *persistMgr) {
 	BaseScriptable::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_length));
+	persistMgr->transferSint32(TMEMBER(_length));
 	persistMgr->transferPtr(TMEMBER_PTR(_values));
 
 	return STATUS_OK;
diff --git a/engines/wintermute/base/scriptables/script_ext_date.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp
index d88bfc5851..6b9c5ff68a 100644
--- a/engines/wintermute/base/scriptables/script_ext_date.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_date.cpp
@@ -243,15 +243,15 @@ bool SXDate::persist(BasePersistenceManager *persistMgr) {
 	int32 hour = _tm.tm_hour;
 	int32 min = _tm.tm_min;
 	int32 sec = _tm.tm_sec;
-	persistMgr->transfer(TMEMBER(year));
-	persistMgr->transfer(TMEMBER(mon));
-	persistMgr->transfer(TMEMBER(mday));
-	persistMgr->transfer(TMEMBER(hour));
-	persistMgr->transfer(TMEMBER(min));
-	persistMgr->transfer(TMEMBER(sec));
+	persistMgr->transferSint32(TMEMBER(year));
+	persistMgr->transferSint32(TMEMBER(mon));
+	persistMgr->transferSint32(TMEMBER(mday));
+	persistMgr->transferSint32(TMEMBER(hour));
+	persistMgr->transferSint32(TMEMBER(min));
+	persistMgr->transferSint32(TMEMBER(sec));
 	if (persistMgr->checkVersion(1, 2, 1)) {
 		int32 wday = _tm.tm_wday;
-		persistMgr->transfer(TMEMBER(wday));
+		persistMgr->transferSint32(TMEMBER(wday));
 		_tm.tm_wday = wday;
 	}
 	_tm.tm_year = year;
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
index fad2f926ad..cb1648608b 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -767,7 +767,7 @@ bool SXFile::persist(BasePersistenceManager *persistMgr) {
 	BaseScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_filename));
-	persistMgr->transfer(TMEMBER(_mode));
+	persistMgr->transferSint32(TMEMBER(_mode));
 	persistMgr->transferBool(TMEMBER(_textMode));
 
 	uint32 pos = 0;
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
index 6a47c09136..39f8b58644 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
@@ -498,7 +498,7 @@ bool SXMemBuffer::persist(BasePersistenceManager *persistMgr) {
 
 	BaseScriptable::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_size));
+	persistMgr->transferSint32(TMEMBER(_size));
 
 	if (persistMgr->getIsSaving()) {
 		if (_size > 0) {
diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp
index 2f2422cdf9..b6d284442d 100644
--- a/engines/wintermute/base/scriptables/script_ext_string.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_string.cpp
@@ -406,7 +406,7 @@ bool SXString::persist(BasePersistenceManager *persistMgr) {
 
 	BaseScriptable::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_capacity));
+	persistMgr->transferSint32(TMEMBER(_capacity));
 
 	if (persistMgr->getIsSaving()) {
 		if (_capacity > 0) {
diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp
index 801ac6ab52..c828b3918e 100644
--- a/engines/wintermute/base/scriptables/script_stack.cpp
+++ b/engines/wintermute/base/scriptables/script_stack.cpp
@@ -186,7 +186,7 @@ bool ScStack::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferPtr(TMEMBER_PTR(_gameRef));
 
-	persistMgr->transfer(TMEMBER(_sP));
+	persistMgr->transferSint32(TMEMBER(_sP));
 	_values.persist(persistMgr);
 
 	return STATUS_OK;
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index 5b275746c0..94e66fccb1 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -793,17 +793,17 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferBool(TMEMBER(_persistent));
 	persistMgr->transferBool(TMEMBER(_isConstVar));
-	persistMgr->transfer(TMEMBER_INT(_type));
+	persistMgr->transferSint32(TMEMBER_INT(_type));
 	persistMgr->transferBool(TMEMBER(_valBool));
 	persistMgr->transferDouble(TMEMBER(_valFloat));
-	persistMgr->transfer(TMEMBER(_valInt));
+	persistMgr->transferSint32(TMEMBER(_valInt));
 	persistMgr->transferPtr(TMEMBER_PTR(_valNative));
 
 	int32 size;
 	const char *str;
 	if (persistMgr->getIsSaving()) {
 		size = _valObject.size();
-		persistMgr->transfer("", &size);
+		persistMgr->transferSint32("", &size);
 		_valIter = _valObject.begin();
 		while (_valIter != _valObject.end()) {
 			str = _valIter->_key.c_str();
@@ -814,7 +814,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
 		}
 	} else {
 		ScValue *val = nullptr;
-		persistMgr->transfer("", &size);
+		persistMgr->transferSint32("", &size);
 		for (int i = 0; i < size; i++) {
 			persistMgr->transfer("", &str);
 			persistMgr->transferPtr("", &val);
diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp
index 9fc58713a4..11408c27c3 100644
--- a/engines/wintermute/base/sound/base_sound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -172,9 +172,9 @@ bool BaseSound::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferBool(TMEMBER(_soundFreezePaused));
 	persistMgr->transferBool(TMEMBER(_soundPlaying));
 	persistMgr->transferUint32(TMEMBER(_soundPosition));
-	persistMgr->transfer(TMEMBER(_soundPrivateVolume));
+	persistMgr->transferSint32(TMEMBER(_soundPrivateVolume));
 	persistMgr->transferBool(TMEMBER(_soundStreamed));
-	persistMgr->transfer(TMEMBER_INT(_soundType));
+	persistMgr->transferSint32(TMEMBER_INT(_soundType));
 	persistMgr->transferUint32(TMEMBER(_soundLoopStart));
 
 	return STATUS_OK;