[Scummvm-cvs-logs] CVS: scummvm/sword2 sword2.cpp,1.123,1.124 sword2.h,1.69,1.70

Eugene Sandulenko sev at users.sourceforge.net
Tue Nov 23 16:15:02 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7792/sword2

Modified Files:
	sword2.cpp sword2.h 
Log Message:
Fix a`ll engines. They work, though current fix is just temporary.
There are plans to add some brains to GameDetector class, which will let us
avoid passing detector to init() method.


Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- sword2.cpp	23 Nov 2004 00:03:25 -0000	1.123
+++ sword2.cpp	24 Nov 2004 00:14:20 -0000	1.124
@@ -223,11 +223,14 @@
 	_resman->openResource(CUR_PLAYER_ID);
 }
     
-int Sword2Engine::init() {
+int Sword2Engine::init(GameDetector &detector) {
 	// Get some falling RAM and put it in your pocket, never let it slip
 	// away
 
-	_graphics = new Graphics(this, 640, 480);
+	_system->beginGFXTransaction();
+		initCommonGFX(detector);
+		_graphics = new Graphics(this, 640, 480);
+	_system->endGFXTransaction();
 
 	// Create the debugger as early as possible (but not before the
 	// graphics object!) so that errors can be displayed in it. In

Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- sword2.h	23 Nov 2004 00:03:25 -0000	1.69
+++ sword2.h	24 Nov 2004 00:14:21 -0000	1.70
@@ -171,7 +171,7 @@
 	Sword2Engine(GameDetector *detector, OSystem *syst);
 	~Sword2Engine();
 	int go();
-	int init();
+	int init(GameDetector &detector);
 
 	void setupPersistentResources();
 





More information about the Scummvm-git-logs mailing list