Skip to content

Commit

Permalink
Fix function override warnings in mg_ore.h
Browse files Browse the repository at this point in the history
  • Loading branch information
sfan5 committed Mar 6, 2021
1 parent abb0c99 commit 1c7b69f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/mapgen/mg_ore.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class OreScatter : public Ore {
public: public:
OreScatter() : Ore(false) {} OreScatter() : Ore(false) {}


ObjDef *clone() const; ObjDef *clone() const override;


void generate(MMVManip *vm, int mapseed, u32 blockseed, void generate(MMVManip *vm, int mapseed, u32 blockseed,
v3s16 nmin, v3s16 nmax, biome_t *biomemap) override; v3s16 nmin, v3s16 nmax, biome_t *biomemap) override;
Expand All @@ -95,7 +95,7 @@ class OreSheet : public Ore {
public: public:
OreSheet() : Ore(true) {} OreSheet() : Ore(true) {}


ObjDef *clone() const; ObjDef *clone() const override;


u16 column_height_min; u16 column_height_min;
u16 column_height_max; u16 column_height_max;
Expand All @@ -107,7 +107,7 @@ class OreSheet : public Ore {


class OrePuff : public Ore { class OrePuff : public Ore {
public: public:
ObjDef *clone() const; ObjDef *clone() const override;


NoiseParams np_puff_top; NoiseParams np_puff_top;
NoiseParams np_puff_bottom; NoiseParams np_puff_bottom;
Expand All @@ -123,7 +123,7 @@ class OrePuff : public Ore {


class OreBlob : public Ore { class OreBlob : public Ore {
public: public:
ObjDef *clone() const; ObjDef *clone() const override;


OreBlob() : Ore(true) {} OreBlob() : Ore(true) {}
void generate(MMVManip *vm, int mapseed, u32 blockseed, void generate(MMVManip *vm, int mapseed, u32 blockseed,
Expand All @@ -132,7 +132,7 @@ class OreBlob : public Ore {


class OreVein : public Ore { class OreVein : public Ore {
public: public:
ObjDef *clone() const; ObjDef *clone() const override;


float random_factor; float random_factor;
Noise *noise2 = nullptr; Noise *noise2 = nullptr;
Expand All @@ -147,7 +147,7 @@ class OreVein : public Ore {


class OreStratum : public Ore { class OreStratum : public Ore {
public: public:
ObjDef *clone() const; ObjDef *clone() const override;


NoiseParams np_stratum_thickness; NoiseParams np_stratum_thickness;
Noise *noise_stratum_thickness = nullptr; Noise *noise_stratum_thickness = nullptr;
Expand Down

0 comments on commit 1c7b69f

Please sign in to comment.