diff -Nurd -X clean/diff_ignore clean/client/gui-gtk/finddlg.c circ/client/gui-gtk/finddlg.c --- clean/client/gui-gtk/finddlg.c Wed Mar 20 07:54:06 2002 +++ circ/client/gui-gtk/finddlg.c Wed Mar 20 09:48:57 2002 @@ -22,6 +22,7 @@ #include #include +#include "city.h" #include "fcintl.h" #include "game.h" #include "player.h" diff -Nurd -X clean/diff_ignore clean/client/mapview_common.c circ/client/mapview_common.c --- clean/client/mapview_common.c Tue Mar 19 16:36:29 2002 +++ circ/client/mapview_common.c Wed Mar 20 09:48:57 2002 @@ -17,6 +17,7 @@ #include +#include "city.h" #include "log.h" #include "map.h" #include "support.h" diff -Nurd -X clean/diff_ignore clean/client/repodlgs_common.c circ/client/repodlgs_common.c --- clean/client/repodlgs_common.c Sun Mar 17 11:55:58 2002 +++ circ/client/repodlgs_common.c Wed Mar 20 09:48:57 2002 @@ -1,4 +1,5 @@ +#include "city.h" #include "game.h" #include "repodlgs_common.h" diff -Nurd -X clean/diff_ignore clean/common/Makefile.am circ/common/Makefile.am --- clean/common/Makefile.am Wed Jan 9 22:48:08 2002 +++ circ/common/Makefile.am Wed Mar 20 09:54:29 2002 @@ -16,6 +16,8 @@ capstr.h \ city.c \ city.h \ + city_list.c \ + city_list.h \ combat.c \ combat.h \ connection.c \ @@ -81,6 +83,8 @@ timing.h \ unit.c \ unit.h \ + unit_list.c \ + unit_list.h \ unittype.c \ unittype.h \ worklist.c \ diff -Nurd -X clean/diff_ignore clean/common/city.c circ/common/city.c --- clean/common/city.c Sun Mar 17 10:13:26 2002 +++ circ/common/city.c Wed Mar 20 09:48:57 2002 @@ -18,6 +18,7 @@ #include #include "fcintl.h" +#include "unit.h" #include "game.h" #include "government.h" #include "log.h" @@ -25,11 +26,6 @@ #include "support.h" #include "city.h" - -/* get 'struct city_list' functions: */ -#define SPECLIST_TAG city -#define SPECLIST_TYPE struct city -#include "speclist_c.h" /* start helper functions for generic_city_refresh */ static int content_citizens(struct player *pplayer); diff -Nurd -X clean/diff_ignore clean/common/city.h circ/common/city.h --- clean/common/city.h Fri Mar 15 14:44:50 2002 +++ circ/common/city.h Wed Mar 20 09:50:22 2002 @@ -13,12 +13,12 @@ #ifndef FC__CITY_H #define FC__CITY_H +#include "city_list.h" #include "genlist.h" #include "improvement.h" #include "unit.h" /* struct unit_list */ #include "worklist.h" - struct player; struct government; struct tile; @@ -307,15 +307,6 @@ }; /* not incl. wall and occupied tiles */ extern struct citystyle *city_styles; - -/* get 'struct city_list' and related functions: */ -#define SPECLIST_TAG city -#define SPECLIST_TYPE struct city -#include "speclist.h" - -#define city_list_iterate(citylist, pcity) \ - TYPED_LIST_ITERATE(struct city, citylist, pcity) -#define city_list_iterate_end LIST_ITERATE_END /* properties */ diff -Nurd -X clean/diff_ignore clean/common/city_list.c circ/common/city_list.c --- clean/common/city_list.c Thu Jan 1 01:00:00 1970 +++ circ/common/city_list.c Wed Mar 20 09:56:30 2002 @@ -0,0 +1,22 @@ +/********************************************************************** + Freeciv - Copyright (C) 2002 - R Falke + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +***********************************************************************/ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "city_list.h" + +/* get 'struct city_list' functions: */ +#define SPECLIST_TAG city +#define SPECLIST_TYPE struct city +#include "speclist_c.h" diff -Nurd -X clean/diff_ignore clean/common/city_list.h circ/common/city_list.h --- clean/common/city_list.h Thu Jan 1 01:00:00 1970 +++ circ/common/city_list.h Wed Mar 20 09:56:22 2002 @@ -0,0 +1,27 @@ +/********************************************************************** + Freeciv - Copyright (C) 2002 - R Falke + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +***********************************************************************/ +#ifndef FC__CITY_LIST_H +#define FC__CITY_LIST_H + +struct city; + +/* get 'struct city_list' and related functions: */ +#define SPECLIST_TAG city +#define SPECLIST_TYPE struct city +#include "speclist.h" + +#define city_list_iterate(citylist, pcity) \ + TYPED_LIST_ITERATE(struct city, citylist, pcity) +#define city_list_iterate_end LIST_ITERATE_END + +#endif diff -Nurd -X clean/diff_ignore clean/common/combat.c circ/common/combat.c --- clean/common/combat.c Fri Mar 15 14:44:50 2002 +++ circ/common/combat.c Wed Mar 20 09:48:57 2002 @@ -14,6 +14,7 @@ #include #include +#include "city.h" #include "log.h" #include "map.h" #include "unit.h" diff -Nurd -X clean/diff_ignore clean/common/government.c circ/common/government.c --- clean/common/government.c Tue Feb 26 18:00:06 2002 +++ circ/common/government.c Wed Mar 20 09:48:57 2002 @@ -14,6 +14,7 @@ #include #include +#include "city.h" #include "game.h" #include "log.h" #include "mem.h" diff -Nurd -X clean/diff_ignore clean/common/improvement.c circ/common/improvement.c --- clean/common/improvement.c Wed Mar 6 10:18:22 2002 +++ circ/common/improvement.c Wed Mar 20 09:48:57 2002 @@ -13,6 +13,7 @@ #include #include +#include "city.h" #include "game.h" #include "log.h" #include "map.h" diff -Nurd -X clean/diff_ignore clean/common/packets.h circ/common/packets.h --- clean/common/packets.h Sun Mar 17 18:20:23 2002 +++ circ/common/packets.h Wed Mar 20 09:48:57 2002 @@ -13,6 +13,7 @@ #ifndef FC__PACKETS_H #define FC__PACKETS_H +#include "city.h" #include "connection.h" /* struct connection, MAX_LEN_* */ #include "map.h" #include "player.h" diff -Nurd -X clean/diff_ignore clean/common/player.h circ/common/player.h --- clean/common/player.h Fri Mar 15 14:44:50 2002 +++ circ/common/player.h Wed Mar 20 09:48:57 2002 @@ -13,14 +13,15 @@ #ifndef FC__PLAYER_H #define FC__PLAYER_H -#include "city.h" +#include "city_list.h" #include "connection.h" /* struct conn_list */ #include "improvement.h" /* Impr_Status */ #include "nation.h" #include "shared.h" #include "spaceship.h" #include "tech.h" -#include "unit.h" +#include "unit_list.h" +#include "worklist.h" struct tile; diff -Nurd -X clean/diff_ignore clean/common/tech.c circ/common/tech.c --- clean/common/tech.c Thu Mar 14 08:13:03 2002 +++ circ/common/tech.c Wed Mar 20 09:48:57 2002 @@ -19,6 +19,7 @@ #include #include +#include "city.h" #include "fcintl.h" #include "game.h" #include "log.h" diff -Nurd -X clean/diff_ignore clean/common/unit.c circ/common/unit.c --- clean/common/unit.c Mon Mar 18 08:22:18 2002 +++ circ/common/unit.c Wed Mar 20 09:48:57 2002 @@ -16,6 +16,7 @@ #include +#include "city.h" #include "fcintl.h" #include "game.h" #include "log.h" diff -Nurd -X clean/diff_ignore clean/common/unit.h circ/common/unit.h --- clean/common/unit.h Sun Mar 17 10:04:49 2002 +++ circ/common/unit.h Wed Mar 20 09:54:10 2002 @@ -15,6 +15,8 @@ #include "genlist.h" #include "unittype.h" +#include "terrain.h" +#include "unit_list.h" struct player; struct city; @@ -135,15 +137,6 @@ struct goto_route *pgr; }; - -/* get 'struct unit_list' and related functions: */ -#define SPECLIST_TAG unit -#define SPECLIST_TYPE struct unit -#include "speclist.h" - -#define unit_list_iterate(unitlist, punit) \ - TYPED_LIST_ITERATE(struct unit, unitlist, punit) -#define unit_list_iterate_end LIST_ITERATE_END #define SINGLE_MOVE 3 #define MOVE_COST_RIVER 1 #define MOVE_COST_RAIL 0 diff -Nurd -X clean/diff_ignore clean/common/unit_list.c circ/common/unit_list.c --- clean/common/unit_list.c Thu Jan 1 01:00:00 1970 +++ circ/common/unit_list.c Wed Mar 20 09:56:11 2002 @@ -0,0 +1,22 @@ +/********************************************************************** + Freeciv - Copyright (C) 2002 - R Falke + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +***********************************************************************/ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "unit_list.h" + +/* get 'struct unit_list' functions: */ +#define SPECLIST_TAG unit +#define SPECLIST_TYPE struct unit +#include "speclist_c.h" diff -Nurd -X clean/diff_ignore clean/common/unit_list.h circ/common/unit_list.h --- clean/common/unit_list.h Thu Jan 1 01:00:00 1970 +++ circ/common/unit_list.h Wed Mar 20 09:56:02 2002 @@ -0,0 +1,28 @@ +/********************************************************************** + Freeciv - Copyright (C) 2002 - R Falke + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +***********************************************************************/ +#ifndef FC__UNIT_LIST_H +#define FC__UNIT_LIST_H + +struct unit; + +/* get 'struct unit_list' and related functions: */ +#define SPECLIST_TAG unit +#define SPECLIST_TYPE struct unit +#include "speclist.h" + +#define unit_list_iterate(unitlist, punit) \ + TYPED_LIST_ITERATE(struct unit, unitlist, punit) +#define unit_list_iterate_end LIST_ITERATE_END + +#endif + diff -Nurd -X clean/diff_ignore clean/common/unittype.c circ/common/unittype.c --- clean/common/unittype.c Mon Mar 18 08:22:18 2002 +++ circ/common/unittype.c Wed Mar 20 09:48:57 2002 @@ -18,6 +18,7 @@ #include #include "astring.h" +#include "city.h" #include "fcintl.h" #include "game.h" #include "government.h"