Silence GCC warnings

diff --git a/src/decl.c b/src/decl.c
index 2df304575647e281cf6d1d56e754acd34a4ba945..6529336b24283b3b0394a8007161acd2464d3547 100644 (file)
--- 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 5b4c9634a16761a0eed481e60edd6b37135a647a..5210d912b219d0ef20616ee3a6c2dd8e712c5f10 100644 (file)
--- 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 fcd6a2df58c3ecf8f2a304551d690c5f3d8e7321..8a5b9b7939eedc92c61cbfc1b5262783fa6edfdd 100644 (file)
--- 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 5e3799b4efae5b30e53117980cb5fdd051312107..6c87da56242c3c48d5930c94885c5b4076babf00 100644 (file)
--- 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]);
                    }
                }
            }