diff options
| author | Johannes Schickel | 2009-07-25 12:59:46 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-07-25 12:59:46 +0000 |
| commit | 7e71865e91a19b022a5ad839802f79a5f300fe8d (patch) | |
| tree | c86e3e37eea3ec566c6c8a1811cb8cc16196b910 /engines/sword1 | |
| parent | 6d1a386471711df4c9ed48be3646a16f81ae0d46 (diff) | |
| download | scummvm-rg350-7e71865e91a19b022a5ad839802f79a5f300fe8d.tar.gz scummvm-rg350-7e71865e91a19b022a5ad839802f79a5f300fe8d.tar.bz2 scummvm-rg350-7e71865e91a19b022a5ad839802f79a5f300fe8d.zip | |
Move the event recorder to its own class (EventRecoder inside common/EventRecorder.[h/cpp]).
svn-id: r42751
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/logic.cpp | 3 | ||||
| -rw-r--r-- | engines/sword1/sound.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index 7e911bd197..be3797b0bd 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -28,6 +28,7 @@ #include "common/util.h" #include "common/system.h" #include "common/events.h" +#include "common/EventRecorder.h" #include "sword1/logic.h" #include "sword1/text.h" @@ -55,7 +56,7 @@ namespace Sword1 { uint32 Logic::_scriptVars[NUM_SCRIPT_VARS]; Logic::Logic(SwordEngine *vm, ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse, Sound *pSound, Music *pMusic, Menu *pMenu, OSystem *system, Audio::Mixer *mixer) { - g_system->getEventManager()->registerRandomSource(_rnd, "sword1"); + g_eventRec.registerRandomSource(_rnd, "sword1"); _vm = vm; _objMan = pObjMan; diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index b23bf71445..6ad946b28d 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -28,6 +28,7 @@ #include "common/util.h" #include "common/events.h" +#include "common/EventRecorder.h" #include "common/system.h" #include "sword1/sound.h" @@ -47,7 +48,7 @@ namespace Sword1 { #define SPEECH_FLAGS (Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_LITTLE_ENDIAN) Sound::Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan) { - g_system->getEventManager()->registerRandomSource(_rnd, "sword1sound"); + g_eventRec.registerRandomSource(_rnd, "sword1sound"); strcpy(_filePath, searchPath); _mixer = mixer; _resMan = pResMan; |