diff options
| author | Einar Johan Trøan Sømåen | 2012-06-26 00:41:05 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-26 00:41:05 +0200 |
| commit | 37079a633591c386731c6287800a09cb093ae78b (patch) | |
| tree | 5ab996372ffd14273bafb9dc87898e0f940bb358 /engines/wintermute/Base/BObject.cpp | |
| parent | 4f1989e6b82ed493b59a06df7744c62b668b5929 (diff) | |
| download | scummvm-rg350-37079a633591c386731c6287800a09cb093ae78b.tar.gz scummvm-rg350-37079a633591c386731c6287800a09cb093ae78b.tar.bz2 scummvm-rg350-37079a633591c386731c6287800a09cb093ae78b.zip | |
WINTERMUTE: Rename FuncName->funcName in BNamedObject and BScriptHolder
Diffstat (limited to 'engines/wintermute/Base/BObject.cpp')
| -rw-r--r-- | engines/wintermute/Base/BObject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/Base/BObject.cpp b/engines/wintermute/Base/BObject.cpp index 7eee851e65..107ab2537c 100644 --- a/engines/wintermute/Base/BObject.cpp +++ b/engines/wintermute/Base/BObject.cpp @@ -101,15 +101,15 @@ CBObject::CBObject(CBGame *inGame): CBScriptHolder(inGame) { //////////////////////////////////////////////////////////////////////
CBObject::~CBObject() {
- Cleanup();
+ cleanup();
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBObject::Cleanup() {
+HRESULT CBObject::cleanup() {
if (Game && Game->_activeObject == this) Game->_activeObject = NULL;
- CBScriptHolder::Cleanup();
+ CBScriptHolder::cleanup();
delete[] _soundEvent;
_soundEvent = NULL;
@@ -157,7 +157,7 @@ char *CBObject::GetCaption(int Case) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBObject::Listen(CBScriptHolder *param1, uint32 param2) {
+HRESULT CBObject::listen(CBScriptHolder *param1, uint32 param2) {
return E_FAIL;
}
@@ -1060,7 +1060,7 @@ HRESULT CBObject::SetSFXVolume(int Volume) { HRESULT CBObject::UpdateSounds() {
if (_soundEvent) {
if (_sFX && !_sFX->IsPlaying()) {
- ApplyEvent(_soundEvent);
+ applyEvent(_soundEvent);
SetSoundEvent(NULL);
}
}
|