aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2003-05-20 13:20:18 +0000
committerMax Horn2003-05-20 13:20:18 +0000
commitbb9c82ed839a45925349cd67332d03515b2a6976 (patch)
tree058d291db1069e3639b1a42abf309cebea9dcada /simon
parent19f77c0381a708ebf53e216312782b6aa44a35bd (diff)
downloadscummvm-rg350-bb9c82ed839a45925349cd67332d03515b2a6976.tar.gz
scummvm-rg350-bb9c82ed839a45925349cd67332d03515b2a6976.tar.bz2
scummvm-rg350-bb9c82ed839a45925349cd67332d03515b2a6976.zip
init some member vars
svn-id: r7723
Diffstat (limited to 'simon')
-rw-r--r--simon/intern.h2
-rw-r--r--simon/midi.cpp6
2 files changed, 7 insertions, 1 deletions
diff --git a/simon/intern.h b/simon/intern.h
index 13e0466042..ec9acaa915 100644
--- a/simon/intern.h
+++ b/simon/intern.h
@@ -58,6 +58,8 @@ struct Item {
uint16 unk4;
uint16 xxx_1; /* unused? */
Child *children;
+
+ Item() { memset(this, 0, sizeof(Item)); }
};
struct Subroutine {
diff --git a/simon/midi.cpp b/simon/midi.cpp
index 8cf4248e45..928c1a0d5d 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -33,10 +33,14 @@ MidiPlayer::MidiPlayer (OSystem *system) {
// between songs.
_system = system;
_mutex = system->create_mutex();
+ _driver = 0;
+ _parser = 0;
+
_data = 0;
_masterVolume = 255;
- _num_songs = 0;
+ _paused = false;
_currentTrack = 255;
+ _num_songs = 0;
}
MidiPlayer::~MidiPlayer() {