Merged revisions 42382,42385-42387,42393-42394 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r42382 | Kirben | 2009-07-11 22:23:42 +1000 (Sat, 11 Jul 2009) | 1 line
  
  Fix pinball type mini game in Putt-Putt Enters The Race.
........
  r42385 | wjpalenstijn | 2009-07-12 01:00:40 +1000 (Sun, 12 Jul 2009) | 3 lines
  
  SCI: don't let TimerSongIterator loop forever, and don't immediately
  signal completion when starting it. This fixes a sync issue with
  the departing spaceship at the start of SQ4CD (after the intro).
........
  r42386 | thebluegr | 2009-07-12 02:07:14 +1000 (Sun, 12 Jul 2009) | 1 line
  
  If we fail to auto-detect either the volume or the map version, set the one to be equal to the other
........
  r42387 | thebluegr | 2009-07-12 03:25:49 +1000 (Sun, 12 Jul 2009) | 1 line
  
  Removed the version parameter from GfxResManager
........
  r42393 | thebluegr | 2009-07-12 05:00:56 +1000 (Sun, 12 Jul 2009) | 1 line
  
  Some work on QFG1VGA (looks like a mix of SCI1 and SCI1.1)
........
  r42394 | thebluegr | 2009-07-12 05:38:41 +1000 (Sun, 12 Jul 2009) | 1 line
  
  Changed an incorrect warning back to scidprintf - the relevant message is for testing only
........

svn-id: r42397

1 files changed, 1 insertions, 1 deletions

diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index 057f28b56f..77b887778b 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -424,7 +424,7 @@ int gfxop_init(int version, GfxState *state,
 
 	state->driver = new GfxDriver(xfact, yfact, mode);
 
-	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));