From 3c0a6d25e95102daec253538b14d0592874e7ee7 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Thu, 13 May 2021 20:25:16 +0100
Subject: [PATCH] Movement fixes

---
 !TheEsc/!RunImage,ff8 | Bin 21236 -> 21256 bytes
 !TheEsc/c/Mission2    |  24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index 44b28879faabec6fee47fa66d506f49150507803..72b0aa0d489825fce342b9b740e9d292d695d4b8 100644
GIT binary patch
delta 2933
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

delta 2986
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
M?N0)?y;;J403E<;SO5S3

diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2
index bf73fe0..cb9798f 100644
--- a/!TheEsc/c/Mission2
+++ b/!TheEsc/c/Mission2
@@ -311,14 +311,15 @@ int game2_check_collide()
 
 void game2_tick_input()
 {
+  char movedy = 0;
+
   // Store in case we have a vertical collide
   TilePlayer.lastlocation.X = TilePlayer.location.X;
   TilePlayer.lastlocation.Y = TilePlayer.location.Y;
   TilePlayer.lastmapoffset.X = TilePlayer.mapoffset.X;
   TilePlayer.lastmapoffset.Y = TilePlayer.mapoffset.Y;
-  
-  // Up arrow
-  if(input_readkey(57))
+
+  if(input_readkey(57))// Up arrow
   {
     TilePlayer.location.Y += 3 * (tick - lasttick);
     if(TilePlayer.location.Y > (910))
@@ -327,10 +328,9 @@ void game2_tick_input()
       TilePlayer.mapoffset.Y += 10;
       game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y);
     }
+    movedy = 1;
   }
-
-  // Down arrow
-  if(input_readkey(41))
+  else if(input_readkey(41))// Down arrow
   {
     TilePlayer.location.Y -= 3 * (tick - lasttick);
     if(TilePlayer.location.Y < (10))
@@ -344,6 +344,7 @@ void game2_tick_input()
         TilePlayer.location.Y = TilePlayer.lastlocation.Y;
       }
     }
+    movedy = 1;
   }
 
 
@@ -355,12 +356,15 @@ void game2_tick_input()
     TilePlayer.mapoffset.Y = TilePlayer.lastmapoffset.Y;
   }
 
+  // Dont allow horizontal and vertical - makes movement sketchy
+  if(movedy == 1)
+    return;
+
   // Store in case we have a horizontal collide
   TilePlayer.lastlocation.X = TilePlayer.location.X;
   TilePlayer.lastlocation.Y = TilePlayer.location.Y;
 
-  // Right arrow
-  if(input_readkey(121))
+  if(input_readkey(121))// Right arrow
   {
     TilePlayer.location.X += 3 * (tick - lasttick);
     if(TilePlayer.location.X > (910))
@@ -370,9 +374,7 @@ void game2_tick_input()
       game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y);
     }
   }
-
-  // Left arrow
-  if(input_readkey(25))
+  else if(input_readkey(25))// Left arrow
   {
     TilePlayer.location.X -= 3 * (tick - lasttick);
     if(TilePlayer.location.X < (10))