summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/gravel.pngbin0 -> 591 bytes
-rw-r--r--data/mossycobble.pngbin0 -> 965 bytes
-rw-r--r--src/main.cpp6
3 files changed, 6 insertions, 0 deletions
diff --git a/data/gravel.png b/data/gravel.png
index e69de29bb..f08666ad9 100644
--- a/data/gravel.png
+++ b/data/gravel.png
Binary files differ
diff --git a/data/mossycobble.png b/data/mossycobble.png
index e69de29bb..fad1b33ff 100644
--- a/data/mossycobble.png
+++ b/data/mossycobble.png
Binary files differ
diff --git a/src/main.cpp b/src/main.cpp
index fa0439dee..41da310f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -354,6 +354,12 @@ TODO: Add a per-sector database to store surface stuff as simple flags/values
TODO: Restart irrlicht completely when coming back to main menu from game.
- This gets rid of everything that is stored in irrlicht's caches.
+TODO: Merge bahamada's audio stuff (clean patch available)
+
+TODO: Merge spongie's chest/furnace direction (by hand)
+
+TODO: Merge key configuration menu (no clean patch available)
+
Making it more portable:
------------------------