Author: cazfi
Date: Tue Dec 9 23:41:28 2014
New Revision: 27223
URL: http://svn.gna.org/viewcvs/freeciv?rev=27223&view=rev
Log:
Renamed base_owner() as extra_owner()
See patch #5502
Modified:
trunk/client/packhand.c
trunk/client/tilespec.c
trunk/common/base.c
trunk/common/base.h
trunk/common/borders.c
trunk/common/extras.c
trunk/common/extras.h
trunk/server/maphand.c
trunk/server/plrhand.c
trunk/server/savegame.c
trunk/server/savegame2.c
trunk/server/unittools.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Tue Dec 9 23:41:28 2014
@@ -2624,7 +2624,7 @@
tile_set_owner(ptile, powner, NULL);
tile_changed = TRUE;
}
- if (base_owner(ptile) != eowner) {
+ if (extra_owner(ptile) != eowner) {
ptile->extras_owner = eowner;
tile_changed = TRUE;
}
Modified: trunk/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/client/tilespec.c (original)
+++ trunk/client/tilespec.c Tue Dec 9 23:41:28 2014
@@ -5176,7 +5176,7 @@
if (NULL != pterrain) {
if (ptile) {
bool show_flag = FALSE;
- struct player *owner = base_owner(ptile);
+ struct player *owner = extra_owner(ptile);
extra_type_list_iterate(t->style_lists[ESTYLE_3LAYER], pextra) {
if (is_extra_drawing_enabled(pextra)
Modified: trunk/common/base.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/base.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/common/base.c (original)
+++ trunk/common/base.c Tue Dec 9 23:41:28 2014
@@ -321,11 +321,3 @@
{
return pbase->border_sq >= 0;
}
-
-/**************************************************************************
- Who owns bases on tile
-**************************************************************************/
-struct player *base_owner(const struct tile *ptile)
-{
- return ptile->extras_owner;
-}
Modified: trunk/common/base.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/base.h?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/common/base.h (original)
+++ trunk/common/base.h Tue Dec 9 23:41:28 2014
@@ -114,7 +114,6 @@
const struct tile *ptile);
bool territory_claiming_base(const struct base_type *pbase);
-struct player *base_owner(const struct tile *ptile);
/* Initialization and iteration */
void base_type_init(struct extra_type *pextra, int idx);
Modified: trunk/common/borders.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/borders.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/common/borders.c (original)
+++ trunk/common/borders.c Tue Dec 9 23:41:28 2014
@@ -110,7 +110,7 @@
return TRUE;
}
- if (base_owner(ptile) != NULL) {
+ if (extra_owner(ptile) != NULL) {
base_type_iterate(pbase) {
if (tile_has_base(ptile, pbase) && territory_claiming_base(pbase)) {
return TRUE;
Modified: trunk/common/extras.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/extras.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/common/extras.c (original)
+++ trunk/common/extras.c Tue Dec 9 23:41:28 2014
@@ -725,3 +725,11 @@
return ERM_NONE;
}
+
+/**************************************************************************
+ Who owns extras on tile
+**************************************************************************/
+struct player *extra_owner(const struct tile *ptile)
+{
+ return ptile->extras_owner;
+}
Modified: trunk/common/extras.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/extras.h?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/common/extras.h (original)
+++ trunk/common/extras.h Tue Dec 9 23:41:28 2014
@@ -191,6 +191,8 @@
enum extra_cause activity_to_extra_cause(enum unit_activity act);
enum extra_rmcause activity_to_extra_rmcause(enum unit_activity act);
+struct player *extra_owner(const struct tile *ptile);
+
#define extra_type_iterate(_p) \
{ \
int _i_; \
Modified: trunk/server/maphand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/maphand.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/server/maphand.c (original)
+++ trunk/server/maphand.c Tue Dec 9 23:41:28 2014
@@ -499,7 +499,7 @@
info.known = TILE_KNOWN_SEEN;
info.continent = tile_continent(ptile);
owner = tile_owner(ptile);
- eowner = base_owner(ptile);
+ eowner = extra_owner(ptile);
info.owner = (owner ? player_number(owner) : MAP_TILE_OWNER_NULL);
info.extras_owner = (eowner ? player_number(eowner) :
MAP_TILE_OWNER_NULL);
info.worked = (NULL != tile_worked(ptile))
@@ -921,7 +921,7 @@
if (game.server.foggedborders) {
plrtile->owner = tile_owner(ptile);
}
- plrtile->extras_owner = base_owner(ptile);
+ plrtile->extras_owner = extra_owner(ptile);
send_tile_info(pplayer->connections, ptile, FALSE);
}
@@ -1155,7 +1155,7 @@
tile_set_owner(ptile, NULL, NULL);
reality_changed = TRUE;
}
- if (base_owner(ptile) == pplayer) {
+ if (extra_owner(ptile) == pplayer) {
ptile->extras_owner = NULL;
reality_changed = TRUE;
}
@@ -1257,14 +1257,14 @@
|| !BV_ARE_EQUAL(plrtile->extras, ptile->extras)
|| plrtile->resource != ptile->resource
|| owner != tile_owner(ptile)
- || plrtile->extras_owner != base_owner(ptile)) {
+ || plrtile->extras_owner != extra_owner(ptile)) {
plrtile->terrain = ptile->terrain;
plrtile->extras = ptile->extras;
plrtile->resource = ptile->resource;
if (plrtile_owner_valid) {
plrtile->owner = tile_owner(ptile);
}
- plrtile->extras_owner = base_owner(ptile);
+ plrtile->extras_owner = extra_owner(ptile);
return TRUE;
}
@@ -1928,7 +1928,7 @@
*************************************************************************/
void tile_claim_bases(struct tile *ptile, struct player *powner)
{
- struct player *base_loser = base_owner(ptile);
+ struct player *base_loser = extra_owner(ptile);
/* This MUST be before potentially recursive call to map_claim_base(),
* so that the recursive call will get new owner == base_loser and
@@ -2099,7 +2099,7 @@
map_clear_border(ptile);
}
- /* We here first claim this tile ownership -> now on base_owner()
+ /* We here first claim this tile ownership -> now on extra_owner()
* will return new owner. Then we claim border, which will recursively
* lead to this tile and base being claimed. But at that point
* ploser == powner and above check will abort the recursion. */
@@ -2161,7 +2161,7 @@
/* Claim bases on tile */
if (pplayer) {
- struct player *old_owner = base_owner(ptile);
+ struct player *old_owner = extra_owner(ptile);
/* Created base from NULL -> pplayer */
map_claim_base(ptile, pbase, pplayer, NULL);
@@ -2178,7 +2178,7 @@
}
} else {
/* Player who already owns bases on tile claims new base */
- map_claim_base(ptile, pbase, base_owner(ptile), NULL);
+ map_claim_base(ptile, pbase, extra_owner(ptile), NULL);
}
if (extras_removed) {
@@ -2225,7 +2225,7 @@
* bases as well. */
map_clear_border(ptile);
} else {
- struct player *owner = base_owner(ptile);
+ struct player *owner = extra_owner(ptile);
if (NULL != owner
&& (0 <= pbase->vision_main_sq || 0 <= pbase->vision_invis_sq)) {
Modified: trunk/server/plrhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/plrhand.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/server/plrhand.c (original)
+++ trunk/server/plrhand.c Tue Dec 9 23:41:28 2014
@@ -224,7 +224,7 @@
if (tile_owner(ptile) == pplayer) {
map_claim_ownership(ptile, NULL, NULL, FALSE);
}
- if (base_owner(ptile) == pplayer) {
+ if (extra_owner(ptile) == pplayer) {
ptile->extras_owner = NULL;
}
} whole_map_iterate_end;
@@ -624,7 +624,7 @@
{
/* Claim bases where units are already standing */
whole_map_iterate(ptile) {
- struct player *old_owner = base_owner(ptile);
+ struct player *old_owner = extra_owner(ptile);
if (old_owner == pplayer2) {
maybe_claim_base(ptile, pplayer, old_owner);
Modified: trunk/server/savegame.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/server/savegame.c (original)
+++ trunk/server/savegame.c Tue Dec 9 23:41:28 2014
@@ -1571,8 +1571,8 @@
unit_list_prepend(ptile->units, punit);
/* Claim ownership of fortress? */
- if ((!base_owner(ptile)
- || pplayers_at_war(base_owner(ptile), plr))
+ if ((extra_owner(ptile) == NULL
+ || pplayers_at_war(extra_owner(ptile), plr))
&& tile_has_claimable_base(ptile, unit_type(punit))) {
tile_claim_bases(ptile, plr);
}
Modified: trunk/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/server/savegame2.c (original)
+++ trunk/server/savegame2.c Tue Dec 9 23:41:28 2014
@@ -3038,11 +3038,11 @@
char token[TOKEN_SIZE];
struct tile *ptile = native_pos_to_tile(x, y);
- if (!saving->save_players || base_owner(ptile) == NULL) {
+ if (!saving->save_players || extra_owner(ptile) == NULL) {
strcpy(token, "-");
} else {
fc_snprintf(token, sizeof(token), "%d",
- player_number(base_owner(ptile)));
+ player_number(extra_owner(ptile)));
}
strcat(line, token);
if (x + 1 < map.xsize) {
@@ -4919,8 +4919,8 @@
unit_list_prepend(unit_tile(punit)->units, punit);
/* Claim ownership of fortress? */
- if ((!base_owner(ptile)
- || pplayers_at_war(base_owner(ptile), plr))
+ if ((extra_owner(ptile) == NULL
+ || pplayers_at_war(extra_owner(ptile), plr))
&& tile_has_claimable_base(ptile, unit_type(punit))) {
tile_claim_bases(ptile, plr);
}
Modified: trunk/server/unittools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=27223&r1=27222&r2=27223&view=diff
==============================================================================
--- trunk/server/unittools.c (original)
+++ trunk/server/unittools.c Tue Dec 9 23:41:28 2014
@@ -3366,7 +3366,7 @@
}
/* Claim ownership of fortress? */
- bowner = base_owner(pdesttile);
+ bowner = extra_owner(pdesttile);
if ((bowner == NULL || pplayers_at_war(bowner, pplayer))
&& tile_has_claimable_base(pdesttile, unit_type(punit))) {
/* Yes. We claim *all* bases if there's *any* claimable base(s).
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
