aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudvig Strigeus2001-12-28 18:43:02 +0000
committerLudvig Strigeus2001-12-28 18:43:02 +0000
commit11312eba66f196bb95d1613a7ca742bcad2b1e53 (patch)
tree97782200823e985edf0a984ecf47abf263b20bf2
parentb4c2832e5f3421d7b619f98910989f53fec86ec4 (diff)
downloadscummvm-rg350-11312eba66f196bb95d1613a7ca742bcad2b1e53.tar.gz
scummvm-rg350-11312eba66f196bb95d1613a7ca742bcad2b1e53.tar.bz2
scummvm-rg350-11312eba66f196bb95d1613a7ca742bcad2b1e53.zip
fixed the programming style on some lines
svn-id: r3537
-rw-r--r--sound/imuse.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/imuse.cpp b/sound/imuse.cpp
index 6914cbcde3..77edde58c0 100644
--- a/sound/imuse.cpp
+++ b/sound/imuse.cpp
@@ -365,7 +365,7 @@ void SoundEngine::handle_marker(uint id, byte data) {
_trigger_count--;
_queue_cleared = false;
do {
- pos = (++pos) & (ARRAYSIZE(_cmd_queue)-1);
+ pos = (pos+1) & (ARRAYSIZE(_cmd_queue)-1);
if (_queue_pos == pos)
break;
p = _cmd_queue[pos].array;
@@ -508,7 +508,7 @@ int SoundEngine::get_queue_sound_status(int sound) {
a = _cmd_queue[i].array;
if (a[0] == COMMAND_ID && a[1] == 8 && a[2] == (uint16)sound)
return 2;
- i = (++i) & (ARRAYSIZE(_cmd_queue)-1);
+ i = (i+1) & (ARRAYSIZE(_cmd_queue)-1);
}
return 0;
}
@@ -592,13 +592,13 @@ int SoundEngine::enqueue_command(int a, int b, int c, int d, int e, int f, int g
p[6] = f;
p[7] = g;
- i = (++i) & (ARRAYSIZE(_cmd_queue)-1);
+ i = (i+1) & (ARRAYSIZE(_cmd_queue)-1);
if (_queue_end!=i) {
_queue_pos = i;
return 0;
} else {
- _queue_pos = (--i) & (ARRAYSIZE(_cmd_queue)-1);
+ _queue_pos = (i-1) & (ARRAYSIZE(_cmd_queue)-1);
return -1;
}
}
@@ -652,9 +652,9 @@ int SoundEngine::enqueue_trigger(int sound, int marker) {
p[1] = sound;
p[2] = marker;
- pos = (++pos) & (ARRAYSIZE(_cmd_queue)-1);
+ pos = (pos+1) & (ARRAYSIZE(_cmd_queue)-1);
if (_queue_end==pos) {
- _queue_pos = (--pos) & (ARRAYSIZE(_cmd_queue)-1);
+ _queue_pos = (pos-1) & (ARRAYSIZE(_cmd_queue)-1);
return -1;
}