[Scummvm-cvs-logs] SF.net SVN: scummvm: [32490] scummvm/trunk/engines/drascula
sev at users.sourceforge.net
sev at users.sourceforge.net
Mon Jun 2 08:51:59 CEST 2008
Revision: 32490
http://scummvm.svn.sourceforge.net/scummvm/?rev=32490&view=rev
Author: sev
Date: 2008-06-01 23:51:59 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Better implementation of packet games loading
Modified Paths:
--------------
scummvm/trunk/engines/drascula/detection.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/drascula/drascula.h
Modified: scummvm/trunk/engines/drascula/detection.cpp
===================================================================
--- scummvm/trunk/engines/drascula/detection.cpp 2008-06-02 05:56:53 UTC (rev 32489)
+++ scummvm/trunk/engines/drascula/detection.cpp 2008-06-02 06:51:59 UTC (rev 32490)
@@ -47,8 +47,19 @@
return _gameDescription->desc.language;
}
+void DrasculaEngine::loadArchives() {
+ const Common::ADGameFileDescription *ag;
+
+ if (getFeatures() & GF_PACKED) {
+ for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++)
+ _arj.registerArchive(ag->fileName);
+ }
+
+ _arj.enableFallback(true);
}
+}
+
static const PlainGameDescriptor drasculaGames[] = {
{"drascula", "Drascula: The Vampire Strikes Back"},
{0, 0}
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2008-06-02 05:56:53 UTC (rev 32489)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2008-06-02 06:51:59 UTC (rev 32490)
@@ -58,8 +58,6 @@
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
- const GameSettings *g;
-
_rnd = new Common::RandomSource();
syst->getEventManager()->registerRandomSource(*_rnd, "drascula");
@@ -102,13 +100,7 @@
_lang = 0;
}
- _arj.registerArchive("packet.001");
- // Use override files for non-English versions
- if (_lang == 3) // French
- _arj.registerArchive("packet.002");
- else if (_lang == 2) // German
- _arj.registerArchive("packet.003");
- _arj.enableFallback(true);
+ loadArchives();
return 0;
}
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2008-06-02 05:56:53 UTC (rev 32489)
+++ scummvm/trunk/engines/drascula/drascula.h 2008-06-02 06:51:59 UTC (rev 32490)
@@ -162,6 +162,8 @@
Common::Language getLanguage() const;
void updateEvents();
+ void loadArchives();
+
Audio::SoundHandle _soundHandle;
void allocMemory();
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