[Scummvm-cvs-logs] scummvm master -> 406b8cf33bc8c324b5040978f74f04d7ed66b054
sev-
sev at scummvm.org
Thu Jul 28 10:47:49 CEST 2016
This automated email contains information about 11 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
795a628684 DRACI: Remove generic comment
49ee8d82d1 ACCESS: Move debug channel registration where they belong
40290fb244 CINE: Move debug channel registration to the first place in the constructor
2d428e2760 DREAMWEB: Cleanup
1fe60f10fa GNAP: Move debug channel registration to the top of the engine constructor
cf89cc04cc GOB: Move debug channel registration to the top of the engine constructor
fa07121155 GROOVIE: Move debug channel registration to the top of the engine constructor
12728cf4dd MADS: Fix debug channel initialization
1fc03406e3 MORTEVIELLE: Fix debug channel initialization
aa2eec09be SHERLOCK: Fix debug channel initialization
406b8cf33b TINSEL: Move debug channel registration to the very top of the engine constructor
Commit: 795a6286849fe1ed1f5333b59a9504a4af7db507
https://github.com/scummvm/scummvm/commit/795a6286849fe1ed1f5333b59a9504a4af7db507
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:32:30+03:00
Commit Message:
DRACI: Remove generic comment
Changed paths:
engines/draci/draci.cpp
diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp
index b40d61a..e3a97bf 100644
--- a/engines/draci/draci.cpp
+++ b/engines/draci/draci.cpp
@@ -71,18 +71,6 @@ const uint kDubbingFrequency = 22050;
DraciEngine::DraciEngine(OSystem *syst, const ADGameDescription *gameDesc)
: Engine(syst), _rnd("draci") {
-
- // Put your engine in a sane state, but do nothing big yet;
- // in particular, do not load data from files; rather, if you
- // need to do such things, do them from init().
-
- // Do not initialize graphics here
-
- // However this is the place to specify all default directories
- //const Common::FSNode gameDataDir(ConfMan.get("path"));
- //SearchMan.addSubDirectoryMatching(gameDataDir, "sound");
-
- // Here is the right place to set up the engine specific debug levels
DebugMan.addDebugChannel(kDraciGeneralDebugLevel, "general", "Draci general debug info");
DebugMan.addDebugChannel(kDraciBytecodeDebugLevel, "bytecode", "GPL bytecode instructions");
DebugMan.addDebugChannel(kDraciArchiverDebugLevel, "archiver", "BAR archiver debug info");
Commit: 49ee8d82d1c08e0822d9387e15ad84efb8d81201
https://github.com/scummvm/scummvm/commit/49ee8d82d1c08e0822d9387e15ad84efb8d81201
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:32:54+03:00
Commit Message:
ACCESS: Move debug channel registration where they belong
Changed paths:
engines/access/access.cpp
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 6f91bd7..ea21444 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -34,6 +34,12 @@ namespace Access {
AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
: _gameDescription(gameDesc), Engine(syst), _randomSource("Access"),
_useItem(_flags[99]), _startup(_flags[170]), _manScaleOff(_flags[172]) {
+ // Set up debug channels
+ DebugMan.addDebugChannel(kDebugPath, "path", "Pathfinding debug level");
+ DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
+ DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
+ DebugMan.addDebugChannel(kDebugSound, "sound", "Sound and Music handling");
+
_aboutBox = nullptr;
_animation = nullptr;
_bubbleBox = nullptr;
@@ -151,12 +157,6 @@ void AccessEngine::setVGA() {
}
void AccessEngine::initialize() {
- // Set up debug channels
- DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
- DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
- DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
- DebugMan.addDebugChannel(kDebugSound, "sound", "Sound and Music handling");
-
if (isCD()) {
const Common::FSNode gameDataDir(ConfMan.get("path"));
// The CD version contains two versions of the game.
Commit: 40290fb244af0017d7219faf21511ad4d5e60c4f
https://github.com/scummvm/scummvm/commit/40290fb244af0017d7219faf21511ad4d5e60c4f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:33:15+03:00
Commit Message:
CINE: Move debug channel registration to the first place in the constructor
Otherwise we could miss some of the debug output as the channels are not yet
registered.
Changed paths:
engines/cine/cine.cpp
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index d2f088d..414fe49 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -49,13 +49,14 @@ CineEngine::CineEngine(OSystem *syst, const CINEGameDescription *gameDesc)
: Engine(syst),
_gameDescription(gameDesc),
_rnd("cine") {
- // Setup mixer
- syncSoundSettings();
-
DebugMan.addDebugChannel(kCineDebugScript, "Script", "Script debug level");
DebugMan.addDebugChannel(kCineDebugPart, "Part", "Part debug level");
DebugMan.addDebugChannel(kCineDebugSound, "Sound", "Sound debug level");
DebugMan.addDebugChannel(kCineDebugCollision, "Collision", "Collision debug level");
+
+ // Setup mixer
+ syncSoundSettings();
+
_console = new CineConsole(this);
g_cine = this;
Commit: 2d428e276074effd0052798428351123866f6d99
https://github.com/scummvm/scummvm/commit/2d428e276074effd0052798428351123866f6d99
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:34:34+03:00
Commit Message:
DREAMWEB: Cleanup
Changed paths:
engines/dreamweb/dreamweb.cpp
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 0514c6e..a10403c 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -46,12 +46,13 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
_roomDesc(kNumRoomTexts), _freeDesc(kNumFreeTexts),
_personText(kNumPersonTexts) {
+ DebugMan.addDebugChannel(kDebugAnimation, "Animation", "Animation Debug Flag");
+ DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Track Save/Load Function");
+
_vSyncInterrupt = false;
_console = 0;
_sound = 0;
- DebugMan.addDebugChannel(kDebugAnimation, "Animation", "Animation Debug Flag");
- DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Track Save/Load Function");
_speed = 1;
_turbo = false;
_oldMouseState = 0;
Commit: 1fe60f10fabe62edafb678ef178e8c2abbbf1216
https://github.com/scummvm/scummvm/commit/1fe60f10fabe62edafb678ef178e8c2abbbf1216
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:36:33+03:00
Commit Message:
GNAP: Move debug channel registration to the top of the engine constructor
Changed paths:
engines/gnap/gnap.cpp
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index 6a03bf8..809e711 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -91,9 +91,10 @@ static const char *kSceneNames[] = {
GnapEngine::GnapEngine(OSystem *syst, const ADGameDescription *gd) :
Engine(syst), _gameDescription(gd) {
- _random = new Common::RandomSource("gnap");
DebugMan.addDebugChannel(kDebugBasic, "basic", "Basic debug level");
+ _random = new Common::RandomSource("gnap");
+
Engine::syncSoundSettings();
_exe = nullptr;
Commit: cf89cc04cc213ff38b83c34f64797d9d6c0e8d4f
https://github.com/scummvm/scummvm/commit/cf89cc04cc213ff38b83c34f64797d9d6c0e8d4f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:37:06+03:00
Commit Message:
GOB: Move debug channel registration to the top of the engine constructor
Changed paths:
engines/gob/gob.cpp
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index dfbff33..605f1ed 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -115,6 +115,19 @@ void PauseDialog::handleKeyDown(Common::KeyState state) {
GobEngine::GobEngine(OSystem *syst) : Engine(syst), _rnd("gob") {
+ DebugMan.addDebugChannel(kDebugFuncOp, "FuncOpcodes", "Script FuncOpcodes debug level");
+ DebugMan.addDebugChannel(kDebugDrawOp, "DrawOpcodes", "Script DrawOpcodes debug level");
+ DebugMan.addDebugChannel(kDebugGobOp, "GoblinOpcodes", "Script GoblinOpcodes debug level");
+ DebugMan.addDebugChannel(kDebugSound, "Sound", "Sound output debug level");
+ DebugMan.addDebugChannel(kDebugExpression, "Expression", "Expression parser debug level");
+ DebugMan.addDebugChannel(kDebugGameFlow, "Gameflow", "Gameflow debug level");
+ DebugMan.addDebugChannel(kDebugFileIO, "FileIO", "File Input/Output debug level");
+ DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Saving/Loading debug level");
+ DebugMan.addDebugChannel(kDebugGraphics, "Graphics", "Graphics debug level");
+ DebugMan.addDebugChannel(kDebugVideo, "Video", "IMD/VMD video debug level");
+ DebugMan.addDebugChannel(kDebugHotspots, "Hotspots", "Hotspots debug level");
+ DebugMan.addDebugChannel(kDebugDemo, "Demo", "Demo script debug level");
+
_sound = 0; _mult = 0; _game = 0;
_global = 0; _dataIO = 0; _goblin = 0;
_vidPlayer = 0; _init = 0; _inter = 0;
@@ -136,19 +149,6 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst), _rnd("gob") {
_copyProtection = ConfMan.getBool("copy_protection");
_console = new GobConsole(this);
-
- DebugMan.addDebugChannel(kDebugFuncOp, "FuncOpcodes", "Script FuncOpcodes debug level");
- DebugMan.addDebugChannel(kDebugDrawOp, "DrawOpcodes", "Script DrawOpcodes debug level");
- DebugMan.addDebugChannel(kDebugGobOp, "GoblinOpcodes", "Script GoblinOpcodes debug level");
- DebugMan.addDebugChannel(kDebugSound, "Sound", "Sound output debug level");
- DebugMan.addDebugChannel(kDebugExpression, "Expression", "Expression parser debug level");
- DebugMan.addDebugChannel(kDebugGameFlow, "Gameflow", "Gameflow debug level");
- DebugMan.addDebugChannel(kDebugFileIO, "FileIO", "File Input/Output debug level");
- DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Saving/Loading debug level");
- DebugMan.addDebugChannel(kDebugGraphics, "Graphics", "Graphics debug level");
- DebugMan.addDebugChannel(kDebugVideo, "Video", "IMD/VMD video debug level");
- DebugMan.addDebugChannel(kDebugHotspots, "Hotspots", "Hotspots debug level");
- DebugMan.addDebugChannel(kDebugDemo, "Demo", "Demo script debug level");
}
GobEngine::~GobEngine() {
Commit: fa071211554663e34b6ecc995d8123aae5d1fdf5
https://github.com/scummvm/scummvm/commit/fa071211554663e34b6ecc995d8123aae5d1fdf5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:38:05+03:00
Commit Message:
GROOVIE: Move debug channel registration to the top of the engine constructor
Changed paths:
engines/groovie/groovie.cpp
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index ac77ec3..2ba4ed1 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -53,17 +53,6 @@ GroovieEngine::GroovieEngine(OSystem *syst, const GroovieGameDescription *gd) :
_graphicsMan(NULL), _macResFork(NULL), _waitingForInput(false), _font(NULL),
_spookyMode(false) {
- // Adding the default directories
- const Common::FSNode gameDataDir(ConfMan.get("path"));
- SearchMan.addSubDirectoryMatching(gameDataDir, "groovie");
- SearchMan.addSubDirectoryMatching(gameDataDir, "media");
- SearchMan.addSubDirectoryMatching(gameDataDir, "system");
- SearchMan.addSubDirectoryMatching(gameDataDir, "MIDI");
-
- _modeSpeed = kGroovieSpeedNormal;
- if (ConfMan.hasKey("fast_movie_speed") && ConfMan.getBool("fast_movie_speed"))
- _modeSpeed = kGroovieSpeedFast;
-
// Initialize the custom debug levels
DebugMan.addDebugChannel(kDebugVideo, "Video", "Debug video and audio playback");
DebugMan.addDebugChannel(kDebugResource, "Resource", "Debug resource management");
@@ -75,6 +64,17 @@ GroovieEngine::GroovieEngine(OSystem *syst, const GroovieGameDescription *gd) :
DebugMan.addDebugChannel(kDebugScriptvars, "Scriptvars", "Print out any change to script variables");
DebugMan.addDebugChannel(kDebugCell, "Cell", "Debug the cell game (in the microscope)");
DebugMan.addDebugChannel(kDebugFast, "Fast", "Play videos quickly, with no sound (unstable)");
+
+ // Adding the default directories
+ const Common::FSNode gameDataDir(ConfMan.get("path"));
+ SearchMan.addSubDirectoryMatching(gameDataDir, "groovie");
+ SearchMan.addSubDirectoryMatching(gameDataDir, "media");
+ SearchMan.addSubDirectoryMatching(gameDataDir, "system");
+ SearchMan.addSubDirectoryMatching(gameDataDir, "MIDI");
+
+ _modeSpeed = kGroovieSpeedNormal;
+ if (ConfMan.hasKey("fast_movie_speed") && ConfMan.getBool("fast_movie_speed"))
+ _modeSpeed = kGroovieSpeedFast;
}
GroovieEngine::~GroovieEngine() {
Commit: 12728cf4ddad2b8a9bd58293398f1af79730c8d9
https://github.com/scummvm/scummvm/commit/12728cf4ddad2b8a9bd58293398f1af79730c8d9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:40:29+03:00
Commit Message:
MADS: Fix debug channel initialization
Changed paths:
engines/mads/mads.cpp
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 5776d81..414473b 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -38,6 +38,11 @@ namespace MADS {
MADSEngine::MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc) :
_gameDescription(gameDesc), Engine(syst), _randomSource("MADS") {
+ // Set up debug channels
+ DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
+ DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
+ DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
+
// Initialize game/engine options
_easyMouse = true;
_invObjectsAnimated = true;
@@ -78,11 +83,6 @@ MADSEngine::~MADSEngine() {
}
void MADSEngine::initialize() {
- // Set up debug channels
- DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
- DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
- DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics handling");
-
// Initial sub-system engine references
MSurface::setVm(this);
MSprite::setVm(this);
Commit: 1fc03406e3d1f83ee8ec89c52e0faf369b7c6c74
https://github.com/scummvm/scummvm/commit/1fc03406e3d1f83ee8ec89c52e0faf369b7c6c74
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:41:49+03:00
Commit Message:
MORTEVIELLE: Fix debug channel initialization
Changed paths:
engines/mortevielle/mortevielle.cpp
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 81b2edb..4f0899d 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -48,6 +48,10 @@ MortevielleEngine *g_vm;
MortevielleEngine::MortevielleEngine(OSystem *system, const MortevielleGameDescription *gameDesc):
Engine(system), _gameDescription(gameDesc), _randomSource("mortevielle") {
+ // Set debug channels
+ DebugMan.addDebugChannel(kMortevielleCore, "core", "Core debugging");
+ DebugMan.addDebugChannel(kMortevielleGraphics, "graphics", "Graphics debugging");
+
g_vm = this;
_debugger = new Debugger(this);
_dialogManager = new DialogManager(this);
@@ -244,10 +248,6 @@ Common::ErrorCode MortevielleEngine::initialize() {
// Initialize graphics mode
initGraphics(SCREEN_WIDTH, SCREEN_HEIGHT, true);
- // Set debug channels
- DebugMan.addDebugChannel(kMortevielleCore, "core", "Core debugging");
- DebugMan.addDebugChannel(kMortevielleGraphics, "graphics", "Graphics debugging");
-
// Set up an intermediate screen surface
_screenSurface->create(SCREEN_WIDTH, SCREEN_HEIGHT, Graphics::PixelFormat::createFormatCLUT8());
Commit: aa2eec09be4428ddff9fcf6a1f2febe718b867e5
https://github.com/scummvm/scummvm/commit/aa2eec09be4428ddff9fcf6a1f2febe718b867e5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:44:04+03:00
Commit Message:
SHERLOCK: Fix debug channel initialization
Changed paths:
engines/sherlock/sherlock.cpp
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index e068ac4..c6b38f7 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -30,6 +30,11 @@ namespace Sherlock {
SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
Engine(syst), _gameDescription(gameDesc), _randomSource("Sherlock") {
+ DebugMan.addDebugChannel(kDebugLevelScript, "scripts", "Script debug level");
+ DebugMan.addDebugChannel(kDebugLevelAdLibDriver, "AdLib", "AdLib driver debugging");
+ DebugMan.addDebugChannel(kDebugLevelMT32Driver, "MT32", "MT32 driver debugging");
+ DebugMan.addDebugChannel(kDebugLevelMusic, "Music", "Music debugging");
+
_animation = nullptr;
_debugger = nullptr;
_events = nullptr;
@@ -74,11 +79,6 @@ SherlockEngine::~SherlockEngine() {
}
void SherlockEngine::initialize() {
- DebugMan.addDebugChannel(kDebugLevelScript, "scripts", "Script debug level");
- DebugMan.addDebugChannel(kDebugLevelAdLibDriver, "AdLib", "AdLib driver debugging");
- DebugMan.addDebugChannel(kDebugLevelMT32Driver, "MT32", "MT32 driver debugging");
- DebugMan.addDebugChannel(kDebugLevelMusic, "Music", "Music debugging");
-
Fonts::setVm(this);
ImageFile::setVm(this);
ImageFile3DO::setVm(this);
Commit: 406b8cf33bc8c324b5040978f74f04d7ed66b054
https://github.com/scummvm/scummvm/commit/406b8cf33bc8c324b5040978f74f04d7ed66b054
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-28T11:45:33+03:00
Commit Message:
TINSEL: Move debug channel registration to the very top of the engine constructor
Changed paths:
engines/tinsel/tinsel.cpp
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 44e8149..8ad177a 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();
More information about the Scummvm-git-logs
mailing list