diff options
| author | Einar Johan Trøan Sømåen | 2012-07-29 02:30:26 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-29 02:34:44 +0200 |
| commit | 9b5cf8f1bafd5aa0dba9194a8f04e58724652891 (patch) | |
| tree | 6a205943845259a213532476d4dc9ee49a898cf7 /engines/wintermute/ui | |
| parent | b214041539559e65b89b3270439970fd7173dcbe (diff) | |
| download | scummvm-rg350-9b5cf8f1bafd5aa0dba9194a8f04e58724652891.tar.gz scummvm-rg350-9b5cf8f1bafd5aa0dba9194a8f04e58724652891.tar.bz2 scummvm-rg350-9b5cf8f1bafd5aa0dba9194a8f04e58724652891.zip | |
WINTERMUTE: Introduce a Singleton-class for holding registry/filemanager.
Diffstat (limited to 'engines/wintermute/ui')
| -rw-r--r-- | engines/wintermute/ui/ui_button.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_edit.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_entity.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_text.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_tiled_image.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/ui/ui_window.cpp | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp index 3352f9355d..fb125ef94c 100644 --- a/engines/wintermute/ui/ui_button.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -102,7 +102,7 @@ UIButton::~UIButton() { //////////////////////////////////////////////////////////////////////////
bool UIButton::loadFile(const char *filename) {
- byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
+ byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == NULL) {
_gameRef->LOG(0, "UIButton::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
@@ -203,7 +203,7 @@ bool UIButton::loadBuffer(byte *buffer, bool complete) { byte *params;
int cmd = 2;
- BaseParser parser(_gameRef);
+ BaseParser parser;
if (complete) {
if (parser.getCommand((char **)&buffer, commands, (char **)¶ms) != TOKEN_BUTTON) {
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index 1483c46475..88c68a3314 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -93,7 +93,7 @@ UIEdit::~UIEdit() { //////////////////////////////////////////////////////////////////////////
bool UIEdit::loadFile(const char *filename) {
- byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
+ byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == NULL) {
_gameRef->LOG(0, "UIEdit::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
@@ -166,7 +166,7 @@ bool UIEdit::loadBuffer(byte *buffer, bool complete) { byte *params;
int cmd = 2;
- BaseParser parser(_gameRef);
+ BaseParser parser;
if (complete) {
if (parser.getCommand((char **)&buffer, commands, (char **)¶ms) != TOKEN_EDIT) {
diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp index 71b573fc92..8008e96050 100644 --- a/engines/wintermute/ui/ui_entity.cpp +++ b/engines/wintermute/ui/ui_entity.cpp @@ -58,7 +58,7 @@ UIEntity::~UIEntity() { //////////////////////////////////////////////////////////////////////////
bool UIEntity::loadFile(const char *filename) {
- byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
+ byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == NULL) {
_gameRef->LOG(0, "UIEntity::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
@@ -108,7 +108,7 @@ bool UIEntity::loadBuffer(byte *buffer, bool complete) { byte *params;
int cmd = 2;
- BaseParser parser(_gameRef);
+ BaseParser parser;
if (complete) {
if (parser.getCommand((char **)&buffer, commands, (char **)¶ms) != TOKEN_ENTITY_CONTAINER) {
diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp index 5ead4ad6f3..56fea4edf9 100644 --- a/engines/wintermute/ui/ui_text.cpp +++ b/engines/wintermute/ui/ui_text.cpp @@ -103,7 +103,7 @@ bool UIText::display(int offsetX, int offsetY) { //////////////////////////////////////////////////////////////////////////
bool UIText::loadFile(const char *filename) {
- byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
+ byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == NULL) {
_gameRef->LOG(0, "UIText::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
@@ -172,7 +172,7 @@ bool UIText::loadBuffer(byte *buffer, bool complete) { byte *params;
int cmd = 2;
- BaseParser parser(_gameRef);
+ BaseParser parser;
if (complete) {
if (parser.getCommand((char **)&buffer, commands, (char **)¶ms) != TOKEN_STATIC) {
diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index f54ba7843e..62c07bf1d7 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -121,7 +121,7 @@ bool UITiledImage::display(int x, int y, int width, int height) { //////////////////////////////////////////////////////////////////////////
bool UITiledImage::loadFile(const char *filename) {
- byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
+ byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == NULL) {
_gameRef->LOG(0, "UITiledImage::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
@@ -181,7 +181,7 @@ bool UITiledImage::loadBuffer(byte *buffer, bool complete) { byte *params;
int cmd;
- BaseParser parser(_gameRef);
+ BaseParser parser;
bool hTiles = false, vTiles = false;
int h1 = 0, h2 = 0, h3 = 0;
int v1 = 0, v2 = 0, v3 = 0;
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index 0a2ec6b389..4f3ee9ff43 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -238,7 +238,7 @@ bool UIWindow::display(int offsetX, int offsetY) { //////////////////////////////////////////////////////////////////////////
bool UIWindow::loadFile(const char *filename) {
- byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
+ byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);
if (buffer == NULL) {
_gameRef->LOG(0, "UIWindow::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
@@ -339,7 +339,7 @@ bool UIWindow::loadBuffer(byte *buffer, bool complete) { byte *params;
int cmd = 2;
- BaseParser parser(_gameRef);
+ BaseParser parser;
int fadeR = 0, fadeG = 0, fadeB = 0, fadeA = 0;
int ar = 0, ag = 0, ab = 0, alpha = 0;
|