<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40183 >
> [EMAIL PROTECTED] - Fri Apr 04 22:10:50 2008]: > > On 04/04/2008, Madeline Book wrote: > > > > > > > [book - Thu Apr 03 22:58:49 2008]: > > > > > > > > As per my off-topic comment in PR#40170, the /wall command > > > should not be E_LOG_FATAL. A patch will be coming soon... > > > > And here it is. Hopefully I have not missed any trivialities. ;) > > As comment before event_type list in events.h says: > > /* Add new event types to the end. Client saves message settings by > * type number and installing new event type in between would cause > * erronous loading of existing .civclientrc > * When adding events to stable branch, there is risk that TRUNK > * already has allocated next slot for something else (and has > * new event in upper slot) */ > > Make sure that message settings saved in 2.1 work correctly when > updating client to 2.2 Duly noted. This second version of the patch puts E_MESSAGE_WALL back in the same place that it occupies in 2.1. ---------------------------------------------------------------------- 先のほうが悪いと思います
diff --git a/common/events.c b/common/events.c index 2830b8a..a7b253a 100644 --- a/common/events.c +++ b/common/events.c @@ -172,6 +172,7 @@ static struct { GEN_EV(E_REPORT, E_S_XYZZY, N_("Report")), GEN_EV(E_LOG_FATAL, E_S_XYZZY, N_("Server Aborting")), GEN_EV(E_LOG_ERROR, E_S_XYZZY, N_("Server Problems")), + GEN_EV(E_MESSAGE_WALL, E_S_XYZZY, N_("Message from server operator")), GEN_EV(E_SETTING, E_S_XYZZY, N_("Server settings changed")), GEN_EV(E_TURN_BELL, E_S_XYZZY, N_("Turn Bell")), GEN_EV(E_TUTORIAL, E_S_XYZZY, N_("Tutorial message")), diff --git a/common/events.h b/common/events.h index a45bff7..5d6c2e4 100644 --- a/common/events.h +++ b/common/events.h @@ -118,11 +118,12 @@ enum event_type { E_BAD_COMMAND, /* Illegal command sent from client. */ E_SETTING, /* Messages for changed server settings */ E_CHAT_MSG, /* Chatline messages */ - E_LOG_FATAL, + E_MESSAGE_WALL, /* Message from server operator */ E_CHAT_ERROR, /* Chatline errors (bad syntax, etc.) */ E_CONNECTION, /* Messages about acquired or lost connections */ E_AI_DEBUG, /* AI debugging messages */ E_LOG_ERROR, /* Warning messages */ + E_LOG_FATAL, E_TECH_GOAL, /* Changed tech goal */ /* * Note: If you add a new event, make sure you make a similar change diff --git a/server/scripting/api.pkg b/server/scripting/api.pkg index 7407cc9..af35487 100644 --- a/server/scripting/api.pkg +++ b/server/scripting/api.pkg @@ -418,6 +418,7 @@ module E { E_GAME_END @ GAME_END, E_GAME_START @ GAME_START, E_LOG_ERROR @ E_LOG_ERROR, + E_MESSAGE_WALL @ MESSAGE_WALL, E_NATION_SELECTED @ NATION_SELECTED, E_DESTROYED @ DESTROYED, E_REPORT @ REPORT, diff --git a/server/stdinhand.c b/server/stdinhand.c index 5d70406..0c24994 100644 --- a/server/stdinhand.c +++ b/server/stdinhand.c @@ -1628,7 +1628,7 @@ static bool explain_option(struct connection *caller, char *str, bool check) static bool wall(char *str, bool check) { if (!check) { - notify_conn(NULL, NULL, E_LOG_FATAL, + notify_conn(NULL, NULL, E_MESSAGE_WALL, _("Server Operator: %s"), str); } return TRUE;
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev