shadowed declaration warning

<Someone> complained that his compiler was giving these
warnings:
cmd.c:2119: warning: declaration of `expl' shadows a global declaration
dungeon.c:292: warning: declaration of `rand' shadows a global declaration
exper.c💯 warning: declaration of `exp' shadows a global declaration
files.c:278: warning: declaration of `basename' shadows a global declaration
hack.c:1102: warning: declaration of `expl' shadows a global declaration
pickup.c:2081: warning: declaration of `select' shadows a global declaration
role.c:1060: warning: declaration of `conj' shadows a global declaration
This commit is contained in:
nethack.allison
2004-12-16 00:20:54 +00:00
parent 9bc23ab484
commit 28a1a41668
8 changed files with 38 additions and 38 deletions

View File

@@ -97,20 +97,20 @@ experience(mtmp, nk) /* return # of exp points for mtmp after nk killed */
}
void
more_experienced(exp, rexp)
register int exp, rexp;
more_experienced(exper, rexp)
register int exper, rexp;
{
long newexp = u.uexp + exp;
long rexpincr = 4*exp + rexp;
long newexp = u.uexp + exper;
long rexpincr = 4*exper + rexp;
long newrexp = u.urexp + rexpincr;
/* cap experience and score on wraparound */
if (newexp < 0 && exp > 0) newexp = LONG_MAX;
if (newexp < 0 && exper > 0) newexp = LONG_MAX;
if (newrexp < 0 && rexpincr > 0) newrexp = LONG_MAX;
u.uexp = newexp;
u.urexp = newrexp;
if(exp
if(exper
#ifdef SCORE_ON_BOTL
|| flags.showscore
#endif