[Now subscribed to the list]
I wrote this patch for the gtk-gui, that aims for showing the amount
of revenue and/or trade points a caravan/freight can generate in the
caravan window, before it can take any action. At least for me, this
feature would help a lot in deciding which city to trade with,
specialy in large empires.
Patch is attached, hope you're interested and apply it.
Glauber de Oliveira Costa.
"Free as in Freedom"
"The less confident you are, the more serious you have to act."
--- client//gui-gtk-2.0/caravan_dialog.c.orig 2007-04-22 20:41:26.000000000 -0300
+++ client//gui-gtk-2.0/caravan_dialog.c 2007-04-22 21:30:00.000000000 -0300
@@ -93,13 +93,22 @@ static void get_help_build_wonder_button
void popup_caravan_dialog(struct unit *punit,
struct city *phomecity, struct city *pdestcity)
- char buf, wonder;
+ char buf, traderoute, marketplace, wonder;
bool can_establish, can_trade, can_wonder;
+ int revenue = get_caravan_enter_city_trade_bonus(phomecity, pdestcity);
+ int curtrade = trade_between_cities(phomecity, pdestcity);
_("Your caravan from %s reaches the city of %s.\nWhat now?"),
+ my_snprintf(traderoute, sizeof(traderoute),
+ _("Establish _Traderoute (+%d trade, +%d revenue)"),
+ curtrade, revenue);
+ my_snprintf(marketplace, sizeof(marketplace),
+ _("Enter Marketplace (+%d revenue)"), (revenue + 2) /3);
caravan_city_id=pdestcity->id; /* callbacks need these */
@@ -113,8 +122,8 @@ void popup_caravan_dialog(struct unit *p
caravan_dialog = popup_choice_dialog(GTK_WINDOW(toplevel),
_("Your Caravan Has Arrived"),
- (can_establish ? _("Establish _Traderoute") :
- _("Enter Marketplace")),caravan_establish_trade_callback, NULL,
+ (can_establish ? traderoute : marketplace),
+ caravan_establish_trade_callback, NULL,
_("_Keep moving"), NULL, NULL,
Freeciv-dev mailing list