diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-15 11:32:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-15 11:32:54 +0000 |
| commit | 7fce9b7324c77c16c310e76a6d697e6f84fc9398 (patch) | |
| tree | 061bcb63c57c1281473a289e22041cb93259feca /crawl-ref/source/traps.cc | |
| parent | ead36b3ba490fb199815ccc048ba204e5bbee30e (diff) | |
| download | crawl-ref-7fce9b7324c77c16c310e76a6d697e6f84fc9398.tar.gz crawl-ref-7fce9b7324c77c16c310e76a6d697e6f84fc9398.zip | |
Fix 1948131: Quiver slot name wraps around the screen.
Also fixes tile issues where the inventory was partly covered or not
shown at all.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5844 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/traps.cc')
| -rw-r--r-- | crawl-ref/source/traps.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index d6646e9dba..1434640c19 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -472,10 +472,10 @@ void handle_traps(trap_type trt, int i, bool trap_known) void destroy_trap( const coord_def& pos ) { - for ( int i = 0; i < MAX_TRAPS; ++i ) + for (int i = 0; i < MAX_TRAPS; ++i) { - if ( env.trap[i].x == pos.x && env.trap[i].y == pos.y && - env.trap[i].type != TRAP_UNASSIGNED ) + if (env.trap[i].x == pos.x && env.trap[i].y == pos.y + && env.trap[i].type != TRAP_UNASSIGNED) { grd(pos) = DNGN_FLOOR; env.trap[i].type = TRAP_UNASSIGNED; @@ -954,7 +954,7 @@ bool is_valid_shaft_level(const level_id &place) if (place.level_type != LEVEL_DUNGEON) return (false); - // disallow shafts on the first two levels + // Disallow shafts on the first two levels. if (place.branch == BRANCH_MAIN_DUNGEON && you.your_level < 2) { @@ -1147,9 +1147,9 @@ static trap_type random_trap_default(int level_number, const level_id &place) if (random2(1 + level_number) > 11) type = TRAP_BLADE; - if ((random2(1 + level_number) > 14 && one_chance_in(3)) - || (place.branch == BRANCH_HALL_OF_ZOT && - place.level_type == LEVEL_DUNGEON && coinflip())) + if (random2(1 + level_number) > 14 && one_chance_in(3) + || (place.branch == BRANCH_HALL_OF_ZOT + && place.level_type == LEVEL_DUNGEON && coinflip())) { type = TRAP_ZOT; } @@ -1168,7 +1168,7 @@ trap_type random_trap_for_place(int level_number, const level_id &place) { if (level_number == -1) { - switch(place.level_type) + switch (place.level_type) { case LEVEL_DUNGEON: level_number = absdungeon_depth(place.branch, place.depth); @@ -1184,7 +1184,7 @@ trap_type random_trap_for_place(int level_number, const level_id &place) } } - switch(place.level_type) + switch (place.level_type) { case LEVEL_DUNGEON: if (branches[place.branch].rand_trap_function != NULL) |