aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2012-06-02 18:37:41 +1000
committerPaul Gilbert2012-06-02 18:37:41 +1000
commit3927d9020613682a7e38e5c387835e27e170fb66 (patch)
treedd76407f9dce5a52bf68c498b589dbb0a4b85dfd
parenta850eabf07bd5c620a7329529f464deb4930a127 (diff)
downloadscummvm-rg350-3927d9020613682a7e38e5c387835e27e170fb66.tar.gz
scummvm-rg350-3927d9020613682a7e38e5c387835e27e170fb66.tar.bz2
scummvm-rg350-3927d9020613682a7e38e5c387835e27e170fb66.zip
TONY: Extra initialisation of globals
-rw-r--r--engines/tony/globals.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/engines/tony/globals.cpp b/engines/tony/globals.cpp
index 1a4467ef28..742d4376d5 100644
--- a/engines/tony/globals.cpp
+++ b/engines/tony/globals.cpp
@@ -26,6 +26,7 @@
namespace Tony {
Globals::Globals() {
+ Common::fill(nextMusic, nextMusic + MAX_PATH, 0);
nextLoop = false;
nextChannel = 0;
nextSync = 0;
@@ -71,6 +72,7 @@ Globals::Globals() {
bCfgDubbing = false;
bCfgMusic = false;
bCfgSFX = false;
+ bAlwaysDisplay = false;
nCfgTonySpeed = 0;
nCfgTextSpeed = 0;
nCfgDubbingVolume = 0;
@@ -129,6 +131,15 @@ Globals::Globals() {
nExecutingDialog = 0;
nExecutingChoice = 0;
nSelectedChoice = 0;
+ nTonyNextTalkType = RMTony::TALK_NORMAL;
+ saveTonyLoc = 0;
+
+ for (int i = 0; i < 16; ++i)
+ Common::fill((byte *)&Character[i], (byte *)&Character[i] + sizeof(CharacterStruct), 0);
+ for (int i = 0; i < 10; ++i)
+ Common::fill((byte *)&MCharacter[i], (byte *)&MCharacter[i] + sizeof(MCharacterStruct), 0);
+ for (int i = 0; i < 256; ++i)
+ Common::fill((byte *)&ChangedHotspot[i], (byte *)&ChangedHotspot[i] + sizeof(ChangedHotspotStruct), 0);
}
} // End of namespace Tony