diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-03 16:08:29 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-03 16:08:29 +0000 |
| commit | fbb8be057b84f12bc8f2cdcab82d0368faea86eb (patch) | |
| tree | 553b24a40cc537f9af96a327b76edc0370980f11 | |
| parent | 6c431e8a60c160556ed15888e7f980dfbce73a5b (diff) | |
| download | crawl-ref-fbb8be057b84f12bc8f2cdcab82d0368faea86eb.tar.gz crawl-ref-fbb8be057b84f12bc8f2cdcab82d0368faea86eb.zip | |
Trunk->0.3 merge (2737): Removed travel_colour.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2738 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/init.txt | 1 | ||||
| -rw-r--r-- | crawl-ref/source/externs.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt index ae1daa66d1..66f39d8f8f 100644 --- a/crawl-ref/init.txt +++ b/crawl-ref/init.txt @@ -122,7 +122,6 @@ stab_brand = hi:blue ##### 4-g Travel and Exploration ################# # -# travel_colour = false # travel_delay = 20 # travel_avoid_terrain = shallow water # diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 4bdb77cae9..a405cbf40d 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -1512,7 +1512,6 @@ public: int stash_tracking; // How stashes are tracked - bool travel_colour; // Colour levelmap using travel information? int tc_reachable; // Colour for squares that are reachable int tc_excluded; // Colour for excluded squares. int tc_exclude_circle; // Colour for squares in the exclusion radius diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 6560462c32..8381108260 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -630,7 +630,6 @@ void game_options::reset_options() pickup_dropped = false; pickup_thrown = true; - travel_colour = true; travel_delay = 20; travel_stair_cost = 500; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 59ea890bb6..817b973db1 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -2581,7 +2581,7 @@ static void draw_level_map(int start_x, int start_y, bool travel_mode) { colour = colour_code_map(c.x, c.y, Options.item_colour, - travel_mode && Options.travel_colour); + travel_mode); buffer2[bufcount2 + 1] = colour; buffer2[bufcount2] = env.map(c).glyph(); |