(N_FLAK, N_DISS_GOV, N_DECL_NEUT, N_RIOT, N_ASSAULT_LOSE): Unused,

remove.
(no_news): new.
(rpt): Use it for r_newsstory of unused slots.

diff --git a/include/news.h b/include/news.h
index 820daed86d7b9df7c384e617de46dea7a7b1f62a..074227b7bb72ecbf19896a2c196e4e2fe2146abd 100644 (file)
--- a/include/news.h
+++ b/include/news.h
@@ -79,14 +79,14 @@ struct rptstr {
 #define        N_SHP_BOMB      17
 #define        N_BOARD_SHIP    18
 #define        N_SHP_LOSE      19
-#define        N_FLAK          20
+/* unused              20 */
 #define        N_SEIZE_SECT    21
 #define        N_HONOR_TRE     22
 #define        N_VIOL_TRE      23
-#define        N_DISS_GOV      24
+/* unused              24 */
 #define        N_HIT_MINE      25
 #define        N_DECL_ALLY     26
-#define        N_DECL_NEUT     27
+/* unused              27 */
 #define        N_DECL_WAR      28
 #define        N_DIS_ALLY      29
 #define        N_DIS_WAR       30
@@ -94,7 +94,7 @@ struct rptstr {
 #define        N_DIE_PLAGUE    32
 #define        N_NAME_CHNG     33
 #define        N_DIE_FAMINE    34
-#define        N_RIOT          35
+/* unused              35 */
 #define        N_DOWN_PLANE    36
 #define        N_NUKE          37
 #define N_FREEDOM_FIGHT        38
@@ -113,7 +113,7 @@ struct rptstr {
 #define N_PIRATE_KEEP  51
 #define        N_SHIP_TORP     52
 #define N_SUB_BOMB     53
-#define N_ASSAULT_LOSE 54
+/* unused              54 */
 #define N_UNIT_BOMB    55
 #define        N_LHIT_MINE     56
 #define        N_FIRE_F_ATTACK 57

diff --git a/info/Commands/newspaper.t b/info/Commands/newspaper.t
index cef7361d3033742ab5b8beec13b80d81f8793a21..94f26be88497659676bad0a58b6d3619c57d27a0 100644 (file)
--- a/info/Commands/newspaper.t
+++ b/info/Commands/newspaper.t
@@ -43,14 +43,11 @@ and what news to see with the ?action selector.  Actions are:
      17) Planes bombing ships           
      18) Successful boarding actions    
      19) Unsuccessful boarding actions  
-     20) AA fire                        
      21) Collecting on loans            
      22) Considering treaty violation   
      23) Actual treaty violation        
-     24) Country dissolving             
      25) Ships hitting mines            
      26) Alliance declaration            
-     27) Neutrality declaration         
      28) War declarations               
      29) Alliance dissolving
      30) War ending
@@ -58,7 +55,6 @@ and what news to see with the ?action selector.  Actions are:
      32) Plague deaths
      33) Name changes
      34) Starvation
-     35) Rioting (from dissolving)
      36) Air to air combat
      37) Nukes going off
      38) Terrorists
@@ -77,7 +73,6 @@ and what news to see with the ?action selector.  Actions are:
      51) Pirates keep loot
      52) Ship torps ship
      53) Sub bombed by ASW plane
-     54) Assault defeated
      55) Unit bombed
      56) Unit hits land mine
      57) Fortress artillery supports attack

diff --git a/src/lib/global/news.c b/src/lib/global/news.c
index 371b7228100159002f05327d6b53fa63b25c4a26..3def09bf2b41afd0a7f8762b2bcb09c0c79c50fc 100644 (file)
--- a/src/lib/global/news.c
+++ b/src/lib/global/news.c
@@ -56,10 +56,11 @@ char *page_headings[N_MAX_PAGE + 1] = {
 /* N_TELE   */ "Telecommunications"
 };
 
+static char no_news[] = "does nothing in particular to %s";
+
 struct rptstr rpt[N_MAX_VERB + 1] = {
 /*  nice  page     text */
-    { 0,  0,      { "does nothing in particular to %s",
-/*  0*/                     "does nothing to %s" } },
+/*  0*/ { 0,  0, { no_news, no_news } },
     { -4, N_FRONT, { "infantry capture %s territory",
 /*  1*/                     "shock troops overrun one of %s's sectors" } },
     { -4, N_FRONT, { "infantry beaten back by %s troops",
@@ -98,22 +99,19 @@ struct rptstr rpt[N_MAX_VERB + 1] = {
 /* 18*/                     "pirates board %s ship" } },
     { -3, N_SEA,   { "is repelled by %s while attempting to board a ship",
 /* 19*/                     "pirates prove inept at boarding %s's ships" } },
-    { -1, N_SKY,   { "anti-aircraft gunners fire on %s airforce",
-/* 20*/                     "attempts to shoot down %s aircraft" } },
+/* 20*/ { 0, 0, { no_news, no_news } },
     { -2, N_ECON,  { "seizes a sector from %s to collect on a loan",
 /* 21*/                     "collects one of %s's sectors in repayment of a loan" } },
     { -1, N_FOR,   { "considers an action which would violate a treaty with %s",
 /* 22*/                     "decides not to violate treaty with %s (yet)" } },
     { -4, N_FOR,   { "violates a treaty with %s",
 /* 23*/                     "actions violate treaty with %s" } },
-    { 0,  N_FOR,   { "dissolves its government",
-/* 24*/                     "throws in the towel" } },
+/* 24*/ { 0, 0, { no_news, no_news } },
     { 0,  N_SEA,   { "ship hits a mine",
 /* 25*/                     "ship severely damaged in mine field" } },
     { 5,  N_FOR,   { "announces an alliance with %s",
 /* 26*/                     "/ %s alliance declared" } },
-    { 0,  N_FOR,   { "declares their neutrality toward %s", /* no longer used */
-/* 27*/                     "announces neutral relations with %s" } },
+/* 27*/ { 0, 0, { no_news, no_news } },
     { -5, N_FOR,   { "declares TOTAL WAR on %s",
 /* 28*/                     "gets serious with %s and declares WAR" } },
     { 0,  N_FOR,   { "diplomats disavow former alliance with %s",
@@ -128,8 +126,7 @@ struct rptstr rpt[N_MAX_VERB + 1] = {
 /* 33*/                     "adopts a new country name" } },
     { 0,  N_HOME,  { "citizens starve in disastrous famine",
 /* 34*/                     "loses citizens to mass starvation" } },
-    { 0,  N_HOME,  { "endures lawless rioting",
-/* 35*/                     "suffers from outbreaks of rioting" } },
+/* 35*/ { 0, 0, { no_news, no_news } },
     { -3, N_SKY,   { "pilots down %s planes",
 /* 36*/                     "victorious in air-to-air combat against %s" } },
     { -10,N_MISS,  { "nuclear device devastates %s sector",
@@ -166,8 +163,7 @@ struct rptstr rpt[N_MAX_VERB + 1] = {
 /* 52*/                     "ships sunk by marauding %s torpedo-boats" } },
     {  0, N_SEA,   { "planes bomb a skulking %s submarine",
 /* 53*/                     "planes drop depth-charges on a %s sub" } },
-    { -2, N_SEA,    { "ship is blown up in a failed assault on %s",
-/* 54*/                     "has a ship destroyed while assaulting %s" } },
+/* 54*/ { 0, 0, { no_news, no_news } },
     { -2, N_SKY,   { "divebombs a brave %s unit",
 /* 55*/                     "airforce bombs %s units" } },
     { 0,  N_FRONT, { "troops run afoul of a landmine",