aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp1
-rw-r--r--src/main.h2
-rw-r--r--src/map.cpp19
-rw-r--r--src/mineral.h1
4 files changed, 21 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 9c7cf2e28..9fb17e211 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -427,6 +427,7 @@ TODO: Use MapBlock::resetUsageTimer() in appropriate places
#include "materials.h"
#include "game.h"
#include "keycode.h"
+#include "tile.h"
// This makes textures
ITextureSource *g_texturesource = NULL;
diff --git a/src/main.h b/src/main.h
index 450525c26..b2dee1494 100644
--- a/src/main.h
+++ b/src/main.h
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
extern Settings g_settings;
// This makes and maps textures
-#include "tile.h"
+class ITextureSource;
extern ITextureSource *g_texturesource;
// Global profiler
diff --git a/src/map.cpp b/src/map.cpp
index a20cd9910..5bf278667 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -755,6 +755,25 @@ void Map::updateLighting(enum LightBank bank,
}
}
+
+ /*
+ Enable this to disable proper lighting for speeding up map
+ generation for testing or whatever
+ */
+#if 0
+ //if(g_settings.get(""))
+ {
+ core::map<v3s16, MapBlock*>::Iterator i;
+ i = blocks_to_update.getIterator();
+ for(; i.atEnd() == false; i++)
+ {
+ MapBlock *block = i.getNode()->getValue();
+ v3s16 p = block->getPos();
+ block->setLightingExpired(false);
+ }
+ return;
+ }
+#endif
#if 0
{
diff --git a/src/mineral.h b/src/mineral.h
index 970ff1f78..61776e669 100644
--- a/src/mineral.h
+++ b/src/mineral.h
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define MINERAL_HEADER
#include "inventory.h"
-#include "tile.h"
/*
Minerals