[Scummvm-cvs-logs] scummvm master -> b0685aebc6cedb9ccb8106fc495f11713a6b572f

Strangerke Strangerke at scummvm.org
Mon Jun 9 18:12:29 CEST 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b0685aebc6 CRUISE: Initialize some variables


Commit: b0685aebc6cedb9ccb8106fc495f11713a6b572f
    https://github.com/scummvm/scummvm/commit/b0685aebc6cedb9ccb8106fc495f11713a6b572f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-06-09T18:11:18+02:00

Commit Message:
CRUISE: Initialize some variables

Changed paths:
    engines/cruise/function.cpp
    engines/cruise/sound.cpp



diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index 33f3bba..c530074 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -1512,6 +1512,9 @@ int16 Op_Itoa() {
 	int param[160];
 	char txt[40];
 
+	for (int i = 0; i < 160; ++i)
+		param[i] = 0;
+
 	for (int i = nbp - 1; i >= 0; i--)
 		param[i] = popVar();
 
diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp
index cc9a17e..0b0fab8 100644
--- a/engines/cruise/sound.cpp
+++ b/engines/cruise/sound.cpp
@@ -607,6 +607,13 @@ PCSoundFxPlayer::PCSoundFxPlayer(PCSoundDriver *driver)
 	_sfxData = NULL;
 	_fadeOutCounter = 0;
 	_driver->setUpdateCallback(updateCallback, this);
+
+	_currentPos = 0;
+	_currentOrder = 0;
+	_numOrders = 0;
+	_eventsDelay = 0;
+	_looping = false;
+	_updateTicksCounter = 0;
 }
 
 PCSoundFxPlayer::~PCSoundFxPlayer() {
@@ -792,6 +799,7 @@ PCSound::PCSound(Audio::Mixer *mixer, CruiseEngine *vm) {
 	_mixer = mixer;
 	_soundDriver = new AdLibSoundDriverADL(_mixer);
 	_player = new PCSoundFxPlayer(_soundDriver);
+	_genVolume = 0;
 }
 
 PCSound::~PCSound() {






More information about the Scummvm-git-logs mailing list