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

@@ -5,7 +5,7 @@
#include "hack.h"
/* Note: Arrays are column first, while the screen is row first */
static int expl[3][3] = {
static int explosion[3][3] = {
{ S_explode1, S_explode4, S_explode7 },
{ S_explode2, S_explode5, S_explode8 },
{ S_explode3, S_explode6, S_explode9 }
@@ -189,7 +189,7 @@ int expltype;
for (i=0; i<3; i++) for (j=0; j<3; j++) {
if (explmask[i][j] == 2) continue;
tmp_at(starting ? DISP_BEAM : DISP_CHANGE,
explosion_to_glyph(expltype,expl[i][j]));
explosion_to_glyph(expltype,explosion[i][j]));
tmp_at(i+x-1, j+y-1);
starting = 0;
}
@@ -215,7 +215,7 @@ int expltype;
for (i=0; i<3; i++) for (j=0; j<3; j++) {
if (explmask[i][j] == 1)
show_glyph(i+x-1,j+y-1,
explosion_to_glyph(expltype, expl[i][j]));
explosion_to_glyph(expltype, explosion[i][j]));
}
} else { /* delay a little bit. */