[Scummvm-cvs-logs] scummvm master -> b51852c641cf4d558d035d7d1dd9309d6d238647
bluegr
bluegr at gmail.com
Mon Dec 22 01:59:15 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b51852c641 ZVISION: Error out when the game string file isn't found
Commit: b51852c641cf4d558d035d7d1dd9309d6d238647
https://github.com/scummvm/scummvm/commit/b51852c641cf4d558d035d7d1dd9309d6d238647
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-22T02:58:18+02:00
Commit Message:
ZVISION: Error out when the game string file isn't found
Changed paths:
engines/zvision/text/string_manager.cpp
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index ec10b62..6b870d0 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -43,21 +43,18 @@ 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;
+ error("%s does not exist. String parsing failed", fileName.c_str());
}
+
uint lineNumber = 0;
while (!file.eos()) {
_lines[lineNumber] = readWideLine(file);
More information about the Scummvm-git-logs
mailing list