diff --git a/src/samplesrc/rogue.map.pla b/src/samplesrc/rogue.map.pla
index d1ca209..4d3c9b0 100644
--- a/src/samplesrc/rogue.map.pla
+++ b/src/samplesrc/rogue.map.pla
@@ -126,8 +126,7 @@ const mapsize  = maprows*mapcols
 
 const WALL_TILE   = '#'
 const FLOOR_TILE  = '.'
-const TORCH1_TILE = '*'
-const TORCH2_TILE = 'X'
+const TORCH_TILE  = '*'
 const PIT_TILE    = ' '
 const DOOR_TILE   = '+'
 const LOCKED_TILE = '%'
@@ -260,7 +259,7 @@ export def lighttorches#0
     rowmap = map + (ymap << rowshift)
     for xmap = 1 to mapcols - 2
       imap = rowmap + xmap
-      if ^imap & MAP_TILE == TORCH1_TILE // or ^imap & MAP_TILE == TORCH2_TILE
+      if ^imap & MAP_TILE == TORCH_TILE
         for yt = ymap - 1 to ymap + 1
           imap = map + (yt << rowshift)
           for xt = xmap - 1 to xmap + 1
@@ -283,11 +282,8 @@ end
 export def animate(tile)
   if animseq
     when tile & MAP_TILE
-      is TORCH1_TILE
-        tile = TORCH2_TILE
-        break
-      is TORCH2_TILE
-        tile = TORCH1_TILE
+      is TORCH_TILE
+        tile = 'X'
         break
       is WATER1_TILE
         tile = '('
diff --git a/src/samplesrc/rogue.pla b/src/samplesrc/rogue.pla
index 8881fc6..11ef935 100755
--- a/src/samplesrc/rogue.pla
+++ b/src/samplesrc/rogue.pla
@@ -12,8 +12,7 @@ import roguemap
 
   const FLOOR_TILE  = '.'
   const WALL_TILE   = '#'
-  const TORCH1_TILE = '*'
-  const TORCH2_TILE = 'X'
+  const TORCH_TILE  = '*'
   const PIT_TILE    = ' '
   const DOOR_TILE   = '+'
   const LOCKED_TILE = '%'
@@ -251,8 +250,7 @@ def moveplayer(dir)#0
         break
       fin
     is FLOOR_TILE
-    is TORCH1_TILE
-    is TORCH2_TILE
+    is TORCH_TILE
     is KEY_TILE
     is RAFT_TILE
     is GOLD_TILE
@@ -427,8 +425,7 @@ def moveentities(playerisvis)#0
         fin
         when getmaptile(xmove, ymove) & MAP_TILE
           is FLOOR_TILE
-          is TORCH1_TILE
-          is TORCH2_TILE
+          is TORCH_TILE
           is KEY_TILE
           is GOLD_TILE
           is FOOD_TILE
@@ -579,8 +576,7 @@ def play
           updtmaptile(player.xpos, player.ypos, FLOOR_TILE)
           gotit
           break
-        is TORCH1_TILE
-        is TORCH2_TILE
+        is TORCH_TILE
           if player.oil < 1000
             player:oil = player:oil + TORCH_OIL
             if player:oil > 1000