diff options
| author | Einar Johan Trøan Sømåen | 2012-07-22 23:17:32 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-22 23:17:32 +0200 |
| commit | 8c378f794e0398e646eb3598c9e27c09b4d68dfc (patch) | |
| tree | 6b02b5ee105402e163f212adf96cc66b5b68c8d1 /engines/wintermute/ad/ad_talk_holder.cpp | |
| parent | f6a5a2a0d57d2e0829aa93ac0b30d3c0e1bf8838 (diff) | |
| download | scummvm-rg350-8c378f794e0398e646eb3598c9e27c09b4d68dfc.tar.gz scummvm-rg350-8c378f794e0398e646eb3598c9e27c09b4d68dfc.tar.bz2 scummvm-rg350-8c378f794e0398e646eb3598c9e27c09b4d68dfc.zip | |
WINTERMUTE: Wrap _name in base_named_object in getters/setters.
Diffstat (limited to 'engines/wintermute/ad/ad_talk_holder.cpp')
| -rw-r--r-- | engines/wintermute/ad/ad_talk_holder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp index 17f7171cc3..de19004584 100644 --- a/engines/wintermute/ad/ad_talk_holder.cpp +++ b/engines/wintermute/ad/ad_talk_holder.cpp @@ -75,7 +75,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { if (_animSprite) {
bool res = _animSprite->loadFile(_forcedTalkAnimName);
if (DID_FAIL(res)) {
- _gameRef->LOG(res, "AdTalkHolder::GetTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", _name, _forcedTalkAnimName);
+ _gameRef->LOG(res, "AdTalkHolder::GetTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", getName(), _forcedTalkAnimName);
delete _animSprite;
_animSprite = NULL;
} else return _animSprite;
@@ -86,7 +86,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { if (stance != NULL) {
// search special talk stances
for (int i = 0; i < _talkSpritesEx.getSize(); i++) {
- if (scumm_stricmp(_talkSpritesEx[i]->_name, stance) == 0) {
+ if (scumm_stricmp(_talkSpritesEx[i]->getName(), stance) == 0) {
ret = _talkSpritesEx[i];
break;
}
@@ -94,7 +94,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) { if (ret == NULL) {
// serach generic talk stances
for (int i = 0; i < _talkSprites.getSize(); i++) {
- if (scumm_stricmp(_talkSprites[i]->_name, stance) == 0) {
+ if (scumm_stricmp(_talkSprites[i]->getName(), stance) == 0) {
ret = _talkSprites[i];
break;
}
|