map update followup to lev_comp.l change

The change to allow digits in maps causes the comments that were
incorrectly placed inside MAP/ENDMAP blocks to be seen as valid
map lines.  They were quietly skipped before by the old scanner.
Move them out.
-dlc

diff --git a/dat/Monk.des b/dat/Monk.des
index 504b0c222ef987d2989200775293bb30dde88e21..69b1d0c31541cbe1f60b483e17e283cbd24aff20 100644 (file)
--- a/dat/Monk.des
+++ b/dat/Monk.des
@@ -105,9 +105,9 @@ MONSTER: 'X',"xorn",(01,17)
 
 MAZE: "Mon-loca",' '
 GEOMETRY:center,center
-MAP
 #         1         2         3         4         5         6         7 
 #123456789012345678901234567890123456789012345678901234567890123456789012345
+MAP
              ----------------------------------------------------   --------
            ---.................................................-    --.....|
          ---...--------........------........................---     ---...|

diff --git a/dat/Rogue.des b/dat/Rogue.des
index a3af9dde0e662bbcb303a7f9832b7e0982f9b7db..5d9a90cb9917dded12bd4d24456fa254878465f9 100644 (file)
--- a/dat/Rogue.des
+++ b/dat/Rogue.des
@@ -10,9 +10,9 @@
 MAZE: "Rog-strt",' '
 FLAGS: noteleport, hardfloor, nommap
 GEOMETRY:center,center
-MAP
 #         1         2         3         4         5         6         7
 #123456789012345678901234567890123456789012345678901234567890123456789012345
+MAP
 ---------------------------------.------------------------------------------
 |.....|.||..........|....|......|.|.........|.......+............---.......|
 |.....|..+..........+....---....S.|...-S-----.-----.|............+.+.......|
@@ -171,9 +171,9 @@ MONSTER: ':',"chameleon",random,hostile
 
 MAZE: "Rog-loca",' '
 GEOMETRY:center,center
-MAP
 #         1         2         3         4         5         6         7
 #123456789012345678901234567890123456789012345678901234567890123456789012345
+MAP
              ----------------------------------------------------   --------
            ---.................................................-    --.....|
          ---...--------........-------.......................---     ---...|
@@ -274,9 +274,9 @@ MONSTER: ':',"chameleon",random,hostile
 MAZE: "Rog-goal", ' '
 FLAGS: noteleport
 GEOMETRY:center,center
-MAP
 #         1         2         3         4         5         6         7
 #123456789012345678901234567890123456789012345678901234567890123456789012345
+MAP
 -----      -------.......................................|-----------------|
 |...|  -----.....|.......................................|.................|
 |...----...|.....|.......................................|....---------....|