diff options
| author | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
| commit | f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7 (patch) | |
| tree | 771a8d2b3fddf96c17a1d81d42cb08dfba09d110 /engines/tinsel | |
| parent | 873d555add9aaf5eb0d021518f5134142e2c2ff6 (diff) | |
| parent | 5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a (diff) | |
| download | scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.gz scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.bz2 scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 44e81494f7..8ad177abbb 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -821,6 +821,12 @@ const char *const TinselEngine::_textFiles[][3] = { TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc), _random("tinsel"), _console(0), _sound(0), _midiMusic(0), _pcmMusic(0), _bmv(0) { + // Register debug flags + DebugMan.addDebugChannel(kTinselDebugAnimations, "animations", "Animations debugging"); + DebugMan.addDebugChannel(kTinselDebugActions, "actions", "Actions debugging"); + DebugMan.addDebugChannel(kTinselDebugSound, "sound", "Sound debugging"); + DebugMan.addDebugChannel(kTinselDebugMusic, "music", "Music debugging"); + _vm = this; _gameId = 0; @@ -828,12 +834,6 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) _config = new Config(this); - // Register debug flags - DebugMan.addDebugChannel(kTinselDebugAnimations, "animations", "Animations debugging"); - DebugMan.addDebugChannel(kTinselDebugActions, "actions", "Actions debugging"); - DebugMan.addDebugChannel(kTinselDebugSound, "sound", "Sound debugging"); - DebugMan.addDebugChannel(kTinselDebugMusic, "music", "Music debugging"); - // Setup mixer syncSoundSettings(); |