diff options
| -rw-r--r-- | crawl-ref/docs/changelog.txt (renamed from crawl-ref/docs/changes.stone_soup) | 0 | ||||
| -rw-r--r-- | crawl-ref/source/command.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/dat/database/FAQ.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 |
5 files changed, 4 insertions, 12 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changelog.txt index 7a3aff137f..7a3aff137f 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changelog.txt diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index b0096b7bb2..bb0903cc9d 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -131,7 +131,7 @@ static void _add_file_to_scroller(FILE* fp, formatted_scroller& m, static std::string _get_version_changes(void) { // Attempts to print "Highlights" of the latest version. - FILE* fp = fopen(datafile_path("changes.stone_soup", false).c_str(), "r"); + FILE* fp = fopen(datafile_path("changelog.txt", false).c_str(), "r"); if (!fp) return ""; @@ -186,13 +186,13 @@ static std::string _get_version_changes(void) if (start) { result += EOL; - result += "For a more complete list of changes, see changes.stone_soup " + result += "For a more complete list of changes, see changelog.txt " "in the " EOL "/docs folder."; } else { - result += "For a list of changes, see changes.stone_soup in the /docs " + result += "For a list of changes, see changelog.txt in the /docs " "folder."; } diff --git a/crawl-ref/source/dat/database/FAQ.txt b/crawl-ref/source/dat/database/FAQ.txt index 5a14d788ef..d4b9771050 100644 --- a/crawl-ref/source/dat/database/FAQ.txt +++ b/crawl-ref/source/dat/database/FAQ.txt @@ -412,7 +412,7 @@ A:changes A: The (admittedly highly subjective) highlights of the last major release are listed along with the version information under '?v'. For more details, check -out the change log in docs/changes.stone_soup. +out changelog.txt in the docs/ folder. %%%% ############################################## # Questions about the Tiles version diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 52e2597a1c..2135d0ca92 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -140,10 +140,6 @@ bool monster_habitable_grid(int monster_class, dungeon_feature_type actual_grid, int flies, bool paralysed) { - // No monster may be placed on open sea. - if (actual_grid == DNGN_OPEN_SEA) - return (false); - const dungeon_feature_type grid_preferred = habitat2grid(mons_class_primary_habitat(monster_class)); const dungeon_feature_type grid_nonpreferred = diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index cc575b03df..408382d387 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -8154,10 +8154,6 @@ static bool _mon_can_move_to_pos(const monsters *monster, if (!in_bounds(targ)) return (false); - // No monster may enter the open sea. - if (grd(targ) == DNGN_OPEN_SEA) - return (false); - // Non-friendly and non-good neutral monsters won't enter // sanctuaries. if (!mons_wont_attack(monster) |