From d4aeb97affb09b42953a60b70ffd21e2165c3d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Mon, 24 Feb 2020 12:53:49 +0100
Subject: [PATCH] Add column

---
 assets/item_column.png | Bin 0 -> 712 bytes
 images.h               |  21 ++++++++++++++++++++-
 levels.h               |  17 +++++++++--------
 main.c                 |   2 ++
 4 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 assets/item_column.png

diff --git a/assets/item_column.png b/assets/item_column.png
new file mode 100644
index 0000000000000000000000000000000000000000..6eb62aeee5d6b35cdb1b68b2e477231d2d4f1f4e
GIT binary patch
literal 712
zcmV;(0yq7MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<N_EAGAMfd%uWCR02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00J;cL_t(o!^Kx2d)qJ&eeG9Z
zFkld1c)-9gV4$ENP+-7tFfd>sKVhI?U?8xtKS7}2z`($O!GJ-5fq}q)KtVu(*#<gk
zvMoE76Ms9BSWbM;@7+D=t{UJsI*|*3-KU+sR<&x~uj&d}nzcT=(ftnqNao(!l@EXc
z0RZwzLe;93#C^C~H$dEbloG0M1tLnk$wvXWKnw^sp$~*vqm+=P8RWwwxGKjUk87L=
z$&CC%4ob<s=}=HgLCFE&1_9yIdW!aAaZ&<T3d6#wWW{p{{Yy^*a2<knvpqlvVP)t7
zYLrH!bPxkU09>uR44A|bCCdXa5#6qPYl}0`B;w!qqO?FFN)S<k_@lUd5#~Zbh_DAU
z^Pu_6?gIHF!OVF4S+rUC%Y^ZO&tJbx?t&m6kR=cS*uKBD1^E4_ZE{sB=vBO24dm;-
zF*QZmYR63+)&)0nJD{p7=v52?&2qq547f?MG(+-ooMqP+^MSekf3^h7484lcboTzm
zi_oQi6DPL#&MCslMzp<`_FDgV_&-Lpy_bkIw{&+;LyH@cFEM~O-D@o0h5(S<?fPpk
zM_Yu8cES3cLitL)gNR{+QUXuVeKvsdmAr0<RovQ|@mwwgAYZ?2NNzjA)PiBf<Bk^t
zu;1@5=77OIV1|>f&c1dOLM$^EnB-$`E<DHgvlz&Qz~OKh-SLKo*C{Ma8cv4{$aO$w
uw)27kU@UoPG9CnQYCIns+s1zD1Mvsv=U7O@EuOsq0000<MNUMnLSTYe88)2&

literal 0
HcmV?d00001

diff --git a/images.h b/images.h
index 3e38c76..bd6bd3c 100644
--- a/images.h
+++ b/images.h
@@ -580,7 +580,26 @@ SFG_PROGRAM_MEMORY uint8_t SFG_itemSprites[][SFG_TEXTURE_STORE_SIZE] =
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0
   },
-  { // 9, access card
+  { // 9, column
+175,2,4,3,5,48,6,63,51,7,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,65,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,20,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,73,16,0,0,0,0,0,0,0,
+0,0,0,0,0,1,148,38,145,16,0,0,16,0,0,0,1,0,0,0,1,22,146,36,105,145,17,17,33,17,
+17,17,23,17,17,17,25,150,98,36,102,67,119,119,41,121,150,102,103,119,118,121,54,
+150,98,36,70,67,68,71,36,68,68,68,71,66,119,119,57,70,66,50,68,67,36,68,40,68,
+68,67,34,66,36,68,52,36,66,34,34,35,51,51,40,34,50,40,34,35,50,34,52,36,66,50,
+34,33,49,129,40,35,131,49,50,35,50,50,20,36,66,35,34,33,17,17,40,129,51,49,18,
+51,50,131,18,36,34,51,51,49,17,24,33,19,51,17,50,56,51,131,18,34,66,50,51,49,26,
+161,33,51,17,19,50,17,51,19,19,50,51,51,19,49,170,161,35,17,17,17,18,51,19,19,
+19,50,35,49,19,17,161,168,34,130,35,56,34,34,33,131,17,34,33,49,50,53,85,85,37,
+85,85,85,82,85,85,85,82,67,49,17,42,160,0,0,16,0,0,0,1,0,0,0,10,162,33,19,160,0,
+0,0,0,0,0,0,0,0,0,0,0,10,33,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,17,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,17,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  },
+  { // 10, access card
 175,0,21,45,44,23,46,2,19,34,69,22,68,60,131,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,17,17,17,17,17,17,0,0,0,0,0,0,0,0,1,
 68,17,24,102,101,86,97,0,0,0,0,0,0,0,0,1,68,17,24,102,85,86,101,16,0,0,0,0,0,0,
diff --git a/levels.h b/levels.h
index a5b0aa3..84ba028 100644
--- a/levels.h
+++ b/levels.h
@@ -96,16 +96,17 @@ typedef struct
 #define SFG_LEVEL_ELEMENT_FINISH 0x07
 #define SFG_LEVEL_ELEMENT_TELEPORT 0x08
 #define SFG_LEVEL_ELEMENT_TERMINAL 0x09
-#define SFG_LEVEL_ELEMENT_CARD0 0x0a ///< Access card, unlocks doors with lock.
-#define SFG_LEVEL_ELEMENT_CARD1 0x0b
-#define SFG_LEVEL_ELEMENT_CARD2 0x0c
-#define SFG_LEVEL_ELEMENT_LOCK0 0x0d /**< Special level element that must be
+#define SFG_LEVEL_ELEMENT_COLUMN 0x0a
+#define SFG_LEVEL_ELEMENT_CARD0 0x0b ///< Access card, unlocks doors with lock.
+#define SFG_LEVEL_ELEMENT_CARD1 0x0c
+#define SFG_LEVEL_ELEMENT_CARD2 0x0d
+#define SFG_LEVEL_ELEMENT_LOCK0 0x0e /**< Special level element that must be
                                      placed on a tile with door. This door is
                                      then unlocked by taking the corresponding
                                      access card. */
-#define SFG_LEVEL_ELEMENT_LOCK1 0x0e
-#define SFG_LEVEL_ELEMENT_LOCK2 0x0f
-#define SFG_LEVEL_ELEMENT_BLOCKER 0x10 ///< Invisible wall.
+#define SFG_LEVEL_ELEMENT_LOCK1 0x0f
+#define SFG_LEVEL_ELEMENT_LOCK2 0x10
+#define SFG_LEVEL_ELEMENT_BLOCKER 0x11 ///< Invisible wall.
 
 /* 
   Monsters have lower 4 bits zero and are only distinguished by the 4 upper
@@ -306,7 +307,7 @@ SFG_PROGRAM_MEMORY SFG_Level SFG_levels[SFG_NUMBER_OF_LEVELS] =
       {SFG_LEVEL_ELEMENT_TERMINAL, {11, 25}},     {SFG_LEVEL_ELEMENT_TERMINAL, {11, 26}},
       {SFG_LEVEL_ELEMENT_MONSTER_WARRIOR, {10, 45}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
       {SFG_LEVEL_ELEMENT_BLOCKER, {14, 26}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
-      {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
+      {SFG_LEVEL_ELEMENT_COLUMN, {21, 15}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
       {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
       {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
       {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
diff --git a/main.c b/main.c
index e0a9214..1f24463 100755
--- a/main.c
+++ b/main.c
@@ -1122,6 +1122,7 @@ void SFG_getItemSprite(
   switch (elementType)
   {
     case SFG_LEVEL_ELEMENT_TREE:
+    case SFG_LEVEL_ELEMENT_COLUMN:
       *spriteSize = 2;
       break;
 
@@ -1159,6 +1160,7 @@ uint8_t SFG_itemCollides(uint8_t elementType)
     elementType == SFG_LEVEL_ELEMENT_BARREL ||
     elementType == SFG_LEVEL_ELEMENT_TREE ||
     elementType == SFG_LEVEL_ELEMENT_TERMINAL ||
+    elementType == SFG_LEVEL_ELEMENT_COLUMN ||
     elementType == SFG_LEVEL_ELEMENT_BLOCKER;
 }