From 3927d9020613682a7e38e5c387835e27e170fb66 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 2 Jun 2012 18:37:41 +1000
Subject: TONY: Extra initialisation of globals

---
 engines/tony/globals.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'engines/tony/globals.cpp')

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
-- 
cgit v1.2.3