Some code review and cleanup.

extern char info[] is almost gone.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1387 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 4 deletions

diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 7644b93220..c89990d03e 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -124,10 +124,12 @@ static void in_a_shop( char shoppy )
 
     ShopInfo &si = stashes.get_shop(the_shop.x, the_shop.y);
 
-    snprintf(info, INFO_SIZE, "Welcome to %s!",
-             shop_name(the_shop.x, the_shop.y) );
-
-    shop_print(info, 20);
+    {
+        std::string welcome_message = "Welcome to ";
+        welcome_message += shop_name(the_shop.x, the_shop.y);
+        welcome_message += "!";
+        shop_print(welcome_message.c_str(), 20);
+    }
 
     more3();