Revert "Fix short 180 degree rotation when using set_bone_position (#10405)" (#10534)

[minetest.git] / src / mapgen / mapgen.h

diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index 7845c5349fd533aef45a5f83bfe36485f584b1a5..1487731e20bb46ef19de89c3efecfbd4bd3d9b3a 100644 (file)
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -1,8 +1,8 @@
 /*
 Minetest
-Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2013-2018 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
-Copyright (C) 2015-2018 paramat
+Copyright (C) 2010-2020 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2015-2020 paramat
+Copyright (C) 2013-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -37,8 +37,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MG_LIGHT       0x10
 #define MG_DECORATIONS 0x20
 #define MG_BIOMES      0x40
+#define MG_ORES        0x80
 
-typedef u8 biome_t;  // copy from mg_biome.h to avoid an unnecessary include
+typedef u16 biome_t;  // copy from mg_biome.h to avoid an unnecessary include
 
 class Settings;
 class MMVManip;
@@ -87,19 +88,17 @@ struct GenNotifyEvent {
 
 class GenerateNotifier {
 public:
+       // Use only for temporary Mapgen objects with no map generation!
        GenerateNotifier() = default;
        GenerateNotifier(u32 notify_on, const std::set<u32> *notify_on_deco_ids);
 
-       void setNotifyOn(u32 notify_on);
-       void setNotifyOnDecoIds(const std::set<u32> *notify_on_deco_ids);
-
        bool addEvent(GenNotifyType type, v3s16 pos, u32 id=0);
        void getEvents(std::map<std::string, std::vector<v3s16> > &event_map);
        void clearEvents();
 
 private:
        u32 m_notify_on = 0;
-       const std::set<u32> *m_notify_on_deco_ids;
+       const std::set<u32> *m_notify_on_deco_ids = nullptr;
        std::list<GenNotifyEvent> m_notify_events;
 };
 
@@ -185,7 +184,6 @@ class Mapgen {
 
        static u32 getBlockSeed(v3s16 p, s32 seed);
        static u32 getBlockSeed2(v3s16 p, s32 seed);
-       s16 findGroundLevelFull(v2s16 p2d);
        s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax);
        s16 findLiquidSurface(v2s16 p2d, s16 ymin, s16 ymax);
        void updateHeightmap(v3s16 nmin, v3s16 nmax);