aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/UI/UIWindow.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-06 19:19:26 +0200
committerEinar Johan Trøan Sømåen2012-07-06 19:19:26 +0200
commita9f0852e2daaca84204186dd91f6d85b3bf40963 (patch)
treeeeb371bbe0b0c81d044e7078f974ed4d197a1c64 /engines/wintermute/UI/UIWindow.cpp
parentd4c57e6d98700fae6f781d967b7e3c9043248731 (diff)
downloadscummvm-rg350-a9f0852e2daaca84204186dd91f6d85b3bf40963.tar.gz
scummvm-rg350-a9f0852e2daaca84204186dd91f6d85b3bf40963.tar.bz2
scummvm-rg350-a9f0852e2daaca84204186dd91f6d85b3bf40963.zip
WINTERMUTE: Rename FuncName/VarName -> funcName/varName in BFontStorage
Diffstat (limited to 'engines/wintermute/UI/UIWindow.cpp')
-rw-r--r--engines/wintermute/UI/UIWindow.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index c2eef79210..b4043a0d41 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -104,7 +104,7 @@ void CUIWindow::cleanup() {
_viewport = NULL;
if (_backInactive) delete _backInactive;
- if (!_sharedFonts && _fontInactive) Game->_fontStorage->RemoveFont(_fontInactive);
+ if (!_sharedFonts && _fontInactive) Game->_fontStorage->removeFont(_fontInactive);
if (!_sharedImages && _imageInactive) delete _imageInactive;
for (int i = 0; i < _widgets.GetSize(); i++) delete _widgets[i];
@@ -369,14 +369,14 @@ HRESULT CUIWindow::loadBuffer(byte *buffer, bool complete) {
break;
case TOKEN_FONT:
- if (_font) Game->_fontStorage->RemoveFont(_font);
- _font = Game->_fontStorage->AddFont((char *)params);
+ if (_font) Game->_fontStorage->removeFont(_font);
+ _font = Game->_fontStorage->addFont((char *)params);
if (!_font) cmd = PARSERR_GENERIC;
break;
case TOKEN_FONT_INACTIVE:
- if (_fontInactive) Game->_fontStorage->RemoveFont(_fontInactive);
- _fontInactive = Game->_fontStorage->AddFont((char *)params);
+ if (_fontInactive) Game->_fontStorage->removeFont(_fontInactive);
+ _fontInactive = Game->_fontStorage->addFont((char *)params);
if (!_fontInactive) cmd = PARSERR_GENERIC;
break;
@@ -720,8 +720,8 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
else if (strcmp(name, "SetInactiveFont") == 0) {
stack->correctParams(1);
- if (_fontInactive) Game->_fontStorage->RemoveFont(_fontInactive);
- _fontInactive = Game->_fontStorage->AddFont(stack->pop()->getString());
+ if (_fontInactive) Game->_fontStorage->removeFont(_fontInactive);
+ _fontInactive = Game->_fontStorage->addFont(stack->pop()->getString());
stack->pushBool(_fontInactive != NULL);
return S_OK;