diff options
| -rw-r--r-- | src/generate.cc | 27 | ||||
| -rw-r--r-- | src/generate.hpp | 2 | ||||
| -rw-r--r-- | src/init2.cc | 6 |
3 files changed, 10 insertions, 25 deletions
diff --git a/src/generate.cc b/src/generate.cc index 5ac6ed77..a0fe829b 100644 --- a/src/generate.cc +++ b/src/generate.cc @@ -284,11 +284,6 @@ struct level_generator_type cptr name; bool_ (*generator)(); - bool_ default_stairs; - bool_ default_monsters; - bool_ default_objects; - bool_ default_miscs; - struct level_generator_type *next; }; @@ -297,7 +292,7 @@ static level_generator_type *level_generators = NULL; /* * Add a new generator */ -void add_level_generator(cptr name, bool_ (*generator)(), bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs) +void add_level_generator(cptr name, bool_ (*generator)()) { assert(name != nullptr); @@ -306,11 +301,6 @@ void add_level_generator(cptr name, bool_ (*generator)(), bool_ stairs, bool_ mo g->name = strdup(name); g->generator = generator; - g->default_stairs = stairs; - g->default_monsters = monsters; - g->default_objects = objects; - g->default_miscs = miscs; - g->next = level_generators; level_generators = g; } @@ -7569,8 +7559,7 @@ static bool_ cave_gen(void) generator = generator->next; } - /* Only if requested */ - if (generator->default_stairs) + /* Generate stairs */ { /* Is there a dungeon branch ? */ if ((branch = get_branch())) @@ -7612,8 +7601,7 @@ static bool_ cave_gen(void) if (k > 10) k = 10; if (k < 2) k = 2; - /* Only if requested */ - if (generator->default_monsters) + /* Place monsters */ { /* @@ -7798,8 +7786,7 @@ static bool_ cave_gen(void) } } - /* Only if requested */ - if (generator->default_miscs) + /* Place traps and rubble */ { /* Place some traps in the dungeon */ alloc_object(ALLOC_SET_BOTH, ALLOC_TYP_TRAP, randint(k * 2)); @@ -7808,8 +7795,7 @@ static bool_ cave_gen(void) alloc_object(ALLOC_SET_CORR, ALLOC_TYP_RUBBLE, randint(k)); } - /* Only if requested */ - if (generator->default_objects) + /* Place objects and treasure */ { /* Put some objects in rooms */ if (dungeon_type != DUNGEON_DEATH) alloc_object(ALLOC_SET_ROOM, ALLOC_TYP_OBJECT, randnor(DUN_AMT_ROOM, 3)); @@ -7819,8 +7805,7 @@ static bool_ cave_gen(void) if (dungeon_type != DUNGEON_DEATH) alloc_object(ALLOC_SET_BOTH, ALLOC_TYP_GOLD, randnor(DUN_AMT_GOLD, 3)); } - /* Only if requested */ - if (generator->default_miscs) + /* Place random features such as altars and void gates, etc. */ { /* Put some altars */ alloc_object(ALLOC_SET_ROOM, ALLOC_TYP_ALTAR, randnor(DUN_AMT_ALTAR, 3)); diff --git a/src/generate.hpp b/src/generate.hpp index 54ac3b7d..5f3b7e35 100644 --- a/src/generate.hpp +++ b/src/generate.hpp @@ -3,7 +3,7 @@ #include "angband.h" extern bool_ new_player_spot(int branch); -extern void add_level_generator(cptr name, bool_ (*generator)(), bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs); +extern void add_level_generator(cptr name, bool_ (*generator)()); extern bool_ level_generate_dungeon(); extern bool_ generate_fracave(int y0, int x0,int xsize,int ysize,int cutoff,bool_ light,bool_ room); extern void generate_hmap(int y0, int x0,int xsiz,int ysiz,int grd,int roug,int cutoff); diff --git a/src/init2.cc b/src/init2.cc index 393f679c..05d55e84 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -1634,9 +1634,9 @@ static errr init_other(void) /* * Install the various level generators */ - add_level_generator("dungeon", level_generate_dungeon, TRUE, TRUE, TRUE, TRUE); - add_level_generator("maze", level_generate_maze, TRUE, TRUE, TRUE, TRUE); - add_level_generator("life", level_generate_life, TRUE, TRUE, TRUE, TRUE); + add_level_generator("dungeon", level_generate_dungeon); + add_level_generator("maze", level_generate_maze); + add_level_generator("life", level_generate_life); /*** Pre-allocate space for the "format()" buffer ***/ |