From 1f5f15ed05f81561aa8f1bdffe24d1d3be0c80e9 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Fri, 8 Jan 2021 13:32:34 +0100 Subject: [PATCH] Add chain tile. --- assets-cg | 2 +- assets-fx | 2 +- include/tiles.h | 1 + levels | 2 +- src/tiles.c | 5 ++++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets-cg b/assets-cg index 09b5adf..7fe9902 160000 --- a/assets-cg +++ b/assets-cg @@ -1 +1 @@ -Subproject commit 09b5adf91b66e0a35096fcbfd6885938afa118d8 +Subproject commit 7fe9902c7ede9e848e453b2228c1da439942147c diff --git a/assets-fx b/assets-fx index 58c1314..cfb373a 160000 --- a/assets-fx +++ b/assets-fx @@ -1 +1 @@ -Subproject commit 58c131401c021ac3aaabc23b7387f9143769072c +Subproject commit cfb373a12700a07c9d51d1d27e333d36a1ad71a8 diff --git a/include/tiles.h b/include/tiles.h index 43ff003..4c09b2e 100644 --- a/include/tiles.h +++ b/include/tiles.h @@ -17,6 +17,7 @@ typedef unsigned char Tile_flags; /* the tile properties (bitmask) */ enum { ID_AIR = TILE_AT(0, 0), + ID_CHAIN = TILE_AT(0, 1), ID_BASE_0 = TILE_AT(1, 0), ID_BASE_1 = TILE_AT(2, 0), ID_BASE_2 = TILE_AT(3, 0), diff --git a/levels b/levels index 2ca487d..d71064f 160000 --- a/levels +++ b/levels @@ -1 +1 @@ -Subproject commit 2ca487d1a0954668a17ba730f64088cf6caec6b0 +Subproject commit d71064f5d5638299938a80b473d0976e29428609 diff --git a/src/tiles.c b/src/tiles.c index 3972957..f000079 100644 --- a/src/tiles.c +++ b/src/tiles.c @@ -2,7 +2,10 @@ Tile_flags tile_get_flags(Tile tile) { switch (tile) { - case ID_AIR: return P_AIR; break; + case ID_AIR: + case ID_CHAIN: + return P_AIR; + break; case ID_BASE_0: case ID_BASE_1: case ID_BASE_2: