aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichiesams2013-07-29 21:54:10 -0500
committerrichiesams2013-08-04 13:32:52 -0500
commitd4ae293f881ae07afd243173ddd11d5b0cfa12b3 (patch)
tree49e86ddf9ff59099cb51857c22d37ad8ac597f54
parent2063cb711dce1894125d1cc6bab5a2d27a163be3 (diff)
downloadscummvm-rg350-d4ae293f881ae07afd243173ddd11d5b0cfa12b3.tar.gz
scummvm-rg350-d4ae293f881ae07afd243173ddd11d5b0cfa12b3.tar.bz2
scummvm-rg350-d4ae293f881ae07afd243173ddd11d5b0cfa12b3.zip
ZVISION: Rename parseResult() to parseResults()
-rw-r--r--engines/zvision/scr_file_handling.cpp2
-rw-r--r--engines/zvision/script_manager.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index cebb57a786..ca66e3bccd 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -136,7 +136,7 @@ bool ScriptManager::parseCriteria(Criteria *criteria, Common::SeekableReadStream
return true;
}
-void ScriptManager::parseResult(Common::SeekableReadStream &stream, Common::List<ResultAction *> &actionList) const {
+void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::List<ResultAction *> &actionList) const {
// Loop until we find the closing brace
Common::String line = stream.readLine();
trimCommentsAndWhiteSpace(&line);
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index ec16477b92..1b12a0693d 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -110,7 +110,7 @@ private:
* @param stream Scr file stream
* @return Created Results object
*/
- void parseResult(Common::SeekableReadStream &stream, Common::List<ResultAction *> &actionList) const;
+ void parseResults(Common::SeekableReadStream &stream, Common::List<ResultAction *> &actionList) const;
/**
* Helper method for parsePuzzle. Parses the stream into a bitwise or of the StateFlags enum