[Freeciv-Dev] Re: a few notify fixes
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
On Wed, Apr 03, 2002 at 01:32:35AM +0200, Per I. Mathisen wrote:
> This is just a collection of Very Minor Notify Fixes That Make Sense.
>
> This patch does:
> -> adds four new events, for sound, with corresponding fixes in
> server notifies
> -> get_a_tech notifies rewritten for basic sanity (didn't anyone
> notice how godawful those notifies were?)
> -> lastly, adds some of andy payne's notify fixes to unittools.c,
> which adds x,y and event to some odd messages
>
> Autogame behaviour is unchanged, and most game stuff looks fine. However,
> I haven't tested it with future techs. Can anyone who have a savegame with
> future techs check if diplomat theft of future techs gives the right
> message now?
>
> Yours,
> Per
>
> PS, the rapture delay patch: Raimar's last release goals list showed this
> as ready for inclusion. What happened to it? Are there issues with it? Why
> isn't it in cvs yet?
>
> PPS, do anyone have andi payne's smaller patches lying around? I only have
> his full tree. I've tried to contact him but his email bounces. There is
> an enormous amount of useful stuff in there...
>
> "While we're all in favor of Arafat doing more to suppress violence in
> the Middle East, we fear that he doesn't have all that much influence on
> the Israeli government. " --Sam Smith
> diff -u3NrX /home/perrin/freeciv/diff_ignore freeciv/client/options.c
> freeciv-phased/client/options.c
> --- freeciv/client/options.c Mon Mar 18 19:51:25 2002
> +++ freeciv-phased/client/options.c Wed Apr 3 00:46:20 2002
> @@ -158,6 +158,7 @@
> GEN_EV(N_("Unit Built"), E_UNIT_BUILD),
> GEN_EV(N_("Unit Defender Destroyed"), E_UNIT_LOST),
> GEN_EV(N_("Unit Defender Survived"), E_UNIT_WIN),
> + GEN_EV(N_("Unit Relocated"), E_UNIT_RELOCATED),
> GEN_EV(N_("Collapse to Anarchy"), E_ANARCHY),
> GEN_EV(N_("Diplomat Actions - Enemy"), E_DIPLOMATED),
> GEN_EV(N_("Tech from Great Library"), E_TECH_GAIN),
> @@ -174,7 +175,6 @@
> GEN_EV(N_("Spaceship Events"), E_SPACESHIP),
> GEN_EV(N_("Barbarian Uprising"), E_UPRISING ),
> GEN_EV(N_("Worklist Events"), E_WORKLIST),
> - GEN_EV(N_("Pact Cancelled"), E_CANCEL_PACT),
> GEN_EV(N_("Diplomatic Incident"), E_DIPL_INCIDENT),
> GEN_EV(N_("First Contact"), E_FIRST_CONTACT),
> GEN_EV(N_("City May Soon Grow"), E_CITY_MAY_SOON_GROW),
> @@ -202,6 +202,12 @@
> GEN_EV(N_("Report"), E_REPORT),
> GEN_EV(N_("Broadcast Report"), E_BROADCAST_REPORT),
> GEN_EV(N_("Nation Selected"), E_NATION_SELECTED),
> + GEN_EV(N_("Civil War"), E_CIVIL_WAR),
> + GEN_EV(N_("City Transfer"), E_CITY_TRANSFER),
> + GEN_EV(N_("Treaty - Ceasefire"), E_TREATY_CEASEFIRE),
> + GEN_EV(N_("Treaty - Peace"), E_TREATY_PEACE),
> + GEN_EV(N_("Treaty - Alliance"), E_TREATY_ALLIANCE),
> + GEN_EV(N_("Treaty - Broken"), E_TREATY_BROKEN),
> GEN_EV_TERMINATOR
> };
These changes are ok.
> diff -u3NrX /home/perrin/freeciv/diff_ignore freeciv/common/events.h
> freeciv-phased/common/events.h
> --- freeciv/common/events.h Tue Mar 26 01:34:22 2002
> +++ freeciv-phased/common/events.h Wed Apr 3 00:46:27 2002
> @@ -35,6 +35,7 @@
> E_UNIT_BUILD,
> E_UNIT_LOST,
> E_UNIT_WIN,
> + E_UNIT_RELOCATED,
> E_ANARCHY,
> E_DIPLOMATED,
> E_TECH_GAIN,
> @@ -51,7 +52,6 @@
> E_SPACESHIP,
> E_UPRISING,
> E_WORKLIST,
> - E_CANCEL_PACT,
> E_DIPL_INCIDENT,
> E_FIRST_CONTACT,
> E_CITY_MAY_SOON_GROW,
These aren't. Only append or rename but not remove.
Raimar
--
email: rf13@xxxxxxxxxxxxxxxxx
What's nice about GUI is that you see what you manipulate.
What's bad about GUI is that you can only manipulate what you see.
[Freeciv-Dev] Re: a few notify fixes, Raimar Falke, 2002/04/24
|
|