diff options
| author | Marisa-Chan | 2014-12-19 17:06:47 +0600 |
|---|---|---|
| committer | Marisa-Chan | 2014-12-19 17:06:47 +0600 |
| commit | e934ffdd5e7719f80703d6874bbdb8618f1606ea (patch) | |
| tree | c5cfbf0235588ad6c6f3fecbec0506406cfe804d /engines/zvision/scripting | |
| parent | c8f8da030845c01453652364a48ae0449d62b890 (diff) | |
| download | scummvm-rg350-e934ffdd5e7719f80703d6874bbdb8618f1606ea.tar.gz scummvm-rg350-e934ffdd5e7719f80703d6874bbdb8618f1606ea.tar.bz2 scummvm-rg350-e934ffdd5e7719f80703d6874bbdb8618f1606ea.zip | |
ZVISION: Fix uninitialized scalar field (CID 1257089)
Diffstat (limited to 'engines/zvision/scripting')
| -rw-r--r-- | engines/zvision/scripting/puzzle.h | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/scr_file_handling.cpp | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/script_manager.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h index 4123880835..7d64357b0a 100644 --- a/engines/zvision/scripting/puzzle.h +++ b/engines/zvision/scripting/puzzle.h @@ -31,7 +31,7 @@ namespace ZVision { struct Puzzle { - Puzzle() : key(0) {} + Puzzle() : key(0), addedBySetState(false) {} ~Puzzle() { for (Common::List<ResultAction *>::iterator iter = resultActions.begin(); iter != resultActions.end(); ++iter) { diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp index 56d0c3bd7f..c117da5ec2 100644 --- a/engines/zvision/scripting/scr_file_handling.cpp +++ b/engines/zvision/scripting/scr_file_handling.cpp @@ -96,7 +96,7 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre trimCommentsAndWhiteSpace(&line); } - puzzle->addedBySetState = 0; + puzzle->addedBySetState = false; } bool ScriptManager::parseCriteria(Common::SeekableReadStream &stream, Common::List<Common::List<Puzzle::CriteriaEntry> > &criteriaList) const { diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp index 65077dfd12..4c1e69072d 100644 --- a/engines/zvision/scripting/script_manager.cpp +++ b/engines/zvision/scripting/script_manager.cpp @@ -97,7 +97,7 @@ bool ScriptManager::execScope(ScriptScope &scope) { scope.scopeQueue->clear(); for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter) - (*PuzzleIter)->addedBySetState = 0; + (*PuzzleIter)->addedBySetState = false; if (scope.procCount < 2 || getStateValue(StateKey_ExecScopeStyle)) { for (PuzzleList::iterator PuzzleIter = scope.puzzles.begin(); PuzzleIter != scope.puzzles.end(); ++PuzzleIter) |