diff --git a/include/land.h b/include/land.h index f5c405c3..343d4636 100644 --- a/include/land.h +++ b/include/land.h @@ -69,7 +69,7 @@ struct lndstr { u_char lnd_fuel; /* How much fuel do we have */ u_char lnd_nxlight; /* How many xlight planes on board? */ 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_scar; /* how experienced the unit is (not used) */ short lnd_item[I_MAX+1]; /* amount of items on board */ diff --git a/include/nat.h b/include/nat.h index 4530af91..cd0aa6eb 100644 --- a/include/nat.h +++ b/include/nat.h @@ -62,11 +62,11 @@ struct natstr { natid nat_cnum; /* our country number */ /* end of part matching struct genitem */ s_char nat_stat; /* inuse, norm, god, abs */ - s_char nat_cnam[20]; /* country name */ - s_char nat_pnam[20]; /* representative */ - s_char nat_hostaddr[32]; /* host addr of last user */ - s_char nat_hostname[512]; /* hostname of last user */ - s_char nat_userid[32]; /* userid of last user */ + char nat_cnam[20]; /* country name */ + char nat_pnam[20]; /* representative */ + char nat_hostaddr[32]; /* host addr of last user */ + char nat_hostname[512]; /* hostname of last user */ + char nat_userid[32]; /* userid of last user */ coord nat_xstart, nat_ystart; /* cap location at start */ coord nat_xcap, nat_ycap; /* cap location in abs coords */ coord nat_xorg, nat_yorg; /* origin location in abs coords */ diff --git a/include/player.h b/include/player.h index da42aa01..75b185be 100644 --- a/include/player.h +++ b/include/player.h @@ -47,10 +47,10 @@ struct player { struct emp_qelem queue; empth_t *proc; - s_char hostaddr[32]; - s_char hostname[512]; - s_char client[128]; - s_char userid[32]; + char hostaddr[32]; + char hostname[512]; /* may be empty */ + char client[128]; /* may be empty */ + char userid[32]; /* may be empty */ int validated; natid cnum; int state; diff --git a/include/ship.h b/include/ship.h index 56a2b966..398ddadc 100644 --- a/include/ship.h +++ b/include/ship.h @@ -94,9 +94,9 @@ struct shpstr { time_t shp_access; /* Last time mob was updated (MOB_ACCESS) */ time_t shp_timestamp; /* Last time this ship was touched. */ u_char shp_mobquota; /* mobility quota */ - s_char shp_path[MAXSHPPATH]; + char shp_path[MAXSHPPATH]; 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_nchoppers; /* How many choppers 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 */ natid shp_orig_own; /* Who built us */ int shp_rflags; /* When do I retreat? */ - s_char shp_rpath[RET_LEN]; /* retreat path */ + char shp_rpath[RET_LEN]; /* retreat path */ }; struct fltelemstr {