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

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Tue Oct 27 03:23:45 CET 2009


Revision: 45431
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45431&view=rev
Author:   mthreepwood
Date:     2009-10-27 02:23:45 +0000 (Tue, 27 Oct 2009)

Log Message:
-----------
Make Jones in the Fast Lane use up the whole screen as did the original game.

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

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-10-27 00:38:41 UTC (rev 45430)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-10-27 02:23:45 UTC (rev 45431)
@@ -49,13 +49,13 @@
 	GfxDriver *driver;
 };
 
-GfxResManager::GfxResManager(GfxDriver *driver, ResourceManager *resMan, SciGuiScreen *screen, SciGuiPalette *palette) :
+GfxResManager::GfxResManager(GfxDriver *driver, ResourceManager *resMan, SciGuiScreen *screen, SciGuiPalette *palette, Common::Rect portBounds) :
 				_driver(driver), _resMan(resMan), _screen(screen), _palette(palette),
 				_lockCounter(0), _tagLockCounter(0), _staticPalette(0) {
 	gfxr_init_static_palette();
+	
+	_portBounds = portBounds;
 
-	_portBounds = Common::Rect(0, 10, 320, 200);	// default value, with a titlebar of 10px
-
 	if (!_resMan->isVGA()) {
 		_staticPalette = gfx_sci0_pic_colors->getref();
 	} else if (getSciVersion() == SCI_VERSION_1_1) {

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-10-27 00:38:41 UTC (rev 45430)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-10-27 02:23:45 UTC (rev 45431)
@@ -91,7 +91,7 @@
 /** Graphics resource manager */
 class GfxResManager {
 public:
-	GfxResManager(GfxDriver *driver, ResourceManager *resMan, SciGuiScreen *screen, SciGuiPalette *palette);
+	GfxResManager(GfxDriver *driver, ResourceManager *resMan, SciGuiScreen *screen, SciGuiPalette *palette, Common::Rect portBounds);
 	~GfxResManager();
 
 

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-10-27 00:38:41 UTC (rev 45430)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-10-27 02:23:45 UTC (rev 45431)
@@ -345,12 +345,17 @@
 	state->pic = state->pic_unscaled = NULL;
 	state->pic_nr = -1; // Set background pic number to an invalid value
 	state->tag_mode = 0;
-	state->pic_port_bounds = gfx_rect(0, 10, 320, 190);
 	state->_dirtyRects.clear();
+	
+	// Jones in the Fast Lane uses up the whole window
+	if (!scumm_stricmp(((SciEngine *)g_engine)->getGameID(), "jones"))
+		state->pic_port_bounds = gfx_rect(0, 0, 320, 200);
+	else
+		state->pic_port_bounds = gfx_rect(0, 10, 320, 190);
 
 	state->driver = new GfxDriver(screen, scaleFactor);
 
-	state->gfxResMan = new GfxResManager(state->driver, resMan, screen, palette);
+	state->gfxResMan = new GfxResManager(state->driver, resMan, screen, palette, toCommonRect(state->pic_port_bounds));
 
 	gfxop_set_clip_zone(state, gfx_rect(0, 0, 320, 200));
 

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-27 00:38:41 UTC (rev 45430)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-27 02:23:45 UTC (rev 45431)
@@ -50,7 +50,8 @@
 	_windowsById.resize(1);
 	_windowsById[0] = _wmgrPort;
 
-	int16 offTop = 10;
+	// Jones in the Fast Lane uses up the whole window
+	int16 offTop = !scumm_stricmp(((SciEngine *)g_engine)->getGameID(), "jones") ? 0 : 10;
 
 	_gfx->OpenPort(_wmgrPort);
 	_gfx->SetPort(_wmgrPort);


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




More information about the Scummvm-git-logs mailing list