[Scummvm-cvs-logs] scummvm master -> d75fbe79f064e3ee017764024aac173a7d599583

bluegr bluegr at gmail.com
Fri Jan 23 02:05:50 CET 2015


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:
d75fbe79f0 ZVISION: Error out when a script file can't be found or be parsed


Commit: d75fbe79f064e3ee017764024aac173a7d599583
    https://github.com/scummvm/scummvm/commit/d75fbe79f064e3ee017764024aac173a7d599583
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-23T03:04:50+02:00

Commit Message:
ZVISION: Error out when a script file can't be found or be parsed

This should be an error, as we've effectively reached a non-existing
scene (such as in bug #6780), or we haven't parsed script files of a
scene fully, thus unexpected behavior will likely occur

Changed paths:
    engines/zvision/scripting/scr_file_handling.cpp



diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index b9cafa7..b047c14 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -47,15 +47,13 @@ namespace ZVision {
 void ScriptManager::parseScrFile(const Common::String &fileName, ScriptScope &scope) {
 	Common::File file;
 	if (!_engine->getSearchManager()->openFile(file, fileName)) {
-		warning("Script file not found: %s", fileName.c_str());
-		return;
+		error("Script file not found: %s", fileName.c_str());
 	}
 
 	while (!file.eos()) {
 		Common::String line = file.readLine();
 		if (file.err()) {
-			warning("Error parsing scr file: %s", fileName.c_str());
-			return;
+			error("Error parsing scr file: %s", fileName.c_str());
 		}
 
 		trimCommentsAndWhiteSpace(&line);






More information about the Scummvm-git-logs mailing list