Make pre-ANSI compiler happy.

This commit is contained in:
jwalz
2002-03-09 01:59:47 +00:00
parent 04ee82d87d
commit e833424555
5 changed files with 12 additions and 10 deletions
+1 -1
View File
@@ -1048,7 +1048,7 @@ minimal_enlightenment()
anything any; anything any;
char buf[BUFSZ], buf2[BUFSZ]; char buf[BUFSZ], buf2[BUFSZ];
static char fmtstr[] = "%-15s: %-12s"; static char fmtstr[] = "%-15s: %-12s";
char deity_fmtstr[] = "%-17s%s"; static char deity_fmtstr[] = "%-17s%s";
any.a_void = 0; any.a_void = 0;
buf[0] = buf2[0] = '\0'; buf[0] = buf2[0] = '\0';
+6 -6
View File
@@ -1617,7 +1617,7 @@ goodfruit:
prefix_val = -1; prefix_val = -1;
while (*op && num < sizeof flags.end_disclose - 1) { while (*op && num < sizeof flags.end_disclose - 1) {
register char c, *dop; register char c, *dop;
char valid_settings[] = { static char valid_settings[] = {
DISCLOSE_PROMPT_DEFAULT_YES, DISCLOSE_PROMPT_DEFAULT_YES,
DISCLOSE_PROMPT_DEFAULT_NO, DISCLOSE_PROMPT_DEFAULT_NO,
DISCLOSE_YES_WITHOUT_PROMPT, DISCLOSE_YES_WITHOUT_PROMPT,
@@ -2379,7 +2379,7 @@ boolean setinitial,setfromfile;
* The order of disclose_names[] * The order of disclose_names[]
* must correspond to disclosure_options in decl.h * must correspond to disclosure_options in decl.h
*/ */
const char *disclosure_names[] = { static const char *disclosure_names[] = {
"inventory", "attributes", "vanquished", "genocides", "conduct" "inventory", "attributes", "vanquished", "genocides", "conduct"
}; };
int disc_cat[NUM_DISCLOSURE_OPTIONS]; int disc_cat[NUM_DISCLOSURE_OPTIONS];
@@ -3146,15 +3146,15 @@ char *op;
int j; int j;
char buf[BUFSZ]; char buf[BUFSZ];
char *wn, *tfg, *tbg, *newop; char *wn, *tfg, *tbg, *newop;
char *wnames[] = {"menu", "message", "status", "text"}; static char *wnames[] = {"menu", "message", "status", "text"};
char *shortnames[] = {"mnu", "msg", "sts", "txt"}; static char *shortnames[] = {"mnu", "msg", "sts", "txt"};
char **fgp[] = { static char **fgp[] = {
&iflags.wc_foregrnd_menu, &iflags.wc_foregrnd_menu,
&iflags.wc_foregrnd_message, &iflags.wc_foregrnd_message,
&iflags.wc_foregrnd_status, &iflags.wc_foregrnd_status,
&iflags.wc_foregrnd_text &iflags.wc_foregrnd_text
}; };
char **bgp[] = { static char **bgp[] = {
&iflags.wc_backgrnd_menu, &iflags.wc_backgrnd_menu,
&iflags.wc_backgrnd_message, &iflags.wc_backgrnd_message,
&iflags.wc_backgrnd_status, &iflags.wc_backgrnd_status,
+1 -1
View File
@@ -366,7 +366,7 @@ tactics(mtmp)
} }
} }
} }
/* NOTREACHED */ /*NOTREACHED*/
return(0); return(0);
} }
+3 -1
View File
@@ -701,7 +701,9 @@ boolean polyspot;
/* currently only does speed boots, but might be expanded if monsters get to /* currently only does speed boots, but might be expanded if monsters get to
use more armor abilities */ use more armor abilities */
static int static int
extra_pref(struct monst *mon, struct obj *obj) extra_pref(mon, obj)
struct monst *mon;
struct obj *obj;
{ {
if (obj) { if (obj) {
if (obj->otyp == SPEED_BOOTS && mon->permspeed != MFAST) if (obj->otyp == SPEED_BOOTS && mon->permspeed != MFAST)
+1 -1
View File
@@ -216,7 +216,7 @@ int set, entry;
i = entry - tilenum; i = entry - tilenum;
if (i < (MAXEXPCHARS * EXPL_MAX)) { if (i < (MAXEXPCHARS * EXPL_MAX)) {
if (set == OTH_GLYPH) { if (set == OTH_GLYPH) {
char *explosion_types[] = { /* hack.h */ static char *explosion_types[] = { /* hack.h */
"dark", "noxious", "muddy", "wet", "dark", "noxious", "muddy", "wet",
"magical", "fiery", "frosty" "magical", "fiery", "frosty"
}; };