diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-06-08 20:22:21 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-06-08 20:22:21 +0200 |
| commit | 258af752a1d6f6dc337c97e8ceabf26bcb974f31 (patch) | |
| tree | dd0a724b9c936b2fc8c497a6d8089d5afcf7c68d /crawl-ref/source/menu.cc | |
| parent | a2c649a2645682eb974353707775e599f1f2ce96 (diff) | |
| download | crawl-ref-258af752a1d6f6dc337c97e8ceabf26bcb974f31.tar.gz crawl-ref-258af752a1d6f6dc337c97e8ceabf26bcb974f31.zip | |
Turn pairs of assertions with x > min, x <= max into ASSERT_RANGE.
The perl regexp to do so is:
s&ASSERT\(([^\n]+) >= ([^\n]+)\);\s*ASSERT\(\1 < ([^\n]+)\);&ASSERT_RANGE($1, $2, $3);&sg;
Diffstat (limited to 'crawl-ref/source/menu.cc')
| -rw-r--r-- | crawl-ref/source/menu.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index d8fde47ed2..76e8974efb 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -1129,8 +1129,7 @@ bool PlayerMenuEntry::get_tiles(vector<tile_def>& tileset) const if (idx == 0 || idx == TILEP_SHOW_EQUIP || flags[p] == TILEP_FLAG_HIDE) continue; - ASSERT(idx >= TILE_MAIN_MAX); - ASSERT(idx < TILEP_PLAYER_MAX); + ASSERT_RANGE(idx, TILE_MAIN_MAX, TILEP_PLAYER_MAX); int ymax = TILE_Y; @@ -1722,8 +1721,7 @@ void column_composer::add_formatted(int ncol, bool (*tfilt)(const string &), int margin) { - ASSERT(ncol >= 0); - ASSERT(ncol < (int) columns.size()); + ASSERT_RANGE(ncol, 0, (int) columns.size()); column &col = columns[ncol]; vector<string> segs = split_string("\n", s, false, true); @@ -3082,8 +3080,7 @@ void SaveMenuItem::_pack_doll() if (idx == 0 || idx == TILEP_SHOW_EQUIP || flags[p] == TILEP_FLAG_HIDE) continue; - ASSERT(idx >= TILE_MAIN_MAX); - ASSERT(idx < TILEP_PLAYER_MAX); + ASSERT_RANGE(idx, TILE_MAIN_MAX, TILEP_PLAYER_MAX); int ymax = TILE_Y; |