aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Montoir2003-11-16 11:17:35 +0000
committerGregory Montoir2003-11-16 11:17:35 +0000
commit587f2d7177fa5b8b5c302ab23fe42fb04b0c9ae9 (patch)
treeffb0f95d5e9e90eda0d49ebaf9756101154ade53
parent74d8b6ef2831625ac6c84082b0a345fe5e8e711c (diff)
downloadscummvm-rg350-587f2d7177fa5b8b5c302ab23fe42fb04b0c9ae9.tar.gz
scummvm-rg350-587f2d7177fa5b8b5c302ab23fe42fb04b0c9ae9.tar.bz2
scummvm-rg350-587f2d7177fa5b8b5c302ab23fe42fb04b0c9ae9.zip
fix song playafter/playbefore type issue
svn-id: r11307
-rw-r--r--queen/command.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/queen/command.cpp b/queen/command.cpp
index 2374dfacda..fb357a4411 100644
--- a/queen/command.cpp
+++ b/queen/command.cpp
@@ -423,7 +423,7 @@ void Command::executeCurrentAction(bool walk) {
}
// only play song if it's a PLAY AFTER type
- if (com->song > 0) {
+ if (com->song < 0) {
_sound->playSong(com->song);
}
@@ -1046,7 +1046,7 @@ void Command::changeObjectState(const Verb& action, int16 obj, int16 song, bool
// play music if it exists... (or SFX for open/close door)
if (song != 0) {
- _sound->playSong(abs(song));
+ _sound->playSong(ABS(song));
}
if (objData->entryObj != 0) {
@@ -1068,7 +1068,7 @@ void Command::changeObjectState(const Verb& action, int16 obj, int16 song, bool
// play music if it exists... (or SFX for open/close door)
if (song != 0) {
- _sound->playSong(abs(song));
+ _sound->playSong(ABS(song));
}
if (objData->entryObj != 0) {