From 1287fef6269d3cfc7857b1735fdd33f50c7f3def Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodissident@gmail.com>
Date: Mon, 17 Feb 2020 16:10:41 +0100
Subject: [PATCH] Glue & better ice texture

---
 assets-cg/img/glue.png | Bin 0 -> 125 bytes
 assets-cg/img/ice.png  | Bin 123 -> 181 bytes
 levels.lua             |   5 +++--
 platform.g3a           | Bin 58100 -> 58556 bytes
 src/collide.c          |   3 ++-
 src/draw.c             |   7 ++++++-
 src/main.c             |  23 +++++++++++++----------
 7 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 assets-cg/img/glue.png

diff --git a/assets-cg/img/glue.png b/assets-cg/img/glue.png
new file mode 100644
index 0000000000000000000000000000000000000000..7490a8beac7ce9c0ca02efc759becb23b8c73930
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!3HEhl+{lMQjEnx?oJHr&dIz4a?Cwl978lF
zCjZ$#<Doq>YeT2d*$~49*6A$CI?T$<K%l38=*i3k9w)YkQ`!wD<Q`hqIpNO%MurO)
Wc}^F+?KT1$!QkoY=d#Wzp$P!N<t54h

literal 0
HcmV?d00001

diff --git a/assets-cg/img/ice.png b/assets-cg/img/ice.png
index cfaf2e19762c67051d88026f2a3a7e46ee094f5e..4910965555856a3e09dd67ff1965f0cd98b3b39c 100644
GIT binary patch
delta 165
zcmb>4$~Zy1o`Zvpfq~&eS^ab%#aJBV?!>U}oXkrgC*RY>F+^ix@|Bq1|LvJY&WKnu
zCL1l;zbV0i{l=4-8W(xY8)DA#06|YXpZx!R?@1DeBMUs^_|sBS5`dr~s=<36=lqnH
zea9<!_3wV1(I{vswjuN0r%<-_Hr%_OEIfQ%QbIyrLL#m9$&nBGW|a*4T3zBf&kIEY
P?Pl<F^>bP0l+XkKU;{n~

delta 106
zcmdnWSUo{Jg@uESfq|iY%l<b&im^Dz-HBn{IhmJ0j;W`MV~E7m<SQ}1|JyT*oDs1;
zcmN0{{5#c@VJECQOHx8Yf$e}r*|uptDxW9r1xh&>$urdN(moNOwevU700vK2KbLh*
G2~7a@NhnbO

diff --git a/levels.lua b/levels.lua
index 42389c6..c20eed3 100644
--- a/levels.lua
+++ b/levels.lua
@@ -4,6 +4,7 @@
 -- v spike
 -- ^ elevator
 -- ~ ice
+-- # glue
 -- j jump upgrade
 --
 -- level id format : YYXX with YY and XX being the Y and X position on the map
@@ -78,9 +79,9 @@ levels = {[5049] = [[
 -00......................00-
 -00......................00-
 -00......................00-
--00......................00-
+-00...........000000000vv00-
 -00v.....................00-
--0000000....000000000000000-
+-0000000....000#######00000-
 -0000000....000000000000000-
 ----------------------------
 ]],
diff --git a/platform.g3a b/platform.g3a
index 8beb18ae248b48a2b090d2e8d9a87327bdb6102d..55be0dfeceeb5ae361deb425f7cf5ab5aea51b12 100644
GIT binary patch
delta 3615
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
ICHSB3e>CT{i~s-t

delta 3208
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
MeK&rP<DZNF1GX(20ssI2

diff --git a/src/collide.c b/src/collide.c
index 99ccb95..056a14a 100644
--- a/src/collide.c
+++ b/src/collide.c
@@ -18,5 +18,6 @@ char collide_solid(int x, int y, char level[])
 {
   return (collide(x, y, level, '0') ||
     collide(x, y, level, '^') ||
-    collide(x, y, level, '~'));
+    collide(x, y, level, '~') ||
+    collide(x, y, level, '#'));
 }
diff --git a/src/draw.c b/src/draw.c
index 1423103..59d8128 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -25,7 +25,8 @@ void draw_level(char level[], char upgrades[])
   extern image_t img_ground; //ground texture, 16x16
   extern image_t img_spike; //spike texture, 16x16
   extern image_t img_elevator; //elevator texture, 16x16
-  extern image_t img_ice; //ice texture, 16x4
+  extern image_t img_ice; //ice texture, 16x8
+  extern image_t img_glue; //glue texture, 16x8
   extern image_t img_jitem; //jump item texture, 16x16
   unsigned int i = 0;
   unsigned int x = 0;
@@ -47,6 +48,10 @@ void draw_level(char level[], char upgrades[])
         dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ground);
         dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ice);
         break;
+      case '#':
+        dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ground);
+        dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_glue);
+        break;
       case 'j':
         if (!upgrades[0])
           dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_jitem);
diff --git a/src/main.c b/src/main.c
index bd8d2e1..7cb1a6d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 #include "levels.h"
 #include "player.h"
 
-#define MAX_HSPD 2.0
+#define MAX_HSPD 2.5
 #define ACCELERATION 1
 #define DECELERATION 0.5
 #define MIN_VSPD -12.0
@@ -93,18 +93,21 @@ int main(void)
         if (hspd < 0) hspd = 0;
       }
       trunc_hspd = hspd * direction;
-      if (!collide_solid(player_x + trunc_hspd, player_y, level))
+      if (!collide(player_x, player_y + 1, level, '#'))
       {
-        player_x += trunc_hspd;
-      }
-      else
-      {
-        int sign_hspd = sgn(trunc_hspd);
-        while (!collide_solid(player_x + sign_hspd, player_y, level))
+        if (!collide_solid(player_x + trunc_hspd, player_y, level))
         {
-          player_x += sign_hspd;
+          player_x += trunc_hspd;
+        }
+        else
+        {
+          int sign_hspd = sgn(trunc_hspd);
+          while (!collide_solid(player_x + sign_hspd, player_y, level))
+          {
+            player_x += sign_hspd;
+          }
+          hspd = 0;
         }
-        hspd = 0;
       }
     }
     //ground detection