Merge branch 'master' into mm

Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h

1 files changed, 5 insertions, 9 deletions

diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index ec10b6220c..c62e18f4b0 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -43,21 +43,17 @@ StringManager::~StringManager() {
 }
 
 void StringManager::initialize(ZVisionGameId gameId) {
-	if (gameId == GID_NEMESIS) {
-		// TODO: Check this hardcoded filename against all versions of Nemesis
+	if (gameId == GID_NEMESIS)
 		loadStrFile("nemesis.str");
-	} else if (gameId == GID_GRANDINQUISITOR) {
-		// TODO: Check this hardcoded filename against all versions of Grand Inquisitor
+	else if (gameId == GID_GRANDINQUISITOR)
 		loadStrFile("inquis.str");
-	}
 }
 
 void StringManager::loadStrFile(const Common::String &fileName) {
 	Common::File file;
-	if (!_engine->getSearchManager()->openFile(file, fileName)) {
-		warning("%s does not exist. String parsing failed", fileName.c_str());
-		return;
-	}
+	if (!_engine->getSearchManager()->openFile(file, fileName))
+		error("%s does not exist. String parsing failed", fileName.c_str());
+
 	uint lineNumber = 0;
 	while (!file.eos()) {
 		_lines[lineNumber] = readWideLine(file);