<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40638 >
As borders handling is removed from vision_site, some vision_site
stuff turns unused. Attached patch removes those unused parts.
- ML
diff -Nurd -X.diff_ignore freeciv/common/player.c freeciv/common/player.c
--- freeciv/common/player.c 2008-11-11 17:38:45.000000000 +0200
+++ freeciv/common/player.c 2009-01-07 21:42:48.000000000 +0200
@@ -191,7 +191,6 @@
plr->capital = FALSE;
plr->city_style=0; /* should be first basic style */
plr->cities = city_list_new();
- plr->sites = site_list_new();
plr->units = unit_list_new();
plr->connections = conn_list_new();
diff -Nurd -X.diff_ignore freeciv/common/player.h freeciv/common/player.h
--- freeciv/common/player.h 2008-12-15 21:55:49.000000000 +0200
+++ freeciv/common/player.h 2009-01-07 21:43:10.000000000 +0200
@@ -181,7 +181,6 @@
struct player_diplstate diplstates[MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS];
int city_style;
struct city_list *cities;
- struct site_list *sites;
struct unit_list *units;
struct player_score score;
struct player_economic economic;
diff -Nurd -X.diff_ignore freeciv/common/vision.c freeciv/common/vision.c
--- freeciv/common/vision.c 2009-01-07 21:50:09.000000000 +0200
+++ freeciv/common/vision.c 2009-01-07 21:57:07.000000000 +0200
@@ -87,11 +87,6 @@
}
assert(psite->ref_count == 0);
-
- if (psite->identity < 0) {
- /* This is base, not city */
- site_list_unlink(psite->owner->sites, psite);
- }
free(psite);
}
@@ -125,24 +120,6 @@
}
/****************************************************************************
- Build basic vision_site structure based on military base on tile.
-****************************************************************************/
-struct vision_site *create_vision_site_from_base(struct tile *ptile,
- struct base_type *pbase,
- struct player *owner)
-{
- struct vision_site *psite;
-
- psite = create_vision_site(-base_number(pbase) - 1, ptile, owner);
- psite->size = 0;
- sz_strlcpy(psite->name, base_name_translation(pbase));
-
- site_list_append(owner->sites, psite);
-
- return psite;
-}
-
-/****************************************************************************
Returns the basic structure filled with current elements.
****************************************************************************/
void update_vision_site_from_city(struct vision_site *psite,
diff -Nurd -X.diff_ignore freeciv/common/vision.h freeciv/common/vision.h
--- freeciv/common/vision.h 2009-01-07 21:50:09.000000000 +0200
+++ freeciv/common/vision.h 2009-01-07 21:57:14.000000000 +0200
@@ -114,7 +114,7 @@
struct player *owner; /* May be NULL, always check! */
int identity; /* city > IDENTITY_NUMBER_ZERO
*/
- int size; /* city, or base pseudo-size */
+ int size; /* city size */
bool occupied;
bool walls;
@@ -131,30 +131,8 @@
struct vision_site *create_vision_site(int identity, struct tile *location,
struct player *owner);
struct vision_site *create_vision_site_from_city(const struct city *pcity);
-struct vision_site *create_vision_site_from_base(struct tile *ptile,
- struct base_type *pbase,
- struct player *owner);
void update_vision_site_from_city(struct vision_site *psite,
const struct city *pcity);
void copy_vision_site(struct vision_site *dest, struct vision_site *src);
-/* get 'struct site_list' and related functions: */
-#define SPECLIST_TAG site
-#define SPECLIST_TYPE struct vision_site
-#include "speclist.h"
-
-#define vision_site_list_iterate(sitelist, psite)\
- TYPED_LIST_ITERATE(struct vision_site, sitelist, psite)
-#define vision_site_list_iterate_end LIST_ITERATE_END
-
-#define sites_iterate(psite) \
-{ \
- players_iterate(psite##_player) { \
- vision_site_list_iterate(psite##_player->sites, psite) {
-
-#define sites_iterate_end \
- } vision_site_list_iterate_end; \
- } players_iterate_end; \
-}
-
#endif /* FC__VISION_H */
diff -Nurd -X.diff_ignore freeciv/server/citytools.c freeciv/server/citytools.c
--- freeciv/server/citytools.c 2009-01-07 21:50:09.000000000 +0200
+++ freeciv/server/citytools.c 2009-01-07 21:56:53.000000000 +0200
@@ -1905,7 +1905,7 @@
}
/**************************************************************************
-Removes outdated (nonexistant) cities from a player
+ Removes outdated (nonexistant) cities from a player
**************************************************************************/
void reality_check_city(struct player *pplayer,struct tile *ptile)
{
diff -Nurd -X.diff_ignore freeciv/server/maphand.c freeciv/server/maphand.c
--- freeciv/server/maphand.c 2009-01-07 21:50:09.000000000 +0200
+++ freeciv/server/maphand.c 2009-01-07 21:56:39.000000000 +0200
@@ -1102,10 +1102,11 @@
reality_check_city(pdest, ptile);
} else /* We have a dest_city. update */
if (from_tile->site->identity
- != dest_tile->site->identity)
+ != dest_tile->site->identity) {
/* As the city was gone on the newer from_tile
it will be removed by this function */
reality_check_city(pdest, ptile);
+ }
}
/* Set and send new city info */
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
