From 12728cf4ddad2b8a9bd58293398f1af79730c8d9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 28 Jul 2016 11:40:29 +0300
Subject: MADS: Fix debug channel initialization

---
 engines/mads/mads.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/mads')

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);
-- 
cgit v1.2.3


From 0182a8a2300d7e536a6d11ed71233a12c1d54e54 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 29 Jul 2016 05:47:31 +0300
Subject: MADS: Fix warning

---
 engines/mads/screen.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/mads')

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);
 	}
 
-- 
cgit v1.2.3