aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Base/BRegion.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-18 18:25:09 +0200
committerEinar Johan Trøan Sømåen2012-07-18 18:25:09 +0200
commit301af17d4c8b7746fde6592dce558d968753c3f0 (patch)
tree3ab2cbedb1288f1e7b84f8fcccccc4dbeb9cc1bb /engines/wintermute/Base/BRegion.cpp
parent23c9bff22637c5bb1e3c3caf93adab7088a2e711 (diff)
downloadscummvm-rg350-301af17d4c8b7746fde6592dce558d968753c3f0.tar.gz
scummvm-rg350-301af17d4c8b7746fde6592dce558d968753c3f0.tar.bz2
scummvm-rg350-301af17d4c8b7746fde6592dce558d968753c3f0.zip
WINTERMUTE: Rename the Game-variable to _gameRef/gameRef
Diffstat (limited to 'engines/wintermute/Base/BRegion.cpp')
-rw-r--r--engines/wintermute/Base/BRegion.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/Base/BRegion.cpp
index 65ba2c8825..1db15abae0 100644
--- a/engines/wintermute/Base/BRegion.cpp
+++ b/engines/wintermute/Base/BRegion.cpp
@@ -96,9 +96,9 @@ bool CBRegion::pointInRegion(int x, int y) {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CBRegion::loadFile(const char *filename) {
- byte *buffer = Game->_fileManager->readWholeFile(filename);
+ byte *buffer = _gameRef->_fileManager->readWholeFile(filename);
if (buffer == NULL) {
- Game->LOG(0, "CBRegion::LoadFile failed for file '%s'", filename);
+ _gameRef->LOG(0, "CBRegion::LoadFile failed for file '%s'", filename);
return STATUS_FAILED;
}
@@ -107,7 +107,7 @@ ERRORCODE CBRegion::loadFile(const char *filename) {
_filename = new char [strlen(filename) + 1];
strcpy(_filename, filename);
- if (DID_FAIL(ret = loadBuffer(buffer, true))) Game->LOG(0, "Error parsing REGION file '%s'", filename);
+ if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing REGION file '%s'", filename);
delete [] buffer;
@@ -143,11 +143,11 @@ ERRORCODE CBRegion::loadBuffer(byte *buffer, bool complete) {
byte *params;
int cmd;
- CBParser parser(Game);
+ CBParser parser(_gameRef);
if (complete) {
if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_REGION) {
- Game->LOG(0, "'REGION' keyword expected.");
+ _gameRef->LOG(0, "'REGION' keyword expected.");
return STATUS_FAILED;
}
buffer = params;
@@ -197,7 +197,7 @@ ERRORCODE CBRegion::loadBuffer(byte *buffer, bool complete) {
}
}
if (cmd == PARSERR_TOKENNOTFOUND) {
- Game->LOG(0, "Syntax error in REGION definition");
+ _gameRef->LOG(0, "Syntax error in REGION definition");
return STATUS_FAILED;
}