diff options
| author | Max Horn | 2003-09-17 21:06:16 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-17 21:06:16 +0000 |
| commit | 468275bb94f975b9e1c2e7e90a03caa37bd0e142 (patch) | |
| tree | 1c3a7f30ca33043dba1a7de1119d6c50da7181fa /sword2/sword2.cpp | |
| parent | c0d1061a2dcfd8c50c70ca99b99a41e81207fa86 (diff) | |
| download | scummvm-rg350-468275bb94f975b9e1c2e7e90a03caa37bd0e142.tar.gz scummvm-rg350-468275bb94f975b9e1c2e7e90a03caa37bd0e142.tar.bz2 scummvm-rg350-468275bb94f975b9e1c2e7e90a03caa37bd0e142.zip | |
added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes
svn-id: r10278
Diffstat (limited to 'sword2/sword2.cpp')
| -rw-r--r-- | sword2/sword2.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index be35ccb59a..fe99a229c1 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -87,6 +87,7 @@ static const TargetSettings sword2_settings[] = { }; Sword2State *g_sword2 = NULL; +Sword2Sound *g_sound = NULL; const TargetSettings *Engine_SWORD2_targetList() { return sword2_settings; @@ -114,7 +115,9 @@ Sword2State::Sword2State(GameDetector *detector, OSystem *syst) _mixer->setVolume(kDefaultSFXVolume * kDefaultMasterVolume / 255); _mixer->setMusicVolume(kDefaultMusicVolume * kDefaultMasterVolume / 255); - _sound = new Sword2Sound(_mixer); + g_sound = _sound = new Sword2Sound(_mixer); + + File::setDefaultDirectory(_gameDataPath); } |