From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 10 Sep 2004 18:18:31 +0000 (+0000)
Subject: Use plain char * instead of s_char *.
X-Git-Tag: v4.2.19~119
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=9dbc1cb5e390e88f9a99bade892a9bed60edd734

Use plain char * instead of s_char *.
---

diff --git a/include/com.h b/include/com.h
index 8132597e8..6fe0db583 100644
--- a/include/com.h
+++ b/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;
diff --git a/include/file.h b/include/file.h
index b67b23dda..68e315bf8 100644
--- a/include/file.h
+++ b/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 */
diff --git a/include/item.h b/include/item.h
index 4e130879c..4b470516b 100644
--- a/include/item.h
+++ b/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 */
diff --git a/include/land.h b/include/land.h
index 39a19ff94..42e4c0908 100644
--- a/include/land.h
+++ b/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 */
diff --git a/include/news.h b/include/news.h
index 6539f059d..630edc9a5 100644
--- a/include/news.h
+++ b/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_ */
diff --git a/include/nuke.h b/include/nuke.h
index 323a8014e..4ccd3d3a9 100644
--- a/include/nuke.h
+++ b/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;
diff --git a/include/plane.h b/include/plane.h
index c9e9ed6d0..2fdc26ae0 100644
--- a/include/plane.h
+++ b/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;
diff --git a/include/sect.h b/include/sect.h
index a45044c15..795f5c2a8 100644
--- a/include/sect.h
+++ b/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 */
diff --git a/include/ship.h b/include/ship.h
index d88d0c6c8..227a0f844 100644
--- a/include/ship.h
+++ b/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 */
diff --git a/include/treaty.h b/include/treaty.h
index 763090e1b..784e636a4 100644
--- a/include/treaty.h
+++ b/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
diff --git a/src/lib/global/news.c b/src/lib/global/news.c
index 6ec625009..76f9db247 100644
--- a/src/lib/global/news.c
+++ b/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",