diff options
| author | Einar Johan Trøan Sømåen | 2012-07-08 22:10:15 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-08 22:10:15 +0200 |
| commit | 5f7b45de34d4f34c543d47e1feead84c79654965 (patch) | |
| tree | 2a58bf0eb515d849000cd32c03f4ce31ef950727 /engines/wintermute/Ad | |
| parent | 11e60e35a238118331c129f3797a2d791cbdb353 (diff) | |
| download | scummvm-rg350-5f7b45de34d4f34c543d47e1feead84c79654965.tar.gz scummvm-rg350-5f7b45de34d4f34c543d47e1feead84c79654965.tar.bz2 scummvm-rg350-5f7b45de34d4f34c543d47e1feead84c79654965.zip | |
WINTERMUTE: Rename FuncName/VarName -> funcName/varName in BSprite
Diffstat (limited to 'engines/wintermute/Ad')
| -rw-r--r-- | engines/wintermute/Ad/AdActor.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdEntity.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdItem.cpp | 5 | ||||
| -rw-r--r-- | engines/wintermute/Ad/AdSentence.cpp | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index 116f8e9794..d4d41c0fa6 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -620,7 +620,7 @@ HRESULT CAdActor::update() { }
if (_tempSprite2) {
- _tempSprite2->Reset();
+ _tempSprite2->reset();
if (_tempSprite2->_looping) _tempSprite2->_looping = false;
}
_currentSprite = _tempSprite2;
@@ -649,7 +649,7 @@ HRESULT CAdActor::update() { }
if (_tempSprite2) {
- _tempSprite2->Reset();
+ _tempSprite2->reset();
if (_tempSprite2->_looping) _tempSprite2->_looping = false;
}
_currentSprite = _tempSprite2;
@@ -694,7 +694,7 @@ HRESULT CAdActor::update() { } else {
_tempSprite2 = getTalkStance(_sentence->getNextStance());
if (_tempSprite2) {
- _tempSprite2->Reset();
+ _tempSprite2->reset();
_currentSprite = _tempSprite2;
((CAdGame *)Game)->addSentence(_sentence);
}
@@ -1304,7 +1304,7 @@ HRESULT CAdActor::playAnim(const char *filename) { if (Anim) {
_animSprite2 = Anim->getSprite(_dir);
if (_animSprite2) {
- _animSprite2->Reset();
+ _animSprite2->reset();
_state = STATE_PLAYING_ANIM_SET;
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp index c5edae5a8f..4686e655ce 100644 --- a/engines/wintermute/Ad/AdEntity.cpp +++ b/engines/wintermute/Ad/AdEntity.cpp @@ -574,7 +574,7 @@ HRESULT CAdEntity::update() { } else {
_tempSprite2 = getTalkStance(_sentence->getNextStance());
if (_tempSprite2) {
- _tempSprite2->Reset();
+ _tempSprite2->reset();
_currentSprite = _tempSprite2;
}
((CAdGame *)Game)->addSentence(_sentence);
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp index e431ca78cf..36daeefd91 100644 --- a/engines/wintermute/Ad/AdItem.cpp +++ b/engines/wintermute/Ad/AdItem.cpp @@ -366,7 +366,7 @@ HRESULT CAdItem::update() { } else {
_tempSprite2 = getTalkStance(_sentence->getNextStance());
if (_tempSprite2) {
- _tempSprite2->Reset();
+ _tempSprite2->reset();
_currentSprite = _tempSprite2;
}
((CAdGame *)Game)->addSentence(_sentence);
@@ -398,7 +398,8 @@ HRESULT CAdItem::display(int x, int y) { _posY = y;
HRESULT ret;
- if (_currentSprite) ret = _currentSprite->Draw(x, y, this, 100, 100, _alphaColor);
+ if (_currentSprite)
+ ret = _currentSprite->draw(x, y, this, 100, 100, _alphaColor);
else ret = S_OK;
if (_displayAmount) {
diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp index 7548655ee6..88b0f26d92 100644 --- a/engines/wintermute/Ad/AdSentence.cpp +++ b/engines/wintermute/Ad/AdSentence.cpp @@ -288,7 +288,7 @@ HRESULT CAdSentence::update(TDirection dir) { talkNodeFound = true;
CBSprite *newSprite = _talkDef->_nodes[i]->getSprite(dir);
- if (newSprite != _currentSprite) newSprite->Reset();
+ if (newSprite != _currentSprite) newSprite->reset();
_currentSprite = newSprite;
if (!_talkDef->_nodes[i]->_playToEnd) break;
@@ -300,7 +300,7 @@ HRESULT CAdSentence::update(TDirection dir) { if (!talkNodeFound) {
CBSprite *newSprite = _talkDef->getDefaultSprite(dir);
if (newSprite) {
- if (newSprite != _currentSprite) newSprite->Reset();
+ if (newSprite != _currentSprite) newSprite->reset();
_currentSprite = newSprite;
} else _currentSprite = NULL;
}
|