Complete.Org: Mailing Lists: Archives: freeciv-dev: July 2000:
[Freeciv-Dev] Suggested corrections to unitfunc.c
Home

[Freeciv-Dev] Suggested corrections to unitfunc.c

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: freeciv-dev@xxxxxxxxxxx
Subject: [Freeciv-Dev] Suggested corrections to unitfunc.c
From: Erik Sigra <freeciv@xxxxxxx>
Date: Fri, 28 Jul 2000 15:22:19 +0200

Changed all occurences of "money" (9) to "gold" (11) to be consistent.
Now "gold" should occur 20 times. Also adds a missing dot.

Against cvs of 2000-07-28 14:39 UTC +0200 (just like
corrections_to_stdinhand.c)

Erik Sigra
--- unitfunc.c.orig     Fri Jul 28 15:00:03 2000
+++ unitfunc.c  Fri Jul 28 15:09:03 2000
@@ -412,7 +412,7 @@
   
   - Can't bribe a unit if:
     - Owner runs an unbribable government (e.g., democracy).
-    - Player doesn't have enough money.
+    - Player doesn't have enough gold.
     - It's not the only unit on the square
       (this is handled outside this function).
     - You are allied with the unit owner.
@@ -451,14 +451,14 @@
     return;
   }
 
-  /* If player doesn't have enough money, can't bribe. */
+  /* If player doesn't have enough gold, can't bribe. */
   if (pplayer->economic.gold < pvictim->bribe_cost) {
     notify_player_ex (pplayer, pdiplomat->x, pdiplomat->y, E_MY_DIPLOMAT,
-                     _("Game: You don't have enough money to"
+                     _("Game: You don't have enough gold to"
                        " bribe %s's %s."),
                      get_player (pvictim->owner)->name,
                      unit_name (pvictim->type));
-    freelog (LOG_DEBUG, "bribe-unit: not enough money");
+    freelog (LOG_DEBUG, "bribe-unit: not enough gold");
     return;
   }
 
@@ -695,7 +695,7 @@
                      pplayer->name, unit_name (pdiplomat->type),
                      advances[target].name, pcity->name);
     notify_embassies (pplayer, cplayer,
-                     _("Game: The %s have stolen %s from the %s"),
+                     _("Game: The %s have stolen %s from the %s."),
                      get_nation_name_plural (pplayer->nation),
                      advances[target].name,
                      get_nation_name_plural (cplayer->nation));
@@ -724,7 +724,7 @@
 
   - Can't incite a city to disaffect if:
     - Owner runs an unbribable government (e.g., democracy).
-    - Player doesn't have enough money.
+    - Player doesn't have enough gold.
     - You are allied with the city owner.
   - Check for infiltration success.  Our provocateur may not survive this.
   - Check for basic success.  Again, our provocateur may not survive this.
@@ -779,13 +779,13 @@
   /* Special deal for former owners! */
   if (pplayer->player_no == pcity->original) revolt_cost /= 2;
 
-  /* If player doesn't have enough money, can't incite a revolt. */
+  /* If player doesn't have enough gold, can't incite a revolt. */
   if (pplayer->economic.gold < revolt_cost) {
     notify_player_ex (pplayer, pcity->x, pcity->y, E_MY_DIPLOMAT,
-                     _("Game: You don't have enough money to"
+                     _("Game: You don't have enough gold to"
                        " subvert %s."),
                      pcity->name);
-    freelog (LOG_DEBUG, "incite: not enough money");
+    freelog (LOG_DEBUG, "incite: not enough gold");
     return;
   }
 
@@ -2861,7 +2861,7 @@
                      ransom);
     destroyer->economic.gold += ransom;
     pplayer->economic.gold -= ransom;
-    send_player_info(destroyer,0);   /* let me see my new money :-) */
+    send_player_info(destroyer,0);   /* let me see my new gold :-) */
     unitcount = 1;
   }
 

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] Suggested corrections to unitfunc.c, Erik Sigra <=