nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Silence GCC warnings

Browse Source
This commit is contained in:
Pasi Kallinen
2015-04-02 14:04:31 +03:00
parent 884d9d4be5
commit f150adf0ce
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decl.c
+3 -3
View File
@@ -103,9 +103,9 @@ NEARDATA struct multishot m_shot = { 0, 0, STRANGE_OBJECT, FALSE };
NEARDATA dungeon dungeons[MAXDUNGEON]; /* ini'ed by init_dungeon() */ NEARDATA dungeon dungeons[MAXDUNGEON]; /* ini'ed by init_dungeon() */
NEARDATA s_level *sp_levchn; NEARDATA s_level *sp_levchn;
NEARDATA stairway upstair = { 0, 0 }, dnstair = { 0, 0 }; NEARDATA stairway upstair = { 0, 0, { 0,0 }, 0 }, dnstair = { 0, 0, { 0,0 }, 0 };
NEARDATA stairway upladder = { 0, 0 }, dnladder = { 0, 0 }; NEARDATA stairway upladder = { 0, 0, { 0,0 }, 0 }, dnladder = { 0, 0, { 0,0 }, 0 };
NEARDATA stairway sstairs = { 0, 0 }; NEARDATA stairway sstairs = { 0, 0, { 0,0 }, 0 };
NEARDATA dest_area updest = { 0, 0, 0, 0, 0, 0, 0, 0 }; NEARDATA dest_area updest = { 0, 0, 0, 0, 0, 0, 0, 0 };
NEARDATA dest_area dndest = { 0, 0, 0, 0, 0, 0, 0, 0 }; NEARDATA dest_area dndest = { 0, 0, 0, 0, 0, 0, 0, 0 };
NEARDATA coord inv_pos = { 0, 0 }; NEARDATA coord inv_pos = { 0, 0 };
src/mklev.c
+1 -1
View File
@@ -537,7 +537,7 @@ STATIC_OVL void
clear_level_structures() clear_level_structures()
{ {
static struct rm zerorm = { cmap_to_glyph(S_stone), static struct rm zerorm = { cmap_to_glyph(S_stone),
0, 0, 0, 0, 0, 0, 0, 0 }; 0, 0, 0, 0, 0, 0, 0, 0, 0 };
register int x,y; register int x,y;
register struct rm *lev; register struct rm *lev;
src/mkmaze.c
+2 -2
View File
@@ -916,9 +916,9 @@ movebubbles()
register int x, y, i, j; register int x, y, i, j;
struct trap *btrap; struct trap *btrap;
static const struct rm water_pos = static const struct rm water_pos =
{ cmap_to_glyph(S_water), WATER, 0, 0, 0, 0, 0, 0, 0 }; { cmap_to_glyph(S_water), WATER, 0, 0, 0, 0, 0, 0, 0, 0 };
static const struct rm air_pos = static const struct rm air_pos =
{ cmap_to_glyph(S_cloud), AIR, 0, 0, 0, 1, 0, 0, 0 }; { cmap_to_glyph(S_cloud), AIR, 0, 0, 0, 1, 0, 0, 0, 0 };
/* set up the portal the first time bubbles are moved */ /* set up the portal the first time bubbles are moved */
if (!wportal) set_wportal(); if (!wportal) set_wportal();
src/sp_lev.c
+3 -4
View File
@@ -523,10 +523,9 @@ remove_boundary_syms()
void void
maybe_add_door(x,y, droom, i,s) maybe_add_door(x,y, droom)
int x,y; int x,y;
struct mkroom *droom; struct mkroom *droom;
int i,s;
{ {
if (droom->hx >= 0 && doorindex < DOORMAX && inside_room(droom, x,y)) if (droom->hx >= 0 && doorindex < DOORMAX && inside_room(droom, x,y))
add_door(x, y, droom); add_door(x, y, droom);
@@ -541,9 +540,9 @@ link_doors_rooms()
for (x = 0; x < COLNO; x++) for (x = 0; x < COLNO; x++)
if (IS_DOOR(levl[x][y].typ) || levl[x][y].typ == SDOOR) { if (IS_DOOR(levl[x][y].typ) || levl[x][y].typ == SDOOR) {
for (tmpi = 0; tmpi < nroom; tmpi++) { for (tmpi = 0; tmpi < nroom; tmpi++) {
maybe_add_door(x,y, &rooms[tmpi], tmpi,-1); maybe_add_door(x,y, &rooms[tmpi]);
for (m = 0; m < rooms[tmpi].nsubrooms; m++) { for (m = 0; m < rooms[tmpi].nsubrooms; m++) {
maybe_add_door(x,y, rooms[tmpi].sbrooms[m], tmpi,m); maybe_add_door(x,y, rooms[tmpi].sbrooms[m]);
} }
} }
} }