aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Ad
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/Ad')
-rw-r--r--engines/wintermute/Ad/AdActor.cpp6
-rw-r--r--engines/wintermute/Ad/AdEntity.cpp6
-rw-r--r--engines/wintermute/Ad/AdGame.cpp54
-rw-r--r--engines/wintermute/Ad/AdGame.h2
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.cpp8
-rw-r--r--engines/wintermute/Ad/AdInventoryBox.h2
-rw-r--r--engines/wintermute/Ad/AdItem.cpp8
-rw-r--r--engines/wintermute/Ad/AdLayer.cpp16
-rw-r--r--engines/wintermute/Ad/AdNodeState.cpp8
-rw-r--r--engines/wintermute/Ad/AdNodeState.h4
-rw-r--r--engines/wintermute/Ad/AdObject.cpp4
-rw-r--r--engines/wintermute/Ad/AdRegion.cpp8
-rw-r--r--engines/wintermute/Ad/AdResponseBox.cpp6
-rw-r--r--engines/wintermute/Ad/AdResponseBox.h2
-rw-r--r--engines/wintermute/Ad/AdScene.cpp22
-rw-r--r--engines/wintermute/Ad/AdScene.h2
-rw-r--r--engines/wintermute/Ad/AdSceneState.cpp4
-rw-r--r--engines/wintermute/Ad/AdSceneState.h2
-rw-r--r--engines/wintermute/Ad/AdSpriteSet.cpp2
-rw-r--r--engines/wintermute/Ad/AdWaypointGroup.cpp10
-rw-r--r--engines/wintermute/Ad/AdWaypointGroup.h2
21 files changed, 89 insertions, 89 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 09f19da65c..dd201ac6c1 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -253,7 +253,7 @@ HRESULT CAdActor::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_CAPTION:
@@ -332,7 +332,7 @@ HRESULT CAdActor::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_SCRIPT:
- AddScript((char *)params);
+ addScript((char *)params);
break;
case TOKEN_CURSOR:
@@ -370,7 +370,7 @@ HRESULT CAdActor::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_PROPERTY:
- ParseProperty(params, false);
+ parseProperty(params, false);
break;
case TOKEN_BLOCKED_REGION: {
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index 0cd1276885..60a94b5e5a 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -249,7 +249,7 @@ HRESULT CAdEntity::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_ITEM:
@@ -372,7 +372,7 @@ HRESULT CAdEntity::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_SCRIPT:
- AddScript((char *)params);
+ addScript((char *)params);
break;
case TOKEN_SUBTYPE: {
@@ -415,7 +415,7 @@ HRESULT CAdEntity::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_PROPERTY:
- ParseProperty(params, false);
+ parseProperty(params, false);
break;
case TOKEN_IGNORE_ITEMS:
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 049247db0a..cb547e02b8 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -71,7 +71,7 @@ CAdGame::CAdGame(): CBGame() {
_inventoryBox = NULL;
_scene = new CAdScene(Game);
- _scene->SetName("");
+ _scene->setName("");
RegisterObject(_scene);
_prevSceneName = NULL;
@@ -112,12 +112,12 @@ CAdGame::CAdGame(): CBGame() {
//////////////////////////////////////////////////////////////////////////
CAdGame::~CAdGame() {
- Cleanup();
+ cleanup();
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdGame::Cleanup() {
+HRESULT CAdGame::cleanup() {
int i;
for (i = 0; i < _objects.GetSize(); i++) {
@@ -190,7 +190,7 @@ HRESULT CAdGame::Cleanup() {
for (i = 0; i < _responsesGame.GetSize(); i++) delete _responsesGame[i];
_responsesGame.RemoveAll();
- return CBGame::Cleanup();
+ return CBGame::cleanup();
}
@@ -248,7 +248,7 @@ HRESULT CAdGame::ChangeScene(const char *Filename, bool FadeIn) {
_scene = new CAdScene(Game);
RegisterObject(_scene);
} else {
- _scene->ApplyEvent("SceneShutdown", true);
+ _scene->applyEvent("SceneShutdown", true);
SetPrevSceneName(_scene->_name);
SetPrevSceneFilename(_scene->_filename);
@@ -263,7 +263,7 @@ HRESULT CAdGame::ChangeScene(const char *Filename, bool FadeIn) {
// reset scene properties
_scene->_sFXVolume = 100;
- if (_scene->_scProp) _scene->_scProp->Cleanup();
+ if (_scene->_scProp) _scene->_scProp->cleanup();
HRESULT ret;
if (_initialScene && _dEBUG_DebugMode && _debugStartupScene) {
@@ -398,7 +398,7 @@ HRESULT CAdGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *This
CAdEntity *Ent = new CAdEntity(Game);
AddObject(Ent);
- if (!Val->IsNULL()) Ent->SetName(Val->GetString());
+ if (!Val->IsNULL()) Ent->setName(Val->GetString());
Stack->PushNative(Ent, true);
return S_OK;
}
@@ -412,7 +412,7 @@ HRESULT CAdGame::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *This
CAdItem *Item = new CAdItem(Game);
AddItem(Item);
- if (!Val->IsNULL()) Item->SetName(Val->GetString());
+ if (!Val->IsNULL()) Item->setName(Val->GetString());
Stack->PushNative(Item, true);
return S_OK;
}
@@ -1104,7 +1104,7 @@ HRESULT CAdGame::ShowCursor() {
_lastCursor = OrigLastCursor;
}
if (_activeObject && _selectedItem->_cursorHover && _activeObject->GetExtendedFlag("usable")) {
- if (!_smartItemCursor || _activeObject->CanHandleEvent(_selectedItem->_name))
+ if (!_smartItemCursor || _activeObject->canHandleEvent(_selectedItem->_name))
return DrawCursor(_selectedItem->_cursorHover);
else
return DrawCursor(_selectedItem->_cursorNormal);
@@ -1264,7 +1264,7 @@ HRESULT CAdGame::LoadBuffer(byte *Buffer, bool Complete) {
//////////////////////////////////////////////////////////////////////////
HRESULT CAdGame::persist(CBPersistMgr *persistMgr) {
- if (!persistMgr->_saving) Cleanup();
+ if (!persistMgr->_saving) cleanup();
CBGame::persist(persistMgr);
_dlgPendingBranches.persist(persistMgr);
@@ -1470,7 +1470,7 @@ CAdSceneState *CAdGame::GetSceneState(const char *Filename, bool Saving) {
if (Saving) {
CAdSceneState *ret = new CAdSceneState(Game);
- ret->SetFilename(FilenameCor);
+ ret->setFilename(FilenameCor);
_sceneStates.Add(ret);
@@ -1524,7 +1524,7 @@ HRESULT CAdGame::WindowScriptMethodHook(CUIWindow *Win, CScScript *Script, CScSt
CScValue *Val = Stack->Pop();
CUIEntity *Ent = new CUIEntity(Game);
- if (!Val->IsNULL()) Ent->SetName(Val->GetString());
+ if (!Val->IsNULL()) Ent->setName(Val->GetString());
Stack->PushNative(Ent, true);
Ent->_parent = Win;
@@ -1957,12 +1957,12 @@ HRESULT CAdGame::OnMouseLeftDown() {
if (_activeObject) _activeObject->HandleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT);
- bool Handled = _state == GAME_RUNNING && SUCCEEDED(ApplyEvent("LeftClick"));
+ bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("LeftClick"));
if (!Handled) {
if (_activeObject != NULL) {
- _activeObject->ApplyEvent("LeftClick");
+ _activeObject->applyEvent("LeftClick");
} else if (_state == GAME_RUNNING && _scene && _scene->PointInViewport(_mousePos.x, _mousePos.y)) {
- _scene->ApplyEvent("LeftClick");
+ _scene->applyEvent("LeftClick");
}
}
@@ -1981,12 +1981,12 @@ HRESULT CAdGame::OnMouseLeftUp() {
_capturedObject = NULL;
_mouseLeftDown = false;
- bool Handled = /*_state==GAME_RUNNING &&*/ SUCCEEDED(ApplyEvent("LeftRelease"));
+ bool Handled = /*_state==GAME_RUNNING &&*/ SUCCEEDED(applyEvent("LeftRelease"));
if (!Handled) {
if (_activeObject != NULL) {
- _activeObject->ApplyEvent("LeftRelease");
+ _activeObject->applyEvent("LeftRelease");
} else if (_state == GAME_RUNNING && _scene && _scene->PointInViewport(_mousePos.x, _mousePos.y)) {
- _scene->ApplyEvent("LeftRelease");
+ _scene->applyEvent("LeftRelease");
}
}
return S_OK;
@@ -2000,12 +2000,12 @@ HRESULT CAdGame::OnMouseLeftDblClick() {
if (_activeObject) _activeObject->HandleMouse(MOUSE_DBLCLICK, MOUSE_BUTTON_LEFT);
- bool Handled = _state == GAME_RUNNING && SUCCEEDED(ApplyEvent("LeftDoubleClick"));
+ bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("LeftDoubleClick"));
if (!Handled) {
if (_activeObject != NULL) {
- _activeObject->ApplyEvent("LeftDoubleClick");
+ _activeObject->applyEvent("LeftDoubleClick");
} else if (_state == GAME_RUNNING && _scene && _scene->PointInViewport(_mousePos.x, _mousePos.y)) {
- _scene->ApplyEvent("LeftDoubleClick");
+ _scene->applyEvent("LeftDoubleClick");
}
}
return S_OK;
@@ -2025,12 +2025,12 @@ HRESULT CAdGame::OnMouseRightDown() {
if (_activeObject) _activeObject->HandleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT);
- bool Handled = _state == GAME_RUNNING && SUCCEEDED(ApplyEvent("RightClick"));
+ bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("RightClick"));
if (!Handled) {
if (_activeObject != NULL) {
- _activeObject->ApplyEvent("RightClick");
+ _activeObject->applyEvent("RightClick");
} else if (_state == GAME_RUNNING && _scene && _scene->PointInViewport(_mousePos.x, _mousePos.y)) {
- _scene->ApplyEvent("RightClick");
+ _scene->applyEvent("RightClick");
}
}
return S_OK;
@@ -2040,12 +2040,12 @@ HRESULT CAdGame::OnMouseRightDown() {
HRESULT CAdGame::OnMouseRightUp() {
if (_activeObject) _activeObject->HandleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT);
- bool Handled = _state == GAME_RUNNING && SUCCEEDED(ApplyEvent("RightRelease"));
+ bool Handled = _state == GAME_RUNNING && SUCCEEDED(applyEvent("RightRelease"));
if (!Handled) {
if (_activeObject != NULL) {
- _activeObject->ApplyEvent("RightRelease");
+ _activeObject->applyEvent("RightRelease");
} else if (_state == GAME_RUNNING && _scene && _scene->PointInViewport(_mousePos.x, _mousePos.y)) {
- _scene->ApplyEvent("RightRelease");
+ _scene->applyEvent("RightRelease");
}
}
return S_OK;
diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/Ad/AdGame.h
index 8139102a22..b722249620 100644
--- a/engines/wintermute/Ad/AdGame.h
+++ b/engines/wintermute/Ad/AdGame.h
@@ -114,7 +114,7 @@ public:
char *_prevSceneFilename;
virtual HRESULT LoadGame(const char *Filename);
CAdItem *_selectedItem;
- HRESULT Cleanup();
+ HRESULT cleanup();
DECLARE_PERSISTENT(CAdGame, CBGame)
void FinishSentences();
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index 7a1b7d6f00..0eb612757b 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -73,7 +73,7 @@ CAdInventoryBox::~CAdInventoryBox() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdInventoryBox::Listen(CBScriptHolder *param1, uint32 param2) {
+HRESULT CAdInventoryBox::listen(CBScriptHolder *param1, uint32 param2) {
CUIObject *obj = (CUIObject *)param1;
switch (obj->_type) {
@@ -85,7 +85,7 @@ HRESULT CAdInventoryBox::Listen(CBScriptHolder *param1, uint32 param2) {
_scrollOffset = MAX(_scrollOffset, 0);
} else if (scumm_stricmp(obj->_name, "next") == 0) {
_scrollOffset += _scrollBy;
- } else return CBObject::Listen(param1, param2);
+ } else return CBObject::listen(param1, param2);
break;
default:
error("CAdInventoryBox::Listen - Unhandled enum");
@@ -231,7 +231,7 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_CAPTION:
@@ -298,7 +298,7 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) {
delete _closeButton;
_closeButton = new CUIButton(Game);
if (_closeButton) {
- _closeButton->SetName("close");
+ _closeButton->setName("close");
_closeButton->SetListener(this, _closeButton, 0);
_closeButton->_parent = _window;
}
diff --git a/engines/wintermute/Ad/AdInventoryBox.h b/engines/wintermute/Ad/AdInventoryBox.h
index 463c6c224a..bf3a3acbd6 100644
--- a/engines/wintermute/Ad/AdInventoryBox.h
+++ b/engines/wintermute/Ad/AdInventoryBox.h
@@ -49,7 +49,7 @@ public:
int _spacing;
int _scrollOffset;
RECT _itemsArea;
- HRESULT Listen(CBScriptHolder *param1, uint32 param2);
+ HRESULT listen(CBScriptHolder *param1, uint32 param2);
CUIWindow *_window;
CAdInventoryBox(CBGame *inGame);
virtual ~CAdInventoryBox();
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index 7f4a8d6525..001ecec3fa 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -184,7 +184,7 @@ HRESULT CAdItem::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_FONT:
@@ -280,11 +280,11 @@ HRESULT CAdItem::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_SCRIPT:
- AddScript((char *)params);
+ addScript((char *)params);
break;
case TOKEN_PROPERTY:
- ParseProperty(params, false);
+ parseProperty(params, false);
break;
case TOKEN_ALPHA_COLOR:
@@ -653,7 +653,7 @@ HRESULT CAdItem::scSetProperty(const char *Name, CScValue *Value) {
// Name
//////////////////////////////////////////////////////////////////////////
if (strcmp(Name, "Name") == 0) {
- SetName(Value->GetString());
+ setName(Value->GetString());
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp
index 1183e0efa1..454644e591 100644
--- a/engines/wintermute/Ad/AdLayer.cpp
+++ b/engines/wintermute/Ad/AdLayer.cpp
@@ -138,7 +138,7 @@ HRESULT CAdLayer::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_CAPTION:
@@ -203,11 +203,11 @@ HRESULT CAdLayer::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_SCRIPT:
- AddScript((char *)params);
+ addScript((char *)params);
break;
case TOKEN_PROPERTY:
- ParseProperty(params, false);
+ parseProperty(params, false);
break;
case TOKEN_EDITOR_PROPERTY:
@@ -273,12 +273,12 @@ HRESULT CAdLayer::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi
CAdSceneNode *Node = new CAdSceneNode(Game);
if (strcmp(Name, "AddRegion") == 0) {
CAdRegion *Region = new CAdRegion(Game);
- if (!Val->IsNULL()) Region->SetName(Val->GetString());
+ if (!Val->IsNULL()) Region->setName(Val->GetString());
Node->SetRegion(Region);
Stack->PushNative(Region, true);
} else {
CAdEntity *Entity = new CAdEntity(Game);
- if (!Val->IsNULL()) Entity->SetName(Val->GetString());
+ if (!Val->IsNULL()) Entity->setName(Val->GetString());
Node->SetEntity(Entity);
Stack->PushNative(Entity, true);
}
@@ -297,12 +297,12 @@ HRESULT CAdLayer::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi
CAdSceneNode *Node = new CAdSceneNode(Game);
if (strcmp(Name, "InsertRegion") == 0) {
CAdRegion *Region = new CAdRegion(Game);
- if (!Val->IsNULL()) Region->SetName(Val->GetString());
+ if (!Val->IsNULL()) Region->setName(Val->GetString());
Node->SetRegion(Region);
Stack->PushNative(Region, true);
} else {
CAdEntity *Entity = new CAdEntity(Game);
- if (!Val->IsNULL()) Entity->SetName(Val->GetString());
+ if (!Val->IsNULL()) Entity->setName(Val->GetString());
Node->SetEntity(Entity);
Stack->PushNative(Entity, true);
}
@@ -426,7 +426,7 @@ HRESULT CAdLayer::scSetProperty(const char *Name, CScValue *Value) {
// Name
//////////////////////////////////////////////////////////////////////////
if (strcmp(Name, "Name") == 0) {
- SetName(Value->GetString());
+ setName(Value->GetString());
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp
index 0a7389045f..59165d834c 100644
--- a/engines/wintermute/Ad/AdNodeState.cpp
+++ b/engines/wintermute/Ad/AdNodeState.cpp
@@ -68,7 +68,7 @@ CAdNodeState::~CAdNodeState() {
//////////////////////////////////////////////////////////////////////////
-void CAdNodeState::SetName(const char *Name) {
+void CAdNodeState::setName(const char *Name) {
delete[] _name;
_name = NULL;
CBUtils::SetString(&_name, Name);
@@ -76,7 +76,7 @@ void CAdNodeState::SetName(const char *Name) {
//////////////////////////////////////////////////////////////////////////
-void CAdNodeState::SetFilename(const char *Filename) {
+void CAdNodeState::setFilename(const char *Filename) {
delete[] _filename;
_filename = NULL;
CBUtils::SetString(&_filename, Filename);
@@ -140,8 +140,8 @@ HRESULT CAdNodeState::TransferEntity(CAdEntity *Entity, bool IncludingSprites, b
if (Entity->_caption[i]) SetCaption(Entity->_caption[i], i);
}
if (!Entity->_region && Entity->_sprite && Entity->_sprite->_filename) {
- if (IncludingSprites) SetFilename(Entity->_sprite->_filename);
- else SetFilename("");
+ if (IncludingSprites) setFilename(Entity->_sprite->_filename);
+ else setFilename("");
}
if (Entity->_cursor && Entity->_cursor->_filename) SetCursor(Entity->_cursor->_filename);
_alphaColor = Entity->_alphaColor;
diff --git a/engines/wintermute/Ad/AdNodeState.h b/engines/wintermute/Ad/AdNodeState.h
index 16445376ca..99238226c3 100644
--- a/engines/wintermute/Ad/AdNodeState.h
+++ b/engines/wintermute/Ad/AdNodeState.h
@@ -36,8 +36,8 @@ class CAdEntity;
class CAdNodeState : public CBBase {
public:
HRESULT TransferEntity(CAdEntity *Entity, bool IncludingSprites, bool Saving);
- void SetName(const char *Name);
- void SetFilename(const char *Filename);
+ void setName(const char *Name);
+ void setFilename(const char *Filename);
void SetCursor(const char *Filename);
DECLARE_PERSISTENT(CAdNodeState, CBBase)
CAdNodeState(CBGame *inGame);
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 15c07aa22b..13e6391d69 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -1073,12 +1073,12 @@ HRESULT CAdObject::AfterMove() {
break;
}
}
- if (!RegFound) NewRegions[i]->ApplyEvent("ActorEntry");
+ if (!RegFound) NewRegions[i]->applyEvent("ActorEntry");
}
for (int i = 0; i < MAX_NUM_REGIONS; i++) {
if (_currentRegions[i] && Game->ValidObject(_currentRegions[i])) {
- _currentRegions[i]->ApplyEvent("ActorLeave");
+ _currentRegions[i]->applyEvent("ActorLeave");
}
_currentRegions[i] = NewRegions[i];
}
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index fb8493b1d4..43ed13eef3 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -140,7 +140,7 @@ HRESULT CAdRegion::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_CAPTION:
@@ -191,11 +191,11 @@ HRESULT CAdRegion::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_SCRIPT:
- AddScript((char *)params);
+ addScript((char *)params);
break;
case TOKEN_PROPERTY:
- ParseProperty(params, false);
+ parseProperty(params, false);
break;
case TOKEN_EDITOR_PROPERTY:
@@ -299,7 +299,7 @@ HRESULT CAdRegion::scSetProperty(const char *Name, CScValue *Value) {
// Name
//////////////////////////////////////////////////////////////////////////
if (strcmp(Name, "Name") == 0) {
- SetName(Value->GetString());
+ setName(Value->GetString());
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index 1da0389037..fe0784feff 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -162,7 +162,7 @@ HRESULT CAdResponseBox::CreateButtons() {
btn->_width = _responseArea.right - _responseArea.left;
if (btn->_width <= 0) btn->_width = Game->_renderer->_width;
}
- btn->SetName("response");
+ btn->setName("response");
btn->CorrectSize();
// make the responses touchable
@@ -482,7 +482,7 @@ HRESULT CAdResponseBox::Display() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CAdResponseBox::Listen(CBScriptHolder *param1, uint32 param2) {
+HRESULT CAdResponseBox::listen(CBScriptHolder *param1, uint32 param2) {
CUIObject *obj = (CUIObject *)param1;
switch (obj->_type) {
@@ -500,7 +500,7 @@ HRESULT CAdResponseBox::Listen(CBScriptHolder *param1, uint32 param2) {
_ready = true;
InvalidateButtons();
ClearResponses();
- } else return CBObject::Listen(param1, param2);
+ } else return CBObject::listen(param1, param2);
break;
default:
error("AdResponseBox::Listen - Unhandled enum");
diff --git a/engines/wintermute/Ad/AdResponseBox.h b/engines/wintermute/Ad/AdResponseBox.h
index 52e5e20d76..044a78bb4f 100644
--- a/engines/wintermute/Ad/AdResponseBox.h
+++ b/engines/wintermute/Ad/AdResponseBox.h
@@ -50,7 +50,7 @@ public:
char *_lastResponseTextOrig;
DECLARE_PERSISTENT(CAdResponseBox, CBObject)
CScScript *_waitingScript;
- virtual HRESULT Listen(CBScriptHolder *param1, uint32 param2);
+ virtual HRESULT listen(CBScriptHolder *param1, uint32 param2);
typedef enum {
EVENT_PREV, EVENT_NEXT, EVENT_RESPONSE
} TResponseEvent;
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index e14a6ce5ba..6bd5be4bea 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -73,7 +73,7 @@ CAdScene::CAdScene(CBGame *inGame): CBObject(inGame) {
//////////////////////////////////////////////////////////////////////////
CAdScene::~CAdScene() {
- Cleanup();
+ cleanup();
Game->UnregisterObject(_fader);
delete _pFTarget;
_pFTarget = NULL;
@@ -136,8 +136,8 @@ void CAdScene::SetDefaults() {
//////////////////////////////////////////////////////////////////////////
-void CAdScene::Cleanup() {
- CBObject::Cleanup();
+void CAdScene::cleanup() {
+ CBObject::cleanup();
_mainLayer = NULL; // reference only
@@ -609,7 +609,7 @@ HRESULT CAdScene::LoadBuffer(byte *Buffer, bool Complete) {
TOKEN_TABLE(EDITOR_PROPERTY)
TOKEN_TABLE_END
- Cleanup();
+ cleanup();
byte *params;
int cmd;
@@ -634,7 +634,7 @@ HRESULT CAdScene::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_CAPTION:
@@ -813,11 +813,11 @@ HRESULT CAdScene::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_SCRIPT:
- AddScript((char *)params);
+ addScript((char *)params);
break;
case TOKEN_PROPERTY:
- ParseProperty(params, false);
+ parseProperty(params, false);
break;
case TOKEN_VIEWPORT: {
@@ -1292,7 +1292,7 @@ HRESULT CAdScene::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi
CAdEntity *Ent = new CAdEntity(Game);
AddObject(Ent);
- if (!Val->IsNULL()) Ent->SetName(Val->GetString());
+ if (!Val->IsNULL()) Ent->setName(Val->GetString());
Stack->PushNative(Ent, true);
return S_OK;
}
@@ -1594,7 +1594,7 @@ HRESULT CAdScene::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi
CScValue *Val = Stack->Pop();
CAdLayer *Layer = new CAdLayer(Game);
- if (!Val->IsNULL()) Layer->SetName(Val->GetString());
+ if (!Val->IsNULL()) Layer->setName(Val->GetString());
if (_mainLayer) {
Layer->_width = _mainLayer->_width;
Layer->_height = _mainLayer->_height;
@@ -1615,7 +1615,7 @@ HRESULT CAdScene::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Thi
CScValue *Val = Stack->Pop();
CAdLayer *Layer = new CAdLayer(Game);
- if (!Val->IsNULL()) Layer->SetName(Val->GetString());
+ if (!Val->IsNULL()) Layer->setName(Val->GetString());
if (_mainLayer) {
Layer->_width = _mainLayer->_width;
Layer->_height = _mainLayer->_height;
@@ -1847,7 +1847,7 @@ HRESULT CAdScene::scSetProperty(const char *Name, CScValue *Value) {
// Name
//////////////////////////////////////////////////////////////////////////
if (strcmp(Name, "Name") == 0) {
- SetName(Value->GetString());
+ setName(Value->GetString());
return S_OK;
}
diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/Ad/AdScene.h
index 4d3720ecfa..8aa5657bc2 100644
--- a/engines/wintermute/Ad/AdScene.h
+++ b/engines/wintermute/Ad/AdScene.h
@@ -92,7 +92,7 @@ public:
bool _paralaxScrolling;
void SkipTo(int OffsetX, int OffsetY);
void SetDefaults();
- void Cleanup();
+ void cleanup();
void SkipToObject(CBObject *Object);
void ScrollToObject(CBObject *Object);
void ScrollTo(int OffsetX, int OffsetY);
diff --git a/engines/wintermute/Ad/AdSceneState.cpp b/engines/wintermute/Ad/AdSceneState.cpp
index 9e7260d5a7..7c1a5d9378 100644
--- a/engines/wintermute/Ad/AdSceneState.cpp
+++ b/engines/wintermute/Ad/AdSceneState.cpp
@@ -63,7 +63,7 @@ HRESULT CAdSceneState::persist(CBPersistMgr *persistMgr) {
//////////////////////////////////////////////////////////////////////////
-void CAdSceneState::SetFilename(const char *Filename) {
+void CAdSceneState::setFilename(const char *Filename) {
delete[] _filename;
_filename = new char [strlen(Filename) + 1];
if (_filename) strcpy(_filename, Filename);
@@ -78,7 +78,7 @@ CAdNodeState *CAdSceneState::GetNodeState(char *Name, bool Saving) {
if (Saving) {
CAdNodeState *ret = new CAdNodeState(Game);
- ret->SetName(Name);
+ ret->setName(Name);
_nodeStates.Add(ret);
return ret;
diff --git a/engines/wintermute/Ad/AdSceneState.h b/engines/wintermute/Ad/AdSceneState.h
index 6aa03792d2..2b91a53a4f 100644
--- a/engines/wintermute/Ad/AdSceneState.h
+++ b/engines/wintermute/Ad/AdSceneState.h
@@ -38,7 +38,7 @@ class CAdNodeState;
class CAdSceneState : public CBBase {
public:
CAdNodeState *GetNodeState(char *Name, bool Saving);
- void SetFilename(const char *Filename);
+ void setFilename(const char *Filename);
DECLARE_PERSISTENT(CAdSceneState, CBBase)
CAdSceneState(CBGame *inGame);
virtual ~CAdSceneState();
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp
index 64de71f39d..3cd0b7aff0 100644
--- a/engines/wintermute/Ad/AdSpriteSet.cpp
+++ b/engines/wintermute/Ad/AdSpriteSet.cpp
@@ -126,7 +126,7 @@ HRESULT CAdSpriteSet::LoadBuffer(byte *Buffer, bool Complete, int LifeTime, TSp
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_LEFT:
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp
index 481f495880..b8ee1be55c 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/Ad/AdWaypointGroup.cpp
@@ -50,12 +50,12 @@ CAdWaypointGroup::CAdWaypointGroup(CBGame *inGame): CBObject(inGame) {
//////////////////////////////////////////////////////////////////////////
CAdWaypointGroup::~CAdWaypointGroup() {
- Cleanup();
+ cleanup();
}
//////////////////////////////////////////////////////////////////////////
-void CAdWaypointGroup::Cleanup() {
+void CAdWaypointGroup::cleanup() {
for (int i = 0; i < _points.GetSize(); i++)
delete _points[i];
_points.RemoveAll();
@@ -127,7 +127,7 @@ HRESULT CAdWaypointGroup::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_NAME:
- SetName((char *)params);
+ setName((char *)params);
break;
case TOKEN_POINT: {
@@ -146,7 +146,7 @@ HRESULT CAdWaypointGroup::LoadBuffer(byte *Buffer, bool Complete) {
break;
case TOKEN_PROPERTY:
- ParseProperty(params, false);
+ parseProperty(params, false);
break;
case TOKEN_EDITOR_PROPERTY:
@@ -241,7 +241,7 @@ HRESULT CAdWaypointGroup::scSetProperty(const char *Name, CScValue *Value) {
HRESULT CAdWaypointGroup::Mimic(CAdWaypointGroup *Wpt, float Scale, int X, int Y) {
if (Scale == _lastMimicScale && X == _lastMimicX && Y == _lastMimicY) return S_OK;
- Cleanup();
+ cleanup();
for (int i = 0; i < Wpt->_points.GetSize(); i++) {
int x, y;
diff --git a/engines/wintermute/Ad/AdWaypointGroup.h b/engines/wintermute/Ad/AdWaypointGroup.h
index 1cf44716a5..653d4eae7b 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.h
+++ b/engines/wintermute/Ad/AdWaypointGroup.h
@@ -38,7 +38,7 @@ public:
float _lastMimicScale;
int _lastMimicX;
int _lastMimicY;
- void Cleanup();
+ void cleanup();
HRESULT Mimic(CAdWaypointGroup *Wpt, float Scale = 100.0f, int X = 0, int Y = 0);
DECLARE_PERSISTENT(CAdWaypointGroup, CBObject)
virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 01:50:55 +0000