[Scummvm-cvs-logs] scummvm master -> 6b4adab654461646a3873b7ad39a283feeb29037

somaen einarjohants at gmail.com
Mon Oct 28 19:19:42 CET 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:
6b4adab654 WINTERMUTE: Transfer booleans explicitly when saving/loading.


Commit: 6b4adab654461646a3873b7ad39a283feeb29037
    https://github.com/scummvm/scummvm/commit/6b4adab654461646a3873b7ad39a283feeb29037
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-10-28T11:19:12-07:00

Commit Message:
WINTERMUTE: Transfer booleans explicitly when saving/loading.

Changed paths:
    engines/wintermute/ad/ad_game.cpp
    engines/wintermute/ad/ad_inventory_box.cpp
    engines/wintermute/ad/ad_item.cpp
    engines/wintermute/ad/ad_layer.cpp
    engines/wintermute/ad/ad_node_state.cpp
    engines/wintermute/ad/ad_object.cpp
    engines/wintermute/ad/ad_path.cpp
    engines/wintermute/ad/ad_path_point.cpp
    engines/wintermute/ad/ad_region.cpp
    engines/wintermute/ad/ad_response_box.cpp
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/ad/ad_sentence.cpp
    engines/wintermute/ad/ad_talk_node.cpp
    engines/wintermute/ad/ad_waypoint_group.cpp
    engines/wintermute/base/base_fader.cpp
    engines/wintermute/base/base_frame.cpp
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/base_game_music.cpp
    engines/wintermute/base/base_keyboard_state.cpp
    engines/wintermute/base/base_object.cpp
    engines/wintermute/base/base_persistence_manager.cpp
    engines/wintermute/base/base_persistence_manager.h
    engines/wintermute/base/base_region.cpp
    engines/wintermute/base/base_script_holder.cpp
    engines/wintermute/base/base_sprite.cpp
    engines/wintermute/base/base_sub_frame.cpp
    engines/wintermute/base/font/base_font_bitmap.cpp
    engines/wintermute/base/font/base_font_truetype.cpp
    engines/wintermute/base/particles/part_emitter.cpp
    engines/wintermute/base/particles/part_particle.cpp
    engines/wintermute/base/scriptables/script.cpp
    engines/wintermute/base/scriptables/script_ext_file.cpp
    engines/wintermute/base/scriptables/script_value.cpp
    engines/wintermute/base/sound/base_sound.cpp
    engines/wintermute/ui/ui_button.cpp
    engines/wintermute/ui/ui_object.cpp
    engines/wintermute/ui/ui_window.cpp
    engines/wintermute/video/video_theora_player.cpp



diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 86f470b..3af43ca 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -1425,7 +1425,7 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) {
 	_responsesGame.persist(persistMgr);
 	persistMgr->transferPtr(TMEMBER_PTR(_scene));
 	_sceneStates.persist(persistMgr);
-	persistMgr->transfer(TMEMBER(_scheduledFadeIn));
+	persistMgr->transferBool(TMEMBER(_scheduledFadeIn));
 	persistMgr->transfer(TMEMBER(_scheduledScene));
 	persistMgr->transferPtr(TMEMBER_PTR(_selectedItem));
 	persistMgr->transfer(TMEMBER_INT(_talkSkipButton));
@@ -1434,18 +1434,18 @@ bool AdGame::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferPtr(TMEMBER_PTR(_sceneViewport));
 	persistMgr->transfer(TMEMBER_INT(_stateEx));
-	persistMgr->transfer(TMEMBER(_initialScene));
+	persistMgr->transferBool(TMEMBER(_initialScene));
 	persistMgr->transfer(TMEMBER(_debugStartupScene));
 
 	persistMgr->transferPtr(TMEMBER_PTR(_invObject));
 	persistMgr->transferPtr(TMEMBER_PTR(_inventoryOwner));
-	persistMgr->transfer(TMEMBER(_tempDisableSaveState));
+	persistMgr->transferBool(TMEMBER(_tempDisableSaveState));
 	_items.persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_itemsFile));
 
 	_speechDirs.persist(persistMgr);
-	persistMgr->transfer(TMEMBER(_smartItemCursor));
+	persistMgr->transferBool(TMEMBER(_smartItemCursor));
 
 	if (!persistMgr->getIsSaving()) {
 		_initialScene = false;
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 4c904e7..61e3929 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -372,16 +372,16 @@ bool AdInventoryBox::persist(BasePersistenceManager *persistMgr) {
 	BaseObject::persist(persistMgr);
 
 	persistMgr->transferPtr(TMEMBER_PTR(_closeButton));
-	persistMgr->transfer(TMEMBER(_hideSelected));
+	persistMgr->transferBool(TMEMBER(_hideSelected));
 	persistMgr->transfer(TMEMBER(_itemHeight));
 	persistMgr->transfer(TMEMBER(_itemsArea));
 	persistMgr->transfer(TMEMBER(_itemWidth));
 	persistMgr->transfer(TMEMBER(_scrollBy));
 	persistMgr->transfer(TMEMBER(_scrollOffset));
 	persistMgr->transfer(TMEMBER(_spacing));
-	persistMgr->transfer(TMEMBER(_visible));
+	persistMgr->transferBool(TMEMBER(_visible));
 	persistMgr->transferPtr(TMEMBER_PTR(_window));
-	persistMgr->transfer(TMEMBER(_exclusive));
+	persistMgr->transferBool(TMEMBER(_exclusive));
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index f9741d1..ae249de 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -783,12 +783,12 @@ bool AdItem::persist(BasePersistenceManager *persistMgr) {
 
 	AdTalkHolder::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_cursorCombined));
+	persistMgr->transferBool(TMEMBER(_cursorCombined));
 	persistMgr->transferPtr(TMEMBER_PTR(_cursorHover));
 	persistMgr->transferPtr(TMEMBER_PTR(_cursorNormal));
 	persistMgr->transferPtr(TMEMBER_PTR(_spriteHover));
-	persistMgr->transfer(TMEMBER(_inInventory));
-	persistMgr->transfer(TMEMBER(_displayAmount));
+	persistMgr->transferBool(TMEMBER(_inInventory));
+	persistMgr->transferBool(TMEMBER(_displayAmount));
 	persistMgr->transfer(TMEMBER(_amount));
 	persistMgr->transfer(TMEMBER(_amountOffsetX));
 	persistMgr->transfer(TMEMBER(_amountOffsetY));
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 752700d..7bbdf27 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -551,10 +551,10 @@ bool AdLayer::persist(BasePersistenceManager *persistMgr) {
 
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_active));
-	persistMgr->transfer(TMEMBER(_closeUp));
+	persistMgr->transferBool(TMEMBER(_active));
+	persistMgr->transferBool(TMEMBER(_closeUp));
 	persistMgr->transfer(TMEMBER(_height));
