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

[thebluegr at users.sourceforge.net]

Revision: 42387
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42387&view=rev
Author:   thebluegr
Date:     2009-07-11 17:25:49 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
Removed the version parameter from GfxResManager

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

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-07-11 16:07:14 UTC (rev 42386)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-07-11 17:25:49 UTC (rev 42387)
@@ -49,12 +49,13 @@
 	GfxDriver *driver;
 };
 
-GfxResManager::GfxResManager(int version, gfx_options_t *options, GfxDriver *driver, ResourceManager *resManager) :
-				_version(version), _options(options), _driver(driver), _resManager(resManager),
+GfxResManager::GfxResManager(gfx_options_t *options, GfxDriver *driver, ResourceManager *resManager) :
+				_options(options), _driver(driver), _resManager(resManager),
 				_lockCounter(0), _tagLockCounter(0), _staticPalette(0) {
 	gfxr_init_static_palette();
 
 	_portBounds = Common::Rect(0, 10, 320, 200);	// default value, with a titlebar of 10px
+	_version = resManager->_volVersion;
 
 	if (!_resManager->isVGA()) {
 		_staticPalette = gfx_sci0_pic_colors->getref();

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-07-11 16:07:14 UTC (rev 42386)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-07-11 17:25:49 UTC (rev 42387)
@@ -90,9 +90,7 @@
 /** Graphics resource manager */
 class GfxResManager {
 public:
-	GfxResManager(int version, gfx_options_t *options,
-			GfxDriver *driver, ResourceManager *resManager);
-
+	GfxResManager(gfx_options_t *options, GfxDriver *driver, ResourceManager *resManager);
 	~GfxResManager();
 
 	/**

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-07-11 16:07:14 UTC (rev 42386)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-07-11 17:25:49 UTC (rev 42387)
@@ -423,7 +423,7 @@
 
 	state->driver = new GfxDriver(xfact, yfact, bpp);
 
-	state->gfxResMan = new GfxResManager(version, state->options, state->driver, resManager);
+	state->gfxResMan = new GfxResManager(state->options, state->driver, resManager);
 	
 	gfxop_set_clip_zone(state, gfx_rect(0, 0, 320, 200));
 


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