added correct data to new images, added comments in main.cpp

diff --git a/data/gravel.png b/data/gravel.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f08666ad9347cd736071d5cfb2ce951f956ce45c 100644 (file)
Binary files a/data/gravel.png and b/data/gravel.png differ

diff --git a/data/mossycobble.png b/data/mossycobble.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fad1b33ff7dadc8147da9e75df67b303a14ad5a5 100644 (file)
Binary files a/data/mossycobble.png and b/data/mossycobble.png differ

diff --git a/src/main.cpp b/src/main.cpp
index fa0439deeac383ed02cd108a9897eba13d6615e7..41da310f450344af0c99b48f3ad6c32c8cc31e76 100644 (file)
--- 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.\r
        - This gets rid of everything that is stored in irrlicht's caches.\r
 \r
+TODO: Merge bahamada's audio stuff (clean patch available)\r
+\r
+TODO: Merge spongie's chest/furnace direction (by hand)\r
+\r
+TODO: Merge key configuration menu (no clean patch available)\r
+\r
 Making it more portable:\r
 ------------------------\r
  \r