diff options
| -rw-r--r-- | crawl-ref/source/acr.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/travel.cc | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 79d4b72cba..6d14d14ce4 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -285,15 +285,8 @@ int main( int argc, char *argv[] ) while (true) _input(); - // Should never reach this stage, right? -#if defined(USE_TILE) - tiles.shutdown(); -#elif defined(UNIX) - unixcurses_shutdown(); -#endif - return 0; -} // end main() +} static void _show_commandline_options_help() { diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 584e6c5e63..e0b4775bab 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -552,7 +552,8 @@ bool is_travelsafe_square(int x, int y, bool ignore_hostile, return (false); const bool seen = see_grid(x,y); - const int grid = (seen ? grd[x][y] : get_envmap_obj(x,y)); + const int grid = ((seen || ignore_terrain_knowledge) ? grd[x][y] + : get_envmap_obj(x,y)); // FIXME: this compares to the *real* monster at the square, // even if the one we've seen is different. |