Lint cleanup, nothing significant.

There is one more new complaint that might cause problems:
explode.c(545): warning: conversion from long may lose accuracy
This commit is contained in:
jwalz
2003-02-19 03:18:49 +00:00
parent 39e11412b0
commit 6689de0e04
7 changed files with 12 additions and 8 deletions

View File

@@ -293,6 +293,7 @@ int whichprefix, buffnum;
} }
/* reasonbuf must be at least BUFSZ, supplied by caller */ /* reasonbuf must be at least BUFSZ, supplied by caller */
/*ARGSUSED*/
int int
validate_prefix_locations(reasonbuf) validate_prefix_locations(reasonbuf)
char *reasonbuf; char *reasonbuf;
@@ -923,6 +924,7 @@ restore_saved_game()
return fd; return fd;
} }
/*ARGSUSED*/
static char* static char*
plname_from_file(filename) plname_from_file(filename)
const char* filename; const char* filename;
@@ -1014,8 +1016,8 @@ char** saved;
{ {
if ( saved ) { if ( saved ) {
int i=0; int i=0;
while (saved[i]) free(saved[i++]); while (saved[i]) free((genericptr_t)saved[i++]);
free(saved); free((genericptr_t)saved);
} }
} }

View File

@@ -805,7 +805,7 @@ boolean guess;
u.dy = sgn(u.ty - u.uy); u.dy = sgn(u.ty - u.uy);
if (test_move(u.ux, u.uy, u.dx, u.dy, TEST_MOVE)) if (test_move(u.ux, u.uy, u.dx, u.dy, TEST_MOVE))
return TRUE; return TRUE;
goto done; goto found;
} }
tx = px; tx = px;
ty = py; ty = py;
@@ -819,7 +819,7 @@ boolean guess;
return FALSE; return FALSE;
} }
done: found:
u.dx = 0; u.dx = 0;
u.dy = 0; u.dy = 0;
nomul(0); nomul(0);

View File

@@ -577,7 +577,7 @@ mdamagem(magr, mdef, mattk)
boolean cancelled; boolean cancelled;
if (touch_petrifies(pd) && !resists_ston(magr)) { if (touch_petrifies(pd) && !resists_ston(magr)) {
long protector = attk_protection(mattk->aatyp), long protector = attk_protection((int)mattk->aatyp),
wornitems = magr->misc_worn_check; wornitems = magr->misc_worn_check;
/* wielded weapon gives same protection as gloves here */ /* wielded weapon gives same protection as gloves here */

View File

@@ -2434,7 +2434,7 @@ register struct attack *mattk;
goto assess_dmg; goto assess_dmg;
case AD_STON: /* cockatrice */ case AD_STON: /* cockatrice */
{ {
long protector = attk_protection(mattk->aatyp), long protector = attk_protection((int)mattk->aatyp),
wornitems = mtmp->misc_worn_check; wornitems = mtmp->misc_worn_check;
/* wielded weapon gives same protection as gloves here */ /* wielded weapon gives same protection as gloves here */

View File

@@ -1153,7 +1153,7 @@ register struct obj *otmp;
break; break;
case WAN_CANCELLATION: case WAN_CANCELLATION:
case SPE_CANCELLATION: case SPE_CANCELLATION:
cancel_monst(mtmp, otmp, FALSE, TRUE, FALSE); (void) cancel_monst(mtmp, otmp, FALSE, TRUE, FALSE);
break; break;
} }
if (reveal_invis) { if (reveal_invis) {

View File

@@ -353,6 +353,7 @@ register int trouble;
else if (Cursed_obj(uarmf, FUMBLE_BOOTS)) else if (Cursed_obj(uarmf, FUMBLE_BOOTS))
otmp = uarmf; otmp = uarmf;
goto decurse; goto decurse;
/*NOTREACHED*/
break; break;
case TROUBLE_CURSED_ITEMS: case TROUBLE_CURSED_ITEMS:
otmp = worst_cursed_item(); otmp = worst_cursed_item();

View File

@@ -711,6 +711,7 @@ int thrown;
shk_your(yourbuf, obj)); shk_your(yourbuf, obj));
useup(obj); useup(obj);
return(TRUE); return(TRUE);
/*NOTREACHED*/
break; break;
#endif #endif
case CORPSE: /* fixed by polder@cs.vu.nl */ case CORPSE: /* fixed by polder@cs.vu.nl */
@@ -2138,7 +2139,7 @@ uchar aatyp;
break; break;
case AD_STON: case AD_STON:
if (mhit) { /* successful attack */ if (mhit) { /* successful attack */
long protector = attk_protection(aatyp); long protector = attk_protection((int)aatyp);
/* hero using monsters' AT_MAGC attack is hitting hand to /* hero using monsters' AT_MAGC attack is hitting hand to
hand rather than casting a spell */ hand rather than casting a spell */