Fix inconsistencies in gold-related messages.

3 files changed, 13 insertions, 10 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index d2177f662c..3cc6579458 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -538,7 +538,10 @@ static void _do_wizard_command(int wiz_command, bool silent_fail)
     case '$':
         you.gold += 1000;
         if (!Options.show_gold_turns)
-            mprf("You now have %d gold.", you.gold);
+        {
+            mprf("You now have %d gold piece%s.",
+                 you.gold, you.gold != 1 ? "s" : "");
+        }
         break;
 
     case 'B':
@@ -1975,7 +1978,7 @@ void process_command( command_type cmd )
 
     case CMD_LIST_GOLD:
         mprf("You have %d gold piece%s.",
-             you.gold, you.gold > 1 ? "s" : "");
+             you.gold, you.gold != 1 ? "s" : "");
         break;
 
     case CMD_INSCRIBE_ITEM:
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 975a4da142..d7a14476fa 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1483,14 +1483,14 @@ void note_inscribe_item(item_def &item)
 
 // Returns quantity of items moved into player's inventory and -1 if
 // the player's inventory is full.
-int move_item_to_player( int obj, int quant_got, bool quiet,
-                         bool ignore_burden )
+int move_item_to_player(int obj, int quant_got, bool quiet,
+                        bool ignore_burden)
 {
     if (item_is_stationary(mitm[obj]))
     {
         mpr("You cannot pick up the net that holds you!");
-        // Fake a successful pickup (return 1), so we can continue to pick up
-        // anything else that might be on this square.
+        // Fake a successful pickup (return 1), so we can continue to
+        // pick up anything else that might be on this square.
         return (1);
     }
 
@@ -1501,12 +1501,12 @@ int move_item_to_player( int obj, int quant_got, bool quiet,
     {
         you.attribute[ATTR_GOLD_FOUND] += quant_got;
         you.gold += quant_got;
-        dec_mitm_item_quantity( obj, quant_got );
+        dec_mitm_item_quantity(obj, quant_got);
 
         if (!quiet)
         {
             mprf("You now have %d gold piece%s.",
-                 you.gold, you.gold > 1 ? "s" : "");
+                 you.gold, you.gold != 1 ? "s" : "");
         }
 
         learned_something_new(TUT_SEEN_GOLD);
diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h
index aa70cee2f7..5d32ee4d21 100644
--- a/crawl-ref/source/items.h
+++ b/crawl-ref/source/items.h
@@ -39,8 +39,8 @@ void inc_mitm_item_quantity(int obj, int amount);
 bool move_item_to_grid( int *const obj, const coord_def& p );
 void move_item_stack_to_grid( const coord_def& from, const coord_def& to );
 void note_inscribe_item(item_def &item);
-int  move_item_to_player( int obj, int quant_got, bool quiet = false,
-                          bool ignore_burden = false );
+int  move_item_to_player(int obj, int quant_got, bool quiet = false,
+                         bool ignore_burden = false);
 void mark_items_non_pickup_at(const coord_def &pos);
 bool is_stackable_item( const item_def &item );
 bool items_similar( const item_def &item1, const item_def &item2,