-	persistMgr->transfer(TMEMBER(_main));
+	persistMgr->transferBool(TMEMBER(_main));
 	_nodes.persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_width));
 
diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp
index 876c5a8..193aa75 100644
--- a/engines/wintermute/ad/ad_node_state.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -95,7 +95,7 @@ void AdNodeState::setCursor(const char *filename) {
 bool AdNodeState::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_gameRef));
 
-	persistMgr->transfer(TMEMBER(_active));
+	persistMgr->transferBool(TMEMBER(_active));
 	persistMgr->transfer(TMEMBER(_name));
 	persistMgr->transfer(TMEMBER(_filename));
 	persistMgr->transfer(TMEMBER(_cursor));
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 349181b..6ab2e9b 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -1030,29 +1030,29 @@ bool AdObject::reset() {
 bool AdObject::persist(BasePersistenceManager *persistMgr) {
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_active));
+	persistMgr->transferBool(TMEMBER(_active));
 	persistMgr->transferPtr(TMEMBER_PTR(_blockRegion));
 	persistMgr->transferPtr(TMEMBER_PTR(_currentBlockRegion));
 	persistMgr->transferPtr(TMEMBER_PTR(_currentWptGroup));
 	persistMgr->transferPtr(TMEMBER_PTR(_currentSprite));
-	persistMgr->transfer(TMEMBER(_drawn));
+	persistMgr->transferBool(TMEMBER(_drawn));
 	persistMgr->transferPtr(TMEMBER_PTR(_font));
-	persistMgr->transfer(TMEMBER(_ignoreItems));
+	persistMgr->transferBool(TMEMBER(_ignoreItems));
 	persistMgr->transfer(TMEMBER_INT(_nextState));
 	persistMgr->transferPtr(TMEMBER_PTR(_sentence));
 	persistMgr->transfer(TMEMBER_INT(_state));
 	persistMgr->transferPtr(TMEMBER_PTR(_animSprite));
-	persistMgr->transfer(TMEMBER(_sceneIndependent));
+	persistMgr->transferBool(TMEMBER(_sceneIndependent));
 	persistMgr->transfer(TMEMBER(_forcedTalkAnimName));
-	persistMgr->transfer(TMEMBER(_forcedTalkAnimUsed));
+	persistMgr->transferBool(TMEMBER(_forcedTalkAnimUsed));
 	persistMgr->transferPtr(TMEMBER_PTR(_tempSprite2));
 	persistMgr->transfer(TMEMBER_INT(_type));
 	persistMgr->transferPtr(TMEMBER_PTR(_wptGroup));
 	persistMgr->transferPtr(TMEMBER_PTR(_stickRegion));
-	persistMgr->transfer(TMEMBER(_subtitlesModRelative));
+	persistMgr->transferBool(TMEMBER(_subtitlesModRelative));
 	persistMgr->transfer(TMEMBER(_subtitlesModX));
 	persistMgr->transfer(TMEMBER(_subtitlesModY));
-	persistMgr->transfer(TMEMBER(_subtitlesModXCenter));
+	persistMgr->transferBool(TMEMBER(_subtitlesModXCenter));
 	persistMgr->transfer(TMEMBER(_subtitlesWidth));
 	persistMgr->transferPtr(TMEMBER_PTR(_inventory));
 	persistMgr->transferPtr(TMEMBER_PTR(_partEmitter));
@@ -1065,7 +1065,7 @@ bool AdObject::persist(BasePersistenceManager *persistMgr) {
 	_attachmentsPost.persist(persistMgr);
 	persistMgr->transferPtr(TMEMBER_PTR(_registerAlias));
 
-	persistMgr->transfer(TMEMBER(_partFollowParent));
+	persistMgr->transferBool(TMEMBER(_partFollowParent));
 	persistMgr->transfer(TMEMBER(_partOffsetX));
 	persistMgr->transfer(TMEMBER(_partOffsetY));
 
diff --git a/engines/wintermute/ad/ad_path.cpp b/engines/wintermute/ad/ad_path.cpp
index 91a24cb..bdb7eba 100644
--- a/engines/wintermute/ad/ad_path.cpp
+++ b/engines/wintermute/ad/ad_path.cpp
@@ -112,7 +112,7 @@ bool AdPath::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(_currIndex));
 	_points.persist(persistMgr);
-	persistMgr->transfer(TMEMBER(_ready));
+	persistMgr->transferBool(TMEMBER(_ready));
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/ad/ad_path_point.cpp b/engines/wintermute/ad/ad_path_point.cpp
index d5108ad..3e99d12 100644
--- a/engines/wintermute/ad/ad_path_point.cpp
+++ b/engines/wintermute/ad/ad_path_point.cpp
@@ -66,7 +66,7 @@ bool AdPathPoint::persist(BasePersistenceManager *persistMgr) {
 	BasePoint::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_distance));
-	persistMgr->transfer(TMEMBER(_marked));
+	persistMgr->transferBool(TMEMBER(_marked));
 	persistMgr->transferPtr(TMEMBER_PTR(_origin));
 
 	return STATUS_OK;
diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index 1c0cf41..215ec49 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -402,8 +402,8 @@ bool AdRegion::persist(BasePersistenceManager *persistMgr) {
 	BaseRegion::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_alpha));
-	persistMgr->transfer(TMEMBER(_blocked));
-	persistMgr->transfer(TMEMBER(_decoration));
+	persistMgr->transferBool(TMEMBER(_blocked));
+	persistMgr->transferBool(TMEMBER(_decoration));
 	persistMgr->transferFloat(TMEMBER(_zoom));
 
 	return STATUS_OK;
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 2a5adb9..7ad3380 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -583,7 +583,7 @@ bool AdResponseBox::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferPtr(TMEMBER_PTR(_font));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontHover));
-	persistMgr->transfer(TMEMBER(_horizontal));
+	persistMgr->transferBool(TMEMBER(_horizontal));
 	persistMgr->transfer(TMEMBER(_lastResponseText));
 	persistMgr->transfer(TMEMBER(_lastResponseTextOrig));
 	_respButtons.persist(persistMgr);
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index bc8d9e9..296ef43 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -2300,7 +2300,7 @@ float AdScene::getScaleAt(int Y) {
 bool AdScene::persist(BasePersistenceManager *persistMgr) {
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_autoScroll));
+	persistMgr->transferBool(TMEMBER(_autoScroll));
 	persistMgr->transfer(TMEMBER(_editorColBlocked));
 	persistMgr->transfer(TMEMBER(_editorColBlockedSel));
 	persistMgr->transfer(TMEMBER(_editorColDecor));
