aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/UI
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/UI')
-rw-r--r--engines/wintermute/UI/UIButton.cpp28
-rw-r--r--engines/wintermute/UI/UIButton.h2
-rw-r--r--engines/wintermute/UI/UIEdit.cpp12
-rw-r--r--engines/wintermute/UI/UIEdit.h2
-rw-r--r--engines/wintermute/UI/UIEntity.cpp22
-rw-r--r--engines/wintermute/UI/UIEntity.h4
-rw-r--r--engines/wintermute/UI/UIObject.cpp2
-rw-r--r--engines/wintermute/UI/UIText.cpp12
-rw-r--r--engines/wintermute/UI/UIText.h2
-rw-r--r--engines/wintermute/UI/UITiledImage.cpp12
-rw-r--r--engines/wintermute/UI/UITiledImage.h2
-rw-r--r--engines/wintermute/UI/UIWindow.cpp20
-rw-r--r--engines/wintermute/UI/UIWindow.h2
13 files changed, 61 insertions, 61 deletions
diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 69809874bf..dffb9532da 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -95,19 +95,19 @@ CUIButton::~CUIButton() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIButton::loadFile(const char *Filename) {
- byte *Buffer = Game->_fileManager->readWholeFile(Filename);
+HRESULT CUIButton::loadFile(const char *filename) {
+ byte *Buffer = Game->_fileManager->readWholeFile(filename);
if (Buffer == NULL) {
- Game->LOG(0, "CUIButton::LoadFile failed for file '%s'", Filename);
+ Game->LOG(0, "CUIButton::LoadFile failed for file '%s'", filename);
return E_FAIL;
}
HRESULT ret;
- _filename = new char [strlen(Filename) + 1];
- strcpy(_filename, Filename);
+ _filename = new char [strlen(filename) + 1];
+ strcpy(_filename, filename);
- if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing BUTTON file '%s'", Filename);
+ if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing BUTTON file '%s'", filename);
delete [] Buffer;
@@ -747,8 +747,8 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
delete _imageDisable;
_imageDisable = new CBSprite(Game);
- const char *Filename = stack->pop()->getString();
- if (!_imageDisable || FAILED(_imageDisable->loadFile(Filename))) {
+ const char *filename = stack->pop()->getString();
+ if (!_imageDisable || FAILED(_imageDisable->loadFile(filename))) {
delete _imageDisable;
_imageDisable = NULL;
stack->pushBool(false);
@@ -788,8 +788,8 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
delete _imageHover;
_imageHover = new CBSprite(Game);
- const char *Filename = stack->pop()->getString();
- if (!_imageHover || FAILED(_imageHover->loadFile(Filename))) {
+ const char *filename = stack->pop()->getString();
+ if (!_imageHover || FAILED(_imageHover->loadFile(filename))) {
delete _imageHover;
_imageHover = NULL;
stack->pushBool(false);
@@ -828,8 +828,8 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
delete _imagePress;
_imagePress = new CBSprite(Game);
- const char *Filename = stack->pop()->getString();
- if (!_imagePress || FAILED(_imagePress->loadFile(Filename))) {
+ const char *filename = stack->pop()->getString();
+ if (!_imagePress || FAILED(_imagePress->loadFile(filename))) {
delete _imagePress;
_imagePress = NULL;
stack->pushBool(false);
@@ -868,8 +868,8 @@ HRESULT CUIButton::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
delete _imageFocus;
_imageFocus = new CBSprite(Game);
- const char *Filename = stack->pop()->getString();
- if (!_imageFocus || FAILED(_imageFocus->loadFile(Filename))) {
+ const char *filename = stack->pop()->getString();
+ if (!_imageFocus || FAILED(_imageFocus->loadFile(filename))) {
delete _imageFocus;
_imageFocus = NULL;
stack->pushBool(false);
diff --git a/engines/wintermute/UI/UIButton.h b/engines/wintermute/UI/UIButton.h
index e89c37aa0c..856afc5be0 100644
--- a/engines/wintermute/UI/UIButton.h
+++ b/engines/wintermute/UI/UIButton.h
@@ -63,7 +63,7 @@ public:
CUITiledImage *_backFocus;
CUIButton(CBGame *inGame = NULL);
virtual ~CUIButton();
- HRESULT loadFile(const char *Filename);
+ HRESULT loadFile(const char *filename);
HRESULT loadBuffer(byte *Buffer, bool Complete = true);
virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index d87eeea630..87d70c8f88 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -94,19 +94,19 @@ CUIEdit::~CUIEdit() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEdit::loadFile(const char *Filename) {
- byte *Buffer = Game->_fileManager->readWholeFile(Filename);
+HRESULT CUIEdit::loadFile(const char *filename) {
+ byte *Buffer = Game->_fileManager->readWholeFile(filename);
if (Buffer == NULL) {
- Game->LOG(0, "CUIEdit::LoadFile failed for file '%s'", Filename);
+ Game->LOG(0, "CUIEdit::LoadFile failed for file '%s'", filename);
return E_FAIL;
}
HRESULT ret;
- _filename = new char [strlen(Filename) + 1];
- strcpy(_filename, Filename);
+ _filename = new char [strlen(filename) + 1];
+ strcpy(_filename, filename);
- if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing EDIT file '%s'", Filename);
+ if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing EDIT file '%s'", filename);
delete [] Buffer;
diff --git a/engines/wintermute/UI/UIEdit.h b/engines/wintermute/UI/UIEdit.h
index 2ee2d3ea3a..0db087e4df 100644
--- a/engines/wintermute/UI/UIEdit.h
+++ b/engines/wintermute/UI/UIEdit.h
@@ -56,7 +56,7 @@ public:
CUIEdit(CBGame *inGame);
virtual ~CUIEdit();
- HRESULT loadFile(const char *Filename);
+ HRESULT loadFile(const char *filename);
HRESULT loadBuffer(byte *Buffer, bool Complete = true);
virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp
index a2b065dd3d..a396ae0560 100644
--- a/engines/wintermute/UI/UIEntity.cpp
+++ b/engines/wintermute/UI/UIEntity.cpp
@@ -49,25 +49,25 @@ CUIEntity::CUIEntity(CBGame *inGame): CUIObject(inGame) {
//////////////////////////////////////////////////////////////////////////
CUIEntity::~CUIEntity() {
- if (_entity) Game->UnregisterObject(_entity);
+ if (_entity) Game->unregisterObject(_entity);
_entity = NULL;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIEntity::loadFile(const char *Filename) {
- byte *Buffer = Game->_fileManager->readWholeFile(Filename);
+HRESULT CUIEntity::loadFile(const char *filename) {
+ byte *Buffer = Game->_fileManager->readWholeFile(filename);
if (Buffer == NULL) {
- Game->LOG(0, "CUIEntity::LoadFile failed for file '%s'", Filename);
+ Game->LOG(0, "CUIEntity::LoadFile failed for file '%s'", filename);
return E_FAIL;
}
HRESULT ret;
- _filename = new char [strlen(Filename) + 1];
- strcpy(_filename, Filename);
+ _filename = new char [strlen(filename) + 1];
+ strcpy(_filename, filename);
- if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing ENTITY container file '%s'", Filename);
+ if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing ENTITY container file '%s'", filename);
delete [] Buffer;
@@ -209,7 +209,7 @@ HRESULT CUIEntity::saveAsText(CBDynBuffer *Buffer, int Indent) {
//////////////////////////////////////////////////////////////////////////
HRESULT CUIEntity::setEntity(const char *filename) {
- if (_entity) Game->UnregisterObject(_entity);
+ if (_entity) Game->unregisterObject(_entity);
_entity = new CAdEntity(Game);
if (!_entity || FAILED(_entity->loadFile(filename))) {
delete _entity;
@@ -219,7 +219,7 @@ HRESULT CUIEntity::setEntity(const char *filename) {
_entity->_nonIntMouseEvents = true;
_entity->_sceneIndependent = true;
_entity->makeFreezable(false);
- Game->RegisterObject(_entity);
+ Game->registerObject(_entity);
}
return S_OK;
}
@@ -270,9 +270,9 @@ HRESULT CUIEntity::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
else if (strcmp(name, "SetEntity") == 0) {
stack->correctParams(1);
- const char *Filename = stack->pop()->getString();
+ const char *filename = stack->pop()->getString();
- if (SUCCEEDED(setEntity(Filename)))
+ if (SUCCEEDED(setEntity(filename)))
stack->pushBool(true);
else
stack->pushBool(false);
diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h
index 670973fdeb..8722ac304b 100644
--- a/engines/wintermute/UI/UIEntity.h
+++ b/engines/wintermute/UI/UIEntity.h
@@ -38,13 +38,13 @@ public:
DECLARE_PERSISTENT(CUIEntity, CUIObject)
CUIEntity(CBGame *inGame);
virtual ~CUIEntity();
- HRESULT loadFile(const char *Filename);
+ HRESULT loadFile(const char *filename);
HRESULT loadBuffer(byte *Buffer, bool Complete);
virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
virtual HRESULT display(int OffsetX = 0, int OffsetY = 0);
CAdEntity *_entity;
- HRESULT setEntity(const char *Filename);
+ HRESULT setEntity(const char *filename);
// scripting interface
virtual CScValue *scGetProperty(const char *name);
diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp
index 7a3cd3e8a0..26d903990d 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/UI/UIObject.cpp
@@ -163,7 +163,7 @@ HRESULT CUIObject::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
stack->correctParams(1);
CScValue *Val = stack->pop();
- /* const char *Filename = */ Val->getString();
+ /* const char *filename = */ Val->getString();
delete _image;
_image = NULL;
diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index 0d7966188e..afb6a6976c 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -95,19 +95,19 @@ HRESULT CUIText::display(int OffsetX, int OffsetY) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::loadFile(const char *Filename) {
- byte *Buffer = Game->_fileManager->readWholeFile(Filename);
+HRESULT CUIText::loadFile(const char *filename) {
+ byte *Buffer = Game->_fileManager->readWholeFile(filename);
if (Buffer == NULL) {
- Game->LOG(0, "CUIText::LoadFile failed for file '%s'", Filename);
+ Game->LOG(0, "CUIText::LoadFile failed for file '%s'", filename);
return E_FAIL;
}
HRESULT ret;
- _filename = new char [strlen(Filename) + 1];
- strcpy(_filename, Filename);
+ _filename = new char [strlen(filename) + 1];
+ strcpy(_filename, filename);
- if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing STATIC file '%s'", Filename);
+ if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing STATIC file '%s'", filename);
delete [] Buffer;
diff --git a/engines/wintermute/UI/UIText.h b/engines/wintermute/UI/UIText.h
index 1f5029e4a6..5ef3c85df9 100644
--- a/engines/wintermute/UI/UIText.h
+++ b/engines/wintermute/UI/UIText.h
@@ -43,7 +43,7 @@ public:
virtual ~CUIText();
TTextAlign _textAlign;
TVerticalAlign _verticalAlign;
- HRESULT loadFile(const char *Filename);
+ HRESULT loadFile(const char *filename);
HRESULT loadBuffer(byte *Buffer, bool Complete = true);
virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
diff --git a/engines/wintermute/UI/UITiledImage.cpp b/engines/wintermute/UI/UITiledImage.cpp
index e7734acdc5..d0f9cdb0f2 100644
--- a/engines/wintermute/UI/UITiledImage.cpp
+++ b/engines/wintermute/UI/UITiledImage.cpp
@@ -119,19 +119,19 @@ HRESULT CUITiledImage::display(int X, int Y, int Width, int Height) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUITiledImage::loadFile(const char *Filename) {
- byte *Buffer = Game->_fileManager->readWholeFile(Filename);
+HRESULT CUITiledImage::loadFile(const char *filename) {
+ byte *Buffer = Game->_fileManager->readWholeFile(filename);
if (Buffer == NULL) {
- Game->LOG(0, "CUITiledImage::LoadFile failed for file '%s'", Filename);
+ Game->LOG(0, "CUITiledImage::LoadFile failed for file '%s'", filename);
return E_FAIL;
}
HRESULT ret;
- _filename = new char [strlen(Filename) + 1];
- strcpy(_filename, Filename);
+ _filename = new char [strlen(filename) + 1];
+ strcpy(_filename, filename);
- if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing TILED_IMAGE file '%s'", Filename);
+ if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing TILED_IMAGE file '%s'", filename);
delete [] Buffer;
diff --git a/engines/wintermute/UI/UITiledImage.h b/engines/wintermute/UI/UITiledImage.h
index d571f1354f..16712746c5 100644
--- a/engines/wintermute/UI/UITiledImage.h
+++ b/engines/wintermute/UI/UITiledImage.h
@@ -38,7 +38,7 @@ class CUITiledImage : public CBObject {
public:
DECLARE_PERSISTENT(CUITiledImage, CBObject)
void correctSize(int *Width, int *Height);
- HRESULT loadFile(const char *Filename);
+ HRESULT loadFile(const char *filename);
HRESULT loadBuffer(byte *Buffer, bool Complete = true);
virtual HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index 5ed33ffd7a..fd36971847 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -200,19 +200,19 @@ HRESULT CUIWindow::display(int OffsetX, int OffsetY) {
//////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::loadFile(const char *Filename) {
- byte *Buffer = Game->_fileManager->readWholeFile(Filename);
+HRESULT CUIWindow::loadFile(const char *filename) {
+ byte *Buffer = Game->_fileManager->readWholeFile(filename);
if (Buffer == NULL) {
- Game->LOG(0, "CUIWindow::LoadFile failed for file '%s'", Filename);
+ Game->LOG(0, "CUIWindow::LoadFile failed for file '%s'", filename);
return E_FAIL;
}
HRESULT ret;
- _filename = new char [strlen(Filename) + 1];
- strcpy(_filename, Filename);
+ _filename = new char [strlen(filename) + 1];
+ strcpy(_filename, filename);
- if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing WINDOW file '%s'", Filename);
+ if (FAILED(ret = loadBuffer(Buffer, true))) Game->LOG(0, "Error parsing WINDOW file '%s'", filename);
delete [] Buffer;
@@ -538,7 +538,7 @@ HRESULT CUIWindow::loadBuffer(byte *Buffer, bool Complete) {
default:
- if (FAILED(Game->WindowLoadHook(this, (char **)&Buffer, (char **)params))) {
+ if (FAILED(Game->windowLoadHook(this, (char **)&Buffer, (char **)params))) {
cmd = PARSERR_GENERIC;
}
}
@@ -735,8 +735,8 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
delete _imageInactive;
_imageInactive = new CBSprite(Game);
- const char *Filename = stack->pop()->getString();
- if (!_imageInactive || FAILED(_imageInactive->loadFile(Filename))) {
+ const char *filename = stack->pop()->getString();
+ if (!_imageInactive || FAILED(_imageInactive->loadFile(filename))) {
delete _imageInactive;
_imageInactive = NULL;
stack->pushBool(false);
@@ -910,7 +910,7 @@ HRESULT CUIWindow::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
}
stack->pushNULL();
return S_OK;
- } else if SUCCEEDED(Game->WindowScriptMethodHook(this, script, stack, name)) return S_OK;
+ } else if SUCCEEDED(Game->windowScriptMethodHook(this, script, stack, name)) return S_OK;
else return CUIObject::scCallMethod(script, stack, thisStack, name);
}
diff --git a/engines/wintermute/UI/UIWindow.h b/engines/wintermute/UI/UIWindow.h
index 80dcda9333..c29038860d 100644
--- a/engines/wintermute/UI/UIWindow.h
+++ b/engines/wintermute/UI/UIWindow.h
@@ -73,7 +73,7 @@ public:
virtual bool handleKeypress(Common::Event *event, bool printable = false);
CBArray<CUIObject *, CUIObject *> _widgets;
TTextAlign _titleAlign;
- HRESULT loadFile(const char *Filename);
+ HRESULT loadFile(const char *filename);
HRESULT loadBuffer(byte *Buffer, bool Complete = true);
CUITiledImage *_backInactive;
CBFont *_fontInactive;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 16:36:23 +0000