added basic cell triggering

Former-commit-id: 7d8dae73edd0ecb6a1212046952740d43618dd81

diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id
index bd5f8b3b7c458941455fbf489e06572106d42f50..687d3c8e134e19e850bd8bb82aab8de256b91e29 100644 (file)
--- a/fishladder.c.REMOVED.git-id
+++ b/fishladder.c.REMOVED.git-id
@@ -1 +1 @@
-1d93a6088e15d24f782e55fb63b274140aa102d9
\ No newline at end of file
+3a3d53c4f7dd8408e3d40780b97a90efd103a804
\ No newline at end of file

diff --git a/maps/level7_combine.map b/maps/level7_combine.map
new file mode 100644 (file)
index 0000000..4e06beb
--- /dev/null
+++ b/maps/level7_combine.map
@@ -0,0 +1,15 @@
+#################;
+##-###########-##;aaa,bbb
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+##             ##;
+####+###+###+####;ab,ab,ab
+#################;

diff --git a/textures/tileset.png.REMOVED.git-id b/textures/tileset.png.REMOVED.git-id
index 61620153013b9f1785673924b67202fc9dfbcbb2..b67fe16e289e76914d4b77e38146f38a245ace99 100644 (file)
--- a/textures/tileset.png.REMOVED.git-id
+++ b/textures/tileset.png.REMOVED.git-id
@@ -1 +1 @@
-6d8928b59e11be0896064eb0e02c797920ce51f2
\ No newline at end of file
+522d5706ff2124ea551de9eeb4c0aa359ca2f8c4
\ No newline at end of file