[Scummvm-cvs-logs] SF.net SVN: scummvm:[45460] scummvm/trunk/engines/sci/gui

[m_kiewitz at users.sourceforge.net]

Revision: 45460
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45460&view=rev
Author:   m_kiewitz
Date:     2009-10-28 13:34:20 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
SCI/newgui: Jones windowMgr Port adjustment, added explanatory comment

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
    scummvm/trunk/engines/sci/gui/gui_windowmgr.h

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-28 13:20:30 UTC (rev 45459)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-28 13:34:20 UTC (rev 45460)
@@ -61,8 +61,6 @@
 	_text = new SciGuiText(_s->resMan, _gfx, _screen);
 	_windowMgr = new SciGuiWindowMgr(_screen, _gfx, _animate, _text);
 	_controls = new SciGuiControls(_s->_segMan, _gfx, _text);
-	_gfx->init(_text);
-	_windowMgr->init();
 //  	_gui32 = new SciGui32(_s, _screen, _palette, _cursor); // for debug purposes
 }
 
@@ -81,6 +79,8 @@
 void SciGui::init(bool usesOldGfxFunctions) {
 	_usesOldGfxFunctions = usesOldGfxFunctions;
 
+	_gfx->init(_text);
+	_windowMgr->init(_s->_gameName);
 	initPriorityBands();
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-28 13:20:30 UTC (rev 45459)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-28 13:34:20 UTC (rev 45460)
@@ -52,14 +52,17 @@
 	// TODO: Clear _windowList and delete all stuff in it?
 }
 
-void SciGuiWindowMgr::init() {
+void SciGuiWindowMgr::init(Common::String gameName) {
+	int16 offTop = 10;
+
 	_wmgrPort = new GuiPort(0);
 	_windowsById.resize(1);
 	_windowsById[0] = _wmgrPort;
 
-	// Jones in the Fast Lane uses up the whole window
-	int16 offTop = !scumm_stricmp(((SciEngine *)g_engine)->getGameID(), "jones") ? 0 : 10;
-	// TODO: Check how original interpreter works and fix this code if the jones interpreter doesnt do it this way
+	// Jones sierra sci was called with parameter -Nw 0 0 200 320
+	//  this actually meant not skipping the first 10 pixellines in windowMgrPort
+	if (gameName == "jones")
+		offTop = 0;
 
 	_gfx->OpenPort(_wmgrPort);
 	_gfx->SetPort(_wmgrPort);

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-28 13:20:30 UTC (rev 45459)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-28 13:34:20 UTC (rev 45460)
@@ -36,7 +36,7 @@
 	SciGuiWindowMgr(SciGuiScreen *screen, SciGuiGfx *gfx, SciGuiAnimate *animate, SciGuiText *text);
 	~SciGuiWindowMgr();
 
-	void init();
+	void init(Common::String gameName);
 
 	int16 isFrontWindow(GuiWindow *wnd);
 	void BeginUpdate(GuiWindow *wnd);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.