From b1eb6da6fab27b215ffd339ccef7e43169ad0a17 Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Tue, 16 Aug 2016 10:40:46 +0200 Subject: MACVENTURE: Add prefixes to error messages --- engines/macventure/container.h | 2 +- engines/macventure/datafiles.cpp | 2 +- engines/macventure/gui.cpp | 8 ++++---- engines/macventure/macventure.cpp | 6 +++--- engines/macventure/menu.cpp | 2 +- engines/macventure/saveload.cpp | 2 +- engines/macventure/stringtable.h | 2 +- engines/macventure/world.cpp | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'engines/macventure') diff --git a/engines/macventure/container.h b/engines/macventure/container.h index b65c1578cd..6b9c6462ca 100644 --- a/engines/macventure/container.h +++ b/engines/macventure/container.h @@ -46,7 +46,7 @@ public: _filename = filename; if (!_file.open(_filename)) - error("Could not open %s", _filename.c_str()); + error("CONTAINER: Could not open %s", _filename.c_str()); _res = _file.readStream(_file.size()); _header = _res->readUint32BE(); diff --git a/engines/macventure/datafiles.cpp b/engines/macventure/datafiles.cpp index a86e922193..9532434f03 100644 --- a/engines/macventure/datafiles.cpp +++ b/engines/macventure/datafiles.cpp @@ -67,7 +67,7 @@ Common::String windowTypeName(MVWindowType windowType) { void MacVentureEngine::loadDataBundle() { _dataBundle = Common::makeZipArchive(MACVENTURE_DATA_BUNDLE); if (!_dataBundle) - error("Couldn't load data bundle '%s'.", MACVENTURE_DATA_BUNDLE.c_str()); + error("ENGINE: Couldn't load data bundle '%s'.", MACVENTURE_DATA_BUNDLE.c_str()); } Common::SeekableReadStream *MacVentureEngine::getBorderFile(MVWindowType windowType, bool isActive) { diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 310cf92443..264e577792 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -152,21 +152,21 @@ void Gui::initGUI() { // Menu _menu = _wm.addMenu(); if (!loadMenus()) - error("Could not load menus"); + error("GUI: Could not load menus"); _menu->setCommandsCallback(menuCommandsCallback, this); _menu->calcDimensions(); loadGraphics(); if (!loadWindows()) - error("Could not load windows"); + error("GUI: Could not load windows"); initWindows(); assignObjReferences(); if (!loadControls()) - error("Could not load controls"); + error("GUI: Could not load controls"); draw(); @@ -960,7 +960,7 @@ WindowData & Gui::findWindowData(WindowReference reference) { if (iter->refcon == reference) return *iter; - error("Could not locate the desired window data"); + error("GUI: Could not locate the desired window data"); } Graphics::MacWindow * Gui::findWindow(WindowReference reference) { diff --git a/engines/macventure/macventure.cpp b/engines/macventure/macventure.cpp index 0542665d3c..ef2b7fadb0 100644 --- a/engines/macventure/macventure.cpp +++ b/engines/macventure/macventure.cpp @@ -143,11 +143,11 @@ Common::Error MacVentureEngine::run() { _resourceManager = new Common::MacResManager(); if (!_resourceManager->open(getGameFileName())) - error("Could not open %s as a resource fork", getGameFileName()); + error("ENGINE: Could not open %s as a resource fork", getGameFileName()); // Engine-wide loading if (!loadGlobalSettings()) - error("Could not load the engine settings"); + error("ENGINE: Could not load the engine settings"); _oldTextEncoding = !loadTextHuffman(); @@ -170,7 +170,7 @@ Common::Error MacVentureEngine::run() { int directSaveSlotLoading = ConfMan.getInt("save_slot"); if (directSaveSlotLoading >= 0) { if (loadGameState(directSaveSlotLoading).getCode() != Common::kNoError) { - error("Could not load game from slot '%d'", directSaveSlotLoading); + error("ENGINE: Could not load game from slot '%d'", directSaveSlotLoading); } } else { setNewGameState(); diff --git a/engines/macventure/menu.cpp b/engines/macventure/menu.cpp index dd3c495e10..ea80104959 100644 --- a/engines/macventure/menu.cpp +++ b/engines/macventure/menu.cpp @@ -35,7 +35,7 @@ Menu::Menu(MacVentureEngine *engine, Graphics::MacWindowManager *wm) { _menu = _wm->addMenu(); if (!loadMenuData()) - error("Could not load menu data from %s", _engine->getGameFileName()); + error("GUI: Could not load menu data from %s", _engine->getGameFileName()); } Menu::~Menu() { diff --git a/engines/macventure/saveload.cpp b/engines/macventure/saveload.cpp index 54009a1127..a341487cf1 100644 --- a/engines/macventure/saveload.cpp +++ b/engines/macventure/saveload.cpp @@ -75,7 +75,7 @@ Common::Error MacVentureEngine::loadGameState(int slot) { Common::String saveFileName = Common::String::format("%s.%03d", _targetName.c_str(), slot); Common::InSaveFile *file; if(!(file = getSaveFileManager()->openForLoading(saveFileName))) { - error("missing savegame file %s", saveFileName.c_str()); + error("ENGINE: Missing savegame file %s", saveFileName.c_str()); } _world->loadGameFrom(file); reset(); diff --git a/engines/macventure/stringtable.h b/engines/macventure/stringtable.h index 0a5419e235..a03fb28a0d 100644 --- a/engines/macventure/stringtable.h +++ b/engines/macventure/stringtable.h @@ -47,7 +47,7 @@ public: _id = id; if (!loadStrings()) - error("Could not load string table %x", id); + error("ENGINE: Could not load string table %x", id); } ~StringTable() { diff --git a/engines/macventure/world.cpp b/engines/macventure/world.cpp index 35cfbd1533..4ef55094bb 100644 --- a/engines/macventure/world.cpp +++ b/engines/macventure/world.cpp @@ -37,11 +37,11 @@ void World::startNewGame() { delete _saveGame; if ((_startGameFileName = _engine->getStartGameFileName()) == "") - error("Could not load initial game configuration"); + error("WORLD: Could not load initial game configuration"); Common::File saveGameFile; if (!saveGameFile.open(_startGameFileName)) - error("Could not load initial game configuration"); + error("WORLD: Could not load initial game configuration"); debug("Loading save game state from %s", _startGameFileName.c_str()); Common::SeekableReadStream *saveGameRes = saveGameFile.readStream(saveGameFile.size()); -- cgit v1.2.3