[Scummvm-cvs-logs] SF.net SVN: scummvm:[39489] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Tue Mar 17 20:04:59 CET 2009
Revision: 39489
http://scummvm.svn.sourceforge.net/scummvm/?rev=39489&view=rev
Author: peres001
Date: 2009-03-17 19:04:59 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Removed one of the overloads of SoundMan::execute(), to make retarded compiler happy. Added a couple of explicit casts from bool to int, so that other compiler don't complain instead.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/sound.h
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2009-03-17 18:44:31 UTC (rev 39488)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2009-03-17 19:04:59 UTC (rev 39489)
@@ -142,7 +142,7 @@
void Parallaction::pauseEngineIntern(bool pause) {
if (_soundMan) {
- _soundMan->execute(SC_PAUSE, pause);
+ _soundMan->execute(SC_PAUSE, (int)pause);
}
}
@@ -638,9 +638,9 @@
case kZoneHear:
_soundMan->execute(SC_SETSFXCHANNEL, z->u.hear->_channel);
- _soundMan->execute(SC_SETSFXLOOPING, ((z->_flags & kFlagsLooping) == kFlagsLooping));
+ _soundMan->execute(SC_SETSFXLOOPING, (int)((z->_flags & kFlagsLooping) == kFlagsLooping));
_soundMan->execute(SC_SETSFXVOLUME, 60);
- _soundMan->execute(SC_PLAYSFX, z->u.hear->_name);
+ _soundMan->execute(SC_PLAYSFX, z->u.hear->_name);
break;
case kZoneSpeak:
@@ -986,9 +986,9 @@
}
void Parallaction::beep() {
- _soundMan->execute(SC_SETSFXCHANNEL, 3);
- _soundMan->execute(SC_SETSFXVOLUME, 127);
- _soundMan->execute(SC_SETSFXLOOPING, 0);
+ _soundMan->execute(SC_SETSFXCHANNEL, 3);
+ _soundMan->execute(SC_SETSFXVOLUME, 127);
+ _soundMan->execute(SC_SETSFXLOOPING, 0);
_soundMan->execute(SC_PLAYSFX, "beep");
}
Modified: scummvm/trunk/engines/parallaction/sound.h
===================================================================
--- scummvm/trunk/engines/parallaction/sound.h 2009-03-17 18:44:31 UTC (rev 39488)
+++ scummvm/trunk/engines/parallaction/sound.h 2009-03-17 19:04:59 UTC (rev 39489)
@@ -57,9 +57,6 @@
public:
SoundMan(SoundManImpl *impl) : _impl(impl) { }
virtual ~SoundMan() { delete _impl; }
- void execute(int command, bool parm) {
- execute(command, parm ? "1" : "0");
- }
void execute(int command, int32 parm) {
char n[12];
sprintf(n, "%i", parm);
@@ -104,7 +101,7 @@
int _sfxVolume;
int _sfxRate;
uint _sfxChannel;
-
+
int _musicType;
public:
@@ -176,7 +173,7 @@
};
class DummySoundMan : public SoundManImpl {
-public:
+public:
void execute(int command, const char *parm) { }
};
@@ -191,7 +188,7 @@
int _sfxVolume;
int _sfxRate;
uint _sfxChannel;
-
+
virtual void playMusic() = 0;
virtual void stopMusic() = 0;
virtual void pause(bool p) = 0;
@@ -202,7 +199,7 @@
virtual void playSfx(const char *filename, uint channel, bool looping, int volume = -1) { }
virtual void stopSfx(uint channel) { }
- virtual void execute(int command, const char *parm);
+ virtual void execute(int command, const char *parm);
void setMusicFile(const char *parm);
};
@@ -213,7 +210,7 @@
public:
DosSoundMan_br(Parallaction_br *vm, MidiDriver *midiDriver);
~DosSoundMan_br();
-
+
void playMusic();
void stopMusic();
void pause(bool p);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list