diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-07-01 21:04:40 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-01 21:04:40 +0300 |
commit | 71f5d4b3443c6ea770463838a2c84b85d9fa3b21 (patch) | |
tree | 8457916fda22b9a19194e6c8163e742443fefdb1 /src/map.h | |
parent | 282912caa0f8a19d5b5fb94a3cb6a41432a3a2df (diff) | |
download | minetest-71f5d4b3443c6ea770463838a2c84b85d9fa3b21.tar.gz minetest-71f5d4b3443c6ea770463838a2c84b85d9fa3b21.tar.bz2 minetest-71f5d4b3443c6ea770463838a2c84b85d9fa3b21.zip |
Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded
Diffstat (limited to 'src/map.h')
-rw-r--r-- | src/map.h | 21 |
1 files changed, 5 insertions, 16 deletions
@@ -57,7 +57,7 @@ enum MapEditEventType{ // Node metadata of block changed (not knowing which node exactly) // p stores block coordinate MEET_BLOCK_NODE_METADATA_CHANGED, - // Anything else + // Anything else (modified_blocks are set unsent) MEET_OTHER }; @@ -338,24 +338,13 @@ public: */ MapBlock * createBlock(v3s16 p); -#if 0 /* - NOTE: This comment might be outdated - Forcefully get a block from somewhere. - - InvalidPositionException possible if only_from_disk==true - - Parameters: - changed_blocks: Blocks that have been modified + - Memory + - Load from disk + - Generate */ - MapBlock * emergeBlock( - v3s16 p, - bool only_from_disk, - core::map<v3s16, MapBlock*> &changed_blocks, - core::map<v3s16, MapBlock*> &lighting_invalidated_blocks - ); -#endif + MapBlock * emergeBlock(v3s16 p, bool allow_generate=true); // Helper for placing objects on ground level s16 findGroundLevel(v2s16 p2d); |