[Freeciv-commits] r33268 - /branches/S2_5/server/unittools.c
Author: jtn Date: Tue Jul 19 00:41:28 2016 New Revision: 33268 URL: http://svn.gna.org/viewcvs/freeciv?rev=33268&view=rev Log: Mark a string for translation that is used when a unit dies due to the 'killunhomed' server setting. See gna bug #24858. Modified: branches/S2_5/server/unittools.c Modified: branches/S2_5/server/unittools.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/unittools.c?rev=33268&r1=33267&r2=33268&view=diff == --- branches/S2_5/server/unittools.c(original) +++ branches/S2_5/server/unittools.cTue Jul 19 00:41:28 2016 @@ -389,8 +389,8 @@ * killed; notify player here */ if (!punit->homecity && 0 < game.server.killunhomed) { notify_player(pplayer, unit_tile(punit), E_UNIT_LOST_MISC, - ftc_server, "Your %s has run out of hit points " - "because it has no supporting homecity.", + ftc_server, _("Your %s has run out of hit points " +"because it was not supported by a city."), unit_tile_link(punit)); } else { notify_player(pplayer, unit_tile(punit), E_UNIT_LOST_MISC, ftc_server, ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33267 - /branches/S2_6/server/unittools.c
Author: jtn Date: Tue Jul 19 00:37:21 2016 New Revision: 33267 URL: http://svn.gna.org/viewcvs/freeciv?rev=33267&view=rev Log: Mark a string for translation that is used when a unit dies due to the 'killunhomed' server setting. See gna bug #24858. Modified: branches/S2_6/server/unittools.c Modified: branches/S2_6/server/unittools.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unittools.c?rev=33267&r1=33266&r2=33267&view=diff == --- branches/S2_6/server/unittools.c(original) +++ branches/S2_6/server/unittools.cTue Jul 19 00:37:21 2016 @@ -396,8 +396,8 @@ * killed; notify player here */ if (!punit->homecity && 0 < game.server.killunhomed) { notify_player(pplayer, unit_tile(punit), E_UNIT_LOST_MISC, - ftc_server, "Your %s has run out of hit points " - "because it has no supporting homecity.", + ftc_server, _("Your %s has run out of hit points " +"because it was not supported by a city."), unit_tile_link(punit)); } else { notify_player(pplayer, unit_tile(punit), E_UNIT_LOST_MISC, ftc_server, ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33265 - in /branches/S2_6/data/misc: events.png events.spec small.png small.spec
Author: jtn Date: Tue Jul 19 00:37:04 2016 New Revision: 33265 URL: http://svn.gna.org/viewcvs/freeciv?rev=33265&view=rev Log: More event graphics, and move some from small.spec. The graphics used for e_* sprites that were in small.png [1, {0,1,2,5}] have been moved to events.png. Most of the remaining icons on the second row of small.png are currently unused and have been moved to the right-hand side. Event graphics and spec updates by GriffonSpade on the forum. See gna patch #7439. Modified: branches/S2_6/data/misc/events.png branches/S2_6/data/misc/events.spec branches/S2_6/data/misc/small.png branches/S2_6/data/misc/small.spec Modified: branches/S2_6/data/misc/events.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/events.png?rev=33265&r1=33264&r2=33265&view=diff == Binary files - no diff available. Modified: branches/S2_6/data/misc/events.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/events.spec?rev=33265&r1=33264&r2=33265&view=diff == --- branches/S2_6/data/misc/events.spec (original) +++ branches/S2_6/data/misc/events.spec Tue Jul 19 00:37:04 2016 @@ -28,6 +28,7 @@ 0, 3, "e_city_disorder" 0, 4, "e_city_famine" 0, 5, "e_city_famine_feared" + 0, 5, "e_unit_built_pop_cost" 0, 6, "e_city_growth" 0, 7, "e_city_may_soon_grow" 0, 8, "e_city_aqueduct" @@ -44,22 +45,32 @@ 0, 12, "e_worklist" ; (0, 19) unused 0, 12, "e_city_radius_sq" ; (0, 20) unused - 1, 0, "e_nuke" -; 1, 1, "e_chem" -; 1, 2, "e_warn" - 1, 3, "e_global_eco" -; 1, 4, "e_no" + 1, 0, "e_treaty_shared_vision" + 1, 1, "e_treaty_alliance" + 1, 2, "e_treaty_peace" + 1, 3, "e_treaty_ceasefire" + 1, 4, "e_treaty_broken" + 1, 5, "e_treaty_embassy" - 1, 2, "e_ai_debug" - 1, 2, "e_script" - 1, 2, "e_broadcast_report" - 1, 2, "e_report" - 1, 2, "e_chat_msg" - 1, 2, "e_log_error" - 1, 2, "e_deprecation_warning" - 1, 3, "e_log_fatal" - 1, 3, "e_chat_error" + 1, 6, "e_imp_buy" + 1, 7, "e_imp_build" + 1, 8, "e_imp_auctioned" + 1, 9, "e_imp_sold" + 1, 10, "e_imp_auto" +; 1, 11, "e_imp_destroyed" + 1, 12, "e_wonder_build" + 1, 13, "e_wonder_started" + 1, 14, "e_wonder_stopped" + 1, 15, "e_wonder_will_be_built" + 1, 16, "e_wonder_obsolete" + + 1, 17, "e_tech_gain" + 1, 18, "e_tech_learned" + 1, 19, "e_tech_lost" + 1, 20, "e_tech_embassy" + 1, 20, "e_tech_goal" + 2, 0, "e_hut_barb" 2, 1, "e_hut_city" 2, 2, "e_hut_gold" @@ -68,6 +79,20 @@ 2, 5, "e_hut_settler" 2, 6, "e_hut_tech" 2, 7, "e_hut_barb_city_near" + + 2, 8, "e_unit_lost_att" + 2, 9, "e_unit_win_att" + 2, 10, "e_unit_buy" + 2, 11, "e_unit_built" + 2, 12, "e_unit_lost_def" + 2, 12, "e_unit_lost_misc" + 2, 13, "e_unit_win" + 2, 14, "e_unit_became_vet" + 2, 15, "e_unit_upgraded" + 2, 16, "e_unit_relocated" + 2, 17, "e_unit_orders" + 2, 18, "e_unit_illegal_action" + 2, 19, "e_caravan_action" 3, 0, "e_my_diplomat_poison" 3, 1, "e_my_diplomat_bribe" @@ -79,6 +104,7 @@ 3, 1, "e_my_spy_steal_gold" 3, 7, "e_diplomatic_incident" 3, 8, "e_my_diplomat_escape" ; base sprite for my diplomats + 3, 9, "e_enemy_diplomat_poison" 3, 10, "e_enemy_diplomat_bribe" 3, 11, "e_enemy_diplomat_incite" @@ -89,17 +115,46 @@ 3, 10, "e_enemy_spy_steal_gold" ; 3, 16, "e_enemy_diplomatic_incident" ; 3, 17, "e_enemy_diplomat_escape" ; base sprite for enemy diplomats - 1, 4, "e_unit_illegal_action" 4, 0, "e_achievement" 4, 1, "e_uprising" 4, 2, "e_civil_war" 4, 3, "e_anarchy" 4, 4, "e_first_contact" + 4, 4, "e_diplomacy" 4, 4, "e_new_government" ; (4, 5) unused + 4, 4, "e_nation_selected" + 4, 4, "e_setting" + 4, 4, "e_message_wall" + 4, 4, "e_connection" + 4, 5, "e_destroyed" 4, 6, "e_low_on_funds" - 4, 7, "e_pollution" ; copy from small.png + 4, 7, "e_pollution" 4, 8, "e_revolt_done" 4, 9, "e_revolt_start" 4, 10, "e_spaceship" + + 4, 4, "e_vote_new" + 4, 5, "e_vote_aborted" + 4, 11, "e_vote_resolved" + + 4, 12, "e_nuke" +; 4, 13, "e_chem" + 4, 14, "e_ai_debug" + 4, 14, "e_script" + 4, 14, "e_broadcast_report" + 4, 14, "e_report" + 4, 14, "e_chat_msg" + 4, 14, "e_log_error" + 4, 14, "e_deprecation_warning" + 4, 15, "e_global_eco" + 4, 15, "e_log_fatal" + 4, 15, "e_chat_error" + 4, 16, "e_bad_command" + + 4, 17, "e_game_start" + 4, 18, "e_next_year" + 4, 19, "e_game_end" + 4, 20, "e_turn_bell" + } Modified: branches/S2_6/data/misc/small.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/small.png?rev=33265&r1=33264&r2=33265&view=diff == Binary files - no diff available. Modified: branches/S2_6/data/misc/small.spec URL: http://svn.gna.org/v
[Freeciv-commits] r33266 - in /branches/S2_6/data: ./ amplio2/ hexemplio/
Author: jtn Date: Tue Jul 19 00:37:17 2016 New Revision: 33266 URL: http://svn.gna.org/viewcvs/freeciv?rev=33266&view=rev Log: Reorganise Amplio2 tileset files. The only major functional change is bringing a separate low-fuel sprite into use. Other changes are internal reorganisations. - all city graphics moved to a single cities.png - some material moved from moderncities to bases - occupied sprites, cd.occupied, cd.disorder, cd.city/cd.city_wall (blank) - some material moved from activities to tiles - unit.{connect,auto_settler,auto_attack,stack,loaded} - some material moved from units to veterancy - fuel gauges; one of them is now actually used - activities: made cells much smaller; removed unused alternative output activity graphic - terrain2: removed dead space and unused individual trees - tiles: more sensible organisation (like S2_5), removed duplicate upkeep sprites, removed explode.nuke_* (obsolete since r7322 in 2004!) - units: removed duplicate veterancy, reduced size by a row The city graphics changes have knock-on effects on cimpletoon, hexemplio, toonhex, and alio. Fortunately hexemplio was prepared for it. New graphics and most of the spec changes by GriffonSpade on the forum. See gna patch #7438. Added: branches/S2_6/data/amplio2/cities.png branches/S2_6/data/amplio2/cities.spec Removed: branches/S2_6/data/amplio2/ancientcities.png branches/S2_6/data/amplio2/ancientcities.spec branches/S2_6/data/amplio2/medievalcities.png branches/S2_6/data/amplio2/medievalcities.spec branches/S2_6/data/amplio2/moderncities.png branches/S2_6/data/amplio2/moderncities.spec Modified: branches/S2_6/data/alio.tilespec branches/S2_6/data/amplio2.tilespec branches/S2_6/data/amplio2/Makefile.am branches/S2_6/data/amplio2/activities.png branches/S2_6/data/amplio2/activities.spec branches/S2_6/data/amplio2/bases.png branches/S2_6/data/amplio2/bases.spec branches/S2_6/data/amplio2/terrain2.png branches/S2_6/data/amplio2/tiles.png branches/S2_6/data/amplio2/tiles.spec branches/S2_6/data/amplio2/units.png branches/S2_6/data/amplio2/units.spec branches/S2_6/data/amplio2/veterancy.png branches/S2_6/data/amplio2/veterancy.spec branches/S2_6/data/cimpletoon.tilespec branches/S2_6/data/hexemplio.tilespec branches/S2_6/data/hexemplio/bases.spec branches/S2_6/data/toonhex.tilespec [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/data/alio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alio.tilespec?rev=33266&r1=33265&r2=33266&view=diff Modified: branches/S2_6/data/amplio2.tilespec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2.tilespec?rev=33266&r1=33265&r2=33266&view=diff Modified: branches/S2_6/data/amplio2/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/Makefile.am?rev=33266&r1=33265&r2=33266&view=diff Modified: branches/S2_6/data/amplio2/activities.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/activities.png?rev=33266&r1=33265&r2=33266&view=diff Modified: branches/S2_6/data/amplio2/activities.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/activities.spec?rev=33266&r1=33265&r2=33266&view=diff Removed: branches/S2_6/data/amplio2/ancientcities.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/ancientcities.png?rev=33265&view=auto Removed: branches/S2_6/data/amplio2/ancientcities.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/ancientcities.spec?rev=33265&view=auto Modified: branches/S2_6/data/amplio2/bases.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/bases.png?rev=33266&r1=33265&r2=33266&view=diff Modified: branches/S2_6/data/amplio2/bases.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/bases.spec?rev=33266&r1=33265&r2=33266&view=diff Added: branches/S2_6/data/amplio2/cities.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/cities.png?rev=33266&view=auto Added: branches/S2_6/data/amplio2/cities.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/cities.spec?rev=33266&view=auto Removed: branches/S2_6/data/amplio2/medievalcities.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/medievalcities.png?rev=33265&view=auto Removed: branches/S2_6/data/amplio2/medievalcities.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/medievalcities.spec?rev=33265&view=auto Removed: branches/S2_6/data/amplio2/moderncities.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/moderncities.png?rev=33265&view=auto Removed: branches/S2_6/data/amplio2/moderncities.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/amplio2/moderncities.spec?rev=33265&view=auto Modified: branches/S2_6/data/amplio2/terrain2.png URL: ht
[Freeciv-commits] r33263 - in /trunk/data: ./ amplio2/ hexemplio/
Author: jtn Date: Tue Jul 19 00:33:23 2016 New Revision: 33263 URL: http://svn.gna.org/viewcvs/freeciv?rev=33263&view=rev Log: Reorganise Amplio2 tileset files. The only major functional change is bringing a separate low-fuel sprite into use. Other changes are internal reorganisations. - all city graphics moved to a single cities.png - some material moved from moderncities to bases - occupied sprites, cd.occupied, cd.disorder, cd.city/cd.city_wall (blank) - some material moved from activities to tiles - unit.{connect,auto_settler,auto_attack,stack,loaded} - some material moved from units to veterancy - fuel gauges; one of them is now actually used - activities: made cells much smaller; removed unused alternative output activity graphic - terrain2: removed dead space and unused individual trees - tiles: more sensible organisation (like S2_5), removed duplicate upkeep sprites, removed explode.nuke_* (obsolete since r7322 in 2004!) - units: removed duplicate veterancy, reduced size by a row The city graphics changes have knock-on effects on cimpletoon, hexemplio, toonhex, and alio. Fortunately hexemplio was prepared for it. New graphics and most of the spec changes by GriffonSpade on the forum. See gna patch #7438. Added: trunk/data/amplio2/cities.png trunk/data/amplio2/cities.spec Removed: trunk/data/amplio2/ancientcities.png trunk/data/amplio2/ancientcities.spec trunk/data/amplio2/medievalcities.png trunk/data/amplio2/medievalcities.spec trunk/data/amplio2/moderncities.png trunk/data/amplio2/moderncities.spec Modified: trunk/data/alio.tilespec trunk/data/amplio2.tilespec trunk/data/amplio2/Makefile.am trunk/data/amplio2/activities.png trunk/data/amplio2/activities.spec trunk/data/amplio2/bases.png trunk/data/amplio2/bases.spec trunk/data/amplio2/terrain2.png trunk/data/amplio2/tiles.png trunk/data/amplio2/tiles.spec trunk/data/amplio2/units.png trunk/data/amplio2/units.spec trunk/data/amplio2/veterancy.png trunk/data/amplio2/veterancy.spec trunk/data/cimpletoon.tilespec trunk/data/hexemplio.tilespec trunk/data/hexemplio/bases.spec trunk/data/toonhex.tilespec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/data/alio.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alio.tilespec?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2.tilespec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2.tilespec?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/Makefile.am?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2/activities.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/activities.png?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2/activities.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/activities.spec?rev=33263&r1=33262&r2=33263&view=diff Removed: trunk/data/amplio2/ancientcities.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/ancientcities.png?rev=33262&view=auto Removed: trunk/data/amplio2/ancientcities.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/ancientcities.spec?rev=33262&view=auto Modified: trunk/data/amplio2/bases.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/bases.png?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2/bases.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/bases.spec?rev=33263&r1=33262&r2=33263&view=diff Added: trunk/data/amplio2/cities.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/cities.png?rev=33263&view=auto Added: trunk/data/amplio2/cities.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/cities.spec?rev=33263&view=auto Removed: trunk/data/amplio2/medievalcities.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/medievalcities.png?rev=33262&view=auto Removed: trunk/data/amplio2/medievalcities.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/medievalcities.spec?rev=33262&view=auto Removed: trunk/data/amplio2/moderncities.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/moderncities.png?rev=33262&view=auto Removed: trunk/data/amplio2/moderncities.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/moderncities.spec?rev=33262&view=auto Modified: trunk/data/amplio2/terrain2.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/terrain2.png?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2/tiles.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/tiles.png?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2/tiles.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/amplio2/tiles.spec?rev=33263&r1=33262&r2=33263&view=diff Modified: trunk/data/amplio2/units.png URL: http://sv
[Freeciv-commits] r33264 - /trunk/server/unittools.c
Author: jtn Date: Tue Jul 19 00:33:28 2016 New Revision: 33264 URL: http://svn.gna.org/viewcvs/freeciv?rev=33264&view=rev Log: Mark a string for translation that is used when a unit dies due to the 'killunhomed' server setting. See gna bug #24858. Modified: trunk/server/unittools.c Modified: trunk/server/unittools.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=33264&r1=33263&r2=33264&view=diff == --- trunk/server/unittools.c(original) +++ trunk/server/unittools.cTue Jul 19 00:33:28 2016 @@ -397,8 +397,8 @@ * killed; notify player here */ if (!punit->homecity && 0 < game.server.killunhomed) { notify_player(pplayer, unit_tile(punit), E_UNIT_LOST_MISC, - ftc_server, "Your %s has run out of hit points " - "because it has no supporting homecity.", + ftc_server, _("Your %s has run out of hit points " +"because it was not supported by a city."), unit_tile_link(punit)); } else { notify_player(pplayer, unit_tile(punit), E_UNIT_LOST_MISC, ftc_server, ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33262 - in /trunk/data/misc: events.png events.spec small.png small.spec
Author: jtn Date: Tue Jul 19 00:33:09 2016 New Revision: 33262 URL: http://svn.gna.org/viewcvs/freeciv?rev=33262&view=rev Log: More event graphics, and move some from small.spec. The graphics used for e_* sprites that were in small.png [1, {0,1,2,5}] have been moved to events.png. Most of the remaining icons on the second row of small.png are currently unused and have been moved to the right-hand side. This events.png is targeted at the 2.6 event set; sprite choices for events that are new since then are placeholders. Event graphics and spec updates by GriffonSpade on the forum. See gna patch #7439. Modified: trunk/data/misc/events.png trunk/data/misc/events.spec trunk/data/misc/small.png trunk/data/misc/small.spec Modified: trunk/data/misc/events.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/events.png?rev=33262&r1=33261&r2=33262&view=diff == Binary files - no diff available. Modified: trunk/data/misc/events.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/events.spec?rev=33262&r1=33261&r2=33262&view=diff == --- trunk/data/misc/events.spec (original) +++ trunk/data/misc/events.spec Tue Jul 19 00:33:09 2016 @@ -28,6 +28,7 @@ 0, 3, "e_city_disorder" 0, 4, "e_city_famine" 0, 5, "e_city_famine_feared" + 0, 5, "e_unit_built_pop_cost" 0, 6, "e_city_growth" 0, 7, "e_city_may_soon_grow" 0, 8, "e_city_aqueduct" @@ -44,22 +45,32 @@ 0, 12, "e_worklist" ; (0, 19) unused 0, 12, "e_city_radius_sq" ; (0, 20) unused - 1, 0, "e_nuke" -; 1, 1, "e_chem" -; 1, 2, "e_warn" - 1, 3, "e_global_eco" -; 1, 4, "e_no" + 1, 0, "e_treaty_shared_vision" + 1, 1, "e_treaty_alliance" + 1, 2, "e_treaty_peace" + 1, 3, "e_treaty_ceasefire" + 1, 4, "e_treaty_broken" + 1, 5, "e_treaty_embassy" - 1, 2, "e_ai_debug" - 1, 2, "e_script" - 1, 2, "e_broadcast_report" - 1, 2, "e_report" - 1, 2, "e_chat_msg" - 1, 2, "e_log_error" - 1, 2, "e_deprecation_warning" - 1, 3, "e_log_fatal" - 1, 3, "e_chat_error" + 1, 6, "e_imp_buy" + 1, 7, "e_imp_build" + 1, 8, "e_imp_auctioned" + 1, 9, "e_imp_sold" + 1, 10, "e_imp_auto" +; 1, 11, "e_imp_destroyed" + 1, 12, "e_wonder_build" + 1, 13, "e_wonder_started" + 1, 14, "e_wonder_stopped" + 1, 15, "e_wonder_will_be_built" + 1, 16, "e_wonder_obsolete" + + 1, 17, "e_tech_gain" + 1, 18, "e_tech_learned" + 1, 19, "e_tech_lost" + 1, 20, "e_tech_embassy" + 1, 20, "e_tech_goal" + 2, 0, "e_hut_barb" 2, 1, "e_hut_city" 2, 2, "e_hut_gold" @@ -68,6 +79,24 @@ 2, 5, "e_hut_settler" 2, 6, "e_hut_tech" 2, 7, "e_hut_barb_city_near" + + 2, 8, "e_unit_lost_att" + 2, 9, "e_unit_win_att" + 2, 9, "e_unit_did_expel" ; PLACEHOLDER + 2, 9, "e_unit_escaped" ; PLACEHOLDER + 2, 10, "e_unit_buy" + 2, 11, "e_unit_built" + 2, 12, "e_unit_lost_def" + 2, 12, "e_unit_lost_misc" + 2, 13, "e_unit_win" + 2, 14, "e_unit_became_vet" + 2, 15, "e_unit_upgraded" + 2, 16, "e_unit_relocated" + 2, 16, "e_unit_was_expelled" ; PLACEHOLDER + 2, 17, "e_unit_orders" + 2, 17, "e_unit_action_failed" + 2, 18, "e_unit_illegal_action" + 2, 19, "e_caravan_action" 3, 0, "e_my_diplomat_poison" 3, 1, "e_my_diplomat_bribe" @@ -93,23 +122,47 @@ 3, 17, "e_enemy_spy_nuke" ; use base sprite for enemy diplomats ; 3, 16, "e_enemy_diplomatic_incident" ; 3, 17, "e_enemy_diplomat_escape" ; base sprite for enemy diplomats - 1, 4, "e_unit_illegal_action" - 1, 5, "e_unit_was_expelled" - 1, 6, "e_unit_did_expel" - 1, 4, "e_unit_action_failed" 4, 0, "e_achievement" 4, 1, "e_uprising" 4, 2, "e_civil_war" 4, 3, "e_anarchy" 4, 4, "e_first_contact" + 4, 4, "e_diplomacy" 4, 4, "e_new_government" ; (4, 5) unused + 4, 4, "e_nation_selected" + 4, 4, "e_setting" + 4, 4, "e_message_wall" + 4, 4, "e_connection" + 4, 5, "e_destroyed" 4, 6, "e_low_on_funds" - 4, 7, "e_pollution" ; copy from small.png + 4, 7, "e_pollution" 4, 8, "e_revolt_done" 4, 9, "e_revolt_start" 4, 10, "e_spaceship" + + 4, 4, "e_vote_new" + 4, 5, "e_vote_aborted" + 4, 11, "e_vote_resolved" - 1, 2, "e_spontaneous_extra" - 4, 17, "e_unit_escaped" + 4, 12, "e_nuke" +; 4, 13, "e_chem" + 4, 14, "e_spontaneous_extra" ; PLACEHOLDER + 4, 14, "e_ai_debug" + 4, 14, "e_script" + 4, 14, "e_broadcast_report" + 4, 14, "e_report" + 4, 14, "e_chat_msg" + 4, 14, "e_log_error" + 4, 14, "e_deprecation_warning" + 4, 15, "e_global_eco" + 4, 15, "e_log_fatal" + 4, 15, "e_chat_error" + 4, 16, "e_bad_command" + + 4, 17, "e_game_start" + 4, 18, "e_next_year" + 4, 19, "e_game_end" + 4, 20, "e_turn_bell" + } Modified: trunk/data/misc/small.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/small.png?rev=33262&r1=33261&r2=33262&view=diff
[Freeciv-commits] r33261 - in /trunk: client/packhand.c common/networking/packets.def fc_version server/ruleset.c
Author: cazfi Date: Mon Jul 18 21:07:19 2016 New Revision: 33261 URL: http://svn.gna.org/viewcvs/freeciv?rev=33261&view=rev Log: Added tech_class network packet See patch #7415 Modified: trunk/client/packhand.c trunk/common/networking/packets.def trunk/fc_version trunk/server/ruleset.c Modified: trunk/client/packhand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=33261&r1=33260&r2=33261&view=diff == --- trunk/client/packhand.c (original) +++ trunk/client/packhand.c Mon Jul 18 21:07:19 2016 @@ -3467,6 +3467,18 @@ PACKET_STRVEC_EXTRACT(a->helptext, p->helptext); tileset_setup_tech_type(tileset, a); +} + +/ + Packet ruleset_tech_class handler. +/ +void handle_ruleset_tech_class(const struct packet_ruleset_tech_class *p) +{ + struct tech_class *ptclass = tech_class_by_number(p->id); + + fc_assert_ret_msg(NULL != ptclass, "Bad tech_class %d.", p->id); + + names_set(&ptclass->name, NULL, p->name, p->rule_name); } / Modified: trunk/common/networking/packets.def URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/packets.def?rev=33261&r1=33260&r2=33261&view=diff == --- trunk/common/networking/packets.def (original) +++ trunk/common/networking/packets.def Mon Jul 18 21:07:19 2016 @@ -1418,6 +1418,12 @@ STRING graphic_alt[MAX_LEN_NAME]; end +PACKET_RULESET_TECH_CLASS = 9; sc, lsend + UINT16 id; + STRING name[MAX_LEN_NAME]; + STRING rule_name[MAX_LEN_NAME]; +end + PACKET_RULESET_TECH_FLAG = 234; sc, lsend UINT8 id; STRING name[MAX_LEN_NAME]; Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=33261&r1=33260&r2=33261&view=diff == --- trunk/fc_version(original) +++ trunk/fc_versionMon Jul 18 21:07:19 2016 @@ -56,7 +56,7 @@ # - Avoid adding a new mandatory capability to the development branch for # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. -NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Jul.15" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Jul.18" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR="" Modified: trunk/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=33261&r1=33260&r2=33261&view=diff == --- trunk/server/ruleset.c (original) +++ trunk/server/ruleset.c Mon Jul 18 21:07:19 2016 @@ -169,6 +169,7 @@ static bool load_ruleset_game(struct section_file *file, bool act, struct rscompat_info *compat); +static void send_ruleset_tech_classes(struct conn_list *dest); static void send_ruleset_techs(struct conn_list *dest); static void send_ruleset_unit_classes(struct conn_list *dest); static void send_ruleset_units(struct conn_list *dest); @@ -6682,6 +6683,21 @@ lsend_packet_ruleset_specialist(dest, &packet); } specialist_type_iterate_end; } +/** + Send the techs class information to the specified connections. +**/ +static void send_ruleset_tech_classes(struct conn_list *dest) +{ + struct packet_ruleset_tech_class packet; + + tech_class_iterate(ptclass) { +packet.id = ptclass->idx; +sz_strlcpy(packet.name, untranslated_name(&ptclass->name)); +sz_strlcpy(packet.rule_name, rule_name_get(&ptclass->name)); + +lsend_packet_ruleset_tech_class(dest, &packet); + } tech_class_iterate_end; +} /** Send the techs ruleset information (all individual advances) to the @@ -6720,7 +6736,7 @@ packet.id = advance_number(a); packet.removed = !valid_advance(a); if (a->tclass == NULL) { - packet.tclass = -1; + packet.tclass = 0; } else { packet.tclass = a->tclass->idx; } @@ -7889,6 +7905,7 @@ send_ruleset_actions(dest); send_ruleset_action_enablers(dest); send_ruleset_action_auto_performers(dest); + send_ruleset_tech_classes(dest); send_ruleset_techs(dest); send_ruleset_governments(dest); send_ruleset_unit_classes(dest); ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33258 - /trunk/client/connectdlg_common.c
Author: cazfi Date: Mon Jul 18 20:50:13 2016 New Revision: 33258 URL: http://svn.gna.org/viewcvs/freeciv?rev=33258&view=rev Log: Store information if client has has already forced server to die. Make sure that server gets killed if it's still running when client really needs it to shut down. Reported by Christian Knoke See bug #24823 Modified: trunk/client/connectdlg_common.c Modified: trunk/client/connectdlg_common.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/connectdlg_common.c?rev=33258&r1=33257&r2=33258&view=diff == --- trunk/client/connectdlg_common.c(original) +++ trunk/client/connectdlg_common.cMon Jul 18 20:50:13 2016 @@ -75,10 +75,11 @@ #ifdef HAVE_USABLE_FORK static pid_t server_pid = -1; -#elif WIN32_NATIVE +#elif FREECIV_MSWINDOWS HANDLE server_process = INVALID_HANDLE_VALUE; HANDLE loghandle = INVALID_HANDLE_VALUE; -#endif +#endif /* HAVE_USABLE_FORK || FREECIV_MSWINDOWS */ +bool server_quitting = FALSE; static char challenge_fullname[MAX_LEN_PATH]; static bool client_has_hack = FALSE; @@ -115,9 +116,12 @@ **/ bool is_server_running(void) { + if (server_quitting) { +return FALSE; + } #ifdef HAVE_USABLE_FORK return (server_pid > 0); -#elif WIN32_NATIVE +#elif FREECIV_MSWINDOWS return (server_process != INVALID_HANDLE_VALUE); #else return FALSE; /* We've been unable to start one! */ @@ -141,6 +145,32 @@ / void client_kill_server(bool force) { +#ifdef HAVE_USABLE_FORK + if (server_quitting && server_pid > 0) { +/* Already asked to /quit. + * If it didn't do that, kill it. */ +if (waitpid(server_pid, NULL, WUNTRACED) <= 0) { + kill(server_pid, SIGTERM); + waitpid(server_pid, NULL, WUNTRACED); +} +server_pid = -1; +server_quitting = FALSE; + } +#elif FREECIV_MSWINDOWS + if (server_quitting && server_process != INVALID_HANDLE_VALUE) { +/* Already asked to /quit. + * If it didn't do that, kill it. */ +TerminateProcess(server_process, 0); +CloseHandle(server_process); +if (loghandle != INVALID_HANDLE_VALUE) { + CloseHandle(loghandle); +} +server_process = INVALID_HANDLE_VALUE; +loghandle = INVALID_HANDLE_VALUE; +server_quitting = FALSE; + } +#endif /* FREECIV_MSWINDOWS || HAVE_USABLE_FORK */ + if (is_server_running()) { if (client.conn.used && client_has_hack) { /* This does a "soft" shutdown of the server by sending a /quit. @@ -156,12 +186,7 @@ * it could potentially be called when we're connected to an unowned * server. In this case we don't want to kill it. */ send_chat("/quit"); -#ifdef HAVE_USABLE_FORK - server_pid = -1; -#elif WIN32_NATIVE - server_process = INVALID_HANDLE_VALUE; - loghandle = INVALID_HANDLE_VALUE; -#endif + server_quitting = TRUE; } else if (force) { /* Either we already disconnected, or we didn't get control of the * server. In either case, the only thing to do is a "hard" kill of @@ -169,8 +194,8 @@ #ifdef HAVE_USABLE_FORK kill(server_pid, SIGTERM); waitpid(server_pid, NULL, WUNTRACED); - server_pid = -1; -#elif WIN32_NATIVE + server_pid = -1; +#elif FREECIV_MSWINDOWS TerminateProcess(server_process, 0); CloseHandle(server_process); if (loghandle != INVALID_HANDLE_VALUE) { @@ -178,7 +203,8 @@ } server_process = INVALID_HANDLE_VALUE; loghandle = INVALID_HANDLE_VALUE; -#endif /* WIN32_NATIVE || HAVE_USABLE_FORK */ +#endif /* FREECIV_MSWINDOWS || HAVE_USABLE_FORK */ + server_quitting = FALSE; } } client_has_hack = FALSE; @@ -320,6 +346,7 @@ } server_pid = fork(); +server_quitting = FALSE; if (server_pid == 0) { int fd; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33260 - /branches/S2_5/client/connectdlg_common.c
Author: cazfi Date: Mon Jul 18 20:50:26 2016 New Revision: 33260 URL: http://svn.gna.org/viewcvs/freeciv?rev=33260&view=rev Log: Store information if client has has already forced server to die. Make sure that server gets killed if it's still running when client really needs it to shut down. Reported by Christian Knoke See bug #24823 Modified: branches/S2_5/client/connectdlg_common.c Modified: branches/S2_5/client/connectdlg_common.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/connectdlg_common.c?rev=33260&r1=33259&r2=33260&view=diff == --- branches/S2_5/client/connectdlg_common.c(original) +++ branches/S2_5/client/connectdlg_common.cMon Jul 18 20:50:26 2016 @@ -1,15 +1,15 @@ -/** +/*** Freeciv - Copyright (C) 2004 - The Freeciv Project 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, + 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 @@ -85,6 +85,7 @@ HANDLE server_process = INVALID_HANDLE_VALUE; HANDLE loghandle = INVALID_HANDLE_VALUE; #endif +bool server_quitting = FALSE; static char challenge_fullname[MAX_LEN_PATH]; static bool client_has_hack = FALSE; @@ -121,6 +122,9 @@ **/ bool is_server_running(void) { + if (server_quitting) { +return FALSE; + } #ifdef HAVE_USABLE_FORK return (server_pid > 0); #elif WIN32_NATIVE @@ -147,6 +151,32 @@ / void client_kill_server(bool force) { +#ifdef HAVE_USABLE_FORK + if (server_quitting && server_pid > 0) { +/* Already asked to /quit. + * If it didn't do that, kill it. */ +if (waitpid(server_pid, NULL, WUNTRACED) <= 0) { + kill(server_pid, SIGTERM); + waitpid(server_pid, NULL, WUNTRACED); +} +server_pid = -1; +server_quitting = FALSE; + } +#elif WIN32_NATIVE + if (server_quitting && server_process != INVALID_HANDLE_VALUE) { +/* Already asked to /quit. + * If it didn't do that, kill it. */ +TerminateProcess(server_process, 0); +CloseHandle(server_process); +if (loghandle != INVALID_HANDLE_VALUE) { + CloseHandle(loghandle); +} +server_process = INVALID_HANDLE_VALUE; +loghandle = INVALID_HANDLE_VALUE; +server_quitting = FALSE; + } +#endif /* WIN32_NATIVE || HAVE_USABLE_FORK */ + if (is_server_running()) { if (client.conn.used && client_has_hack) { /* This does a "soft" shutdown of the server by sending a /quit. @@ -162,12 +192,7 @@ * it could potentially be called when we're connected to an unowned * server. In this case we don't want to kill it. */ send_chat("/quit"); -#ifdef HAVE_USABLE_FORK - server_pid = -1; -#elif WIN32_NATIVE - server_process = INVALID_HANDLE_VALUE; - loghandle = INVALID_HANDLE_VALUE; -#endif + server_quitting = TRUE; } else if (force) { /* Either we already disconnected, or we didn't get control of the * server. In either case, the only thing to do is a "hard" kill of @@ -175,7 +200,7 @@ #ifdef HAVE_USABLE_FORK kill(server_pid, SIGTERM); waitpid(server_pid, NULL, WUNTRACED); - server_pid = -1; + server_pid = -1; #elif WIN32_NATIVE TerminateProcess(server_process, 0); CloseHandle(server_process); @@ -185,6 +210,7 @@ server_process = INVALID_HANDLE_VALUE; loghandle = INVALID_HANDLE_VALUE; #endif /* WIN32_NATIVE || HAVE_USABLE_FORK */ + server_quitting = FALSE; } } client_has_hack = FALSE; @@ -310,6 +336,7 @@ } server_pid = fork(); +server_quitting = FALSE; if (server_pid == 0) { int fd; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33259 - /branches/S2_6/client/connectdlg_common.c
Author: cazfi Date: Mon Jul 18 20:50:21 2016 New Revision: 33259 URL: http://svn.gna.org/viewcvs/freeciv?rev=33259&view=rev Log: Store information if client has has already forced server to die. Make sure that server gets killed if it's still running when client really needs it to shut down. Reported by Christian Knoke See bug #24823 Modified: branches/S2_6/client/connectdlg_common.c Modified: branches/S2_6/client/connectdlg_common.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/connectdlg_common.c?rev=33259&r1=33258&r2=33259&view=diff == --- branches/S2_6/client/connectdlg_common.c(original) +++ branches/S2_6/client/connectdlg_common.cMon Jul 18 20:50:21 2016 @@ -75,10 +75,11 @@ #ifdef HAVE_USABLE_FORK static pid_t server_pid = -1; -#elif WIN32_NATIVE +#elif FREECIV_MSWINDOWS HANDLE server_process = INVALID_HANDLE_VALUE; HANDLE loghandle = INVALID_HANDLE_VALUE; -#endif +#endif /* HAVE_USABLE_FORK || FREECIV_MSWINDOWS */ +bool server_quitting = FALSE; static char challenge_fullname[MAX_LEN_PATH]; static bool client_has_hack = FALSE; @@ -115,9 +116,12 @@ **/ bool is_server_running(void) { + if (server_quitting) { +return FALSE; + } #ifdef HAVE_USABLE_FORK return (server_pid > 0); -#elif WIN32_NATIVE +#elif FREECIV_MSWINDOWS return (server_process != INVALID_HANDLE_VALUE); #else return FALSE; /* We've been unable to start one! */ @@ -141,6 +145,32 @@ / void client_kill_server(bool force) { +#ifdef HAVE_USABLE_FORK + if (server_quitting && server_pid > 0) { +/* Already asked to /quit. + * If it didn't do that, kill it. */ +if (waitpid(server_pid, NULL, WUNTRACED) <= 0) { + kill(server_pid, SIGTERM); + waitpid(server_pid, NULL, WUNTRACED); +} +server_pid = -1; +server_quitting = FALSE; + } +#elif FREECIV_MSWINDOWS + if (server_quitting && server_process != INVALID_HANDLE_VALUE) { +/* Already asked to /quit. + * If it didn't do that, kill it. */ +TerminateProcess(server_process, 0); +CloseHandle(server_process); +if (loghandle != INVALID_HANDLE_VALUE) { + CloseHandle(loghandle); +} +server_process = INVALID_HANDLE_VALUE; +loghandle = INVALID_HANDLE_VALUE; +server_quitting = FALSE; + } +#endif /* FREECIV_MSWINDOWS || HAVE_USABLE_FORK */ + if (is_server_running()) { if (client.conn.used && client_has_hack) { /* This does a "soft" shutdown of the server by sending a /quit. @@ -156,12 +186,7 @@ * it could potentially be called when we're connected to an unowned * server. In this case we don't want to kill it. */ send_chat("/quit"); -#ifdef HAVE_USABLE_FORK - server_pid = -1; -#elif WIN32_NATIVE - server_process = INVALID_HANDLE_VALUE; - loghandle = INVALID_HANDLE_VALUE; -#endif + server_quitting = TRUE; } else if (force) { /* Either we already disconnected, or we didn't get control of the * server. In either case, the only thing to do is a "hard" kill of @@ -169,8 +194,8 @@ #ifdef HAVE_USABLE_FORK kill(server_pid, SIGTERM); waitpid(server_pid, NULL, WUNTRACED); - server_pid = -1; -#elif WIN32_NATIVE + server_pid = -1; +#elif FREECIV_MSWINDOWS TerminateProcess(server_process, 0); CloseHandle(server_process); if (loghandle != INVALID_HANDLE_VALUE) { @@ -178,7 +203,8 @@ } server_process = INVALID_HANDLE_VALUE; loghandle = INVALID_HANDLE_VALUE; -#endif /* WIN32_NATIVE || HAVE_USABLE_FORK */ +#endif /* FREECIV_MSWINDOWS || HAVE_USABLE_FORK */ + server_quitting = FALSE; } } client_has_hack = FALSE; @@ -308,6 +334,7 @@ } server_pid = fork(); +server_quitting = FALSE; if (server_pid == 0) { int fd; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33257 - /branches/S2_6/common/actions.c
Author: sveinung Date: Mon Jul 18 12:11:39 2016 New Revision: 33257 URL: http://svn.gna.org/viewcvs/freeciv?rev=33257&view=rev Log: Drop unknown action button mouse over help. The action probability that used to be ?% is now [0%, 100%]. [0%, 100%] is easier to understand. Drop its custom action button mouse over help text. See patch #7473 Modified: branches/S2_6/common/actions.c Modified: branches/S2_6/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/actions.c?rev=33257&r1=33256&r2=33257&view=diff == --- branches/S2_6/common/actions.c (original) +++ branches/S2_6/common/actions.c Mon Jul 18 12:11:39 2016 @@ -58,8 +58,6 @@ action_prob_is_signal(const struct act_prob probability); static inline bool action_prob_not_relevant(const struct act_prob probability); -static inline bool -action_prob_unknown(const struct act_prob probability); static inline bool action_prob_not_impl(const struct act_prob probability); @@ -376,10 +374,6 @@ /* Missing server support. No in game action will change this. */ astr_clear(&tool_tip); - } else if (action_prob_unknown(prob)) { -/* Missing in game knowledge. An in game action can change this. */ -astr_set(&tool_tip, - _("Starting to do this may currently be impossible.")); } else if (prob.min == prob.max) { /* TRANS: action probability of success. Given in percentage. * Resolution is 0.5%. */ @@ -1388,20 +1382,6 @@ } /** - Returns TRUE iff the given action probability represents that the player - currently doesn't have enough information to find the real value. - - It is caused by the probability depending on a rule that depends on game - state the player don't have access to. It may be possible for the player - to later gain access to this game state. -**/ -static inline bool -action_prob_unknown(const struct act_prob probability) -{ - return probability.min == 0 && probability.max == 200; -} - -/** Returns TRUE iff the given action probability represents a special signal value rather than a regular action probability value. **/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33256 - /trunk/common/actions.c
Author: sveinung Date: Mon Jul 18 11:57:45 2016 New Revision: 33256 URL: http://svn.gna.org/viewcvs/freeciv?rev=33256&view=rev Log: Drop unknown action button mouse over help. The action probability that used to be ?% is now [0%, 100%]. [0%, 100%] is easier to understand. Drop its custom action button mouse over help text. See patch #7473 Modified: trunk/common/actions.c Modified: trunk/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=33256&r1=33255&r2=33256&view=diff == --- trunk/common/actions.c (original) +++ trunk/common/actions.c Mon Jul 18 11:57:45 2016 @@ -66,8 +66,6 @@ action_prob_is_signal(const struct act_prob probability); static inline bool action_prob_not_relevant(const struct act_prob probability); -static inline bool -action_prob_unknown(const struct act_prob probability); static inline bool action_prob_not_impl(const struct act_prob probability); @@ -626,10 +624,6 @@ /* Missing server support. No in game action will change this. */ astr_clear(&tool_tip); - } else if (action_prob_unknown(prob)) { -/* Missing in game knowledge. An in game action can change this. */ -astr_set(&tool_tip, - _("Starting to do this may currently be impossible.")); } else if (prob.min == prob.max) { /* TRANS: action probability of success. Given in percentage. * Resolution is 0.5%. */ @@ -2795,20 +2789,6 @@ } /** - Returns TRUE iff the given action probability represents that the player - currently doesn't have enough information to find the real value. - - It is caused by the probability depending on a rule that depends on game - state the player don't have access to. It may be possible for the player - to later gain access to this game state. -**/ -static inline bool -action_prob_unknown(const struct act_prob probability) -{ - return probability.min == 0 && probability.max == 200; -} - -/** Returns TRUE iff the given action probability represents a special signal value rather than a regular action probability value. **/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits