diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 14:20:07 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 14:20:07 +0200 |
| commit | 3c630c0d90a8d997475c07bc52781126e5f531e6 (patch) | |
| tree | 27c6b62c2e8ca0a29438995b2f6b8c4d111521e5 /src | |
| parent | d0810b0156073833b9966672c86b5fc3650dade9 (diff) | |
| parent | 74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c (diff) | |
| download | minetest-3c630c0d90a8d997475c07bc52781126e5f531e6.tar.gz minetest-3c630c0d90a8d997475c07bc52781126e5f531e6.tar.bz2 minetest-3c630c0d90a8d997475c07bc52781126e5f531e6.zip | |
Merge branch 'upstream/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common_irrlicht.h | 10 | ||||
| -rw-r--r-- | src/map.cpp | 21 |
2 files changed, 26 insertions, 5 deletions
diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h index 785f4fec7..7ce5d8db7 100644 --- a/src/common_irrlicht.h +++ b/src/common_irrlicht.h @@ -35,7 +35,15 @@ typedef core::vector2d<s32> v2s32; typedef core::vector2d<u32> v2u32; typedef core::vector2d<f32> v2f32; -typedef unsigned long long u64; +#ifdef _MSC_VER + // Windows + typedef unsigned long long u64; +#else + // Posix + #include <stdint.h> + typedef uint64_t u64; + //typedef unsigned long long u64; +#endif #endif diff --git a/src/map.cpp b/src/map.cpp index aa064637f..e47b1b212 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2026,9 +2026,14 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos) for(s16 y=-1; y<=1; y++) { - MapBlock *block = createBlock(blockpos); + //MapBlock *block = createBlock(blockpos); + // 1) get from memory, 2) load from disk + MapBlock *block = emergeBlock(blockpos, false); + // 3) create a blank one + if(block == NULL) + block = createBlock(blockpos); - // Lighting won't be calculated + // Lighting will not be valid after make_chunk is called block->setLightingExpired(true); // Lighting will be calculated //block->setLightingExpired(false); @@ -2145,10 +2150,18 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data, TimeTaker t("finishBlockMake lighting update"); core::map<v3s16, MapBlock*> lighting_update_blocks; +#if 1 // Center block lighting_update_blocks.insert(block->getPos(), block); - #if 0 +#endif +#if 0 // All modified blocks + // NOTE: Should this be done? If this is not done, then the lighting + // of the others will be updated in a different place, one by one, i + // think... or they might not? Well, at least they are left marked as + // "lighting expired"; it seems that is not handled at all anywhere, + // so enabling this will slow it down A LOT because otherwise it + // would not do this at all. This causes the black trees. for(core::map<v3s16, MapBlock*>::Iterator i = changed_blocks.getIterator(); i.atEnd() == false; i++) @@ -2156,7 +2169,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data, lighting_update_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue()); } - #endif +#endif updateLighting(lighting_update_blocks, changed_blocks); if(enable_mapgen_debug_info == false) |