diff options
| author | Strangerke | 2012-05-03 19:35:53 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-03-28 17:36:57 +0200 |
| commit | 9fc6e8f370ded2e777dca5d1150ced02c82ae9b8 (patch) | |
| tree | 8fa2735226d33998feb9d5675a723cc6e2b8eb21 | |
| parent | ca2534dd6b5f6d3f4e8f2e440799bcada739041f (diff) | |
| download | scummvm-rg350-9fc6e8f370ded2e777dca5d1150ced02c82ae9b8.tar.gz scummvm-rg350-9fc6e8f370ded2e777dca5d1150ced02c82ae9b8.tar.bz2 scummvm-rg350-9fc6e8f370ded2e777dca5d1150ced02c82ae9b8.zip | |
LILLIPUT: Fix some uninitialized variables reported by Valgrind (Thanks Hkz for reporting)
| -rw-r--r-- | engines/lilliput/lilliput.cpp | 2 | ||||
| -rw-r--r-- | engines/lilliput/script.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index 860d2e1cc2..3ccf2dd72e 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -150,6 +150,7 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd) _byte12FE4 = 0xFF; _byte12FE3 = 0; _byte16F08 = 0; + _byte16C9F = 0; _currentScriptCharacter = 0; _currentScriptCharacterPosition = 0; @@ -165,6 +166,7 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd) _word15AC2 = 0; _displayStringIndex = 0; _word1289D = 0; + _numCharacters = 0; _saveFlag = false; _byte16F07_menuId = 0; diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp index b5f34e1868..9942f24d5e 100644 --- a/engines/lilliput/script.cpp +++ b/engines/lilliput/script.cpp @@ -2219,8 +2219,10 @@ void LilliputScript::OC_sub17E07() { _currScript->readUint16LE(); } + void LilliputScript::OC_sub17E15() { debugC(1, kDebugScript, "OC_sub17E15()"); + if ((_word1881B & 0xFF) == 0xFF) { OC_sub17DB9(); return; @@ -2299,6 +2301,7 @@ void LilliputScript::OC_resetByte1714E() { void LilliputScript::OC_deleteSavegameAndQuit() { warning("OC_deleteSavegameAndQuit"); } + void LilliputScript::OC_incByte16F04() { debugC(1, kDebugScript, "OC_incByte16F04()"); @@ -2316,6 +2319,7 @@ void LilliputScript::OC_sub17BA5() { void LilliputScript::OC_setByte18823() { debugC(1, kDebugScript, "OC_setByte18823()"); + byte *tmpArr = getCharacterVariablePtr(); _byte18823 = *tmpArr; } @@ -2408,6 +2412,7 @@ void LilliputScript::OC_sub17C0E() { void LilliputScript::OC_sub17C55() { debugC(1, kDebugScript, "OC_sub17C55()"); + int var1 = getValue1(); int var2 = getValue1(); |