URL: http://bugs.freeciv.org/Ticket/Display.html?id=39528
On 10/08/07, Marko Lindqvist [EMAIL PROTECTED] wrote:
$subject
S2_0 version.
Completely different version for trunk. There is no point in
refreshing workers after every clause, but only once whole treaty is
handled.
Less intrusive original version should go to S2_1, though.
- ML
diff -Nurd -X.diff_ignore freeciv/server/diplhand.c freeciv/server/diplhand.c
--- freeciv/server/diplhand.c 2007-08-04 04:27:24.0 +0300
+++ freeciv/server/diplhand.c 2007-08-10 21:01:47.0 +0300
@@ -375,12 +375,16 @@
give_map_from_player_to_player(pgiver, pdest);
notify_player(pdest, _(Game: You receive %s's worldmap.),
pgiver-name);
+
+check_city_workers(pdest); /* See CLAUSE_VISION */
gamelog(GAMELOG_TREATY, GL_MAP, pgiver, pdest);
break;
case CLAUSE_SEAMAP:
give_seamap_from_player_to_player(pgiver, pdest);
notify_player(pdest, _(Game: You receive %s's seamap.),
pgiver-name);
+
+check_city_workers(pdest); /* See CLAUSE_VISION */
gamelog(GAMELOG_TREATY, GL_SEAMAP, pgiver, pdest);
break;
case CLAUSE_CITY:
@@ -463,6 +467,10 @@
notify_player_ex(pdest, NULL, E_TREATY_SHARED_VISION,
_(Game: %s gives you shared vision.),
pgiver-name);
+
+/* Yes, shared vision may let us to _know_ tiles
+ * within radius of our own city. */
+ check_city_workers(pdest);
gamelog(GAMELOG_TREATY, GL_VISION, pgiver, pdest);
break;
case CLAUSE_LAST:
diff -Nurd -X.diff_ignore freeciv/server/diplhand.c freeciv/server/diplhand.c
--- freeciv/server/diplhand.c 2007-08-04 18:36:24.0 +0300
+++ freeciv/server/diplhand.c 2007-08-10 21:27:37.0 +0300
@@ -101,6 +101,7 @@
struct player *pother;
bool *player_accept, *other_accept;
enum dipl_reason diplcheck;
+ bool worker_refresh_required = FALSE;
if (!is_valid_player_id(counterpart) || pplayer-player_no == counterpart) {
return;
@@ -391,12 +392,16 @@
notify_player(pdest, NULL, E_DIPLOMACY,
_(You receive %s's worldmap.),
pgiver-name);
+
+worker_refresh_required = TRUE; /* See CLAUSE_VISION */
break;
case CLAUSE_SEAMAP:
give_seamap_from_player_to_player(pgiver, pdest);
notify_player(pdest, NULL, E_DIPLOMACY,
_(You receive %s's seamap.),
pgiver-name);
+
+worker_refresh_required = TRUE; /* See CLAUSE_VISION */
break;
case CLAUSE_CITY:
{
@@ -434,8 +439,8 @@
if (old_diplstate == DS_ALLIANCE) {
update_players_after_alliance_breakup(pgiver, pdest);
}
- check_city_workers(pplayer);
- check_city_workers(pother);
+
+worker_refresh_required = TRUE;
break;
case CLAUSE_PEACE:
pgiver-diplstates[player_index(pdest)].type = DS_ARMISTICE;
@@ -467,8 +472,8 @@
if (old_diplstate == DS_ALLIANCE) {
update_players_after_alliance_breakup(pgiver, pdest);
}
- check_city_workers(pplayer);
- check_city_workers(pother);
+
+worker_refresh_required = TRUE;
break;
case CLAUSE_ALLIANCE:
pgiver-diplstates[player_index(pdest)].type=DS_ALLIANCE;
@@ -484,8 +489,7 @@
_(You agree on an alliance with %s.),
pgiver-name);
- check_city_workers(pplayer);
- check_city_workers(pother);
+worker_refresh_required = TRUE;
break;
case CLAUSE_VISION:
give_shared_vision(pgiver, pdest);
@@ -495,6 +499,10 @@
notify_player(pdest, NULL, E_TREATY_SHARED_VISION,
_(%s gives you shared vision.),
pgiver-name);
+
+/* Yes, shared vision may let us to _know_ tiles
+ * within radius of our own city. */
+worker_refresh_required = TRUE;
break;
case CLAUSE_LAST:
freelog(LOG_ERROR, Received bad clause type);
@@ -502,6 +510,17 @@
}
} clause_list_iterate_end;
+
+/* In theory, we would need refresh only receiving party of
+ * CLAUSE_MAP, CLAUSE_SEAMAP and CLAUSE_VISION clauses.
+ * It's quite unlikely that there is such a clause going one
+ * way but no clauses affecting both parties or going other
+ * way. */
+if (worker_refresh_required) {
+ check_city_workers(pplayer);
+ check_city_workers(pother);
+}
+
cleanup:
treaty_list_unlink(treaties, ptreaty);
clear_treaty(ptreaty);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
