mirror of
https://github.com/luanti-org/luanti.git
synced 2025-09-15 18:57:08 +00:00
Prevent invalid memory access under failure conditions
This commit is contained in:
parent
6ddf458504
commit
bc28ca0636
3 changed files with 64 additions and 61 deletions
19
src/biome.h
19
src/biome.h
|
@ -44,24 +44,16 @@ public:
|
|||
u8 id;
|
||||
std::string name;
|
||||
u32 flags;
|
||||
|
||||
/*
|
||||
std::string nname_top;
|
||||
std::string nname_filler;
|
||||
std::string nname_water;
|
||||
std::string nname_dust;
|
||||
std::string nname_dust_water;
|
||||
*/
|
||||
|
||||
content_t c_top;
|
||||
content_t c_filler;
|
||||
content_t c_water;
|
||||
content_t c_dust;
|
||||
content_t c_dust_water;
|
||||
|
||||
|
||||
s16 depth_top;
|
||||
s16 depth_filler;
|
||||
|
||||
|
||||
s16 height_min;
|
||||
s16 height_max;
|
||||
float heat_point;
|
||||
|
@ -85,15 +77,14 @@ public:
|
|||
|
||||
BiomeDefManager(NodeResolver *resolver);
|
||||
~BiomeDefManager();
|
||||
|
||||
|
||||
Biome *createBiome(BiomeTerrainType btt);
|
||||
void calcBiomes(BiomeNoiseInput *input, u8 *biomeid_map);
|
||||
Biome *getBiome(float heat, float humidity, s16 y);
|
||||
|
||||
void addBiome(Biome *b);
|
||||
void resolveNodeNames(INodeDefManager *ndef);
|
||||
bool addBiome(Biome *b);
|
||||
u8 getBiomeIdByName(const char *name);
|
||||
|
||||
|
||||
s16 calcBlockHeat(v3s16 p, u64 seed, float timeofday, float totaltime);
|
||||
s16 calcBlockHumidity(v3s16 p, u64 seed, float timeofday, float totaltime);
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue