Index: server/citytools.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v retrieving revision 1.187 diff -u -r1.187 citytools.c --- server/citytools.c 2002/08/15 21:21:18 1.187 +++ server/citytools.c 2002/08/20 14:10:23 @@ -1132,6 +1132,7 @@ pcity->food_stock=0; pcity->shield_stock=0; pcity->trade_prod=0; + pcity->tile_trade = 0; pcity->original = pplayer->player_no; pcity->is_building_unit = TRUE; pcity->turn_founded = game.turn; @@ -1172,6 +1173,8 @@ memset(pcity->ai.building_want, 0, sizeof(pcity->ai.building_want)); pcity->ai.workremain = 1; /* there's always work to be done! */ pcity->ai.danger = -1; /* flag, may come in handy later */ + assess_danger(pcity); + pcity->corruption = 0; pcity->shield_bonus = 100; pcity->tax_bonus = 100; Index: server/gamehand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/gamehand.c,v retrieving revision 1.113 diff -u -r1.113 gamehand.c --- server/gamehand.c 2002/08/19 23:05:34 1.113 +++ server/gamehand.c 2002/08/20 14:10:23 @@ -231,6 +231,9 @@ ginfo.spacerace = game.spacerace; ginfo.unhappysize = game.unhappysize; ginfo.angrycitizen = game.angrycitizen; + ginfo.diplcost = game.diplcost; + ginfo.freecost = game.freecost; + ginfo.conquercost = game.conquercost; ginfo.cityfactor = game.cityfactor; for (i = 0; i < A_LAST /*game.num_tech_types */ ; i++) ginfo.global_advances[i] = game.global_advances[i]; @@ -238,9 +241,13 @@ ginfo.global_wonders[i] = game.global_wonders[i]; /* the following values are computed every time a packet_game_info packet is created */ - if (game.timeout != 0) + if (game.timeout != 0) { ginfo.seconds_to_turndone = game.turn_start + game.timeout - time(NULL); + } else { + /* unused but at least initialized */ + ginfo.seconds_to_turndone = -1; + } conn_list_iterate(*dest, pconn) { /* ? fixme: check for non-players: */ Index: server/report.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/report.c,v retrieving revision 1.31 diff -u -r1.31 report.c --- server/report.c 2002/08/08 22:06:47 1.31 +++ server/report.c 2002/08/20 14:10:26 @@ -1052,6 +1052,11 @@ freelog(LOG_ERROR, "Message truncated in page_conn_etype()!"); } genmsg.event = event; + + /* unused but at least initialized */ + genmsg.x = -1; + genmsg.y = -1; + genmsg.event = -1; lsend_packet_generic_message(dest, PACKET_PAGE_MSG, &genmsg); } Index: server/settlers.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/settlers.c,v retrieving revision 1.140 diff -u -r1.140 settlers.c --- server/settlers.c 2002/08/14 01:44:59 1.140 +++ server/settlers.c 2002/08/20 14:10:27 @@ -632,6 +632,7 @@ int x1 = x + ii[k], y1 = y + jj[k]; if (is_border && !normalize_map_pos(&x1, &y1)) { rd[k] = FALSE; + te[k] = FALSE; } else { ptile = map_get_tile(x1, y1); rd[k] = tile_has_special(ptile, spc);