diff options
| author | Einar Johan Trøan Sømåen | 2012-07-22 22:55:54 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-22 22:55:54 +0200 |
| commit | f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838 (patch) | |
| tree | 11fc0f9994c0e938027f767dc5e054bd42c921fd /engines/wintermute/ad/ad_talk_holder.cpp | |
| parent | 30ada3c13f63ef35ccdd21ca76fb45aa9fb1dc3c (diff) | |
| download | scummvm-rg350-f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838.tar.gz scummvm-rg350-f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838.tar.bz2 scummvm-rg350-f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838.zip | |
WINTERMUTE: Wrap away base_script_holder's _filename field in getters/setters, avoiding direct writes.
Diffstat (limited to 'engines/wintermute/ad/ad_talk_holder.cpp')
| -rw-r--r-- | engines/wintermute/ad/ad_talk_holder.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp index bd48ac601c..17f7171cc3 100644 --- a/engines/wintermute/ad/ad_talk_holder.cpp +++ b/engines/wintermute/ad/ad_talk_holder.cpp @@ -159,8 +159,8 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS else if (strcmp(name, "GetSprite") == 0) {
stack->correctParams(0);
- if (!_sprite || !_sprite->_filename) stack->pushNULL();
- else stack->pushString(_sprite->_filename);
+ if (!_sprite || !_sprite->getFilename()) stack->pushNULL();
+ else stack->pushString(_sprite->getFilename());
return STATUS_OK;
}
@@ -210,7 +210,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS if (ex) {
for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
- if (scumm_stricmp(_talkSpritesEx[i]->_filename, filename) == 0) {
+ if (scumm_stricmp(_talkSpritesEx[i]->getFilename(), filename) == 0) {
if (_currentSprite == _talkSpritesEx[i])
setCurrent = true;
if (_tempSprite2 == _talkSpritesEx[i])
@@ -222,7 +222,7 @@ bool AdTalkHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisS }
} else {
for (int i = 0; i < _talkSprites.getSize(); i++) {
- if (scumm_stricmp(_talkSprites[i]->_filename, filename) == 0) {
+ if (scumm_stricmp(_talkSprites[i]->getFilename(), filename) == 0) {
if (_currentSprite == _talkSprites[i])
setCurrent = true;
if (_tempSprite2 == _talkSprites[i])
@@ -339,13 +339,13 @@ const char *AdTalkHolder::scToString() { //////////////////////////////////////////////////////////////////////////
bool AdTalkHolder::saveAsText(BaseDynamicBuffer *buffer, int indent) {
for (int i = 0; i < _talkSprites.getSize(); i++) {
- if (_talkSprites[i]->_filename)
- buffer->putTextIndent(indent + 2, "TALK=\"%s\"\n", _talkSprites[i]->_filename);
+ if (_talkSprites[i]->getFilename())
+ buffer->putTextIndent(indent + 2, "TALK=\"%s\"\n", _talkSprites[i]->getFilename());
}
for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
- if (_talkSpritesEx[i]->_filename)
- buffer->putTextIndent(indent + 2, "TALK_SPECIAL=\"%s\"\n", _talkSpritesEx[i]->_filename);
+ if (_talkSpritesEx[i]->getFilename())
+ buffer->putTextIndent(indent + 2, "TALK_SPECIAL=\"%s\"\n", _talkSpritesEx[i]->getFilename());
}
return STATUS_OK;
|