Falling sand and gravel

[oweals/minetest.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 6b0cc1f83ff9ab02c18d12b51329b3c15db3cfc6..0646494fcf51fbcfd4f48059f1c036bc33facb98 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -334,11 +334,6 @@ TODO: Add a long step function to objects that is called with the time
 Map:
 ----
 
-TODO: Mineral and ground material properties
-      - This way mineral ground toughness can be calculated with just
-           some formula, as well as tool strengths. Sounds too.
-         - There are TODOs in appropriate files: material.h, content_mapnode.h
-
 TODO: Flowing water to actually contain flow direction information
       - There is a space for this - it just has to be implemented.
 
@@ -385,11 +380,11 @@ Doing currently:
 */
 
 #ifdef NDEBUG
-       #ifdef _WIN32
+       /*#ifdef _WIN32
                #pragma message ("Disabling unit tests")
        #else
                #warning "Disabling unit tests"
-       #endif
+       #endif*/
        // Disable unit tests
        #define ENABLE_TESTS 0
 #else
@@ -434,11 +429,6 @@ Doing currently:
 #include "settings.h"
 #include "profiler.h"
 #include "log.h"
-#include "mapnode_contentfeatures.h" // For init_contentfeatures
-#include "content_mapnode.h" // For content_mapnode_init
-
-// This makes textures
-ITextureSource *g_texturesource = NULL;
 
 /*
        Settings.
@@ -1275,11 +1265,7 @@ int main(int argc, char *argv[])
                These are needed for unit tests at least.
        */
        
-       // Initialize content feature table
-       init_contentfeatures();
-       // Initialize mapnode content without textures (with g_texturesource=NULL)
-       content_mapnode_init();
-       // Must be called before g_texturesource is created
+       // Must be called before texturesource is created
        // (for texture atlas making)
        init_mineral();
 
@@ -1430,9 +1416,6 @@ int main(int argc, char *argv[])
        // Create game callback for menus
        g_gamecallback = new MainGameCallback(device);
        
-       // Create texture source
-       g_texturesource = new TextureSource(device);
-
        /*
                Speed tests (done after irrlicht is loaded to get timer)
        */
@@ -1477,13 +1460,6 @@ int main(int argc, char *argv[])
        skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255,0,0,0));
        skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255,0,0,0));
        
-       /*
-               Preload some textures and stuff
-       */
-
-       // Initialize mapnode content with textures (with g_texturesource!=NULL)
-       content_mapnode_init();
-
        /*
                GUI stuff
        */
@@ -1657,12 +1633,6 @@ int main(int argc, char *argv[])
                        if(device->run() == false)
                                break;
                        
-                       // Initialize mapnode again to enable changed graphics settings
-                       // Initialize content feature table
-                       init_contentfeatures();
-                       // Initialize mapnode content with textures (with g_texturesource!=NULL)
-                       content_mapnode_init();
-
                        /*
                                Run game
                        */