From c6cfab9c8d27c27924e69860cadc563b2fa7c4ca Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 25 Apr 2007 06:37:02 +0000
Subject: Mummies fall apart in deep water, demons can drown in deep water or
 lava.

Fixed missing space for randart "Thing".

Use SQLITE_TRANSIENT when inserting data into the db.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1363 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/mon-util.cc | 4 +++-
 crawl-ref/source/monstuff.cc | 6 +++++-
 crawl-ref/source/mutation.cc | 2 --
 crawl-ref/source/randart.cc  | 2 +-
 crawl-ref/source/sqldbm.cc   | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 0bd81b26ba..35d968eb6e 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -2332,7 +2332,9 @@ bool monsters::floundering() const
 
 bool monsters::can_drown() const
 {
-    return (!mons_res_asphyx(this));
+    // Mummies can fall apart in water; demons can drown in water/lava.
+    return (!mons_res_asphyx(this) || mons_genus(type) == MONS_MUMMY
+            || holiness() == MH_DEMONIC);
 }
 
 size_type monsters::body_size(int /* psize */, bool /* base */) const
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 305defc058..c4ea1066d6 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -4276,7 +4276,11 @@ void mons_check_pool(monsters *mons, int killer)
             {
                 if (grid == DNGN_LAVA)
                     simple_monster_message(
-                        mons, " is incinerated!",
+                        mons, " is incinerated.",
+                        MSGCH_MONSTER_DAMAGE, MDAM_DEAD);
+                else if (mons_genus(mons->type) == MONS_MUMMY)
+                    simple_monster_message(
+                        mons, " falls apart.",
                         MSGCH_MONSTER_DAMAGE, MDAM_DEAD);
                 else
                     simple_monster_message(
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 7245a2b182..81aec01c2f 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1070,8 +1070,6 @@ formatted_string describe_mutations()
         break;
     }                           //end switch - innate abilities
     
-     
-
     // a bit more stuff
     if ( (you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE) ||
          player_genus(GENPC_DRACONIAN) ||
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index 2cfa9ec8aa..d0a6775ab3 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -224,7 +224,7 @@ const char *rand_wpn_names[] = {
     " of the Lurker",
     " of the Crawling Thing",
     " of the Thing",
-    "\"Thing\"",
+    " \"Thing\"",
     " of the Sea",
     " of the Forest",
     " of the Trees",
diff --git a/crawl-ref/source/sqldbm.cc b/crawl-ref/source/sqldbm.cc
index f3cba77100..40d5867ca0 100644
--- a/crawl-ref/source/sqldbm.cc
+++ b/crawl-ref/source/sqldbm.cc
@@ -103,10 +103,10 @@ int SQL_DBM::insert(const std::string &key, const std::string &value)
     if (init_insert() != SQLITE_OK)
         return (errc);
 
-    ec(sqlite3_bind_text(s_insert, 1, key.c_str(), -1, SQLITE_STATIC));
+    ec(sqlite3_bind_text(s_insert, 1, key.c_str(), -1, SQLITE_TRANSIENT));
     if (errc != SQLITE_OK)
         return (errc);
-    ec(sqlite3_bind_text(s_insert, 2, value.c_str(), -1, SQLITE_STATIC));
+    ec(sqlite3_bind_text(s_insert, 2, value.c_str(), -1, SQLITE_TRANSIENT));
     if (errc != SQLITE_OK)
         return (errc);
 
-- 
cgit v1.2.3-54-g00ecf