diff options
author | Weblate <42@minetest.ru> | 2013-05-01 15:33:15 +0200 |
---|---|---|
committer | Weblate <42@minetest.ru> | 2013-05-01 15:33:15 +0200 |
commit | 97cddd1b960e3b60ce74ff9ad16307b39676144e (patch) | |
tree | 0547ab284acc0fdf8aad2a36643be6f78f786ef1 /src/mapgen_indev.h | |
parent | f1f2004cb9efb026625b192b404064c26ceb6d5f (diff) | |
parent | 898a4e441fc0245aaf4821ff5e3dad0daccda3b5 (diff) | |
download | minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.gz minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.bz2 minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/mapgen_indev.h')
-rw-r--r-- | src/mapgen_indev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapgen_indev.h b/src/mapgen_indev.h index bd6faa21c..87ae39d09 100644 --- a/src/mapgen_indev.h +++ b/src/mapgen_indev.h @@ -153,8 +153,8 @@ struct MapgenFactoryIndev : public MapgenFactoryV6 { class CaveIndev : public CaveV6 { public: - CaveIndev(Mapgen *mg, PseudoRandom *ps, PseudoRandom *ps2, v3s16 node_min, - bool is_large_cave, content_t c_water, content_t c_lava); + CaveIndev(MapgenIndev *mg, PseudoRandom *ps, PseudoRandom *ps2, + v3s16 node_min, bool is_large_cave); }; #endif |