diff --git a/!RunImage,ff8 b/!RunImage,ff8 index 3ccef58..f7b82fa 100644 Binary files a/!RunImage,ff8 and b/!RunImage,ff8 differ diff --git a/Makefile,fe1 b/Makefile,fe1 index 02ad35f..8da425f 100644 --- a/Makefile,fe1 +++ b/Makefile,fe1 @@ -25,34 +25,27 @@ Linkflags = -aif -o $@ cc $(ccflags) -o @.o.Input @.c.Input # Dynamic dependencies: + +o.CTheEscape: c.CTheEscape +o.CTheEscape: C:h.swis +o.CTheEscape: C:h.kernel +o.CTheEscape: C:h.kernel +o.CTheEscape: h.Sound +o.CTheEscape: c.CTheEscape +o.CTheEscape: C:h.swis +o.CTheEscape: C:h.kernel +o.CTheEscape: C:h.kernel +o.CTheEscape: h.Sound +o.Graphics: c.Graphics +o.Graphics: C:h.swis +o.Graphics: C:h.kernel +o.Graphics: C:h.kernel o.Sound: c.Sound o.Sound: C:h.swis o.Sound: C:h.kernel o.Sound: C:h.kernel o.Sound: h.Sound -o.Graphics: c.Graphics -o.Graphics: C:h.swis -o.Graphics: C:h.kernel -o.Graphics: C:h.kernel -o.Graphics: c.Graphics -o.Graphics: C:h.swis -o.Graphics: C:h.kernel -o.Graphics: C:h.kernel o.Input: c.Input o.Input: C:h.swis o.Input: C:h.kernel o.Input: C:h.kernel -o.Input: c.Input -o.Input: C:h.swis -o.Input: C:h.kernel -o.Input: C:h.kernel -o.CTheEscape: c.CTheEscape -o.CTheEscape: C:h.swis -o.CTheEscape: C:h.kernel -o.CTheEscape: C:h.kernel -o.CTheEscape: h.Sound -o.CTheEscape: c.CTheEscape -o.CTheEscape: C:h.swis -o.CTheEscape: C:h.kernel -o.CTheEscape: C:h.kernel -o.CTheEscape: h.Sound diff --git a/c/CTheEscape b/c/CTheEscape index 3998433..f516371 100644 --- a/c/CTheEscape +++ b/c/CTheEscape @@ -451,6 +451,9 @@ void game_collider_tick() { NPCS[i].sprite = explode_shp1; NPCS[i].explodenextframe = tick + 4; + sound_play(1,-5,0,100); + sound_play(3,-15,0,1000); + sound_play(2,-10,1,100); } } } diff --git a/c/Sound b/c/Sound index 34f77fb..98c921d 100644 --- a/c/Sound +++ b/c/Sound @@ -38,15 +38,22 @@ void sound_set_voice(int voicenum, char* voicename) _kernel_swi(Sound_AttachNamedVoice,&inreg,&outreg); } -void sound_composition_element_play(struct CompositionElement element) +void sound_play(unsigned char Channel, signed char Volume, unsigned char Note, unsigned short int Length) { - inreg.r[0] = element.Channel; - inreg.r[1] = element.Volume; - inreg.r[2] = element.Note; - inreg.r[3] = element.Length; + inreg.r[0] = Channel; + inreg.r[1] = Volume; + inreg.r[2] = Note; + inreg.r[3] = Length; _kernel_swi(Sound_Control,&inreg,&outreg); } + +void sound_composition_element_play(struct CompositionElement element) +{ + sound_play(element.Channel, element.Volume, element.Note, element.Length); +} + + void sound_composition_init() { int i;