Fix: Fill in missing S_bridge code (reported by cbus)

elunna · Nov 15, 2023 · 734e3b3 · 734e3b3
1 parent 769da4b
commit 734e3b3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
@@ -4617,6 +4617,7 @@ g	S_gremlin	(gremlin)
 h	S_humanoid	(humanoid)
 \-	S_hwall	(horizontal wall)
 \.	S_ice	(ice)
+\.	S_bridge (bridge)
 \,	S_grass	(grass)
 i	S_imp	(imp or minor demon)
 I	S_invisible	(invisible monster)

diff --git a/doc/Guidebook.txt b/doc/Guidebook.txt
@@ -5343,6 +5343,7 @@
 
           -  S_hwall                (horizontal wall)
           .  S_ice                  (ice)
+          .  S_bridge               (bridge)
           i  S_imp                  (imp or minor demon)
           I  S_invisible            (invisible monster)
           J  S_jabberwock           (jabberwock)

diff --git a/src/display.c b/src/display.c
@@ -1842,13 +1842,14 @@ xchar x, y;
     case ICE:
         idx = S_ice;
         break;
+    case BRIDGE:
+        idx = S_bridge;
+        break;
     case GRASS:
         idx = S_grass;
         /*engr_override = TRUE;*/
         break;
-    case BRIDGE:
-        idx = S_bridge;
-        break;
+
     case AIR:
         idx = S_air;
         break;
@@ -1896,7 +1897,6 @@ xchar x, y;
         idx = S_room;
         break;
     }
-
     return cmap_to_glyph(idx);
 }
 
@@ -1976,6 +1976,7 @@ back_to_defsym(xchar x, xchar y)
     case THRONE:        idx = S_throne; break;
     case LAVAPOOL:      idx = S_lava; break;
     case ICE:           idx = S_ice; break;
+    case BRIDGE:        idx = S_bridge; break;
     case GRASS:         idx = S_grass; break;
     case AIR:           idx = S_air; break;
     case CLOUD:         idx = S_cloud; break;

diff --git a/src/drawing.c b/src/drawing.c
@@ -696,6 +696,7 @@ struct symparse loadsyms[] = {
     { SYM_PCHAR, S_vent, "S_vent" },
     { SYM_PCHAR, S_pool, "S_pool" },
     { SYM_PCHAR, S_ice, "S_ice" },
+    { SYM_PCHAR, S_bridge, "S_bridge" },
     { SYM_PCHAR, S_grass, "S_grass" },
     { SYM_PCHAR, S_lava, "S_lava" },
     { SYM_PCHAR, S_vodbridge, "S_vodbridge" },

diff --git a/src/invent.c b/src/invent.c
@@ -3608,10 +3608,10 @@ char *buf;
         cmap = S_throne; /* "opulent throne" */
     else if (is_lava(x, y))
         cmap = S_lava; /* "molten lava" */
-    else if (is_bridge(x, y))
-        cmap = S_bridge;
     else if (is_ice(x, y))
         cmap = S_ice; /* "ice" */
+    else if (is_bridge(x, y))
+        cmap = S_bridge;
     else if (is_pool(x, y))
         dfeature = "pool of water";
     else if (IS_GRASS(ltyp))