From 7b1e9a0a6bb821f8dd56c029d0d186c2e1073297 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sun, 28 Mar 2021 18:27:00 +0100 Subject: [PATCH] Some sound fixes (allow more than one composition) and death screen handling --- !TheEsc/!RunImage,ff8 | Bin 13868 -> 14684 bytes !TheEsc/Spr,ff9 | Bin 57624 -> 88180 bytes !TheEsc/c/CTheEscape | 22 +++++---- !TheEsc/c/Mission1 | 111 ++++++++++++++++++++++++++++++++++-------- !TheEsc/c/Sound | 2 + 5 files changed, 106 insertions(+), 29 deletions(-) diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index fd332acc1012420c0172d2076a83de25b4fcf514..d24757c354be64cfc54af07c9ef93256d19780cb 100644 GIT binary patch delta 3496 zcmZuz3vg6L7VYktm(1rSOdy#gGs(>4!vKMN2>9IvlBfxPBZ^j$2n3S_6)=Qom8_V+ zCgP$%?%mw39^`E7Gr+ro+W{8kMZgNKTM#n$GrA4cuMd!0J0`E)R-NReFqP z3sUK2?y(=naFTS1_H%E_N732^lvdUnW^Gz%fWGHmdskF*hLXfhVyQ|qMbL4-$_DE@ z8Qb1TYs5U!(@95ARI8M2$##!LkGKFPR?=!HuHgylIVvr%_=H!bH5QLZR_O(c&!-NX zF4F7wRM{<<+l=T?^~<~ijVgU%nJF?=@>%ovcQnK5=ikzU)*QiA+HB2J{)UMwG{@={ z2b^@m8suk)D=!Li(#uLvbU5ilC7bt?p)3_&Vg7Mt;xA6x8aGpvIq7svOQdqnN*n z1)Sja8;q?pih{D#^v@mihOOMOAC%}4UA7f?-bS^g$ZuHK@6O#GKsmfHJB`;JRAw(0 zI~??wec^4nft^P4#P$8mb->^ftU27wD)mdId4jn#-G&`zu4W_g!roBzKE{s22Ukh{ z04vc#Y0Ph=_4_H_F@>f(COBFgtlN)O-R__#9Wy7l;;`6`ZVK~~7MQ$8AB4&C=)zoW z#z@d?0Zo4b91gh%8}K+BChklpms25+^Vam*B)?(9Jmnm%Y}c?4&G6|7s&n3?+>Ft> zXqPjUe?|M8g?uRuIDaMF4hpK-qRc@vRi7wu&_im0{S2J$5`F`8wSpToppN&wZI|b+ z!!U7_F~BI!G>Z$zH@bqw33;N|P74zX#B+AqoDjU@9Xso0l{n)i(i=_hy=q3j^KS{G zqka_f8OQ?iVaOrK7RU!7pN1^?pF;kDE+u#~haertq@OU&2*a^e5Rbh@nl3Q6A8BHu zAE)oGL@&j;15R`h8?pR|}h=~Fcw=R|*oJ^*h$8Tda=c9);8qH(SqzKrJJ zzlc`he=j|c{~X$f|Lt_j<()AF7BAUYq^lBVhP4_)kT;`kJVq%FXu2DgMaH_Y?PoJ` z674dJ6d@ANgSTzCK3N~lnCBdoCgt#-s4l50yBAxxy1wRtx+OIY3}55QrHfWKGRE0t z-2rZojlxMmex%(#GL?(_Y?M7}jaX-+S4ZWQJqEjsZ88MQ4Kvp(hHzzJx0?IAWILk4 zj&&a^WuzV}>Z7HMb1mB?Kg&jrG_l~d$Dj-)1C@J#WmqLPy*=^h)Yjnv-Uum)w*13_9%Iz{k-1)Ewn1XgAX_ zcL0nkyC>S|B=NKj%8AQT_d&{ZN>3d{=hDXVE=o!tWhJmEkeWs%>ABXwf`m#6txX?e zeOp#erlnC&dM@8dM*3|dH(xdfli_qOVzvaR-cPrBf?`7)E%B5qyU}4Xg*=7)B|7Dq z#Gj=kZx!dX!aIvs&_3@pkrhXmz2&@wN;B?GxU8`5<%k~@slJ1DWlZuQKSVfd37aJ> z>_BW^FwOU{l>=>E^h3s3@rFWune%+d6c%X#lG!?hz(>Ym$a3KoRnxaBRPMV`9O|Se zeR*Y%VgwmjhgSKGx4^22_G-CnL%*^Z+rvIK_QdpFF)V*5o;A%;|~_Bh9(H`#faoeoOX7Xo?O}T_vFPbA5U1^Vmut}S&N7*Qs{`k z*jFYY0ZmVI^}_*8pM$pAB2DLLv!hL*Z8|07P7|t?=H|Z3L+#3F zFGt{J1^v96N`n<*$NRJ~SS;!-^nP$?Y@tuaED-%&ls)!@z{$Nj zHpu(hM~}0JDf0#EmI-OaPiDj!O<<2gR-*~50ditAfjt5_E}Fm?a`eMgH@+&V5EfDq z)L$1O6(Xps>DYL0)BGVblEJna&92sd71}Vgm1w(rgr>(ko5KNDhv642vdPsPwnBen z0hSmxD~8O$QU=MALU;9$T?SGL1tQdO_}@OKZ{

k9 z6NHU1gzI_!XBbGItLfXJUmv5N1p_hzUxa?;otnM{`Zd4M%O(FF`a#&|vs=O&z*!Z; z=`CuycA1<3=^c;+NHWzgiy;l4HyHW`95*-?a2ml`6vL6Tku_KzLl(wPEMc0S6XhNlGQCMZO}y6e zAExP%Z<^bS8LI%wCNWkD+yOcEQhoTr8mh|AY8qm!yQ4zB(6$+iqYpoa91zYQghSs0 zdu@Ir1NQ*KBhiJyZ^5mk;_^NVAPOU20xJ=SnJ5pU4B@Kz`Cn#a9?DK&4|oTllaD&- z+aX-=?XcT-(X>Zg2xkrjozJh1OaFke>3B#NJSEnC+1^($kC(sJ&RA^+W7ZzV0tXlq zNExy|9Y$n**%9Ole9g_*+T>$Swq5^Zy?S5!%A$8HzLr0u50DGUPuf`qEC=d4DC>qL zq)kqK=;@~!dlqN|wgKCL9e@VB2J8Xe1oi?QK<-v-8SrahI&crL7^nxDfi^$`_5wXX RFK`q%z7<1Wpu`(}{{bX(+UNiP delta 2723 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 C%r3(l^ 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 diff --git a/!TheEsc/c/CTheEscape b/!TheEsc/c/CTheEscape index 28bbce7..c9e7166 100644 --- a/!TheEsc/c/CTheEscape +++ b/!TheEsc/c/CTheEscape @@ -21,6 +21,7 @@ int lasttick = 0; extern int screen; extern int game1_tick(); +extern void game1_setup(); int game_hitbox_collide(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2) { @@ -35,26 +36,27 @@ int game_hitbox_collide(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int main(int argc, char *argv[]) { + int lastoutcome = 0; sound_on(); + // Set initial display mode display_mode(DISPLAY_MODE); - screen_clear(); - + + // Load sprite library load_sprites("Spr"); + // Intro titles + music intro(); - display_mode(DISPLAY_MODE); screen_clear(); - - game_setup(); - - while(game1_tick()); - screen_clear(); - printf("you ded\n"); - screen_flipbuffer(); + // Mission 1 + game1_setup(); + while(!lastoutcome) + { + lastoutcome = game1_tick(); + } free(buffer); diff --git a/!TheEsc/c/Mission1 b/!TheEsc/c/Mission1 index b523505..e2e834b 100644 --- a/!TheEsc/c/Mission1 +++ b/!TheEsc/c/Mission1 @@ -782,7 +782,7 @@ void game_draw_hud() draw_sprite("pointer",141+(Player.remainingdistance/7500),DISPLAY_Y - 164 + 4); } -void game_setup() +void game1_setup() { game_setup_input(); game_setup_audio(); @@ -816,6 +816,73 @@ void game_tick_player() } } +void game1_death() +{ + int currentstart = 0; + int introframe = 0; + sound_voices(4); + + sound_set_voice(1,"WaveSynth-Beep"); + sound_set_voice(2,"WaveSynth-Beep"); + sound_set_voice(3,"WaveSynth-Beep"); + sound_set_voice(4,"WaveSynth-Beep"); + sound_composition_init(); + + currentstart += 100; + sound_composition_element_add(currentstart,1,sound_note("D2"),150); + currentstart += 100; + sound_composition_element_add(currentstart,2,sound_note("G2"),200); + currentstart += 200; + sound_composition_element_add(currentstart,3,sound_note("B3"),75); + currentstart += 40; + sound_composition_element_add(currentstart,4,sound_note("G2"),75); + currentstart += 50; + sound_composition_element_add(currentstart,2,sound_note("B3"),200); + currentstart += 200; + sound_composition_element_add(currentstart,1,sound_note("A3"),100); + currentstart += 100; + sound_composition_element_add(currentstart,3,sound_note("G2"),150); + currentstart += 150; + sound_composition_element_add(currentstart,2,sound_note("E2"),100); + currentstart += 100; + sound_composition_element_add(currentstart,1,sound_note("D2"),150); + currentstart += 150; + sound_composition_element_add(currentstart,3,sound_note("D2"),150); + currentstart += 100; + sound_composition_element_add(currentstart,4,sound_note("G2"),150); + currentstart += 150; + sound_composition_element_add(currentstart,1,sound_note("B3"),75); + currentstart += 40; + sound_composition_element_add(currentstart,2,sound_note("G2"),75); + currentstart += 40; + sound_composition_element_add(currentstart,3,sound_note("B3"),150); + currentstart += 150; + sound_composition_element_add(currentstart,4,sound_note("A3"),130); + currentstart += 100; + sound_composition_element_add(currentstart,1,sound_note("G2"),200); + currentstart += 300; + tick = clock(); + + sound_composition_start(clock()); + + draw_sprite("spacebar",(DISPLAY_X/2)-106,50); + draw_sprite("kia",(DISPLAY_X/2)-300,500); + + screen_flipbuffer(); + + while(sound_composition_incomplete()) + { + sound_composition_tick(clock()); + + if(clock() > (tick + 200)) + { + if(input_readkey(98)) + sound_composition_stop(); + } + } +} + + int game1_tick() { lasttick = tick; @@ -824,24 +891,30 @@ int game1_tick() screen_flipbuffer(); screen_clear(); - PROFILE(game_tick_stars()); - PROFILE(game_tick_input()); - PROFILE(game_tick_player()); - PROFILE(game_tick_npcs()); - PROFILE(game_tick_collider()); - PROFILE(game_tick_player_targets()); - PROFILE(game_tick_npcs()); - PROFILE(game_tick_projectiles()); - PROFILE(game_draw_stars()); - PROFILE(game_draw_player()); - PROFILE(game_draw_npcs()); - PROFILE(game_draw_projectiles()); - - PROFILE(game_draw_hud()); - PROFILE(game_draw_debugmenu()); - if(Player.integrity > 0) - return 1; - else + { + PROFILE(game_tick_stars()); + PROFILE(game_tick_input()); + PROFILE(game_tick_player()); + PROFILE(game_tick_npcs()); + PROFILE(game_tick_collider()); + PROFILE(game_tick_player_targets()); + PROFILE(game_tick_npcs()); + PROFILE(game_tick_projectiles()); + PROFILE(game_draw_stars()); + PROFILE(game_draw_player()); + PROFILE(game_draw_npcs()); + PROFILE(game_draw_projectiles()); + + PROFILE(game_draw_hud()); + PROFILE(game_draw_debugmenu()); return 0; + }else{ + screen_flipbuffer(); + screen_clear(); + game1_death(); + return 1; + } + + } diff --git a/!TheEsc/c/Sound b/!TheEsc/c/Sound index 98c921d..84dacc6 100644 --- a/!TheEsc/c/Sound +++ b/!TheEsc/c/Sound @@ -61,6 +61,7 @@ void sound_composition_init() { composition[i].Start = -1; } + current_element = 0; } void sound_composition_element_add(int start, int channel, int note, int length) @@ -101,6 +102,7 @@ void sound_composition_debug() void sound_composition_start(int cent) { composition_startcent = cent; + current_playback_element = 0; } void sound_composition_stop()