[crawl-ref-commits] master branch updated: 0.10-a0-3020-g2e2a398

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

       via  2e2a398d1a4aafad0ad434a36a300faa9e9ac3ea (commit)
       via  f703418444a94c867b85eb6c3c670b0f478b9b84 (commit)
       via  251e3ede3eec57e1091a9a090a256878193e56f4 (commit)
      from  993baa891cc8c796eb6c291534c6ac56902b3066 (commit)

-----------------------------------------------------------------------
commit 2e2a398d1a4aafad0ad434a36a300faa9e9ac3ea
Author: Brendan Hickey <br...@bh...>
Date:   Fri Dec 30 14:03:18 2011 -0500

    Fixing a RNG error

commit f703418444a94c867b85eb6c3c670b0f478b9b84
Author: Neil Moore <ne...@s-...>
Date:   Fri Dec 30 14:44:22 2011 -0500

    Add bmh to the crawl-ref-cia hook.

commit 251e3ede3eec57e1091a9a090a256878193e56f4
Author: Neil Moore <ne...@s-...>
Date:   Fri Dec 30 14:40:20 2011 -0500

    Fix a duplicate message (Fixes #5142).

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

Summary of changes:
 crawl-ref/git-hooks/crawl-ref-cia |    1 +
 crawl-ref/source/asg.cc           |    2 +-
 crawl-ref/source/beam.cc          |    3 +++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/git-hooks/crawl-ref-cia b/crawl-ref/git-hooks/crawl-ref-cia
index 3b5c362..24c7c62 100755
--- a/crawl-ref/git-hooks/crawl-ref-cia
+++ b/crawl-ref/git-hooks/crawl-ref-cia
@@ -187,6 +187,7 @@ $user =~ s/akbecker/GreatZebu/;
 $user =~ s/pete/mumra/;
 $user =~ s/bstriegs/Wensley/;
 $user =~ s/lothar.dierkes/ldierk/;
+$user =~ s/brendan/bmh/;
 
 $rev = substr($commit, 0, 12);
 
diff --git a/crawl-ref/source/asg.cc b/crawl-ref/source/asg.cc
index f942bb9..40a097a 100644
--- a/crawl-ref/source/asg.cc
+++ b/crawl-ref/source/asg.cc
@@ -16,7 +16,7 @@ uint32_t
 AsgKISS::get_uint32()
 {
     m_lcg = (314527869 * m_lcg + 1234567);
-    m_lfsr = (-(m_lfsr&1U))&0xD0000001 & m_lfsr >> 1;
+    m_lfsr = (m_lfsr >> 1) ^ (-(m_lfsr & 1U) & 0xD0000001U);
 
     if (m_lfsr & 1)
     {
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index fa5615c..59f6c3a 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3251,7 +3251,10 @@ void bolt::affect_player_enchantment()
             mpr("This is polymorph other only!");
         }
         else
+        {
             canned_msg(MSG_NOTHING_HAPPENS);
+            msg_generated = true; // to avoid duplicate "nothing happens"
+        }
         break;
 
     case BEAM_SLOW:


-- 
Dungeon Crawl Stone Soup