@@ -2315,14 +2315,14 @@ bool AdScene::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_editorColWaypointsSel));
 	persistMgr->transfer(TMEMBER(_editorMarginH));
 	persistMgr->transfer(TMEMBER(_editorMarginV));
-	persistMgr->transfer(TMEMBER(_editorShowBlocked));
-	persistMgr->transfer(TMEMBER(_editorShowDecor));
-	persistMgr->transfer(TMEMBER(_editorShowEntities));
-	persistMgr->transfer(TMEMBER(_editorShowRegions));
-	persistMgr->transfer(TMEMBER(_editorShowScale));
+	persistMgr->transferBool(TMEMBER(_editorShowBlocked));
+	persistMgr->transferBool(TMEMBER(_editorShowDecor));
+	persistMgr->transferBool(TMEMBER(_editorShowEntities));
+	persistMgr->transferBool(TMEMBER(_editorShowRegions));
+	persistMgr->transferBool(TMEMBER(_editorShowScale));
 	persistMgr->transferPtr(TMEMBER_PTR(_fader));
 	persistMgr->transfer(TMEMBER(_height));
-	persistMgr->transfer(TMEMBER(_initialized));
+	persistMgr->transferBool(TMEMBER(_initialized));
 	persistMgr->transfer(TMEMBER(_lastTimeH));
 	persistMgr->transfer(TMEMBER(_lastTimeV));
 	_layers.persist(persistMgr);
@@ -2330,13 +2330,13 @@ bool AdScene::persist(BasePersistenceManager *persistMgr) {
 	_objects.persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_offsetLeft));
 	persistMgr->transfer(TMEMBER(_offsetTop));
-	persistMgr->transfer(TMEMBER(_paralaxScrolling));
-	persistMgr->transfer(TMEMBER(_persistentState));
-	persistMgr->transfer(TMEMBER(_persistentStateSprites));
+	persistMgr->transferBool(TMEMBER(_paralaxScrolling));
+	persistMgr->transferBool(TMEMBER(_persistentState));
+	persistMgr->transferBool(TMEMBER(_persistentStateSprites));
 	persistMgr->transfer(TMEMBER(_pfMaxTime));
 	_pfPath.persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_pfPointsNum));
-	persistMgr->transfer(TMEMBER(_pfReady));
+	persistMgr->transferBool(TMEMBER(_pfReady));
 	persistMgr->transferPtr(TMEMBER_PTR(_pfRequester));
 	persistMgr->transferPtr(TMEMBER_PTR(_pfTarget));
 	persistMgr->transferPtr(TMEMBER_PTR(_pfTargetPath));
diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index d5baa82..e742ffa 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -257,15 +257,15 @@ bool AdSentence::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_font));
 	persistMgr->transfer(TMEMBER(_pos));
 	persistMgr->transferPtr(TMEMBER_PTR(_sound));
-	persistMgr->transfer(TMEMBER(_soundStarted));
+	persistMgr->transferBool(TMEMBER(_soundStarted));
 	persistMgr->transfer(TMEMBER(_stances));
 	persistMgr->transfer(TMEMBER(_startTime));
 	persistMgr->transferPtr(TMEMBER_PTR(_talkDef));
 	persistMgr->transfer(TMEMBER(_tempStance));
 	persistMgr->transfer(TMEMBER(_text));
 	persistMgr->transfer(TMEMBER(_width));
-	persistMgr->transfer(TMEMBER(_fixedPos));
-	persistMgr->transfer(TMEMBER(_freezable));
+	persistMgr->transferBool(TMEMBER(_fixedPos));
+	persistMgr->transferBool(TMEMBER(_freezable));
 
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp
index eca4535..b9be62e 100644
--- a/engines/wintermute/ad/ad_talk_node.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -194,7 +194,7 @@ bool AdTalkNode::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_comment));
 	persistMgr->transfer(TMEMBER(_startTime));
 	persistMgr->transfer(TMEMBER(_endTime));
-	persistMgr->transfer(TMEMBER(_playToEnd));
+	persistMgr->transferBool(TMEMBER(_playToEnd));
 	persistMgr->transferPtr(TMEMBER_PTR(_sprite));
 	persistMgr->transfer(TMEMBER(_spriteFilename));
 	persistMgr->transferPtr(TMEMBER_PTR(_spriteSet));
diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index f7735a4..a8d474b 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -194,7 +194,7 @@ bool AdWaypointGroup::persist(BasePersistenceManager *persistMgr) {
 
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_active));
+	persistMgr->transferBool(TMEMBER(_active));
 	persistMgr->transfer(TMEMBER(_editorSelectedPoint));
 	persistMgr->transferFloat(TMEMBER(_lastMimicScale));
 	persistMgr->transfer(TMEMBER(_lastMimicX));
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index 7978230..a2408b6 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -175,7 +175,7 @@ uint32 BaseFader::getCurrentColor() const {
 bool BaseFader::persist(BasePersistenceManager *persistMgr) {
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_active));
+	persistMgr->transferBool(TMEMBER(_active));
 	persistMgr->transfer(TMEMBER(_blue));
 	persistMgr->transfer(TMEMBER(_currentAlpha));
 	persistMgr->transfer(TMEMBER(_duration));
@@ -184,7 +184,7 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_sourceAlpha));
 	persistMgr->transfer(TMEMBER(_startTime));
 	persistMgr->transfer(TMEMBER(_targetAlpha));
