From: Pasi Kallinen <paxed@alt.org>
Date: Thu, 2 Apr 2015 11:04:31 +0000 (+0300)
Subject: Silence GCC warnings
X-Git-Tag: NetHack-3.6.0_RC01~492^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f150adf0ce3b7b4b7871a209e353d505614facf2;p=nethack

Silence GCC warnings
---

diff --git a/src/decl.c b/src/decl.c
index 2df304575..6529336b2 100644
--- a/src/decl.c
+++ b/src/decl.c
@@ -103,9 +103,9 @@ NEARDATA struct multishot m_shot = { 0, 0, STRANGE_OBJECT, FALSE };
 
 NEARDATA dungeon dungeons[MAXDUNGEON];	/* ini'ed by init_dungeon() */
 NEARDATA s_level *sp_levchn;
-NEARDATA stairway upstair = { 0, 0 }, dnstair = { 0, 0 };
-NEARDATA stairway upladder = { 0, 0 }, dnladder = { 0, 0 };
-NEARDATA stairway sstairs = { 0, 0 };
+NEARDATA stairway upstair = { 0, 0, { 0,0 }, 0 }, dnstair = { 0, 0, { 0,0 }, 0  };
+NEARDATA stairway upladder = { 0, 0, { 0,0 }, 0  }, dnladder = { 0, 0, { 0,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 dndest = { 0, 0, 0, 0, 0, 0, 0, 0 };
 NEARDATA coord inv_pos = { 0, 0 };
diff --git a/src/mklev.c b/src/mklev.c
index 5b4c9634a..5210d912b 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -537,7 +537,7 @@ STATIC_OVL void
 clear_level_structures()
 {
 	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 struct rm *lev;
 
diff --git a/src/mkmaze.c b/src/mkmaze.c
index fcd6a2df5..8a5b9b793 100644
--- a/src/mkmaze.c
+++ b/src/mkmaze.c
@@ -916,9 +916,9 @@ movebubbles()
 	register int x, y, i, j;
 	struct trap *btrap;
 	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 =
-		{ 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 */
 	if (!wportal) set_wportal();
diff --git a/src/sp_lev.c b/src/sp_lev.c
index 5e3799b4e..6c87da562 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -523,10 +523,9 @@ remove_boundary_syms()
 
 
 void
-maybe_add_door(x,y, droom, i,s)
+maybe_add_door(x,y, droom)
 int x,y;
 struct mkroom *droom;
-int i,s;
 {
     if (droom->hx >= 0 && doorindex < DOORMAX && inside_room(droom, x,y))
 	add_door(x, y, droom);
@@ -541,9 +540,9 @@ link_doors_rooms()
 	for (x = 0; x < COLNO; x++)
 	    if (IS_DOOR(levl[x][y].typ) || levl[x][y].typ == SDOOR) {
 		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++) {
-			maybe_add_door(x,y, rooms[tmpi].sbrooms[m], tmpi,m);
+			maybe_add_door(x,y, rooms[tmpi].sbrooms[m]);
 		    }
 		}
 	    }