Merge pull request fogleman#9 from mbozada/US3.1.1_US3.2.1

US 3, Tasks US 3.1.1, US 3.1.2
AlexPanacea · Mar 31, 2021 · f9cf913 · f9cf913
2 parents 6bf5ab9 + 43eb92a
commit f9cf913
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/item.c b/src/item.c
@@ -26,6 +26,8 @@ const int items[] = {
     WHITE_FLOWER,
     BLUE_FLOWER,
     TNT,
+    ICE,
+    COMPACT_SNOW,
     COLOR_00,
     COLOR_01,
     COLOR_02,
@@ -89,8 +91,8 @@ const int blocks[256][6] = {
     {0, 0, 0, 0, 0, 0}, // 22
     {0, 0, 0, 0, 0, 0}, // 23
     {80, 80, 96, 64, 80, 80}, // 24 - TNT
-    {0, 0, 0, 0, 0, 0}, // 25
-    {0, 0, 0, 0, 0, 0}, // 26
+    {65, 65, 65, 65, 65, 65}, // 25 - ice
+    {66, 66, 66, 66, 66, 66}, // 26 - compact_snow
     {0, 0, 0, 0, 0, 0}, // 27
     {0, 0, 0, 0, 0, 0}, // 28
     {0, 0, 0, 0, 0, 0}, // 29

diff --git a/src/item.h b/src/item.h
@@ -26,6 +26,8 @@
 #define WHITE_FLOWER 22
 #define BLUE_FLOWER 23
 #define TNT 24
+#define ICE 25
+#define COMPACT_SNOW 26
 #define COLOR_00 32
 #define COLOR_01 33
 #define COLOR_02 34

diff --git a/textures/texture.png b/textures/texture.png