aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichiesams2013-07-03 15:46:36 -0500
committerrichiesams2013-08-04 13:31:56 -0500
commit0b9dce40a08020499aab20d8c9d967f53f7d84ea (patch)
tree76eb96560aea84540e2f6527b591c3b46b26ce3f
parent1710468121648d494a393f7176c81027fec573c4 (diff)
downloadscummvm-rg350-0b9dce40a08020499aab20d8c9d967f53f7d84ea.tar.gz
scummvm-rg350-0b9dce40a08020499aab20d8c9d967f53f7d84ea.tar.bz2
scummvm-rg350-0b9dce40a08020499aab20d8c9d967f53f7d84ea.zip
ZVISION: Fix usage of Puzzle struct to use 'key' instead of 'id'
-rw-r--r--engines/zvision/scr_file_handling.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/zvision/scr_file_handling.cpp b/engines/zvision/scr_file_handling.cpp
index d18e042815..073d0eaaa4 100644
--- a/engines/zvision/scr_file_handling.cpp
+++ b/engines/zvision/scr_file_handling.cpp
@@ -52,7 +52,7 @@ void ScriptManager::parseScrFile(Common::String fileName) {
if (line.matchString("puzzle:*", true)) {
Puzzle puzzle;
- sscanf(line.c_str(),"puzzle:%u",&(puzzle.id));
+ sscanf(line.c_str(),"puzzle:%u",&(puzzle.key));
parsePuzzle(puzzle, file);
_puzzles.push_back(puzzle);
@@ -95,7 +95,7 @@ Criteria ScriptManager::parseCriteria(Common::SeekableReadStream &stream) const
// Parse the id out of the first token
token = tokenizer.nextToken();
- sscanf(token.c_str(), "[%u]", &(criteria.id));
+ sscanf(token.c_str(), "[%u]", &(criteria.key));
// Parse the operator out of the second token
token = tokenizer.nextToken();