Author: cazfi Date: Thu Mar 20 06:45:30 2014 New Revision: 24700 URL: http://svn.gna.org/viewcvs/freeciv?rev=24700&view=rev Log: Made initial city styles to be derived from national styles. User selects national style, not city style.
See patch #4589 Modified: trunk/client/gui-gtk-2.0/dialogs.c trunk/client/gui-gtk-3.0/dialogs.c trunk/client/gui-qt/dialogs.cpp trunk/client/gui-qt/dialogs.h trunk/client/gui-sdl/dialogs.c trunk/client/gui-sdl2/dialogs.c trunk/client/gui-xaw/dialogs.c trunk/client/packhand.c trunk/common/city.c trunk/common/city.h trunk/common/nation.c trunk/common/nation.h trunk/common/packets.def trunk/common/player.c trunk/common/player.h trunk/common/style.c trunk/common/style.h trunk/data/alien/cities.ruleset trunk/data/civ1/cities.ruleset trunk/data/civ2/cities.ruleset trunk/data/civ2civ3/cities.ruleset trunk/data/classic/cities.ruleset trunk/data/experimental/cities.ruleset trunk/data/multiplayer/cities.ruleset trunk/fc_version trunk/server/rssanity.c trunk/server/ruleset.c trunk/server/savegame.c trunk/server/savegame2.c trunk/server/srv_main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/client/gui-gtk-2.0/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/dialogs.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/client/gui-gtk-3.0/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/dialogs.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/client/gui-qt/dialogs.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/client/gui-qt/dialogs.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.h?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/client/gui-sdl/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/dialogs.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/client/gui-sdl2/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/dialogs.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/client/gui-xaw/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-xaw/dialogs.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/city.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/city.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/city.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/city.h?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/nation.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/nation.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/nation.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/nation.h?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/packets.def URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/player.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/player.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/player.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/player.h?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/style.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/style.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/common/style.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/style.h?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/data/alien/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/cities.ruleset?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/data/civ1/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/cities.ruleset?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/data/civ2/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/cities.ruleset?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/data/civ2civ3/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/cities.ruleset?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/data/classic/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/cities.ruleset?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/data/experimental/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/cities.ruleset?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/data/multiplayer/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/cities.ruleset?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/server/rssanity.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/server/savegame.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/server/savegame2.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=24700&r1=24699&r2=24700&view=diff Modified: trunk/server/srv_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=24700&r1=24699&r2=24700&view=diff _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits