diff options
Diffstat (limited to 'engines/sci/engine/ksound.cpp')
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 22437d86b7..3a60f77fff 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -91,8 +91,7 @@ namespace Sci { #define SCRIPT_ASSERT_ZERO(fun) if (fun) script_debug_flag = script_error_flag = 1; -static void -script_set_priority(EngineState *s, reg_t obj, int priority) { +static void script_set_priority(EngineState *s, reg_t obj, int priority) { int song_nr = GET_SEL32V(obj, number); resource_t *song = scir_find_resource(s->resmgr, sci_sound, song_nr, 0); int flags = GET_SEL32V(obj, flags); @@ -110,8 +109,7 @@ script_set_priority(EngineState *s, reg_t obj, int priority) { PUT_SEL32V(obj, flags, flags); } -song_iterator_t * -build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) { +song_iterator_t *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) { resource_t *song = scir_find_resource(s->resmgr, sci_sound, song_nr, 0); if (!song) @@ -121,8 +119,7 @@ build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) { } -void -process_sound_events(EngineState *s) { /* Get all sound events, apply their changes to the heap */ +void process_sound_events(EngineState *s) { /* Get all sound events, apply their changes to the heap */ int result; song_handle_t handle; int cue; @@ -174,8 +171,7 @@ process_sound_events(EngineState *s) { /* Get all sound events, apply their chan } -reg_t -kDoSound_SCI0(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kDoSound_SCI0(EngineState *s, int funct_nr, int argc, reg_t *argv) { reg_t obj = KP_ALT(1, NULL_REG); uint16 command = UKPV(0); song_handle_t handle = FROBNICATE_HANDLE(obj); @@ -362,12 +358,10 @@ kDoSound_SCI0(EngineState *s, int funct_nr, int argc, reg_t *argv) { return s->r_acc; } -int -sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel, +int sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel, int command, int arg1, int arg2); -reg_t -kDoSound_SCI01(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kDoSound_SCI01(EngineState *s, int funct_nr, int argc, reg_t *argv) { uint16 command = UKPV(0); reg_t obj = KP_ALT(1, NULL_REG); song_handle_t handle = FROBNICATE_HANDLE(obj); @@ -667,12 +661,10 @@ kDoSound_SCI01(EngineState *s, int funct_nr, int argc, reg_t *argv) { return s->r_acc; } -int -sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel, +int sfx_send_midi(sfx_state_t *self, song_handle_t handle, int channel, int command, int arg1, int arg2); -reg_t -kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) { uint16 command = UKPV(0); reg_t obj = KP_ALT(1, NULL_REG); song_handle_t handle = FROBNICATE_HANDLE(obj); @@ -979,8 +971,7 @@ kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) { return s->r_acc; } -reg_t -kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) { if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_2) return kDoSound_SCI1(s, funct_nr, argc, argv); else if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_1) @@ -989,8 +980,7 @@ kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) { return kDoSound_SCI0(s, funct_nr, argc, argv); } -reg_t -kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) { +reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) { switch (UKPV(0)) { case _K_SCI1_AUDIO_POSITION : return make_reg(0, -1); /* Finish immediately */ |