diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-02-18 18:45:38 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-03-29 20:57:29 +0200 |
| commit | db5ec646ef4c0d802221ea10a543c38ce59b5d16 (patch) | |
| tree | a2c943946df572cc88017218ee6bf3d01323cfdd | |
| parent | c4928a52cb100f696f2ff54d27a87f2ff2ae37c2 (diff) | |
Remove unused parameter from level generating function.
| -rw-r--r-- | src/externs.h | 8 | ||||
| -rw-r--r-- | src/gen_evol.c | 5 | ||||
| -rw-r--r-- | src/gen_maze.c | 5 | ||||
| -rw-r--r-- | src/generate.c | 7 |
4 files changed, 8 insertions, 17 deletions
diff --git a/src/externs.h b/src/externs.h index a463831a..5ccc13a9 100644 --- a/src/externs.h +++ b/src/externs.h @@ -907,16 +907,16 @@ extern void show_highclass(int building); extern errr get_xtra_line(char * file_name, monster_type *m_ptr, char * output); /* gen_maze.c */ -extern bool_ level_generate_maze(cptr name); +extern bool_ level_generate_maze(); /* gen_life.c */ -extern bool_ level_generate_life(cptr name); +extern bool_ level_generate_life(); extern void evolve_level(bool_ noise); /* generate.c */ extern bool_ new_player_spot(int branch); -extern void add_level_generator(cptr name, bool_ (*generator)(cptr), bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs); -extern bool_ level_generate_dungeon(cptr name); +extern void add_level_generator(cptr name, bool_ (*generator)(), bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs); +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); extern bool_ room_alloc(int x,int y,bool_ crowded,int by0,int bx0,int *xx,int *yy); diff --git a/src/gen_evol.c b/src/gen_evol.c index 85bad1a3..bfdfbd68 100644 --- a/src/gen_evol.c +++ b/src/gen_evol.c @@ -130,13 +130,10 @@ void evolve_level(bool_ noise) } -bool_ level_generate_life(cptr name) +bool_ level_generate_life() { int i, j; - /* unused */ - name = name; - for (i = 1; i < cur_wid - 1; i++) { for (j = 1; j < cur_hgt - 1; j++) diff --git a/src/gen_maze.c b/src/gen_maze.c index c3333083..92cb482f 100644 --- a/src/gen_maze.c +++ b/src/gen_maze.c @@ -139,7 +139,7 @@ void dig(maze_row *maze, int y, int x, int d) } -bool_ level_generate_maze(cptr name) +bool_ level_generate_maze() { int i, j, d; int y, dy = 0; @@ -147,9 +147,6 @@ bool_ level_generate_maze(cptr name) int m_1 = 0, m_2 = 0; maze_row *maze; - /* unused */ - name = name; - /* Allocate temporary memory */ C_MAKE(maze, (MAX_HGT / 2) + 2, maze_row); diff --git a/src/generate.c b/src/generate.c index 0e8cfa59..ab74dffe 100644 --- a/src/generate.c +++ b/src/generate.c @@ -288,7 +288,7 @@ static level_generator_type *level_generators = NULL; /* * Add a new generator */ -void add_level_generator(cptr name, bool_ (*generator)(cptr name), bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs) +void add_level_generator(cptr name, bool_ (*generator)(), bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs) { level_generator_type *g; @@ -6722,7 +6722,7 @@ static void fill_level(bool_ use_floor, byte smooth); /* * Generate a normal dungeon level */ -bool_ level_generate_dungeon(cptr name) +bool_ level_generate_dungeon() { int i, k, y, x, y1, x1, branch = get_branch(); dungeon_info_type *d_ptr = &d_info[dungeon_type]; @@ -6740,9 +6740,6 @@ bool_ level_generate_dungeon(cptr name) if (d_ptr->t_level[i] == dun_level) town_level = d_ptr->t_idx[i]; } - /* unused */ - name = name; - /* Check for arena level */ if ((dungeon_flags1 & (DF1_EMPTY)) || (empty_levels && (rand_int(EMPTY_LEVEL) == 0))) |