diff options
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/cell.cpp | 1 | ||||
| -rw-r--r-- | engines/groovie/cursor.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/font.h | 2 | ||||
| -rw-r--r-- | engines/groovie/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/music.cpp | 5 | ||||
| -rw-r--r-- | engines/groovie/music.h | 2 | ||||
| -rw-r--r-- | engines/groovie/player.cpp | 3 |
7 files changed, 11 insertions, 6 deletions
diff --git a/engines/groovie/cell.cpp b/engines/groovie/cell.cpp index 24fac17e44..5fceb8f74e 100644 --- a/engines/groovie/cell.cpp +++ b/engines/groovie/cell.cpp @@ -30,6 +30,7 @@ CellGame::CellGame() { _stack_index = _boardStackPtr = 0; _flag4 = false; _flag2 = false; + _flag1 = false; _coeff3 = 0; _moveCount = 0; diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp index 442f0bfada..d56698095f 100644 --- a/engines/groovie/cursor.cpp +++ b/engines/groovie/cursor.cpp @@ -35,7 +35,7 @@ namespace Groovie { // Cursor Manager GrvCursorMan::GrvCursorMan(OSystem *system) : - _syst(system), _lastTime(0), _current(255), _cursor(NULL) { + _syst(system), _lastTime(0), _current(255), _cursor(NULL), _lastFrame(0) { } GrvCursorMan::~GrvCursorMan() { diff --git a/engines/groovie/font.h b/engines/groovie/font.h index 23e060faf3..5c479b6919 100644 --- a/engines/groovie/font.h +++ b/engines/groovie/font.h @@ -44,7 +44,7 @@ private: int _maxHeight, _maxWidth; struct Glyph { - Glyph() : pixels(0) {} + Glyph() : pixels(0), width(0), height(0), julia(0) {} ~Glyph() { delete[] pixels; } byte width; diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp index e0c198f377..45956416cd 100644 --- a/engines/groovie/graphics.cpp +++ b/engines/groovie/graphics.cpp @@ -31,7 +31,7 @@ namespace Groovie { GraphicsMan::GraphicsMan(GroovieEngine *vm) : - _vm(vm), _changed(false), _fading(0) { + _vm(vm), _changed(false), _fading(0), _fadeStartTime(0) { // Create the game surfaces _foreground.create(640, 320, _vm->_pixelFormat); _background.create(640, 320, _vm->_pixelFormat); diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index cf65e012c8..9244dd7c31 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -44,7 +44,8 @@ namespace Groovie { MusicPlayer::MusicPlayer(GroovieEngine *vm) : _vm(vm), _isPlaying(false), _backgroundFileRef(0), _gameVolume(100), - _prevCDtrack(0), _backgroundDelay(0) { + _prevCDtrack(0), _backgroundDelay(0), _fadingStartTime(0), _fadingStartVolume(0), + _fadingEndVolume(0), _fadingDuration(0), _userVolume(0) { } MusicPlayer::~MusicPlayer() { @@ -391,6 +392,8 @@ MusicPlayerXMI::MusicPlayerXMI(GroovieEngine *vm, const Common::String >lName) bool milesAudioEnabled = true; MidiParser::XMidiNewTimbreListProc newTimbreListProc = NULL; + _musicType = 0; + if (milesAudioEnabled) { // 7th Guest uses FAT.AD/FAT.OPL/FAT.MT // 11th Hour uses SAMPLE.AD/SAMPLE.OPL/SAMPLE.MT diff --git a/engines/groovie/music.h b/engines/groovie/music.h index c549527c77..8b46cddc1f 100644 --- a/engines/groovie/music.h +++ b/engines/groovie/music.h @@ -141,7 +141,7 @@ private: // Timbres class Timbre { public: - Timbre() : data(NULL) {} + Timbre() : data(NULL), patch(0), bank(0), size(0) {} byte patch; byte bank; uint32 size; diff --git a/engines/groovie/player.cpp b/engines/groovie/player.cpp index dea32386f2..bbc8918902 100644 --- a/engines/groovie/player.cpp +++ b/engines/groovie/player.cpp @@ -29,7 +29,8 @@ namespace Groovie { VideoPlayer::VideoPlayer(GroovieEngine *vm) : - _vm(vm), _syst(vm->_system), _file(NULL), _audioStream(NULL), _fps(0), _overrideSpeed(false) { + _vm(vm), _syst(vm->_system), _file(NULL), _audioStream(NULL), _fps(0), _overrideSpeed(false), _flags(0), + _begunPlaying(false), _millisBetweenFrames(0), _lastFrameTime(0) { } bool VideoPlayer::load(Common::SeekableReadStream *file, uint16 flags) { |