aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/sound.h
diff options
context:
space:
mode:
authorNicola Mettifogo2009-03-14 15:34:28 +0000
committerNicola Mettifogo2009-03-14 15:34:28 +0000
commit14ced31851d3136bba55c57e58abef93502b1a4f (patch)
tree41665d2c9670a392298e104426eb5e4cd33ee2d5 /engines/parallaction/sound.h
parent8723afd6f4a6c5d7163d509b0fa22cd562de3233 (diff)
downloadscummvm-rg350-14ced31851d3136bba55c57e58abef93502b1a4f.tar.gz
scummvm-rg350-14ced31851d3136bba55c57e58abef93502b1a4f.tar.bz2
scummvm-rg350-14ced31851d3136bba55c57e58abef93502b1a4f.zip
Fixed building on 64-bit architectures.
svn-id: r39395
Diffstat (limited to 'engines/parallaction/sound.h')
-rw-r--r--engines/parallaction/sound.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h
index e3eac1ccff..72d22e02b4 100644
--- a/engines/parallaction/sound.h
+++ b/engines/parallaction/sound.h
@@ -43,11 +43,9 @@ namespace Parallaction {
class Parallaction_ns;
class MidiPlayer;
-typedef void* SoundManCommandParameter;
-
class SoundManImpl {
public:
- virtual void execute(int command, SoundManCommandParameter parm) = 0;
+ virtual void execute(int command, const char *parm = 0) = 0;
virtual ~SoundManImpl() { }
};
@@ -56,7 +54,15 @@ class SoundMan {
public:
SoundMan(SoundManImpl *impl) : _impl(impl) { }
virtual ~SoundMan() { delete _impl; }
- void execute(int command, SoundManCommandParameter parm = 0) {
+ void execute(int command, bool parm) {
+ execute(command, parm ? "1" : "0");
+ }
+ void execute(int command, int32 parm) {
+ char n[12];
+ sprintf(n, "%i", parm);
+ execute(command, n);
+ }
+ void execute(int command, const char *parm = 0) {
if (_impl) {
_impl->execute(command, parm);
}
@@ -111,7 +117,7 @@ public:
virtual void playCharacterMusic(const char *character) = 0;
virtual void playLocationMusic(const char *location) = 0;
virtual void pause(bool p) { }
- virtual void execute(int command, SoundManCommandParameter parm = 0);
+ virtual void execute(int command, const char *parm);
void setMusicVolume(int value);
};
@@ -168,7 +174,7 @@ public:
class DummySoundMan : public SoundManImpl {
public:
- void execute(int command, SoundManCommandParameter parm) { }
+ void execute(int command, const char *parm) { }
};
} // namespace Parallaction