-	persistMgr->transfer(TMEMBER(_system));
+	persistMgr->transferBool(TMEMBER(_system));
 
 	if (_system && !persistMgr->getIsSaving()) {
 		_startTime = 0;
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index 1af8be0..0a17ee7 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -415,9 +415,9 @@ bool BaseFrame::persist(BasePersistenceManager *persistMgr) {
 
 	_applyEvent.persist(persistMgr);
 	persistMgr->transfer(TMEMBER(_delay));
-	persistMgr->transfer(TMEMBER(_editorExpanded));
-	persistMgr->transfer(TMEMBER(_keyframe));
-	persistMgr->transfer(TMEMBER(_killSound));
+	persistMgr->transferBool(TMEMBER(_editorExpanded));
+	persistMgr->transferBool(TMEMBER(_keyframe));
+	persistMgr->transferBool(TMEMBER(_killSound));
 	persistMgr->transfer(TMEMBER(_moveX));
 	persistMgr->transfer(TMEMBER(_moveY));
 	persistMgr->transferPtr(TMEMBER_PTR(_sound));
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 0d8af0c..04a52ca 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3054,12 +3054,12 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_activeObject));
 	persistMgr->transferPtr(TMEMBER_PTR(_capturedObject));
 	persistMgr->transferPtr(TMEMBER_PTR(_cursorNoninteractive));
-	persistMgr->transfer(TMEMBER(_editorMode));
+	persistMgr->transferBool(TMEMBER(_editorMode));
 	persistMgr->transferPtr(TMEMBER_PTR(_fader));
 	persistMgr->transfer(TMEMBER(_freezeLevel));
 	persistMgr->transferPtr(TMEMBER_PTR(_focusedWindow));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontStorage));
-	persistMgr->transfer(TMEMBER(_interactive));
+	persistMgr->transferBool(TMEMBER(_interactive));
 	persistMgr->transferPtr(TMEMBER_PTR(_keyboardState));
 	persistMgr->transfer(TMEMBER(_lastTime));
 	persistMgr->transferPtr(TMEMBER_PTR(_mainObject));
@@ -3071,10 +3071,10 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferFloat(TMEMBER(_offsetPercentX));
 	persistMgr->transferFloat(TMEMBER(_offsetPercentY));
 
-	persistMgr->transfer(TMEMBER(_origInteractive));
+	persistMgr->transferBool(TMEMBER(_origInteractive));
 	persistMgr->transfer(TMEMBER_INT(_origState));
-	persistMgr->transfer(TMEMBER(_personalizedSave));
-	persistMgr->transfer(TMEMBER(_quitting));
+	persistMgr->transferBool(TMEMBER(_personalizedSave));
+	persistMgr->transferBool(TMEMBER(_quitting));
 
 	_regObjects.persist(persistMgr);
 
@@ -3082,11 +3082,11 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	//persistMgr->transfer(TMEMBER(_soundMgr));
 	persistMgr->transfer(TMEMBER_INT(_state));
 	//persistMgr->transfer(TMEMBER(_surfaceStorage));
-	persistMgr->transfer(TMEMBER(_subtitles));
+	persistMgr->transferBool(TMEMBER(_subtitles));
 	persistMgr->transfer(TMEMBER(_subtitlesSpeed));
 	persistMgr->transferPtr(TMEMBER_PTR(_systemFont));
 	persistMgr->transferPtr(TMEMBER_PTR(_videoFont));
-	persistMgr->transfer(TMEMBER(_videoSubtitles));
+	persistMgr->transferBool(TMEMBER(_videoSubtitles));
 
 	_timerNormal.persist(persistMgr);
 	_timerLive.persist(persistMgr);
@@ -3094,21 +3094,21 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 	_renderer->persistSaveLoadImages(persistMgr);
 
 	persistMgr->transfer(TMEMBER_INT(_textEncoding));
-	persistMgr->transfer(TMEMBER(_textRTL));
+	persistMgr->transferBool(TMEMBER(_textRTL));
 
 	persistMgr->transfer(TMEMBER(_soundBufferSizeSec));
-	persistMgr->transfer(TMEMBER(_suspendedRendering));
+	persistMgr->transferBool(TMEMBER(_suspendedRendering));
 
 	persistMgr->transfer(TMEMBER(_mouseLockRect));
 
 	_windows.persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_suppressScriptErrors));
-	persistMgr->transfer(TMEMBER(_autorunDisabled));
+	persistMgr->transferBool(TMEMBER(_suppressScriptErrors));
+	persistMgr->transferBool(TMEMBER(_autorunDisabled));
 
-	persistMgr->transfer(TMEMBER(_autoSaveOnExit));
+	persistMgr->transferBool(TMEMBER(_autoSaveOnExit));
 	persistMgr->transfer(TMEMBER(_autoSaveSlot));
-	persistMgr->transfer(TMEMBER(_cursorHidden));
+	persistMgr->transferBool(TMEMBER(_cursorHidden));
 
 	if (!persistMgr->getIsSaving()) {
 		_quitting = false;
diff --git a/engines/wintermute/base/base_game_music.cpp b/engines/wintermute/base/base_game_music.cpp
index c50969d..9462757 100644
--- a/engines/wintermute/base/base_game_music.cpp
+++ b/engines/wintermute/base/base_game_music.cpp
@@ -221,12 +221,12 @@ bool BaseGameMusic::persistChannels(BasePersistenceManager *persistMgr) {
 }
 
 bool BaseGameMusic::persistCrossfadeSettings(BasePersistenceManager *persistMgr) {
-	persistMgr->transfer(TMEMBER(_musicCrossfadeRunning));
+	persistMgr->transferBool(TMEMBER(_musicCrossfadeRunning));
 	persistMgr->transfer(TMEMBER(_musicCrossfadeStartTime));
 	persistMgr->transfer(TMEMBER(_musicCrossfadeLength));
 	persistMgr->transfer(TMEMBER(_musicCrossfadeChannel1));
 	persistMgr->transfer(TMEMBER(_musicCrossfadeChannel2));
-	persistMgr->transfer(TMEMBER(_musicCrossfadeSwap));
+	persistMgr->transferBool(TMEMBER(_musicCrossfadeSwap));
 	return true;
 }
 
diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index aeb56ad..014802d 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -221,12 +221,12 @@ bool BaseKeyboardState::persist(BasePersistenceManager *persistMgr) {
 	//if (!persistMgr->getIsSaving()) cleanup();
 	BaseScriptable::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_currentAlt));
+	persistMgr->transferBool(TMEMBER(_currentAlt));
 	persistMgr->transfer(TMEMBER(_currentCharCode));
-	persistMgr->transfer(TMEMBER(_currentControl));
+	persistMgr->transferBool(TMEMBER(_currentControl));
 	persistMgr->transfer(TMEMBER(_currentKeyData));
