empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(lndstr, natstr, shpstr): Fix string types from s_char[] to char[].

Browse source 
They were declared NSC_STRINGY in their selector descriptors, and
NSC_STRINGY is specified to represent char[].
(player): Get rid of s_char.
This commit is contained in:
Markus Armbruster 2005-10-03 10:35:44 +00:00
parent 30a4437714
commit 717b8e96be
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/land.h
View file

@ -69,7 +69,7 @@ struct lndstr {
u_char lnd_fuel; /* How much fuel do we have */ u_char lnd_fuel; /* How much fuel do we have */
u_char lnd_nxlight; /* How many xlight planes on board? */ u_char lnd_nxlight; /* How many xlight planes on board? */
int lnd_rflags; /* When do I retreat? */ int lnd_rflags; /* When do I retreat? */
s_char lnd_rpath[RET_LEN]; /* retreat path */ char lnd_rpath[RET_LEN]; /* retreat path */
u_char lnd_rad_max; /* max radius for this unit */ u_char lnd_rad_max; /* max radius for this unit */
u_char lnd_scar; /* how experienced the unit is (not used) */ u_char lnd_scar; /* how experienced the unit is (not used) */
short lnd_item[I_MAX+1]; /* amount of items on board */ short lnd_item[I_MAX+1]; /* amount of items on board */

10
include/nat.h
View file

@ -62,11 +62,11 @@ struct natstr {
natid nat_cnum; /* our country number */ natid nat_cnum; /* our country number */
/* end of part matching struct genitem */ /* end of part matching struct genitem */
s_char nat_stat; /* inuse, norm, god, abs */ s_char nat_stat; /* inuse, norm, god, abs */
s_char nat_cnam[20]; /* country name */ char nat_cnam[20]; /* country name */
s_char nat_pnam[20]; /* representative */ char nat_pnam[20]; /* representative */
s_char nat_hostaddr[32]; /* host addr of last user */ char nat_hostaddr[32]; /* host addr of last user */
s_char nat_hostname[512]; /* hostname of last user */ char nat_hostname[512]; /* hostname of last user */
s_char nat_userid[32]; /* userid of last user */ char nat_userid[32]; /* userid of last user */
coord nat_xstart, nat_ystart; /* cap location at start */ coord nat_xstart, nat_ystart; /* cap location at start */
coord nat_xcap, nat_ycap; /* cap location in abs coords */ coord nat_xcap, nat_ycap; /* cap location in abs coords */
coord nat_xorg, nat_yorg; /* origin location in abs coords */ coord nat_xorg, nat_yorg; /* origin location in abs coords */

8
include/player.h
View file

@ -47,10 +47,10 @@
struct player { struct player {
struct emp_qelem queue; struct emp_qelem queue;
empth_t *proc; empth_t *proc;
s_char hostaddr[32]; char hostaddr[32];
s_char hostname[512]; char hostname[512]; /* may be empty */
s_char client[128]; char client[128]; /* may be empty */
s_char userid[32]; char userid[32]; /* may be empty */
int validated; int validated;
natid cnum; natid cnum;
int state; int state;

6
include/ship.h
View file

@ -94,9 +94,9 @@ struct shpstr {
time_t shp_access; /* Last time mob was updated (MOB_ACCESS) */ time_t shp_access; /* Last time mob was updated (MOB_ACCESS) */
time_t shp_timestamp; /* Last time this ship was touched. */ time_t shp_timestamp; /* Last time this ship was touched. */
u_char shp_mobquota; /* mobility quota */ u_char shp_mobquota; /* mobility quota */
s_char shp_path[MAXSHPPATH]; char shp_path[MAXSHPPATH];
short shp_follow; short shp_follow;
s_char shp_name[MAXSHPNAMLEN]; /* name set with the "name" command */ char shp_name[MAXSHPNAMLEN]; /* name set with the "name" command */
u_char shp_fuel; /* How much fuel do we have */ u_char shp_fuel; /* How much fuel do we have */
u_char shp_nchoppers; /* How many choppers on board? */ u_char shp_nchoppers; /* How many choppers on board? */
u_char shp_nxlight; /* How many xlight planes on board? */ u_char shp_nxlight; /* How many xlight planes on board? */
@ -104,7 +104,7 @@ struct shpstr {
coord shp_orig_y; /* Where we were built */ coord shp_orig_y; /* Where we were built */
natid shp_orig_own; /* Who built us */ natid shp_orig_own; /* Who built us */
int shp_rflags; /* When do I retreat? */ int shp_rflags; /* When do I retreat? */
s_char shp_rpath[RET_LEN]; /* retreat path */ char shp_rpath[RET_LEN]; /* retreat path */
}; };
struct fltelemstr { struct fltelemstr {