From 95164a8f249ef5f154d219237af2af4ad78e4bac Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Wed, 17 Apr 2013 20:06:53 +0200 Subject: WINTERMUTE: Avoid including BaseGame in BaseRegion. --- engines/wintermute/base/base_region.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines') diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp index a3a23f770a..8bdb726cde 100644 --- a/engines/wintermute/base/base_region.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_region.h" #include "engines/wintermute/base/base_parser.h" #include "engines/wintermute/base/base_dynamic_buffer.h" -#include "engines/wintermute/base/base_game.h" +#include "engines/wintermute/base/base_engine.h" #include "engines/wintermute/base/scriptables/script.h" #include "engines/wintermute/base/scriptables/script_stack.h" #include "engines/wintermute/base/scriptables/script_value.h" @@ -104,7 +104,7 @@ bool BaseRegion::pointInRegion(int x, int y) { bool BaseRegion::loadFile(const char *filename) { byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename); if (buffer == nullptr) { - _gameRef->LOG(0, "BaseRegion::LoadFile failed for file '%s'", filename); + BaseEngine::LOG(0, "BaseRegion::LoadFile failed for file '%s'", filename); return STATUS_FAILED; } @@ -113,7 +113,7 @@ bool BaseRegion::loadFile(const char *filename) { setFilename(filename); if (DID_FAIL(ret = loadBuffer(buffer, true))) { - _gameRef->LOG(0, "Error parsing REGION file '%s'", filename); + BaseEngine::LOG(0, "Error parsing REGION file '%s'", filename); } @@ -154,7 +154,7 @@ bool BaseRegion::loadBuffer(byte *buffer, bool complete) { if (complete) { if (parser.getCommand((char **)&buffer, commands, (char **)¶ms) != TOKEN_REGION) { - _gameRef->LOG(0, "'REGION' keyword expected."); + BaseEngine::LOG(0, "'REGION' keyword expected."); return STATUS_FAILED; } buffer = params; @@ -206,7 +206,7 @@ bool BaseRegion::loadBuffer(byte *buffer, bool complete) { } } if (cmd == PARSERR_TOKENNOTFOUND) { - _gameRef->LOG(0, "Syntax error in REGION definition"); + BaseEngine::LOG(0, "Syntax error in REGION definition"); return STATUS_FAILED; } -- cgit v1.2.3