<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40700 >

The concise city status symbols (* for celebrating, X for disorder)
were changed to + and - in r12989 (39385) for no reason I can see.
This patch reverts those changes.


-----------------------------------------------------------------------
他人の食器の配置を変えるのが好きなタイプだろう。
diff --git a/client/cityrepdata.c b/client/cityrepdata.c
index 5d923c8..7984530 100644
--- a/client/cityrepdata.c
+++ b/client/cityrepdata.c
@@ -60,8 +60,8 @@ static const char *cr_entry_hstate_concise(const struct city *pcity,
 					   const void *data)
 {
   static char buf[4];
-  my_snprintf(buf, sizeof(buf), "%s", (city_celebrating(pcity) ? "+" :
-				       (city_unhappy(pcity) ? "-" : " ")));
+  my_snprintf(buf, sizeof(buf), "%s", (city_celebrating(pcity) ? "*" :
+				       (city_unhappy(pcity) ? "X" : " ")));
   return buf;
 }
 
@@ -449,7 +449,7 @@ static const struct city_report_spec base_city_report_specs[] = {
     N_("Entertainers, Scientists, Taxmen"),
     NULL, FUNC_TAG(specialists) },
 
-  { FALSE,  1, 1, NULL,  NULL,          N_("Concise + Rapture, - Disorder"),
+  { FALSE,  1, 1, NULL,  NULL,          N_("Concise *=Rapture, X=Disorder"),
     NULL, FUNC_TAG(hstate_concise) },
   { TRUE,  -8, 1, NULL,  N_("State"),   N_("Rapture/Peace/Disorder"),
     NULL, FUNC_TAG(hstate_verbose) },
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to