-	persistMgr->transfer(TMEMBER(_currentPrintable));
-	persistMgr->transfer(TMEMBER(_currentShift));
+	persistMgr->transferBool(TMEMBER(_currentPrintable));
+	persistMgr->transferBool(TMEMBER(_currentShift));
 
 	if (!persistMgr->getIsSaving()) {
 		_keyStates = new uint8[323]; // Hardcoded size for the common/keyboard.h enum
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index f9cedbd..70b2c6a 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -957,40 +957,40 @@ bool BaseObject::persist(BasePersistenceManager *persistMgr) {
 	}
 	persistMgr->transferPtr(TMEMBER_PTR(_activeCursor));
 	persistMgr->transfer(TMEMBER(_alphaColor));
-	persistMgr->transfer(TMEMBER(_autoSoundPanning));
+	persistMgr->transferBool(TMEMBER(_autoSoundPanning));
 	persistMgr->transferPtr(TMEMBER_PTR(_cursor));
-	persistMgr->transfer(TMEMBER(_sharedCursors));
-	persistMgr->transfer(TMEMBER(_editorAlwaysRegister));
-	persistMgr->transfer(TMEMBER(_editorOnly));
-	persistMgr->transfer(TMEMBER(_editorSelected));
+	persistMgr->transferBool(TMEMBER(_sharedCursors));
+	persistMgr->transferBool(TMEMBER(_editorAlwaysRegister));
+	persistMgr->transferBool(TMEMBER(_editorOnly));
+	persistMgr->transferBool(TMEMBER(_editorSelected));
 	persistMgr->transfer(TMEMBER(_iD));
-	persistMgr->transfer(TMEMBER(_is3D));
-	persistMgr->transfer(TMEMBER(_movable));
+	persistMgr->transferBool(TMEMBER(_is3D));
+	persistMgr->transferBool(TMEMBER(_movable));
 	persistMgr->transfer(TMEMBER(_posX));
 	persistMgr->transfer(TMEMBER(_posY));
 	persistMgr->transferFloat(TMEMBER(_relativeScale));
-	persistMgr->transfer(TMEMBER(_rotatable));
+	persistMgr->transferBool(TMEMBER(_rotatable));
 	persistMgr->transferFloat(TMEMBER(_scale));
 	persistMgr->transferPtr(TMEMBER_PTR(_sFX));
 	persistMgr->transfer(TMEMBER(_sFXStart));
 	persistMgr->transfer(TMEMBER(_sFXVolume));
-	persistMgr->transfer(TMEMBER(_ready));
+	persistMgr->transferBool(TMEMBER(_ready));
 	persistMgr->transfer(TMEMBER(_rect));
-	persistMgr->transfer(TMEMBER(_rectSet));
-	persistMgr->transfer(TMEMBER(_registrable));
-	persistMgr->transfer(TMEMBER(_shadowable));
+	persistMgr->transferBool(TMEMBER(_rectSet));
+	persistMgr->transferBool(TMEMBER(_registrable));
+	persistMgr->transferBool(TMEMBER(_shadowable));
 	persistMgr->transfer(TMEMBER(_soundEvent));
-	persistMgr->transfer(TMEMBER(_zoomable));
+	persistMgr->transferBool(TMEMBER(_zoomable));
 
 	persistMgr->transferFloat(TMEMBER(_scaleX));
 	persistMgr->transferFloat(TMEMBER(_scaleY));
 
 	persistMgr->transferFloat(TMEMBER(_rotate));
-	persistMgr->transfer(TMEMBER(_rotateValid));
+	persistMgr->transferBool(TMEMBER(_rotateValid));
 	persistMgr->transferFloat(TMEMBER(_relativeRotate));
 
-	persistMgr->transfer(TMEMBER(_saveState));
-	persistMgr->transfer(TMEMBER(_nonIntMouseEvents));
+	persistMgr->transferBool(TMEMBER(_saveState));
+	persistMgr->transferBool(TMEMBER(_nonIntMouseEvents));
 
 	persistMgr->transfer(TMEMBER_INT(_sFXType));
 	persistMgr->transferFloat(TMEMBER(_sFXParam1));
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index e5542d9..c7f672b 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -587,7 +587,7 @@ double BasePersistenceManager::getDouble() {
 
 //////////////////////////////////////////////////////////////////////////
 // bool
-bool BasePersistenceManager::transfer(const char *name, bool *val) {
+bool BasePersistenceManager::transferBool(const char *name, bool *val) {
 	if (_saving) {
 		_saveStream->writeByte(*val);
 		if (_saveStream->err()) {
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h
index 3c0587b..a168f5f 100644
--- a/engines/wintermute/base/base_persistence_manager.h
+++ b/engines/wintermute/base/base_persistence_manager.h
@@ -78,7 +78,7 @@ public:
 	bool transfer(const char *name, uint32 *val);
 	bool transferFloat(const char *name, float *val);
 	bool transfer(const char *name, double *val);
-	bool transfer(const char *name, bool *val);
+	bool transferBool(const char *name, bool *val);
 	bool transfer(const char *name, byte *val);
 	bool transfer(const char *name, Rect32 *val);
 	bool transfer(const char *name, Point32 *val);
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index 581583c..e8d004d 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -430,7 +430,7 @@ bool BaseRegion::persist(BasePersistenceManager *persistMgr) {
 
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_active));
+	persistMgr->transferBool(TMEMBER(_active));
 	persistMgr->transfer(TMEMBER(_editorSelectedPoint));
 	persistMgr->transferFloat(TMEMBER(_lastMimicScale));
 	persistMgr->transfer(TMEMBER(_lastMimicX));
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index a670ebf..2e21b3e 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -281,7 +281,7 @@ bool BaseScriptHolder::persist(BasePersistenceManager *persistMgr) {
 	BaseScriptable::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_filename));
-	persistMgr->transfer(TMEMBER(_freezable));
+	persistMgr->transferBool(TMEMBER(_freezable));
 	if (persistMgr->getIsSaving()) {
 		const char *name = getName();
 		persistMgr->transfer(TMEMBER(name));
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 383655e..3b5cb0a 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -520,29 +520,29 @@ bool BaseSprite::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 bool BaseSprite::persist(BasePersistenceManager *persistMgr) {
 	BaseScriptHolder::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_canBreak));
-	persistMgr->transfer(TMEMBER(_changed));
-	persistMgr->transfer(TMEMBER(_paused));
-	persistMgr->transfer(TMEMBER(_continuous));
+	persistMgr->transferBool(TMEMBER(_canBreak));
+	persistMgr->transferBool(TMEMBER(_changed));
+	persistMgr->transferBool(TMEMBER(_paused));
+	persistMgr->transferBool(TMEMBER(_continuous));
 	persistMgr->transfer(TMEMBER(_currentFrame));
-	persistMgr->transfer(TMEMBER(_editorAllFrames));
+	persistMgr->transferBool(TMEMBER(_editorAllFrames));
 	persistMgr->transfer(TMEMBER(_editorBgAlpha));
 	persistMgr->transfer(TMEMBER(_editorBgFile));
 	persistMgr->transfer(TMEMBER(_editorBgOffsetX));
 	persistMgr->transfer(TMEMBER(_editorBgOffsetY));
-	persistMgr->transfer(TMEMBER(_editorMuted));
-	persistMgr->transfer(TMEMBER(_finished));
+	persistMgr->transferBool(TMEMBER(_editorMuted));
+	persistMgr->transferBool(TMEMBER(_finished));
 
 	_frames.persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_lastFrameTime));
-	persistMgr->transfer(TMEMBER(_looping));
+	persistMgr->transferBool(TMEMBER(_looping));
 	persistMgr->transfer(TMEMBER(_moveX));
 	persistMgr->transfer(TMEMBER(_moveY));
 	persistMgr->transferPtr(TMEMBER_PTR(_owner));
-	persistMgr->transfer(TMEMBER(_precise));
-	persistMgr->transfer(TMEMBER(_streamed));
-	persistMgr->transfer(TMEMBER(_streamedKeepLoaded));
+	persistMgr->transferBool(TMEMBER(_precise));
+	persistMgr->transferBool(TMEMBER(_streamed));
+	persistMgr->transferBool(TMEMBER(_streamedKeepLoaded));
 
 
 	return STATUS_OK;
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index 1055987..1327ae1 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -386,26 +386,26 @@ bool BaseSubFrame::persist(BasePersistenceManager *persistMgr) {
 
 	BaseScriptable::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_2DOnly));
-	persistMgr->transfer(TMEMBER(_3DOnly));
+	persistMgr->transferBool(TMEMBER(_2DOnly));
+	persistMgr->transferBool(TMEMBER(_3DOnly));
 	persistMgr->transfer(TMEMBER(_alpha));
-	persistMgr->transfer(TMEMBER(_decoration));
-	persistMgr->transfer(TMEMBER(_editorSelected));
+	persistMgr->transferBool(TMEMBER(_decoration));
+	persistMgr->transferBool(TMEMBER(_editorSelected));
 	persistMgr->transfer(TMEMBER(_hotspotX));
 	persistMgr->transfer(TMEMBER(_hotspotY));
 	persistMgr->transfer(TMEMBER(_rect));
-	persistMgr->transfer(TMEMBER(_wantsDefaultRect));
+	persistMgr->transferBool(TMEMBER(_wantsDefaultRect));
 
 	persistMgr->transfer(TMEMBER(_surfaceFilename));
-	persistMgr->transfer(TMEMBER(_cKDefault));
+	persistMgr->transferBool(TMEMBER(_cKDefault));
 	persistMgr->transfer(TMEMBER(_cKRed));
 	persistMgr->transfer(TMEMBER(_cKGreen));
 	persistMgr->transfer(TMEMBER(_cKBlue));
 	persistMgr->transfer(TMEMBER(_lifeTime));
 
-	persistMgr->transfer(TMEMBER(_keepLoaded));
-	persistMgr->transfer(TMEMBER(_mirrorX));
-	persistMgr->transfer(TMEMBER(_mirrorY));
+	persistMgr->transferBool(TMEMBER(_keepLoaded));
+	persistMgr->transferBool(TMEMBER(_mirrorX));
+	persistMgr->transferBool(TMEMBER(_mirrorY));
 	persistMgr->transfer(TMEMBER(_transparent));
 
 	return STATUS_OK;
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 23a633a..2b5fe0d 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -511,8 +511,8 @@ bool BaseFontBitmap::persist(BasePersistenceManager *persistMgr) {
 	}
 
 
-	persistMgr->transfer(TMEMBER(_fontextFix));
-	persistMgr->transfer(TMEMBER(_wholeCell));
+	persistMgr->transferBool(TMEMBER(_fontextFix));
+	persistMgr->transferBool(TMEMBER(_wholeCell));
 
 
 	return STATUS_OK;
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index bbc6690..8f0484f 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -521,10 +521,10 @@ bool BaseFontTT::parseLayer(BaseTTFontLayer *layer, char *buffer) {
 bool BaseFontTT::persist(BasePersistenceManager *persistMgr) {
 	BaseFont::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_isBold));
-	persistMgr->transfer(TMEMBER(_isItalic));
-	persistMgr->transfer(TMEMBER(_isUnderline));
-	persistMgr->transfer(TMEMBER(_isStriked));
+	persistMgr->transferBool(TMEMBER(_isBold));
+	persistMgr->transferBool(TMEMBER(_isItalic));
+	persistMgr->transferBool(TMEMBER(_isUnderline));
+	persistMgr->transferBool(TMEMBER(_isStriked));
 	persistMgr->transfer(TMEMBER(_fontHeight));
 	persistMgr->transfer(TMEMBER(_fontFile));
 
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index aaffa09..79076d7 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -1165,22 +1165,22 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferFloat(TMEMBER(_velocity1));
 	persistMgr->transferFloat(TMEMBER(_velocity2));
-	persistMgr->transfer(TMEMBER(_velocityZBased));
+	persistMgr->transferBool(TMEMBER(_velocityZBased));
 
 	persistMgr->transferFloat(TMEMBER(_scale1));
 	persistMgr->transferFloat(TMEMBER(_scale2));
-	persistMgr->transfer(TMEMBER(_scaleZBased));
+	persistMgr->transferBool(TMEMBER(_scaleZBased));
 
 	persistMgr->transfer(TMEMBER(_maxParticles));
 
 	persistMgr->transfer(TMEMBER(_lifeTime1));
 	persistMgr->transfer(TMEMBER(_lifeTime2));
-	persistMgr->transfer(TMEMBER(_lifeTimeZBased));
+	persistMgr->transferBool(TMEMBER(_lifeTimeZBased));
 
 	persistMgr->transfer(TMEMBER(_genInterval));
 	persistMgr->transfer(TMEMBER(_genAmount));
 
-	persistMgr->transfer(TMEMBER(_running));
+	persistMgr->transferBool(TMEMBER(_running));
 	persistMgr->transfer(TMEMBER(_overheadTime));
 
 	persistMgr->transfer(TMEMBER(_border));
@@ -1194,7 +1194,7 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(_alpha1));
 	persistMgr->transfer(TMEMBER(_alpha2));
