tile synch and a warning fix

diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c
index b345a8fba8131cb72fb5865601a92bb2e529e7c0..407f87d9a66b4948e2aec90316e0775b733cd409 100644 (file)
--- a/sys/share/pcmain.c
+++ b/sys/share/pcmain.c
@@ -105,7 +105,7 @@ char *argv[];
        register char *dir;
 #if defined(WIN32)
        char fnamebuf[BUFSZ], encodedfnamebuf[BUFSZ];
-       boolean save_getreturn_status;
+       boolean save_getreturn_status = getreturn_enabled;
 #endif
 #ifdef NOCWD_ASSUMPTIONS
        char failbuf[BUFSZ];

diff --git a/win/share/monsters.txt b/win/share/monsters.txt
index 2df33216ee927e64d469286087be149bbfce444e..1b416a6baa13984760eecf415869c3ac412b0072 100644 (file)
--- a/win/share/monsters.txt
+++ b/win/share/monsters.txt
@@ -337,6 +337,25 @@ P = (108, 145, 182)
   MMMMMKKMMMKAMMMM
   MMMMMMMMMMMMMMMM
 }
+# tile 19 (dingo)
+{
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMCMM
+  MMMCMMCMMMMMMMCM
+  MMMCMCCMMMMMMMCA
+  MMCCCCKMMMMMMMCA
+  MMACACCKCCCCCCAA
+  MMLLCCCKCCCLCCCA
+  MKCCACKCLLLLACCA
+  MMAACAACLLAAACCA
+  MMMMACACAAAAAACA
+  MMMMCCACAAAMMCCA
+  MMMMMACCAMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+}
 # tile 17 (dog)
 {
   MMMMMMMMMMMMMMMM
@@ -375,25 +394,6 @@ P = (108, 145, 182)
   MMMMMKKAAMMMKAMM
   MMMMMMMMMMMMMMMM
 }
