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/mads | |
| 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/mads')
| -rw-r--r-- | engines/mads/mads.cpp | 10 | ||||
| -rw-r--r-- | engines/mads/screen.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp index 5776d813cf..414473bb82 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); diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index b17b6e93b8..79d5256c1c 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -671,7 +671,7 @@ void Screen::transition(ScreenTransition transitionType, bool surfaceFlag) { void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, const Common::Point &srcPos, const Common::Point &destPos, - ThroughBlack throughBlack, bool setPalette, int numTicks) { + ThroughBlack throughBlack, bool setPalette_, int numTicks) { EventsManager &events = *_vm->_events; Palette &palette = *_vm->_palette; Common::Point size; @@ -693,7 +693,7 @@ void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, startX = size.x - 1; deltaX = startX ? -1 : 1; - if (setPalette & !throughBlack) + if (setPalette_ & !throughBlack) palette.setFullPalette(palData); // TODO: Original uses a different frequency ticks counter. Need to @@ -731,7 +731,7 @@ void Screen::panTransition(MSurface &newScreen, byte *palData, int entrySide, g_system->delayMillis(1); } - if ((setPalette && !loop) || throughBlack == THROUGH_BLACK2) + if ((setPalette_ && !loop) || throughBlack == THROUGH_BLACK2) palette.setFullPalette(palData); } |