-	persistMgr->transfer(TMEMBER(_alphaTimeBased));
+	persistMgr->transferBool(TMEMBER(_alphaTimeBased));
 
 	persistMgr->transferFloat(TMEMBER(_angVelocity1));
 	persistMgr->transferFloat(TMEMBER(_angVelocity2));
@@ -1204,9 +1204,9 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transferFloat(TMEMBER(_growthRate1));
 	persistMgr->transferFloat(TMEMBER(_growthRate2));
-	persistMgr->transfer(TMEMBER(_exponentialGrowth));
+	persistMgr->transferBool(TMEMBER(_exponentialGrowth));
 
-	persistMgr->transfer(TMEMBER(_useRegion));
+	persistMgr->transferBool(TMEMBER(_useRegion));
 
 	persistMgr->transfer(TMEMBER_INT(_maxBatches));
 	persistMgr->transfer(TMEMBER_INT(_batchesGenerated));
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index 86cacac..e857458 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -239,7 +239,7 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferFloat(TMEMBER(_scale));
 	persistMgr->transfer(TMEMBER(_creationTime));
 	persistMgr->transfer(TMEMBER(_lifeTime));
-	persistMgr->transfer(TMEMBER(_isDead));
+	persistMgr->transferBool(TMEMBER(_isDead));
 	persistMgr->transfer(TMEMBER_INT(_state));
 	persistMgr->transfer(TMEMBER(_fadeStart));
 	persistMgr->transfer(TMEMBER(_fadeTime));
