[Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.64,1.65 sword1.h,1.19,1.20
Eugene Sandulenko
sev at users.sourceforge.net
Tue Nov 23 16:16:12 CET 2004
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7792/sword1
Modified Files:
sword1.cpp sword1.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: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- sword1.cpp 23 Nov 2004 00:03:24 -0000 1.64
+++ sword1.cpp 24 Nov 2004 00:14:19 -0000 1.65
@@ -109,6 +109,16 @@
if (!_mixer->isReady())
warning("Sound initialization failed");
+
+ // Add default file directories
+ File::addDefaultDirectory(_gameDataPath + "CLUSTERS/");
+ File::addDefaultDirectory(_gameDataPath + "MUSIC/");
+ File::addDefaultDirectory(_gameDataPath + "SPEECH/");
+ File::addDefaultDirectory(_gameDataPath + "VIDEO/");
+ File::addDefaultDirectory(_gameDataPath + "clusters/");
+ File::addDefaultDirectory(_gameDataPath + "music/");
+ File::addDefaultDirectory(_gameDataPath + "speech/");
+ File::addDefaultDirectory(_gameDataPath + "video/");
}
SwordEngine::~SwordEngine() {
@@ -123,19 +133,13 @@
delete _resMan;
}
-int SwordEngine::init() {
+int SwordEngine::init(GameDetector &detector) {
- // Add default file directories
- File::addDefaultDirectory(_gameDataPath + "CLUSTERS/");
- File::addDefaultDirectory(_gameDataPath + "MUSIC/");
- File::addDefaultDirectory(_gameDataPath + "SPEECH/");
- File::addDefaultDirectory(_gameDataPath + "VIDEO/");
- File::addDefaultDirectory(_gameDataPath + "clusters/");
- File::addDefaultDirectory(_gameDataPath + "music/");
- File::addDefaultDirectory(_gameDataPath + "speech/");
- File::addDefaultDirectory(_gameDataPath + "video/");
+ _system->beginGFXTransaction();
+ initCommonGFX(detector);
+ _system->initSize(640, 480);
+ _system->endGFXTransaction();
- _system->initSize(640, 480);
debug(5, "Starting resource manager");
_resMan = new ResMan("swordres.rif");
debug(5, "Starting object manager");
Index: sword1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sword1.h 23 Nov 2004 00:03:24 -0000 1.19
+++ sword1.h 24 Nov 2004 00:14:20 -0000 1.20
@@ -76,7 +76,7 @@
uint32 _features;
protected:
int go();
- int init();
+ int init(GameDetector &detector);
private:
void delay(uint amount);
More information about the Scummvm-git-logs
mailing list