build warning
sp_lev.c: In function ‘lspo_altar’:
sp_lev.c:3962:9: warning: declaration of ‘shrine’ shadows a global
declaration [-Wshadow]
3962 | int shrine;
| ^~~~~~
In file included from ../include/hack.h:217,
from sp_lev.c:14:
../include/display.h:959:5: note: shadowed
declaration is here
959 | shrine
| ^~~~~~
This commit is contained in:
+1
-1
@@ -956,7 +956,7 @@ enum altar_types {
|
|||||||
altar_chaotic,
|
altar_chaotic,
|
||||||
altar_neutral,
|
altar_neutral,
|
||||||
altar_lawful,
|
altar_lawful,
|
||||||
shrine
|
altar_shrine
|
||||||
};
|
};
|
||||||
|
|
||||||
enum { GM_FLAGS, GM_TTYCHAR, GM_COLOR, NUM_GLYPHMOD }; /* glyphmod entries */
|
enum { GM_FLAGS, GM_TTYCHAR, GM_COLOR, NUM_GLYPHMOD }; /* glyphmod entries */
|
||||||
|
|||||||
+2
-2
@@ -329,7 +329,7 @@ tilename(int set, const int file_entry, int gend UNUSED)
|
|||||||
|
|
||||||
/* Altars */
|
/* Altars */
|
||||||
cmap = S_altar;
|
cmap = S_altar;
|
||||||
for (k = altar_unaligned; k <= shrine; k++) {
|
for (k = altar_unaligned; k <= altar_shrine; k++) {
|
||||||
/* Since defsyms only has one altar symbol,
|
/* Since defsyms only has one altar symbol,
|
||||||
it isn't much help in identifying details
|
it isn't much help in identifying details
|
||||||
these. Roll our own name. */
|
these. Roll our own name. */
|
||||||
@@ -889,7 +889,7 @@ init_tilemap(void)
|
|||||||
/* Altars */
|
/* Altars */
|
||||||
cmap = S_altar;
|
cmap = S_altar;
|
||||||
j = 0;
|
j = 0;
|
||||||
for (k = altar_unaligned; k <= shrine; k++) {
|
for (k = altar_unaligned; k <= altar_shrine; k++) {
|
||||||
offset = GLYPH_ALTAR_OFF + j;
|
offset = GLYPH_ALTAR_OFF + j;
|
||||||
precheck((offset), "altar");
|
precheck((offset), "altar");
|
||||||
tilemap[offset].tilenum = tilenum;
|
tilemap[offset].tilenum = tilenum;
|
||||||
|
|||||||
Reference in New Issue
Block a user