diff options
| author | kwolekr <kwolekr@minetest.net> | 2016-05-22 16:50:43 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2016-05-27 23:23:58 -0400 |
| commit | c8fd232678698b8be469b3792e7acc9418231a38 (patch) | |
| tree | 95f1c68889a3a40b2efad1ed87beb8a80d54c133 /src/dungeongen.h | |
| parent | fd0efb21c3d40a963a813d73a09bb80df625b247 (diff) | |
| download | minetest-c8fd232678698b8be469b3792e7acc9418231a38.tar.gz minetest-c8fd232678698b8be469b3792e7acc9418231a38.tar.bz2 minetest-c8fd232678698b8be469b3792e7acc9418231a38.zip | |
Dungeongen: Remove dependency on Mapgen
Diffstat (limited to 'src/dungeongen.h')
| -rw-r--r-- | src/dungeongen.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/dungeongen.h b/src/dungeongen.h index d209dd4bf..f0a5e5ba8 100644 --- a/src/dungeongen.h +++ b/src/dungeongen.h @@ -39,6 +39,8 @@ int dir_to_facedir(v3s16 d); struct DungeonParams { + int seed; + content_t c_water; content_t c_river_water; content_t c_cobble; @@ -59,7 +61,9 @@ struct DungeonParams { class DungeonGen { public: MMVManip *vm; - Mapgen *mg; + INodeDefManager *ndef; + GenerateNotifier *gennotify; + u32 blockseed; PseudoRandom random; v3s16 csize; @@ -67,17 +71,20 @@ public: content_t c_torch; DungeonParams dp; - //RoomWalker + // RoomWalker v3s16 m_pos; v3s16 m_dir; - DungeonGen(Mapgen *mg, DungeonParams *dparams); - void generate(u32 bseed, v3s16 full_node_min, v3s16 full_node_max); + DungeonGen(INodeDefManager *ndef, + GenerateNotifier *gennotify, DungeonParams *dparams); + + void generate(MMVManip *vm, u32 bseed, + v3s16 full_node_min, v3s16 full_node_max); void makeDungeon(v3s16 start_padding); void makeRoom(v3s16 roomsize, v3s16 roomplace); void makeCorridor(v3s16 doorplace, v3s16 doordir, - v3s16 &result_place, v3s16 &result_dir); + v3s16 &result_place, v3s16 &result_dir); void makeDoor(v3s16 doorplace, v3s16 doordir); void makeFill(v3s16 place, v3s16 size, u8 avoid_flags, MapNode n, u8 or_flags); void makeHole(v3s16 place); @@ -86,7 +93,7 @@ public: bool findPlaceForRoomDoor(v3s16 roomsize, v3s16 &result_doorplace, v3s16 &result_doordir, v3s16 &result_roomplace); - void randomizeDir() + inline void randomizeDir() { m_dir = rand_ortho_dir(random, dp.diagonal_dirs); } |