diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-02-05 19:22:46 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-02-05 19:22:46 +0100 |
| commit | 959f8c09f32e6b431bc4f7af8d1a5c296cefdafe (patch) | |
| tree | 39b93225f9a1ce47af5015bef347ef3166382185 /src | |
| parent | f099462e0ddb5e3304b06ea1d7727bd01d82453b (diff) | |
Remove unused dungeon_info_type::next
Diffstat (limited to 'src')
| -rw-r--r-- | src/dungeon_info_type.hpp | 1 | ||||
| -rw-r--r-- | src/generate.cc | 22 | ||||
| -rw-r--r-- | src/init1.cc | 7 |
3 files changed, 4 insertions, 26 deletions
diff --git a/src/dungeon_info_type.hpp b/src/dungeon_info_type.hpp index 5f6fc9d0..b7b61a53 100644 --- a/src/dungeon_info_type.hpp +++ b/src/dungeon_info_type.hpp @@ -38,7 +38,6 @@ struct dungeon_info_type s16b maxdepth; /* Maximal depth */ bool_ principal; /* If it's a part of the main dungeon */ - byte next; /* The next part of the main dungeon */ byte min_plev; /* Minimal plev needed to enter -- it's an anti-cheating mesure */ int min_m_alloc_level; /* Minimal number of monsters per level */ diff --git a/src/generate.cc b/src/generate.cc index b5733682..9fc71763 100644 --- a/src/generate.cc +++ b/src/generate.cc @@ -420,19 +420,6 @@ static void place_up_stairs(int y, int x) /* - * Convert existing terrain type to "down stairs" with dungeon changing. - */ -static void place_magical_stairs(int y, int x, byte next) -{ - cave_type *c_ptr = &cave[y][x]; - - /* Create up stairs */ - cave_set_feat(y, x, FEAT_MORE); - c_ptr->special = next; -} - - -/* * Convert existing terrain type to "down stairs" */ static void place_down_stairs(int y, int x) @@ -907,14 +894,7 @@ static void place_random_stairs(int y, int x) } else if (dun_level >= d_info[dungeon_type].maxdepth) { - if (d_info[dungeon_type].next) - { - place_magical_stairs(y, x, d_info[dungeon_type].next); - } - else - { - place_up_stairs(y, x); - } + place_up_stairs(y, x); } else if (rand_int(100) < 50) { diff --git a/src/init1.cc b/src/init1.cc index 7083a5f3..9d221c01 100644 --- a/src/init1.cc +++ b/src/init1.cc @@ -7876,18 +7876,17 @@ errr init_d_info_txt(FILE *fp) if (buf[0] == 'W') { int min_lev, max_lev; - int min_plev, next; + int min_plev; int min_alloc, max_chance; /* Scan for the values */ - if (6 != sscanf(buf + 2, "%d:%d:%d:%d:%d:%d", - &min_lev, &max_lev, &min_plev, &next, &min_alloc, &max_chance)) return (1); + if (5 != sscanf(buf + 2, "%d:%d:%d:%d:%d", + &min_lev, &max_lev, &min_plev, &min_alloc, &max_chance)) return (1); /* Save the values */ d_ptr->mindepth = min_lev; d_ptr->maxdepth = max_lev; d_ptr->min_plev = min_plev; - d_ptr->next = next; d_ptr->min_m_alloc_level = min_alloc; d_ptr->max_m_alloc_chance = max_chance; |