Author: jtn
Date: Mon Apr 27 11:31:03 2015
New Revision: 28920
URL: http://svn.gna.org/viewcvs/freeciv?rev=28920&view=rev
Log:
Remove broken attempt to prevent territory claimed by cities being stolen.
It has beeen broken since 2.3, and is a major gameplay change to
reintroduce late in the life of 2.4.
After a report by Robin Patterson.
See gna bug #23501.
Modified:
branches/S2_4/data/helpdata.txt
branches/S2_4/server/maphand.c
Modified: branches/S2_4/data/helpdata.txt
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/data/helpdata.txt?rev=28920&r1=28919&r2=28920&view=diff
==============================================================================
--- branches/S2_4/data/helpdata.txt (original)
+++ branches/S2_4/data/helpdata.txt Mon Apr 27 11:31:03 2015
@@ -455,11 +455,7 @@
diplomatic pact between nations (see the section on Diplomacy).\
"), _("\
Founding a city establishes a claim on an area of land around the \
-city. Once claimed, a tile that can be directly worked by a city can \
-not change ownership unless the city does (or is destroyed). However, \
-the ownership of land that is out of range of any city can change \
-depending on factors such as the relative size of nearby nations' \
-cities.\
+city.\
"), _("\
Borders can only extend into water for tiles adjacent to a city; other \
water tiles remain unclaimed territory.\
Modified: branches/S2_4/server/maphand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/server/maphand.c?rev=28920&r1=28919&r2=28920&view=diff
==============================================================================
--- branches/S2_4/server/maphand.c (original)
+++ branches/S2_4/server/maphand.c Mon Apr 27 11:31:03 2015
@@ -1860,21 +1860,13 @@
/* Always claim source itself (distance, dr, to it 0) */
if (dr != 0 && NULL != dclaimer && dclaimer != ptile) {
- struct city *ccity = tile_city(dclaimer);
int strength_old, strength_new;
- if (ccity != NULL) {
- /* Previously claimed by city */
- int city_x, city_y;
-
- map_distance_vector(&city_x, &city_y, ccity->tile, dtile);
-
- if (is_valid_city_coords(city_map_radius_sq_get(ccity),
- CITY_ABS2REL(city_x), CITY_ABS2REL(city_y))) {
- /* Tile is within squared city radius */
- continue;
- }
- }
+ /* There used to be an attempt here to prevent stealing tiles within
+ * a city's workable radius. However, it had been mostly ineffective
+ * since 2.3. Since this was discovered late in the 2.4 cycle, it
+ * has been removed entirely from 2.4 in order not to change gameplay.
+ * It will return in later versions. */
strength_old = tile_border_strength(dtile, dclaimer);
strength_new = tile_border_strength(dtile, ptile);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
