aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Ad
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/Ad')
-rw-r--r--engines/wintermute/Ad/AdActor.cpp18
-rw-r--r--engines/wintermute/Ad/AdActor.h6
-rw-r--r--engines/wintermute/Ad/AdEntity.cpp24
-rw-r--r--engines/wintermute/Ad/AdEntity.h6
-rw-r--r--engines/wintermute/Ad/AdGame.cpp38
-rw-r--r--engines/wintermute/Ad/AdGame.h2
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.cpp14
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.h2
-rw-r--r--engines/wintermute/Ad/AdItem.cpp12
-rw-r--r--engines/wintermute/Ad/AdItem.h6
-rw-r--r--engines/wintermute/Ad/AdLayer.cpp4
-rw-r--r--engines/wintermute/Ad/AdNodeState.cpp10
-rw-r--r--engines/wintermute/Ad/AdNodeState.h4
-rw-r--r--engines/wintermute/Ad/AdObject.cpp30
-rw-r--r--engines/wintermute/Ad/AdObject.h12
-rw-r--r--engines/wintermute/Ad/AdRegion.cpp4
-rw-r--r--engines/wintermute/Ad/AdResponseBox.cpp12
-rw-r--r--engines/wintermute/Ad/AdResponseBox.h2
-rw-r--r--engines/wintermute/Ad/AdScene.cpp40
-rw-r--r--engines/wintermute/Ad/AdScene.h6
-rw-r--r--engines/wintermute/Ad/AdSentence.cpp4
-rw-r--r--engines/wintermute/Ad/AdSentence.h4
22 files changed, 130 insertions, 130 deletions
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<CAdScaleLevel *, CAdScaleLevel *> _scaleLevels;
CBArray<CAdRotLevel *, CAdRotLevel *> _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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:13:29 +0000