aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2010-12-20 14:59:21 +0200
committerPerttu Ahola <celeron55@gmail.com>2010-12-20 14:59:21 +0200
commit6350c5d7a606924a12ba41468d126ff94d9e6d36 (patch)
tree3df2ec976eeb23dcb2aa7b9a5ebadd26b00cb734
parent5a36956f75959887f75fda90c39d56181cd1f196 (diff)
downloadminetest-6350c5d7a606924a12ba41468d126ff94d9e6d36.tar.gz
minetest-6350c5d7a606924a12ba41468d126ff94d9e6d36.tar.bz2
minetest-6350c5d7a606924a12ba41468d126ff94d9e6d36.zip
some tinkering with gui. removed updating of configuration file at end
-rw-r--r--data/pauseMenu.guibin15170 -> 17766 bytes
-rw-r--r--minetest.conf.example2
-rw-r--r--src/defaultsettings.cpp2
-rw-r--r--src/main.cpp4
-rw-r--r--src/map.cpp62
-rw-r--r--src/map.h2
-rw-r--r--src/mapblock.h2
-rw-r--r--src/servermain.cpp8
8 files changed, 10 insertions, 72 deletions
diff --git a/data/pauseMenu.gui b/data/pauseMenu.gui
index 78fa02a9a..543b3fb8a 100644
--- a/data/pauseMenu.gui
+++ b/data/pauseMenu.gui
Binary files differ
diff --git a/minetest.conf.example b/minetest.conf.example
index 20392e56d..ed3f8ebef 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -62,6 +62,8 @@
# 20 min/day
#time_speed = 72
+# 4 min/day
+#time_speed = 360
# 1 min/day
#time_speed = 1440
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 2dbbaada7..a9b8dc279 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -55,6 +55,6 @@ void set_default_settings()
g_settings.setDefault("max_block_send_distance", "5");
g_settings.setDefault("max_block_generate_distance", "4");
g_settings.setDefault("time_send_interval", "20");
- g_settings.setDefault("time_speed", "144");
+ g_settings.setDefault("time_speed", "360");
}
diff --git a/src/main.cpp b/src/main.cpp
index 7d146835f..3dc111201 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2486,10 +2486,10 @@ int main(int argc, char *argv[])
/*
Update configuration file
*/
- if(configpath != "")
+ /*if(configpath != "")
{
g_settings.updateConfigFile(configpath.c_str());
- }
+ }*/
} //try
catch(con::PeerNotFoundException &e)
diff --git a/src/map.cpp b/src/map.cpp
index db9d4120e..acaebe257 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1141,21 +1141,21 @@ bool Map::dayNightDiffed(v3s16 blockpos)
}
catch(InvalidPositionException &e){}
try{
- v3s16 p = blockpos + v3s16(1,0,0);
+ v3s16 p = blockpos + v3s16(-1,0,0);
MapBlock *b = getBlockNoCreate(p);
if(b->dayNightDiffed())
return true;
}
catch(InvalidPositionException &e){}
try{
- v3s16 p = blockpos + v3s16(0,1,0);
+ v3s16 p = blockpos + v3s16(0,-1,0);
MapBlock *b = getBlockNoCreate(p);
if(b->dayNightDiffed())
return true;
}
catch(InvalidPositionException &e){}
try{
- v3s16 p = blockpos + v3s16(0,0,1);
+ v3s16 p = blockpos + v3s16(0,0,-1);
MapBlock *b = getBlockNoCreate(p);
if(b->dayNightDiffed())
return true;
@@ -1805,26 +1805,6 @@ MapBlock * ServerMap::emergeBlock(
Calculate material
*/
- // If node is very low
- /*if(real_y <= surface_y - 7)
- {
- // Create dungeons
- if(underground_emptiness[
- ued*ued*(z0*ued/MAP_BLOCKSIZE)
- +ued*(y0*ued/MAP_BLOCKSIZE)
- +(x0*ued/MAP_BLOCKSIZE)])
- {
- n.d = CONTENT_AIR;
- }
- else
- {
- n.d = CONTENT_STONE;
- }
- }
- // If node is under surface level
- else if(real_y <= surface_y - surface_depth)
- n.d = CONTENT_STONE;
- */
if(real_y <= surface_y - surface_depth)
{
// Create dungeons
@@ -1956,42 +1936,6 @@ MapBlock * ServerMap::emergeBlock(
sector->insertBlock(block);
/*
- Do some interpolation for dungeons
- */
-
-#if 0
- {
- TimeTaker timer("interpolation", g_device);
-
- MapVoxelManipulator vmanip(this);
-
- v3s16 relpos = block->getPosRelative();
-
- vmanip.interpolate(VoxelArea(relpos-v3s16(1,1,1),
- relpos+v3s16(1,1,1)*(MAP_BLOCKSIZE+1)));
- /*vmanip.interpolate(VoxelArea(relpos,
- relpos+v3s16(1,1,1)*(MAP_BLOCKSIZE-1)));*/
-
- core::map<v3s16, MapBlock*> modified_blocks;
- vmanip.blitBack(modified_blocks);
- dstream<<"blitBack modified "<<modified_blocks.size()
- <<" blocks"<<std::endl;
-
- // Add modified blocks to changed_blocks and lighting_invalidated_blocks
- for(core::map<v3s16, MapBlock*>::Iterator
- i = modified_blocks.getIterator();
- i.atEnd() == false; i++)
- {
- MapBlock *block = i.getNode()->getValue();
-
- changed_blocks.insert(block->getPos(), block);
- //lighting_invalidated_blocks.insert(block->getPos(), block);
- }
-
- }
-#endif
-
- /*
Sector object stuff
*/
diff --git a/src/map.h b/src/map.h
index 581708a36..05984b1a9 100644
--- a/src/map.h
+++ b/src/map.h
@@ -387,7 +387,7 @@ public:
#endif
/*
- Takes the blocks at the trailing edges into account
+ Takes the blocks at the leading edges into account
*/
bool dayNightDiffed(v3s16 blockpos);
diff --git a/src/mapblock.h b/src/mapblock.h
index 304794dd4..2bdf639b7 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -412,7 +412,7 @@ public:
These methods don't care about neighboring blocks.
It means that to know if a block really doesn't need a mesh
update between day and night, the neighboring blocks have
- to be taken into account.
+ to be taken into account. Use Map::dayNightDiffed().
*/
void updateDayNightDiff();
diff --git a/src/servermain.cpp b/src/servermain.cpp
index 5edc8ac7c..70f11cba3 100644
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -354,14 +354,6 @@ int main(int argc, char *argv[])
}
}
- /*
- Update configuration file
- */
- if(configpath != "")
- {
- g_settings.updateConfigFile(configpath.c_str());
- }
-
} //try
catch(con::PeerNotFoundException &e)
{