From 82fa55157ff9d3c8115b143440120c2266237f5d Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Tue, 18 May 2021 21:22:16 +0100 Subject: [PATCH] Stop phasers getting stuck firing at end of Mission1 --- !TheEsc/!RunImage,ff8 | Bin 23612 -> 23632 bytes !TheEsc/Makefile,fe1 | 10 ++-------- !TheEsc/Tools,fe1 | 6 ------ !TheEsc/c/Mission1 | 4 ++++ 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index bc136f23c84dd94a4d170dc907feccf3b3e13963..e7566281d34bb60bf9a33d8ef339f8952c0f7384 100644 GIT binary patch delta 2489 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 ZTm-N%*_rfDce9vjDN}89)spLm{{zy$u3Z2C diff --git a/!TheEsc/Makefile,fe1 b/!TheEsc/Makefile,fe1 index 349038d..23a0c83 100644 --- a/!TheEsc/Makefile,fe1 +++ b/!TheEsc/Makefile,fe1 @@ -52,12 +52,8 @@ o.Graphics: c.Graphics o.Graphics: C:h.swis o.Graphics: C:h.kernel o.Graphics: 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: h.Graphics +o.Intro: c.Intro +o.Intro: h.Graphics o.CTheEscape: c.CTheEscape o.CTheEscape: C:h.swis o.CTheEscape: C:h.kernel @@ -69,8 +65,6 @@ o.Sound: C:h.swis o.Sound: C:h.kernel o.Sound: C:h.kernel o.Sound: h.Sound -o.Intro: c.Intro -o.Intro: h.Graphics o.Mission1: c.Mission1 o.Mission1: h.Graphics o.Mission1: h.Sound diff --git a/!TheEsc/Tools,fe1 b/!TheEsc/Tools,fe1 index b835451..0052b8d 100644 --- a/!TheEsc/Tools,fe1 +++ b/!TheEsc/Tools,fe1 @@ -57,12 +57,6 @@ o.MapEdit: C:h.kernel o.MapEdit: C:h.kernel o.MapEdit: h.Sound o.MapEdit: h.Graphics -o.MapEdit: c.MapEdit -o.MapEdit: C:h.swis -o.MapEdit: C:h.kernel -o.MapEdit: C:h.kernel -o.MapEdit: h.Sound -o.MapEdit: h.Graphics o.Graphics: c.Graphics o.Graphics: C:h.swis o.Graphics: C:h.kernel diff --git a/!TheEsc/c/Mission1 b/!TheEsc/c/Mission1 index 9524e21..4bff49f 100644 --- a/!TheEsc/c/Mission1 +++ b/!TheEsc/c/Mission1 @@ -1031,6 +1031,10 @@ int game1_tick() return 2; }else if (Player.remainingdistance <= 120000) { + // Stop firing phasers so they dont get stuck + Player.firingleft = 0; + Player.firingright = 0; + if(Player.remainingdistance <= 80000) { PROFILE(game_draw_tractor());