[crawl-ref-commits] master branch updated: 0.13-a0-2581-g07a0b80

[<gi...@cr...>]

       via  07a0b80f945cf9971cf29834f28f279ccdfbefdb (commit)
       via  6d5fa6932aadca17e146582085c533f2cb4f77e0 (commit)
      from  9c9ad2be82ac0601b9a8ba53bf694f9989117f03 (commit)

-----------------------------------------------------------------------
commit 07a0b80f945cf9971cf29834f28f279ccdfbefdb
Author: Adam Borowski <kil...@an...>
Date:   Mon Jul 29 19:30:32 2013 +0200

    Fix reversed logic in a test.

commit 6d5fa6932aadca17e146582085c533f2cb4f77e0
Author: Adam Borowski <kil...@an...>
Date:   Wed Jul 31 03:58:07 2013 +0200

    Unbreak build.
    
    Guys, actually trying to compile after a pull --rebase would be nice;
    there's 16 commits in a row which don't even build.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dactions.cc      |    1 +
 crawl-ref/source/test/los_csc.lua |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/source/dactions.cc b/crawl-ref/source/dactions.cc
index 4680ba1..1979a25 100644
--- a/crawl-ref/source/dactions.cc
+++ b/crawl-ref/source/dactions.cc
@@ -56,6 +56,7 @@ static const char *daction_names[] =
     "slimes allow another conversion attempt",
 #endif
     "hogs to humans",
+    "end spirit howl",
 };
 #endif
 
diff --git a/crawl-ref/source/test/los_csc.lua b/crawl-ref/source/test/los_csc.lua
index ea8d5e5..02a8c2a 100644
--- a/crawl-ref/source/test/los_csc.lua
+++ b/crawl-ref/source/test/los_csc.lua
@@ -25,7 +25,7 @@ local function test_cellseecell_symmetry()
           this_p = other_p
           other_p = temp
         end
-        if (forward and backward) or (not forward and not backward) then
+        if (forward and not backward) or (not forward and backward) then
           dgn.fprop_changed(other_p.x, other_p.y, "highlight")
           debug.dump_map(FAILMAP)
           assert(false,


-- 
Dungeon Crawl Stone Soup