diff options
| author | Einar Johan Trøan Sømåen | 2012-07-06 19:19:26 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-06 19:19:26 +0200 |
| commit | a9f0852e2daaca84204186dd91f6d85b3bf40963 (patch) | |
| tree | eeb371bbe0b0c81d044e7078f974ed4d197a1c64 /engines/wintermute/Ad | |
| parent | d4c57e6d98700fae6f781d967b7e3c9043248731 (diff) | |
| download | scummvm-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/Ad')
| -rw-r--r-- | engines/wintermute/Ad/AdObject.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdResponse.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdResponseBox.cpp | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp index f594f91100..b132bec46e 100644 --- a/engines/wintermute/Ad/AdObject.cpp +++ b/engines/wintermute/Ad/AdObject.cpp @@ -127,7 +127,7 @@ CAdObject::~CAdObject() { _tempSprite2 = NULL; // reference only
_stickRegion = NULL;
- if (_font) Game->_fontStorage->RemoveFont(_font);
+ if (_font) Game->_fontStorage->removeFont(_font);
if (_inventory) {
((CAdGame *)Game)->unregisterInventory(_inventory);
@@ -793,9 +793,9 @@ const char *CAdObject::scToString() { //////////////////////////////////////////////////////////////////////////
HRESULT CAdObject::SetFont(const char *filename) {
- if (_font) Game->_fontStorage->RemoveFont(_font);
+ if (_font) Game->_fontStorage->removeFont(_font);
if (filename) {
- _font = Game->_fontStorage->AddFont(filename);
+ _font = Game->_fontStorage->addFont(filename);
return _font == NULL ? E_FAIL : S_OK;
} else {
_font = NULL;
diff --git a/engines/wintermute/Ad/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp index 7c6a768c21..320f026863 100644 --- a/engines/wintermute/Ad/AdResponse.cpp +++ b/engines/wintermute/Ad/AdResponse.cpp @@ -60,7 +60,7 @@ CAdResponse::~CAdResponse() { _icon = NULL;
_iconHover = NULL;
_iconPressed = NULL;
- if (_font) Game->_fontStorage->RemoveFont(_font);
+ if (_font) Game->_fontStorage->removeFont(_font);
}
@@ -86,8 +86,8 @@ HRESULT CAdResponse::setIcon(const char *filename) { //////////////////////////////////////////////////////////////////////////
HRESULT CAdResponse::setFont(const char *filename) {
- if (_font) Game->_fontStorage->RemoveFont(_font);
- _font = Game->_fontStorage->AddFont(filename);
+ if (_font) Game->_fontStorage->removeFont(_font);
+ _font = Game->_fontStorage->addFont(filename);
if (!_font) {
Game->LOG(0, "CAdResponse::setFont failed for file '%s'", filename);
return E_FAIL;
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp index 9f498b49a5..6841705701 100644 --- a/engines/wintermute/Ad/AdResponseBox.cpp +++ b/engines/wintermute/Ad/AdResponseBox.cpp @@ -82,8 +82,8 @@ CAdResponseBox::~CAdResponseBox() { delete[] _lastResponseTextOrig;
_lastResponseTextOrig = NULL;
- if (_font) Game->_fontStorage->RemoveFont(_font);
- if (_fontHover) Game->_fontStorage->RemoveFont(_fontHover);
+ if (_font) Game->_fontStorage->removeFont(_font);
+ if (_fontHover) Game->_fontStorage->removeFont(_fontHover);
clearResponses();
clearButtons();
@@ -269,14 +269,14 @@ HRESULT CAdResponseBox::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_HOVER:
- if (_fontHover) Game->_fontStorage->RemoveFont(_fontHover);
- _fontHover = Game->_fontStorage->AddFont((char *)params);
+ if (_fontHover) Game->_fontStorage->removeFont(_fontHover);
+ _fontHover = Game->_fontStorage->addFont((char *)params);
if (!_fontHover) cmd = PARSERR_GENERIC;
break;
|