diff options
| -rw-r--r-- | crawl-ref/docs/options_guide.txt | 6 | ||||
| -rwxr-xr-x | crawl-ref/source/misc/build_dcss_release.rb | 10 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/tutorial.cc | 4 |
4 files changed, 10 insertions, 16 deletions
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index d09b780aa5..dee3660fee 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -832,8 +832,7 @@ tc_exclude_circle = red etc. disconnected: squares which cannot be reached without leaving the level - excluded: the colour for the centre of travel exclusions - ('e') + excluded: the colour for the centre of travel exclusions ('e') excluded_circle: the colour for travel exclusions apart from centre @@ -924,7 +923,8 @@ auto_exclude = <list of monster names> travel exclusion is set centered on this monster, meaning autoexplore won't ever bring you in its line of sight. If the monster dies or wakes up while you are in sight, this exclusion - is automatically removed again. + is automatically removed again. Otherwise, you can remove an + exclusion that is no longer valid with Xee. 4-h Stashes. ---------------- diff --git a/crawl-ref/source/misc/build_dcss_release.rb b/crawl-ref/source/misc/build_dcss_release.rb index 5f620fb209..9ea7008b5e 100755 --- a/crawl-ref/source/misc/build_dcss_release.rb +++ b/crawl-ref/source/misc/build_dcss_release.rb @@ -14,7 +14,7 @@ SVN_PRESYNC = '' SVN = 'svn' -BUILDS = [ Proc.new { build_win32 }, +BUILDS = [ Proc.new { build_win32 }, Proc.new { build_dos } ].reverse W32MAKE = 'mingw32-make' @@ -59,7 +59,7 @@ end def full_checkout puts "#{SVN} co #{SVN_URL} #{SVN_CO_DIR}" - system "#{SVN} co #{SVN_URL} #{SVN_CO_DIR}" or + system "#{SVN} co #{SVN_URL} #{SVN_CO_DIR}" or raise "#{SVN} co failed: #$?" Dir.chdir SVN_CO_DIR end @@ -167,7 +167,7 @@ end def build_win32 setup_w32make_env - + puts "\nBuilding stone_soup (non-debug) for #{release_version} release!" system( %{#{W32MAKE} -f makefile.mgw DOYACC=y "EXTRA_FLAGS=-O2 } + %{-DCLUA_BINDINGS -DREGEX_PCRE -DDEBUG -DWIZARD" } + @@ -203,7 +203,7 @@ def makezip(path, name, exe) end Zip::ZipFile.open( zipname, Zip::ZipFile::CREATE ) do |zip| zip.dir.mkdir(name) - + zip.dir.chdir name # The exe itself @@ -211,7 +211,7 @@ def makezip(path, name, exe) # Add base documentation zip.add [ 'CREDITS', 'licence.txt', 'readme.txt' ] + Dir['README*'] - + # Add base config zip.add [ 'init.txt', 'macro.txt' ] diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index ed12f894e2..a140fb30d2 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -679,12 +679,6 @@ bool cast_a_spell(bool check_range) return (false); } - if (you.magic_points < 1) - { - mpr("You don't have enough magic to cast spells."); - return (false); - } - const int minRange = _get_dist_to_nearest_monster(); int keyin = (check_range ? 0 : '?'); diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index a67b6804da..fedc3c38a5 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -2063,9 +2063,9 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc) viewwindow(true, false); text << "are some kind of escape hatch. You can use them to " "quickly leave a level with <w><<</w> and <w>></w>, " - "respectively " + "respectively" #ifdef USE_TILE - "(or by using your <w>left mouse button</w> in combination " + " (or by using your <w>left mouse button</w> in combination " "with the <w>Shift key</w>)" #endif ", but will usually be unable to return right away."; |