-# tile 19 (dingo)
-{
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMCMM
-  MMMCMMCMMMMMMMCM
-  MMMCMCCMMMMMMMCA
-  MMCCCCKMMMMMMMCA
-  MMACACCKCCCCCCAA
-  MMLLCCCKCCCLCCCA
-  MKCCACKCLLLLACCA
-  MMAACAACLLAAACCA
-  MMMMACACAAAAAACA
-  MMMMCCACAAAMMCCA
-  MMMMMACCAMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 20 (wolf)
 {
   MMMMMMMMMMMMMMMM
@@ -432,25 +432,6 @@ P = (108, 145, 182)
   MMMLMLLAAMMPPMMM
   MMMMMLLMMMMMMMMM
 }
-# tile 22 (warg)
-{
-  MMMMMMMMMMMMMMMM
-  MMMPMMPMMMMPPMMM
-  MMMPMPPMMMMMMPMM
-  MMPPPPMMMMMMMPMA
-  MMNMNPPMMMMMMPMA
-  MPMMPPPPPMMMMPMA
-  PPPPDPPPPPPPPPAA
-  DPPNDPPPPPPPPPAA
-  MMDDDPPPPPPPPPAA
-  PNDNPMPPPPPPPPAA
-  MPPPPAPPPPAPPMAM
-  MMMPAAPPAAAAPPAA
-  MMMPAAPMAAAAPMAM
-  MPPPAAPAAAAAPAAM
-  MMMMPPPAAMPPPAMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 23 (winter wolf cub)
 {
   MMMMMMMMMMMMMMMM
@@ -470,6 +451,25 @@ P = (108, 145, 182)
   MMMMMNBMMNBAMMMM
   MMMMMMMMMMMMMMMM
 }
+# tile 22 (warg)
+{
+  MMMMMMMMMMMMMMMM
+  MMMPMMPMMMMPPMMM
+  MMMPMPPMMMMMMPMM
+  MMPPPPMMMMMMMPMA
+  MMNMNPPMMMMMMPMA
+  MPMMPPPPPMMMMPMA
+  PPPPDPPPPPPPPPAA
+  DPPNDPPPPPPPPPAA
+  MMDDDPPPPPPPPPAA
+  PNDNPMPPPPPPPPAA
+  MPPPPAPPPPAPPMAM
+  MMMPAAPPAAAAPPAA
+  MMMPAAPMAAAAPMAM
+  MPPPAAPAAAAAPAAM
+  MMMMPPPAAMPPPAMM
+  MMMMMMMMMMMMMMMM
+}
 # tile 24 (winter wolf)
 {
   MMMMMMMMMMMMMMMM
@@ -1933,6 +1933,25 @@ P = (108, 145, 182)
   MMMAAGFAAGFAAAMM
   MAAAAAAAAAAAAAAA
 }
+# tile 104 (pony)
+{
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMJJMMMMMMMMM
+  MMMMKKKJMMMMMMMM
+  MMMKKEKJMMMMMMMM
+  MMKKJKKJMMMMMMMM
+  MMJJAKKJAAMMMMMM
+  MMMAKKKJAMMMMMMM
+  MMMKKKKKKKJMMMMM
+  MMMKKKKKKKJJAAAM
+  MMMKJKJJJJJAJAMM
+  MMMJAJAAAAJAAMMM
+  MMMJAJAAJAJAMMMM
+  MMMLMJAALAJMMMMM
+  MMMMMLAMMMLMMMMM
+  MMMMMMMMMMMMMMMM
+}
 # tile 101 (white unicorn)
 {
   MMMMMMMMMMMMMMMM
@@ -1990,25 +2009,6 @@ P = (108, 145, 182)
   MMMMMLPMMMLMMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 104 (pony)
-{
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMJJMMMMMMMMM
-  MMMMKKKJMMMMMMMM
-  MMMKKEKJMMMMMMMM
-  MMKKJKKJMMMMMMMM
-  MMJJAKKJAAMMMMMM
-  MMMAKKKJAMMMMMMM
-  MMMKKKKKKKJMMMMM
-  MMMKKKKKKKJJAAAM
-  MMMKJKJJJJJAJAMM
-  MMMJAJAAAAJAAMMM
-  MMMJAJAAJAJAMMMM
-  MMMLMJAALAJMMMMM
-  MMMMMLAMMMLMMMMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 105 (horse)
 {
   MMMMMMMMMMMMMMMM
@@ -3339,25 +3339,6 @@ P = (108, 145, 182)
   MMMMMCLJACLJAAAA
   MMMLLLLJMCLLLKAA
 }
-# tile 175 (storm giant)
-{
-  MMMMMMJJJJAAMMMM
-  MMMMJJJJJJJJAMMM
-  MMMMJJLLLLJJAMMM
-  MMMMJFFLLFFJAMMM
-  MMMMJLLLLLLJAMMM
-  MMMMALLAALLAAHMM
-  MMMMMALLLLJAHAAM
-  MMMJJKJJJJJHHAAM
-  MMLJJCCKCKHHLAAM
-  MMJLKKKCKHHHHHHM
-  MMLAAKKCCKJAHHAA
-  MMLAAJJJKKJHHALA
-  MMLCMJJJJJKHAAAA
-  MMLLMCLJACHAAAAA
-  MMMMMCLJACCJAAAA
-  MMMLLLLJMLLLLKAA
-}
 # tile 176 (ettin)
 {
   MMMMNNMMONOPMMMM
@@ -3377,6 +3358,25 @@ P = (108, 145, 182)
   MMMMMBPAABPAAAAA
   MMMPPPPAMBPPPFAA
 }
+# tile 175 (storm giant)
+{
+  MMMMMMJJJJAAMMMM
+  MMMMJJJJJJJJAMMM
+  MMMMJJLLLLJJAMMM
+  MMMMJFFLLFFJAMMM
+  MMMMJLLLLLLJAMMM
+  MMMMALLAALLAAHMM
+  MMMMMALLLLJAHAAM
+  MMMJJKJJJJJHHAAM
+  MMLJJCCKCKHHLAAM
+  MMJLKKKCKHHHHHHM
+  MMLAAKKCCKJAHHAA
+  MMLAAJJJKKJHHALA
+  MMLCMJJJJJKHAAAA
+  MMLLMCLJACHAAAAA
+  MMMMMCLJACCJAAAA
+  MMMLLLLJMLLLLKAA
+}
 # tile 177 (titan)
 {
   MMMMMAAAAAAAMMMM
@@ -4004,25 +4004,6 @@ P = (108, 145, 182)
   MMMMMMMMMMMMMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 210 (black pudding)
-{
-  MMMMMMMMAMMMMMMM
-  MMMMMMMMAAMMMMMM
-  MMMMMAAAMMMMMMMM
-  MMMMAAAAAMMMMMMM
-  MMMMCACAAMMMMMMM
-  MMMMDADAAMMMMMMM
-  MMMMAAAAAMMMMMMM
-  MMMMAAAAAMMMMMMM
-  MMMMAAAAAMMMMMMM
-  MMMMMAAAAAMMMMMM
-  MMMMMAAAAAMMMMMM
-  MMMMMMAAAAAMMMMM
-  MMMMMMAAAAAAMMMM
-  MMMMMMMAAAAAAMAM
-  MMMMMMMMAAAAAAAA
-  MMMMMMMMMMAAAAMM
-}
 # tile 211 (green slime)
 {
   MMMMMMMMMMMMMMMM
@@ -4042,6 +4023,25 @@ P = (108, 145, 182)
   NGGFGGFMMGFMMMMM
   MMGGFMMGGFMMGMMM
 }
+# tile 210 (black pudding)
+{
+  MMMMMMMMAMMMMMMM
+  MMMMMMMMAAMMMMMM
+  MMMMMAAAMMMMMMMM
+  MMMMAAAAAMMMMMMM
+  MMMMCACAAMMMMMMM
+  MMMMDADAAMMMMMMM
+  MMMMAAAAAMMMMMMM
+  MMMMAAAAAMMMMMMM
+  MMMMAAAAAMMMMMMM
+  MMMMMAAAAAMMMMMM
+  MMMMMAAAAAMMMMMM
+  MMMMMMAAAAAMMMMM
+  MMMMMMAAAAAAMMMM
+  MMMMMMMAAAAAAMAM
+  MMMMMMMMAAAAAAAA
+  MMMMMMMMMMAAAAMM
+}
 # tile 212 (quantum mechanic)
 {
   MMMMMMMMMMMMMMMM
@@ -4156,25 +4156,6 @@ P = (108, 145, 182)
   MMMMMAAAAAMMMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 218 (pit viper)
-{
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMAAAMMMMMMMMM
-  MMMAAAAAMMMAAAMM
-  MMMOAAAAAMAAMAAM
-  MMMAAMMAAMAAMAAM
-  MMMDMMMAAMAAMMAM
-  MMMMMMAAAMMAAMAM
-  MMMMMMAAMMMAAMMM
-  MMMMMAAAMMMAAMMM
-  MMMMMAAMMMAAAMMM
-  MMMMMAAMMAAAMMMM
-  MMMMMAAAAAAMMMMM
-  MMMMMMAAAAMMMMMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 219 (python)
 {
   MMMMMMMMMMMMMMMM
@@ -4194,6 +4175,25 @@ P = (108, 145, 182)
   MMMMMJJJJJAAMMMM
   MMMMMMMMMMMMMMMM
 }
+# tile 218 (pit viper)
+{
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMAAAMMMMMMMMM
+  MMMAAAAAMMMAAAMM
+  MMMOAAAAAMAAMAAM
+  MMMAAMMAAMAAMAAM
+  MMMDMMMAAMAAMMAM
+  MMMMMMAAAMMAAMAM
+  MMMMMMAAMMMAAMMM
+  MMMMMAAAMMMAAMMM
+  MMMMMAAMMMAAAMMM
+  MMMMMAAMMAAAMMMM
+  MMMMMAAAAAAMMMMM
+  MMMMMMAAAAMMMMMM
+  MMMMMMMMMMMMMMMM
+}
 # tile 220 (cobra)
 {
   MMMMMMMMMMMMMMMM
@@ -4726,25 +4726,6 @@ P = (108, 145, 182)
   MMMMMGFAAGFAAAAA
   MMMFFFFAMGFFFFAA
 }
-# tile 248 (giant zombie)
-{
-  MMMMMMJJJJAAMMMM
-  MMMMJJJJJJJJAMMM
-  MMMMJJFFFFJJAMMM
-  MMMMJDDFFDDJAMMM
-  MMMMJFFFFFFJAMMM
-  MMMMAFFAAFFAAAMM
-  MMMMMAFFFFJAAAAM
-  MMGGFFJJJJFFGGAA
-  MGFFFGGFFFFFFFCA
-  MFFFKFFFFFFKFFFA
-  FFFAAFFFFFFAAFFA
-  FFAAMJJJKKJAAFFA
-  FFAMMJJJJJKAGFAA
-  MMMMMGFAGFFAFFAA
-  MMMMGFFAGFFAAAAA
-  MMMGFFAAGFFFAAAA
-}
 # tile 249 (ghoul)
 {
   MMMMMMAAAMMMMMMM
@@ -4764,6 +4745,25 @@ P = (108, 145, 182)
   MMMMOOAOOAMMMMMM
   MMMMMMMMMMMMMMMM
 }
+# tile 248 (giant zombie)
+{
+  MMMMMMJJJJAAMMMM
+  MMMMJJJJJJJJAMMM
+  MMMMJJFFFFJJAMMM
+  MMMMJDDFFDDJAMMM
+  MMMMJFFFFFFJAMMM
+  MMMMAFFAAFFAAAMM
+  MMMMMAFFFFJAAAAM
+  MMGGFFJJJJFFGGAA
+  MGFFFGGFFFFFFFCA
+  MFFFKFFFFFFKFFFA
+  FFFAAFFFFFFAAFFA
+  FFAAMJJJKKJAAFFA
+  FFAMMJJJJJKAGFAA
+  MMMMMGFAGFFAFFAA
+  MMMMGFFAGFFAAAAA
+  MMMGFFAAGFFFAAAA
+}
 # tile 250 (skeleton)
 {
   MMMMMMMMMMMMMMMM
@@ -5201,25 +5201,6 @@ P = (108, 145, 182)
   MMCDMLLAALLADCMM
   MMMMMMMMMMMMMMMM
 }
-# tile 273 (nurse)
-{
-  MMMMMMMMMMMMMMMM
-  MMMMMMMNOMMMMMMM
-  MMMMMMNDDOMMMMMM
-  MMMMMMNNOOAMMMMM
-  MMMMMDBLBLDMMMMM
-  MMMMMCLLLLDCMMMM
-  MMMMMDALLACDMMMM
-  MMMMMCNAAODCAAAM
-  MMMMMNNNOOLAAAAM
-  MMMMLANNDOALAAAM
-  MMMMLANNOOALAAAM
-  MMMMMMNNOOAAAAMM
-  MMMMMMNNAOAAMAMM
-  MMMMMLLAMLLAMMMM
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 274 (shopkeeper)
 {
   MMMMMMMMMMMMMMMM
@@ -5372,6 +5353,25 @@ P = (108, 145, 182)
   MMMMMAAMAAMMMMMM
   MMMMMMMMMMMMMMMM
 }
+# tile 273 (nurse)
+{
+  MMMMMMMMMMMMMMMM
+  MMMMMMMNOMMMMMMM
+  MMMMMMNDDOMMMMMM
+  MMMMMMNNOOAMMMMM
+  MMMMMDBLBLDMMMMM
+  MMMMMCLLLLDCMMMM
+  MMMMMDALLACDMMMM
+  MMMMMCNAAODCAAAM
+  MMMMMNNNOOLAAAAM
+  MMMMLANNDOALAAAM
+  MMMMLANNOOALAAAM
+  MMMMMMNNOOAAAAMM
+  MMMMMMNNAOAAMAMM
+  MMMMMLLAMLLAMMMM
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+}
 # tile 282 (lieutenant)
 {
   MMMMMMMMMMMMMMMM
@@ -5581,25 +5581,6 @@ P = (108, 145, 182)
   MMMMEEAEEAMMMMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 293 (horned devil)
-{
-  MMMMMMMMMMMMMMMM
-  MMMMMMMMMMMMMMMM
-  MMOMMMMMMMOMMMMM
-  MMOOMMMMMOOMMMMM
-  MMMLOCDCOLMMMMMM
-  MMMCDDDDDCMMMMMM
-  MMMDAADAADAMMDMM
-  MMMDDDDDDDAMDMMM
-  MMCCDDFDDCCADMAM
-  MMCDKDDDKCDADAMM
-  MMCDAKKKACDAAAAM
-  MMDDADDDADDAAAAM
-  MMMMCDDDKAAAAAMM
-  MMMCDDADDKAAMMMM
-  MMCDDAAMDDKMMMMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 294 (succubus)
 {
   DDMOHHDMMMMMMMMM
@@ -5619,6 +5600,25 @@ P = (108, 145, 182)
   MMMMDDAAMMDDAAMM
   MMMDDJAMMMDDDAMM
 }
+# tile 293 (horned devil)
+{
+  MMMMMMMMMMMMMMMM
+  MMMMMMMMMMMMMMMM
+  MMOMMMMMMMOMMMMM
+  MMOOMMMMMOOMMMMM
+  MMMLOCDCOLMMMMMM
+  MMMCDDDDDCMMMMMM
+  MMMDAADAADAMMDMM
+  MMMDDDDDDDAMDMMM
+  MMCCDDFDDCCADMAM
+  MMCDKDDDKCDADAMM
+  MMCDAKKKACDAAAAM
+  MMDDADDDADDAAAAM
+  MMMMCDDDKAAAAAMM
+  MMMCDDADDKAAMMMM
+  MMCDDAAMDDKMMMMM
+  MMMMMMMMMMMMMMMM
+}
 # tile 295 (incubus)
 {
   DDMOHHDMMMMMMMMM
@@ -5809,6 +5809,25 @@ P = (108, 145, 182)
   MMMCDDAAMDDKMMMM
   MMMMMMMMMMMMMMMM
 }
+# tile 319 (sandestin)
+{
+  MMMMMCCCCCMMIMMM
+  MIMMCDMMMMCMMMMM
+  MMMCDMDDDMMCMMIM
+  MMCDMDDDDDMMCMMM
+  MMCDMDNDNDAMDCMM
+  IMCDMDDDDDAMDCMM
+  MMCDMADDDAMDCMMA
+  MCDMDDAAADDMDCAA
+  CDMDDDDDDDDDADCA
+  CDMDADDDDDADADCA
+  CDMDADDDDDADADCA
+  CDMDADDDDDADADCM
+  MCDMMDDJDDAADCAM
+  MMCDMDDADDADCAMM
+  MCDMDDAADDDADCMM
+  MMMMMMMMMMMMMMMM
+}
 # tile 305 (balrog)
 {
   MMMMMMMMMMMMMMMM
@@ -6075,25 +6094,6 @@ P = (108, 145, 182)
   MMMMMMMMMIFEDMMM
   MMMMMMMMMMMMMMMM
 }
-# tile 319 (sandestin)
-{
-  MMMMMCCCCCMMIMMM
-  MIMMCDMMMMCMMMMM
-  MMMCDMDDDMMCMMIM
-  MMCDMDDDDDMMCMMM
-  MMCDMDNDNDAMDCMM
-  IMCDMDDDDDAMDCMM
-  MMCDMADDDAMDCMMA
-  MCDMDDAAADDMDCAA
-  CDMDDDDDDDDDADCA
-  CDMDADDDDDADADCA
-  CDMDADDDDDADADCA
-  CDMDADDDDDADADCM
-  MCDMMDDJDDAADCAM
-  MMCDMDDADDADCAMM
-  MCDMDDAADDDADCMM
-  MMMMMMMMMMMMMMMM
-}
 # tile 320 (jellyfish)
 {
   MMMMMMMMMMMMMMMM