Updated comments

diff --git a/src/main.cpp b/src/main.cpp
index ed3b322a4334bedd20330aeb79d571adaab34505..455e0ac9bd329c9e0ae397c0586e7a8d313e5897 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -89,6 +89,17 @@ SUGG: Make a system for pregenerating quick information for mapblocks, so
          that the client can show them as cubes before they are actually sent\r
          or even generated.\r
 \r
+SUGG: Erosion simulation at map generation time\r
+       - Simulate water flows, which would carve out dirt fast and\r
+         then turn stone into gravel and sand and relocate it.\r
+       - How about relocating minerals, too? Coal and gold in\r
+         downstream sand and gravel would be kind of cool\r
+         - This would need a better way of handling minerals, mainly\r
+               to have mineral content as a separate field. the first\r
+               parameter field is free for this.\r
+       - Simulate rock falling from cliffs when water has removed\r
+         enough solid rock from the bottom\r
+\r
 Gaming ideas:\r
 -------------\r
 \r
@@ -172,14 +183,9 @@ TODO: A setting for enabling bilinear filtering for textures
 \r
 TODO: Better control of draw_control.wanted_max_blocks\r
 \r
-TODO: Block mesh generator to tile properly on smooth lighting\r
-\r
 TODO: Further investigate the use of GPU lighting in addition to the\r
       current one\r
 \r
-TODO: Quick drawing of huge distances according to heightmap has to be\r
-      tested once again.\r
-\r
 Configuration:\r
 --------------\r
 \r
@@ -204,6 +210,9 @@ TODO: Don't update all meshes always on single node changes, but
 \r
 FIXME: When disconnected to the menu, memory is not freed properly\r
 \r
+TODO: Investigate how much the mesh generator thread gets used when\r
+      transferring map data\r
+\r
 Server:\r
 -------\r
 \r
@@ -220,24 +229,20 @@ FIXME: Server sometimes goes into some infinite PeerNotFoundException loop
 \r
 FIXME: The new optimized map sending doesn't sometimes send enough blocks\r
        from big caves and such\r
-\r
-* Take player's walking direction into account in GetNextBlocks\r
+FIXME: Block send distance configuration does not take effect for some reason\r
 \r
 TODO: Map saving should be done by EmergeThread\r
 \r
 SUGG: Map unloading based on sector reference is not very good, it keeps\r
        unnecessary stuff in memory. I guess. Investigate this.\r
 \r
-TODO: FIXME: Make furnaces handle long step() times better; now a 10-day\r
-       dtime for a bunch of furnaces will take ages\r
-\r
 TODO: When block is placed and it has param_type==CPT_FACEDIR_SIMPLE, set\r
       the direction accordingly.\r
 \r
 Environment:\r
 ------------\r
 \r
-TODO: A list of "active blocks" in which stuff happens.\r
+TODO: A list of "active blocks" in which stuff happens. (+=done)\r
        + Add a never-resetted game timer to the server\r
        + Add a timestamp value to blocks\r
        + The simple rule: All blocks near some player are "active"\r
@@ -288,21 +293,11 @@ Map:
 TODO: Mineral and ground material properties\r
       - This way mineral ground toughness can be calculated with just\r
            some formula, as well as tool strengths\r
+         - There are TODOs in appropriate files: material.h, content_mapnode.h\r
 \r
 TODO: Flowing water to actually contain flow direction information\r
       - There is a space for this - it just has to be implemented.\r
 \r
-SUGG: Erosion simulation at map generation time\r
-       - Simulate water flows, which would carve out dirt fast and\r
-         then turn stone into gravel and sand and relocate it.\r
-       - How about relocating minerals, too? Coal and gold in\r
-         downstream sand and gravel would be kind of cool\r
-         - This would need a better way of handling minerals, mainly\r
-               to have mineral content as a separate field. the first\r
-               parameter field is free for this.\r
-       - Simulate rock falling from cliffs when water has removed\r
-         enough solid rock from the bottom\r
-\r
 SUGG: Try out the notch way of generating maps, that is, make bunches\r
       of low-res 3d noise and interpolate linearly.\r
 \r
@@ -328,8 +323,17 @@ TODO: Add a not_fully_generated flag to MapBlock, which would be set for
 \r
 Misc. stuff:\r
 ------------\r
-* Move digging property stuff from material.{h,cpp} to mapnode.cpp\r
-  - ...Or maybe move content_features to material.{h,cpp}?\r
+- Make sure server handles removing grass when a block is placed (etc)\r
+    - The client should not do it by itself\r
+- Block cube placement around player's head\r
+- Protocol version field\r
+- Consider getting some textures from cisoun's texture pack\r
+       - Ask from Cisoun\r
+- Make sure the fence implementation and data format is good\r
+       - Think about using same bits for material for fences and doors, for\r
+       example\r
+- Finish the ActiveBlockModifier stuff and use it for something\r
+- Move mineral to param2, increment map serialization version, add conversion\r
 \r
 Making it more portable:\r
 ------------------------\r
@@ -342,17 +346,6 @@ Fixes to the current release:
 \r
 Stuff to do after release:\r
 ---------------------------\r
-- Make sure server handles removing grass when a block is placed (etc)\r
-    - The client should not do it by itself\r
-- Block cube placement around player's head\r
-- Protocol version field\r
-- Consider getting some textures from cisoun's texture pack\r
-       - Ask from Cisoun\r
-- Make sure the fence implementation and data format is good\r
-       - Think about using same bits for material for fences and doors, for\r
-       example\r
-- Finish the ActiveBlockModifier stuff and use it for something\r
-- Move mineral to param2, increment map serialization version, add conversion\r
 \r
 ======================================================================\r
 \r

diff --git a/src/materials.h b/src/materials.h
index 272116d8310209836a764e32701c5ff40bc04d2b..f061ecbfa5eb7075c5fe0e4463fad10ff6279301 100644 (file)
--- a/src/materials.h
+++ b/src/materials.h
@@ -49,7 +49,7 @@ struct DiggingProperties
 };
 
 /*
-       This is a DEPRECATED way of determining mining characteristics.
+       This is a bad way of determining mining characteristics.
        TODO: Get rid of this and set up some attributes like toughness,
              fluffyness, and a funciton to calculate time and durability loss
              (and sound? and whatever else) from them