@@ -247,7 +247,7 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferFloat(TMEMBER(_angVelocity));
 	persistMgr->transferFloat(TMEMBER(_rotation));
 	persistMgr->transferFloat(TMEMBER(_growthRate));
-	persistMgr->transfer(TMEMBER(_exponentialGrowth));
+	persistMgr->transferBool(TMEMBER(_exponentialGrowth));
 	persistMgr->transfer(TMEMBER(_fadeStartAlpha));
 
 	if (persistMgr->getIsSaving()) {
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 5aeff78..49152ec 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -1273,7 +1273,7 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_currentLine));
 	persistMgr->transferPtr(TMEMBER_PTR(_engine));
 	persistMgr->transfer(TMEMBER(_filename));
-	persistMgr->transfer(TMEMBER(_freezable));
+	persistMgr->transferBool(TMEMBER(_freezable));
 	persistMgr->transferPtr(TMEMBER_PTR(_globals));
 	persistMgr->transfer(TMEMBER(_iP));
 	persistMgr->transferPtr(TMEMBER_PTR(_scopeStack));
@@ -1283,18 +1283,18 @@ bool ScScript::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER_INT(_origState));
 	persistMgr->transferPtr(TMEMBER_PTR(_owner));
 	persistMgr->transferPtr(TMEMBER_PTR(_reg1));
-	persistMgr->transfer(TMEMBER(_thread));
+	persistMgr->transferBool(TMEMBER(_thread));
 	persistMgr->transfer(TMEMBER(_threadEvent));
 	persistMgr->transferPtr(TMEMBER_PTR(_thisStack));
 	persistMgr->transfer(TMEMBER(_timeSlice));
 	persistMgr->transferPtr(TMEMBER_PTR(_waitObject));
 	persistMgr->transferPtr(TMEMBER_PTR(_waitScript));
 	persistMgr->transfer(TMEMBER(_waitTime));
-	persistMgr->transfer(TMEMBER(_waitFrozen));
+	persistMgr->transferBool(TMEMBER(_waitFrozen));
 
-	persistMgr->transfer(TMEMBER(_methodThread));
-	persistMgr->transfer(TMEMBER(_methodThread));
-	persistMgr->transfer(TMEMBER(_unbreakable));
+	persistMgr->transferBool(TMEMBER(_methodThread));
+	persistMgr->transferBool(TMEMBER(_methodThread)); // TODO-SAVE: Deduplicate.
+	persistMgr->transferBool(TMEMBER(_unbreakable));
 	persistMgr->transferPtr(TMEMBER_PTR(_parentScript));
 
 	if (!persistMgr->getIsSaving()) {
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
index 18f7b82..5e6f057 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -768,7 +768,7 @@ bool SXFile::persist(BasePersistenceManager *persistMgr) {
 
 	persistMgr->transfer(TMEMBER(_filename));
 	persistMgr->transfer(TMEMBER(_mode));
-	persistMgr->transfer(TMEMBER(_textMode));
+	persistMgr->transferBool(TMEMBER(_textMode));
 
 	uint32 pos = 0;
 	if (persistMgr->getIsSaving()) {
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index 31ec457..c87180f 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -791,10 +791,10 @@ void ScValue::setValue(ScValue *val) {
 bool ScValue::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_gameRef));
 
-	persistMgr->transfer(TMEMBER(_persistent));
-	persistMgr->transfer(TMEMBER(_isConstVar));
+	persistMgr->transferBool(TMEMBER(_persistent));
+	persistMgr->transferBool(TMEMBER(_isConstVar));
 	persistMgr->transfer(TMEMBER_INT(_type));
-	persistMgr->transfer(TMEMBER(_valBool));
+	persistMgr->transferBool(TMEMBER(_valBool));
 	persistMgr->transfer(TMEMBER(_valFloat));
 	persistMgr->transfer(TMEMBER(_valInt));
 	persistMgr->transferPtr(TMEMBER_PTR(_valNative));
diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp
index c1923b3..c3f2ff0 100644
--- a/engines/wintermute/base/sound/base_sound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -167,13 +167,13 @@ bool BaseSound::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_gameRef));
 
 	persistMgr->transfer(TMEMBER(_soundFilename));
-	persistMgr->transfer(TMEMBER(_soundLooping));
-	persistMgr->transfer(TMEMBER(_soundPaused));
-	persistMgr->transfer(TMEMBER(_soundFreezePaused));
-	persistMgr->transfer(TMEMBER(_soundPlaying));
+	persistMgr->transferBool(TMEMBER(_soundLooping));
+	persistMgr->transferBool(TMEMBER(_soundPaused));
+	persistMgr->transferBool(TMEMBER(_soundFreezePaused));
+	persistMgr->transferBool(TMEMBER(_soundPlaying));
 	persistMgr->transfer(TMEMBER(_soundPosition));
 	persistMgr->transfer(TMEMBER(_soundPrivateVolume));
