TONY: Some further initialisation of object fields

2 files changed, 26 insertions, 0 deletions

diff --git a/engines/tony/gfxengine.cpp b/engines/tony/gfxengine.cpp
index 1b09e00956..f6d047d267 100644
--- a/engines/tony/gfxengine.cpp
+++ b/engines/tony/gfxengine.cpp
@@ -90,6 +90,17 @@ RMGfxEngine::RMGfxEngine() {
 	m_bigBuf.OffsetY(RM_SKIPY);
 
 	csMainLoop = NULL;
+	m_nCurLoc = 0;
+	m_curAction = TA_GOTO;
+	m_curActionObj = 0;
+	m_nWipeType	= 0;
+	m_hWipeEvent = 0;
+	m_nWipeStep	= 0;
+	m_bMustEnterMenu = false;
+	m_bWiping = false;
+	m_bGUIOption = false;
+	m_bGUIInterface = false;
+	m_bGUIInventory = false;
 }
 
 RMGfxEngine::~RMGfxEngine() {
diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 0658c99f48..01968ea579 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -775,6 +775,8 @@ uint32 CODECADPCMSTEREO::Decompress(Common::File &fp, void *buf, uint32 dwSize)
 FPSOUND::FPSOUND() {
 	lpDS = NULL;
 	lpDSBPrimary = NULL;
+	hwnd = 0;
+	bSoundSupported = false;
 }
 
 
@@ -1028,6 +1030,19 @@ FPSFX::FPSFX(LPDIRECTSOUND lpds, HWND hWnd, bool bSoundOn) {
 		return;
 
 	/* Poiché non abbiamo ancora nessun dato sull'effetto sonoro, non possiamo fare nulla */
+#else
+	bIsVoice = false;
+	lastVolume = 0;
+	dwFreq = 0;
+	hEndOfBuffer = CORO_INVALID_PID_VALUE;
+	bFileLoaded = false;
+	bSoundSupported = false;
+	bLoop = false;
+	bPaused = false;
+	bStereo = false;
+	b16bit = false;
+	bIsPlaying = false;
+	bIsVoice = false;
 #endif
 }