diff options
| author | Einar Johan Trøan Sømåen | 2012-06-26 12:33:37 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-26 12:33:37 +0200 |
| commit | 831560d03b5d19e64feccdac9ff909ffe9100a39 (patch) | |
| tree | ebf834a9767f7fa6df69050708858269aacde7b3 /engines/wintermute/Base | |
| parent | 7207f20f6a18da76786bc537bd2f931de9024c57 (diff) | |
| download | scummvm-rg350-831560d03b5d19e64feccdac9ff909ffe9100a39.tar.gz scummvm-rg350-831560d03b5d19e64feccdac9ff909ffe9100a39.tar.bz2 scummvm-rg350-831560d03b5d19e64feccdac9ff909ffe9100a39.zip | |
WINTERMUTE: Rename FuncName->funcName in AdObject
Diffstat (limited to 'engines/wintermute/Base')
| -rw-r--r-- | engines/wintermute/Base/BObject.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/Base/BObject.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/Base/BSprite.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/Base/BObject.cpp b/engines/wintermute/Base/BObject.cpp index d117fe3455..7c3acd83a7 100644 --- a/engines/wintermute/Base/BObject.cpp +++ b/engines/wintermute/Base/BObject.cpp @@ -174,7 +174,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi Stack->CorrectParams(2);
_posX = Stack->Pop()->GetInt();
_posY = Stack->Pop()->GetInt();
- AfterMove();
+ afterMove();
Stack->PushNULL();
return S_OK;
@@ -680,7 +680,7 @@ HRESULT CBObject::scSetProperty(const char *Name, CScValue *Value) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "X") == 0) {
_posX = Value->GetInt();
- AfterMove();
+ afterMove();
return S_OK;
}
@@ -689,7 +689,7 @@ HRESULT CBObject::scSetProperty(const char *Name, CScValue *Value) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "Y") == 0) {
_posY = Value->GetInt();
- AfterMove();
+ afterMove();
return S_OK;
}
@@ -1115,7 +1115,7 @@ void CBObject::setSoundEvent(const char *eventName) { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CBObject::AfterMove() {
+HRESULT CBObject::afterMove() {
return S_OK;
}
diff --git a/engines/wintermute/Base/BObject.h b/engines/wintermute/Base/BObject.h index 20b6cfdb2a..c289bd1313 100644 --- a/engines/wintermute/Base/BObject.h +++ b/engines/wintermute/Base/BObject.h @@ -46,7 +46,7 @@ class CScScript; class CBObject : public CBScriptHolder {
public:
TSpriteBlendMode _blendMode;
- virtual HRESULT AfterMove();
+ virtual HRESULT afterMove();
float _relativeRotate;
bool _rotateValid;
float _rotate;
diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp index 6ec19c6ba3..6f23649737 100644 --- a/engines/wintermute/Base/BSprite.cpp +++ b/engines/wintermute/Base/BSprite.cpp @@ -110,7 +110,7 @@ HRESULT CBSprite::Draw(int X, int Y, CBObject *Register, float ZoomX, float Zoom if (_changed && _owner && _owner->_movable) {
_owner->_posX += _moveX;
_owner->_posY += _moveY;
- _owner->AfterMove();
+ _owner->afterMove();
X = _owner->_posX;
Y = _owner->_posY;
|