[Scummvm-cvs-logs] scummvm master -> b9badf61bfca47fdfe45495a199c72c3fba08039

waltervn walter at vanniftrik-it.nl
Mon Aug 8 19:32:16 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b9badf61bf ADL: Fix gfx vs console init order


Commit: b9badf61bfca47fdfe45495a199c72c3fba08039
    https://github.com/scummvm/scummvm/commit/b9badf61bfca47fdfe45495a199c72c3fba08039
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-08-08T19:29:02+02:00

Commit Message:
ADL: Fix gfx vs console init order

Changed paths:
    engines/adl/adl.cpp
    engines/adl/display.cpp



diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index b6af549..83181c9 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -520,6 +520,8 @@ void AdlEngine::dropItem(byte noun) {
 }
 
 Common::Error AdlEngine::run() {
+	initGraphics(DISPLAY_WIDTH * 2, DISPLAY_HEIGHT * 2, true);
+
 	_console = new Console(this);
 	_speaker = new Speaker();
 	_display = new Display();
diff --git a/engines/adl/display.cpp b/engines/adl/display.cpp
index b7f6eb9..858d3ac 100644
--- a/engines/adl/display.cpp
+++ b/engines/adl/display.cpp
@@ -109,8 +109,6 @@ Display::Display() :
 		_cursorPos(0),
 		_showCursor(false) {
 
-	initGraphics(DISPLAY_WIDTH * 2, DISPLAY_HEIGHT * 2, true);
-
 	_monochrome = !ConfMan.getBool("color");
 	_scanlines = ConfMan.getBool("scanlines");
 






More information about the Scummvm-git-logs mailing list