? 1684_fix2.diff
? bug.gz
? bug2.gz
? die1.diff
? diff
? include_fix1.diff
? measure_ai1.diff
? o2_fix1.diff
? packet_size1.diff
? show_city_descriptions.diff.html
? stats
? warnings_A_1.diff
Index: common/player.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/player.c,v
retrieving revision 1.103
diff -u -r1.103 player.c
--- common/player.c	2002/11/18 12:19:51	1.103
+++ common/player.c	2002/11/24 21:32:06
@@ -117,6 +117,9 @@
 
   plr->attribute_block.data = NULL;
   plr->attribute_block.length = 0;
+
+  memset(&plr->harvested, 0, sizeof(plr->harvested));
+  plr->unfogged = 0;
 }
 
 /***************************************************************
Index: common/player.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/player.h,v
retrieving revision 1.87
diff -u -r1.87 player.h
--- common/player.h	2002/11/22 17:44:45	1.87
+++ common/player.h	2002/11/24 21:32:07
@@ -202,6 +202,9 @@
     int length;
     void *data;
   } attribute_block;
+
+  int harvested[6];
+  int unfogged;
 };
 
 void player_init(struct player *plr);
Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.198
diff -u -r1.198 cityturn.c
--- server/cityturn.c	2002/11/14 09:15:03	1.198
+++ server/cityturn.c	2002/11/24 21:32:11
@@ -1266,6 +1266,14 @@
 
   city_refresh(pcity);
 
+  pplayer->harvested[0] += pcity->food_surplus;
+  pplayer->harvested[1] += pcity->shield_surplus;
+  pplayer->harvested[2] += pcity->trade_prod;
+
+  pplayer->harvested[3] += pcity->luxury_total;
+  pplayer->harvested[4] += pcity->tax_total;
+  pplayer->harvested[5] += pcity->science_total;
+
   /* the AI often has widespread disorder when the Gardens or Oracle
      become obsolete.  This is a quick hack to prevent this.  980805 -- Syela */
   while (pplayer->ai.control && city_unhappy(pcity)) {
Index: server/maphand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/maphand.c,v
retrieving revision 1.111
diff -u -r1.111 maphand.c
--- server/maphand.c	2002/11/14 09:15:04	1.111
+++ server/maphand.c	2002/11/24 21:32:14
@@ -480,6 +480,8 @@
   struct city *pcity;
   bool old_known = map_get_known(x, y, pplayer);
 
+  pplayer->unfogged++;
+
   freelog(LOG_DEBUG, "really unfogging %d,%d\n", x, y);
   send_NODRAW_tiles(pplayer, &pplayer->connections, x, y, 0);
 
Index: server/srv_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.c,v
retrieving revision 1.106
diff -u -r1.106 srv_main.c
--- server/srv_main.c	2002/11/14 09:15:05	1.106
+++ server/srv_main.c	2002/11/24 21:32:18
@@ -497,6 +497,18 @@
     flush_packets();
   }
 
+  players_iterate(pplayer) {
+    int s = pplayer->harvested[0] * FOOD_WEIGHTING +
+	pplayer->harvested[1] * SHIELD_WEIGHTING +
+	pplayer->harvested[2] * TRADE_WEIGHTING;
+    freelog(LOG_NORMAL,
+	    "%d:%20s:(f s t)=(%4d %4d %4d) (l t s)=(%4d %4d %4d) s=%6d uf=%4d",
+	    game.turn, pplayer->name, pplayer->harvested[0],
+	    pplayer->harvested[1], pplayer->harvested[2],
+	    pplayer->harvested[3], pplayer->harvested[4],
+	    pplayer->harvested[5], s, pplayer->unfogged);
+  } players_iterate_end;
+
   /* Unit end of turn activities */
   for(i=0; i<game.nplayers; i++) {
     struct player *pplayer = shuffled_player(i);
@@ -2107,9 +2119,9 @@
   /* We want to reset the timer as late as possible but before the info is
    * sent to the clients */
   game.turn_start = time(NULL);
-
   lsend_packet_generic_empty(&game.est_connections, PACKET_FREEZE_HINT);
   send_all_info(&game.game_connections);
+  show_map_to_all();
   lsend_packet_generic_empty(&game.est_connections, PACKET_THAW_HINT);
   
   if(game.is_new_game) {