From 8581baef6309eb58a513f109d85810b081465e50 Mon Sep 17 00:00:00 2001
From: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 13 Oct 2008 17:41:14 +0000
Subject: Add a few apostrophe-related cleanups.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7234 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/mon-util.cc | 2 +-
 crawl-ref/source/shopping.cc | 4 ++--
 crawl-ref/source/spl-cast.cc | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 5cea8ebe9b..6bb68e5f28 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -4477,7 +4477,7 @@ std::string monsters::name(description_level_type desc, bool force_vis) const
 
     std::string monnam = _str_monam(*this, desc, force_vis);
 
-    return (possessive? apostrophise(monnam) : monnam);
+    return (possessive ? apostrophise(monnam) : monnam);
 }
 
 std::string monsters::base_name(description_level_type desc, bool force_vis)
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index cbcbaa89a4..e341a49aca 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -28,6 +28,7 @@
 #include "items.h"
 #include "itemname.h"
 #include "itemprop.h"
+#include "Kills.h"
 #include "macro.h"
 #include "notes.h"
 #include "player.h"
@@ -1734,8 +1735,7 @@ std::string shop_name(const coord_def& where)
         | (static_cast<unsigned long>( cshop->keeper_name[1] ) << 8)
         | (static_cast<unsigned long>( cshop->keeper_name[1] ) << 16);
 
-    std::string sh_name = make_name(seed, false);
-    sh_name += "'s ";
+    std::string sh_name = apostrophise(make_name(seed, false)) + " ";
 
     if (shop_type == SHOP_WEAPON_ANTIQUE || shop_type == SHOP_ARMOUR_ANTIQUE)
         sh_name += "Antique ";
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 5abc08b98b..2d686983f3 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -28,6 +28,7 @@
 #include "item_use.h"
 #include "itemname.h"
 #include "itemprop.h"
+#include "Kills.h"
 #include "macro.h"
 #include "menu.h"
 #include "message.h"
@@ -2377,10 +2378,9 @@ std::string MiscastEffect::get_default_cause()
 
     if (you.can_see(mon_source))
     {
-        std::string str = mon_source->base_name(DESC_PLAIN);
+        std::string str = apostrophise(mon_source->base_name(DESC_PLAIN));
 
-        str += "'s spell miscasting";
-        str = replace_all(str, "s's", "s'");
+        str += " spell miscasting";
         return str;
     }
     else
-- 
cgit v1.2.3-54-g00ecf