1 files changed, 20 insertions, 20 deletions

diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 2c356b2b7e..9db1f4f4b4 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -382,7 +382,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) {
 
 		case TOKEN_TEXT:
 			setText((char *)params);
-			_gameRef->_stringTable->expand(&_text);
+			_gameRef->expandStringByStringTable(&_text);
 			break;
 
 		case TOKEN_TEXT_ALIGN:
@@ -622,15 +622,15 @@ void UIButton::correctSize() {
 	}
 
 	if (_text) {
-		int text_height;
+		int textHeight;
 		if (_font) {
-			text_height = _font->getTextHeight((byte *)_text, _width);
+			textHeight = _font->getTextHeight((byte *)_text, _width);
 		} else {
-			text_height = _gameRef->_systemFont->getTextHeight((byte *)_text, _width);
+			textHeight = _gameRef->getSystemFont()->getTextHeight((byte *)_text, _width);
 		}
 
-		if (text_height > _height) {
-			_height = text_height;
+		if (textHeight > _height) {
+			_height = textHeight;
 		}
 	}
 
@@ -717,7 +717,7 @@ bool UIButton::display(int offsetX, int offsetY) {
 		if (_font) {
 			font = _font;
 		} else {
-			font = _gameRef->_systemFont;
+			font = _gameRef->getSystemFont();
 		}
 	}
 
@@ -1179,21 +1179,21 @@ bool UIButton::persist(BasePersistenceManager *persistMgr) {
 	UIObject::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER_INT(_align));
-	persistMgr->transfer(TMEMBER(_backDisable));
-	persistMgr->transfer(TMEMBER(_backFocus));
-	persistMgr->transfer(TMEMBER(_backHover));
-	persistMgr->transfer(TMEMBER(_backPress));
+	persistMgr->transferPtr(TMEMBER_PTR(_backDisable));
+	persistMgr->transferPtr(TMEMBER_PTR(_backFocus));
+	persistMgr->transferPtr(TMEMBER_PTR(_backHover));
+	persistMgr->transferPtr(TMEMBER_PTR(_backPress));
 	persistMgr->transfer(TMEMBER(_centerImage));
-	persistMgr->transfer(TMEMBER(_fontDisable));
-	persistMgr->transfer(TMEMBER(_fontFocus));
-	persistMgr->transfer(TMEMBER(_fontHover));
-	persistMgr->transfer(TMEMBER(_fontPress));
+	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->transfer(TMEMBER(_image));
-	persistMgr->transfer(TMEMBER(_imageDisable));
-	persistMgr->transfer(TMEMBER(_imageFocus));
-	persistMgr->transfer(TMEMBER(_imageHover));
-	persistMgr->transfer(TMEMBER(_imagePress));
+	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));