diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-12-10 00:56:44 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-12-10 00:56:44 -0500 |
| commit | cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e (patch) | |
| tree | 38fc831ee02f25810b1134a8fbdb0d871ef0a1d4 /src/mg_decoration.h | |
| parent | fb2bc956b18bd70a47bff00d5726d4754867856a (diff) | |
| download | minetest-cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e.tar.gz minetest-cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e.tar.bz2 minetest-cfba55ba0a79eb1a4e9250d6dcc7ed4dd2bd519e.zip | |
Remove get_noiseparams function. read_noiseparams should be used from now on
Diffstat (limited to 'src/mg_decoration.h')
| -rw-r--r-- | src/mg_decoration.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mg_decoration.h b/src/mg_decoration.h index 3262924b0..f360e3b76 100644 --- a/src/mg_decoration.h +++ b/src/mg_decoration.h @@ -38,8 +38,9 @@ enum DecorationType { #define DECO_PLACE_CENTER_X 0x01 #define DECO_PLACE_CENTER_Y 0x02 #define DECO_PLACE_CENTER_Z 0x04 +#define DECO_USE_NOISE 0x08 -extern FlagDesc flagdesc_deco_schematic[]; +extern FlagDesc flagdesc_deco[]; #if 0 @@ -61,11 +62,12 @@ class Decoration : public GenElement { public: INodeDefManager *ndef; + u32 flags; int mapseed; std::vector<content_t> c_place_on; s16 sidelen; float fill_ratio; - NoiseParams *np; + NoiseParams np; std::set<u8> biomes; //std::list<CutoffData> cutoffs; @@ -98,7 +100,6 @@ public: class DecoSchematic : public Decoration { public: - u32 flags; Rotation rotation; Schematic *schematic; std::string filename; |