aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Ad
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-08 22:18:18 +0200
committerEinar Johan Trøan Sømåen2012-07-08 22:18:18 +0200
commit595f140cd82b06346dbfa668cdfa672fc402a9a9 (patch)
treeda8bfe6f3641c6d4a13d5692134a606b4ec9b0a2 /engines/wintermute/Ad
parent5f7b45de34d4f34c543d47e1feead84c79654965 (diff)
downloadscummvm-rg350-595f140cd82b06346dbfa668cdfa672fc402a9a9.tar.gz
scummvm-rg350-595f140cd82b06346dbfa668cdfa672fc402a9a9.tar.bz2
scummvm-rg350-595f140cd82b06346dbfa668cdfa672fc402a9a9.zip
WINTERMUTE: Rename FuncName/VarName -> funcName/varName in BStringTable
Diffstat (limited to 'engines/wintermute/Ad')
-rw-r--r--engines/wintermute/Ad/AdGame.cpp2
-rw-r--r--engines/wintermute/Ad/AdNodeState.cpp2
-rw-r--r--engines/wintermute/Ad/AdObject.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 58b3250deb..66dd247a76 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -475,7 +475,7 @@ HRESULT CAdGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *this
if (res) {
res->_iD = id;
res->setText(text);
- _stringTable->Expand(&res->_text);
+ _stringTable->expand(&res->_text);
if (!val1->isNULL()) res->setIcon(val1->getString());
if (!val2->isNULL()) res->setIconHover(val2->getString());
if (!val3->isNULL()) res->setIconPressed(val3->getString());
diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp
index 266adc9378..954c12c9fc 100644
--- a/engines/wintermute/Ad/AdNodeState.cpp
+++ b/engines/wintermute/Ad/AdNodeState.cpp
@@ -115,7 +115,7 @@ void CAdNodeState::setCaption(const char *caption, int caseVal) {
_caption[caseVal- 1] = new char[strlen(caption) + 1];
if (_caption[caseVal- 1]) {
strcpy(_caption[caseVal- 1], caption);
- Game->_stringTable->Expand(&_caption[caseVal- 1]);
+ Game->_stringTable->expand(&_caption[caseVal- 1]);
}
}
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 4bea6921b9..978c4d2c04 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -838,7 +838,7 @@ void CAdObject::talk(const char *text, const char *sound, uint32 duration, const
_sentence->_sound = NULL;
_sentence->setText(text);
- Game->_stringTable->Expand(&_sentence->_text);
+ Game->_stringTable->expand(&_sentence->_text);
_sentence->setStances(stances);
_sentence->_duration = duration;
_sentence->_align = Align;
@@ -850,7 +850,7 @@ void CAdObject::talk(const char *text, const char *sound, uint32 duration, const
// try to locate speech file automatically
bool deleteSound = false;
if (!sound) {
- char *key = Game->_stringTable->GetKey(text);
+ char *key = Game->_stringTable->getKey(text);
if (key) {
sound = ((CAdGame *)Game)->findSpeechFile(key);
delete [] key;