From c2239512909eae01f6fa4ad3ed2c34de9cc9343f Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Tue, 26 Jun 2012 01:11:52 +0200 Subject: WINTERMUTE: Rename FuncName -> funcName in BObject --- engines/wintermute/Ad/AdActor.cpp | 18 ++-- engines/wintermute/Ad/AdActor.h | 6 +- engines/wintermute/Ad/AdEntity.cpp | 24 ++--- engines/wintermute/Ad/AdEntity.h | 6 +- engines/wintermute/Ad/AdGame.cpp | 38 +++---- engines/wintermute/Ad/AdGame.h | 2 +- engines/wintermute/Ad/AdInventoryBox.cpp | 14 +-- engines/wintermute/Ad/AdInventoryBox.h | 2 +- engines/wintermute/Ad/AdItem.cpp | 12 +-- engines/wintermute/Ad/AdItem.h | 6 +- engines/wintermute/Ad/AdLayer.cpp | 4 +- engines/wintermute/Ad/AdNodeState.cpp | 10 +- engines/wintermute/Ad/AdNodeState.h | 4 +- engines/wintermute/Ad/AdObject.cpp | 30 +++--- engines/wintermute/Ad/AdObject.h | 12 +-- engines/wintermute/Ad/AdRegion.cpp | 4 +- engines/wintermute/Ad/AdResponseBox.cpp | 12 +-- engines/wintermute/Ad/AdResponseBox.h | 2 +- engines/wintermute/Ad/AdScene.cpp | 40 +++---- engines/wintermute/Ad/AdScene.h | 6 +- engines/wintermute/Ad/AdSentence.cpp | 4 +- engines/wintermute/Ad/AdSentence.h | 4 +- engines/wintermute/Base/BFader.cpp | 4 +- engines/wintermute/Base/BFader.h | 4 +- engines/wintermute/Base/BFrame.cpp | 2 +- engines/wintermute/Base/BGame.cpp | 48 ++++----- engines/wintermute/Base/BGame.h | 10 +- engines/wintermute/Base/BObject.cpp | 126 +++++++++++------------ engines/wintermute/Base/BObject.h | 50 ++++----- engines/wintermute/Base/BRegion.cpp | 4 +- engines/wintermute/Base/BSprite.cpp | 4 +- engines/wintermute/Base/BSprite.h | 2 +- engines/wintermute/Base/BTransitionMgr.cpp | 8 +- engines/wintermute/Base/BTransitionMgr.h | 4 +- engines/wintermute/Base/BViewport.cpp | 2 +- engines/wintermute/Base/BViewport.h | 2 +- engines/wintermute/Base/PartEmitter.cpp | 8 +- engines/wintermute/Base/PartEmitter.h | 4 +- engines/wintermute/Base/PartParticle.cpp | 6 +- engines/wintermute/Base/PartParticle.h | 4 +- engines/wintermute/Base/scriptables/ScEngine.cpp | 2 +- engines/wintermute/PlatformSDL.cpp | 8 +- engines/wintermute/UI/UIButton.cpp | 8 +- engines/wintermute/UI/UIButton.h | 2 +- engines/wintermute/UI/UIEdit.cpp | 10 +- engines/wintermute/UI/UIEdit.h | 4 +- engines/wintermute/UI/UIEntity.cpp | 6 +- engines/wintermute/UI/UIEntity.h | 2 +- engines/wintermute/UI/UIObject.cpp | 6 +- engines/wintermute/UI/UIObject.h | 4 +- engines/wintermute/UI/UIText.cpp | 8 +- engines/wintermute/UI/UIText.h | 2 +- engines/wintermute/UI/UITiledImage.cpp | 2 +- engines/wintermute/UI/UITiledImage.h | 2 +- engines/wintermute/UI/UIWindow.cpp | 26 ++--- engines/wintermute/UI/UIWindow.h | 8 +- engines/wintermute/video/VidPlayer.cpp | 4 +- engines/wintermute/video/VidTheoraPlayer.cpp | 4 +- 58 files changed, 330 insertions(+), 330 deletions(-) (limited to 'engines/wintermute') diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index dd201ac6c1..bfd344531c 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -257,7 +257,7 @@ HRESULT CAdActor::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_FONT: @@ -504,8 +504,8 @@ void CAdActor::GoTo(int X, int Y, TDirection AfterWalkDir) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdActor::Display() { - if (_active) UpdateSounds(); +HRESULT CAdActor::display() { + if (_active) updateSounds(); uint32 Alpha; if (_alphaColor != 0) Alpha = _alphaColor; @@ -527,7 +527,7 @@ HRESULT CAdActor::Display() { bool Reg = _registrable; if (_ignoreItems && ((CAdGame *)Game)->_selectedItem) Reg = false; - _currentSprite->Display(_posX, + _currentSprite->display(_posX, _posY, Reg ? _registerAlias : NULL, ScaleX, @@ -539,7 +539,7 @@ HRESULT CAdActor::Display() { } if (_active) DisplaySpriteAttachments(false); - if (_active && _partEmitter) _partEmitter->Display(); + if (_active && _partEmitter) _partEmitter->display(); return S_OK; @@ -547,7 +547,7 @@ HRESULT CAdActor::Display() { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdActor::Update() { +HRESULT CAdActor::update() { _currentSprite = NULL; if (_state == STATE_READY) { @@ -681,7 +681,7 @@ HRESULT CAdActor::Update() { ////////////////////////////////////////////////////////////////////////// case STATE_TALKING: { - _sentence->Update(_dir); + _sentence->update(_dir); if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite; bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->IsPlaying() && !_sentence->_sound->IsPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime); @@ -1238,7 +1238,7 @@ TDirection CAdActor::AngleToDirection(int Angle) { ////////////////////////////////////////////////////////////////////////// -int CAdActor::GetHeight() { +int CAdActor::getHeight() { // if no current sprite is set, set some if (_currentSprite == NULL) { if (_standSprite) _currentSprite = _standSprite->GetSprite(_dir); @@ -1248,7 +1248,7 @@ int CAdActor::GetHeight() { } } // and get height - return CAdTalkHolder::GetHeight(); + return CAdTalkHolder::getHeight(); } diff --git a/engines/wintermute/Ad/AdActor.h b/engines/wintermute/Ad/AdActor.h index 32df33d39a..ab1b8a775e 100644 --- a/engines/wintermute/Ad/AdActor.h +++ b/engines/wintermute/Ad/AdActor.h @@ -48,12 +48,12 @@ class CAdActor : public CAdTalkHolder { public: TDirection AngleToDirection(int Angle); DECLARE_PERSISTENT(CAdActor, CAdTalkHolder) - virtual int GetHeight(); + virtual int getHeight(); CBSprite *GetTalkStance(const char *Stance); virtual void GoTo(int X, int Y, TDirection AfterWalkDir = DI_NONE); CBPoint *_targetPoint; - virtual HRESULT Update(); - virtual HRESULT Display(); + virtual HRESULT update(); + virtual HRESULT display(); TDirection _targetDir; TDirection _afterWalkDir; virtual void TurnTo(TDirection dir); diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp index 60a94b5e5a..9e7fb28f2a 100644 --- a/engines/wintermute/Ad/AdEntity.cpp +++ b/engines/wintermute/Ad/AdEntity.cpp @@ -257,7 +257,7 @@ HRESULT CAdEntity::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_FONT: @@ -395,7 +395,7 @@ HRESULT CAdEntity::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_SOUND: - PlaySFX((char *)params, false, false); + playSFX((char *)params, false, false); break; case TOKEN_SOUND_START_TIME: @@ -481,9 +481,9 @@ HRESULT CAdEntity::LoadBuffer(byte *Buffer, bool Complete) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdEntity::Display() { +HRESULT CAdEntity::display() { if (_active) { - UpdateSounds(); + updateSounds(); uint32 Alpha; if (_alphaColor != 0) Alpha = _alphaColor; @@ -510,7 +510,7 @@ HRESULT CAdEntity::Display() { if (_theora && (_theora->isPlaying() || _theora->isPaused())) { _theora->display(Alpha); } else if (_currentSprite) { - _currentSprite->Display(_posX, + _currentSprite->display(_posX, _posY, (Reg || _editorAlwaysRegister) ? _registerAlias : NULL, ScaleX, @@ -521,7 +521,7 @@ HRESULT CAdEntity::Display() { } DisplaySpriteAttachments(false); - if (_partEmitter) _partEmitter->Display(_region); + if (_partEmitter) _partEmitter->display(_region); } return S_OK; @@ -529,7 +529,7 @@ HRESULT CAdEntity::Display() { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdEntity::Update() { +HRESULT CAdEntity::update() { _currentSprite = NULL; if (_state == STATE_READY && _animSprite) { @@ -562,7 +562,7 @@ HRESULT CAdEntity::Update() { ////////////////////////////////////////////////////////////////////////// case STATE_TALKING: { - _sentence->Update(); + _sentence->update(); if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite; bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->IsPlaying() && !_sentence->_sound->IsPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime); @@ -632,7 +632,7 @@ HRESULT CAdEntity::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th if (strcmp(Name, "StopSound") == 0 && _subtype == ENTITY_SOUND) { Stack->CorrectParams(0); - if (FAILED(StopSFX(false))) Stack->PushBool(false); + if (FAILED(stopSFX(false))) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -882,7 +882,7 @@ HRESULT CAdEntity::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); if (_subtype == ENTITY_SOUND) Buffer->PutTextIndent(Indent + 2, "SUBTYPE=\"SOUND\"\n"); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE"); Buffer->PutTextIndent(Indent + 2, "X=%d\n", _posX); Buffer->PutTextIndent(Indent + 2, "Y=%d\n", _posY); @@ -957,12 +957,12 @@ HRESULT CAdEntity::saveAsText(CBDynBuffer *Buffer, int Indent) { ////////////////////////////////////////////////////////////////////////// -int CAdEntity::GetHeight() { +int CAdEntity::getHeight() { if (_region && !_sprite) { return _region->_rect.bottom - _region->_rect.top; } else { if (_currentSprite == NULL) _currentSprite = _sprite; - return CAdObject::GetHeight(); + return CAdObject::getHeight(); } } diff --git a/engines/wintermute/Ad/AdEntity.h b/engines/wintermute/Ad/AdEntity.h index 9418147cb7..28e491cd4e 100644 --- a/engines/wintermute/Ad/AdEntity.h +++ b/engines/wintermute/Ad/AdEntity.h @@ -44,11 +44,11 @@ public: char *_item; DECLARE_PERSISTENT(CAdEntity, CAdTalkHolder) void UpdatePosition(); - virtual int GetHeight(); + virtual int getHeight(); CBRegion *_region; virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent); - virtual HRESULT Update(); - virtual HRESULT Display(); + virtual HRESULT update(); + virtual HRESULT display(); CAdEntity(CBGame *inGame); virtual ~CAdEntity(); HRESULT LoadFile(const char *Filename); diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp index cb547e02b8..c16c1dac28 100644 --- a/engines/wintermute/Ad/AdGame.cpp +++ b/engines/wintermute/Ad/AdGame.cpp @@ -196,7 +196,7 @@ HRESULT CAdGame::cleanup() { ////////////////////////////////////////////////////////////////////////// HRESULT CAdGame::InitLoop() { - if (_scheduledScene && _transMgr->IsReady()) { + if (_scheduledScene && _transMgr->isReady()) { ChangeScene(_scheduledScene, _scheduledFadeIn); delete[] _scheduledScene; _scheduledScene = NULL; @@ -296,7 +296,7 @@ void CAdGame::AddSentence(CAdSentence *Sentence) { HRESULT CAdGame::DisplaySentences(bool Frozen) { for (int i = 0; i < _sentences.GetSize(); i++) { if (Frozen && _sentences[i]->_freezable) continue; - else _sentences[i]->Display(); + else _sentences[i]->display(); } return S_OK; } @@ -1094,22 +1094,22 @@ HRESULT CAdGame::ExternalCall(CScScript *Script, CScStack *Stack, CScStack *This ////////////////////////////////////////////////////////////////////////// -HRESULT CAdGame::ShowCursor() { +HRESULT CAdGame::showCursor() { if (_cursorHidden) return S_OK; if (_selectedItem && Game->_state == GAME_RUNNING && _stateEx == GAME_NORMAL && _interactive) { if (_selectedItem->_cursorCombined) { CBSprite *OrigLastCursor = _lastCursor; - CBGame::ShowCursor(); + CBGame::showCursor(); _lastCursor = OrigLastCursor; } - if (_activeObject && _selectedItem->_cursorHover && _activeObject->GetExtendedFlag("usable")) { + if (_activeObject && _selectedItem->_cursorHover && _activeObject->getExtendedFlag("usable")) { if (!_smartItemCursor || _activeObject->canHandleEvent(_selectedItem->_name)) return DrawCursor(_selectedItem->_cursorHover); else return DrawCursor(_selectedItem->_cursorNormal); } else return DrawCursor(_selectedItem->_cursorNormal); - } else return CBGame::ShowCursor(); + } else return CBGame::showCursor(); } @@ -1712,14 +1712,14 @@ HRESULT CAdGame::DisplayContent(bool Update, bool DisplayAll) { POINT p; GetMousePos(&p); - _scene->Update(); - _scene->Display(); + _scene->update(); + _scene->display(); // display in-game windows DisplayWindows(true); - if (_inventoryBox) _inventoryBox->Display(); - if (_stateEx == GAME_WAITING_RESPONSE) _responseBox->Display(); + if (_inventoryBox) _inventoryBox->display(); + if (_stateEx == GAME_WAITING_RESPONSE) _responseBox->display(); if (_indicatorDisplay) DisplayIndicator(); @@ -1732,15 +1732,15 @@ HRESULT CAdGame::DisplayContent(bool Update, bool DisplayAll) { // textual info DisplaySentences(_state == GAME_FROZEN); - ShowCursor(); + showCursor(); - if (_fader) _fader->Display(); - _transMgr->Update(); + if (_fader) _fader->display(); + _transMgr->update(); } } if (_loadingIcon) { - _loadingIcon->Display(_loadingIconX, _loadingIconY); + _loadingIcon->display(_loadingIconX, _loadingIconY); if (!_loadingIconPersistent) { delete _loadingIcon; _loadingIcon = NULL; @@ -1955,7 +1955,7 @@ HRESULT CAdGame::OnMouseLeftDown() { return S_OK; } - if (_activeObject) _activeObject->HandleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT); + if (_activeObject) _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("LeftClick")); if (!Handled) { @@ -1975,7 +1975,7 @@ HRESULT CAdGame::OnMouseLeftDown() { ////////////////////////////////////////////////////////////////////////// HRESULT CAdGame::OnMouseLeftUp() { - if (_activeObject) _activeObject->HandleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT); + if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT); CBPlatform::ReleaseCapture(); _capturedObject = NULL; @@ -1998,7 +1998,7 @@ HRESULT CAdGame::OnMouseLeftDblClick() { if (_state == GAME_RUNNING && !_interactive) return S_OK; - if (_activeObject) _activeObject->HandleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_LEFT); + if (_activeObject) _activeObject->handleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_LEFT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("LeftDoubleClick")); if (!Handled) { @@ -2023,7 +2023,7 @@ HRESULT CAdGame::OnMouseRightDown() { if ((_state == GAME_RUNNING && !_interactive) || _stateEx == GAME_WAITING_RESPONSE) return S_OK; - if (_activeObject) _activeObject->HandleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT); + if (_activeObject) _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("RightClick")); if (!Handled) { @@ -2038,7 +2038,7 @@ HRESULT CAdGame::OnMouseRightDown() { ////////////////////////////////////////////////////////////////////////// HRESULT CAdGame::OnMouseRightUp() { - if (_activeObject) _activeObject->HandleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT); + if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("RightRelease")); if (!Handled) { diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/Ad/AdGame.h index b722249620..287421c2a4 100644 --- a/engines/wintermute/Ad/AdGame.h +++ b/engines/wintermute/Ad/AdGame.h @@ -118,7 +118,7 @@ public: DECLARE_PERSISTENT(CAdGame, CBGame) void FinishSentences(); - HRESULT ShowCursor(); + HRESULT showCursor(); TGameStateEx _stateEx; CAdResponseBox *_responseBox; CAdInventoryBox *_inventoryBox; diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp index 0eb612757b..ee3e9dedfe 100644 --- a/engines/wintermute/Ad/AdInventoryBox.cpp +++ b/engines/wintermute/Ad/AdInventoryBox.cpp @@ -97,7 +97,7 @@ HRESULT CAdInventoryBox::listen(CBScriptHolder *param1, uint32 param2) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdInventoryBox::Display() { +HRESULT CAdInventoryBox::display() { CAdGame *AdGame = (CAdGame *)Game; if (!_visible) return S_OK; @@ -117,7 +117,7 @@ HRESULT CAdInventoryBox::Display() { _closeButton->_width = Game->_renderer->_width; _closeButton->_height = Game->_renderer->_height; - _closeButton->Display(); + _closeButton->display(); } @@ -125,7 +125,7 @@ HRESULT CAdInventoryBox::Display() { RECT rect = _itemsArea; if (_window) { CBPlatform::OffsetRect(&rect, _window->_posX, _window->_posY); - _window->Display(); + _window->display(); } // display items @@ -138,8 +138,8 @@ HRESULT CAdInventoryBox::Display() { if (ItemIndex >= 0 && ItemIndex < AdGame->_inventoryOwner->GetInventory()->_takenItems.GetSize()) { CAdItem *item = AdGame->_inventoryOwner->GetInventory()->_takenItems[ItemIndex]; if (item != ((CAdGame *)Game)->_selectedItem || !_hideSelected) { - item->Update(); - item->Display(xxx, yyy); + item->update(); + item->display(xxx, yyy); } } @@ -235,7 +235,7 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_WINDOW: @@ -322,7 +322,7 @@ HRESULT CAdInventoryBox::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "{\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "AREA { %d, %d, %d, %d }\n", _itemsArea.left, _itemsArea.top, _itemsArea.right, _itemsArea.bottom); diff --git a/engines/wintermute/Ad/AdInventoryBox.h b/engines/wintermute/Ad/AdInventoryBox.h index bf3a3acbd6..f0900406ad 100644 --- a/engines/wintermute/Ad/AdInventoryBox.h +++ b/engines/wintermute/Ad/AdInventoryBox.h @@ -44,7 +44,7 @@ public: int _itemHeight; int _itemWidth; bool _visible; - virtual HRESULT Display(); + virtual HRESULT display(); CUIButton *_closeButton; int _spacing; int _scrollOffset; diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp index 001ecec3fa..ca001b3eb7 100644 --- a/engines/wintermute/Ad/AdItem.cpp +++ b/engines/wintermute/Ad/AdItem.cpp @@ -192,7 +192,7 @@ HRESULT CAdItem::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_IMAGE: @@ -319,7 +319,7 @@ HRESULT CAdItem::LoadBuffer(byte *Buffer, bool Complete) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdItem::Update() { +HRESULT CAdItem::update() { _currentSprite = NULL; if (_state == STATE_READY && _animSprite) { @@ -354,7 +354,7 @@ HRESULT CAdItem::Update() { ////////////////////////////////////////////////////////////////////////// case STATE_TALKING: { - _sentence->Update(); + _sentence->update(); if (_sentence->_currentSprite) _tempSprite2 = _sentence->_currentSprite; bool TimeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->IsPlaying() && !_sentence->_sound->IsPaused())) || (!_sentence->_sound && _sentence->_duration <= Game->_timer - _sentence->_startTime); @@ -386,7 +386,7 @@ HRESULT CAdItem::Update() { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdItem::Display(int X, int Y) { +HRESULT CAdItem::display(int X, int Y) { int Width = 0; if (_currentSprite) { RECT rc; @@ -750,10 +750,10 @@ HRESULT CAdItem::persist(CBPersistMgr *persistMgr) { ////////////////////////////////////////////////////////////////////////// -bool CAdItem::GetExtendedFlag(const char *FlagName) { +bool CAdItem::getExtendedFlag(const char *FlagName) { if (!FlagName) return false; else if (strcmp(FlagName, "usable") == 0) return true; - else return CAdObject::GetExtendedFlag(FlagName); + else return CAdObject::getExtendedFlag(FlagName); } } // end of namespace WinterMute diff --git a/engines/wintermute/Ad/AdItem.h b/engines/wintermute/Ad/AdItem.h index 9e970c1b58..d394310172 100644 --- a/engines/wintermute/Ad/AdItem.h +++ b/engines/wintermute/Ad/AdItem.h @@ -44,10 +44,10 @@ public: char *_amountString; - HRESULT Update(); + HRESULT update(); DECLARE_PERSISTENT(CAdItem, CAdTalkHolder) - HRESULT Display(int X, int Y); - bool GetExtendedFlag(const char *FlagName); + HRESULT display(int X, int Y); + bool getExtendedFlag(const char *FlagName); bool _inInventory; bool _cursorCombined; CBSprite *_spriteHover; diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp index 454644e591..45c6678188 100644 --- a/engines/wintermute/Ad/AdLayer.cpp +++ b/engines/wintermute/Ad/AdLayer.cpp @@ -142,7 +142,7 @@ HRESULT CAdLayer::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_MAIN: @@ -481,7 +481,7 @@ const char *CAdLayer::scToString() { HRESULT CAdLayer::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "LAYER {\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "MAIN=%s\n", _main ? "TRUE" : "FALSE"); Buffer->PutTextIndent(Indent + 2, "WIDTH=%d\n", _width); Buffer->PutTextIndent(Indent + 2, "HEIGHT=%d\n", _height); diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp index 59165d834c..0e6c718ae0 100644 --- a/engines/wintermute/Ad/AdNodeState.cpp +++ b/engines/wintermute/Ad/AdNodeState.cpp @@ -107,7 +107,7 @@ HRESULT CAdNodeState::persist(CBPersistMgr *persistMgr) { ////////////////////////////////////////////////////////////////////////// -void CAdNodeState::SetCaption(const char *Caption, int Case) { +void CAdNodeState::setCaption(const char *Caption, int Case) { if (Case == 0) Case = 1; if (Case < 1 || Case > 7) return; @@ -121,7 +121,7 @@ void CAdNodeState::SetCaption(const char *Caption, int Case) { ////////////////////////////////////////////////////////////////////////// -char *CAdNodeState::GetCaption(int Case) { +char *CAdNodeState::getCaption(int Case) { if (Case == 0) Case = 1; if (Case < 1 || Case > 7 || _caption[Case - 1] == NULL) return ""; else return _caption[Case - 1]; @@ -137,7 +137,7 @@ HRESULT CAdNodeState::TransferEntity(CAdEntity *Entity, bool IncludingSprites, b if (Saving) { for (int i = 0; i < 7; i++) { - if (Entity->_caption[i]) SetCaption(Entity->_caption[i], i); + if (Entity->_caption[i]) setCaption(Entity->_caption[i], i); } if (!Entity->_region && Entity->_sprite && Entity->_sprite->_filename) { if (IncludingSprites) setFilename(Entity->_sprite->_filename); @@ -148,7 +148,7 @@ HRESULT CAdNodeState::TransferEntity(CAdEntity *Entity, bool IncludingSprites, b _active = Entity->_active; } else { for (int i = 0; i < 7; i++) { - if (_caption[i]) Entity->SetCaption(_caption[i], i); + if (_caption[i]) Entity->setCaption(_caption[i], i); } if (_filename && !Entity->_region && IncludingSprites && strcmp(_filename, "") != 0) { if (!Entity->_sprite || !Entity->_sprite->_filename || scumm_stricmp(Entity->_sprite->_filename, _filename) != 0) @@ -156,7 +156,7 @@ HRESULT CAdNodeState::TransferEntity(CAdEntity *Entity, bool IncludingSprites, b } if (_cursor) { if (!Entity->_cursor || !Entity->_cursor->_filename || scumm_stricmp(Entity->_cursor->_filename, _cursor) != 0) - Entity->SetCursor(_cursor); + Entity->setCursor(_cursor); } Entity->_active = _active; diff --git a/engines/wintermute/Ad/AdNodeState.h b/engines/wintermute/Ad/AdNodeState.h index 99238226c3..d180a3543e 100644 --- a/engines/wintermute/Ad/AdNodeState.h +++ b/engines/wintermute/Ad/AdNodeState.h @@ -45,8 +45,8 @@ public: char *_name; bool _active; char *_caption[7]; - void SetCaption(const char *Caption, int Case); - char *GetCaption(int Case); + void setCaption(const char *Caption, int Case); + char *getCaption(int Case); uint32 _alphaColor; char *_filename; char *_cursor; diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp index 13e6391d69..ca6880557e 100644 --- a/engines/wintermute/Ad/AdObject.cpp +++ b/engines/wintermute/Ad/AdObject.cpp @@ -173,13 +173,13 @@ HRESULT CAdObject::PlayAnim(const char *Filename) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdObject::Display() { +HRESULT CAdObject::display() { return S_OK; } ////////////////////////////////////////////////////////////////////////// -HRESULT CAdObject::Update() { +HRESULT CAdObject::update() { return S_OK; } @@ -805,7 +805,7 @@ HRESULT CAdObject::SetFont(const char *Filename) { ////////////////////////////////////////////////////////////////////////// -int CAdObject::GetHeight() { +int CAdObject::getHeight() { if (!_currentSprite) return 0; else { CBFrame *frame = _currentSprite->_frames[_currentSprite->_currentFrame]; @@ -897,7 +897,7 @@ void CAdObject::Talk(const char *Text, const char *Sound, uint32 Duration, const height = _sentence->_font->GetTextHeight((byte *)_sentence->_text, width); - y = y - height - GetHeight() - 5; + y = y - height - getHeight() - 5; if (_subtitlesModRelative) { x += _subtitlesModX; y += _subtitlesModY; @@ -998,29 +998,29 @@ HRESULT CAdObject::persist(CBPersistMgr *persistMgr) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdObject::UpdateSounds() { +HRESULT CAdObject::updateSounds() { if (_sentence && _sentence->_sound) - UpdateOneSound(_sentence->_sound); + updateOneSound(_sentence->_sound); - return CBObject::UpdateSounds(); + return CBObject::updateSounds(); } ////////////////////////////////////////////////////////////////////////// -HRESULT CAdObject::ResetSoundPan() { +HRESULT CAdObject::resetSoundPan() { if (_sentence && _sentence->_sound) { _sentence->_sound->SetPan(0.0f); } - return CBObject::ResetSoundPan(); + return CBObject::resetSoundPan(); } ////////////////////////////////////////////////////////////////////////// -bool CAdObject::GetExtendedFlag(const char *FlagName) { +bool CAdObject::getExtendedFlag(const char *FlagName) { if (!FlagName) return false; else if (strcmp(FlagName, "usable") == 0) return true; - else return CBObject::GetExtendedFlag(FlagName); + else return CBObject::getExtendedFlag(FlagName); } @@ -1110,10 +1110,10 @@ HRESULT CAdObject::GetScale(float *ScaleX, float *ScaleY) { ////////////////////////////////////////////////////////////////////////// HRESULT CAdObject::UpdateSpriteAttachments() { for (int i = 0; i < _attachmentsPre.GetSize(); i++) { - _attachmentsPre[i]->Update(); + _attachmentsPre[i]->update(); } for (int i = 0; i < _attachmentsPost.GetSize(); i++) { - _attachmentsPost[i]->Update(); + _attachmentsPost[i]->update(); } return S_OK; } @@ -1162,7 +1162,7 @@ HRESULT CAdObject::DisplaySpriteAttachment(CAdObject *Attachment) { Attachment->_registerAlias = this; Attachment->_registrable = this->_registrable; - HRESULT ret = Attachment->Display(); + HRESULT ret = Attachment->display(); Attachment->_posX = OrigX; Attachment->_posY = OrigY; @@ -1197,7 +1197,7 @@ HRESULT CAdObject::UpdatePartEmitter() { _partEmitter->_posX = (int)(_posX + (ScaleX / 100.0f) * _partOffsetX); _partEmitter->_posY = (int)(_posY + (ScaleY / 100.0f) * _partOffsetY); } - return _partEmitter->Update(); + return _partEmitter->update(); } } // end of namespace WinterMute diff --git a/engines/wintermute/Ad/AdObject.h b/engines/wintermute/Ad/AdObject.h index 6c20e5d84e..ca85da42b0 100644 --- a/engines/wintermute/Ad/AdObject.h +++ b/engines/wintermute/Ad/AdObject.h @@ -64,17 +64,17 @@ public: HRESULT UpdateBlockRegion(); bool _forcedTalkAnimUsed; char *_forcedTalkAnimName; - virtual bool GetExtendedFlag(const char *FlagName); - virtual HRESULT ResetSoundPan(); - virtual HRESULT UpdateSounds(); + virtual bool getExtendedFlag(const char *FlagName); + virtual HRESULT resetSoundPan(); + virtual HRESULT updateSounds(); HRESULT Reset(); DECLARE_PERSISTENT(CAdObject, CBObject) virtual void Talk(const char *Text, const char *Sound = NULL, uint32 Duration = 0, const char *Stances = NULL, TTextAlign Align = TAL_CENTER); - virtual int GetHeight(); + virtual int getHeight(); CAdSentence *_sentence; HRESULT SetFont(const char *Filename); - virtual HRESULT Update(); - virtual HRESULT Display(); + virtual HRESULT update(); + virtual HRESULT display(); bool _drawn; bool _active; virtual HRESULT PlayAnim(const char *Filename); diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp index 43ed13eef3..c8b65a6691 100644 --- a/engines/wintermute/Ad/AdRegion.cpp +++ b/engines/wintermute/Ad/AdRegion.cpp @@ -144,7 +144,7 @@ HRESULT CAdRegion::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_ACTIVE: @@ -349,7 +349,7 @@ const char *CAdRegion::scToString() { HRESULT CAdRegion::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "REGION {\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "BLOCKED=%s\n", _blocked ? "TRUE" : "FALSE"); Buffer->PutTextIndent(Indent + 2, "DECORATION=%s\n", _decoration ? "TRUE" : "FALSE"); Buffer->PutTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE"); diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp index fe0784feff..42f1038ffc 100644 --- a/engines/wintermute/Ad/AdResponseBox.cpp +++ b/engines/wintermute/Ad/AdResponseBox.cpp @@ -141,7 +141,7 @@ HRESULT CAdResponseBox::CreateButtons() { if (_responses[i]->_iconHover) btn->_imageHover = _responses[i]->_iconHover; if (_responses[i]->_iconPressed) btn->_imagePress = _responses[i]->_iconPressed; - btn->SetCaption(_responses[i]->_text); + btn->setCaption(_responses[i]->_text); if (_cursor) btn->_cursor = _cursor; else if (Game->_activeCursor) btn->_cursor = Game->_activeCursor; } @@ -396,11 +396,11 @@ HRESULT CAdResponseBox::saveAsText(CBDynBuffer *Buffer, int Indent) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdResponseBox::Display() { +HRESULT CAdResponseBox::display() { RECT rect = _responseArea; if (_window) { CBPlatform::OffsetRect(&rect, _window->_posX, _window->_posY); - //_window->Display(); + //_window->display(); } int xxx, yyy, i; @@ -465,16 +465,16 @@ HRESULT CAdResponseBox::Display() { _shieldWindow->_width = Game->_renderer->_width; _shieldWindow->_height = Game->_renderer->_height; - _shieldWindow->Display(); + _shieldWindow->display(); } // display window - if (_window) _window->Display(); + if (_window) _window->display(); // display response buttons for (i = _scrollOffset; i < _respButtons.GetSize(); i++) { - _respButtons[i]->Display(); + _respButtons[i]->display(); } return S_OK; diff --git a/engines/wintermute/Ad/AdResponseBox.h b/engines/wintermute/Ad/AdResponseBox.h index 044a78bb4f..0f719ab6c1 100644 --- a/engines/wintermute/Ad/AdResponseBox.h +++ b/engines/wintermute/Ad/AdResponseBox.h @@ -56,7 +56,7 @@ public: } TResponseEvent; HRESULT WeedResponses(); - HRESULT Display(); + HRESULT display(); int _spacing; int _scrollOffset; CBFont *_fontHover; diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp index 6bd5be4bea..2feb042df6 100644 --- a/engines/wintermute/Ad/AdScene.cpp +++ b/engines/wintermute/Ad/AdScene.cpp @@ -638,7 +638,7 @@ HRESULT CAdScene::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_LAYER: { @@ -957,7 +957,7 @@ HRESULT CAdScene::TraverseNodes(bool Update) { _shieldWindow->_posX = _shieldWindow->_posY = 0; _shieldWindow->_width = Game->_renderer->_width; _shieldWindow->_height = Game->_renderer->_height; - _shieldWindow->Display(); + _shieldWindow->display(); } } } @@ -987,8 +987,8 @@ HRESULT CAdScene::TraverseNodes(bool Update) { if (Node->_entity->_active && (Game->_editorMode || !Node->_entity->_editorOnly)) { Game->_renderer->Setup2D(); - if (Update) Node->_entity->Update(); - else Node->_entity->Display(); + if (Update) Node->_entity->update(); + else Node->_entity->display(); } break; @@ -1022,8 +1022,8 @@ HRESULT CAdScene::TraverseNodes(bool Update) { // display/update fader if (_fader) { - if (Update) _fader->Update(); - else _fader->Display(); + if (Update) _fader->update(); + else _fader->display(); } if (PopViewport) Game->PopViewport(); @@ -1033,7 +1033,7 @@ HRESULT CAdScene::TraverseNodes(bool Update) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdScene::Display() { +HRESULT CAdScene::display() { return TraverseNodes(false); } @@ -1049,7 +1049,7 @@ HRESULT CAdScene::UpdateFreeObjects() { for (i = 0; i < AdGame->_objects.GetSize(); i++) { if (!AdGame->_objects[i]->_active) continue; - AdGame->_objects[i]->Update(); + AdGame->_objects[i]->update(); AdGame->_objects[i]->_drawn = false; } @@ -1057,7 +1057,7 @@ HRESULT CAdScene::UpdateFreeObjects() { for (i = 0; i < _objects.GetSize(); i++) { if (!_objects[i]->_active) continue; - _objects[i]->Update(); + _objects[i]->update(); _objects[i]->_drawn = false; } @@ -1106,7 +1106,7 @@ HRESULT CAdScene::DisplayRegionContent(CAdRegion *Region, bool Display3DOnly) { Game->_renderer->Setup2D(); - if (Game->_editorMode || !Obj->_editorOnly) Obj->Display(); + if (Game->_editorMode || !Obj->_editorOnly) Obj->display(); Obj->_drawn = true; } @@ -1116,7 +1116,7 @@ HRESULT CAdScene::DisplayRegionContent(CAdRegion *Region, bool Display3DOnly) { if (Game->_editorMode && Region == NULL) { for (i = 0; i < _objects.GetSize(); i++) { if (_objects[i]->_active && _objects[i]->_editorOnly) { - _objects[i]->Display(); + _objects[i]->display(); _objects[i]->_drawn = true; } } @@ -1167,7 +1167,7 @@ HRESULT CAdScene::DisplayRegionContentOld(CAdRegion *Region) { if (obj != NULL) { Game->_renderer->Setup2D(); - if (Game->_editorMode || !obj->_editorOnly) obj->Display(); + if (Game->_editorMode || !obj->_editorOnly) obj->display(); obj->_drawn = true; } } while (obj != NULL); @@ -1177,7 +1177,7 @@ HRESULT CAdScene::DisplayRegionContentOld(CAdRegion *Region) { if (Game->_editorMode && Region == NULL) { for (i = 0; i < _objects.GetSize(); i++) { if (_objects[i]->_active && _objects[i]->_editorOnly) { - _objects[i]->Display(); + _objects[i]->display(); _objects[i]->_drawn = true; } } @@ -1188,7 +1188,7 @@ HRESULT CAdScene::DisplayRegionContentOld(CAdRegion *Region) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdScene::Update() { +HRESULT CAdScene::update() { return TraverseNodes(true); } @@ -1219,13 +1219,13 @@ void CAdScene::ScrollTo(int OffsetX, int OffsetY) { ////////////////////////////////////////////////////////////////////////// void CAdScene::ScrollToObject(CBObject *Object) { - if (Object) ScrollTo(Object->_posX, Object->_posY - Object->GetHeight() / 2); + if (Object) ScrollTo(Object->_posX, Object->_posY - Object->getHeight() / 2); } ////////////////////////////////////////////////////////////////////////// void CAdScene::SkipToObject(CBObject *Object) { - if (Object) SkipTo(Object->_posX, Object->_posY - Object->GetHeight() / 2); + if (Object) SkipTo(Object->_posX, Object->_posY - Object->getHeight() / 2); } @@ -1975,7 +1975,7 @@ HRESULT CAdScene::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "SCENE {\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); if (_persistentState) Buffer->PutTextIndent(Indent + 2, "PERSISTENT_STATE=%s\n", _persistentState ? "TRUE" : "FALSE"); @@ -2379,10 +2379,10 @@ HRESULT CAdScene::GetViewportSize(int *Width, int *Height) { CAdGame *AdGame = (CAdGame *)Game; if (_viewport && !Game->_editorMode) { if (Width) *Width = _viewport->GetWidth(); - if (Height) *Height = _viewport->GetHeight(); + if (Height) *Height = _viewport->getHeight(); } else if (AdGame->_sceneViewport && !Game->_editorMode) { if (Width) *Width = AdGame->_sceneViewport->GetWidth(); - if (Height) *Height = AdGame->_sceneViewport->GetHeight(); + if (Height) *Height = AdGame->_sceneViewport->getHeight(); } else { if (Width) *Width = Game->_renderer->_width; if (Height) *Height = Game->_renderer->_height; @@ -2627,7 +2627,7 @@ HRESULT CAdScene::GetRegionsAt(int X, int Y, CAdRegion **RegionList, int NumRegi } ////////////////////////////////////////////////////////////////////////// -HRESULT CAdScene::RestoreDeviceObjects() { +HRESULT CAdScene::restoreDeviceObjects() { return S_OK; } diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/Ad/AdScene.h index 8aa5657bc2..6587418dd9 100644 --- a/engines/wintermute/Ad/AdScene.h +++ b/engines/wintermute/Ad/AdScene.h @@ -96,7 +96,7 @@ public: void SkipToObject(CBObject *Object); void ScrollToObject(CBObject *Object); void ScrollTo(int OffsetX, int OffsetY); - virtual HRESULT Update(); + virtual HRESULT update(); bool _autoScroll; int _targetOffsetTop; int _targetOffsetLeft; @@ -109,7 +109,7 @@ public: uint32 _scrollTimeH; uint32 _lastTimeH; - virtual HRESULT Display(); + virtual HRESULT display(); uint32 _pFMaxTime; HRESULT InitLoop(); void PathFinderStep(); @@ -152,7 +152,7 @@ public: CBArray _scaleLevels; CBArray _rotLevels; - virtual HRESULT RestoreDeviceObjects(); + virtual HRESULT restoreDeviceObjects(); int GetPointsDist(CBPoint p1, CBPoint p2, CBObject *requester = NULL); // scripting interface diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp index a893a00489..a753f13a67 100644 --- a/engines/wintermute/Ad/AdSentence.cpp +++ b/engines/wintermute/Ad/AdSentence.cpp @@ -165,7 +165,7 @@ char *CAdSentence::GetStance(int Stance) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdSentence::Display() { +HRESULT CAdSentence::display() { if (!_font || !_text) return E_FAIL; if (_sound && !_soundStarted) { @@ -270,7 +270,7 @@ HRESULT CAdSentence::SetupTalkFile(const char *SoundFilename) { ////////////////////////////////////////////////////////////////////////// -HRESULT CAdSentence::Update(TDirection Dir) { +HRESULT CAdSentence::update(TDirection Dir) { if (!_talkDef) return S_OK; uint32 CurrentTime; diff --git a/engines/wintermute/Ad/AdSentence.h b/engines/wintermute/Ad/AdSentence.h index 310be3e3e5..675cb9d744 100644 --- a/engines/wintermute/Ad/AdSentence.h +++ b/engines/wintermute/Ad/AdSentence.h @@ -45,7 +45,7 @@ public: bool _fixedPos; CBSprite *_currentSprite; char *_currentSkelAnim; - HRESULT Update(TDirection Dir = DI_DOWN); + HRESULT update(TDirection Dir = DI_DOWN); HRESULT SetupTalkFile(const char *SoundFilename); DECLARE_PERSISTENT(CAdSentence, CBBase) HRESULT Finish(); @@ -53,7 +53,7 @@ public: bool _soundStarted; CBSound *_sound; TTextAlign _align; - HRESULT Display(); + HRESULT display(); int _width; POINT _pos; CBFont *_font; diff --git a/engines/wintermute/Base/BFader.cpp b/engines/wintermute/Base/BFader.cpp index b20d377e93..741b586d56 100644 --- a/engines/wintermute/Base/BFader.cpp +++ b/engines/wintermute/Base/BFader.cpp @@ -60,7 +60,7 @@ CBFader::~CBFader() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBFader::Update() { +HRESULT CBFader::update() { if (!_active) return S_OK; int AlphaDelta = _targetAlpha - _sourceAlpha; @@ -84,7 +84,7 @@ HRESULT CBFader::Update() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBFader::Display() { +HRESULT CBFader::display() { if (!_active) return S_OK; if (_currentAlpha > 0x00) return Game->_renderer->FadeToColor(DRGBA(_red, _green, _blue, _currentAlpha)); diff --git a/engines/wintermute/Base/BFader.h b/engines/wintermute/Base/BFader.h index 141f44f485..663766127b 100644 --- a/engines/wintermute/Base/BFader.h +++ b/engines/wintermute/Base/BFader.h @@ -41,8 +41,8 @@ public: HRESULT FadeOut(uint32 TargetColor, uint32 Duration, bool System = false); HRESULT FadeIn(uint32 SourceColor, uint32 Duration, bool System = false); HRESULT Deactivate(); - HRESULT Display(); - HRESULT Update(); + HRESULT display(); + HRESULT update(); DECLARE_PERSISTENT(CBFader, CBObject) CBFader(CBGame *inGame); virtual ~CBFader(); diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp index b774a4bf92..7acc45e3ba 100644 --- a/engines/wintermute/Base/BFrame.cpp +++ b/engines/wintermute/Base/BFrame.cpp @@ -90,7 +90,7 @@ HRESULT CBFrame::Draw(int X, int Y, CBObject *Register, float ZoomX, float ZoomY ////////////////////////////////////////////////////////////////////////// HRESULT CBFrame::OneTimeDisplay(CBObject *Owner, bool Muted) { if (_sound && !Muted) { - if (Owner) Owner->UpdateOneSound(_sound); + if (Owner) Owner->updateOneSound(_sound); _sound->Play(); /* if (Game->_state == GAME_FROZEN) { diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 73cdea0971..62197ec430 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -653,9 +653,9 @@ HRESULT CBGame::InitLoop() { } } - UpdateSounds(); + updateSounds(); - if (_fader) _fader->Update(); + if (_fader) _fader->update(); return S_OK; } @@ -817,7 +817,7 @@ HRESULT CBGame::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_SYSTEM_FONT: @@ -1669,7 +1669,7 @@ HRESULT CBGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS ////////////////////////////////////////////////////////////////////////// else if (strcmp(Name, "SetActiveCursor") == 0) { Stack->CorrectParams(1); - if (SUCCEEDED(SetActiveCursor(Stack->Pop()->GetString()))) Stack->PushBool(true); + if (SUCCEEDED(setActiveCursor(Stack->Pop()->GetString()))) Stack->PushBool(true); else Stack->PushBool(false); return S_OK; @@ -3209,15 +3209,15 @@ HRESULT CBGame::ExternalCall(CScScript *Script, CScStack *Stack, CScStack *ThisS ////////////////////////////////////////////////////////////////////////// -HRESULT CBGame::ShowCursor() { +HRESULT CBGame::showCursor() { if (_cursorHidden) return S_OK; if (!_interactive && Game->_state == GAME_RUNNING) { if (_cursorNoninteractive) return DrawCursor(_cursorNoninteractive); } else { - if (_activeObject && !FAILED(_activeObject->ShowCursor())) return S_OK; + if (_activeObject && !FAILED(_activeObject->showCursor())) return S_OK; else { - if (_activeObject && _activeCursor && _activeObject->GetExtendedFlag("usable")) return DrawCursor(_activeCursor); + if (_activeObject && _activeCursor && _activeObject->getExtendedFlag("usable")) return DrawCursor(_activeCursor); else if (_cursor) return DrawCursor(_cursor); } } @@ -3404,7 +3404,7 @@ HRESULT CBGame::DisplayWindows(bool InGame) { for (i = 0; i < _windows.GetSize(); i++) { if (_windows[i]->_visible && _windows[i]->_inGame == InGame) { - res = _windows[i]->Display(); + res = _windows[i]->display(); if (FAILED(res)) return res; } } @@ -3768,7 +3768,7 @@ HRESULT CBGame::Unfreeze() { ////////////////////////////////////////////////////////////////////////// -bool CBGame::HandleKeypress(Common::Event *event, bool printable) { +bool CBGame::handleKeypress(Common::Event *event, bool printable) { if (IsVideoPlaying()) { if (event->kbd.keycode == Common::KEYCODE_ESCAPE) StopVideo(); @@ -3796,7 +3796,7 @@ bool CBGame::HandleKeypress(Common::Event *event, bool printable) { // TODO if (_focusedWindow) { - if (!Game->_focusedWindow->HandleKeypress(event, _keyboardState->_currentPrintable)) { + if (!Game->_focusedWindow->handleKeypress(event, _keyboardState->_currentPrintable)) { /*if (event->type != SDL_TEXTINPUT) {*/ if (Game->_focusedWindow->canHandleEvent("Keypress")) Game->_focusedWindow->applyEvent("Keypress"); @@ -3819,10 +3819,10 @@ void CBGame::handleKeyRelease(Common::Event *event) { ////////////////////////////////////////////////////////////////////////// -bool CBGame::HandleMouseWheel(int Delta) { +bool CBGame::handleMouseWheel(int Delta) { bool Handled = false; if (_focusedWindow) { - Handled = Game->_focusedWindow->HandleMouseWheel(Delta); + Handled = Game->_focusedWindow->handleMouseWheel(Delta); if (!Handled) { if (Delta < 0 && Game->_focusedWindow->canHandleEvent("MouseWheelDown")) { @@ -4186,18 +4186,18 @@ void CBGame::DEBUG_DumpClassRegistry() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBGame::InvalidateDeviceObjects() { +HRESULT CBGame::invalidateDeviceObjects() { for (int i = 0; i < _regObjects.GetSize(); i++) { - _regObjects[i]->InvalidateDeviceObjects(); + _regObjects[i]->invalidateDeviceObjects(); } return S_OK; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBGame::RestoreDeviceObjects() { +HRESULT CBGame::restoreDeviceObjects() { for (int i = 0; i < _regObjects.GetSize(); i++) { - _regObjects[i]->RestoreDeviceObjects(); + _regObjects[i]->restoreDeviceObjects(); } return S_OK; } @@ -4266,7 +4266,7 @@ HRESULT CBGame::OnActivate(bool Activate, bool RefreshMouse) { ////////////////////////////////////////////////////////////////////////// HRESULT CBGame::OnMouseLeftDown() { - if (_activeObject) _activeObject->HandleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT); + if (_activeObject) _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("LeftClick")); if (!Handled) { @@ -4284,7 +4284,7 @@ HRESULT CBGame::OnMouseLeftDown() { ////////////////////////////////////////////////////////////////////////// HRESULT CBGame::OnMouseLeftUp() { - if (_activeObject) _activeObject->HandleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT); + if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT); CBPlatform::ReleaseCapture(); _capturedObject = NULL; @@ -4303,7 +4303,7 @@ HRESULT CBGame::OnMouseLeftUp() { HRESULT CBGame::OnMouseLeftDblClick() { if (_state == GAME_RUNNING && !_interactive) return S_OK; - if (_activeObject) _activeObject->HandleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_LEFT); + if (_activeObject) _activeObject->handleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_LEFT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("LeftDoubleClick")); if (!Handled) { @@ -4318,7 +4318,7 @@ HRESULT CBGame::OnMouseLeftDblClick() { HRESULT CBGame::OnMouseRightDblClick() { if (_state == GAME_RUNNING && !_interactive) return S_OK; - if (_activeObject) _activeObject->HandleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_RIGHT); + if (_activeObject) _activeObject->handleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_RIGHT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("RightDoubleClick")); if (!Handled) { @@ -4331,7 +4331,7 @@ HRESULT CBGame::OnMouseRightDblClick() { ////////////////////////////////////////////////////////////////////////// HRESULT CBGame::OnMouseRightDown() { - if (_activeObject) _activeObject->HandleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT); + if (_activeObject) _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("RightClick")); if (!Handled) { @@ -4344,7 +4344,7 @@ HRESULT CBGame::OnMouseRightDown() { ////////////////////////////////////////////////////////////////////////// HRESULT CBGame::OnMouseRightUp() { - if (_activeObject) _activeObject->HandleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT); + if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("RightRelease")); if (!Handled) { @@ -4359,7 +4359,7 @@ HRESULT CBGame::OnMouseRightUp() { HRESULT CBGame::OnMouseMiddleDown() { if (_state == GAME_RUNNING && !_interactive) return S_OK; - if (_activeObject) _activeObject->HandleMouse(MOUSE_CLICK, MOUSE_BUTTON_MIDDLE); + if (_activeObject) _activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_MIDDLE); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("MiddleClick")); if (!Handled) { @@ -4372,7 +4372,7 @@ HRESULT CBGame::OnMouseMiddleDown() { ////////////////////////////////////////////////////////////////////////// HRESULT CBGame::OnMouseMiddleUp() { - if (_activeObject) _activeObject->HandleMouse(MOUSE_RELEASE, MOUSE_BUTTON_MIDDLE); + if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_MIDDLE); bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("MiddleRelease")); if (!Handled) { diff --git a/engines/wintermute/Base/BGame.h b/engines/wintermute/Base/BGame.h index 8aa1cce127..51f792dc75 100644 --- a/engines/wintermute/Base/BGame.h +++ b/engines/wintermute/Base/BGame.h @@ -219,8 +219,8 @@ public: CBFader *_fader; bool _suppressScriptErrors; - virtual HRESULT InvalidateDeviceObjects(); - virtual HRESULT RestoreDeviceObjects(); + virtual HRESULT invalidateDeviceObjects(); + virtual HRESULT restoreDeviceObjects(); virtual void PublishNatives(); virtual HRESULT ExternalCall(CScScript *Script, CScStack *Stack, CScStack *ThisStack, char *Name); @@ -253,11 +253,11 @@ public: HRESULT GetSaveSlotDescription(int Slot, char *Buffer); HRESULT GetSaveSlotFilename(int Slot, char *Buffer); void SetWindowTitle(); - virtual bool HandleMouseWheel(int Delta); + virtual bool handleMouseWheel(int Delta); bool _quitting; virtual HRESULT GetVersion(byte *VerMajor, byte *VerMinor, byte *ExtMajor, byte *ExtMinor); - virtual bool HandleKeypress(Common::Event *event, bool printable = false); + virtual bool handleKeypress(Common::Event *event, bool printable = false); virtual void handleKeyRelease(Common::Event *event); int _freezeLevel; HRESULT Unfreeze(); @@ -295,7 +295,7 @@ public: virtual HRESULT LoadGame(int Slot); virtual HRESULT LoadGame(const char *Filename); virtual HRESULT SaveGame(int slot, const char *desc, bool quickSave = false); - virtual HRESULT ShowCursor(); + virtual HRESULT showCursor(); CBSprite *_cursorNoninteractive; CBObject *_activeObject; diff --git a/engines/wintermute/Base/BObject.cpp b/engines/wintermute/Base/BObject.cpp index 107ab2537c..156575b2b5 100644 --- a/engines/wintermute/Base/BObject.cpp +++ b/engines/wintermute/Base/BObject.cpp @@ -135,21 +135,21 @@ HRESULT CBObject::cleanup() { ////////////////////////////////////////////////////////////////////////// -void CBObject::SetCaption(const char *Caption, int Case) { +void CBObject::setCaption(const char *caption, int Case) { // TODO: rename Case to something usefull if (Case == 0) Case = 1; if (Case < 1 || Case > 7) return; delete[] _caption[Case - 1]; - _caption[Case - 1] = new char[strlen(Caption) + 1]; + _caption[Case - 1] = new char[strlen(caption) + 1]; if (_caption[Case - 1]) { - strcpy(_caption[Case - 1], Caption); + strcpy(_caption[Case - 1], caption); Game->_stringTable->Expand(&_caption[Case - 1]); } } ////////////////////////////////////////////////////////////////////////// -char *CBObject::GetCaption(int Case) { +char *CBObject::getCaption(int Case) { if (Case == 0) Case = 1; if (Case < 1 || Case > 7 || _caption[Case - 1] == NULL) return ""; else return _caption[Case - 1]; @@ -185,7 +185,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi ////////////////////////////////////////////////////////////////////////// else if (strcmp(Name, "Caption") == 0) { Stack->CorrectParams(1); - Stack->PushString(GetCaption(Stack->Pop()->GetInt())); + Stack->PushString(getCaption(Stack->Pop()->GetInt())); return S_OK; } @@ -195,7 +195,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi ////////////////////////////////////////////////////////////////////////// else if (strcmp(Name, "SetCursor") == 0) { Stack->CorrectParams(1); - if (SUCCEEDED(SetCursor(Stack->Pop()->GetString()))) Stack->PushBool(true); + if (SUCCEEDED(setCursor(Stack->Pop()->GetString()))) Stack->PushBool(true); else Stack->PushBool(false); return S_OK; @@ -257,7 +257,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi ////////////////////////////////////////////////////////////////////////// else if (strcmp(Name, "SetCaption") == 0) { Stack->CorrectParams(2); - SetCaption(Stack->Pop()->GetString(), Stack->Pop()->GetInt()); + setCaption(Stack->Pop()->GetString(), Stack->Pop()->GetInt()); Stack->PushNULL(); return S_OK; @@ -269,7 +269,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi else if (strcmp(Name, "LoadSound") == 0) { Stack->CorrectParams(1); const char *Filename = Stack->Pop()->GetString(); - if (SUCCEEDED(PlaySFX(Filename, false, false))) + if (SUCCEEDED(playSFX(Filename, false, false))) Stack->PushBool(true); else Stack->PushBool(false); @@ -302,7 +302,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi LoopStart = val3->GetInt(); } - if (FAILED(PlaySFX(Filename, Looping, true, NULL, LoopStart))) Stack->PushBool(false); + if (FAILED(playSFX(Filename, Looping, true, NULL, LoopStart))) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -327,7 +327,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi EventName = val2->GetString(); } - if (FAILED(PlaySFX(Filename, false, true, EventName))) Stack->PushBool(false); + if (FAILED(playSFX(Filename, false, true, EventName))) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -338,7 +338,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi else if (strcmp(Name, "StopSound") == 0) { Stack->CorrectParams(0); - if (FAILED(StopSFX())) Stack->PushBool(false); + if (FAILED(stopSFX())) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -349,7 +349,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi else if (strcmp(Name, "PauseSound") == 0) { Stack->CorrectParams(0); - if (FAILED(PauseSFX())) Stack->PushBool(false); + if (FAILED(pauseSFX())) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -360,7 +360,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi else if (strcmp(Name, "ResumeSound") == 0) { Stack->CorrectParams(0); - if (FAILED(ResumeSFX())) Stack->PushBool(false); + if (FAILED(resumeSFX())) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -383,7 +383,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi Stack->CorrectParams(1); uint32 Time = Stack->Pop()->GetInt(); - if (FAILED(SetSFXTime(Time))) Stack->PushBool(false); + if (FAILED(setSFXTime(Time))) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -406,7 +406,7 @@ HRESULT CBObject::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi Stack->CorrectParams(1); int Volume = Stack->Pop()->GetInt(); - if (FAILED(SetSFXVolume(Volume))) Stack->PushBool(false); + if (FAILED(setSFXVolume(Volume))) Stack->PushBool(false); else Stack->PushBool(true); return S_OK; } @@ -488,7 +488,7 @@ CScValue *CBObject::scGetProperty(const char *Name) { // Caption ////////////////////////////////////////////////////////////////////////// else if (strcmp(Name, "Caption") == 0) { - _scValue->SetString(GetCaption(1)); + _scValue->SetString(getCaption(1)); return _scValue; } @@ -512,7 +512,7 @@ CScValue *CBObject::scGetProperty(const char *Name) { // Height (RO) ////////////////////////////////////////////////////////////////////////// else if (strcmp(Name, "Height") == 0) { - _scValue->SetInt(GetHeight()); + _scValue->SetInt(getHeight()); return _scValue; } @@ -671,7 +671,7 @@ HRESULT CBObject::scSetProperty(const char *Name, CScValue *Value) { // Caption ////////////////////////////////////////////////////////////////////////// if (strcmp(Name, "Caption") == 0) { - SetCaption(Value->GetString()); + setCaption(Value->GetString()); return S_OK; } @@ -813,7 +813,7 @@ HRESULT CBObject::scSetProperty(const char *Name, CScValue *Value) { ////////////////////////////////////////////////////////////////////////// else if (strcmp(Name, "SoundPanning") == 0) { _autoSoundPanning = Value->GetBool(); - if (!_autoSoundPanning) ResetSoundPan(); + if (!_autoSoundPanning) resetSoundPan(); return S_OK; } @@ -851,14 +851,14 @@ const char *CBObject::scToString() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::ShowCursor() { +HRESULT CBObject::showCursor() { if (_cursor) return Game->DrawCursor(_cursor); else return E_FAIL; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::saveAsText(CBDynBuffer *Buffer, int Indent) { +HRESULT CBObject::saveAsText(CBDynBuffer *buffer, int indent) { return S_OK; } @@ -919,7 +919,7 @@ HRESULT CBObject::persist(CBPersistMgr *persistMgr) { ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::SetCursor(const char *Filename) { +HRESULT CBObject::setCursor(const char *filename) { if (!_sharedCursors) { delete _cursor; _cursor = NULL; @@ -927,7 +927,7 @@ HRESULT CBObject::SetCursor(const char *Filename) { _sharedCursors = false; _cursor = new CBSprite(Game); - if (!_cursor || FAILED(_cursor->LoadFile(Filename))) { + if (!_cursor || FAILED(_cursor->LoadFile(filename))) { delete _cursor; _cursor = NULL; return E_FAIL; @@ -936,10 +936,10 @@ HRESULT CBObject::SetCursor(const char *Filename) { ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::SetActiveCursor(const char *Filename) { +HRESULT CBObject::setActiveCursor(const char *filename) { delete _activeCursor; _activeCursor = new CBSprite(Game); - if (!_activeCursor || FAILED(_activeCursor->LoadFile(Filename))) { + if (!_activeCursor || FAILED(_activeCursor->LoadFile(filename))) { delete _activeCursor; _activeCursor = NULL; return E_FAIL; @@ -948,62 +948,62 @@ HRESULT CBObject::SetActiveCursor(const char *Filename) { ////////////////////////////////////////////////////////////////////////// -int CBObject::GetHeight() { +int CBObject::getHeight() { return 0; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::HandleMouse(TMouseEvent Event, TMouseButton Button) { +HRESULT CBObject::handleMouse(TMouseEvent event, TMouseButton button) { return S_OK; } ////////////////////////////////////////////////////////////////////////// -bool CBObject::HandleKeypress(Common::Event *event, bool printable) { +bool CBObject::handleKeypress(Common::Event *event, bool printable) { return false; } ////////////////////////////////////////////////////////////////////////// -bool CBObject::HandleMouseWheel(int Delta) { +bool CBObject::handleMouseWheel(int delta) { return false; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::PlaySFX(const char *Filename, bool Looping, bool PlayNow, const char *EventName, uint32 LoopStart) { +HRESULT CBObject::playSFX(const char *filename, bool looping, bool playNow, const char *eventName, uint32 loopStart) { // just play loaded sound - if (Filename == NULL && _sFX) { + if (filename == NULL && _sFX) { if (Game->_editorMode || _sFXStart) { _sFX->SetVolume(_sFXVolume); _sFX->SetPositionTime(_sFXStart); if (!Game->_editorMode) _sFXStart = 0; } - if (PlayNow) { - SetSoundEvent(EventName); - if (LoopStart) _sFX->SetLoopStart(LoopStart); - return _sFX->Play(Looping); + if (playNow) { + setSoundEvent(eventName); + if (loopStart) _sFX->SetLoopStart(loopStart); + return _sFX->Play(looping); } else return S_OK; } - if (Filename == NULL) return E_FAIL; + if (filename == NULL) return E_FAIL; // create new sound delete _sFX; _sFX = new CBSound(Game); - if (_sFX && SUCCEEDED(_sFX->SetSound(Filename, SOUND_SFX, true))) { + if (_sFX && SUCCEEDED(_sFX->SetSound(filename, SOUND_SFX, true))) { _sFX->SetVolume(_sFXVolume); if (_sFXStart) { _sFX->SetPositionTime(_sFXStart); _sFXStart = 0; } _sFX->ApplyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4); - if (PlayNow) { - SetSoundEvent(EventName); - if (LoopStart) _sFX->SetLoopStart(LoopStart); - return _sFX->Play(Looping); + if (playNow) { + setSoundEvent(eventName); + if (loopStart) _sFX->SetLoopStart(loopStart); + return _sFX->Play(looping); } else return S_OK; } else { delete _sFX; @@ -1014,10 +1014,10 @@ HRESULT CBObject::PlaySFX(const char *Filename, bool Looping, bool PlayNow, cons ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::StopSFX(bool DeleteSound) { +HRESULT CBObject::stopSFX(bool deleteSound) { if (_sFX) { _sFX->Stop(); - if (DeleteSound) { + if (deleteSound) { delete _sFX; _sFX = NULL; } @@ -1027,29 +1027,29 @@ HRESULT CBObject::StopSFX(bool DeleteSound) { ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::PauseSFX() { +HRESULT CBObject::pauseSFX() { if (_sFX) return _sFX->Pause(); else return E_FAIL; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::ResumeSFX() { +HRESULT CBObject::resumeSFX() { if (_sFX) return _sFX->Resume(); else return E_FAIL; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::SetSFXTime(uint32 Time) { - _sFXStart = Time; - if (_sFX && _sFX->IsPlaying()) return _sFX->SetPositionTime(Time); +HRESULT CBObject::setSFXTime(uint32 time) { + _sFXStart = time; + if (_sFX && _sFX->IsPlaying()) return _sFX->SetPositionTime(time); else return S_OK; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::SetSFXVolume(int Volume) { +HRESULT CBObject::setSFXVolume(int Volume) { _sFXVolume = Volume; if (_sFX) return _sFX->SetVolume(Volume); else return S_OK; @@ -1057,34 +1057,34 @@ HRESULT CBObject::SetSFXVolume(int Volume) { ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::UpdateSounds() { +HRESULT CBObject::updateSounds() { if (_soundEvent) { if (_sFX && !_sFX->IsPlaying()) { applyEvent(_soundEvent); - SetSoundEvent(NULL); + setSoundEvent(NULL); } } - if (_sFX) UpdateOneSound(_sFX); + if (_sFX) updateOneSound(_sFX); return S_OK; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::UpdateOneSound(CBSound *Sound) { +HRESULT CBObject::updateOneSound(CBSound *sound) { HRESULT Ret = S_OK; - if (Sound) { + if (sound) { if (_autoSoundPanning) - Ret = Sound->SetPan(Game->_soundMgr->posToPan(_posX - Game->_offsetX, _posY - Game->_offsetY)); + Ret = sound->SetPan(Game->_soundMgr->posToPan(_posX - Game->_offsetX, _posY - Game->_offsetY)); - Ret = Sound->ApplyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4); + Ret = sound->ApplyFX(_sFXType, _sFXParam1, _sFXParam2, _sFXParam3, _sFXParam4); } return Ret; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBObject::ResetSoundPan() { +HRESULT CBObject::resetSoundPan() { if (!_sFX) return S_OK; else { return _sFX->SetPan(0.0f); @@ -1093,24 +1093,24 @@ HRESULT CBObject::ResetSoundPan() { ////////////////////////////////////////////////////////////////////////// -bool CBObject::GetExtendedFlag(const char *FlagName) { +bool CBObject::getExtendedFlag(const char *flagName) { return false; } ////////////////////////////////////////////////////////////////////////// -bool CBObject::IsReady() { +bool CBObject::isReady() { return _ready; } ////////////////////////////////////////////////////////////////////////// -void CBObject::SetSoundEvent(const char *EventName) { +void CBObject::setSoundEvent(const char *eventName) { delete[] _soundEvent; _soundEvent = NULL; - if (EventName) { - _soundEvent = new char[strlen(EventName) + 1]; - if (_soundEvent) strcpy(_soundEvent, EventName); + if (eventName) { + _soundEvent = new char[strlen(eventName) + 1]; + if (_soundEvent) strcpy(_soundEvent, eventName); } } diff --git a/engines/wintermute/Base/BObject.h b/engines/wintermute/Base/BObject.h index 294b345dec..20b6cfdb2a 100644 --- a/engines/wintermute/Base/BObject.h +++ b/engines/wintermute/Base/BObject.h @@ -50,27 +50,27 @@ public: float _relativeRotate; bool _rotateValid; float _rotate; - void SetSoundEvent(const char *EventName); + void setSoundEvent(const char *EventName); bool _rotatable; uint32 _alphaColor; float _scale; float _scaleX; float _scaleY; float _relativeScale; - virtual bool IsReady(); - virtual bool GetExtendedFlag(const char *FlagName); - virtual HRESULT ResetSoundPan(); - virtual HRESULT UpdateSounds(); - HRESULT UpdateOneSound(CBSound *Sound); + virtual bool isReady(); + virtual bool getExtendedFlag(const char *FlagName); + virtual HRESULT resetSoundPan(); + virtual HRESULT updateSounds(); + HRESULT updateOneSound(CBSound *Sound); bool _autoSoundPanning; uint32 _sFXStart; int _sFXVolume; - HRESULT SetSFXTime(uint32 Time); - HRESULT SetSFXVolume(int Volume); - HRESULT ResumeSFX(); - HRESULT PauseSFX(); - HRESULT StopSFX(bool DeleteSound = true); - HRESULT PlaySFX(const char *Filename, bool Looping = false, bool PlayNow = true, const char *EventName = NULL, uint32 LoopStart = 0); + HRESULT setSFXTime(uint32 Time); + HRESULT setSFXVolume(int Volume); + HRESULT resumeSFX(); + HRESULT pauseSFX(); + HRESULT stopSFX(bool DeleteSound = true); + HRESULT playSFX(const char *Filename, bool Looping = false, bool PlayNow = true, const char *EventName = NULL, uint32 LoopStart = 0); CBSound *_sFX; TSFXType _sFXType; @@ -79,21 +79,21 @@ public: float _sFXParam3; float _sFXParam4; - virtual bool HandleMouseWheel(int Delta); - virtual HRESULT HandleMouse(TMouseEvent Event, TMouseButton Button); - virtual bool HandleKeypress(Common::Event *event, bool printable = false); - virtual int GetHeight(); - HRESULT SetCursor(const char *Filename); - HRESULT SetActiveCursor(const char *Filename); + virtual bool handleMouseWheel(int Delta); + virtual HRESULT handleMouse(TMouseEvent Event, TMouseButton Button); + virtual bool handleKeypress(Common::Event *event, bool printable = false); + virtual int getHeight(); + HRESULT setCursor(const char *Filename); + HRESULT setActiveCursor(const char *Filename); HRESULT cleanup(); - char *GetCaption(int Case = 1); - void SetCaption(const char *Caption, int Case = 1); + char *getCaption(int Case = 1); + void setCaption(const char *Caption, int Case = 1); bool _editorSelected; bool _editorAlwaysRegister; bool _editorOnly; bool _is3D; DECLARE_PERSISTENT(CBObject, CBScriptHolder) - virtual HRESULT ShowCursor(); + virtual HRESULT showCursor(); CBSprite *_cursor; bool _sharedCursors; CBSprite *_activeCursor; @@ -116,16 +116,16 @@ public: bool _saveState; // base - virtual HRESULT Update() { + virtual HRESULT update() { return E_FAIL; }; - virtual HRESULT Display() { + virtual HRESULT display() { return E_FAIL; }; - virtual HRESULT InvalidateDeviceObjects() { + virtual HRESULT invalidateDeviceObjects() { return S_OK; }; - virtual HRESULT RestoreDeviceObjects() { + virtual HRESULT restoreDeviceObjects() { return S_OK; }; bool _nonIntMouseEvents; diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp index 9307af62bb..9de95bb858 100644 --- a/engines/wintermute/Base/BRegion.cpp +++ b/engines/wintermute/Base/BRegion.cpp @@ -169,7 +169,7 @@ HRESULT CBRegion::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_ACTIVE: @@ -383,7 +383,7 @@ HRESULT CBRegion::saveAsText(CBDynBuffer *Buffer, int Indent, const char *NameOv else Buffer->PutTextIndent(Indent, "%s {\n", NameOverride); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE"); Buffer->PutTextIndent(Indent + 2, "EDITOR_SELECTED_POINT=%d\n", _editorSelectedPoint); diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp index 8e851d5605..e7f9df194d 100644 --- a/engines/wintermute/Base/BSprite.cpp +++ b/engines/wintermute/Base/BSprite.cpp @@ -117,7 +117,7 @@ HRESULT CBSprite::Draw(int X, int Y, CBObject *Register, float ZoomX, float Zoom } // draw frame - return Display(X, Y, Register, ZoomX, ZoomY, Alpha); + return display(X, Y, Register, ZoomX, ZoomY, Alpha); } @@ -383,7 +383,7 @@ bool CBSprite::GetCurrentFrame(float ZoomX, float ZoomY) { ////////////////////////////////////////////////////////////////////// -HRESULT CBSprite::Display(int X, int Y, CBObject *Register, float ZoomX, float ZoomY, uint32 Alpha, float Rotate, TSpriteBlendMode BlendMode) { +HRESULT CBSprite::display(int X, int Y, CBObject *Register, float ZoomX, float ZoomY, uint32 Alpha, float Rotate, TSpriteBlendMode BlendMode) { if (_currentFrame < 0 || _currentFrame >= _frames.GetSize()) return S_OK; // on change... diff --git a/engines/wintermute/Base/BSprite.h b/engines/wintermute/Base/BSprite.h index a5dde324e5..67f703d744 100644 --- a/engines/wintermute/Base/BSprite.h +++ b/engines/wintermute/Base/BSprite.h @@ -56,7 +56,7 @@ public: bool GetBoundingRect(LPRECT Rect, int X, int Y, float ScaleX = 100, float ScaleY = 100); int _moveY; int _moveX; - HRESULT Display(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, uint32 Alpha = 0xFFFFFFFF, float Rotate = 0.0f, TSpriteBlendMode BlendMode = BLEND_NORMAL); + HRESULT display(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, uint32 Alpha = 0xFFFFFFFF, float Rotate = 0.0f, TSpriteBlendMode BlendMode = BLEND_NORMAL); bool GetCurrentFrame(float ZoomX = 100, float ZoomY = 100); bool _canBreak; bool _editorMuted; diff --git a/engines/wintermute/Base/BTransitionMgr.cpp b/engines/wintermute/Base/BTransitionMgr.cpp index 1a9d9008c6..c44a5960a1 100644 --- a/engines/wintermute/Base/BTransitionMgr.cpp +++ b/engines/wintermute/Base/BTransitionMgr.cpp @@ -52,7 +52,7 @@ CBTransitionMgr::~CBTransitionMgr() { ////////////////////////////////////////////////////////////////////////// -bool CBTransitionMgr::IsReady() { +bool CBTransitionMgr::isReady() { return (_state == TRANS_MGR_READY); } @@ -82,8 +82,8 @@ HRESULT CBTransitionMgr::Start(TTransitionType Type, bool NonInteractive) { #define FADE_DURATION 200 ////////////////////////////////////////////////////////////////////////// -HRESULT CBTransitionMgr::Update() { - if (IsReady()) return S_OK; +HRESULT CBTransitionMgr::update() { + if (isReady()) return S_OK; if (!_started) { _started = true; @@ -118,7 +118,7 @@ HRESULT CBTransitionMgr::Update() { error("CBTransitionMgr::Update - unhandled enum NUM_TRANSITION_TYPES"); } - if (IsReady()) { + if (isReady()) { if (_preserveInteractive) Game->_interactive = _origInteractive; } return S_OK; diff --git a/engines/wintermute/Base/BTransitionMgr.h b/engines/wintermute/Base/BTransitionMgr.h index 01cdee8262..41ec077822 100644 --- a/engines/wintermute/Base/BTransitionMgr.h +++ b/engines/wintermute/Base/BTransitionMgr.h @@ -39,9 +39,9 @@ public: uint32 _lastTime; bool _origInteractive; bool _preserveInteractive; - HRESULT Update(); + HRESULT update(); HRESULT Start(TTransitionType Type, bool NonInteractive = false); - bool IsReady(); + bool isReady(); TTransMgrState _state; CBTransitionMgr(CBGame *inGame); virtual ~CBTransitionMgr(); diff --git a/engines/wintermute/Base/BViewport.cpp b/engines/wintermute/Base/BViewport.cpp index 5010b2c030..e6c372b4e6 100644 --- a/engines/wintermute/Base/BViewport.cpp +++ b/engines/wintermute/Base/BViewport.cpp @@ -91,7 +91,7 @@ int CBViewport::GetWidth() { ////////////////////////////////////////////////////////////////////////// -int CBViewport::GetHeight() { +int CBViewport::getHeight() { return _rect.bottom - _rect.top; } diff --git a/engines/wintermute/Base/BViewport.h b/engines/wintermute/Base/BViewport.h index 640f54f438..65d82de45b 100644 --- a/engines/wintermute/Base/BViewport.h +++ b/engines/wintermute/Base/BViewport.h @@ -36,7 +36,7 @@ namespace WinterMute { class CBObject; class CBViewport : public CBBase { public: - int GetHeight(); + int getHeight(); int GetWidth(); RECT *GetRect(); HRESULT SetRect(int left, int top, int right, int bottom, bool NoCheck = false); diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp index bfce64041e..5f7f8f5906 100644 --- a/engines/wintermute/Base/PartEmitter.cpp +++ b/engines/wintermute/Base/PartEmitter.cpp @@ -226,7 +226,7 @@ HRESULT CPartEmitter::InitParticle(CPartParticle *Particle, uint32 CurrentTime, } ////////////////////////////////////////////////////////////////////////// -HRESULT CPartEmitter::Update() { +HRESULT CPartEmitter::update() { if (!_running) return S_OK; else return UpdateInternal(Game->_timer, Game->_timerDelta); } @@ -236,7 +236,7 @@ HRESULT CPartEmitter::UpdateInternal(uint32 CurrentTime, uint32 TimerDelta) { int NumLive = 0; for (int i = 0; i < _particles.GetSize(); i++) { - _particles[i]->Update(this, CurrentTime, TimerDelta); + _particles[i]->update(this, CurrentTime, TimerDelta); if (!_particles[i]->_isDead) NumLive++; } @@ -288,7 +288,7 @@ HRESULT CPartEmitter::UpdateInternal(uint32 CurrentTime, uint32 TimerDelta) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CPartEmitter::Display(CBRegion *Region) { +HRESULT CPartEmitter::display(CBRegion *Region) { if (_sprites.GetSize() <= 1) Game->_renderer->StartSpriteBatch(); for (int i = 0; i < _particles.GetSize(); i++) { @@ -296,7 +296,7 @@ HRESULT CPartEmitter::Display(CBRegion *Region) { if (!Region->PointInRegion(_particles[i]->_pos.x, _particles[i]->_pos.y)) continue; } - _particles[i]->Display(this); + _particles[i]->display(this); } if (_sprites.GetSize() <= 1) Game->_renderer->EndSpriteBatch(); diff --git a/engines/wintermute/Base/PartEmitter.h b/engines/wintermute/Base/PartEmitter.h index 45997b280e..f4ef67fe69 100644 --- a/engines/wintermute/Base/PartEmitter.h +++ b/engines/wintermute/Base/PartEmitter.h @@ -102,8 +102,8 @@ public: HRESULT Start(); - HRESULT Update(); - HRESULT Display(CBRegion *Region = NULL); + HRESULT update(); + HRESULT display(CBRegion *Region = NULL); HRESULT SortParticlesByZ(); HRESULT AddSprite(const char *Filename); diff --git a/engines/wintermute/Base/PartParticle.cpp b/engines/wintermute/Base/PartParticle.cpp index f772e6fe77..69b933b518 100644 --- a/engines/wintermute/Base/PartParticle.cpp +++ b/engines/wintermute/Base/PartParticle.cpp @@ -96,7 +96,7 @@ HRESULT CPartParticle::SetSprite(const char *Filename) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CPartParticle::Update(CPartEmitter *Emitter, uint32 CurrentTime, uint32 TimerDelta) { +HRESULT CPartParticle::update(CPartEmitter *Emitter, uint32 CurrentTime, uint32 TimerDelta) { if (_state == PARTICLE_FADEIN) { if (CurrentTime - _fadeStart >= _fadeTime) { _state = PARTICLE_NORMAL; @@ -180,12 +180,12 @@ HRESULT CPartParticle::Update(CPartEmitter *Emitter, uint32 CurrentTime, uint32 } ////////////////////////////////////////////////////////////////////////// -HRESULT CPartParticle::Display(CPartEmitter *Emitter) { +HRESULT CPartParticle::display(CPartEmitter *Emitter) { if (!_sprite) return E_FAIL; if (_isDead) return S_OK; _sprite->GetCurrentFrame(); - return _sprite->Display(_pos.x, _pos.y, + return _sprite->display(_pos.x, _pos.y, NULL, _scale, _scale, DRGBA(255, 255, 255, _currentAlpha), diff --git a/engines/wintermute/Base/PartParticle.h b/engines/wintermute/Base/PartParticle.h index 2c5c57034c..9618954475 100644 --- a/engines/wintermute/Base/PartParticle.h +++ b/engines/wintermute/Base/PartParticle.h @@ -68,8 +68,8 @@ public: bool _isDead; TParticleState _state; - HRESULT Update(CPartEmitter *Emitter, uint32 CurrentTime, uint32 TimerDelta); - HRESULT Display(CPartEmitter *Emitter); + HRESULT update(CPartEmitter *Emitter, uint32 CurrentTime, uint32 TimerDelta); + HRESULT display(CPartEmitter *Emitter); HRESULT SetSprite(const char *Filename); diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp index 0066a2574f..4e2dd203cc 100644 --- a/engines/wintermute/Base/scriptables/ScEngine.cpp +++ b/engines/wintermute/Base/scriptables/ScEngine.cpp @@ -390,7 +390,7 @@ HRESULT CScEngine::Tick() { if(!obj_found) _scripts[i]->Finish(); // _waitObject no longer exists */ if (Game->ValidObject(_scripts[i]->_waitObject)) { - if (_scripts[i]->_waitObject->IsReady()) _scripts[i]->Run(); + if (_scripts[i]->_waitObject->isReady()) _scripts[i]->Run(); } else _scripts[i]->Finish(); break; } diff --git a/engines/wintermute/PlatformSDL.cpp b/engines/wintermute/PlatformSDL.cpp index 37270d8834..6817ef047b 100644 --- a/engines/wintermute/PlatformSDL.cpp +++ b/engines/wintermute/PlatformSDL.cpp @@ -77,14 +77,14 @@ void CBPlatform::HandleEvent(Common::Event *event) { if (Game) Game->OnMouseMiddleUp(); break; case Common::EVENT_KEYDOWN: - if (Game) Game->HandleKeypress(event); + if (Game) Game->handleKeypress(event); break; case Common::EVENT_KEYUP: if (Game) Game->handleKeyRelease(event); break; case Common::EVENT_WHEELUP: case Common::EVENT_WHEELDOWN: - if (Game) Game->HandleMouseWheel(event->mouse.y); + if (Game) Game->handleMouseWheel(event->mouse.y); break; /*#ifdef __IPHONEOS__ { @@ -102,12 +102,12 @@ void CBPlatform::HandleEvent(Common::Event *event) { //TODO /* case SDL_MOUSEWHEEL: - if (Game) Game->HandleMouseWheel(event->wheel.y); + if (Game) Game->handleMouseWheel(event->wheel.y); break; case SDL_KEYDOWN: case SDL_TEXTINPUT: - if (Game) Game->HandleKeypress(event); + if (Game) Game->handleKeypress(event); break; case SDL_WINDOWEVENT: diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp index 4751ead13b..f545a0a745 100644 --- a/engines/wintermute/UI/UIButton.cpp +++ b/engines/wintermute/UI/UIButton.cpp @@ -218,7 +218,7 @@ HRESULT CUIButton::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_BACK: @@ -445,7 +445,7 @@ HRESULT CUIButton::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "{\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "\n"); @@ -578,7 +578,7 @@ void CUIButton::CorrectSize() { ////////////////////////////////////////////////////////////////////////// -HRESULT CUIButton::Display(int OffsetX, int OffsetY) { +HRESULT CUIButton::display(int OffsetX, int OffsetY) { if (!_visible) return S_OK; CUITiledImage *back = NULL; @@ -629,7 +629,7 @@ HRESULT CUIButton::Display(int OffsetX, int OffsetY) { ImageY += (_height - (rc.bottom - rc.top)) / 2; } - if (back) back->Display(OffsetX + _posX, OffsetY + _posY, _width, _height); + if (back) back->display(OffsetX + _posX, OffsetY + _posY, _width, _height); //if(image) image->Draw(ImageX +((_press||_oneTimePress)&&back?1:0), ImageY +((_press||_oneTimePress)&&back?1:0), NULL); if (image) image->Draw(ImageX + ((_press || _oneTimePress) && back ? 1 : 0), ImageY + ((_press || _oneTimePress) && back ? 1 : 0), _pixelPerfect ? this : NULL); diff --git a/engines/wintermute/UI/UIButton.h b/engines/wintermute/UI/UIButton.h index 0f2a01b425..5a86087d76 100644 --- a/engines/wintermute/UI/UIButton.h +++ b/engines/wintermute/UI/UIButton.h @@ -44,7 +44,7 @@ public: uint32 _oneTimePressTime; DECLARE_PERSISTENT(CUIButton, CUIObject) void Press(); - virtual HRESULT Display(int OffsetX = 0, int OffsetY = 0); + virtual HRESULT display(int OffsetX = 0, int OffsetY = 0); bool _press; bool _hover; void CorrectSize(); diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp index 9c874b8ba3..fdb5b00a80 100644 --- a/engines/wintermute/UI/UIEdit.cpp +++ b/engines/wintermute/UI/UIEdit.cpp @@ -245,7 +245,7 @@ HRESULT CUIEdit::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_CURSOR: @@ -307,7 +307,7 @@ HRESULT CUIEdit::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "{\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "\n"); @@ -543,7 +543,7 @@ void CUIEdit::SetCursorChar(const char *Char) { ////////////////////////////////////////////////////////////////////////// -HRESULT CUIEdit::Display(int OffsetX, int OffsetY) { +HRESULT CUIEdit::display(int OffsetX, int OffsetY) { if (!_visible) return S_OK; @@ -551,7 +551,7 @@ HRESULT CUIEdit::Display(int OffsetX, int OffsetY) { TTextEncoding OrigEncoding = Game->_textEncoding; Game->_textEncoding = TEXT_ANSI; - if (_back) _back->Display(OffsetX + _posX, OffsetY + _posY, _width, _height); + if (_back) _back->display(OffsetX + _posX, OffsetY + _posY, _width, _height); if (_image) _image->Draw(OffsetX + _posX, OffsetY + _posY, NULL); // prepare fonts @@ -686,7 +686,7 @@ HRESULT CUIEdit::Display(int OffsetX, int OffsetY) { ////////////////////////////////////////////////////////////////////////// -bool CUIEdit::HandleKeypress(Common::Event *event, bool printable) { +bool CUIEdit::handleKeypress(Common::Event *event, bool printable) { bool Handled = false; if (event->type == Common::EVENT_KEYDOWN && !printable) { diff --git a/engines/wintermute/UI/UIEdit.h b/engines/wintermute/UI/UIEdit.h index aea0f6088e..192257e996 100644 --- a/engines/wintermute/UI/UIEdit.h +++ b/engines/wintermute/UI/UIEdit.h @@ -43,8 +43,8 @@ public: int DeleteChars(int Start, int End); bool _cursorVisible; uint32 _lastBlinkTime; - virtual HRESULT Display(int OffsetX, int OffsetY); - virtual bool HandleKeypress(Common::Event *event, bool printable = false); + virtual HRESULT display(int OffsetX, int OffsetY); + virtual bool handleKeypress(Common::Event *event, bool printable = false); int _scrollOffset; int _frameWidth; uint32 _cursorBlinkRate; diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp index 8143afdf44..962a6b87d7 100644 --- a/engines/wintermute/UI/UIEntity.cpp +++ b/engines/wintermute/UI/UIEntity.cpp @@ -225,7 +225,7 @@ HRESULT CUIEntity::SetEntity(const char *Filename) { } ////////////////////////////////////////////////////////////////////////// -HRESULT CUIEntity::Display(int OffsetX, int OffsetY) { +HRESULT CUIEntity::display(int OffsetX, int OffsetY) { if (!_visible) return S_OK; if (_entity) { @@ -234,13 +234,13 @@ HRESULT CUIEntity::Display(int OffsetX, int OffsetY) { if (_entity->_scale < 0) _entity->_zoomable = false; _entity->_shadowable = false; - _entity->Update(); + _entity->update(); bool OrigReg = _entity->_registrable; if (_entity->_registrable && _disable) _entity->_registrable = false; - _entity->Display(); + _entity->display(); _entity->_registrable = OrigReg; } diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h index 5c3f29bd7d..29262d77c1 100644 --- a/engines/wintermute/UI/UIEntity.h +++ b/engines/wintermute/UI/UIEntity.h @@ -42,7 +42,7 @@ public: HRESULT LoadBuffer(byte *Buffer, bool Complete); virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent); - virtual HRESULT Display(int OffsetX = 0, int OffsetY = 0); + virtual HRESULT display(int OffsetX = 0, int OffsetY = 0); CAdEntity *_entity; HRESULT SetEntity(const char *Filename); diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp index 8560747297..31a7c044c7 100644 --- a/engines/wintermute/UI/UIObject.cpp +++ b/engines/wintermute/UI/UIObject.cpp @@ -98,7 +98,7 @@ void CUIObject::SetText(const char *Text) { ////////////////////////////////////////////////////////////////////////// -HRESULT CUIObject::Display(int OffsetX, int OffsetY) { +HRESULT CUIObject::display(int OffsetX, int OffsetY) { return S_OK; } @@ -500,12 +500,12 @@ bool CUIObject::IsFocused() { ////////////////////////////////////////////////////////////////////////// -HRESULT CUIObject::HandleMouse(TMouseEvent Event, TMouseButton Button) { +HRESULT CUIObject::handleMouse(TMouseEvent Event, TMouseButton Button) { // handle focus change if (Event == MOUSE_CLICK && Button == MOUSE_BUTTON_LEFT) { Focus(); } - return CBObject::HandleMouse(Event, Button); + return CBObject::handleMouse(Event, Button); } diff --git a/engines/wintermute/UI/UIObject.h b/engines/wintermute/UI/UIObject.h index 910a2045cc..272b094131 100644 --- a/engines/wintermute/UI/UIObject.h +++ b/engines/wintermute/UI/UIObject.h @@ -43,12 +43,12 @@ public: HRESULT GetTotalOffset(int *OffsetX, int *OffsetY); bool _canFocus; HRESULT Focus(); - virtual HRESULT HandleMouse(TMouseEvent Event, TMouseButton Button); + virtual HRESULT handleMouse(TMouseEvent Event, TMouseButton Button); bool IsFocused(); bool _parentNotify; DECLARE_PERSISTENT(CUIObject, CBObject) CUIObject *_parent; - virtual HRESULT Display(int OffsetX = 0, int OffsetY = 0); + virtual HRESULT display(int OffsetX = 0, int OffsetY = 0); virtual void CorrectSize(); bool _sharedFonts; bool _sharedImages; diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp index 1c2033a8d3..e221314218 100644 --- a/engines/wintermute/UI/UIText.cpp +++ b/engines/wintermute/UI/UIText.cpp @@ -62,14 +62,14 @@ CUIText::~CUIText() { ////////////////////////////////////////////////////////////////////////// -HRESULT CUIText::Display(int OffsetX, int OffsetY) { +HRESULT CUIText::display(int OffsetX, int OffsetY) { if (!_visible) return S_OK; CBFont *font = _font; if (!font) font = Game->_systemFont; - if (_back) _back->Display(OffsetX + _posX, OffsetY + _posY, _width, _height); + if (_back) _back->display(OffsetX + _posX, OffsetY + _posY, _width, _height); if (_image) _image->Draw(OffsetX + _posX, OffsetY + _posY, NULL); if (font && _text) { @@ -185,7 +185,7 @@ HRESULT CUIText::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_BACK: @@ -298,7 +298,7 @@ HRESULT CUIText::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "{\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "\n"); diff --git a/engines/wintermute/UI/UIText.h b/engines/wintermute/UI/UIText.h index e59c7b3cb3..5092623d8c 100644 --- a/engines/wintermute/UI/UIText.h +++ b/engines/wintermute/UI/UIText.h @@ -37,7 +37,7 @@ namespace WinterMute { class CUIText : public CUIObject { public: HRESULT SizeToFit(); - virtual HRESULT Display(int OffsetX, int OffsetY); + virtual HRESULT display(int OffsetX, int OffsetY); DECLARE_PERSISTENT(CUIText, CUIObject) CUIText(CBGame *inGame = NULL); virtual ~CUIText(); diff --git a/engines/wintermute/UI/UITiledImage.cpp b/engines/wintermute/UI/UITiledImage.cpp index 38cbdfdba7..54a85a0578 100644 --- a/engines/wintermute/UI/UITiledImage.cpp +++ b/engines/wintermute/UI/UITiledImage.cpp @@ -64,7 +64,7 @@ CUITiledImage::~CUITiledImage() { ////////////////////////////////////////////////////////////////////////// -HRESULT CUITiledImage::Display(int X, int Y, int Width, int Height) { +HRESULT CUITiledImage::display(int X, int Y, int Width, int Height) { if (!_image) return E_FAIL; int tile_width = _middleMiddle.right - _middleMiddle.left; diff --git a/engines/wintermute/UI/UITiledImage.h b/engines/wintermute/UI/UITiledImage.h index f73c995310..fa0338586e 100644 --- a/engines/wintermute/UI/UITiledImage.h +++ b/engines/wintermute/UI/UITiledImage.h @@ -42,7 +42,7 @@ public: HRESULT LoadBuffer(byte *Buffer, bool Complete = true); virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent); - HRESULT Display(int X, int Y, int Width, int Height); + HRESULT display(int X, int Y, int Width, int Height); CUITiledImage(CBGame *inGame = NULL); virtual ~CUITiledImage(); CBSubFrame *_image; diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp index d89a5e4b42..8b6ed746af 100644 --- a/engines/wintermute/UI/UIWindow.cpp +++ b/engines/wintermute/UI/UIWindow.cpp @@ -113,7 +113,7 @@ void CUIWindow::cleanup() { ////////////////////////////////////////////////////////////////////////// -HRESULT CUIWindow::Display(int OffsetX, int OffsetY) { +HRESULT CUIWindow::display(int OffsetX, int OffsetY) { // go exclusive if (_mode == WINDOW_EXCLUSIVE || _mode == WINDOW_SYSTEM_EXCLUSIVE) { if (!_shieldWindow) _shieldWindow = new CUIWindow(Game); @@ -122,7 +122,7 @@ HRESULT CUIWindow::Display(int OffsetX, int OffsetY) { _shieldWindow->_width = Game->_renderer->_width; _shieldWindow->_height = Game->_renderer->_height; - _shieldWindow->Display(); + _shieldWindow->display(); } } else if (_isMenu) { if (!_shieldButton) { @@ -136,7 +136,7 @@ HRESULT CUIWindow::Display(int OffsetX, int OffsetY) { _shieldButton->_width = Game->_renderer->_width; _shieldButton->_height = Game->_renderer->_height; - _shieldButton->Display(); + _shieldButton->display(); } } @@ -178,7 +178,7 @@ HRESULT CUIWindow::Display(int OffsetX, int OffsetY) { } if (_alphaColor != 0) Game->_renderer->_forceAlphaColor = _alphaColor; - if (back) back->Display(_posX + OffsetX, _posY + OffsetY, _width, _height); + if (back) back->display(_posX + OffsetX, _posY + OffsetY, _width, _height); if (image) image->Draw(_posX + OffsetX, _posY + OffsetY, _transparent ? NULL : this); if (!CBPlatform::IsRectEmpty(&_titleRect) && font && _text) { @@ -188,7 +188,7 @@ HRESULT CUIWindow::Display(int OffsetX, int OffsetY) { if (!_transparent && !image) Game->_renderer->_rectList.Add(new CBActiveRect(Game, this, NULL, _posX + OffsetX, _posY + OffsetY, _width, _height, 100, 100, false)); for (int i = 0; i < _widgets.GetSize(); i++) { - _widgets[i]->Display(_posX + OffsetX, _posY + OffsetY); + _widgets[i]->display(_posX + OffsetX, _posY + OffsetY); } if (_alphaColor != 0) Game->_renderer->_forceAlphaColor = 0; @@ -325,7 +325,7 @@ HRESULT CUIWindow::LoadBuffer(byte *Buffer, bool Complete) { break; case TOKEN_CAPTION: - SetCaption((char *)params); + setCaption((char *)params); break; case TOKEN_BACK: @@ -572,7 +572,7 @@ HRESULT CUIWindow::saveAsText(CBDynBuffer *Buffer, int Indent) { Buffer->PutTextIndent(Indent, "{\n"); Buffer->PutTextIndent(Indent + 2, "NAME=\"%s\"\n", _name); - Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", GetCaption()); + Buffer->PutTextIndent(Indent + 2, "CAPTION=\"%s\"\n", getCaption()); Buffer->PutTextIndent(Indent + 2, "\n"); @@ -1100,12 +1100,12 @@ const char *CUIWindow::scToString() { ////////////////////////////////////////////////////////////////////////// -bool CUIWindow::HandleKeypress(Common::Event *event, bool printable) { +bool CUIWindow::handleKeypress(Common::Event *event, bool printable) { //TODO if (event->type == Common::EVENT_KEYDOWN && event->kbd.keycode == Common::KEYCODE_TAB) { return SUCCEEDED(MoveFocus(!CBKeyboardState::IsShiftDown())); } else { - if (_focusedWidget) return _focusedWidget->HandleKeypress(event, printable); + if (_focusedWidget) return _focusedWidget->handleKeypress(event, printable); else return false; } return false; @@ -1113,15 +1113,15 @@ bool CUIWindow::HandleKeypress(Common::Event *event, bool printable) { ////////////////////////////////////////////////////////////////////////// -bool CUIWindow::HandleMouseWheel(int Delta) { - if (_focusedWidget) return _focusedWidget->HandleMouseWheel(Delta); +bool CUIWindow::handleMouseWheel(int Delta) { + if (_focusedWidget) return _focusedWidget->handleMouseWheel(Delta); else return false; } ////////////////////////////////////////////////////////////////////////// -HRESULT CUIWindow::HandleMouse(TMouseEvent Event, TMouseButton Button) { - HRESULT res = CUIObject::HandleMouse(Event, Button); +HRESULT CUIWindow::handleMouse(TMouseEvent Event, TMouseButton Button) { + HRESULT res = CUIObject::handleMouse(Event, Button); // handle window dragging if (!CBPlatform::IsRectEmpty(&_dragRect)) { diff --git a/engines/wintermute/UI/UIWindow.h b/engines/wintermute/UI/UIWindow.h index 53d52d55fc..ed81ef9d06 100644 --- a/engines/wintermute/UI/UIWindow.h +++ b/engines/wintermute/UI/UIWindow.h @@ -50,7 +50,7 @@ public: bool _isMenu; bool _fadeBackground; uint32 _fadeColor; - virtual bool HandleMouseWheel(int Delta); + virtual bool handleMouseWheel(int Delta); CUIWindow *_shieldWindow; CUIButton *_shieldButton; HRESULT Close(); @@ -58,7 +58,7 @@ public: HRESULT GoExclusive(); TWindowMode _mode; HRESULT MoveFocus(bool Forward = true); - virtual HRESULT HandleMouse(TMouseEvent Event, TMouseButton Button); + virtual HRESULT handleMouse(TMouseEvent Event, TMouseButton Button); POINT _dragFrom; bool _dragging; DECLARE_PERSISTENT(CUIWindow, CUIObject) @@ -67,10 +67,10 @@ public: HRESULT EnableWidget(const char *Name, bool Enable = true); RECT _titleRect; RECT _dragRect; - virtual HRESULT Display(int OffsetX = 0, int OffsetY = 0); + virtual HRESULT display(int OffsetX = 0, int OffsetY = 0); CUIWindow(CBGame *inGame); virtual ~CUIWindow(); - virtual bool HandleKeypress(Common::Event *event, bool printable = false); + virtual bool handleKeypress(Common::Event *event, bool printable = false); CBArray _widgets; TTextAlign _titleAlign; HRESULT LoadFile(const char *Filename); diff --git a/engines/wintermute/video/VidPlayer.cpp b/engines/wintermute/video/VidPlayer.cpp index 365e10bdd7..c0dbfea56f 100644 --- a/engines/wintermute/video/VidPlayer.cpp +++ b/engines/wintermute/video/VidPlayer.cpp @@ -211,7 +211,7 @@ HRESULT CVidPlayer::update() { HRESULT res; if (_soundAvailable && m_Sound) { - res = _sound->Update(); + res = _sound->update(); if (FAILED(res)) return res; } @@ -279,7 +279,7 @@ HRESULT CVidPlayer::display() { if (!m_Playing) return S_OK; HRESULT res; - if (_vidRenderer) res = _vidRenderer->Display(m_PlayPosX, m_PlayPosY, m_PlayZoom); + if (_vidRenderer) res = _vidRenderer->display(m_PlayPosX, m_PlayPosY, m_PlayZoom); else res = E_FAIL; // display subtitle diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp index 6b85f0b20f..779827212a 100644 --- a/engines/wintermute/video/VidTheoraPlayer.cpp +++ b/engines/wintermute/video/VidTheoraPlayer.cpp @@ -578,7 +578,7 @@ HRESULT CVidTheoraPlayer::update() { m_PlaybackStarted = true; } - if (m_Subtitler && Game->m_VideoSubtitles) m_Subtitler->Update(GetMovieFrame()); + if (m_Subtitler && Game->m_VideoSubtitles) m_Subtitler->update(GetMovieFrame()); #endif return S_OK; } @@ -656,7 +656,7 @@ HRESULT CVidTheoraPlayer::display(uint32 alpha) { else res = _texture->displayTransZoom(_posX, _posY, rc, _playZoom, _playZoom, alpha); } else res = E_FAIL; #if 0 - if (m_Subtitler && Game->m_VideoSubtitles) m_Subtitler->Display(); + if (m_Subtitler && Game->m_VideoSubtitles) m_Subtitler->display(); #endif return res; } -- cgit v1.2.3