-	persistMgr->transfer(TMEMBER(_soundStreamed));
+	persistMgr->transferBool(TMEMBER(_soundStreamed));
 	persistMgr->transfer(TMEMBER_INT(_soundType));
 	persistMgr->transfer(TMEMBER(_soundLoopStart));
 
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 42a873a..f2933f4 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -1183,20 +1183,20 @@ bool UIButton::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_backFocus));
 	persistMgr->transferPtr(TMEMBER_PTR(_backHover));
 	persistMgr->transferPtr(TMEMBER_PTR(_backPress));
-	persistMgr->transfer(TMEMBER(_centerImage));
+	persistMgr->transferBool(TMEMBER(_centerImage));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontDisable));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontFocus));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontHover));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontPress));
-	persistMgr->transfer(TMEMBER(_hover));
+	persistMgr->transferBool(TMEMBER(_hover));
 	persistMgr->transferPtr(TMEMBER_PTR(_image));
 	persistMgr->transferPtr(TMEMBER_PTR(_imageDisable));
 	persistMgr->transferPtr(TMEMBER_PTR(_imageFocus));
 	persistMgr->transferPtr(TMEMBER_PTR(_imageHover));
 	persistMgr->transferPtr(TMEMBER_PTR(_imagePress));
-	persistMgr->transfer(TMEMBER(_pixelPerfect));
-	persistMgr->transfer(TMEMBER(_press));
-	persistMgr->transfer(TMEMBER(_stayPressed));
+	persistMgr->transferBool(TMEMBER(_pixelPerfect));
+	persistMgr->transferBool(TMEMBER(_press));
+	persistMgr->transferBool(TMEMBER(_stayPressed));
 
 	if (!persistMgr->getIsSaving()) {
 		_oneTimePress = false;
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp
index fbe18ef..a1a89b7 100644
--- a/engines/wintermute/ui/ui_object.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -622,8 +622,8 @@ bool UIObject::persist(BasePersistenceManager *persistMgr) {
 	BaseObject::persist(persistMgr);
 
 	persistMgr->transferPtr(TMEMBER_PTR(_back));
-	persistMgr->transfer(TMEMBER(_canFocus));
-	persistMgr->transfer(TMEMBER(_disable));
+	persistMgr->transferBool(TMEMBER(_canFocus));
+	persistMgr->transferBool(TMEMBER(_disable));
 	persistMgr->transferPtr(TMEMBER_PTR(_focusedWidget));
 	persistMgr->transferPtr(TMEMBER_PTR(_font));
 	persistMgr->transfer(TMEMBER(_height));
@@ -632,12 +632,12 @@ bool UIObject::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transferPtr(TMEMBER_PTR(_listenerParamObject));
 	persistMgr->transfer(TMEMBER(_listenerParamDWORD));
 	persistMgr->transferPtr(TMEMBER_PTR(_parent));
-	persistMgr->transfer(TMEMBER(_parentNotify));
-	persistMgr->transfer(TMEMBER(_sharedFonts));
-	persistMgr->transfer(TMEMBER(_sharedImages));
+	persistMgr->transferBool(TMEMBER(_parentNotify));
+	persistMgr->transferBool(TMEMBER(_sharedFonts));
+	persistMgr->transferBool(TMEMBER(_sharedImages));
 	persistMgr->transfer(TMEMBER(_text));
 	persistMgr->transfer(TMEMBER_INT(_type));
-	persistMgr->transfer(TMEMBER(_visible));
+	persistMgr->transferBool(TMEMBER(_visible));
 	persistMgr->transfer(TMEMBER(_width));
 
 	return STATUS_OK;
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 9051ce8..7883b65 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -1258,24 +1258,24 @@ bool UIWindow::persist(BasePersistenceManager *persistMgr) {
 	UIObject::persist(persistMgr);
 
 	persistMgr->transferPtr(TMEMBER_PTR(_backInactive));
-	persistMgr->transfer(TMEMBER(_clipContents));
+	persistMgr->transferBool(TMEMBER(_clipContents));
 	persistMgr->transfer(TMEMBER(_dragFrom));
-	persistMgr->transfer(TMEMBER(_dragging));
+	persistMgr->transferBool(TMEMBER(_dragging));
 	persistMgr->transfer(TMEMBER(_dragRect));
-	persistMgr->transfer(TMEMBER(_fadeBackground));
+	persistMgr->transferBool(TMEMBER(_fadeBackground));
 	persistMgr->transfer(TMEMBER(_fadeColor));
 	persistMgr->transferPtr(TMEMBER_PTR(_fontInactive));
 	persistMgr->transferPtr(TMEMBER_PTR(_imageInactive));
-	persistMgr->transfer(TMEMBER(_inGame));
-	persistMgr->transfer(TMEMBER(_isMenu));
+	persistMgr->transferBool(TMEMBER(_inGame));
+	persistMgr->transferBool(TMEMBER(_isMenu));
 	persistMgr->transfer(TMEMBER_INT(_mode));
 	persistMgr->transferPtr(TMEMBER_PTR(_shieldButton));
 	persistMgr->transferPtr(TMEMBER_PTR(_shieldWindow));
 	persistMgr->transfer(TMEMBER_INT(_titleAlign));
 	persistMgr->transfer(TMEMBER(_titleRect));
-	persistMgr->transfer(TMEMBER(_transparent));
+	persistMgr->transferBool(TMEMBER(_transparent));
 	persistMgr->transferPtr(TMEMBER_PTR(_viewport));
-	persistMgr->transfer(TMEMBER(_pauseMusic));
+	persistMgr->transferBool(TMEMBER(_pauseMusic));
 
 	_widgets.persist(persistMgr);
 
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index f331768..6b2037a 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -500,7 +500,7 @@ bool VideoTheoraPlayer::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_posY));
 	persistMgr->transferFloat(TMEMBER(_playZoom));
 	persistMgr->transfer(TMEMBER_INT(_playbackType));
-	persistMgr->transfer(TMEMBER(_looping));
+	persistMgr->transferBool(TMEMBER(_looping));
 	persistMgr->transfer(TMEMBER(_volume));
 
 	if (!persistMgr->getIsSaving() && (_savedState != THEORA_STATE_NONE)) {

More information about the Scummvm-git-logs mailing list