[Scummvm-cvs-logs] SF.net SVN: scummvm: [24656] scummvm/trunk

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Nov 8 11:07:27 CET 2006


Revision: 24656
          http://svn.sourceforge.net/scummvm/?rev=24656&view=rev
Author:   sev
Date:     2006-11-08 02:06:42 -0800 (Wed, 08 Nov 2006)

Log Message:
-----------
Fix bug #1590596: "HE: When 3x graphics are choosen, F5 crashes game"

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/gui/newgui.h

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-11-08 10:05:21 UTC (rev 24655)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-11-08 10:06:42 UTC (rev 24656)
@@ -1023,6 +1023,16 @@
 		initCommonGFX(defaultTo1XScaler);
 	_system->endGFXTransaction();
 
+	// It may happen that we have 3x scaler in launcher (960xY) and then 640x480
+	// game will be forced to 1x. At this stage GUI will not be aware of
+	// resolution change, so widgets will be off screen. This forces it to
+	// recompute
+	//
+	// Fixes bug #1590596: "HE: When 3x graphics are choosen, F5 crashes game"
+	if (defaultTo1XScaler) {
+		g_gui.screenChange();
+	}
+
 	setupScumm();
 
 	readIndexFile();

Modified: scummvm/trunk/gui/newgui.h
===================================================================
--- scummvm/trunk/gui/newgui.h	2006-11-08 10:05:21 UTC (rev 24655)
+++ scummvm/trunk/gui/newgui.h	2006-11-08 10:06:42 UTC (rev 24656)
@@ -83,6 +83,8 @@
 
 	void clearDragWidget();
 
+	void screenChange();
+
 protected:
 	OSystem			*_system;
 
@@ -124,7 +126,6 @@
 	void openDialog(Dialog *dialog);
 	void closeTopDialog();
 
-	void screenChange();
 	void redraw();
 
 	void loop();


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