diff options
Diffstat (limited to 'engines/wintermute/UI')
| -rw-r--r-- | engines/wintermute/UI/UIWindow.cpp | 12 | ||||
| -rw-r--r-- | engines/wintermute/UI/UIWindow.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp index 8b6ed746af..1998b380cd 100644 --- a/engines/wintermute/UI/UIWindow.cpp +++ b/engines/wintermute/UI/UIWindow.cpp @@ -89,7 +89,7 @@ CUIWindow::CUIWindow(CBGame *inGame): CUIObject(inGame) { //////////////////////////////////////////////////////////////////////////
CUIWindow::~CUIWindow() {
- Close();
+ close();
cleanup();
}
@@ -773,7 +773,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *Script, CScStack *Stack, CScStack *Th //////////////////////////////////////////////////////////////////////////
else if (strcmp(Name, "Close") == 0) {
Stack->CorrectParams(0);
- Stack->PushBool(SUCCEEDED(Close()));
+ Stack->PushBool(SUCCEEDED(close()));
return S_OK;
}
@@ -1070,7 +1070,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) { if (Value->GetBool())
GoExclusive();
else {
- Close();
+ close();
_visible = true;
}
return S_OK;
@@ -1083,7 +1083,7 @@ HRESULT CUIWindow::scSetProperty(const char *Name, CScValue *Value) { if (Value->GetBool())
GoSystemExclusive();
else {
- Close();
+ close();
_visible = true;
}
return S_OK;
@@ -1254,7 +1254,7 @@ HRESULT CUIWindow::GoSystemExclusive() { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::Close() {
+HRESULT CUIWindow::close() {
if (_mode == WINDOW_SYSTEM_EXCLUSIVE) {
Game->Unfreeze();
}
@@ -1273,7 +1273,7 @@ HRESULT CUIWindow::listen(CBScriptHolder *param1, uint32 param2) { switch (obj->_type) {
case UI_BUTTON:
- if (scumm_stricmp(obj->_name, "close") == 0) Close();
+ if (scumm_stricmp(obj->_name, "close") == 0) close();
else return CBObject::listen(param1, param2);
break;
default:
diff --git a/engines/wintermute/UI/UIWindow.h b/engines/wintermute/UI/UIWindow.h index ed81ef9d06..adc2a89d21 100644 --- a/engines/wintermute/UI/UIWindow.h +++ b/engines/wintermute/UI/UIWindow.h @@ -53,7 +53,7 @@ public: virtual bool handleMouseWheel(int Delta);
CUIWindow *_shieldWindow;
CUIButton *_shieldButton;
- HRESULT Close();
+ HRESULT close();
HRESULT GoSystemExclusive();
HRESULT GoExclusive();
TWindowMode _mode;
|