Remove option TREATIES

[empserver] / src / lib / global / news.c

diff --git a/src/lib/global/news.c b/src/lib/global/news.c
index 1774af60eae0b2c037ff623ca3e3ec7b738d4c79..6623b2445dacf3896f44fddae9a7f67d41c1a8fe 100644 (file)
--- a/src/lib/global/news.c
+++ b/src/lib/global/news.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire 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 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,9 +25,9 @@
  *  ---
  *
  *  news.c: News item characteristics
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 /*
@@ -41,9 +40,7 @@
 
 #include <config.h>
 
-#include "misc.h"
 #include "news.h"
-#include "nsc.h"
 
 static char no_news[] = "does nothing in particular to %s";
 
@@ -58,8 +55,7 @@ struct rptstr rpt[] = {
                                 "spy captured and shot by %s" } },
     { N_SENT_TEL, 1,  N_TELE,  { "sends a telegram to %s",
                                 "telexes %s" } },
-    { N_SIGN_TRE, 3,  N_FOR,   { "diplomats sign a treaty with %s",
-                                "ambassador agrees to a treaty with %s" } },
+    { 5, 0, 0, { no_news, no_news } },
     { N_MAKE_LOAN, 2,  N_ECON,  { "bankers make a loan to %s",
                                  "Ministry of Finance lends money to %s" } },
     { N_REPAY_LOAN, 1,  N_ECON,  { "repays a loan from %s",
@@ -91,10 +87,8 @@ struct rptstr rpt[] = {
     { 20, 0, 0, { no_news, no_news } },
     { N_SEIZE_SECT, -2, N_ECON,  { "seizes a sector from %s to collect on a loan",
                                   "collects one of %s's sectors in repayment of a loan" } },
-    { N_HONOR_TRE, -1, N_FOR,   { "considers an action which would violate a treaty with %s",
-                                 "decides not to violate treaty with %s (yet)" } },
-    { N_VIOL_TRE, -4, N_FOR,   { "violates a treaty with %s",
-                                "actions violate treaty with %s" } },
+    { 22, 0, 0, { no_news, no_news } },
+    { 23, 0, 0, { no_news, no_news } },
     { 24, 0, 0, { no_news, no_news } },
     { N_HIT_MINE, 0,  N_SEA,   { "ship hits a mine",
                                 "ship severely damaged in mine field" } },
@@ -128,13 +122,13 @@ struct rptstr rpt[] = {
                               "continues its conquest of space with a successful launch" } },
     { N_SAT_KILL, -8, N_MISS,  { "strikes a %s big bird",
                                 "rockets damage a %s satellite" } },
-    { N_GIFT,  4, N_ECON,  { "makes a contribution to %s",
+    { N_GIFT,  0, N_ECON,  { "makes a contribution to %s",
                             "helps out %s" } },
-    { N_AIDS,  2, N_HOME,  { "aids %s with divine intervention",
+    { N_AIDS,  0, N_HOME,  { "aids %s with divine intervention",
                             "smiles upon %s" } },
-    { N_HURTS, -3, N_HOME,  { "hurts %s with divine intervention",
+    { N_HURTS,  0, N_HOME,  { "hurts %s with divine intervention",
                              "frowns upon %s" } },
-    { N_TAKE, -4, N_ECON,  { "sacrifices to %s",
+    { N_TAKE,  0, N_ECON,  { "sacrifices to %s",
                             "makes divine payment to %s" } },
     { N_NUKE_STOP, -10,N_MISS,  { "abms intercept a %s missile",
                                  "strategic defense systems destroy a %s missile" } },