Use plain char * instead of s_char *.

include/com.h

@@ -35,7 +35,7 @@
 #define _COM_H_
 
 struct cmndstr {
-    s_char *c_form;		/* prototype of command */
+    char *c_form;		/* prototype of command */
     int c_cost;			/* btu cost of command */
     int (*c_addr)(void);	/* core addr of appropriate routine */
     int c_flags;

include/file.h

@@ -37,8 +37,8 @@
 #include <stddef.h>
 
 struct empfile {
-    s_char *name;		/* file name (e.g., "treaty") */
-    s_char *file;		/* file path */
+    char *name;			/* file name (e.g., "treaty") */
+    char *file;			/* file path */
     int flags;			/* misc stuff */
     int mode;			/* O_flags */
     int size;			/* size of object */

include/item.h

@@ -53,7 +53,7 @@ struct ichrstr {
     int i_sell;			/* can this be sold? */
     int i_lbs;			/* how hard to move */
     int i_pkg[NUMPKG];		/* units for reg, ware, urb, bank */
-    s_char *i_name;		/* full name of item */
+    char *i_name;		/* full name of item */
 };
 
 /* variables using this structure */

include/land.h

@@ -100,7 +100,7 @@ struct lndstr {
 
 struct lchrstr {
     u_short l_item[I_MAX+1];	/* load limit */
-    s_char *l_name;		/* full name of type of land unit */
+    char *l_name;		/* full name of type of land unit */
     int l_lcm;			/* units of lcm to build */
     int l_hcm;			/* units of hcm to build */
     int l_mil;			/* how many mil it takes to build */

include/news.h

@@ -56,7 +56,7 @@ struct nwsstr {
 struct rptstr {
     int r_good_will;		/* how "nice" the action is */
     int r_newspage;		/* which page this item belongs on */
-    s_char *r_newstory[NUM_RPTS];	/* texts for fmt( */
+    char *r_newstory[NUM_RPTS];	/* texts for fmt( */
 };
 
 	/* news verbs */
@@ -165,6 +165,6 @@ struct rptstr {
 	(struct nwsstr *) ef_ptr(EF_NEWS, n)
 
 extern struct rptstr rpt[];
-extern s_char *page_headings[];
+extern char *page_headings[];
 
 #endif /* _NEWS_H_ */

include/nuke.h

@@ -50,7 +50,7 @@ struct nukstr {
 };
 
 struct nchrstr {
-    s_char *n_name;		/* warhead unit name */
+    char *n_name;		/* warhead unit name */
     int n_lcm;			/* costs to build */
     int n_hcm;
     int n_oil;

include/plane.h

@@ -82,7 +82,7 @@ struct plnstr {
 #define	PLN_AIRBURST	bit(2)	/* Airburst the nuke we're armed with */
 
 struct plchrstr {
-    s_char *pl_name;		/* full name of type of plane */
+    char *pl_name;		/* full name of type of plane */
     int pl_lcm;			/* costs to build */
     int pl_hcm;
     int pl_cost;

include/sect.h

@@ -92,7 +92,7 @@ struct dchrstr {
     int d_mnem;			/* map symbol */
     int d_prd;			/* product type */
     int d_mcst;			/* movement cost */
-    int d_flg;			/* movement cost */
+    int d_flg;			/* movement flags */
     i_packing d_pkg;		/* type of packaging in these sects */
     float d_ostr;		/* offensive strength */
     float d_dstr;		/* defensive strength */
@@ -101,7 +101,7 @@ struct dchrstr {
     int d_build;		/* cost multiplier for eff */
     int d_lcms;			/* lcm's needed per point of eff */
     int d_hcms;			/* hcm's needed per point of eff */
-    s_char *d_name;		/* full name of sector type */
+    char *d_name;		/* full name of sector type */
 };
 
 /* for d_flg */

include/ship.h

@@ -141,7 +141,7 @@ struct mchrstr {
     u_char m_nchoppers;		/* maximum number of choppers */
     u_char m_fuelc;		/* fuel capacity */
     u_char m_fuelu;		/* fuel used per 10 mob */
-    s_char *m_name;		/* full name of type of ship */
+    char *m_name;		/* full name of type of ship */
     int m_tech;			/* tech required to build */
     int m_cost;			/* how much it costs to build */
     long m_flags;		/* what special things can this ship do */

include/treaty.h

@@ -48,7 +48,7 @@ struct trtstr {
 
 struct tchrstr {
     int t_cond;			/* bit to indicate this clause */
-    s_char *t_name;		/* description of clause */
+    char *t_name;		/* description of clause */
 };
 
 #define TS_FREE		0

src/lib/global/news.c

@@ -41,7 +41,7 @@
 #include "misc.h"
 #include "news.h"
 
-s_char *page_headings[N_MAX_PAGE + 1] = {
+char *page_headings[N_MAX_PAGE + 1] = {
 /* not used */ "Comics",
 /* N_FOR    */ "Foreign Affairs",
 /* N_FRONT  */ "The Front Line",