1 files changed, 19 insertions, 19 deletions

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 0f2a3d1260..e97e342149 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -602,7 +602,7 @@ int BaseGame::getSequence() {
 
 
 //////////////////////////////////////////////////////////////////////////
-void BaseGame::setOffset(int offsetX, int offsetY) {
+void BaseGame::setOffset(int32 offsetX, int32 offsetY) {
 	_offsetX = offsetX;
 	_offsetY = offsetY;
 }
@@ -1090,11 +1090,11 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "SetMousePos") == 0) {
 		stack->correctParams(2);
-		int x = stack->pop()->getInt();
-		int y = stack->pop()->getInt();
-		x = MAX(x, 0);
+		int32 x = stack->pop()->getInt();
+		int32 y = stack->pop()->getInt();
+		x = MAX<int32>(x, 0);
 		x = MIN(x, _renderer->getWidth());
-		y = MAX(y, 0);
+		y = MAX<int32>(y, 0);
 		y = MIN(y, _renderer->getHeight());
 		Point32 p;
 		p.x = x + _renderer->_drawOffsetX;
@@ -2486,7 +2486,7 @@ bool BaseGame::scSetProperty(const char *name, ScValue *value) {
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "SoundBufferSize") == 0) {
 		_soundBufferSizeSec = value->getInt();
-		_soundBufferSizeSec = MAX(3, _soundBufferSizeSec);
+		_soundBufferSizeSec = MAX<int32>(3, _soundBufferSizeSec);
 		return STATUS_OK;
 	}
 
@@ -2995,7 +2995,7 @@ bool BaseGame::showCursor() {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseGame::saveGame(int slot, const char *desc, bool quickSave) {
+bool BaseGame::saveGame(int32 slot, const char *desc, bool quickSave) {
 	return SaveLoad::saveGame(slot, desc, quickSave, _gameRef);
 }
 
@@ -3055,18 +3055,18 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 
 	BaseObject::persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_activeObject));
-	persistMgr->transfer(TMEMBER(_capturedObject));
-	persistMgr->transfer(TMEMBER(_cursorNoninteractive));
+	persistMgr->transferPtr(TMEMBER_PTR(_activeObject));
+	persistMgr->transferPtr(TMEMBER_PTR(_capturedObject));
+	persistMgr->transferPtr(TMEMBER_PTR(_cursorNoninteractive));
 	persistMgr->transfer(TMEMBER(_editorMode));
-	persistMgr->transfer(TMEMBER(_fader));
+	persistMgr->transferPtr(TMEMBER_PTR(_fader));
 	persistMgr->transfer(TMEMBER(_freezeLevel));
-	persistMgr->transfer(TMEMBER(_focusedWindow));
-	persistMgr->transfer(TMEMBER(_fontStorage));
+	persistMgr->transferPtr(TMEMBER_PTR(_focusedWindow));
+	persistMgr->transferPtr(TMEMBER_PTR(_fontStorage));
 	persistMgr->transfer(TMEMBER(_interactive));
-	persistMgr->transfer(TMEMBER(_keyboardState));
+	persistMgr->transferPtr(TMEMBER_PTR(_keyboardState));
 	persistMgr->transfer(TMEMBER(_lastTime));
-	persistMgr->transfer(TMEMBER(_mainObject));
+	persistMgr->transferPtr(TMEMBER_PTR(_mainObject));
 	_musicSystem->persistChannels(persistMgr);
 	_musicSystem->persistCrossfadeSettings(persistMgr);
 
@@ -3082,14 +3082,14 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) {
 
 	_regObjects.persist(persistMgr);
 
-	persistMgr->transfer(TMEMBER(_scEngine));
+	persistMgr->transferPtr(TMEMBER_PTR(_scEngine));
 	//persistMgr->transfer(TMEMBER(_soundMgr));
 	persistMgr->transfer(TMEMBER_INT(_state));
 	//persistMgr->transfer(TMEMBER(_surfaceStorage));
 	persistMgr->transfer(TMEMBER(_subtitles));
 	persistMgr->transfer(TMEMBER(_subtitlesSpeed));
-	persistMgr->transfer(TMEMBER(_systemFont));
-	persistMgr->transfer(TMEMBER(_videoFont));
+	persistMgr->transferPtr(TMEMBER_PTR(_systemFont));
+	persistMgr->transferPtr(TMEMBER_PTR(_videoFont));
 	persistMgr->transfer(TMEMBER(_videoSubtitles));
 
 	_timerNormal.persist(persistMgr);
@@ -3840,7 +3840,7 @@ bool BaseGame::isRightDoubleClick() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool BaseGame::isDoubleClick(int buttonIndex) {
+bool BaseGame::isDoubleClick(int32 buttonIndex) {
 	uint32 maxDoubleCLickTime = 500;
 	int maxMoveX = 4;
 	int maxMoveY = 4;