[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.276,1.277 scumm.h,1.517,1.518
Eugene Sandulenko
sev at users.sourceforge.net
Tue Nov 23 16:16:07 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.25,1.26 engine.h,1.15,1.16 main.cpp,1.57,1.58
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.64,1.65 sword1.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7792/scumm
Modified Files:
scumm.cpp scumm.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: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- scumm.cpp 23 Nov 2004 09:36:46 -0000 1.276
+++ scumm.cpp 24 Nov 2004 00:14:02 -0000 1.277
@@ -976,10 +976,13 @@
#pragma mark --- Initialization ---
#pragma mark -
-int ScummEngine::init() {
+int ScummEngine::init(GameDetector &detector) {
// Initialize backend
- _system->initSize(_screenWidth, _screenHeight);
+ _system->beginGFXTransaction();
+ initCommonGFX(detector);
+ _system->initSize(_screenWidth, _screenHeight);
+ _system->endGFXTransaction();
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -d -r1.517 -r1.518
--- scumm.h 23 Nov 2004 00:03:21 -0000 1.517
+++ scumm.h 24 Nov 2004 00:14:14 -0000 1.518
@@ -388,7 +388,7 @@
int go();
// Init functions
- int init();
+ int init(GameDetector &detector);
virtual void setupScummVars();
void initScummVars();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.25,1.26 engine.h,1.15,1.16 main.cpp,1.57,1.58
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.64,1.65 sword1.h,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list