aboutsummaryrefslogtreecommitdiff
path: root/sword1/logic.h
diff options
context:
space:
mode:
authorJames Brown2004-01-18 05:52:04 +0000
committerJames Brown2004-01-18 05:52:04 +0000
commitad46828d1c8fb68c3c44c5c38c5ac9b2031a2fc9 (patch)
tree4253ac14e5934508d7a455cafdf1fec88d0af866 /sword1/logic.h
parenta95818d29a706095517ada079f316ad74f20a86d (diff)
downloadscummvm-rg350-ad46828d1c8fb68c3c44c5c38c5ac9b2031a2fc9.tar.gz
scummvm-rg350-ad46828d1c8fb68c3c44c5c38c5ac9b2031a2fc9.tar.bz2
scummvm-rg350-ad46828d1c8fb68c3c44c5c38c5ac9b2031a2fc9.zip
BS1 cutscene support. Also bugfixes (don't crash if cutscene ogg unavailable)
svn-id: r12465
Diffstat (limited to 'sword1/logic.h')
-rw-r--r--sword1/logic.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sword1/logic.h b/sword1/logic.h
index c49d12092b..3d3fc47288 100644
--- a/sword1/logic.h
+++ b/sword1/logic.h
@@ -26,6 +26,7 @@
#include "sworddefs.h"
#include "objectman.h"
#include "common/util.h"
+#include "sound/mixer.h"
namespace Sword1 {
@@ -46,7 +47,7 @@ typedef int (Logic::*BSMcodeTable)(Object *, int32, int32, int32, int32, int32,
class Logic {
public:
- Logic(ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse, Sound *pSound, Music *pMusic, Menu *pMenu);
+ Logic(ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse, Sound *pSound, Music *pMusic, Menu *pMenu, OSystem *system, SoundMixer *mixer);
~Logic(void);
void initialize(void);
void newScreen(uint32 screen);
@@ -66,6 +67,8 @@ public:
int cfnPresetScript (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
private:
ObjectMan *_objMan;
+ OSystem *_system;
+ SoundMixer *_mixer;
ResMan *_resMan;
Screen *_screen;
Sound *_sound;