diff options
| author | Einar Johan Trøan Sømåen | 2012-07-26 22:20:55 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-26 22:20:55 +0200 |
| commit | 3a49f2bad407787ef65d04c5f9ae423485629b41 (patch) | |
| tree | f7ceed0ac885724b5569302bc23ba3f027705fb1 /engines/wintermute/base/base_object.cpp | |
| parent | 496a3938c451683845e73fa9b2cba20dadddfe21 (diff) | |
| download | scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.tar.gz scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.tar.bz2 scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.zip | |
WINTERMUTE: More variable/function renaming VarName->varName
Diffstat (limited to 'engines/wintermute/base/base_object.cpp')
| -rw-r--r-- | engines/wintermute/base/base_object.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp index 18619616fe..76047ef4b4 100644 --- a/engines/wintermute/base/base_object.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -428,8 +428,8 @@ bool BaseObject::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta else if (strcmp(name, "SetSoundPosition") == 0) {
stack->correctParams(1);
- uint32 Time = stack->pop()->getInt();
- if (DID_FAIL(setSFXTime(Time))) {
+ uint32 time = stack->pop()->getInt();
+ if (DID_FAIL(setSFXTime(time))) {
stack->pushBool(false);
} else {
stack->pushBool(true);
@@ -1099,7 +1099,7 @@ bool BaseObject::playSFX(const char *filename, bool looping, bool playNow, const _sFX->setPositionTime(_sFXStart);
_sFXStart = 0;
}
- _sFX->ApplyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4);
+ _sFX->applyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4);
if (playNow) {
setSoundEvent(eventName);
if (loopStart) {
@@ -1192,16 +1192,16 @@ bool BaseObject::updateSounds() { //////////////////////////////////////////////////////////////////////////
bool BaseObject::updateOneSound(BaseSound *sound) {
- bool Ret = STATUS_OK;
+ bool ret = STATUS_OK;
if (sound) {
if (_autoSoundPanning) {
- Ret = sound->setPan(_gameRef->_soundMgr->posToPan(_posX - _gameRef->_offsetX, _posY - _gameRef->_offsetY));
+ ret = sound->setPan(_gameRef->_soundMgr->posToPan(_posX - _gameRef->_offsetX, _posY - _gameRef->_offsetY));
}
- Ret = sound->ApplyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4);
+ ret = sound->applyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4);
}
- return Ret;
+ return ret;
}
//////////////////////////////////////////////////////////////////////////
|