[Freeciv-Dev] Re: (PR#12331) conquered city style

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

Paul Zastoupil wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=12331 >
> 
> It might be cool if conquered cities kept their citystyle regardless of
> the current owner.

Here's an incomplete patch for this.

It's incomplete because you'll get bad results in some cases, because of 
the city styles that become available through tech advances.  These 
styles should automatically upgrade all cities you have, including 
conquered ones.  But that's impossible in the context of 
get_player_city_style().

-jason

Index: common/city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.314
diff -u -r1.314 city.c
--- common/city.c       10 Feb 2005 17:55:08 -0000      1.314
+++ common/city.c       23 Feb 2005 04:18:36 -0000
@@ -1239,7 +1239,7 @@
 **************************************************************************/
 int get_city_style(const struct city *pcity)
 {
-  return get_player_city_style(city_owner(pcity));
+  return get_player_city_style(get_player(pcity->original));
 }
 
 /**************************************************************************