From 61de119af862e0c1edab929b1b898a86ea6dab3f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 18 Jan 2022 17:45:21 +0200 Subject: [PATCH 21/21] Drop city_style citizens_graphic_alt See osdn #43650 Signed-off-by: Marko Lindqvist --- client/packhand.c | 1 - common/city.h | 1 - common/networking/packets.def | 1 - data/alien/styles.ruleset | 5 +---- data/civ1/styles.ruleset | 12 +----------- data/civ2/styles.ruleset | 12 +----------- data/civ2civ3/styles.ruleset | 12 +----------- data/classic/styles.ruleset | 12 +----------- data/experimental/styles.ruleset | 12 +----------- data/granularity/styles.ruleset | 3 +-- data/multiplayer/styles.ruleset | 12 +----------- data/ruledit/comments-3.1.txt | 2 +- data/sandbox/styles.ruleset | 12 +----------- data/stub/styles.ruleset | 3 +-- data/webperimental/styles.ruleset | 12 +----------- fc_version | 2 +- server/ruleset.c | 7 +------ tools/ruleutil/rulesave.c | 4 ---- 18 files changed, 14 insertions(+), 111 deletions(-) diff --git a/client/packhand.c b/client/packhand.c index d989c405aa..ee08091c1d 100644 --- a/client/packhand.c +++ b/client/packhand.c @@ -4612,7 +4612,6 @@ void handle_ruleset_city(const struct packet_ruleset_city *packet) sz_strlcpy(cs->graphic, packet->graphic); sz_strlcpy(cs->graphic_alt, packet->graphic_alt); sz_strlcpy(cs->citizens_graphic, packet->citizens_graphic); - sz_strlcpy(cs->citizens_graphic_alt, packet->citizens_graphic_alt); tileset_setup_city_tiles(tileset, id); } diff --git a/common/city.h b/common/city.h index 0450703ff5..520f4d5255 100644 --- a/common/city.h +++ b/common/city.h @@ -469,7 +469,6 @@ struct citystyle { char graphic[MAX_LEN_NAME]; char graphic_alt[MAX_LEN_NAME]; char citizens_graphic[MAX_LEN_NAME]; - char citizens_graphic_alt[MAX_LEN_NAME]; struct requirement_vector reqs; }; diff --git a/common/networking/packets.def b/common/networking/packets.def index 8d26decfe9..7e476fc4b4 100644 --- a/common/networking/packets.def +++ b/common/networking/packets.def @@ -1624,7 +1624,6 @@ PACKET_RULESET_CITY = 149; sc, lsend STRING name[MAX_LEN_NAME]; STRING rule_name[MAX_LEN_NAME]; STRING citizens_graphic[MAX_LEN_NAME]; - STRING citizens_graphic_alt[MAX_LEN_NAME]; UINT8 reqs_count; REQUIREMENT reqs[MAX_NUM_REQS:reqs_count]; STRING graphic[MAX_LEN_NAME]; diff --git a/data/alien/styles.ruleset b/data/alien/styles.ruleset index 08b82c62f6..030eabed3d 100644 --- a/data/alien/styles.ruleset +++ b/data/alien/styles.ruleset @@ -43,7 +43,7 @@ name = _("?style:Human") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -53,7 +53,6 @@ name = _("?citystyle:Human") graphic = "city.human" graphic_alt = "city.classical" citizens_graphic = "human" -citizens_graphic_alt = "ancient" reqs = { "type", "name", "range" "Style", "Human", "Player" } @@ -63,7 +62,6 @@ name = _("?citystyle:Dual") graphic = "city.dual" graphic_alt = "city.modern" citizens_graphic = "dual" -citizens_graphic_alt = "modern" reqs = { "type", "name", "range" "Tech", "Alien Rights", "Player" @@ -74,7 +72,6 @@ name = _("?citystyle:Oceanic") graphic = "city.ocean" graphic_alt = "city.modern" citizens_graphic = "dual" -citizens_graphic_alt = "modern" reqs = { "type", "name", "range" "TerrainClass", "Oceanic", "Local" diff --git a/data/civ1/styles.ruleset b/data/civ1/styles.ruleset index f1e878ae79..7e4cd6459e 100644 --- a/data/civ1/styles.ruleset +++ b/data/civ1/styles.ruleset @@ -57,7 +57,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -67,7 +67,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -77,7 +76,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -87,7 +85,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -97,7 +94,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -107,7 +103,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -117,7 +112,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -127,7 +121,6 @@ name = _("?citystyle:Renaissance") graphic = "city.renaissance" graphic_alt = "city.industrial" citizens_graphic = "renaissance" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "University", "Player" } @@ -137,7 +130,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -147,7 +139,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -157,7 +148,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/data/civ2/styles.ruleset b/data/civ2/styles.ruleset index f1e878ae79..7e4cd6459e 100644 --- a/data/civ2/styles.ruleset +++ b/data/civ2/styles.ruleset @@ -57,7 +57,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -67,7 +67,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -77,7 +76,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -87,7 +85,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -97,7 +94,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -107,7 +103,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -117,7 +112,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -127,7 +121,6 @@ name = _("?citystyle:Renaissance") graphic = "city.renaissance" graphic_alt = "city.industrial" citizens_graphic = "renaissance" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "University", "Player" } @@ -137,7 +130,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -147,7 +139,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -157,7 +148,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/data/civ2civ3/styles.ruleset b/data/civ2civ3/styles.ruleset index aad7edfd57..645bb20dc5 100644 --- a/data/civ2civ3/styles.ruleset +++ b/data/civ2civ3/styles.ruleset @@ -57,7 +57,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -67,7 +67,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -77,7 +76,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -87,7 +85,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -97,7 +94,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -107,7 +103,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -117,7 +112,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -127,7 +121,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -137,7 +130,6 @@ name = _("?citystyle:ElectricAge") graphic = "city.electricage" graphic_alt = "city.modern" citizens_graphic = "electricage" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -147,7 +139,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Rocketry", "Player" } @@ -157,7 +148,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/data/classic/styles.ruleset b/data/classic/styles.ruleset index 1f5d0ca6dc..cf8ea982ed 100644 --- a/data/classic/styles.ruleset +++ b/data/classic/styles.ruleset @@ -57,7 +57,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -67,7 +67,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -77,7 +76,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -87,7 +85,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -97,7 +94,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -107,7 +103,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -117,7 +112,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -127,7 +121,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -137,7 +130,6 @@ name = _("?citystyle:ElectricAge") graphic = "city.electricage" graphic_alt = "city.modern" citizens_graphic = "electricage" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -147,7 +139,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Rocketry", "Player" } @@ -157,7 +148,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/data/experimental/styles.ruleset b/data/experimental/styles.ruleset index 940485470b..02f2c6b54f 100644 --- a/data/experimental/styles.ruleset +++ b/data/experimental/styles.ruleset @@ -59,7 +59,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -69,7 +69,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -79,7 +78,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -89,7 +87,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -99,7 +96,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -109,7 +105,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -119,7 +114,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -129,7 +123,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -139,7 +132,6 @@ name = _("?citystyle:ElectricAge") graphic = "city.electricage" graphic_alt = "city.modern" citizens_graphic = "electricage" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -149,7 +141,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Rocketry", "Player" } @@ -159,7 +150,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/data/granularity/styles.ruleset b/data/granularity/styles.ruleset index c2744e6790..9bf323f59b 100644 --- a/data/granularity/styles.ruleset +++ b/data/granularity/styles.ruleset @@ -42,7 +42,7 @@ name = _("?style:Generic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -52,7 +52,6 @@ name = _("?citystyle:Generic") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Generic", "Player" } diff --git a/data/multiplayer/styles.ruleset b/data/multiplayer/styles.ruleset index aad7edfd57..645bb20dc5 100644 --- a/data/multiplayer/styles.ruleset +++ b/data/multiplayer/styles.ruleset @@ -57,7 +57,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -67,7 +67,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -77,7 +76,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -87,7 +85,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -97,7 +94,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -107,7 +103,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -117,7 +112,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -127,7 +121,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -137,7 +130,6 @@ name = _("?citystyle:ElectricAge") graphic = "city.electricage" graphic_alt = "city.modern" citizens_graphic = "electricage" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -147,7 +139,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Rocketry", "Player" } @@ -157,7 +148,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/data/ruledit/comments-3.1.txt b/data/ruledit/comments-3.1.txt index d31ca81291..276215ab46 100644 --- a/data/ruledit/comments-3.1.txt +++ b/data/ruledit/comments-3.1.txt @@ -957,7 +957,7 @@ citystyles = "\ ; more info on city tiles\n\ ; citizens_graphic = group of citizens tiles to use, see citizens/small\n\ ; spec for more info on citizens tiles\n\ -; FIXME: this and _alt not currently used!\n\ +; FIXME: this is currently not used!\n\ ; reqs = requirements for this city style (see README.effects)\n\ ;\n\ ; */ <-- avoid gettext warnings\n\ diff --git a/data/sandbox/styles.ruleset b/data/sandbox/styles.ruleset index 2ef9d3f628..8252454e32 100644 --- a/data/sandbox/styles.ruleset +++ b/data/sandbox/styles.ruleset @@ -57,7 +57,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -67,7 +67,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -77,7 +76,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -87,7 +85,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -97,7 +94,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -107,7 +103,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -117,7 +112,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -127,7 +121,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -137,7 +130,6 @@ name = _("?citystyle:ElectricAge") graphic = "city.electricage" graphic_alt = "city.modern" citizens_graphic = "electricage" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -147,7 +139,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Rocketry", "Player" } @@ -157,7 +148,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/data/stub/styles.ruleset b/data/stub/styles.ruleset index 1b703e2f30..f780e1ddfa 100644 --- a/data/stub/styles.ruleset +++ b/data/stub/styles.ruleset @@ -36,7 +36,7 @@ name = _("?style:Generic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -46,7 +46,6 @@ name = _("?citystyle:Generic") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Generic", "Player" } diff --git a/data/webperimental/styles.ruleset b/data/webperimental/styles.ruleset index e12748c199..6bbbd4af93 100644 --- a/data/webperimental/styles.ruleset +++ b/data/webperimental/styles.ruleset @@ -57,7 +57,7 @@ name = _("?style:Celtic") ; more info on city tiles ; citizens_graphic = group of citizens tiles to use, see citizens/small ; spec for more info on citizens tiles -; FIXME: this and _alt not currently used! +; FIXME: this is currently not used! ; reqs = requirements for this city style (see README.effects) ; ; */ <-- avoid gettext warnings @@ -67,7 +67,6 @@ name = _("?citystyle:European") graphic = "city.european" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "European", "Player" } @@ -77,7 +76,6 @@ name = _("?citystyle:Classical") graphic = "city.classical" graphic_alt = "-" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Classical", "Player" } @@ -87,7 +85,6 @@ name = _("?citystyle:Tropical") graphic = "city.tropical" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Tropical", "Player" } @@ -97,7 +94,6 @@ name = _("?citystyle:Asian") graphic = "city.asian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Asian", "Player" } @@ -107,7 +103,6 @@ name = _("?citystyle:Babylonian") graphic = "city.babylonian" graphic_alt = "city.classical" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Babylonian", "Player" } @@ -117,7 +112,6 @@ name = _("?citystyle:Celtic") graphic = "city.celtic" graphic_alt = "city.european" citizens_graphic = "ancient" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "Style", "Celtic", "Player" } @@ -127,7 +121,6 @@ name = _("?citystyle:Industrial") graphic = "city.industrial" graphic_alt = "-" citizens_graphic = "industrial" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Railroad", "Player" } @@ -137,7 +130,6 @@ name = _("?citystyle:ElectricAge") graphic = "city.electricage" graphic_alt = "city.modern" citizens_graphic = "electricage" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Automobile", "Player" } @@ -147,7 +139,6 @@ name = _("?citystyle:Modern") graphic = "city.modern" graphic_alt = "-" citizens_graphic = "modern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Rocketry", "Player" } @@ -157,7 +148,6 @@ name = _("?citystyle:PostModern") graphic = "city.postmodern" graphic_alt = "-" citizens_graphic = "postmodern" -citizens_graphic_alt = "generic" reqs = { "type", "name", "range" "tech", "Superconductors", "Player" } diff --git a/fc_version b/fc_version index fb4aec1a4f..0f9c0c2885 100755 --- a/fc_version +++ b/fc_version @@ -56,7 +56,7 @@ DEFAULT_FOLLOW_TAG=S3_1 # - No new mandatory capabilities can be added to the release branch; doing # so would break network capability of supposedly "compatible" releases. # -NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2022.Jan.09" +NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2022.Jan.18" FREECIV_DISTRIBUTOR="" diff --git a/server/ruleset.c b/server/ruleset.c index 7fca50c4b7..d37e43493a 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -5712,11 +5712,8 @@ static bool load_ruleset_styles(struct section_file *file, sz_strlcpy(city_styles[i].graphic_alt, secfile_lookup_str(file, "%s.graphic_alt", sec_name)); sz_strlcpy(city_styles[i].citizens_graphic, - secfile_lookup_str_default(file, "-", + secfile_lookup_str_default(file, "-", "%s.citizens_graphic", sec_name)); - sz_strlcpy(city_styles[i].citizens_graphic_alt, - secfile_lookup_str_default(file, "generic", - "%s.citizens_graphic_alt", sec_name)); reqs = lookup_req_list(file, compat, sec_name, "reqs", city_style_rule_name(i)); if (reqs == NULL) { @@ -8989,8 +8986,6 @@ static void send_ruleset_cities(struct conn_list *dest) sz_strlcpy(city_p.graphic, city_styles[k].graphic); sz_strlcpy(city_p.graphic_alt, city_styles[k].graphic_alt); sz_strlcpy(city_p.citizens_graphic, city_styles[k].citizens_graphic); - sz_strlcpy(city_p.citizens_graphic_alt, - city_styles[k].citizens_graphic_alt); lsend_packet_ruleset_city(dest, &city_p); } diff --git a/tools/ruleutil/rulesave.c b/tools/ruleutil/rulesave.c index 6f72a3ec3d..0c0c347ddb 100644 --- a/tools/ruleutil/rulesave.c +++ b/tools/ruleutil/rulesave.c @@ -480,10 +480,6 @@ static bool save_styles_ruleset(const char *filename, const char *name) secfile_insert_str(sfile, city_styles[i].citizens_graphic, "%s.citizens_graphic", path); } - if (strcmp(city_styles[i].citizens_graphic_alt, "generic")) { - secfile_insert_str(sfile, city_styles[i].citizens_graphic_alt, - "%s.citizens_graphic_alt", path); - } save_reqs_vector(sfile, &(city_styles[i].reqs), path, "reqs"); } -- 2.34.1