luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-21 11:55:43 +02:00
Code Activity

Properly remove SAO when worldedges are overtaken (#5889)

Browse Source 
* LuaEntitySAO: Remove beyond outermost mapchunk edges

Based on a commit by, and with help from, nerzhul.
Add 2 functions to class Mapgen:
A function to calculate actual mapgen edges, called from the Mapgen constructor.
A function called indirectly from content_sao.cpp per entity step to check SAO
position is within mapgen edges.

* Calculate borders from params not mapgen, which is not available everytime
This commit is contained in:
Loïc Blot
2017-06-03 19:57:02 +02:00
committed by GitHub
parent 72eec0f6f5
commit c6d5441105
5 changed files with 84 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mapgen.h
View File

@@ -138,7 +138,10 @@ struct MapgenParams {
water_level(1),
mapgen_limit(MAX_MAP_GENERATION_LIMIT),
flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
bparams(NULL)
bparams(NULL),
m_sao_limit_min(MAX_MAP_GENERATION_LIMIT * BS),
m_sao_limit_max(MAX_MAP_GENERATION_LIMIT * BS),
m_sao_limit_calculated(false)
{
}
@@ -146,6 +149,14 @@ struct MapgenParams {
virtual void readParams(const Settings *settings);
virtual void writeParams(Settings *settings) const;
bool saoPosOverLimit(const v3f &p);
private:
void calcMapgenEdges();
float m_sao_limit_min;
float m_sao_limit_max;
bool m_sao_limit_calculated;
};