Author: cazfi Date: Tue Nov 10 22:48:30 2015 New Revision: 30522 URL: http://svn.gna.org/viewcvs/freeciv?rev=30522&view=rev Log: Tell name of the tech gained from EFT_GIVE_IMM_TECH building.
See bug #24036 Modified: branches/S2_6/server/cityturn.c Modified: branches/S2_6/server/cityturn.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=30522&r1=30521&r2=30522&view=diff ============================================================================== --- branches/S2_6/server/cityturn.c (original) +++ branches/S2_6/server/cityturn.c Tue Nov 10 22:48:30 2015 @@ -2124,25 +2124,26 @@ struct research *presearch = research_get(pplayer); char research_name[MAX_LEN_NAME * 2]; int i; + const char *provider = improvement_name_translation(pimprove); notify_research(presearch, NULL, E_TECH_GAIN, ftc_server, PL_("%s boosts research; you gain %d immediate " "advance.", "%s boosts research; you gain %d immediate " "advances.", - mod), - improvement_name_translation(pimprove), mod); + mod), provider, mod); research_pretty_name(presearch, research_name, sizeof(research_name)); for (i = 0; i < mod; i++) { Tech_type_id tech = give_immediate_free_tech(presearch); - - notify_research_embassies - (presearch, NULL, E_TECH_EMBASSY, ftc_server, - _("The %s have acquired %s from %s."), - research_name, - research_advance_name_translation(presearch, tech), - improvement_name_translation(pimprove)); + const char *adv_name = research_advance_name_translation(presearch, tech); + + notify_research(presearch, NULL, E_TECH_GAIN, ftc_server, + _("Acquired %s from %s."), adv_name, provider); + + notify_research_embassies(presearch, NULL, E_TECH_EMBASSY, ftc_server, + _("The %s have acquired %s from %s."), + research_name, adv_name, provider); } } if (space_part && pplayer->spaceship.state == SSHIP_NONE) { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits