From dbc3945d16c975570db5a4e39070552a9b48c390 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sun, 7 Feb 2021 15:35:17 +0000 Subject: [PATCH] Split out scene, audio fix. --- !TheEscape/!RunImage,ffb | Bin 16286 -> 16350 bytes !TheEscape/!RunImage,ffb.bas | 23 +++++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/!TheEscape/!RunImage,ffb b/!TheEscape/!RunImage,ffb index 71281219141eaf36d1396d0a0ff1d0a6ec902ae5..89a1f4c49d77b22f80095e540dc12e13d33cc6cb 100644 GIT binary patch delta 5439 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 F`+pY`@Hqeg diff --git a/!TheEscape/!RunImage,ffb.bas b/!TheEscape/!RunImage,ffb.bas index 5c79743..8a3d50f 100644 --- a/!TheEscape/!RunImage,ffb.bas +++ b/!TheEscape/!RunImage,ffb.bas @@ -16,17 +16,15 @@ PROCtitle PROCfinal_gfx_setup -PROCmain +PROCmain_scene1 END DEF PROCtitle - MODE 4 CLS PROCdraw_sprite("intro_25",320,256) KEY$ = GET$ - SCREENMODE% = 25 IF KEY$ = "1" THEN SCREENMODE% = 32 ENDIF @@ -39,6 +37,11 @@ DEF PROCtitle ENDPROC DEF PROCinitial_gfx_setup + SCREENMODE% = 4 + + + MODE SCREENMODE% + sprite_area% = FNload_sprites("Spr") ENDPROC @@ -60,17 +63,19 @@ DEF PROCfinal_gfx_setup REM Position text cursor at graphics location VDU 5 + ENDPROC DEF PROCaudio_setup - VOICE 1,"Percussion-Noise" + VOICES 2 + VOICE 1,"WaveSynth-Beep" + VOICE 2,"Percussion-Noise" ENDPROC -DEF PROCmain +DEF PROCmain_scene1 REM Current graphics buffer Scr% = 1 - DIM PlayerLocation%(1) PlayerLocation%(X) = SCREENGFXWIDTH%/2 PlayerLocation%(Y) = SCREENGFXHEIGHT%/PlayerYHeightDivide% @@ -125,8 +130,6 @@ DEF PROCmain SpeckLocations%(Speck%,Y) = RND(SCREENGFXHEIGHT%) NEXT Speck% - - REPEAT REM Store current time and last time LastCents% = Cents% @@ -186,7 +189,7 @@ DEF PROCplayer_ship_handle_damage PlayerExplodeNextFrame% = TIME + 4 IF PlayerSprite$ = "player_ship" THEN DieEnd% = TIME + 150 - SOUND 1,-5,0,50 + SOUND 2,-5,0,50 ENDIF CASE PlayerSprite$ OF WHEN "player_ship": PlayerSprite$ = "explode_shp1" @@ -209,7 +212,7 @@ DEF PROCenemy_ship_handle_damage FOR Enemy%=0 TO MaxEnemies% - 1 IF EnemyHealth%(Enemy%) <= 0 THEN IF EnemySprites$(Enemy%) = "durno_ship2" THEN - SOUND 1,-5,0,50 + SOUND 2,-5,0,50 ENDIF IF TIME > EnemyExplodeNextFrame%(Enemy%) THEN EnemyExplodeNextFrame%(Enemy%) = TIME + 4