summaryrefslogtreecommitdiff
path: root/src/noise.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-05-18 23:26:27 -0400
committerkwolekr <kwolekr@minetest.net>2013-05-19 12:22:20 -0400
commit93474c4218eee621a96e24324b1b41a55571f0df (patch)
treedc74d8a27cfa853b4580159cde8c66e485c4f9f2 /src/noise.h
parentf577facf79729a03bb274a27c9f50f0092cd3a40 (diff)
downloadminetest-93474c4218eee621a96e24324b1b41a55571f0df.tar.gz
minetest-93474c4218eee621a96e24324b1b41a55571f0df.tar.bz2
minetest-93474c4218eee621a96e24324b1b41a55571f0df.zip
Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams
Diffstat (limited to 'src/noise.h')
-rw-r--r--src/noise.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/noise.h b/src/noise.h
index ace6d7eb4..0bf1a2f13 100644
--- a/src/noise.h
+++ b/src/noise.h
@@ -72,8 +72,8 @@ struct NoiseParams {
// Convenience macros for getting/setting NoiseParams in Settings
-#define getNoiseParams(x) getStruct<NoiseParams>((x), "f,f,v3,s32,s32,f")
-#define setNoiseParams(x, y) setStruct((x), "f,f,v3,s32,s32,f", (y))
+#define getNoiseParams(x, y) getStruct((x), "f,f,v3,s32,s32,f", &(y), sizeof(y))
+#define setNoiseParams(x, y) setStruct((x), "f,f,v3,s32,s32,f", &(y))
class Noise {
public:
@@ -88,7 +88,7 @@ public:
Noise(NoiseParams *np, int seed, int sx, int sy);
Noise(NoiseParams *np, int seed, int sx, int sy, int sz);
- ~Noise();
+ virtual ~Noise();
virtual void init(NoiseParams *np, int seed, int sx, int sy, int sz);
void setSize(int sx, int sy);