<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40183 >

> [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. ;)


---------------------------------------------------------------------
急がなきゃ。急がなきゃ。急がなきゃ。
>From 3963f1a831b0828418fe5a022620c6d3f4c4f161 Mon Sep 17 00:00:00 2001
From: Madeline Book <[EMAIL PROTECTED]>
Date: Thu, 3 Apr 2008 19:26:39 -0500
Subject: [PATCH] Re-added E_MESSAGE_WALL and fixed /wall command.

---
 common/events.c          |    1 +
 common/events.h          |    1 +
 server/scripting/api.pkg |    1 +
 server/stdinhand.c       |    2 +-
 4 files changed, 4 insertions(+), 1 deletions(-)

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..ca6f65b 100644
--- a/common/events.h
+++ b/common/events.h
@@ -123,6 +123,7 @@ enum event_type {
   E_CONNECTION,			/* Messages about acquired or lost connections */
   E_AI_DEBUG,			/* AI debugging messages */
   E_LOG_ERROR,			/* Warning messages */
+  E_MESSAGE_WALL,		/* Message from server operator */
   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..13ef69b 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 @ E_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;
-- 
1.5.3.8

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to