[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.127,1.128 sky.h,1.53,1.54
Max Horn
fingolfin at users.sourceforge.net
Sun Nov 9 17:05:06 CET 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv4333/sky
Modified Files:
sky.cpp sky.h
Log Message:
cut down on unnecessary GameDetector references
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- sky.cpp 1 Nov 2003 16:39:26 -0000 1.127
+++ sky.cpp 10 Nov 2003 01:04:11 -0000 1.128
@@ -113,7 +113,7 @@
SystemVars SkyEngine::_systemVars = {0, 0, 0, 0, 4316, 0, 0, false, false };
SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
- : Engine(detector, syst) {
+ : Engine(syst) {
if (!_mixer->bindToSystem(syst))
warning("Sound initialisation failed.");
@@ -122,7 +122,7 @@
_debugMode = ConfMan.hasKey("debuglevel");
_debugLevel = ConfMan.getInt("debuglevel");
- _detector = detector;
+ _midi = detector->_game.midi;
_floppyIntro = ConfMan.getBool("floppy_intro");
@@ -256,16 +256,16 @@
_systemVars.gameVersion = _skyDisk->determineGameVersion();
- int midiDriver = GameDetector::detectMusicDriver(_detector->_game.midi);
+ int midiDriver = GameDetector::detectMusicDriver(_midi);
if (midiDriver == MD_ADLIB) {
_systemVars.systemFlags |= SF_SBLASTER;
_skyMusic = new SkyAdlibMusic(_mixer, _skyDisk, _system);
} else {
_systemVars.systemFlags |= SF_ROLAND;
if (ConfMan.getBool("native_mt32"))
- _skyMusic = new SkyMT32Music(_detector->createMidi(midiDriver), _skyDisk, _system);
+ _skyMusic = new SkyMT32Music(GameDetector::createMidi(midiDriver), _skyDisk, _system);
else
- _skyMusic = new SkyGmMusic(_detector->createMidi(midiDriver), _skyDisk, _system);
+ _skyMusic = new SkyGmMusic(GameDetector::createMidi(midiDriver), _skyDisk, _system);
}
if (isCDVersion()) {
@@ -289,7 +289,7 @@
_skyLogic = new SkyLogic(_skyScreen, _skyDisk, _skyText, _skyMusic, _skyMouse, _skySound);
_skyMouse->useLogicInstance(_skyLogic);
- _timer = Engine::_timer; // initialize timer *after* _skyScreen has been initialized.
+ // initialize timer *after* _skyScreen has been initialized.
_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
_skyControl = new SkyControl(_skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _skySound, _system, getSavePath());
Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- sky.h 28 Oct 2003 17:07:25 -0000 1.53
+++ sky.h 10 Nov 2003 01:04:11 -0000 1.54
@@ -25,6 +25,8 @@
#include "stdafx.h"
#include "base/engine.h"
+class GameDetector;
+
struct SystemVars {
uint32 systemFlags;
uint32 gameVersion;
@@ -75,7 +77,7 @@
SkyMusicBase *_skyMusic;
SkyIntro *_skyIntro;
- GameDetector *_detector; // necessary for music
+ int _midi; // necessary for music
public:
SkyEngine(GameDetector *detector, OSystem *syst);
More information about the Scummvm-git-logs
mailing list