http://www.teaser.fr/~amajorel/yadex/yadex-1.6.0.diff.gz WHAT IS THIS This is a patch to turn Yadex 1.5.2 into Yadex 1.6.0. To apply, cd into the directory where the Yadex 1.5.2 source is and type gzip -d 3) zoom factor, sometimes the + sector actually appeared on the window, even though it was supposed + to be a few thousand pixels off-screen. I don't know if the + "oddity" is in Xlib, in the X server or in my video card but, + interestingly, the symptoms show up only when drawing horizontal or + vertical lines on the window, not when drawing oblique lines or on + the pixmap. + + Since it only occurs at high zoom factors, it must be some sort of + overflow error though it doesn't look like a 32-bit value being + truncated to 16 bits because the values are too small. Strange. I + dumbly worked around it by skipping off-screen objects. + + * Editing: A linedef, thing or vertex is highlighted if the pointer + is within 15 pixels of it. Previously, the threshold was 20 map + units which was too narrow at low zoom factors and too broad at + high zoom factors. This change makes drawing selection boxes in + crowded areas much easier than before. + + * Editing: Configuration variables thing_fudge and vertex_fudge are + gone, since they've been made irrelevant by changes in the + highlighting code. + + * Editing: If the pointer is within highlighting distance of more + than one thing, the one that is highlighted is the one in which the + pointer is, or the one that has the smallest radius, or the one + whose centre is nearest. Previously, the lowest-numbered one was + highlighted, making it impossible to select, say, a high numbered + baron standing in the same spot as an arachnotron. + + * Editing: Restored [Shift][Ins] that was inadvertently disabled + during the port to X. Thanks to Ingo van Lil for reporting this + bug. + + * Editing: If a linedef has a negative tag, tagged sectors are now + shown. + + * Editing: As per Ingo van Lil's suggestion, if a linedef is tagged + to more than one sector, a "+" is appended to the sector number in + the object info window. Similarly, if a sector is tagged to more + than one linedef, a "+" is appended to the linedef number in the + object info window. + + * Editing: In the object info window, tag 667 is now marked as + special. Yadex catches up with that newfangled Doom II thing. + + * Editing: The static text in the object info boxes is now a bit + dimmer to make the important information stand out. + + * Editing: Started working on a global mode, where you can work with + all types of objects at once, vertices, linedefs, sectors and + things. It's toggled by pressing [Ctrl][g] in the editing window. + Since it's an experimental feature, it comes with a big fat + warning, that you should take seriously. One known bug is that + selection is broken is this mode. Overhauled GetCurObject() to make + it able to cope with global mode. + + * Editing: [1] through [9] and [0] are now configurable through the + new variables "digit_zoom_base" and "digit_zoom_step". The default + values are set to roughly emulate the old behaviour but it's now + possible to have the zoom factor increase across the keyboard, for + instance. Patch by AJA. + + * Editing: New variable "blindly_swap_sidedefs" to prevent Yadex from + asking for confirmation when swapping sidedefs. Patch by AJA. + + * Editing: Placeat AJA, it's now possible to toggle the object info + boxes with [i]. Toggling the info bar is now bound to [Alt][i]. + + * Editing: The "Info bar" item has been moved from the "Help" menu to + the "View" menu. Fixed misplaced underscore in linedef "Misc" menu. + Fixed misplaced tick marks (thanks to Ingo van Lil) and added + separations in the "View" menu. Added missing ellipses here and + there. + + * Editing: Removed the sudden jump (down) in the size of the vertices + when zooming in. + + * Editing: Sectors are now shown in one of three colours : green for + sectors that have a tag, blue for sectors that have a type and cyan + for sectors that have both. Previously, all tagged sectors looked + the same, whether they had a type or not. + + * Editing: Integer entry: you can now enter hexadecimal or octal + numbers by prefixing them with "0x" or "0", as in C. This should + make it easier to enter Boom generalized types. You are now allowed + to start the number with an explicit plus sign ("+"). The lower + limit has been pushed from -32,749 to -32,768. The upper limit has + been pushed from +32,749 to +32,767. For consistency with the rest + of the interface, if the current entry is invalid, it is shown in + red instead of dim grey. You are allowed to type more characters, + even if the current entry is invalid ([Return] is still disabled, + however). The message in InputIntegerValue() has been changed from + "Enter a decimal number" to "Enter a number". + + * Editing: Fixed segfault on "Save as..." on a new level (i.e. opened + with the "create" command). This bug was there ever since 1.1. + + * Editing: On a new level (opened with the "create" command), the + level name and file name are now remembered so you don't have to + enter them again every time you save. + + * Editing: New function "cut a slice out of a sector" to easily split + doughnut-shaped sectors. Shortcut is [Ctrl][k]. See + users_guide.html for details. Thanks to Jim Flynn for writing a + similar function in DETH, which I used as a reference. + + * Editing: Setting things flags by value now allows any value between + 0 and 65,535 (instead of 1 through 31). The word "decimal" has been + removed from the menu item since you can now enter hexadecimal as + well. + + * Editing: [n], [p], [<] and [>] work properly even if no object was + highlighted. + + * Editing: In linedef mode, linedefs that have no first sidedef, or a + bad sidedef number are drawn in red. + + * Game/wad: MBF: changed the radius of the dog from 16 to 12. Thanks + to AJA for pointing it out. + + * Game/wad: Boom: added all of Boom's 130 non-generalized linedef + types to doom.ygd and doom2.ygd. New "elevator" linedef type group. + Many thanks to AJA for typing in the ygd data. + + * Game/wad: Linedef types 33 and 34 were incorrectly labelled "yel" + and "red" instead of the other way around. Thanks to Ingo van Lil + for pointing this out. + + * Game/wad: Linedef type 96 was incorrectly marked "W1" instead of + "WR". Spotted by IvL. + + * Game/wad: Hexen: added to hexen.ygd a couple of things types and + most sector and linedef types. Linedefs now have their tag set to + arg1. It used to be left uninitialized, which is why so many + linedefs were shown in red on the map. + + * Game/wad: Linedef types 105 and 111 had their descriptions + reversed. Don't blindly trust the UDS. Spotted by AJA. + + * Game/wad: Gave a sprite to Doom thing type 23 (dead lost soul), + SKULK. + + * Game/wad: Strife: definitions for thing types 10, 27, 46, 50, 81, + 137, 138, 2018, 2019 and 2026. + + * Game/wad: Hexen: definitions for things 122, 124 and 8004. + + * Misc: Flat/patch/sprite/texture viewer: restored ability to save to + file by pressing [Shift][F1]. + + * Misc: Flat/patch/sprite/texture viewer: not unnecessarily + refreshing the whole image window anymore when browsing patches or + sprites. + + * Misc: Texture viewer: new bindings [Ctrl][a] [Ctrl][x] to change + the number of patches shown. + + * Misc: Most I/O errors occurring while reading wads are now handled + gracefully (fewer gratuitous calls to fatal_error()). + + * Misc: The menu code (menu.cc and oldmenus.cc) has been partly + rewritten. Made the automatic shortcuts case-sensitive to allow up + to 61 entries instead of just 35. Option numbers shortcuts are + framed with dimmer square brackets, instead of parentheses. + Implemented separations. Two extra pixels of space between lines. + Tick marks now look like tick marks, not asterisks. Unticked + entries now have a dash in front of them. + + * Misc: The search paths for game definition files and configuration + files have changed in several ways. + + Some config file search directories have changed for conformance to + the FHS. If the prefix is "/usr/local", the path is now "/etc/ + yadex" instead of "/usr/local/etc/yadex". If the prefix is "/opt/ + something", the path is now "/etc/opt/something" instead of "/opt/ + something/etc/yadex". The practical consequence for the 90% of you + who install in /usr/local is that the system-wide config file has + moved from /usr/local/etc to /etc. + + Overriding the prefix now actually works for other prefixes than / + usr and /usr/local. The problem was that, even though the makefile + installed the files in the proper directories, the yadex binary + looked for them in /etc, /usr and /usr/local, regardless of the + prefix. Thanks to Oliver Kraus and Udo Munk for clueing me in. + + Yadex used to look for files in places where it shouldn't have. For + example, it looked for game definition files in /usr even if + compiled for /usr/local and vice-versa. Yadex now looks for files + only in the places corresponding to the prefix it was compiled for. + This makes it possible to have several builds of the same version + of Yadex on the same machine without unwanted interactions, as long + as they're compiled for different prefixes. Note, however, that / + etc/yadex is used by both /usr and /usr/local but that is mandated + by the FHS and there's nothing I can do. + + The search directories relative to $YADEX_DIR have been removed + from the Unix version (they were intended for DOS). + + See users_guide.html for the exact contents of the new search + paths. + + * Misc: Config file: bumped the config file version# from 3 to 4. + + * Misc: Fixed strange reactions to percent character ("%") in the + file name entry box. + + * Misc: Slightly less chaotic output in verbose mode. + + * Misc: Fixed a memory leak that occurred when repeatedly reloading a + wad. This log entry is particularly delightful because that leak + was introduced by me in version 1.5.0 while trying to fix a bug in + the same code that was, guess what, an fd leak. For the + historically minded, that fd leak goes back to at least DEU 5.21. + Try it. It's easily exercised by loading the same wad over and + over. After about 20 iterations, you are rewarded with "patch wad + file xxx doesn't exist. Ignored.". + + * Misc: Removed from the makefile unflattering comments on bzip2's + celerity that came from using an old version. + + * Misc: Decapitalised object type names (GetObjectTypeName()). + + * Misc: Fixed display bug in sector# and sidedef# entry box + (InputObjectXref()). + + * Misc: The config file search algorithm has been modified to support + multiple config files. The old algorithm was to walk the search + path front to back and stop at the first match. The new algorithm + is to walk the path back to front and use all the matches. Thus + local files inherit parameter settings from global files and still + have the possibility to selectively override them (i.e. you can + override some parameters and inherit the others). + + For example, assuming /etc/yadex/1.6.0/yadex.cfg contains : + + a = old + b = old + + and ./yadex.cfg contains : + + a = new + c = new + + the net effect is : + + a = new + b = old + c = new + + The motivation for the change was to allow users to put most of + their settings in global config files, either system wide or + per-user. When local files exist, they should contain only the + minimum, i.e. just those settings you want to override. This way of + doing has several advantages over the previous all-or-nothing + system. Obviously, you can now change a setting globally by editing + just one file, even if you have many local config files. Upgrades + are also smoother because any new variable definitions appearing in + global config files propagate even if local config files exist. + Finally, it's much easier to figure what local files are meant to + do because everything they contain is meaningful. + + * Misc: Removed the start-up message stating that "this program is + derived from DEU 5.21 by Raphal Quinet and Brendon Wyber" (for + clarity, not because I'm in denial). + + * Platform: On DOS, the PPM files created by "make_palette_ppm" and + "mp2" now have correct CRLF line terminators instead of LFCR. + + * Platform: Wart in gfx.cc to cope with QNX where DisplayWidth() and + DisplayHeight() return silly values. + + * Platform: Added support for 16-colour displays. Tested with the + XFree86 VGA16 server which, when running in 640x480x16 (VGA mode + 12h), provides a PseudoColor or StaticColor visual with an 8 bits + per pixel pixmap format. If there are any servers that expect a + pixmap format with a number of bits per pixel that is not a + multiple of 8, they're still unsupported. + + * Platform: Reworked the pixmap format selection code. Should not + change anything for most people. + + * Platform: Compiles and runs on HP-UX 10.0 (with GCC 3.0.1). + + * Platform: Compiles on Linux PPC (with GCC 3.1). Thanks to Mark + Brown for the patch. - Changes - Yadex 1.5.2 (2001-06-30) - * Platform: Compiles with GCC 3.0 (added std:: qualifiers where they - were missing and removed #ifdef inside printf()). - + * Platform: Compiles with GCC 3.0 (added std:: qualifiers where they + were missing and removed #ifdef inside printf()). + Yadex 1.5.1 (2000-12-12) - * Platform: One-line fix in menu.cc to please GCC 2.96 (of Red Hat 7 - fame). Thanks to Zebediah C. McClure for reporting the problem. - + * Platform: One-line fix in menu.cc to please GCC 2.96 (of Red Hat 7 + fame). Thanks to Zebediah C. McClure for reporting the problem. + Yadex 1.5.0 (2000-08-27) - * Build: Changed the way the diffs are generated after reading more - carefully the patch(1) man page and learning the hard way that - it's a very bad idea to put absolute paths in patches. - * Build: Made it easier to add or remove individual options in - CFLAGS and friends. - * Command-line: New option -b to benchmark parts of Yadex. For - hackers only. - * Command-line: Removed option -e in prevision of reuse for another - function. - * Doc: Completed ygd.html. - * Doc: Documented the usage of the LINES and YADEX_DIR environment - variables. - * Editing: Things that have an illegal angle are now shown with the - angle Doom would see, instead of just a dot in the middle. The - emulation is believed to be accurate for angles comprised between - 0 and 359. Values outside that range have not been tested. - * Editing: Things flags and linedefs flags now grouped by 4 for - readability. For linedefs, the decimal value of the flags field is - not shown anymore. - * Editing: In the object info box, the type and description of the - current thing are now display in red if the type is invalid (i.e. - not defined in the .ygd). - * Editing: The things and linedefs flags operations ([a], [b], [c]) - now set MadeChanges as they should have from the start. - * Editing: The View menu now contains entries for "Show object - numbers" [&] and "Show grid" [h]. - * Editing: The Edit menu now contains entries for "Snap to grid" [y] - and "Loc grid step" [z]. - * Editing: Rearranged the sidedef object info windows so that the - textures are listed in a more intuitive order (upper, middle, - lower instead of middle, upper, lower). Made labels shorter in - preparation of the hypothetical inclusion of texture swatches in - the future. - * Editing: Fixed long-standing buglet with the sidedef info saying - there are missing upper/lower textures even though both sectors - have a "sky" ceiling/floor. - * Editing: Implemented showing object numbers for linedefs and - sectors. The placement of sector numbers is naive and inadequate - for sectors that don't have a simple convex shape, but it's still - better than nothing. Picked a somewhat brighter colour for object - numbers. - * Editing: Linedef object info box: if the first sidedef is missing, - the message "(no first sidedef)" is printed in red instead of dim - gray. Same thing for the second sidedef if the "2" flag is set. - * Editing: Removed careless dereferencing of SideDefs[] for bad - sidedef numbers in the sector selection code. I don't think this - is what caused the mysterious unreproducible segfault James - Caldwell reported, though. Made the object deletion function - paranoid (checks that the objects to delete actually exist). - * Editing: When found superimposed linedefs after merging vertices, - the dialog box that asks whether they should be merged now - mentions the numbers of the first two superimposed linedefs found - instead of a laconic "Some linedefs are superimposed". - * Editing: Zooming: the zoom factor is now displayed in percent, - 100% being 1/1. - * Editing: Zooming: the zoom factors are now regularly spaced, with - a ratio of 1.414 between them. This removes the annoying "jump" - between the zoom factors greater than 1/2. It also fixes the - oddities that happened when zooming in after [`]. The ratio - between zoom factors can be controlled through the new parameter - "zoom_step". - * Editing: Zooming: the "zoom" parameter has been replaced by the - new parameter "zoom_default". The latter is expressed in percent, - not in 1/n units. It's now possible to specify an initial zoom - factor of more than 1/1. When opening a new window, Yadex now - adjusts the zoom factor so that the level fills the window. Should - you want to revert to the old behaviour, you can do it by setting - zoom_default to 12. - * Editing: ['] and [`] now go to the current centre of the level - (they used to go to where the centre was when the level was opened - or created). - * Editing: [`] now has a menu item (View -> Whole level). - * Editing: The grid has changed. There are now dots every step map - units, dim lines every 4step units, normal lines every 16step - units and bold lines every 64step units. The new grid is supposed - to be less obtrusive visually, faster to display and more distinct - when scrolling. - * Editing: New function to swap floor and ceiling flats of selected - sectors (Misc. operations -> Swap flats). - * Editing: When not in things mode, things are drawn in a dimmer - shade of gray and do not hide the linedefs anymore. - * Game/wad: Removed the "-g wolf" bit. [For those who still haven't - got it : the support for Wolfenstein 3D announced in the CHANGES - for version 1.4.0 was of course a hoax, 1.4.0 having been released - on April 1st.] Hope you've been having as much fun as I have. :-) - * Game/wad: Heretic: made the golem leader ghost, undead warrior - ghost and golem ghost look a little more ghostly. Made the - gargoyle leader, golem leader and golem leader ghost look - different from their vanilla counterparts by using sprites IMPXD - and MUMMY. Assigned a sprite to things 31 and 32 (enchanted - shield, SHD2 and mystic urn, SPHL). - * Game/wad: Heretic: corrected things radii in heretic.ygd, using - [1]info2ygd and the Heretic source as a reference. Almost all - radii were wrong, a few grossly so (maulotaur, ironlich and - gargoyle). - * Game/wad: Strife: many new things and linedef types thanks to - [2]Matt Miller. - * Game/wad: Doom alpha 0.4: definitions for thing types 2020, 2036, - 2038 and 2046. - * Game/wad: Updated format comments in *.ygd. - * Game/wad: Sprites in pwads now supported (between S_START/S_END or - SS_START/SS_END or SS_START/S_END). This fixes Yadex's failure to - show redefined sprites in [3]alitcsf.wad, [4]basilica.wad and - [5]strifed1.wad. A few Aliens TC sprites don't work yet but it's - for a different reason (DEH). - * Game/wad: Sprites now shown on the map when in things mode. You - can switch between sprites and squares with View -> Show sprites - [%]. New config file parameter "sprite_scale" to adjust the scale - at which sprites are displayed (default 100%). - * Game/wad: The right sprite is shown, even if the sprites are not - in alphabetical order in the wad (cf BARWA0 in Strife). - * Game/wad: The function to add pwads (be it from the command line - or with the "r" command) has been heavily reworked. It's more - robust and handles errors better. It does not leak file handles - anymore when you add the same pwad more than once. It also accepts - to add iwads, modulo a warning (though you should expect problems - later if you do that). The merging of the pwad directory into the - master directory is still lousy. - * Game/wad: Fixed duplicate entries in the flat selector. This bug - was found by "Ras2". It happened whenever you added the same flat - thrice or more. - * Game/wad: EDGE: added definitions for EDGE linedef types and - things types to doom.ygd and doom2.ygd. Thanks to [6]Andrew Apted - for providing the ygd data. - * Game/wad: EDGE: in sector mode, show information for EDGE - extrafloors if there are any. - * Misc: A couple of calls to fatal_error() were turned into calls to - report_error() (don't abort). - * Misc: New game definition file directive "sky_flat" to specify the - name of the "sky" flat. Replaced all occurrences of F_SKY1 by - references to this parameter. Fixes Check -> Check for missing - textures for Hexen and Strife. Bumped game definition file - version# to 4. - * Misc: Because it seems to disturb people (and for the pleasure of - proving Matt wrong), I've made the texture selector clip textures - to size. Since there's no scrolling/zooming system yet, I also - enlarged the viewing area from 256128 to 512256 to alleviate the - lossage on large textures. - * Misc: Removed the "Press Shift-F1 to save image to file" text in - the selector. It's been a no-op ever since 1.0, anyway. - * Misc: In the selectors, pressing [F1] prints the location of the - current item to stdout (file name and offset). Works with flats, - patches and sprites but not textures. It's there to help trace - Ras' bug. - * Misc: Made LoadPicture() nicer and safer. It gracefully bails out - if there are more than 20 errors on a single picture. It does not - make Yadex abort anymore on read errors in the header or column - offset table. I've done this by modifying wad_read_i16() and - wad_read_i32() so other functions might have been impacted. - * Misc: Config file: commented out most settings (this has no - visible effect since those settings were just reiterations of the - default values built into the executable). Also changed the - initialization code so that Yadex can run without a config file. - * Misc: Config file: unknown variables are ignored with a warning - instead of triggering a fatal error. The intent is to facilitate - sharing config files between versions. - * Misc: Config file: bumped version# to 3. - * Misc: Made Yadex use YADEX_GAME as documented and not Y_GAME. - Oops ! - * Misc: New feature in the flat/picture/sprite selector to show - where the current image comes from (file name and file offset). - For debugging. - * Misc: The window size (width/height and -w/-h) can now be - expressed in percent of the screen size, by appending a "%" to the - value. The default size, instead of being 640480 in the - executable and 900600 in the config file is now 90%90%. It's - still possible to give absolute width and heights, of course. - * Misc: No tantrum thrown if the game definition file contains no - thing directive. - * Misc: Removed the check for sector headroom being < 1024 in Checks - -> Check for missing textures. It was sometimes annoying and - inaccurate anyway. - * Platform: Images display correctly on packed 24-bit X servers - (i.e. bits_per_pixel actually is 24 and not 32). The scanline_pad - member of the ScreenFormat structure is now honoured (not that - XFree86 seemed to mind much when it wasn't). - * Platform: Began to clean the code up to make porting less - difficult. - * Platform: Added patch to get Yadex to compile with GCC 2.7 - (patch/gcc-2.7.diff). GCC 2.7 is officially considered - unsupported, though. You're on your own. - + * Build: Changed the way the diffs are generated after reading more + carefully the patch(1) man page and learning the hard way that it's + a very bad idea to put absolute paths in patches. + + * Build: Made it easier to add or remove individual options in CFLAGS + and friends. + + * Command-line: New option -b to benchmark parts of Yadex. For + hackers only. + + * Command-line: Removed option -e in prevision of reuse for another + function. + + * Doc: Completed ygd.html. + + * Doc: Documented the usage of the LINES and YADEX_DIR environment + variables. + + * Editing: Things that have an illegal angle are now shown with the + angle Doom would see, instead of just a dot in the middle. The + emulation is believed to be accurate for angles comprised between 0 + and 359. Values outside that range have not been tested. + + * Editing: Things flags and linedefs flags now grouped by 4 for + readability. For linedefs, the decimal value of the flags field is + not shown anymore. + + * Editing: In the object info box, the type and description of the + current thing are now display in red if the type is invalid (i.e. + not defined in the .ygd). + + * Editing: The things and linedefs flags operations ([a], [b], [c]) + now set MadeChanges as they should have from the start. + + * Editing: The View menu now contains entries for "Show object + numbers" [&] and "Show grid" [h]. + + * Editing: The Edit menu now contains entries for "Snap to grid" [y] + and "Loc grid step" [z]. + + * Editing: Rearranged the sidedef object info windows so that the + textures are listed in a more intuitive order (upper, middle, lower + instead of middle, upper, lower). Made labels shorter in + preparation of the hypothetical inclusion of texture swatches in + the future. + + * Editing: Fixed long-standing buglet with the sidedef info saying + there are missing upper/lower textures even though both sectors + have a "sky" ceiling/floor. + + * Editing: Implemented showing object numbers for linedefs and + sectors. The placement of sector numbers is naive and inadequate + for sectors that don't have a simple convex shape, but it's still + better than nothing. Picked a somewhat brighter colour for object + numbers. + + * Editing: Linedef object info box: if the first sidedef is missing, + the message "(no first sidedef)" is printed in red instead of dim + gray. Same thing for the second sidedef if the "2" flag is set. + + * Editing: Removed careless dereferencing of SideDefs[] for bad + sidedef numbers in the sector selection code. I don't think this is + what caused the mysterious unreproducible segfault James Caldwell + reported, though. Made the object deletion function paranoid + (checks that the objects to delete actually exist). + + * Editing: When found superimposed linedefs after merging vertices, + the dialog box that asks whether they should be merged now mentions + the numbers of the first two superimposed linedefs found instead of + a laconic "Some linedefs are superimposed". + + * Editing: Zooming: the zoom factor is now displayed in percent, 100% + being 1/1. + + * Editing: Zooming: the zoom factors are now regularly spaced, with a + ratio of 1.414 between them. This removes the annoying "jump" + between the zoom factors greater than 1/2. It also fixes the + oddities that happened when zooming in after [`]. The ratio between + zoom factors can be controlled through the new parameter + "zoom_step". + + * Editing: Zooming: the "zoom" parameter has been replaced by the new + parameter "zoom_default". The latter is expressed in percent, not + in 1/n units. It's now possible to specify an initial zoom factor + of more than 1/1. When opening a new window, Yadex now adjusts the + zoom factor so that the level fills the window. Should you want to + revert to the old behaviour, you can do it by setting zoom_default + to 12. + + * Editing: ['] and [`] now go to the current centre of the level + (they used to go to where the centre was when the level was opened + or created). + + * Editing: [`] now has a menu item (View -> Whole level). + + * Editing: The grid has changed. There are now dots every step map + units, dim lines every 4step units, normal lines every 16step + units and bold lines every 64step units. The new grid is supposed + to be less obtrusive visually, faster to display and more distinct + when scrolling. + + * Editing: New function to swap floor and ceiling flats of selected + sectors (Misc. operations -> Swap flats). + + * Editing: When not in things mode, things are drawn in a dimmer + shade of gray and do not hide the linedefs anymore. + + * Game/wad: Removed the "-g wolf" bit. [For those who still haven't + got it : the support for Wolfenstein 3D announced in the CHANGES + for version 1.4.0 was of course a hoax, 1.4.0 having been released + on April 1st.] Hope you've been having as much fun as I have. :-) + + * Game/wad: Heretic: made the golem leader ghost, undead warrior + ghost and golem ghost look a little more ghostly. Made the gargoyle + leader, golem leader and golem leader ghost look different from + their vanilla counterparts by using sprites IMPXD and MUMMY. + Assigned a sprite to things 31 and 32 (enchanted shield, SHD2 and + mystic urn, SPHL). + + * Game/wad: Heretic: corrected things radii in heretic.ygd, using + info2ygd and the Heretic source as a reference. Almost all radii + were wrong, a few grossly so (maulotaur, ironlich and gargoyle). + + * Game/wad: Strife: many new things and linedef types thanks to Matt + Miller. + + * Game/wad: Doom alpha 0.4: definitions for thing types 2020, 2036, + 2038 and 2046. + + * Game/wad: Updated format comments in *.ygd. + + * Game/wad: Sprites in pwads now supported (between S_START/S_END or + SS_START/SS_END or SS_START/S_END). This fixes Yadex's failure to + show redefined sprites in alitcsf.wad, basilica.wad and + strifed1.wad. A few Aliens TC sprites don't work yet but it's for a + different reason (DEH). + + * Game/wad: Sprites now shown on the map when in things mode. You can + switch between sprites and squares with View -> Show sprites [%]. + New config file parameter "sprite_scale" to adjust the scale at + which sprites are displayed (default 100%). + + * Game/wad: The right sprite is shown, even if the sprites are not in + alphabetical order in the wad (cf BARWA0 in Strife). + + * Game/wad: The function to add pwads (be it from the command line or + with the "r" command) has been heavily reworked. It's more robust + and handles errors better. It does not leak file handles anymore + when you add the same pwad more than once. It also accepts to add + iwads, modulo a warning (though you should expect problems later if + you do that). The merging of the pwad directory into the master + directory is still lousy. + + * Game/wad: Fixed duplicate entries in the flat selector. This bug + was found by "Ras2". It happened whenever you added the same flat + thrice or more. + + * Game/wad: EDGE: added definitions for EDGE linedef types and things + types to doom.ygd and doom2.ygd. Thanks to Andrew Apted for + providing the ygd data. + + * Game/wad: EDGE: in sector mode, show information for EDGE + extrafloors if there are any. + + * Misc: A couple of calls to fatal_error() were turned into calls to + report_error() (don't abort). + + * Misc: New game definition file directive "sky_flat" to specify the + name of the "sky" flat. Replaced all occurrences of F_SKY1 by + references to this parameter. Fixes Check -> Check for missing + textures for Hexen and Strife. Bumped game definition file version# + to 4. + + * Misc: Because it seems to disturb people (and for the pleasure of + proving Matt wrong), I've made the texture selector clip textures + to size. Since there's no scrolling/zooming system yet, I also + enlarged the viewing area from 256128 to 512256 to alleviate the + lossage on large textures. + + * Misc: Removed the "Press Shift-F1 to save image to file" text in + the selector. It's been a no-op ever since 1.0, anyway. + + * Misc: In the selectors, pressing [F1] prints the location of the + current item to stdout (file name and offset). Works with flats, + patches and sprites but not textures. It's there to help trace Ras' + bug. + + * Misc: Made LoadPicture() nicer and safer. It gracefully bails out + if there are more than 20 errors on a single picture. It does not + make Yadex abort anymore on read errors in the header or column + offset table. I've done this by modifying wad_read_i16() and + wad_read_i32() so other functions might have been impacted. + + * Misc: Config file: commented out most settings (this has no visible + effect since those settings were just reiterations of the default + values built into the executable). Also changed the initialization + code so that Yadex can run without a config file. + + * Misc: Config file: unknown variables are ignored with a warning + instead of triggering a fatal error. The intent is to facilitate + sharing config files between versions. + + * Misc: Config file: bumped version# to 3. + + * Misc: Made Yadex use YADEX_GAME as documented and not Y_GAME. + Oops ! + + * Misc: New feature in the flat/picture/sprite selector to show where + the current image comes from (file name and file offset). For + debugging. + + * Misc: The window size (width/height and -w/-h) can now be expressed + in percent of the screen size, by appending a "%" to the value. The + default size, instead of being 640480 in the executable and 900 + 600 in the config file is now 90%90%. It's still possible to give + absolute width and heights, of course. + + * Misc: No tantrum thrown if the game definition file contains no + thing directive. + + * Misc: Removed the check for sector headroom being < 1024 in Checks + -> Check for missing textures. It was sometimes annoying and + inaccurate anyway. + + * Platform: Images display correctly on packed 24-bit X servers (i.e. + bits_per_pixel actually is 24 and not 32). The scanline_pad member + of the ScreenFormat structure is now honoured (not that XFree86 + seemed to mind much when it wasn't). + + * Platform: Began to clean the code up to make porting less + difficult. + + * Platform: Added patch to get Yadex to compile with GCC 2.7 (patch/ + gcc-2.7.diff). GCC 2.7 is officially considered unsupported, + though. You're on your own. + Yadex 1.4.0 (2000-04-01) - * Command-line: The parsing of the command line arguments is now - case-sensitive. Yes, that's right, it used to be case-insensitive. - I never knew. I just realized it by accident. DOS is not dead. - * Doc: The man page now has an "OPTIONS" section. - * Doc: Three new makefile targets, man, dvi and ps, for people who - hack the doc. - * Editing: Made object numbers slightly more legible in crowded - areas. - * Game/wad: Added support for Wolfenstein 3D (-g wolf). - * Misc: The code that parses the configuration file is smarter and - its error messages are more informative. Doesn't choke anymore on - a line containing just spaces or on comments not starting on - column 1. Thanks to "Ras2" for reporting the bug. - * Misc: New commands "viewtex" and "viewflat" so that you can browse - textures and flats without having to open a level. This is - primarily useful to me, for testing purposes. - * Misc: More sanitization : the parsing of the configuration file is - now case-sensitive when matching option names and values - ("yes"/"no", "true"/"false", "on"/"off"). - * Misc: The flat/patch/sprite/texture viewer does not flicker - anymore, and is somewhat faster when viewing textures. The list of - names in the flat viewer has grown from 3 to 5 lines. - * Misc: The diffs are now in unified format (supposedly just as good - and IMHO clearer). - + * Command-line: The parsing of the command line arguments is now + case-sensitive. Yes, that's right, it used to be case-insensitive. + I never knew. I just realized it by accident. DOS is not dead. + + * Doc: The man page now has an "OPTIONS" section. + + * Doc: Three new makefile targets, man, dvi and ps, for people who + hack the doc. + + * Editing: Made object numbers slightly more legible in crowded + areas. + + * Game/wad: Added support for Wolfenstein 3D (-g wolf). + + * Misc: The code that parses the configuration file is smarter and + its error messages are more informative. Doesn't choke anymore on a + line containing just spaces or on comments not starting on + column 1. Thanks to "Ras2" for reporting the bug. + + * Misc: New commands "viewtex" and "viewflat" so that you can browse + textures and flats without having to open a level. This is + primarily useful to me, for testing purposes. + + * Misc: More sanitization : the parsing of the configuration file is + now case-sensitive when matching option names and values ("yes"/ + "no", "true"/"false", "on"/"off"). + + * Misc: The flat/patch/sprite/texture viewer does not flicker + anymore, and is somewhat faster when viewing textures. The list of + names in the flat viewer has grown from 3 to 5 lines. + + * Misc: The diffs are now in unified format (supposedly just as good + and IMHO clearer). + Yadex 1.3.2 (2000-01-14) - * Build: Oops ! I had forgotten to set CC and CXX back to their - "sane" values before cutting the 1.3.1 tarball. - * Code: "make dist" now also generates a diff. - + * Build: Oops ! I had forgotten to set CC and CXX back to their + "sane" values before cutting the 1.3.1 tarball. + + * Code: "make dist" now also generates a diff. + Yadex 1.3.1 (2000-01-12) - * Build: Fix for "Ras2"'s compile error with g++ 2.7.2.3 : - c++ src/disppic.cc - In file included from /usr/include/g++-2.7/defalloc.h:24, - from /usr/include/g++-2.7/map.h:21, - from /usr/include/g++-2.7/map:6, - from src/patchdir.h:35, - from src/disppic.cc:33: - /usr/include/g++-2.7/algobase.h:47: macro `min' used with too many (3) args - /usr/include/g++-2.7/algobase.h:57: macro `max' used with too many (3) args - make: *** [obj/0/disppic.o] Error 1 - * Build: Fix for HAVE_NANOSLEEP being always false. Thanks to "Ras2" - for pointing it out. - + * Build: Fix for "Ras2"'s compile error with g++ 2.7.2.3 : + c++ src/disppic.cc + In file included from /usr/include/g++-2.7/defalloc.h:24, + from /usr/include/g++-2.7/map.h:21, + from /usr/include/g++-2.7/map:6, + from src/patchdir.h:35, + from src/disppic.cc:33: + /usr/include/g++-2.7/algobase.h:47: macro `min' used with too many (3) args + /usr/include/g++-2.7/algobase.h:57: macro `max' used with too many (3) args + make: *** [obj/0/disppic.o] Error 1 + + * Build: Fix for HAVE_NANOSLEEP being always false. Thanks to "Ras2" + for pointing it out. + Yadex 1.3.0 (2000-01-11) - * Build: The makefile now honours the dependencies in yadex.dep. - * Build: Support for FHS-compliant systems: "make install" now - copies the man pages into /usr/local/share/man/man6/ if - /usr/local/share/man/ exists. If not, it still uses - /usr/local/man/man6/ (requested by Joseph Carter). - * Build: Added "#include " to fix compilation error on - wads.cc under Solaris. - * Build: Downgraded the makefile and scripts to use the old - backquote syntax for command substitution, because Oliver Kraus' - reports suggest that the Solaris sh does not understand the "$()" - syntax. Barfulation ! - * Build: New makefile target showconf that shows the value of all - the important macros as well as the output of certain commands. If - you have trouble compiling Yadex, mail me the output of "make - showconf". - * Build: A bunch of little changes in the makefile to try to make - build problems on Solaris go away. - * Doc: Fixed several discrepancies in README. - * Game/wad: Support for the german edition of Doom II (as the iwad - has no MAP31 and MAP32, Yadex 1.1.0 and 1.2.0 used to say "this is - the shareware version of the game"). - * Game/wad: Replacement patches in pwads are now supported, even if - between PP_START and PP_END. Fixes failure to see redefined - textures with mbfedit!.wad, alitcwad.wad and certainly many - others. Replacement patches in pwads not between P_START/P_END or - PP_START/PP_END are not recognized anymore. Many PNAMES errors - that would have made previous versions of Yadex abort now just - make it print warnings. - * Misc: Cleaned up the web page source and makefile. Added - documentation, should someone else take over maintainership. No - harm in dreaming. - * Misc: New command viewpat to browse through the patches. - * Misc: It's now possible to have several different versions of - Yadex installed simultaneously. Some paths have changed : - + $(PREFIX)/share/games/ is now - $(PREFIX)/share/games/yadex/$(VERSION)/ - + $(PREFIX)/etc/yadex.cfg is now - $(PREFIX)/etc/yadex/$(VERSION)/yadex.cfg - + ~/yadex.cfg is now ~/.yadex/$(VERSION)/yadex.cfg - + $(PREFIX)/bin/yadex changed to $(PREFIX)/bin/yadex-$(VERSION) - + $(PREFIX)/bin/ybsp changed to $(PREFIX)/bin/ybsp-$(VERSION) - + $(PREFIX)/bin/yadex is now a symlink pointing to - yadex-$(VERSION) - + $(PREFIX)/bin/ybsp is now a symlink pointing to - ybsp-$(VERSION) - The insertion of a yadex/ component in the paths was done for two - reasons. In the first place, it was requested by Joseph Carter for - game definition files, to reduce clutter in - $(PREFIX)/share/games/. I extended it to configuration files - because it I thought it was a nice way not to clutter - $(PREFIX)/etc/. On the other hand, it was not done for man pages - and executables because it would have interfered. - * Misc: Fixed bug where if you typed "yadex: c level", then created - or edited a level and then closed the editing window, you got a - dozen of messages like this one : "Warning: error freeing colour - 00005820h (BadAccess (attempt to access private resource - denied))". I hope this fixes the related item in TODO. - + * Build: The makefile now honours the dependencies in yadex.dep. + + * Build: Support for FHS-compliant systems: "make install" now copies + the man pages into /usr/local/share/man/man6/ if /usr/local/share/ + man/ exists. If not, it still uses /usr/local/man/man6/ (requested + by Joseph Carter). + + * Build: Added "#include " to fix compilation error on + wads.cc under Solaris. + + * Build: Downgraded the makefile and scripts to use the old backquote + syntax for command substitution, because Oliver Kraus' reports + suggest that the Solaris sh does not understand the "$()" syntax. + Barfulation ! + + * Build: New makefile target showconf that shows the value of all the + important macros as well as the output of certain commands. If you + have trouble compiling Yadex, mail me the output of "make + showconf". + + * Build: A bunch of little changes in the makefile to try to make + build problems on Solaris go away. + + * Doc: Fixed several discrepancies in README. + + * Game/wad: Support for the german edition of Doom II (as the iwad + has no MAP31 and MAP32, Yadex 1.1.0 and 1.2.0 used to say "this is + the shareware version of the game"). + + * Game/wad: Replacement patches in pwads are now supported, even if + between PP_START and PP_END. Fixes failure to see redefined + textures with mbfedit!.wad, alitcwad.wad and certainly many others. + Replacement patches in pwads not between P_START/P_END or PP_START/ + PP_END are not recognized anymore. Many PNAMES errors that would + have made previous versions of Yadex abort now just make it print + warnings. + + * Misc: Cleaned up the web page source and makefile. Added + documentation, should someone else take over maintainership. No + harm in dreaming. + + * Misc: New command viewpat to browse through the patches. + + * Misc: It's now possible to have several different versions of Yadex + installed simultaneously. Some paths have changed : + + $(PREFIX)/share/games/ is now $(PREFIX)/share/games/yadex/$ + (VERSION)/ + + $(PREFIX)/etc/yadex.cfg is now $(PREFIX)/etc/yadex/$(VERSION)/ + yadex.cfg + + ~/yadex.cfg is now ~/.yadex/$(VERSION)/yadex.cfg + + $(PREFIX)/bin/yadex changed to $(PREFIX)/bin/yadex-$(VERSION) + + $(PREFIX)/bin/ybsp changed to $(PREFIX)/bin/ybsp-$(VERSION) + + $(PREFIX)/bin/yadex is now a symlink pointing to yadex-$ + (VERSION) + + $(PREFIX)/bin/ybsp is now a symlink pointing to ybsp-$(VERSION) + + The insertion of a yadex/ component in the paths was done for two + reasons. In the first place, it was requested by Joseph Carter for + game definition files, to reduce clutter in $(PREFIX)/share/games/. + I extended it to configuration files because it I thought it was a + nice way not to clutter $(PREFIX)/etc/. On the other hand, it was + not done for man pages and executables because it would have + interfered. + + * Misc: Fixed bug where if you typed "yadex: c level", then created + or edited a level and then closed the editing window, you got a + dozen of messages like this one : "Warning: error freeing colour + 00005820h (BadAccess (attempt to access private resource denied))". + I hope this fixes the related item in TODO. + Yadex 1.2.0 (1999-11-23) - * BSP: Added missing newline in banner. - * BSP: Silenced GCC 2.95.2 warnings about implicit braces. - * Build: The makefile doesn't rebuild doc/ every time a source file - is changed anymore. - * Build: Can now be built on machines where Perl is not installed. - * Build: The doc can now be built on machines with a non-GNU find. - * Build: Fixed compilation errors with GCC 2.95.2 in src/infobar.cc. - * Build: Silenced most GCC warnings. - * Code: Fixed a typo in the legal notices at the beginning of the - source files. - * Doc: HISTORY renamed as CHANGES, since that seems to be a more - widespread convention. - * Editing: The checks don't beep for every error anymore, just the - first one. - * Editing: Object info window: the sprite and flats graphics don't - flicker anymore when the pointer moves from one object to another. - Besides, if the sprite is not found, displays the message - "sprite_name not found" instead of just a blank area. - * Game/wad: Doom alpha & press release versions: it's now possible - to save levels. Note: they're saved to regular Doom format, not - Doom alpha format. - * Game/wad: Doom II: The boss shooter thing now has a sprite - (BOSFB0). - * Game/wad: Hacx and Aliens TC: fixed a bug that made Yadex segfault - when trying to edit a Hacx level (or alitcsf.wad from - alntc19{a,b}.zip). - * Game/wad: For homogeneity with DeuTex, less confusion and to - reduce the risk of conflicts with other applications, the game - names for Doom alpha 0.2, Doom alpha 0.4, and Doom alpha 0.5 are - now "doom02", "doom04" and "doom05" respectively instead of - "alpha02", "alpha04" and "alpha05". It follows that some - command-line options have changed : - + "-g alpha02" is now "-g doom02", - + "-g alpha04" is now "-g doom04", - + "-g alpha05" is now "-g doom05". - Configuration file directives : - + "game = alpha02" is now "game = doom02", - + "game = alpha04" is now "game = doom04", - + "game = alpha05" is now "game = doom05". - Paths : - + /usr/local/share/games/alpha02/ is now - /usr/local/share/games/doom02/, - + /usr/local/share/games/alpha04/ is now - /usr/local/share/games/doom04/, - + /usr/local/share/games/alpha05/ is now - /usr/local/share/games/doom05/, - + /usr/local/share/games/alpha02.ygd is now - /usr/local/share/games/doom02.ygd, - + /usr/local/share/games/alpha04.ygd is now - /usr/local/share/games/doom04.ygd, - + /usr/local/share/games/alpha05.ygd is now - /usr/local/share/games/doom05.ygd. - * Game/wad: Fixed Yadex aborting when trying to view textures for - versions of Strife >= 1.1. The problem was that Strife 1.1 and - above use a different format for the TEXTURE1 and TEXTURE2 lumps - (Strife 1.0 uses the same format as Doom). New game definition - file directive "texture_format strife11" to support that format. - strife.ygd now contains "texture_format strife11". Added - strife10.ygd that is identical to strife.ygd except that it - contains "texture_format normal". Summary : - + if you have the Strife 1.0 iwad, use "-g strife10" or "game = - strife10", - + if you have Strife 1.1 or above, use "-g strife" or "game = - strife". - Thanks to Kim Parrott for reporting the bug and Len Pitre for - pointing me in the right direction. - * Misc: The "dump" command now prints correctly the last line even - if the length of the lump is not a multiple of 16. - * Misc: For homogeneity with DeuTex, the following game definition - file directives have changed : - + "texture_format alpha04" is now "texture_format nameless", - + "texture_lump texture1" is now "texture_lump normal", - + new choice "texture_lump none". - * Misc: For homogeneity with DeuTex, automatic texture names for - Doom alpha 0.4 are now "TEXnnnn" where nnnn is zero-based. - * Misc: Bumped game definition file version# to 3. - * Misc: When trying to use a pwad as iwad, emit a warning instead of - seeing this as a fatal error. - * Misc: Added a palette viewer (PLAYPAL and COLORMAP). Can be run - from the prompt with the viewpal command or from the level editing - window with [Ctrl][P]. - * Misc: The sometimes tedious pwad loading messages are not - displayed anymore, unless in verbose mode. By default, Yadex now - just prints which levels the pwad contains. - + * BSP: Added missing newline in banner. + + * BSP: Silenced GCC 2.95.2 warnings about implicit braces. + + * Build: The makefile doesn't rebuild doc/ every time a source file + is changed anymore. + + * Build: Can now be built on machines where Perl is not installed. + + * Build: The doc can now be built on machines with a non-GNU find. + + * Build: Fixed compilation errors with GCC 2.95.2 in src/infobar.cc. + + * Build: Silenced most GCC warnings. + + * Code: Fixed a typo in the legal notices at the beginning of the + source files. + + * Doc: HISTORY renamed as CHANGES, since that seems to be a more + widespread convention. + + * Editing: The checks don't beep for every error anymore, just the + first one. + + * Editing: Object info window: the sprite and flats graphics don't + flicker anymore when the pointer moves from one object to another. + Besides, if the sprite is not found, displays the message + "sprite_name not found" instead of just a blank area. + + * Game/wad: Doom alpha & press release versions: it's now possible to + save levels. Note: they're saved to regular Doom format, not Doom + alpha format. + + * Game/wad: Doom II: The boss shooter thing now has a sprite + (BOSFB0). + + * Game/wad: Hacx and Aliens TC: fixed a bug that made Yadex segfault + when trying to edit a Hacx level (or alitcsf.wad from alntc19 + {a,b}.zip). + + * Game/wad: For homogeneity with DeuTex, less confusion and to reduce + the risk of conflicts with other applications, the game names for + Doom alpha 0.2, Doom alpha 0.4, and Doom alpha 0.5 are now + "doom02", "doom04" and "doom05" respectively instead of "alpha02", + "alpha04" and "alpha05". It follows that some command-line options + have changed : + + "-g alpha02" is now "-g doom02", + + "-g alpha04" is now "-g doom04", + + "-g alpha05" is now "-g doom05". + + Configuration file directives : + + "game = alpha02" is now "game = doom02", + + "game = alpha04" is now "game = doom04", + + "game = alpha05" is now "game = doom05". + + Paths : + + /usr/local/share/games/alpha02/ is now /usr/local/share/games/ + doom02/, + + /usr/local/share/games/alpha04/ is now /usr/local/share/games/ + doom04/, + + /usr/local/share/games/alpha05/ is now /usr/local/share/games/ + doom05/, + + /usr/local/share/games/alpha02.ygd is now /usr/local/share/ + games/doom02.ygd, + + /usr/local/share/games/alpha04.ygd is now /usr/local/share/ + games/doom04.ygd, + + /usr/local/share/games/alpha05.ygd is now /usr/local/share/ + games/doom05.ygd. + + * Game/wad: Fixed Yadex aborting when trying to view textures for + versions of Strife >= 1.1. The problem was that Strife 1.1 and + above use a different format for the TEXTURE1 and TEXTURE2 lumps + (Strife 1.0 uses the same format as Doom). New game definition file + directive "texture_format strife11" to support that format. + strife.ygd now contains "texture_format strife11". Added + strife10.ygd that is identical to strife.ygd except that it + contains "texture_format normal". Summary : + + + if you have the Strife 1.0 iwad, use "-g strife10" or "game = + strife10", + + if you have Strife 1.1 or above, use "-g strife" or "game = + strife". + + Thanks to Kim Parrott for reporting the bug and Len Pitre for + pointing me in the right direction. + + * Misc: The "dump" command now prints correctly the last line even if + the length of the lump is not a multiple of 16. + + * Misc: For homogeneity with DeuTex, the following game definition + file directives have changed : + + "texture_format alpha04" is now "texture_format nameless", + + "texture_lump texture1" is now "texture_lump normal", + + new choice "texture_lump none". + + * Misc: For homogeneity with DeuTex, automatic texture names for Doom + alpha 0.4 are now "TEXnnnn" where nnnn is zero-based. + + * Misc: Bumped game definition file version# to 3. + + * Misc: When trying to use a pwad as iwad, emit a warning instead of + seeing this as a fatal error. + + * Misc: Added a palette viewer (PLAYPAL and COLORMAP). Can be run + from the prompt with the viewpal command or from the level editing + window with [Ctrl][P]. + + * Misc: The sometimes tedious pwad loading messages are not displayed + anymore, unless in verbose mode. By default, Yadex now just prints + which levels the pwad contains. + Yadex 1.1.0 (1999-08-22) - * BSP: Included Colin Phipps' [7]fix for the bugs in - [8]bsp23bug.zip. - * BSP: Renamed the executable and the man page as ybsp, to avoid - having Yadex and Xwadtools overwrite each other's BSP. - * BSP: The whirling baton is now disabled if stderr is not a TTY. - This is the same thing Udo Munk did for [9]Xwadtools' BSP with the - -noprog option except that here it's automatic. - * BSP: Made the man page spell out exactly which version of BSP this - is. - * BSP: Inserted notice in the banner that this is the version that - comes with Yadex. In the online help, replaced "TMP.WAD" by the - correct "tmp.wad". - * Building: Fixed compilation error on line 44 of bitvec.h. - * Code: Removed CR characters that remained in some of the source - files. - * Code: New function DrawScreenString(). Began to use it instead of - DrawScreenText(). This should squash some latent bugs, for example - regarding flat and texture names containing percent signs (%). - * Code: Fixed constness warnings in cfgfile.cc. - * Code: Replaced most occurrences of hard-coded 8 by one of - WAD_NAME, WAD_FLAT_NAME, WAD_PIC_NAME and WAD_TEX_NAME. - * Code: New directives level_format and level_name in the YGD files. - As a result, been able to remove most tests on specific values of - the game parameter. - * Doc: Too many changes and additions to list. Since the last - release, the HTML doc has doubled in size (from 80 kB to 160 kB). - Added a dozen of screenshots. - * Doc: In an attempt to make it easier to find what you're looking - for, I've split the doc in a larger number of files, referred to - by a top level index.html. - * Doc: Moved the HTML doc and the man pages to the doc/ directory, - so as not to clutter the base directory too much. - * Doc: Man pages: the first argument of the .TH macro (the name) is - now all caps since that's what (almost) everybody else does. - * Editing: Autoscroll is now off by default -- use "autoscroll = - true" in yadex.cfg if you want it back. - * Editing: New bindings [e] and [Ctrl][e] to select all linedefs - that belong to the same non-forked path. - * Editing: New bindings [E] and [Ctrl][Shift][e] to select all - single-sided linedefs that belong to the same non-forked path. - * Editing: New functions to flip and mirror linedefs, sectors, - things and vertices. - * Editing: Fixed the "string art" bug. That was a subtle bug that - happened only as a result of a rare chain of events. The recipe to - it is to render a vertex unused (for example by deleting all the - linedefs that use it), save the level, make a change that does not - call for a rebuilding of the nodes (for example, moving a thing or - changing an attribute of a sector), save the level, quit and load - again. At that point, a nice surprise awaits you: the linedefs are - all entangled (hence the name). Spectacular, and even beautiful, - but also very annoying if you don't have a backup copy of your - level. - This is the same bug I thought I had fixed in Yadex 1.0.0_alpha3. - In fact, I had cut one of the paths that led to it but the bug - itself was still there. It reappeared in february 1999. - * Editing: Fixed an old DEU bug where you sometimes couldn't select - a newly created sector to the west of the level until you saved. - * Editing: It's now possible to toggle linedef flags 8-15 and to - specify linedef flags field values greater than 511. - * Editing: It's now possible to set/clear/toggle things flags 7-15. - * Editing: Made the Not-enough-player-starts and - Not-enough-deathmatch-start dialogs on saving more intuitive (it - was about time). - * Editing: New function "Exchange objects numbers". - * Editing: Things types are now displayed in decimal, not in - hexadecimal. Other minor cosmetic changes. - * Editing: The focus-on-object function now works much better. It - does not land off-target or zoom in excessively anymore. - Superimposed things and sectors containing other sectors or not - containing their own centre don't confuse it anymore. It's still - fooled by unclosed sectors, though. - * Editing: Changed the meaning of [q]. It used to save and quit. Now - it just quits (same thing as [Esc]). - * Editing: The edit command can now edit levels of any name. If you - had a wad with a level named "FOO" in it, you could edit that - level by typing "edit foo". In case you're wondering, no there's - no practical application to this (beyond experimenting). - * Editing: Reminder to build nodes: the message is now more - specific. - * Editing: Command mode: typing ^D at the prompt now works. - * Editing: Insert linedef and split sector: the new linedef now goes - from the first selected vertex to the second and not the other way - around. - * Editing: Insert linedef and split sector: does not loop forever - anymore if there are forks in the edge of the sector (for example - like when trying to split between vertices 283 and 278 of MAP01 of - Doom II). - * Editing: [n], [p], [>] and [<] now move the view so that the - object to highlight is under the pointer. - * Editing: The messages displayed when loading pwads are more - compact (several lumps are printed on the same line and groups of - sprites are collapsed). The end marker for groups of flats, - patches and sprites is now printed. - * Editing: Flat/sprite/texture viewer : added bindings [Ctrl][u] and - [Ctrl][w] to erase to start of line, [Ctrl][f] and [Ctrl][v] to - page down and [Ctrl][b] to page up. - * Editing: Flat/sprite/texture viewer : added bindings [Ctrl][PgUp] - and [Ctrl][PgDn] to move to top and bottom of list, because [Home] - and [End] will eventually cease to be available for that (they - will be bound to SOL and EOL). - * Editing: Flat/sprite/texture viewer : made [Up] and [Down] work - even when there are duplicate names. - * Editing: Flat/sprite/texture viewer : InputNameFromListWithFunc() - is now genuinely case insensitive. The positioning in the list of - names is now correct, even if the name given is lower-case. - * Editing: Flat/sprite/texture viewer : reduced flickering (still - room for improvement, though). - * Editing: Flat/sprite/texture viewer : the current name was way too - dim if not in the list. Fixed. - * Editing: Flat/sprite/texture viewer : made image window 320x200 - instead of 256x128. - * Editing: Sprite viewer : new bindings [Ctrl][n] and [Ctrl][p] to - go to start of next/previous group of sprites. - * Editing: Sprite viewer : fixed display bug. - * Editing: Spectres now look more like spectres. - * Editing: Confirm-or-cancel dialogs: more intuitive. You can now - confirm with [y] or [Return] and cancel with [n] or [Esc]. All - other keys are ignored (previously, [y] confirmed and all other - keys cancelled). Expose events are now handled (previously they - were ignored). - * Editing: Some abnormal conditions that used to trigger fatal - errors now just cause a message error to be printed. The current - operation is aborted but not the whole program anymore. - * Game/wad: Fixed segfault on levels containing a thing of type 0 - (like Eternal MAP25 and some Final Doom maps). - * Game/wad: When reading a level from a wad, now verifies that the - SECTORS, THINGS, VERTEXES, LINEDEFS and SIDEDEFS lumps have - correct sizes and that sidedefs, sectors and vertices references - are correct. - * Game/wad: Final Doom : should be supported now. Yadex does not - assume anymore that F1_START is always present, which caused it to - segfault on either or both Final Doom iwads. - * Game/wad: Heretic : added sprite names for 58 thing types. - * Game/wad: Hexen : added very partial support (-g hexen). You can - edit levels but not save them. Hexen-specific linedef and things - fields are ignored, and so is the BEHAVIOR lump. Most definitions - are missing. - * Game/wad: Strife : added partial support (-g strife). Yadex now - knows about the translucent linedef flag and the new sector types. - Thanks to Len Pitre for the help. Still missing : the new things - flags, most things types and linedefs types. Anybody wants to work - on strife.ygd ? - * Game/wad: MBF : supported. Yadex now knows about the friendly - thing flag, thing type 888 (Dog) and linedef types 271 and 272 - (transfer sky texture). - * Game/wad: Doom press release pre-beta : supported (-g doompr). - Added support for the PR picture format and the definitions for - things 2016 (evil sceptre) and 2017 (unholy bible). - * Game/wad: Doom alpha : read-only support (-g - alpha02|alpha04|alpha05). Added support for the alpha picture - format, the TEXTURES lump, the different level format and the - incompatible level names (E1M10 through E1M13). - * Game/wad: Added support for FF_START/FF_END in addition of - FF_START/F_END. As a result, Yadex does not barf anymore on - basilica.wad (but issue a warning). F?_START is not supported - anymore ; it has to be FF_START. - * Game/wad: Made "Post too long. Wad file might be corrupt" a - warning, not a fatal error anymore. - * Game/wad: New directives picture_format, texture_format and - texture_lump in the YGD files, to support Doom alpha and Doom PR. - * Misc: New command make_palette_ppm to generate a raw PPM file - containing all the colours of the palette. - * Misc: Cosmetic changes in the prompt and character mode interface. - * Misc: make_gimp_palette : the generated palette files now include - RGB values in the comments. - * Misc: Removed from the menus the functions that were not - implemented (File->Print, Edit->Find, View->3D preview). - * Misc: Failure to load the specified X font is not a fatal error - anymore. - * Misc: New command line options --help and --version. - * Misc: Bumped game definition file version# to 2. - * Platform: Removed dependency on nanosleep(), strcasecmp() and - strncasecmp(). Thanks to Udo Munk for pointing out that - nanosleep() is not always available. - * Platform: Now compiles with other compilers than GCC/EGCS without - modifying the makefile. - * Platform: New parameter idle_sleep_ms to set the time in ms - between polls of the X server when the input queue is empty. - * Platform: Previously, if the CPU and the X server had different - endiannesses and the screen depth was more than 8 bits, sprites, - flats and textures were displayed with wrong colours. This is now - fixed. - * Platform: The build, group, insert and save commands should now - work correctly on big-endian machines. - * Platform: The bell has been resurrected on X. - * Platform: Should now compile on X11R5 systems (to be verified). - Thanks to Udo Munk for the fix. - + * BSP: Included Colin Phipps' fix for the bugs in bsp23bug.zip. + + * BSP: Renamed the executable and the man page as ybsp, to avoid + having Yadex and Xwadtools overwrite each other's BSP. + + * BSP: The whirling baton is now disabled if stderr is not a TTY. + This is the same thing Udo Munk did for Xwadtools' BSP with the + -noprog option except that here it's automatic. + + * BSP: Made the man page spell out exactly which version of BSP this + is. + + * BSP: Inserted notice in the banner that this is the version that + comes with Yadex. In the online help, replaced "TMP.WAD" by the + correct "tmp.wad". + + * Building: Fixed compilation error on line 44 of bitvec.h. + + * Code: Removed CR characters that remained in some of the source + files. + + * Code: New function DrawScreenString(). Began to use it instead of + DrawScreenText(). This should squash some latent bugs, for example + regarding flat and texture names containing percent signs (%). + + * Code: Fixed constness warnings in cfgfile.cc. + + * Code: Replaced most occurrences of hard-coded 8 by one of WAD_NAME, + WAD_FLAT_NAME, WAD_PIC_NAME and WAD_TEX_NAME. + + * Code: New directives level_format and level_name in the YGD files. + As a result, been able to remove most tests on specific values of + the game parameter. + + * Doc: Too many changes and additions to list. Since the last + release, the HTML doc has doubled in size (from 80 kB to 160 kB). + Added a dozen of screenshots. + + * Doc: In an attempt to make it easier to find what you're looking + for, I've split the doc in a larger number of files, referred to by + a top level index.html. + + * Doc: Moved the HTML doc and the man pages to the doc/ directory, so + as not to clutter the base directory too much. + + * Doc: Man pages: the first argument of the .TH macro (the name) is + now all caps since that's what (almost) everybody else does. + + * Editing: Autoscroll is now off by default -- use "autoscroll = + true" in yadex.cfg if you want it back. + + * Editing: New bindings [e] and [Ctrl][e] to select all linedefs that + belong to the same non-forked path. + + * Editing: New bindings [E] and [Ctrl][Shift][e] to select all + single-sided linedefs that belong to the same non-forked path. + + * Editing: New functions to flip and mirror linedefs, sectors, things + and vertices. + + * Editing: Fixed the "string art" bug. That was a subtle bug that + happened only as a result of a rare chain of events. The recipe to + it is to render a vertex unused (for example by deleting all the + linedefs that use it), save the level, make a change that does not + call for a rebuilding of the nodes (for example, moving a thing or + changing an attribute of a sector), save the level, quit and load + again. At that point, a nice surprise awaits you: the linedefs are + all entangled (hence the name). Spectacular, and even beautiful, + but also very annoying if you don't have a backup copy of your + level. + + This is the same bug I thought I had fixed in Yadex 1.0.0_alpha3. + In fact, I had cut one of the paths that led to it but the bug + itself was still there. It reappeared in february 1999. + + * Editing: Fixed an old DEU bug where you sometimes couldn't select a + newly created sector to the west of the level until you saved. + + * Editing: It's now possible to toggle linedef flags 8-15 and to + specify linedef flags field values greater than 511. + + * Editing: It's now possible to set/clear/toggle things flags 7-15. + + * Editing: Made the Not-enough-player-starts and + Not-enough-deathmatch-start dialogs on saving more intuitive (it + was about time). + + * Editing: New function "Exchange objects numbers". + + * Editing: Things types are now displayed in decimal, not in + hexadecimal. Other minor cosmetic changes. + + * Editing: The focus-on-object function now works much better. It + does not land off-target or zoom in excessively anymore. + Superimposed things and sectors containing other sectors or not + containing their own centre don't confuse it anymore. It's still + fooled by unclosed sectors, though. + + * Editing: Changed the meaning of [q]. It used to save and quit. Now + it just quits (same thing as [Esc]). + + * Editing: The edit command can now edit levels of any name. If you + had a wad with a level named "FOO" in it, you could edit that level + by typing "edit foo". In case you're wondering, no there's no + practical application to this (beyond experimenting). + + * Editing: Reminder to build nodes: the message is now more specific. + + * Editing: Command mode: typing ^D at the prompt now works. + + * Editing: Insert linedef and split sector: the new linedef now goes + from the first selected vertex to the second and not the other way + around. + + * Editing: Insert linedef and split sector: does not loop forever + anymore if there are forks in the edge of the sector (for example + like when trying to split between vertices 283 and 278 of MAP01 of + Doom II). + + * Editing: [n], [p], [>] and [<] now move the view so that the object + to highlight is under the pointer. + + * Editing: The messages displayed when loading pwads are more compact + (several lumps are printed on the same line and groups of sprites + are collapsed). The end marker for groups of flats, patches and + sprites is now printed. + + * Editing: Flat/sprite/texture viewer : added bindings [Ctrl][u] and + [Ctrl][w] to erase to start of line, [Ctrl][f] and [Ctrl][v] to + page down and [Ctrl][b] to page up. + + * Editing: Flat/sprite/texture viewer : added bindings [Ctrl][PgUp] + and [Ctrl][PgDn] to move to top and bottom of list, because [Home] + and [End] will eventually cease to be available for that (they will + be bound to SOL and EOL). + + * Editing: Flat/sprite/texture viewer : made [Up] and [Down] work + even when there are duplicate names. + + * Editing: Flat/sprite/texture viewer : InputNameFromListWithFunc() + is now genuinely case insensitive. The positioning in the list of + names is now correct, even if the name given is lower-case. + + * Editing: Flat/sprite/texture viewer : reduced flickering (still + room for improvement, though). + + * Editing: Flat/sprite/texture viewer : the current name was way too + dim if not in the list. Fixed. + + * Editing: Flat/sprite/texture viewer : made image window 320x200 + instead of 256x128. + + * Editing: Sprite viewer : new bindings [Ctrl][n] and [Ctrl][p] to go + to start of next/previous group of sprites. + + * Editing: Sprite viewer : fixed display bug. + + * Editing: Spectres now look more like spectres. + + * Editing: Confirm-or-cancel dialogs: more intuitive. You can now + confirm with [y] or [Return] and cancel with [n] or [Esc]. All + other keys are ignored (previously, [y] confirmed and all other + keys cancelled). Expose events are now handled (previously they + were ignored). + + * Editing: Some abnormal conditions that used to trigger fatal errors + now just cause a message error to be printed. The current operation + is aborted but not the whole program anymore. + + * Game/wad: Fixed segfault on levels containing a thing of type 0 + (like Eternal MAP25 and some Final Doom maps). + + * Game/wad: When reading a level from a wad, now verifies that the + SECTORS, THINGS, VERTEXES, LINEDEFS and SIDEDEFS lumps have correct + sizes and that sidedefs, sectors and vertices references are + correct. + + * Game/wad: Final Doom : should be supported now. Yadex does not + assume anymore that F1_START is always present, which caused it to + segfault on either or both Final Doom iwads. + + * Game/wad: Heretic : added sprite names for 58 thing types. + + * Game/wad: Hexen : added very partial support (-g hexen). You can + edit levels but not save them. Hexen-specific linedef and things + fields are ignored, and so is the BEHAVIOR lump. Most definitions + are missing. + + * Game/wad: Strife : added partial support (-g strife). Yadex now + knows about the translucent linedef flag and the new sector types. + Thanks to Len Pitre for the help. Still missing : the new things + flags, most things types and linedefs types. Anybody wants to work + on strife.ygd ? + + * Game/wad: MBF : supported. Yadex now knows about the friendly thing + flag, thing type 888 (Dog) and linedef types 271 and 272 (transfer + sky texture). + + * Game/wad: Doom press release pre-beta : supported (-g doompr). + Added support for the PR picture format and the definitions for + things 2016 (evil sceptre) and 2017 (unholy bible). + + * Game/wad: Doom alpha : read-only support (-g alpha02|alpha04| + alpha05). Added support for the alpha picture format, the TEXTURES + lump, the different level format and the incompatible level names + (E1M10 through E1M13). + + * Game/wad: Added support for FF_START/FF_END in addition of FF_START + /F_END. As a result, Yadex does not barf anymore on basilica.wad + (but issue a warning). F?_START is not supported anymore ; it has + to be FF_START. + + * Game/wad: Made "Post too long. Wad file might be corrupt" a + warning, not a fatal error anymore. + + * Game/wad: New directives picture_format, texture_format and + texture_lump in the YGD files, to support Doom alpha and Doom PR. + + * Misc: New command make_palette_ppm to generate a raw PPM file + containing all the colours of the palette. + + * Misc: Cosmetic changes in the prompt and character mode interface. + + * Misc: make_gimp_palette : the generated palette files now include + RGB values in the comments. + + * Misc: Removed from the menus the functions that were not + implemented (File->Print, Edit->Find, View->3D preview). + + * Misc: Failure to load the specified X font is not a fatal error + anymore. + + * Misc: New command line options --help and --version. + + * Misc: Bumped game definition file version# to 2. + + * Platform: Removed dependency on nanosleep(), strcasecmp() and + strncasecmp(). Thanks to Udo Munk for pointing out that nanosleep() + is not always available. + + * Platform: Now compiles with other compilers than GCC/EGCS without + modifying the makefile. + + * Platform: New parameter idle_sleep_ms to set the time in ms between + polls of the X server when the input queue is empty. + + * Platform: Previously, if the CPU and the X server had different + endiannesses and the screen depth was more than 8 bits, sprites, + flats and textures were displayed with wrong colours. This is now + fixed. + + * Platform: The build, group, insert and save commands should now + work correctly on big-endian machines. + + * Platform: The bell has been resurrected on X. + + * Platform: Should now compile on X11R5 systems (to be verified). + Thanks to Udo Munk for the fix. + Yadex 1.0.1 (1999-01-02) - * Doc: New sections "Moving around" and "Other credits" in the - user's guide. - * Editing: Split linedefs and sector: new linedef now goes from 1 to - 2 and not the other way around. - * Editing: Added scrolling with the arrow keys. - * Editing: [Pgup], [Pgdn], [Home] and [End] now scroll one page at a - time. - * Editing: New variable autoscroll to disable autoscrolling. - * Editing: New variables autoscroll_amp and autoscroll_edge to tweak - autoscrolling. - * Editing: New shortcut [x] to "Split linedef (insert new vertex)". - * Editing: New shortcut [w] to "Split linedefs and sector". - * Misc: Fixed segfault on trying to edit MAPnm in Doom/Heretic mode - or EnMm in Doom II mode. - * Misc: New prompt command make_gimp_palette to generate a gimp - palette file from PLAYPAL. - * Misc: Bumped configuration file version# to 2. - + * Doc: New sections "Moving around" and "Other credits" in the user's + guide. + + * Editing: Split linedefs and sector: new linedef now goes from 1 to + 2 and not the other way around. + + * Editing: Added scrolling with the arrow keys. + + * Editing: [Pgup], [Pgdn], [Home] and [End] now scroll one page at a + time. + + * Editing: New variable autoscroll to disable autoscrolling. + + * Editing: New variables autoscroll_amp and autoscroll_edge to tweak + autoscrolling. + + * Editing: New shortcut [x] to "Split linedef (insert new vertex)". + + * Editing: New shortcut [w] to "Split linedefs and sector". + + * Misc: Fixed segfault on trying to edit MAPnm in Doom/Heretic mode + or EnMm in Doom II mode. + + * Misc: New prompt command make_gimp_palette to generate a gimp + palette file from PLAYPAL. + + * Misc: Bumped configuration file version# to 2. + Yadex 1.0.0 (1998-12-26) - * Code: Moved the source files to a subdirectory. - * Doc: A few additions in the user's guide - * Editing: Fixed buglet in positioning of newly copied objects. - * Game/wad: Game support: added definitions for Boom's things 5001 - and 5002 (point pusher and puller). - * Misc: Added reminder to build nodes after making changes. - * Misc: Added magic string to configuration file. - * Misc: Added magic string to game definition file. - + * Code: Moved the source files to a subdirectory. + + * Doc: A few additions in the user's guide + + * Editing: Fixed buglet in positioning of newly copied objects. + + * Game/wad: Game support: added definitions for Boom's things 5001 + and 5002 (point pusher and puller). + + * Misc: Added reminder to build nodes after making changes. + + * Misc: Added magic string to configuration file. + + * Misc: Added magic string to game definition file. + Yadex 1.0.0_alpha3 (1998-12-23) - * Doc: A few additions/corrections in the hacker's guide. - * Editing: Fixed spectacular corruption of linedefs (string art bug) - that occurred if all you did during a given session was deleting - vertices. - + * Doc: A few additions/corrections in the hacker's guide. + + * Editing: Fixed spectacular corruption of linedefs (string art bug) + that occurred if all you did during a given session was deleting + vertices. + Yadex 1.0.0_alpha2 (1998-12-22) - * BSP: Included BSP 2.3 (thanks to Lee Killough). - * Doc: Improved user's guide. - * Editing: Added new commands [a], [b] and [c] to set, toggle and - clear things and linedefs flags. - + * BSP: Included BSP 2.3 (thanks to Lee Killough). + + * Doc: Improved user's guide. + + * Editing: Added new commands [a], [b] and [c] to set, toggle and + clear things and linedefs flags. + Yadex 1.0.0_alpha1 (1998-12-17) - * Code: Removed dereferencing of NULL pointer in - ParseCommandLineOptions() (DEU). - * Code: Replaced occurrences of "x==TRUE" and "x==FALSE" by "x" and - "!x". - * Code: Replaced occurrences of "x=TRUE" and "x=FALSE" by "x=1" and - "x=0". - * Command-line: You don't have anymore to put "-file" or "-pwad" in - front of pwads names on the command line. E.G. you can type "yadex - foo.wad". - * Command-line: Deleted a few little-used or DOS-specific options. - * Editing: Menu bar and pop-up menus much improved. - * Editing: Info bar reworked. - * Editing: When prompted to "Press a key to continue", you can now - also press the left mouse button. - * Editing: Grid: the grid step can now adapt automatically as you - zoom in/out. - * Editing: Grid: whether dragging is snapped to grid is now - independent of whether the grid is shown or not (added flags - grid_snap and grid_shown). - * Editing: Added finer-grained confirmation options. - * Editing: General editing: you can now scroll the map further from - the centre of the level. - * Editing: Added ['] to re-centre the window around the centre of - the map. - * Editing: Added [`] to re-centre the window around the centre of - the map and adjust the zoom so that the map fills the screen. - * Editing: Added [&] to show things and vertices numbers. - * Editing: Autoscroll: scroll speed is now progressive. - * Editing: Autoscroll: easier to use near the top of the window. - * Editing: [Left], [Right], [Up], [Down] do nothing. - * Editing: [Space] does not toggle move fast/slow anymore; it - toggles between nominal zoom and x 4. - * Editing: Highlighting of things, vertices and linedefs much - improved. - * Editing: Dragging objects is now done with the left mouse button - instead of the right button. - * Editing: Editing object properties is now done by double-clicking - on the object. - * Editing: Selection and drag-and-drop have changed a lot. - * Editing: Selection box: removed the -a option and the addselbox - parameter. Whether the selection box is additive or not is now - controlled dynamically by the user (with [Ctrl]). - * Editing: Sprite viewer: sprites are now centred. - * Editing: Linedef info: shortened flags names to one character. - * Editing: Linedef info: a missing normal texture on a 1-sided - linedef is now flagged in red. - * Editing: Linedefs copy: you now have the choice between - duplicating the sidedefs too and reusing the same sidedefs. DEU - left the new linedefs sidedef-less and, so far, Yadex used to - reuse the same sidedefs. - * Editing: Linedefs: added function to "unlink" sidedefs. - * Editing: Linedefs: dragging linedefs is much faster than before. - * Editing: Sectors: in the object info window, added display of - floor and ceiling height delta with respect to previous sector. - * Editing: Sectors: in the object info window, added display of - floor and ceiling texture. - * Editing: Sectors: dragging sectors is much faster than before. - * Editing: Things: now drawn as squares so that it's easier to see - whether they are stuck in a wall or another thing. And you don't - have to highlight them to see their angle. Note: the old shape is - still available by defining ROUND_THINGS at compile-time. - * Editing: Things: changed the colours again. Tried to make - important things stand out and conversely. Bonuses are now dark - green and player/ deathmatch starts bright green. Keys are - magenta. Decoration is dim blue instead of white. Unknown objects - are cyan instead of white. Weapons are orange instead of brownish. - Heretic sound source things and Boom point pushers are dim - turquoise-ish. - * Editing: Things: the sprite is now shown in the object info - window. - * Editing: Vertices: deciding whether a vertex is on a linedef is - now done on the distance in pixels, not in map units. So you can - now work on very fine details (E.G. vertices only 2 map units - away) provided that the zoom factor is high enough. - * Editing: Fixed minor glitch in texture viewer that showed with - BIGDOOR7, SKY1, TEKWALL1, TEKWALL5 and others (DEU). - * Editing: When highlighting a sector, compared - SideDefs[LineDef[n].sidedef1].sector with ObjNum even though - .sector was -1. Somehow it always tested false (DEU). - * Editing: "Check textures names": the name of the offending texture - is now printed correctly even if it is 8 characters long (DEU). - * Editing: "Check textures names": if you fixed a missing texture, - the editor was not made aware that you had made changes to the - level (DEU). - * Editing: Unused sectors are not selected anymore (DEU). - * Editing: Changing the preferences could overwrite other variables - (DEU). - * Editing: InputNameFromListWithFunc() used to segfault if you - pressed [Pgdn] on a list shorter than (listdisp + 1) elements - (DEU). - * Editing: Removed segfault in AlignTexturesX() (DEU). - * Game/wad: Heretic is now supported. - * Game/wad: Added support for Boom's new thing flags - not-in-deathmatch and not-in-coop. - * Game/wad: Added support for Boom's new linedef flag pass-through. - * Misc: Renamed as Yadex to avoid confusion with Yet Another Diagram - Editor. - * Misc: Loading pwads: implemented standard directories. If the pwad - to load is in one of the standard directories (or a subdirectory) - you don't have to type the whole name. - * Misc: Loading pwads: added standard directories and made the - messages less verbose for pwads that contain patches - (PP_START/PP_END). - * Misc: Removed segfault during fatal_error() on failure to open the - iwad (DEU). - * Misc: The prompt now groks TTYs with a number of lines other than - 25. - * Misc: Changed the welcome message (a.k.a. "reminder"). - * Misc: Added an "About Yadex..." window. - * Misc: Don't copy SEGS, SSECTORS, NODES, REJECT and BLOCKMAP from - the original file anymore when the map has changed. Makes smaller - wad files. Nice for archival. - * Misc: Added environment variable YADEX_GAME. - * Platform: Ported to X (plain Xlib). This version is not available - for DOS. - * Platform: Now works on big-endian machines. - * Platform: Removed several DOS-isms from file name handling code. - -References - - 1. http://www.teaser.fr/~amajorel/info2ygd/ - 2. http://my.ohio.voyager.net/~mattm/ - 3. ftp://ftp.cdrom.com/pub/idgames/themes/aliens/alntc19a.zip - 4. ftp://ftp.cdrom.com/pub/idgames/levels/doom/a-c/basilica.zip - 5. ftp://ftp.cdrom.com/pub/idgames/levels/doom2/Ports/s-u/strifed1.zip - 6. http://www.netspace.net.au/~ajapted/ - 7. http://lxdoom.linuxgames.com/notes.html#bsp - 8. http://www.teaser.fr/~amajorel/doom/bsp23bug.zip - 9. ftp://ftp.cdrom.com/pub/idgames/source/ + * Code: Removed dereferencing of NULL pointer in + ParseCommandLineOptions() (DEU). + + * Code: Replaced occurrences of "x==TRUE" and "x==FALSE" by "x" and + "!x". + + * Code: Replaced occurrences of "x=TRUE" and "x=FALSE" by "x=1" and + "x=0". + + * Command-line: You don't have anymore to put "-file" or "-pwad" in + front of pwads names on the command line. E.G. you can type "yadex + foo.wad". + + * Command-line: Deleted a few little-used or DOS-specific options. + + * Editing: Menu bar and pop-up menus much improved. + + * Editing: Info bar reworked. + + * Editing: When prompted to "Press a key to continue", you can now + also press the left mouse button. + + * Editing: Grid: the grid step can now adapt automatically as you + zoom in/out. + + * Editing: Grid: whether dragging is snapped to grid is now + independent of whether the grid is shown or not (added flags + grid_snap and grid_shown). + + * Editing: Added finer-grained confirmation options. + + * Editing: General editing: you can now scroll the map further from + the centre of the level. + + * Editing: Added ['] to re-centre the window around the centre of the + map. + + * Editing: Added [`] to re-centre the window around the centre of the + map and adjust the zoom so that the map fills the screen. + + * Editing: Added [&] to show things and vertices numbers. + + * Editing: Autoscroll: scroll speed is now progressive. + + * Editing: Autoscroll: easier to use near the top of the window. + + * Editing: [Left], [Right], [Up], [Down] do nothing. + + * Editing: [Space] does not toggle move fast/slow anymore; it toggles + between nominal zoom and x 4. + + * Editing: Highlighting of things, vertices and linedefs much + improved. + + * Editing: Dragging objects is now done with the left mouse button + instead of the right button. + + * Editing: Editing object properties is now done by double-clicking + on the object. + + * Editing: Selection and drag-and-drop have changed a lot. + + * Editing: Selection box: removed the -a option and the addselbox + parameter. Whether the selection box is additive or not is now + controlled dynamically by the user (with [Ctrl]). + + * Editing: Sprite viewer: sprites are now centred. + + * Editing: Linedef info: shortened flags names to one character. + + * Editing: Linedef info: a missing normal texture on a 1-sided + linedef is now flagged in red. + + * Editing: Linedefs copy: you now have the choice between duplicating + the sidedefs too and reusing the same sidedefs. DEU left the new + linedefs sidedef-less and, so far, Yadex used to reuse the same + sidedefs. + + * Editing: Linedefs: added function to "unlink" sidedefs. + + * Editing: Linedefs: dragging linedefs is much faster than before. + + * Editing: Sectors: in the object info window, added display of floor + and ceiling height delta with respect to previous sector. + + * Editing: Sectors: in the object info window, added display of floor + and ceiling texture. + + * Editing: Sectors: dragging sectors is much faster than before. + + * Editing: Things: now drawn as squares so that it's easier to see + whether they are stuck in a wall or another thing. And you don't + have to highlight them to see their angle. Note: the old shape is + still available by defining ROUND_THINGS at compile-time. + + * Editing: Things: changed the colours again. Tried to make important + things stand out and conversely. Bonuses are now dark green and + player/ deathmatch starts bright green. Keys are magenta. + Decoration is dim blue instead of white. Unknown objects are cyan + instead of white. Weapons are orange instead of brownish. Heretic + sound source things and Boom point pushers are dim turquoise-ish. + + * Editing: Things: the sprite is now shown in the object info window. + + * Editing: Vertices: deciding whether a vertex is on a linedef is now + done on the distance in pixels, not in map units. So you can now + work on very fine details (E.G. vertices only 2 map units away) + provided that the zoom factor is high enough. + + * Editing: Fixed minor glitch in texture viewer that showed with + BIGDOOR7, SKY1, TEKWALL1, TEKWALL5 and others (DEU). + + * Editing: When highlighting a sector, compared SideDefs[LineDef + [n].sidedef1].sector with ObjNum even though .sector was -1. + Somehow it always tested false (DEU). + + * Editing: "Check textures names": the name of the offending texture + is now printed correctly even if it is 8 characters long (DEU). + + * Editing: "Check textures names": if you fixed a missing texture, + the editor was not made aware that you had made changes to the + level (DEU). + + * Editing: Unused sectors are not selected anymore (DEU). + + * Editing: Changing the preferences could overwrite other variables + (DEU). + + * Editing: InputNameFromListWithFunc() used to segfault if you + pressed [Pgdn] on a list shorter than (listdisp + 1) elements + (DEU). + + * Editing: Removed segfault in AlignTexturesX() (DEU). + + * Game/wad: Heretic is now supported. + + * Game/wad: Added support for Boom's new thing flags + not-in-deathmatch and not-in-coop. + + * Game/wad: Added support for Boom's new linedef flag pass-through. + + * Misc: Renamed as Yadex to avoid confusion with Yet Another Diagram + Editor. + + * Misc: Loading pwads: implemented standard directories. If the pwad + to load is in one of the standard directories (or a subdirectory) + you don't have to type the whole name. + + * Misc: Loading pwads: added standard directories and made the + messages less verbose for pwads that contain patches (PP_START/ + PP_END). + + * Misc: Removed segfault during fatal_error() on failure to open the + iwad (DEU). + + * Misc: The prompt now groks TTYs with a number of lines other than + 25. + + * Misc: Changed the welcome message (a.k.a. "reminder"). + + * Misc: Added an "About Yadex..." window. + + * Misc: Don't copy SEGS, SSECTORS, NODES, REJECT and BLOCKMAP from + the original file anymore when the map has changed. Makes smaller + wad files. Nice for archival. + + * Misc: Added environment variable YADEX_GAME. + + * Platform: Ported to X (plain Xlib). This version is not available + for DOS. + + * Platform: Now works on big-endian machines. + + * Platform: Removed several DOS-isms from file name handling code. + diff -uaNr yadex-1.5.2/FAQ yadex-1.6.0/FAQ --- yadex-1.5.2/FAQ 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/FAQ 2001-07-01 11:12:13.000000000 +0200 @@ -0,0 +1,125 @@ + + Fancy logo + Yadex 1.6.0 (2001-06-27) + + Yadex FAQ + +Compilation problems + + warning: comparison between signed and unsigned + Not a problem. GCC is over-sensitive to signedness mismatches. + + In sanity.cc, + warning: decimal integer constant is so large that it is + unsigned + Not a problem. It's a bug in GCC. + + c++: command not found + Are you sure you have a C++ compiler ? If not, install one. If + you do have one, find out how it's called and change the "CXX + =" line in GNUmakefile accordingly. + + X11/Xlib.h: No such file or directory + Are you sure you have the Xlib headers ? If not, install them. + If you already have them, then find out where they are and + change the "X11INCLUDEDIR =" line in GNUmakefile accordingly. + + The compiler chokes on the Xlib headers + This happens on Solaris 2.6 with GCC 2.95.2. Oliver Kraus says + that the solution is to add "-fpermissive" to "CXXFLAGS =" in + GNUmakefile. + + /usr/X11R6/lib/libX11.so: undefined reference to `recv' + /usr/X11R6/lib/libX11.so: undefined reference to `connect' + /usr/X11R6/lib/libX11.so: undefined reference to `socket' + /usr/X11R6/lib/libX11.so: undefined reference to `setsockopt' + /usr/X11R6/lib/libX11.so: undefined reference to `shutdown' + /usr/X11R6/lib/libX11.so: undefined reference to + `gethostbyname' + /usr/X11R6/lib/libX11.so: undefined reference to + `getservbyname' + /usr/X11R6/lib/libX11.so: undefined reference to `getpeername' + /usr/X11R6/lib/libX11.so: undefined reference to `getsockname' + This happens with QNX 6 and other Unices. Add "-lsocket" to + "LDFLAGS =" in GNUmakefile. + + I have GCC 3.0 and Yadex 1.5.1 doesn't compile + Get Yadex 1.5.2 or later. + + I have GCC 2.96 and Yadex 1.5.0 doesn't compile + Get Yadex 1.5.1 or later. + + I have GCC 2.7 and I get lots of errors + GCC 2.7 is a very old compiler, it does not implement the + current C++ standard and I don't support it. If you must, try + applying patch/gcc-2.7.diff that's included in the archive but + don't complain to me if it doesn't work. + + I have EGCS 1.1.2 / SuSE 6.2 and I get + "no matching function for call to `menu_c::menu_c (...)'" + Apparently, there is a bug in certain EGCS 1.1.2 installations + that makes them choke on src/editloop.cc. I know no workaround. + I'd suggest that you try to get a fix from your distributor or + use another compiler. EGCS 1.0.3, EGCS 1.1.1 and GCC 2.95.2 are + known to work. + + Yadex 1.3.1 doesn't compile + There's a thinko in the makefile. It's fixed in version 1.3.2. + + Yadex 1.1.0 doesn't compile + In src/infobar.cc, lines 48 and 49, replace + + const char infobar_c::FILE_NAME_UNSET[1]; // A special pointer value + const char infobar_c::LEVEL_NAME_UNSET[1]; // A special pointer value + + by + + const char infobar_c::FILE_NAME_UNSET[1] = { ' ' }; + const char infobar_c::LEVEL_NAME_UNSET[1] = { ' ' }; + + Yadex 1.0.1 doesn't compile + In src/vector.h, delete line 44 ("return this;") and compile + again. + +Misc. + + I don't have an iwad + You can download certain iwads for free ; + + + [1]Doom 1.8 shareware iwad + + [2]Heretic shareware version + + [3]Hexen demo + + [4]Strife demo + + What about a 3D preview ? + Unless I suddenly become interested in 3D graphics, that is not + going to happen. Besides, I suspect that a better and easier + way to achieve what you're after might be to implement a + reload-level in your favourite Doom port. + + Yadex is slow, particularly when dragging objects + Yes. I plan to replace the current implementation (pixmap) by + drawing directly to the window. The difficulty lies in making + that without generating a lot of flicker. In the meantime, try + the -P option. + + How many people use Yadex ? + I don't know for sure. Each new release gets a few hundred + downloads. + + Why didn't you use ? + I used plain Xlib and not a toolkit for several reasons. + Firstly, I wanted to learn Xlib. Secondly, I reckoned it would + be easier to translate the existing BGI calls to Xlib than to + some higher level toolkit. Thirdly, I feared that depending on + a toolkit would hurt portability. + _________________________________________________________________ + + AYM 2001-06-29 + +References + + 1. ftp://ftp.idsoftware.com/idstuff/doom/doom-1.8.wad.gz + 2. ftp://ftp.idsoftware.com/idstuff/heretic/htic_v12.zip + 3. ftp://ftp.idsoftware.com/idstuff/hexen/hexndemo.zip + 4. http://www.rogue-ent.com/sfiles.html diff -uaNr yadex-1.5.2/GNUmakefile yadex-1.6.0/GNUmakefile --- yadex-1.5.2/GNUmakefile 2001-06-30 23:31:28.000000000 +0200 +++ yadex-1.6.0/GNUmakefile 2003-03-31 18:57:59.000000000 +0200 @@ -1,6 +1,6 @@ # # Makefile for Yadex -# Copyright Andr Majorel 1998-2000. +# Copyright Andr Majorel 1998-2003. # AYM 1998-06-10 # @@ -8,52 +8,51 @@ # rules, addprefix, addsuffix, etc. It's not named "GNUmakefile" # for nothing. -# Don't change these lines. -DEFINES = -VERSION := $(shell cat VERSION) -VERPREV := $(shell test -f VERSION~ && cat VERSION~) - ######################################################################## # -# Definitions that end users +# Definitions that only hackers # might want to change # ######################################################################## -# Where you want "make install" to put things. -# Typical values : "/usr", "/usr/local" and "/opt". -PREFIX = /usr/local - -# Which OS ? -OS := $(shell uname -s | tr A-Z a-z) - -# Can we use GCC to compile BSP ? -HAVE_GCC := $(shell if gcc --version; then echo OK; fi) +# The name of the directory where objects and +# binaries are put. I include the output of +# "uname -a" to make it easier for me to build +# Yadex for different platforms from the same +# source tree. +SYSTEM := $(shell echo `uname -n`_`uname -a | cksum` | tr -dc '[:alnum:]._-') +OBJDIR = obj/0 +DOBJDIR = dobj/0 +OBJPHYSDIR = obj/$(SYSTEM) +DOBJPHYSDIR = dobj/$(SYSTEM) +OBJDIR_ATCLIB = $(OBJDIR)/atclib +DOBJDIR_ATCLIB = $(DOBJDIR)/atclib +OBJPHYSDIR_ATCLIB = $(OBJPHYSDIR)/atclib +DOBJPHYSDIR_ATCLIB = $(DOBJPHYSDIR)/atclib -# Is that /usr/man or /usr/share/man ? -FHS_MAN := $(shell if [ -d $(PREFIX)/share/man ]; then echo OK; fi) +# Create all directories and make symlinks to +# config.cc and config.h. Doing it at the start +# makes things much simpler later on. +DUMMY := $(shell \ + mkdir -p $(OBJPHYSDIR) $(OBJPHYSDIR_ATCLIB); \ + mkdir -p $(DOBJPHYSDIR) $(DOBJPHYSDIR_ATCLIB); \ + [ ! -h $(OBJDIR) ] || rm $(OBJDIR); \ + [ ! -h $(DOBJDIR) ] || rm $(DOBJDIR); \ + ln -s $(SYSTEM) $(OBJDIR); \ + ln -s $(SYSTEM) $(DOBJDIR); \ + ) -# Does your system have gettimeofday() ? -# Current rule: all systems have it. -HAVE_GETTIMEOFDAY = 1 - -# Does your system have nanosleep() ? -# Current rule: only Linux has it. -ifneq (,$(findstring $(OS), linux)) - HAVE_NANOSLEEP = 1 -endif +include $(OBJDIR)/Makefile.config -# Does your system have snprintf() ? -# Current rule: only Linux has it. -ifneq (,$(findstring $(OS), linux)) - HAVE_SNPRINTF = 1 -endif +######################################################################## +# +# Definitions that end users +# might want to change +# +######################################################################## -# Does your system have usleep() ? -# Current rule: all unices have it. -ifdef OS - HAVE_USLEEP = 1 -endif +# Which OS ? +OS := $(shell uname -s | tr A-Z a-z) # Where your X11 libraries and headers reside. # Current rule: @@ -73,25 +72,25 @@ endif endif -# Your C and C++ compilers. -CC = cc -CXX = c++ +# C and C++ compiler +#CC = cc +#CXX = c++ # Options used when compiling Atclib. CFLAGS = -O # Options used when compiling and linking Yadex. -# ld is invoked through the C++ compiler -# so LDFLAGS should not contain options that mean +# ld is invoked through the C++ compiler so +# LDFLAGS should not contain options that mean # something to the C++ compiler. -CXXFLAGS = -O -I$(X11INCLUDEDIR) -LDFLAGS = +CXXFLAGS = -O +#LDFLAGS = # Options used to compile and link the debugging # targets. Not used by normal end-user targets. # Unlike CFLAGS, CXXFLAGS and LDFLAGS, assume # GCC/EGCS. -DCFLAGS = -g -O -I$(X11INCLUDEDIR) +DCFLAGS = -g -O DCFLAGS += -Wall # GCC warnings DCFLAGS += -pedantic # GCC warnings DCFLAGS += -Wno-parentheses # GCC warnings @@ -104,7 +103,7 @@ DCFLAGS += -Winline # GCC warnings DCFLAGS += -pg # Profiling -DCXXFLAGS = -g -O -I$(X11INCLUDEDIR) +DCXXFLAGS = -g -O DCXXFLAGS += -Wall # GCC warnings DCXXFLAGS += -pedantic # GCC warnings DCXXFLAGS += -Wno-parentheses # GCC warnings @@ -130,13 +129,15 @@ ######################################################################## MAKEFILE = GNUmakefile +VERSION := $(shell cat VERSION) +VERPREV := $(shell test -f VERPREV && cat VERPREV) # All the modules of Yadex without path or extension. -MODULES_YADEX =\ +MODULES_YADEX = \ acolours aym bench bitvec \ - cfgfile checks colour1 \ - colour2 colour3 colour4 dependcy \ - dialog disppic drawmap \ + cfgfile checks colour1 colour2 \ + colour3 colour4 config credits \ + dependcy dialog disppic drawmap \ edisplay editgrid editlev editloop \ editobj editsave endian editzoom \ entry entry2 events flats \ @@ -146,28 +147,27 @@ img imgscale imgspect infobar \ input l_align l_centre l_flags \ l_misc l_prop l_unlink l_vertices \ - levels lists lumpdir macro \ - memory menubar menu mkpalette \ - mouse names nop objects \ - objinfo oldmenus palview patchdir \ - pic2img prefer s_centre s_door \ - s_lift s_linedefs s_merge s_misc \ - s_prop s_split s_swapf s_vertices \ - sanity \ - savepic scrnshot selbox selectn \ - selpath selrect serialnum spritdir \ - sticker swapmem t_centre t_flags \ - t_prop \ - t_spin textures things trace \ - v_centre v_merge v_polyg vectext \ - verbmsg \ - version wadnamec wadres wads \ - wads2 warn windim x_centre \ - x_exchng x_mirror x_rotate x11 \ - xref yadex ytime + levels lists locate lumpdir \ + macro memory menubar menu \ + mkpalette mouse names nop \ + objects objinfo oldmenus palview \ + patchdir pic2img prefer s_centre \ + s_door s_lift s_linedefs s_merge \ + s_misc s_prop s_slice s_split \ + s_swapf s_vertices sanity scrnshot \ + selbox selectn selpath selrect \ + serialnum spritdir sticker swapmem \ + t_centre t_flags t_prop t_spin \ + textures things trace v_centre \ + v_merge v_polyg vectext verbmsg \ + version wadfile wadlist wadnamec \ + wadres wads wads2 warn \ + windim x_centre x_exchng x_hover \ + x_mirror x_rotate x11 xref \ + yadex ytime # All the modules of Atclib without path or extension. -MODULES_ATCLIB =\ +MODULES_ATCLIB = \ al_adigits al_aerrno al_astrerror al_fana \ al_fnature al_lateol al_lcount al_lcreate \ al_ldelete al_ldiscard al_lgetpos al_linsert \ @@ -178,68 +178,32 @@ al_sapc al_saps al_scps al_scpslower \ al_sdup al_sisnum al_strolc -# All the modules of BSP without path or extension. -MODULES_BSP =\ - bsp funcs makenode picknode - -# The source files of Yadex, Atclib and BSP +# The source files of Yadex and Atclib SRC_YADEX = $(addprefix src/, $(addsuffix .cc, $(MODULES_YADEX))) SRC_ATCLIB = $(addprefix atclib/, $(addsuffix .c, $(MODULES_ATCLIB))) -SRC_BSP = $(addprefix bsp-2.3/, $(addsuffix .c, $(MODULES_BSP))) -# The headers of Yadex, Atclib and BSP +# The headers of Yadex and Atclib HEADERS_YADEX := $(wildcard src/*.h) HEADERS_ATCLIB = atclib/atclib.h -HEADERS_BSP = bsp-2.3/bsp.h bsp-2.3/structs.h # All the source files, including the headers. -SRC = $(SRC_YADEX) $(HEADERS_YADEX)\ - $(SRC_ATCLIB) $(HEADERS_ATCLIB)\ - $(SRC_BSP) $(HEADERS_BSP) +SRC = $(filter-out src/config.cc, $(SRC_YADEX)) \ + $(filter-out src/config.h, $(HEADERS_YADEX)) \ + $(SRC_ATCLIB) $(HEADERS_ATCLIB) # The files on which youngest is run. -SRC_NON_GEN = $(filter-out src/version.cc, $(SRC)) - -# Defines used when compiling Yadex. -# If you change Y_UNIX for Y_DOS or Y_X11 for Y_BGI, -# don't even expect it to compile. As of this release, -# the DOS/BGI version is _broken_. -DEFINES += -DY_UNIX -DY_X11 -#DEFINES += -DY_ALPHA -#DEFINES += -DY_BETA -ifdef HAVE_GETTIMEOFDAY - DEFINES += -DY_GETTIMEOFDAY -endif -ifdef HAVE_NANOSLEEP - DEFINES += -DY_NANOSLEEP -endif -ifdef HAVE_SNPRINTF - DEFINES += -DY_SNPRINTF -endif -ifdef HAVE_USLEEP - DEFINES += -DY_USLEEP -endif +SRC_NON_GEN = $(filter-out src/credits.cc src/prefix.cc src/version.cc, $(SRC)) -# The name of the directory where objects and binaries -# are put. I include the output of "uname -a" to make -# it easier for me to build Yadex for different platforms -# from the same source tree. -OBJSUBDIR := $(shell uname -a | tr -c "[:alnum:]._-" "[_*]") -OBJDIR = obj/0 -DOBJDIR = dobj/0 -OBJPHYSDIR = obj/$(OBJSUBDIR) -DOBJPHYSDIR = dobj/$(OBJSUBDIR) -OBJDIR_ATCLIB = $(OBJDIR)/atclib -DOBJDIR_ATCLIB = $(DOBJDIR)/atclib -OBJPHYSDIR_ATCLIB = $(OBJPHYSDIR)/atclib -DOBJPHYSDIR_ATCLIB = $(DOBJPHYSDIR)/atclib +# The object files +OBJ_CONFIG =# $(OBJDIR)/config.o +DOBJ_CONFIG =# $(DOBJDIR)/config.o OBJ_YADEX = $(addprefix $(OBJDIR)/, $(addsuffix .o, $(MODULES_YADEX))) DOBJ_YADEX = $(addprefix $(DOBJDIR)/, $(addsuffix .o, $(MODULES_YADEX))) -OBJ_ATCLIB = $(addprefix $(OBJDIR_ATCLIB)/, $(addsuffix .o, $(MODULES_ATCLIB))) -DOBJ_ATCLIB = $(addprefix $(DOBJDIR_ATCLIB)/, $(addsuffix .o, $(MODULES_ATCLIB))) +OBJ_ATCLIB = $(addprefix $(OBJDIR_ATCLIB)/, $(addsuffix .o,$(MODULES_ATCLIB))) +DOBJ_ATCLIB = $(addprefix $(DOBJDIR_ATCLIB)/, $(addsuffix .o,$(MODULES_ATCLIB))) # The game definition files. -YGD = $(addprefix ygd/,\ +YGD = $(addprefix ygd/, \ doom.ygd doom02.ygd doom04.ygd doom05.ygd \ doom2.ygd doompr.ygd heretic.ygd hexen.ygd \ strife.ygd strife10.ygd) @@ -247,14 +211,14 @@ # Files that are used with scripts/process to # generate files that are included in the # distribution archive. -DOC1_SRC =\ +DOC1_SRC = \ docsrc/README \ docsrc/README.doc # Files that are used with scripts/process to # generate files that go in the doc/ directory # and are NOT included in the archive. -DOC2_SRC_HTML =\ +DOC2_SRC_HTML = \ docsrc/advanced.html \ docsrc/contact.html \ docsrc/credits.html \ @@ -268,6 +232,7 @@ docsrc/index.html \ docsrc/keeping_up.html \ docsrc/legal.html \ + docsrc/packagers_guide.html \ docsrc/palette.html \ docsrc/reporting.html \ docsrc/tips.html \ @@ -277,15 +242,14 @@ docsrc/wad_specs.html \ docsrc/ygd.html -DOC2_SRC_MISC =\ - bsp-2.3/ybsp.6 \ +DOC2_SRC_MISC = \ docsrc/yadex.6 \ # docsrc/yadex.lsm\ # Files that must be put in the distribution # archive. Most (but not all) are generated from # $(DOC1_SRC_*) into the base directory. -DOC1 = README doc/README +DOC1 = FAQ README doc/README # Files that go in the doc/ directory and must # NOT be put in the distribution archive. Most @@ -295,69 +259,108 @@ # Misc. other files that must be put in the # distribution archive. -MISC_FILES =\ - src/.srcdate \ - src/.uptodate \ - CHANGES \ - COPYING \ - COPYING.LIB \ - GNUmakefile \ - Makefile \ - TODO \ - VERSION \ - bsp-2.3/bsp23x.txt \ - bsp-2.3/transdor.wad \ - docsrc/.pixlist \ - yadex.cfg \ +MISC_FILES = \ + boost/boost/config.hpp \ + boost/boost/config/compiler/borland.hpp \ + boost/boost/config/compiler/comeau.hpp \ + boost/boost/config/compiler/common_edg.hpp \ + boost/boost/config/compiler/compaq_cxx.hpp \ + boost/boost/config/compiler/gcc.hpp \ + boost/boost/config/compiler/greenhills.hpp \ + boost/boost/config/compiler/hp_acc.hpp \ + boost/boost/config/compiler/intel.hpp \ + boost/boost/config/compiler/kai.hpp \ + boost/boost/config/compiler/metrowerks.hpp \ + boost/boost/config/compiler/mpw.hpp \ + boost/boost/config/compiler/sgi_mipspro.hpp \ + boost/boost/config/compiler/sunpro_cc.hpp \ + boost/boost/config/compiler/vacpp.hpp \ + boost/boost/config/compiler/visualc.hpp \ + boost/boost/config/platform/aix.hpp \ + boost/boost/config/platform/beos.hpp \ + boost/boost/config/platform/bsd.hpp \ + boost/boost/config/platform/cygwin.hpp \ + boost/boost/config/platform/hpux.hpp \ + boost/boost/config/platform/irix.hpp \ + boost/boost/config/platform/linux.hpp \ + boost/boost/config/platform/macos.hpp \ + boost/boost/config/platform/solaris.hpp \ + boost/boost/config/platform/win32.hpp \ + boost/boost/config/posix_features.hpp \ + boost/boost/config/select_compiler_config.hpp \ + boost/boost/config/select_platform_config.hpp \ + boost/boost/config/select_stdlib_config.hpp \ + boost/boost/config/stdlib/dinkumware.hpp \ + boost/boost/config/stdlib/libstdcpp3.hpp \ + boost/boost/config/stdlib/modena.hpp \ + boost/boost/config/stdlib/msl.hpp \ + boost/boost/config/stdlib/roguewave.hpp \ + boost/boost/config/stdlib/sgi.hpp \ + boost/boost/config/stdlib/stlport.hpp \ + boost/boost/config/stdlib/vacpp.hpp \ + boost/boost/config/suffix.hpp \ + boost/boost/config/user.hpp \ + boost/boost/smart_ptr.hpp \ + boost/boost/static_assert.hpp \ + boost/boost/utility.hpp \ + boost/boost/utility/base_from_member.hpp \ + boost/boost/utility_fwd.hpp \ + cache/copyright.man \ + cache/copyright.txt \ + cache/pixlist \ + cache/srcdate \ + cache/uptodate \ + configure \ + docsrc/copyright \ + CHANGES \ + COPYING \ + COPYING.LIB \ + GNUmakefile \ + Makefile \ + TODO \ + VERSION \ + yadex.cfg \ yadex.dep # The images used in the HTML doc. FIXME: "&1 - -.PHONY: ybsp -ybsp: $(BINDIR)/ybsp - -$(BINDIR)/ybsp: $(SRC_BSP) $(HEADERS_BSP) $(MAKEFILE) - @echo -ifdef HAVE_GCC - @echo Compiling and linking BSP with gcc - @gcc bsp-2.3/bsp.c -DYADEX_VERSION=\"$(VERSION)\" \ - -O2 -Wall -Winline -finline-functions -ffast-math -lm -o $@ -else - @echo Compiling and linking BSP with cc - @$(CC) bsp-2.3/bsp.c -DYADEX_VERSION=\"$(VERSION)\" -O2 -lm -o $@ -endif +$(OBJDIR)/yadex: $(OBJ_CONFIG) $(OBJ_YADEX) $(OBJ_ATCLIB) $(MAKEFILE) + @echo "** Linking Yadex" + $(CXX) $(OBJ_CONFIG) $(OBJ_YADEX) $(OBJ_ATCLIB) -o $@ \ + -L$(X11LIBDIR) -lX11 -lm -lc $(LDFLAGS) .PHONY: test test: - $(BINDIR)/yadex $(A) + $(OBJDIR)/yadex $(A) .PHONY: install -install: - @echo - @scripts/mkinstalldirs $(INST_BINDIR) - @scripts/mkinstalldirs $(INST_CFGDIR) - @scripts/mkinstalldirs $(INST_MANDIR) - @scripts/mkinstalldirs $(INST_YGDDIR) - @echo Installing yadex and ybsp in $(INST_BINDIR) - cp -p $(BINDIR)/yadex $(INST_BINDIR)/yadex-$(VERSION) 2>&1 - ln -sf yadex-$(VERSION) $(INST_BINDIR)/yadex 2>&1 - cp -p $(BINDIR)/ybsp $(INST_BINDIR)/ybsp-$(VERSION) 2>&1 - ln -sf ybsp-$(VERSION) $(INST_BINDIR)/ybsp 2>&1 - @echo Installing man pages in $(INST_MANDIR) - cp -p doc/yadex.6 $(INST_MANDIR) 2>&1 - cp -p doc/ybsp.6 $(INST_MANDIR) 2>&1 - @echo Installing game definition files in $(INST_YGDDIR) - cp -p $(YGD) $(INST_YGDDIR) 2>&1 - @echo Installing configuration file in $(INST_CFGDIR) - cp -p yadex.cfg $(INST_CFGDIR) 2>&1 - chmod a+w $(INST_CFGDIR)/yadex.cfg 2>&1 +install: $(OBJDIR)/install + @scripts/mkinstalldirs $(BINDIR) + @scripts/mkinstalldirs $(ETCDIR) + @scripts/mkinstalldirs $(MANDIR) + @scripts/mkinstalldirs $(MANDIR)/man6 + @scripts/mkinstalldirs $(SHAREDIR) + $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION) + rm -f $(BINDIR)/yadex + ln -s yadex-$(VERSION) $(BINDIR)/yadex + $(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6 + rm -f $(MANDIR)/man6/yadex.6 + ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6 + $(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD) + $(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg @echo "---------------------------------------------------------------" @echo " Yadex is now installed." @echo @echo " Before you run it, enter the paths to your iwads in" - @echo " $(INST_CFGDIR)/yadex.cfg." + @echo " $(ETCDIR)/yadex.cfg or ~/.yadex/yadex.cfg." @echo " When you're done, type \"yadex\" to start." - @echo " If you're confused, take a look at index.html." + @echo " If you're confused, take a look at doc/index.html." @echo - @echo " Good editing !" + @echo " Happy editing !" @echo "---------------------------------------------------------------" .PHONY: clean clean: - rm -r $(OBJPHYSDIR) + rm -f $(OBJ_CONFIG) $(OBJ_YADEX) $(OBJ_ATCLIB) $(OBJDIR)/yadex + rm -f $(DOBJ_CONFIG) $(DOBJ_YADEX) $(DOBJ_ATCLIB) $(DOBJDIR)/yadex + rm -f $(OBJDIR)/ftime + rm -f $(OBJDIR)/install + rm -f $(OBJDIR)/notexist + rm -f $(OBJDIR) + rm -f $(DOBJDIR) + rm -rf doc .PHONY: dclean dclean: - rm -r $(DOBJPHYSDIR) + rm -rf $(DOBJPHYSDIR) + rm -f $(DOBJDIR) .PHONY: doc -doc: docsrc/.pixlist docdirs $(DOC1) doc2 +doc: cache/pixlist docdirs $(DOC1) doc2 # Have to put it separately because evaluation -# of $(DOC2) requires docsrc/.pixlist to exist. +# of $(DOC2) requires cache/pixlist to exist. .PHONY: doc2 doc2: $(DOC2) .PHONY: help help: @echo User targets: - @echo "make [all] Build Yadex and BSP" - @echo "make yadex Build Yadex" - @echo "make ybsp Build BSP" - @echo "make test [A=args] Test Yadex" - @echo "make install [PREFIX=dir] Install Yadex and BSP" + @echo "make [all] Build everything" + @echo "make yadex Build Yadex" + @echo "make test [A=args] Test Yadex" + @echo "make install Install everything" + @echo "make showconf Show current configuration" @echo @echo Hacker targets: - @echo "make dall Build debug version of Yadex and BSP" + @echo "make dall Build debug version of everything" @echo "make dyadex Build debug version of Yadex" - @echo "make dybsp Build debug version of BSP" @echo "make dtest [A=args] Test debug version of Yadex" @echo "make dg Run debug version of Yadex through gdb" @echo "make dd Run debug version of Yadex through ddd" @@ -466,7 +456,6 @@ @echo "make ps View man page with gv" @echo "make dist Create distribution archive" @echo "make save Create backup archive" - @echo "make showconf Show current configuration" ######################################################################## @@ -482,142 +471,130 @@ .PHONY: save save: - tar -zcvf yadex-$$(date '+%Y%m%d').tgz\ - --exclude "*.wad"\ - --exclude "*.zip"\ - --exclude "core"\ - --exclude "dos/*"\ - --exclude "obj"\ - --exclude "dobj"\ - --exclude "old/*"\ - --exclude "*~"\ - --exclude "*.bak"\ - --exclude "web/arc"\ - --exclude yadex-$$(date '+%Y%m%d').tgz\ + tar -Icvf yadex-$$(date '+%Y%m%d').tar.bz2 \ + --exclude "*.wad" \ + --exclude "*.zip" \ + --exclude "core" \ + --exclude "dos/*" \ + --exclude "obj" \ + --exclude "dobj" \ + --exclude "old/*" \ + --exclude "*~" \ + --exclude "*.bak" \ + --exclude "web/arc" \ + --exclude yadex-$$(date '+%Y%m%d').tar.bz2 \ . .PHONY: dall -dall: yadex.dep ddirs dyadex dybsp $(YGD) +dall: yadex.dep dyadex $(YGD) .PHONY: dyadex -dyadex: ddirs $(DBINDIR)/yadex +dyadex: $(DOBJDIR)/yadex -$(DBINDIR)/yadex: $(DOBJ_YADEX) $(DOBJ_ATCLIB) $(MAKEFILE) - @echo - @echo Linking Yadex - @$(CXX) $(DOBJ_YADEX) $(DOBJ_ATCLIB) -o $@\ - -L$(X11LIBDIR) -lc -lm -lX11 $(DLDFLAGS) 2>&1 - -.PHONY: dybsp -dybsp: ddirs $(DBINDIR)/ybsp - -$(DBINDIR)/ybsp: $(SRC_BSP) $(HEADERS_BSP) $(MAKEFILE) - @echo - @echo Compiling and linking BSP - @$(CC) bsp-2.3/bsp.c -Wall -Winline -O2 -finline-functions\ - -ffast-math -lm -o $@ +$(DOBJDIR)/yadex: $(DOBJ_CONFIG) $(DOBJ_YADEX) $(DOBJ_ATCLIB) $(MAKEFILE) + @echo "** Linking Yadex" + $(CXX) $(DOBJ_CONFIG) $(DOBJ_YADEX) $(DOBJ_ATCLIB) -o $@ \ + -L$(X11LIBDIR) -lX11 -lm -lc $(DLDFLAGS) .PHONY: dtest dtest: - $(DBINDIR)/yadex $(A) - gprof $(DBINDIR)/yadex >gprof.out + $(DOBJDIR)/yadex $(A) + gprof $(DOBJDIR)/yadex >gprof.out .PHONY: dg dg: - gdb $(DBINDIR)/yadex + gdb $(DOBJDIR)/yadex .PHONY: dd dd: - ddd $(DBINDIR)/yadex + ddd $(DOBJDIR)/yadex + +.PHONY: asm +asm: $(addprefix $(OBJDIR)/, $(addsuffix .S, $(MODULES_YADEX))) # Generate the distribution archives. Requires GNU tar, -# GNU cp, gzip and optionally bzip2. bzip2 is cool but, -# in this case, it's 900% slower than gzip while being -# only 15% more efficient. That's why the creation -# of the .tar.bz2 archive is commented out. +# GNU cp, gzip and optionally bzip2 (if distbz2 is +# uncommented). .PHONY: dist dist: changes distimage distgz distdiff #distbz2 - @echo "> Removing distribution image tree $(ARCHIVE)" + @echo "** Removing distribution image tree $(ARCHIVE)" rm -r $(ARCHIVE) .PHONY: distimage distimage: all $(ARC_FILES) - @echo "> Creating distribution image tree $(ARCHIVE)" - @[ ! -e $(ARCHIVE) ] || (echo "Error: $(ARCHIVE) already exists"; false) + @echo "** Creating distribution image tree $(ARCHIVE)" + rm -rf $(ARCHIVE) scripts/mkinstalldirs $(ARCHIVE) @tar -cf - $(ARC_FILES) | (cd $(ARCHIVE); tar -xf -) .PHONY: distgz distgz: distimage - @echo "> Creating gzipped distribution" + @echo "** Creating tar.gz distribution" tar -czf $(ARCHIVE).tar.gz $(ARCHIVE) .PHONY: distbz2 distbz2: distimage - @echo "> Creating bzip2'd distribution" + @echo "** Creating .tar.bz2 distribution" tar -cIf $(ARCHIVE).tar.bz2 $(ARCHIVE) .PHONY: distdiff TMP0 = $$HOME/tmp TMPPREV = $(TMP0)/$(ARCPREV) TMPCURR = $(TMP0)/$(ARCHIVE) -TMPDIFF = $(TMP0)/$(ARCDIFF) -DIFF = $(TMP0)/$(ARCDIFF)/$(ARCDIFF) distdiff: - @echo "> Building the diff distribution" - @echo ">> Creating the diff" - @[ ! -e $(TMPPREV) ] || (echo "Error: $(TMPPREV) already exists"; false) - @[ ! -e $(TMPCURR) ] || (echo "Error: $(TMPCURR) already exists"; false) - @[ ! -e $(TMPDIFF) ] || (echo "Error: $(TMPDIFF) already exists"; false) - tar -xzf $(ARCHIVE).tar.gz -C $(TMP0) + @echo "** Building the diff distribution" + @echo "Creating the diff" + rm -rf $(TMPPREV) $(TMPCURR) $(TMPDIFF) + mkdir -p $(TMP0) + tar -xzf $(ARCHIVE).tar.gz -C $(TMP0) tar -xzf ../yadex-arc/pub/$(ARCPREV).tar.gz -C $(TMP0) - mkdir -p $(TMPDIFF) - cd $(TMP0) && (diff -uNr $(ARCPREV) $(ARCHIVE) >$(DIFF) || true) - #! grep "Binary files y.* and .* differ" $(DIFF) - scripts/process docsrc/README.diff >$(TMPDIFF)/README - cd $(TMP0) && tar -czf $(ARCDIFF).tar.gz $(ARCDIFF) - cd $(TMPO) && rm -rf $(ARCDIFF) - cd $(TMP0) && tar -xzf $(ARCDIFF).tar.gz - @echo ">> Verifying the diff" - cd $(TMPPREV) && patch -p1 <../$(ARCDIFF)/$(ARCDIFF) - cd $(TMP0) && diff -r $(ARCPREV) $(ARCHIVE) - mv $(TMPDIFF).tar.gz . - @echo ">> Cleaning up" + scripts/process docsrc/README.diff >$(TMP0)/$(ARCDIFF) + echo >>$(TMP0)/$(ARCDIFF) + cd $(TMP0) && (diff -uaNr $(ARCPREV) $(ARCHIVE) >>$(ARCDIFF) || true) + @# KLUDGE - On my system, just "! grep" makes make choke + true; ! grep "^Binary files .* and .* differ" $(TMP0)/$(ARCDIFF) + gzip -f $(TMP0)/$(ARCDIFF) + @echo "Verifying the diff" + cd $(TMPPREV) && gzip -d <../$(ARCDIFF).gz | patch -p1 + @# FIXME remove -N after 1.6 is done, it's there because + @# uptodate has been moved between 1.5 and 1.6 and since + @# it's empty it remains in $(ARCPREV). + cd $(TMP0) && diff -rP $(ARCHIVE) $(ARCPREV) + mv $(TMP0)/$(ARCDIFF).gz . + @echo "Cleaning up" cd $(TMP0) && rm -rf $(ARCPREV) cd $(TMP0) && rm -rf $(ARCHIVE) - cd $(TMP0) && rm -rf $(ARCDIFF) .PHONY: showconf showconf: @echo "ARCHIVE \"$(ARCHIVE)\"" + @echo "BINDIR \"$(BINDIR)\"" @echo "CC \"$(CC)\"" @echo "CFLAGS \"$(CFLAGS)\"" @echo "CXX \"$(CXX)\"" @echo "CXXFLAGS \"$(CXXFLAGS)\"" @echo "DCFLAGS \"$(DCFLAGS)\"" @echo "DCXXFLAGS \"$(DCXXFLAGS)\"" - @echo "DEFINES \"$(DEFINES)\"" @echo "DLDFLAGS \"$(DLDFLAGS)\"" - @echo "FHS_MAN \"$(FHS_MAN)\"" - @echo "HAVE_GCC \"$(HAVE_GCC)\"" + @echo "ETCDIR \"$(ETCDIR)\"" + @echo "ETCDIRNV \"$(ETCDIRNV)\"" @echo "HAVE_GETTIMEOFDAY \"$(HAVE_GETTIMEOFDAY)\"" @echo "HAVE_NANOSLEEP \"$(HAVE_NANOSLEEP)\"" @echo "HAVE_SNPRINTF \"$(HAVE_SNPRINTF)\"" @echo "HAVE_USLEEP \"$(HAVE_USLEEP)\"" - @echo "INST_BINDIR \"$(INST_BINDIR)\"" - @echo "INST_CFGDIR \"$(INST_CFGDIR)\"" - @echo "INST_MANDIR \"$(INST_MANDIR)\"" - @echo "INST_YGDDIR \"$(INST_YGDDIR)\"" @echo "LDFLAGS \"$(LDFLAGS)\"" - @echo "OBJSUBDIR \"$(OBJSUBDIR)\"" + @echo "MANDIR \"$(MANDIR)\"" @echo "OS \"$(OS)\"" @echo "PREFIX \"$(PREFIX)\"" + @echo "SHAREDIR \"$(SHAREDIR)\"" + @echo "SHAREDIRNV \"$(SHAREDIRNV)\"" @echo "SHELL \"$(SHELL)\"" + @echo "SYSTEM \"$(SYSTEM)\"" @echo "VERSION \"$(VERSION)\"" @echo "X11INCLUDEDIR \"$(X11INCLUDEDIR)\"" @echo "X11LIBDIR \"$(X11LIBDIR)\"" - @echo "c++ --version \"`c++ --version`\"" - @echo "cc --version \"`cc --version`\"" + @echo "CXX --version \"`$(CXX) --version`\"" + @echo "CC --version \"`$(CC) --version`\"" @echo "shell \"$$SHELL\"" @echo "uname \"`uname`\"" @@ -629,6 +606,17 @@ # ######################################################################## +# If Makefile.config doesn't exist, give a hint... +$(OBJDIR)/Makefile.config: + @echo "Sorry guv'nor, but... did you run ./configure ?" >&2 + @false + +$(OBJDIR)/files_etc.man: $(OBJDIR)/config.etc $(MAKEFILE) + sed 's/%v/$(VERSION)/g; s,.*,.B &/yadex.cfg,' $< >$@ + +$(OBJDIR)/files_share.man: $(OBJDIR)/config.share $(MAKEFILE) + sed 's/%v/$(VERSION)/g; s,.*,.BI &/ game .ygd,' $< >$@ + # Dependencies of the modules of Yadex # -Y is here to prevent the inclusion of dependencies on # /usr/include/*.h etc. As a side-effect, it generates many @@ -646,162 +634,152 @@ # Note: the modules of Atclib are not scanned as they all # depend on $(HEADERS_ATCLIB) and nothing else. -yadex.dep: $(SRC_YADEX) - @echo - @echo makedepend - @makedepend -f- -Y -Iatclib $(DEFINES) $(SRC_YADEX) 2>/dev/null\ - | awk 'sub (/^src/, "") == 1 {\ - print "'$(OBJDIR)'" $$0;\ - print "'$(DOBJDIR)'" $$0;\ - next;\ +yadex.dep: $(SRC_NON_GEN) + @echo "Generating $@" + @makedepend -f- -Y -Iatclib $(SRC_NON_GEN) 2>/dev/null \ + | awk 'sub (/^src/, "") == 1 { \ + print "'$(OBJDIR)'" $$0; \ + print "'$(DOBJDIR)'" $$0; \ + next; \ }' >$@ +cache/copyright.man: $(MAKEFILE) scripts/copyright docsrc/copyright + scripts/copyright -m docsrc/copyright >$@ + +cache/copyright.txt: $(MAKEFILE) scripts/copyright docsrc/copyright + scripts/copyright -t docsrc/copyright | sed 's/^./ &/' >$@ + # The YYYY-MM-DD date indicated in the parentheses after the # version number is the mtime of the most recent source file # (where "being a source file" is defined as "being listed in # $(SRC_NON_GEN)"). That string is the output of a perl script, # scripts/youngest. Since perl is not necessarily installed on -# all machines, we cache that string in the file src/.srcdate +# all machines, we cache that string in the file cache/srcdate # and include that file in the distribution archive. If we # didn't do that, people who don't have perl would be unable to # build Yadex. # -# Conceptually, src/.srcdate depends on $(SRC_NON_GEN) and -# doc/*.html depend on src/.srcdate. However, we can't write the +# Conceptually, cache/srcdate depends on $(SRC_NON_GEN) and +# doc/*.html depend on cache/srcdate. However, we can't write the # makefile that way because if we did, that would cause two # problems. Firstly every time a source file is changed, # scripts/youngest would be ran, most of the time for nothing # since its output is always the same, unless it's never been -# run today. Secondly, src/.srcdate being just generated, it's +# run today. Secondly, cache/srcdate being just generated, it's # more recent than the content of the doc/ directory. The result # would be that the entire doc/ directory would be rebuilt every # time a single source file is changed, which is guaranteed to # have an unnerving effect on the hacker at the keyboard. # # Part of the solution is to systematically force the mtime of -# src/.srcdate to 00:00, today. Thus, src/.srcdate always looks +# cache/srcdate to 00:00, today. Thus, cache/srcdate always looks # older than the content of the doc/ directory, unless it's not # been refreshed yet today. # -# But that's not enough because then src/.srcdate also looks +# But that's not enough because then cache/srcdate also looks # always older than the source files it depends on, and thus # make attempts to regenerate it every time make is invoked at -# all, which would render the very existence of src/.srcdate -# useless. That's why we have another file, src/.uptodate, that +# all, which would render the very existence of cache/srcdate +# useless. That's why we have another file, cache/uptodate, that # we touch to keep track of the time when we last generated -# src/.srcdate. +# cache/srcdate. # # If there was a such thing as _date-only_ dependencies, I could # get away with just this : # -# src/.srcdate: scripts/youngest -# src/.srcdate $(SRC_NON_GEN) +# cache/srcdate: scripts/youngest +# cache/srcdate $(SRC_NON_GEN) # if perl -v >/dev/null 2>&1; then\ # scripts/youngest >$@;\ # else\ # blah... -# doc/*.html src/.srcdate +# doc/*.html cache/srcdate # blah... # # That would save two calls to "touch", one intermediary -# dependency (src/.uptodate) and a lot of obfuscation. - -src/.srcdate: src/.uptodate +# dependency (cache/uptodate) and a lot of obfuscation. +cache/srcdate: cache/uptodate -src/.uptodate: scripts/youngest $(SRC_NON_GEN) - @if perl -v >/dev/null 2>&1; then\ - echo Generating src/.srcdate;\ - scripts/youngest $(SRC_NON_GEN) >src/.srcdate;\ - touch -t `date '+%m%d'`0000 src/.srcdate;\ - elif [ -f src/.srcdate ]; then\ - echo Perl not available. Keeping old src/.srcdate;\ - else\ - echo Perl not available. Creating bogus src/.srcdate;\ - date '+%Y-%m-%d' >src/.srcdate;\ +cache/uptodate: scripts/youngest $(SRC_NON_GEN) + @mkdir -p cache + @if perl -v >/dev/null 2>&1; then \ + echo Generating cache/srcdate; \ + scripts/youngest $(SRC_NON_GEN) >cache/srcdate; \ + touch -t `date '+%m%d'`0000 cache/srcdate; \ + elif [ -r cache/srcdate ]; then \ + echo Perl not available. Keeping old cache/srcdate; \ + else \ + echo Perl not available. Creating bogus cache/srcdate; \ + date '+%Y-%m-%d' >cache/srcdate; \ fi @touch $@; -# Directories where objects and binaries are put. +# To compile the modules of Yadex # (normal and debugging versions) +include yadex.dep -.PHONY: dirs -dirs: - @if [ ! -d $(OBJPHYSDIR)\ - -o ! -d $(OBJPHYSDIR_ATCLIB) ];\ - then\ - echo Creating object directories;\ - scripts/mkinstalldirs $(OBJPHYSDIR) 2>&1;\ - scripts/mkinstalldirs $(OBJPHYSDIR_ATCLIB) 2>&1;\ - fi - @if [ -e $(OBJDIR) ]; then rm $(OBJDIR) 2>&1; fi - @ln -sf $(OBJSUBDIR) $(OBJDIR) 2>&1 - -.PHONY: ddirs -ddirs: - @if [ ! -d $(DOBJPHYSDIR)\ - -o ! -d $(DOBJPHYSDIR_ATCLIB) ];\ - then\ - echo Creating object directories;\ - scripts/mkinstalldirs $(DOBJPHYSDIR) 2>&1;\ - scripts/mkinstalldirs $(DOBJPHYSDIR_ATCLIB) 2>&1;\ - fi - @if [ -e $(DOBJDIR) ]; then rm $(DOBJDIR) 2>&1; fi - @ln -sf $(OBJSUBDIR) $(DOBJDIR) 2>&1 +# It's simpler to copy config.cc into src/ than to have a +# compilation rule for just one file. +src/config.cc: $(OBJDIR)/config.cc + cp -p $< $@ -# To compile the modules of Yadex -# (normal and debugging versions) +src/config.h: $(OBJDIR)/config.h + cp -p $< $@ -include yadex.dep $(OBJDIR)/%.o: src/%.cc - @echo - @echo $(CXX) $< - @$(CXX) $(CXXFLAGS) -c -Iatclib $(DEFINES) $< -o $@ 2>&1 + $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(CXXFLAGS) $< -o $@ $(DOBJDIR)/%.o: src/%.cc - @echo - @echo $(CXX) $< - @$(CXX) $(DCXXFLAGS) -c -Iatclib $(DEFINES) $< -o $@ 2>&1 + $(CXX) -c -Iatclib -Iboost -I$(X11INCLUDEDIR) $(DCXXFLAGS) $< -o $@ # To compile the modules of Atclib # (normal and debugging versions) - $(OBJDIR_ATCLIB)/%.o: atclib/%.c $(HEADERS_ATCLIB) - @echo - @echo $(CC) $< - @$(CC) $(CFLAGS) -c $< -o $@ 2>&1 + $(CC) -c $(CFLAGS) $< -o $@ $(DOBJDIR_ATCLIB)/%.o: atclib/%.c $(HEADERS_ATCLIB) - @echo - @echo $(CC) $< - @$(CC) $(DCFLAGS) -c $< -o $@ 2>&1 + $(CC) -c $(DCFLAGS) $< -o $@ + +# To see the generated assembly code +# for the modules of Yadex +$(OBJDIR)/%.S: src/%.cc $(MAKEFILE) + $(CXX) $(CXXFLAGS) -S -fverbose-asm -Iatclib -Iboost -I$(X11INCLUDEDIR)\ + $< -o $@ + +# A source file containing the credits +src/credits.cc: $(MAKEFILE) docsrc/copyright scripts/copyright + @echo Generating $@ + @echo '// DO NOT EDIT -- generated from docsrc/copyright' >$@ + scripts/copyright -c docsrc/copyright >>$@ # A source file containing just the date of the # most recent source file and the version number -# (found in ./VERSION). - -src/version.cc: $(SRC_NON_GEN) VERSION src/.srcdate - @echo +# (found in ./VERSION) +src/version.cc: $(SRC_NON_GEN) VERSION cache/srcdate $(MAKEFILE) @echo Generating $@ + @printf '// DO NOT EDIT -- generated from VERSION\n\n' >$@ @printf "extern const char *const yadex_source_date = \"%s\";\n" \ - `cat src/.srcdate` >$@ - @printf "extern const char *const yadex_version = \"%s\";\n" \ - $(VERSION) >>$@ + `cat cache/srcdate` >>$@ + @printf "extern const char *const yadex_version = \"%s\";\n" \ + "$(VERSION)" >>$@ + # -------- Doc-related stuff -------- docdirs: @if [ ! -d doc ]; then mkdir doc; fi -docsrc/.pixlist: $(DOC2_SRC_HTML) +cache/pixlist: $(DOC2_SRC_HTML) @echo Generating $@ - @if perl -v >/dev/null; then\ - perl -ne '@l = m/]*src="?([^\s">]+)/io;\ - print "@l\n" if @l;' $(DOC2_SRC_HTML) | sort | uniq >$@;\ - elif [ -e $@ ]; then\ - echo "Sorry, you need Perl to refresh $@. Keeping old $@.";\ - else\ - echo "Sorry, you need Perl to create $@. Creating empty $@.";\ - touch $@;\ + @mkdir -p cache + @if perl -v >/dev/null 2>/dev/null; then \ + perl -ne '@l = m/]*src="?([^\s">]+)/io; \ + print "@l\n" if @l;' $(DOC2_SRC_HTML) | sort | uniq >$@; \ + elif [ -f $@ ]; then \ + echo "Sorry, you need Perl to refresh $@. Keeping old $@."; \ + else \ + echo "Sorry, you need Perl to create $@. Creating empty $@."; \ + touch $@; \ fi events.html: ev evhtml @@ -810,13 +788,13 @@ events.txt: events.html lynx -dump $< >$@ -changes/changes.html: changes/*.log log2html - ./log2html -- $$(ls -r changes/*.log) >$@ +changes/changes.html: changes/*.log log2html RELEASE + ./log2html -- -r `cat RELEASE` -- $$(ls -r changes/*.log) >$@ # changes - update the changelog .PHONY: changes changes: changes/changes.html - lynx -dump $< >CHANGES + w3m -dump -cols 72 $< >CHANGES # cns - view the changelog with Netscape .PHONY: cns @@ -848,6 +826,14 @@ ps: doc/yadex.ps gv $^ +# Use docsrc/faq.html and not directly +# doc/faq.html because we don't want FAQ to be +# remade at first build time. +FAQ: docsrc/faq.html + scripts/process $< >cache/faq.html + lynx -dump cache/faq.html >$@ + rm cache/faq.html + doc/yadex.dvi: doc/yadex.6 groff -Tdvi -man $^ >$@ @@ -856,43 +842,45 @@ # Generate the doc by filtering them through scripts/process - -PROCESS = VERSION src/.srcdate scripts/process scripts/ftime - -doc/ybsp.6: bsp-2.3/ybsp.6 $(PROCESS) - @echo - @echo Generating $@ - @scripts/process $< >$@ +PROCESS = \ + VERSION \ + cache/copyright.man \ + cache/copyright.txt \ + cache/srcdate \ + scripts/process \ + $(OBJDIR)/ftime \ + $(OBJDIR)/files_etc.man \ + $(OBJDIR)/files_share.man \ + $(OBJDIR)/notexist doc/yadex.6: docsrc/yadex.6 $(PROCESS) - @echo @echo Generating $@ @scripts/process $< >$@ doc/README: docsrc/README.doc $(PROCESS) - @echo @echo Generating $@ @scripts/process $< >$@ %: docsrc/% $(PROCESS) - @echo @echo Generating $@ @scripts/process $< >$@ doc/%.html: docsrc/%.html $(PROCESS) - @echo @echo Generating $@ @scripts/process $< >$@ # The images are just symlinked from docsrc/ to doc/ - doc/%.png: docsrc/%.png - @ln -sf ../$< $@ + @rm -f $@ + @ln -s ../$< $@ -#scripts/mdate: scripts/mdate.c -# $(CC) $< -o $@ +$(OBJDIR)/ftime: scripts/ftime.c + $(CC) $< -o $@ + +$(OBJDIR)/install: scripts/install.c + $(CC) $< -o $@ -scripts/ftime: scripts/ftime.c +$(OBJDIR)/notexist: scripts/notexist.c $(CC) $< -o $@ diff -uaNr yadex-1.5.2/README yadex-1.6.0/README --- yadex-1.5.2/README 2001-06-30 21:17:46.000000000 +0200 +++ yadex-1.6.0/README 2003-04-01 02:30:42.000000000 +0200 @@ -1,4 +1,4 @@ -Yadex 1.5.2 (2001-06-30) +Yadex 1.6.0 (2003-04-01) WHAT IS YADEX ? Yadex is a Doom level (wad) editor for Unix systems running X, @@ -9,8 +9,9 @@ PREREQUISITES You need : - - Some flavour of Unix, - - X11R6 or X11R5 and a display of at least 640x480x256, + - Some flavour of Unix (known to work with AIX, FreeBSD, HP-UX, + Irix, Linux, NetBSD, OpenBSD, OpenUnix, QNX and Solaris), + - X11R6 or X11R5 and a display of at least 640x480, - a Doom/Doom II/Heretic/Strife iwad (shareware/demo is OK), - GNU make (vanilla make won't do), - a standard C compiler (ISO 9899:1990), @@ -18,46 +19,46 @@ - hypot() and either nanosleep() or usleep(). BUILDING AND INSTALLING - Type this : + To install in /usr/local : - make - su -c 'make install' + ./configure + make + su -c 'make install' - Notes : - 1) If you get an error on -lX11, add X11LIBDIR= to the make - command line, where is the path to your libX11* files. - E.G. "make X11LIBDIR=/usr/lpp/X11/lib" + To install somewhere else, for example in ~/yadex : + + ./configure --prefix ~/yadex + make + make install + + Got problems getting Yadex to compile ? See doc/faq.html. + Got no problem ? Read the FAQ anyway. See doc/faq.html. - 2) If you want to install somewhere else than in /usr/local/bin, - add PREFIX= to the "make install" command line. - E.G. "su -c 'make install PREFIX=/opt/yadex'" - or "make install PREFIX=~" - - 3) Beware, the installation OVERWRITES the following files: - /usr/local/bin/ybsp - /usr/local/bin/ybsp-1.5.2 - /usr/local/bin/yadex - /usr/local/bin/yadex-1.5.2 - /usr/local/etc/yadex/1.5.2/yadex.cfg - /usr/local/share/games/yadex/1.5.2/doom.ygd - /usr/local/share/games/yadex/1.5.2/doom02.ygd - /usr/local/share/games/yadex/1.5.2/doom04.ygd - /usr/local/share/games/yadex/1.5.2/doom05.ygd - /usr/local/share/games/yadex/1.5.2/doom2.ygd - /usr/local/share/games/yadex/1.5.2/doompr.ygd - /usr/local/share/games/yadex/1.5.2/heretic.ygd - /usr/local/share/games/yadex/1.5.2/hexen.ygd - /usr/local/share/games/yadex/1.5.2/strife.ygd - /usr/local/share/games/yadex/1.5.2/strife10.ygd - /usr/local/[share/]man/man6/ybsp.6 - /usr/local/[share/]man/man6/yadex.6 + Beware, the installation OVERWRITES the following files (assuming + you're installing in /usr/local) : + /etc/yadex/1.6.0/yadex.cfg + /usr/local/bin/yadex + /usr/local/bin/yadex-1.6.0 + /usr/local/man/man6/yadex.6 + /usr/local/man/man6/yadex-1.6.0.6 + /usr/local/share/games/yadex/1.6.0/doom.ygd + /usr/local/share/games/yadex/1.6.0/doom02.ygd + /usr/local/share/games/yadex/1.6.0/doom04.ygd + /usr/local/share/games/yadex/1.6.0/doom05.ygd + /usr/local/share/games/yadex/1.6.0/doom2.ygd + /usr/local/share/games/yadex/1.6.0/doompr.ygd + /usr/local/share/games/yadex/1.6.0/heretic.ygd + /usr/local/share/games/yadex/1.6.0/hexen.ygd + /usr/local/share/games/yadex/1.6.0/strife.ygd + /usr/local/share/games/yadex/1.6.0/strife10.ygd CONFIGURING AND RUNNING Before you run Yadex, you need to tell it where to find your iwads. - Open /usr/local/etc/yadex/1.5.2/yadex.cfg with your favourite - text editor and insert the appropriate values for the parameters - "iwad1", "iwad2", etc. If you don't want Doom II to be the default - iwad, also change the value of the "game" parameter. + Assuming you have installed in /usr/local, open + /etc/yadex/1.6.0/yadex.cfg with your favourite text editor and + insert the appropriate values for the parameters "iwad1", "iwad2", + etc. If you don't want Doom II to be the default iwad, also change + the value of the "game" parameter. You can now run Yadex by typing : @@ -74,11 +75,14 @@ Have fun ! DOCUMENTATION - There are man pages and quite a lot of documentation, most of it in + There is a man page and quite a lot of documentation, most of it in HTML format. Start at : doc/index.html + If you're upgrading from a previous version of Yadex, please read + carefully CHANGES. + STATUS Yadex is work in progress. It still lacks important features like a better interface, cut-and-paste, undo/redo, support for Boom and @@ -86,25 +90,46 @@ code is a horrible mess. I'm not proud of it. Be indulgent. LEGAL - Yadex is GPL'd libre software. It incorporates code from DEU 5.21 - that was put in the public domain in 1994 by Raphal Quinet and - Brendon Wyber. The rest is Copyright 1997-2000 Andr Majorel. - - Now comes the part I like best : This program is free software; you - can redistribute it and/or modify it under the terms of the GNU - General Public License as published by the Free Software Foundation; - either version 2 of the License, or (at your option) any later - version. This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied warranty - of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. You should have received a - copy of the GNU General Public License along with this program; if - not, write to the Free Software Foundation, Inc., 675 Mass Ave, - Cambridge, MA 02139, USA. + 1. Yadex + + Parts copyright Andrew Apted 2000-2001, GNU GPL v2 + Parts copyright Andr Majorel 1997-2003, GNU GPL v2 + Parts copyright Matthew W. Miller 2000, GNU GPL v2 + Parts written by Raphal Quinet, public domain + Parts written by Brendon Wyber, public domain + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + 2. Atclib + + The Yadex distribution includes a subset of Atclib. + + Atclib is copyright Andr Majorel 1995-1999 and distributed under + the terms of version 2 of the GNU Library General Public License. + + 3. Boost - All trademarks are the propriety of their owners. + The Yadex distribution includes a subset of Boost 1.25.0. Boost + 1.25.0 is copyright various authors and released under the following + terms : Permission to copy, use, modify, sell and distribute this + software is granted provided this copyright notice appears in all + copies. This software is provided "as is" without express or + implied warranty, and with no claim as to its suitability for any + purpose. CONTACT See doc/contact.html for addresses. -AYM 2000-01-10 +AYM 2003-02-15 diff -uaNr yadex-1.5.2/TODO yadex-1.6.0/TODO --- yadex-1.5.2/TODO 2000-08-26 00:32:19.000000000 +0200 +++ yadex-1.6.0/TODO 2003-03-28 21:12:16.000000000 +0100 @@ -14,10 +14,14 @@ Command line - Add option -e like in sed and Perl. Auto quit at end or not ? - Add option -f like in sed ? +- Unix version recognizes -V but does not list it in the usage. Configuration file - Add operator ".=" (E.G. "iwad_dir .= ,/foo/bar"). Perhaps implement real lists. Perhaps not. +- Comments are not allowed if not at the beginning of a line +- New option --print-config-path or --cfg-dirs to print the config file + search path and exit Variables - Make variables objects instead of C++ variables. It should not be @@ -38,10 +42,6 @@ different sections of the .cfg. - Fix TranslateToDoomColor(). - -g should accept anything as long as .ygd exists. -- Have to think of how to handle different games : Doom, Doom II and - Boom all have a lot in common. Try not to duplicate all this, perhaps - by _include_ing a "generic_doom" block, which contains _if_s before - features not common to all versions. - It is prob. possible to crash the program by entering weird things in LoadGameDefs. For example, shortdesc is not truncated and the current number of "raise floor" types will probably make the menu "overflow" @@ -61,8 +61,6 @@ - Move the definition of special sector tags out of the exe and into the ygd files. - Gadget: add level names (E.G. "E1M1" -> "Hangar"). -- An attempt to define twice the same thing/linedef/sector type - should be detected and reported. - The basename need not be in the configuration file; it should be in the ygd (E.G. iwad_base = "doom.wad,doom1.wad") - The .ygd collection has grown so large that it has become difficult to @@ -100,17 +98,22 @@ one that has the appropriate magic (but warn). If an include was not found just print a warning and continue ? - Allow overriding of a previous linedef type / thing type / sector type - definition (currently it just *adds*). + definition (currently it just *adds* and, since the new definition is + at the end the of list, it's *ignored*). Possibly with an option to + warn about such redefinitions. +- New option -Y (or -y or -G ?) to insert a directory at the beginning + of the .ygd files search path. Perhaps -Y- to clear the path (think + -I-). Add it to "make test" and "make dtest". +- New option --print-ygd-path or --ygd-dirs to print the ygd file search + path and exit. Game and wad support - Some wads have sidedefs with a sector# of -1. Apparently, those are always unused sidedefs but perhaps there is something to do about it. dyst3, mm, mm2 map13,28, wads2/1kill (e2m2,6,7,8,9), wads2/adieu wads2/ebola, wads2/requiem (map03,08,etc). -- Some wads generating a flurry of messages "updating entry ''" when +- Some wads generate a flurry of messages "updating entry ''" when loaded (11fortko, 1_on_1, chase21). Fix that. -- Support Boom extensions, at least by allowing to enter hexadecimal - linedef types etc. - Some working pwads are not pwads. 1sthell is an iwad. - Some wads have a large number of unused vertices in the middle. base, phobos, 2wad/dks_e1l1, 2wad/dks_e1l3, amanda2 (no tail !), atica, @@ -156,15 +159,29 @@ replacement patches but not the new ones of course. - Now that wad_read_i16() and wad_read_i32() don't abort anymore, check the code that uses them. -- Add definition for sector tag 667 (MAP07). - Colin wants to be able to use the Final Doom iwads without having to type "yadex -iwad2 /foo/bar/tnt.wad". He suggests either (1) adding a new game or (2) changing the code so that "yadex -iwad2 tnt.wad" looks for tnt.wad in the iwad2 directory defined in the config file. - Graphics: Yadex uses no COLORMAP, instead of COLORMAP 0. In practice COLORMAP 0 is very close to no COLORMAP but... +- Graphics: Yadex uses colour index IMG_TRANSP = 0 to represent + transparent pixels and remaps index 0 to the closest index (247 in the + case of Doom). Because we save in PPM format, it doesn't matter. But + if we wanted to save in BMP format, many pixels would have their value + changed, which I'd rather avoid. If Yadex used IMG_TRANSP = 255, no + remapping would be necessary because that index is not used in Doom, + Doom II, Heretic and Hexen. For Strife, it's the other way around : + index 255 is used quite a lot and index 0 is not. - Be able to edit levels with silly names like "QD2" (cf. qdoomtst.wad). This implies not replacing entries in the master directory anymore ! +- When "saving as" a create'd level, NODES, SEGS, SSECTORS, REJECT, + BLOCKMAP and VERTEXES are not empty. Recipe : yadex: c [Return] [F3] + [y] [Return] beurk.wad q yadex: q $ lswad -l beurk.wad. +- Bug: there is a small memory leak in that can be seen when repeatedly + loading two wads that contain the same level (E.G. while true; do echo + r tmp.wad; echo r 11.wad; done | yadex). I suspect the leak is in + ReadLevelData(). Doom alpha - Fix wrong things definitions and add missing ones. @@ -178,6 +195,7 @@ - Hexen has some flats with a size of 8 kB. - Generate the "thing" directives by either parsing info.c or ripping off the one in DETH. +- Hexen: add linedef types and check Heretic - Heretic has some flats with a size of 4160. Is this why DeuTex accepts @@ -189,6 +207,24 @@ - Matt wonders what RIFLB0 is and what's the difference with RIFLA0. - Incorporate what's only in the USS. +Boom +- convenient way of entering generalized types. +- Decode generalized types. +- Allow WATERMAP pseudo-texture (frankc@srv.net). + +XDoom +- Write or get someone to write xdoom.ygd. +- Check XDoom linedef types +- Copy XDoom linedefs types to doom.ygd + +ZDoom +- Allow AARRGGBB pseudo-texture ? (frankc@srv.net) + +EDGE +- Abstract away extrafloor linedef types. +- Parse DDF and RTS. +- Function to jump to n-th extrafloor for this sector. + Messages and reports The reason for emitting messages : - Bug (internal error, unexpected condition in the program that @@ -242,6 +278,15 @@ - When moving a bunch of vertices, do not check for vertex-on-linedef condition if both vertices of the linedef were part of the vertices that are being moved. + AJA 2000-09-21: (d) when moving a large bunch of vertices or linedefs + that are very close together (e.g. 2 units), there often pops up a + message to confirm merging vertices or splitting a linedef. (This + would be worse with the 1.5.0 config file which makes merges/splits + happen automatically). + I guess the solution would be making Yadex to skip checks for + overlapping vertex/linedef _between_ all the vertices/lines that are + being moved at once (i.e. only check a moving V/L against a non-moving + V/L). Old bugs to fix - When splitting and merging sectors, some of the sidedefs in the split @@ -250,14 +295,10 @@ "vertices A and B not on the same sector" or "cannot find a closed path", etc. I have already got "no sector between vertex A and vertex B" ; save, quit, edit and try again : it works ! -- Let RIGHT work after SPACE (works if no mouse driver!) +- DOS: Let [right] work after [space] (works if no mouse driver!) - DOS: understand why mouse pointer moves 8 pixels at a time and fix that. -- I already got erroneous "sector not closed" messages. The last time I - remember, it was on a tiny triangular sector (base=16, height=2). - When merging sectors, linedefs sometimes get only 1 sidedef... -- InputInteger limits numbers to [-32749,+32749]. -- InputInteger doesn't accept hexadecimal numbers. - If you do "delete linedef and merge sectors" when it's the same sector on both sides of the linedef, the sector is deleted. - Check that all sectors are closed : chokes on pseudo sectors (s1=s2). @@ -268,9 +309,6 @@ Editing in general - Implement undo and redo. -- Move things along with vertexes -- Add a "global" or "everything" editing mode. In that mode, moving, - deleting, duplicating affects all objects (things, vertexes...) - Move cursor : jump to next object in direction ... - Move objects n grid steps in direction ... - Move objects n Grid steps in direction ... @@ -296,9 +334,6 @@ (E.G. segfault upon switching to sector mode). - For very large levels, the lower limit on the zoom factor is too high to allow showing the whole level. -- Bug: for very large levels, the automatic zoom factor setting is hosed - (instead of using the lowest allowed zoom factor, it falls back on a - rather high value). - Bug: for very large levels (very low zoom factors), the upper limit on the grid step is too restrictive. - Strife's MAP29 is so much to the west (-23,000 or so) that the current @@ -308,8 +343,177 @@ adding the number of such items already existing. E.G. if there are already 50 vertices, increment the vertex numbers in all the linedefs by 50. Same thing for sidedefs numbers in linedefs, sector tags (DON'T - increment those above 900!). increment sector# in sidedefs too. that's - all ? + increment those that have a special meaning like 666 or 667 or those + above 900!). increment sector# in sidedefs too. that's all ? +- Andy Baker wants a don't-drag toggle. I'd rather just add some initial + resistance. +- For the two widest grids, display the coordinates along the edges. +- There is something that sucks in the edit loop ; when you scroll + without moving the mouse, the selection box always "lags behind" + because its map coordinates are updated only _after_ the next screen + refresh. +- Select all. +- Reverse selection (select everything that's not selected and unselect + everything that's selected). +- Edit functions : copy, cut, paste. +- Crop (delete all unselected objects). +- Persistent box for cropping ? +- BD suggests sector creation la DCK ([r] then draw box). +- When there are several objects under the pointer, report it and give a + way to access any one of them. Or maybe implement planes ? +- When doing drag-n-drop, should the snap-to-grid be applied to A. + relative position since started dragging B. or to the highlighted + object ? If A, you can't use drag-n-drop to snap-to-grid objects that + aren't. If B, you can't drag correctly objects that are not aligned on + grid. +- Object number: the type should be "i16", not "int" (cf. SelPtr). +- Object number: the test for "none" should not be hard-coded "< 0". +- While dragging or drawing a selbox, prevent Del, Ins, etc. from + working. E.G. Del would suppress the object being dragged ! +- Add config file parameters for initial snap_to_grid and + lock_grid_step. +- Scale: make it local to an edit window. +- MadeChanges: make it local to an edit window. +- MadeMapChanges: make it local to an edit window. +- When saving with [F2], ".wad" should be appended automatically. +- Save ([F2]): should not ask for the file name every time. +- Save ([F2]): I swear I've seen the file name dialog open with + "nase.bak" in it ! +- Save ([F2]): should use the Save as... ([F3]) code, not duplicate it. +- Get rid of the Level variable. +- The file name should be a member of edit-session or level-data, not + retrieved by looking up the master directory. +- A function that would be really very useful would be the possibility + to change the start/end vertex of a linedef. That could be done by + holding, say, [Alt], down and dragging the start/end until on top of + another vertex. When the button is released, the linedef start/end is + changed and the sector references of the impacted linedefs are + updated. +- Displaying pointer coords; should look into using PutImageFont(). +- [Ctrl][Click]: Press button: do nothing. Release button: select or + unselect IF STILL ON TOP OF OBJECT. Thus we can use [Ctrl] + drag to + copy :-). +- Dragging with [Ctrl] on duplicates ? +- Vertex on linedef: lower tolerance when zoom factor is high. [partly + done as of 1998-12-20 but still needs work]. +- Check self-consistency of level data: for each linedef, v1 and v2 must + be either OBJ_NO_NONE or between 0 and NumVertexes and s1 and s2 must + be either OBJ_NO_NONE or between 0 and NumSideDefs. +- Goto function: takes as an argument either the centre of the level or + a previously set mark. Like in vi: m, '. Maybe '' to go to + centre ? +- Clicking and superimposed objects: if n1 and n2 (n1 < n2) are + superimposed, n1 is not selected but n2 is selected and you click on + them, Yadex thinks you are starting a new selection because + is_selected (highlight) is false. +- objects.cc: GetObjectCoords(): should use center_of_objects() instead. +- Permanently show a 64-wide object to scale ? +- Right-button menus: access to many different menus (no modifier, + [Shift], [Ctrl], [Alt], several of them). + - Cut, copy, paste + - Show properties + - Misc. operations + - Frequently used properties (toggle bit of linedef...) + - Change tool +- Menus: when you move the pointer over a pulled down menu is, you can + highlight the objects it hides. +- Replace "insert rectangle"/"insert polygon" by : + - insert pillar (nb. of sides, size) + - insert subsector Differences in floor/ceiling height/textures and + lighting level could be set by predefined styles : + - pedestal (floor + 48, ceiling - ...) + - hanging from ceiling + - teleporters +- In addition of make nook/make boss, + - insert protruding subsector + - insert recessed subsector +- Minor glitch: when a popup menu is active, the spot is still shown +- Object info box: if the box is already drawn, don't draw it again; it + makes the strings flicker slightly. +- [Alt] alone should highlight the menu bar. +- Split linedefs and sector: if there is no sector between the linedefs, + they shouldn't be split. +- Split linedefs and sector: if only one linedef is + selected/highlighted, assume that the other linedef is the one + opposite. +- Moving/scrolling: centre view around spot under pointer (binding : + perhaps [Ctrl][But2]). +- James Caldwell says that, with v1.4, if you create a polygon, delete + the sector inside it and try to draw a selection box around the + linedefs, Yadex segfaults. James was not able to give me a backtrace + and, apparently, no one has been able to reproduce that bug. After + upgrading to 1.5 and a new version of Red Hat, the problem + disappeared. A bug in GCC 2.96 ? +- Linedef type/sector type/thing type selector : the current + implementation (cascaded menus) has certain shortcomings : + - No scrollbars for long lists. + - It's not possible to associate a bitmap to an item, which would be + very useful for thing types. + - There doesn't seem to be a good way to specify which fields are to + be printed, especially not dynamically. This could be useful in some + occasions (thing types : sprite root). + - There doesn't seem to be a good way to change the sorting order, + especially not dynamically. Still it would be nice to be able to + sort linedef types by either (function, trigger) or (trigger, + function) or (number), etc. + - There doesn't seem to be a good way to restrict which items are + shown. For example, one might wish to hide all linedef types that + are not available in plain Doom 1.666. Arguably, that should be done + by chosing the right game specification in the first place, but + there *might* be good reasons to do otherwise. + It seems that ldt/st/tt selection is an operation that calls for more + complex interactions than a simple list menu can do. We should + probably use a specialised widget, perhaps like this one : + _________________________________________________________________ + | _____________________________ | + | Group ( ) Door | 0 -- None |^| | + | ( ) Door (red key) | 1 DR Open door | | | + | ... | 2 W1 Open door (stays op| | | + | ( ) Misc | 3 ... | | | + | (o) All | 4 | | | + | | 5 | | | + | Sort ( ) Group, desc, trig | 6 | | | + | ( ) Group, trig, desc | 7 | | | + | ( ) Desc, trig, group | 8 | | | + | ( ) Trig, desc, group | 9 | | | + | ( ) Desc, trig, number | 10 | | | + | ( ) Trig, desc, number | 11 | | | + | (o) Number | 12 | | | + | | 13 | | | + | Show [x] Boom | 14 | | | + | [x] EDGE | 15 | | | + | [x] MBF | 16 | | | + | [x] PR | 17 |_| | + | [x] XDoom |_18________________________|v| | + | [x] v1.6 |<_________________________>| | + | _________________ | + | |___OK___|_Cancel_| | + |_________________________________________________________________| + + Note #1: how do we enter linedef types by number ? + Note #2: the "Show" items are not hard coded but unique values of a + field that does not yet exist (alternatively "from which ygd file the + definition comes from"). + Note #3: instead of hard-coding "Sort" items, one could make this + group a collection of special widgets, one for each field. Each widget + has two buttons : up and down. By clicking on said button, you move + the widget up down the list. More flexible, but also more confusing + when you're not used to it. Promises to be awkward to use with the + keyboard. + Note #4: it might be useful to have two descriptions : an internal one + that sorts well (door open, door close) and an external one that's + human readable (Open door, Close door). + +Editing, global mode: +- Editing properties (double-clicking or [Return]), selecting by + clicking and selecting with a box still care about the mode. Selection + in general is broken, because only the number is remembered. +- Autosplit linedef by dragging vertex doesn't work unless in vertex + mode. +- draw_map(): linedefs are still shown according to mode. +- draw_map(): need another representation for sectors (conflicts with + linedefs). +- draw_map(): always show right side of linedefs ? Editing things: - Thing info box: @@ -330,12 +534,6 @@ be spinned. - Thing properties -> type : on selecting group with 0 things, fatal error PTD1. -- Maintain a list of all things on the level, sorted by increasing - radius. To determine which thing is under the pointer, scan that list - and highlight the first thing such that the pointer in inside the - square of half-side (scale x radius + slack). Possible refinement ; if - several things would be highlighted, highlight the one whose centre is - closest to the pointer. - Check Doom's behaviour w.r.t. negative angles. - On the map, if the thing has a root but no sprite by that root was found, display the root ? (instead of the type) @@ -343,13 +541,15 @@ - On the map, switch between displaying the sprite, the type in decimal, the type in hex, the root, etc. - Option to show both the sprite and the square. Or maybe the sprite and - a cross, la WinDEU ? + a cross, la WinDEU/DETH ? - Perhaps choose between sprite and square automatically depending on zoom factor ? +- Things: the name is sometimes too long and cut off. It looks bad. +- Unknown things (i.e. thing numbers for which there's no record in the + ygd) should be displayed in red, to distinguish them from things that + just don't have a root. Editing vertices: -- Change the highlighting algorithm so that it's more bearable at low - zoom factors. Editing linedefs and sidedefs - Linedef type : show long name. @@ -438,8 +638,105 @@ - Linedef tag : same thing. - Linedef flags : give choice between string, signed decimal, unsigned decimal and hexadecimal. -- If a linedef has a type that requires a tag but its tag is set to 0, - draw the linedef in red. +- AJA 2000-09-21: (b) the texture checker only gives you two choices + when it encounters missing textures: stop, or make it STARTAN3 and + continue. When using some Doom tricks using missing uppers/lowers, + this is a pain, ideally (IMHO) there would be four options: + + Press ESC to see the object, + or `y' to fix the texture and continue, + or `A' to fix all remaining textures, + or any other key to leave it and continue + +- Look into texture alignment. Look at what's been done with DETH. + AJA 2000-09-21: (e) I wanted to horizontally align a bunch of lower + textures on some two-sided lines, but the X alignment functions only + work on middle textures. + + This is how I would prefer it to work: well, pseudo-code would + explain it best: + + AlignX(sidedef_t S[], int NUM) + { + int i, x_offset; + + // initial x offset comes from first sidedef + int x_offset = S[0].x_offset; + + for (i=1; i < NUM; i++) + { + // ... check if S[i] contiguous with S[i-1] ... + + x_offset += LineLength(S[i-1]); + x_offset &= 4095; + + S[i].x_offset = x_offset; + } + } + + That would collapse the 8 alignment choices into 2 (sidedef1 or + sidedef2). Well, 4 if you keep the texture checking versions. + + It should work fine in practice since all Doom textures are powers + of two. If one wasn't, it wouldn't be drawn properly since the + R_GetColumn() routine in the Doom source does this: + + column &= (width-1) + + Do you think this "texture-independent" version is better ? + +- Highlighting linedefs: the test "tag > 0" is arguable. Shouldn't it be + "tag != 0" ? +- When merging superimposed 1S linedefs, the resulting 2S linedef often + has the middle textures the 1S linedefs had. +- Showing linedef textures: several solutions: + - easiest: show raw middle texture, + - easy: show raw upper, middle and lower textures, + - hardest: show as Doom would render it, with offsets, LTU, UTU and + all. Scale it down so as to fit in the window that has a fixed size. + Optionally apply brightness. Maybe show the edge of the neighbouring + walls, it might help for alignment. ISSUE: it might not be a good + thing to respect the length of the linedef as, for long linedefs, it + will force us to scale down too much. For textures that don't + exist, show background with cross. For texture "-", show background + only. For transparent texture, background sees through. It's + probably better to use a special colour (like black) for background + as the user might want to use a bright colour for window + backgrounds, which wouldn't look too good with Doom's dark textures. +- Split linedef: if pointer is somewhere on top of linedef, split it + there (not in the middle). +- Split linedef: buglet: the new vertex is initially put at (0,0) and + MapMaxX and friends are updated accordingly. So if the centre of the + map is way off (0,0), the next centre-map command will appear to put + the map off-centre. +- Highlighting linedefs: same problem when some of the linedefs to + highlight have a non-zero tag. IMO, the key of the problem is the O(2) + part in the highlighting of sectors. Should restructure + HighlightObject() and HighlightObjects(). Build a bit vector of all + linedefs that should be highlighted and do them all in a loop, without + recursion. And thus we would not highlight the same linedef more than + once anymore. +- Warn if W? linedef type used on single-sided linedef. +- Show all linedefs that have errors in red. That includes : + 1. bad type, + 2. type requires a tag but its tag is set to 0, + 3. type requires a tag but no sector uses that tag, + 4. door type on a single-sided linedef, + 5. missing texture (HOM) (though this is normal for some tricks), + 6. tx with multi-patch columns on a double-sided linedef (medusa), + 7. bad flag, + 8. misaligned (bad X-offset), + 9. superimposed linedefs. + Notes: + - For (3), you probably need a bit vector of tags used by at least one + sector. When should it be refreshed ? It's perhaps safer to do it + from scratch before displaying, than trying to keep track... + - (7) is another reason to move the definition of flags out of the + executable and into the .ygd. + - (6), (8) and (9) are not too easy. + - The colour of the linedef should probably be reset to normal before + highlighting and selecting. Having lines of many different colour is + just going to be confusing. Editing sectors - Set floor height to ceiling height - headroom. @@ -454,6 +751,12 @@ be because of the overhead incurred by highlighting all the linedefs. - Sectors are sometimes mistakenly considered unclosed and don't highlight properly. E.G. in ss27bet2.wad, sector #66. + Also: I already got erroneous "sector not closed" messages. The last + time I remember, it was on a tiny triangular sector (base=16, + height=2). + AJA 2000-09-21: two linedefs meeting at a vertex, and the other ends + are very close to each other (like 2 units) causes spurious + Sector-not-closed messages in the consistency check. - A DCK-like philosophy could be used when moving sectors : | | @@ -478,6 +781,12 @@ vertices on one side. One strategy that comes to mind is placing it at the centre of the largest area (where "largeness" is a compound of "surface" and "squareness"). +- Showing sector textures: optionally apply brightness. +- Andy Baker reported than when merging linedefs, Yadex sometimes + deleted the wrong linedef. +- Highlighting sectors: for a constant number of sectors to highlight, + gets slower as the total number of sectors increases. Might have to do + with the search for tagged linedefs. Keyboard interface - Proposition: in linedef mode, gives access to @@ -489,6 +798,13 @@ - Document screenshot. - faq.html should be included in the distribution. - Some entries in the FAQ should also be in trouble.html and vice-versa. +- In TODO, entries should be numbered. +- The following should be externalized: + - the URL of the homepage (when it's done, update web/readme.html) + - the URLs of the mirrors + - the names of the copyright holders (contributors et al.) + - the name of the maintainer +- Each file should have its own copyright statement. Unimportant : - If bgi= or -bgi specifies a path for the .bgi driver, handle it. @@ -498,7 +814,11 @@ Flat/sprite/texture viewer - Use other palettes than #0 (also when saving). - Use COLORMAPs (also when saving). -- Reimplement "save image to file" with PPM, PNG and perhaps XPM. +- Save bug: should save entire image, not clipped. Requires implementing + Sticker::load (Img, int oxfs, int yofs, int width, int height). And + changing textures.cc so that it does not clip the width and height. +- Save: will never be able to save all arch-vile frame under MS-DOS + (contain "[", "\", "]"). Use DeuTex's translation scheme ? - Zoom and scrollbars. - Add binding to toggle between SW1* and SW2*, cycle through the frames of an animation. For Hexen, it's much more complicated (3-frame @@ -510,9 +830,23 @@ - Support pictures higher than 255 and textures higher than 128. - If the "view" command is given a lower case argument, the positionning in the list of sprite names is wrong. -- When viewing patches or sprites, the entire view window is refreshed - even though, in most of the cases, the picture to display is much - smaller than that. + +Build: +- Document somewhere what RELEASE does and why it's important. +- Makefile: after changing DEFINES in the makefile, running make does + nothing ! (have to delete manually wads.o and sanity.o) +- Makefile: after hacking for two days on a machine, some objects are + not rebuilt on another machine. Even though yadex.h has changed ! +- Should not build yadex.dep from scratch every time you type "make". +- "make clean all" fails because clean removes obj/0 but does not create + it again. +- Some configuration items are not detected by configure but by the + makefile. This is confusing (there's no simple rule). +- It would be nice to automatically detect when -fpermissive is needed + (GCC >= 3 + "extern XSetTransientForHint" in /usr/include/X11/Xlib.h) +- It would be nice to automatically detect where the X11 headers and + library are. And omit -I/usr/X11R6/include from the command line when + it's not needed. DOS/BGI port - Do more modules splitting (deu.c, ReadConfigFile, menus.c). In @@ -580,6 +914,18 @@ Sprite::make_bitmap, scale_img and, above all, Sprite::make_ximage. Making sprites persistent across iterations helps enormously. Do it. +Unix port +- Basenames are truncated to 8 characters. The DOS approach of fixed + size al_f* types does not scale on Unix. Should probably modify + al_fana() to use dynamically allocated buffers. + +Platforms/Portability +- Solaris 2.7: bad X11/Xlib.h. With GCC, need -fpermissive + and/or -isystem /usr/openwin/include +- Solaris 2.7: don't assume that having gcc implies that cc is + gcc. cc might be the native compiler in which case -Wall might + no be appreciated. + Prompt - Add access to the prompt from an editing window (":" like in vi). - Use readline. @@ -589,46 +935,16 @@ Misc. - Implement several windows at once ? - Replace all occurrences of BLACK, WHITE, ... by logical colours. -- The highlight proximity should always match the apparent size of the - object (done for things, to be done for vertices and linedefs). -- GetCurObject(): the radius should not be expressed in map units but in - screen units and should depend on the apparent size of the object. - Indeed, 20 is too much for linedefs at high zoom factors and too - little for vertexes at low zoom factors. -- Highlighthing things: if there is a small thing and a large thing in - the same spot, when you're "in" the small thing, it should be - highlighted, even if it's higher-numbered. At the moment, it's the - lowest-numbered thing that's highlighted. - Externalize occurrences of ".wad". - Externalize occurrences of ".bak". -- Let the selection include objects of different types. -- There is something that sucks in the edit loop ; when you scroll - without moving the mouse, the selection box always "lags behind" - because its map coordinates are updated only _after_ the next screen - refresh. -- Select all. -- Reverse selection (select everything that's not selected and unselect - everything that's selected). -- Edit functions : copy, cut, paste. -- Crop (delete all unselected objects). -- Persistent box for cropping ? -- BD suggests sector creation la DCK ([r] then draw box). -- Be able to select objects of several types at once. -- Modelessness ? -- When there are several objects under the pointer, report it and give a - way to access any one of them. Or maybe implement planes ? -- When doing drag-n-drop, should the snap-to-grid be applied to A. - relative position since started dragging B. or to the highlighted - object ? If A, you can't use drag-n-drop to snap-to-grid objects that - aren't. If B, you can't drag correctly objects that are not aligned on - grid. -- Object number: the type should be "i16", not "int" (cf. SelPtr). -- Object number: the test for "none" should not be hard-coded "< 0". - Browse mode, as in xv and psp, to browse through a large number of wads. - Be able to open zipped files ? -- On ProgError(), save current data to a file named yadexcrash.wad. On +- On ProgError(), save current data to a file named yadexcrash.wad. On startup, if that file exists, propose to use it. +- Add a handler for the SIGSEGV signal to, on segfault (SIGSEGV), save + current data to a file named yadexcrash.wad. On startup, if that file + exists, propose to use it. - If DOOMWADDIR exists, use it ? But overridden by yadex.cfg & -iwad - Texture browser : it's so slow that, even on a K6/200, some textures are slow to come (AMRIBS). Should cache patches ? 1999-11-28: after @@ -637,134 +953,22 @@ - colour# used to represent transparent colour when saving textures, - rgb used to represent transparent colour when saving textures, - rgb used to represent transparent colour when displaying textures, -- While dragging or drawing a selbox, prevent Del, Ins, etc. from - working. E.G. Del would suppress the object being dragged ! -- Add config file parameters for initial snap_to_grid and - lock_grid_step. -- Scale: make it local to an edit window. -- MadeChanges: make it local to an edit window. -- MadeMapChanges: make it local to an edit window. -- When saving with [F2], ".wad" should be appended automatically. - Log file: create/update it iff the pwad file is modified. -- Things: the name is sometimes too long and cut off. It looks bad. -- A function that would be really very useful would be the possibility - to change the start/end vertex of a linedef. That could be done by - holding, say, [Alt], down and dragging the start/end until on top of - another vertex. When the button is released, the linedef start/end is - changed and the sector references of the impacted linedefs are - updated. - Events; generalize internal events and hold refresh until all events have been processed. Though autoscroll could bite me. - Delete all those "huge" qualifiers ; means nothing for Unix and the DOS version should be compiled with -mh anyway. Update: 1999-11-25: Ha! Ha! Ha! Ha! Ho! Ho! ... I was so young and naive... -- Displaying pointer coords; should look into using PutImageFont(). -- [Ctrl][Click]: Press button: do nothing. Release button: select or - unselect IF STILL ON TOP OF OBJECT. Thus we can use [Ctrl] + drag to - copy :-). -- Vertex on linedef: lower tolerance when zoom factor is high. [partly - done as of 1998-12-20 but still needs work]. -- Check self-consistency of level data: for each linedef, v1 and v2 must - be either OBJ_NO_NONE or between 0 and NumVertexes and s1 and s2 must - be either OBJ_NO_NONE or between 0 and NumSideDefs. -- Showing linedef textures: several solutions: - - easiest: show raw middle texture, - - easy: show raw upper, middle and lower textures, - - hardest: show as Doom would render it, with offsets, LTU, UTU and - all. Scale it down so as to fit in the window that has a fixed size. - Optionally apply brightness. Maybe show the edge of the neighbouring - walls, it might help for alignment. ISSUE: it might not be a good - thing to respect the length of the linedef as, for long linedefs, it - will force us to scale down too much. For textures that don't - exist, show background with cross. For texture "-", show background - only. For transparent texture, background sees through. It's - probably better to use a special colour (like black) for background - as the user might want to use a bright colour for window - backgrounds, which wouldn't look too good with Doom's dark textures. -- Showing sector textures: optionally apply brightness. -- Goto function: takes as an argument either the centre of the level or - a previously set mark. Like in vi: m, '. Maybe '' to go to - centre ? -- Clicking and superimposed objects: if n1 and n2 (n1 < n2) are - superimposed, n1 is not selected but n2 is selected and you click on - them, Yadex thinks you are starting a new selection because - is_selected (highlight) is false. -- objects.cc: GetObjectCoords(): should use center_of_objects() instead. -- Permanently show a 64-wide object to scale ? -- Right-button menus: access to many different menus (no modifier, - [Shift], [Ctrl], [Alt], several of them). - - Cut, copy, paste - - Show properties - - Misc. operations - - Frequently used properties (toggle bit of linedef...) - - Change tool -- Dragging with [Ctrl] on duplicates ? -- Makefile: after changing DEFINES in the makefile, running make does - nothing ! (have to delete manually wads.o and sanity.o) -- Makefile: after hacking for two days on a machine, some objects are - not rebuilt on another machine. Even though yadex.h has changed ! -- Menus: when you move the pointer over a pulled down menu is, you can - highlight the objects it hides. -- Replace "insert rectangle"/"insert polygon" by : - - insert pillar (nb. of sides, size) - - insert subsector Differences in floor/ceiling height/textures and - lighting level could be set by predefined styles : - - pedestal (floor + 48, ceiling - ...) - - hanging from ceiling - - teleporters -- In addition of make nook/make boss, - - insert protruding subsector - - insert recessed subsector -- Force the event type to 16 bit. Would make us save a few kB in the - menus (shortcut_key and cooked_shortcut). -- Change the way the menu_c class is defined so that it wastes less - space. Should probably look into other classes too. Why not using - bitvectors instead of arrays of ints used as booleans ? - The popup menus should get the pointer position event when there is no motion event. It's an issue when, to close a submenu, you click on the parent menu; until you move, the parent menu still highlights the old line. -- Object info box: if the box is already drawn, don't draw it again; it - makes the strings flicker slightly. -- [Alt] alone should highlight the menu bar. -- Minor glitch: when a popup menu is active, the spot is still shown -- Minor glitch: when a popup menu becomes active (active again) it does - not try to check if the pointer is over it. It waits for the first - motion event. I'm not sure whether this is the right thing. - Popup menus: that code is brittle because the same menu_c object is used for popups and pull-downs. For example, if a menu was pulled down before the same menu (that was previously popped up) was undrawn, weird things might happen. I don't like the idea of duplicating the whole menus, though. It would be cleaner to split the menu_c class into a constant part and a dynamic part but it would be a lot of work. -- Highlighting sectors: for a constant number of sectors to highlight, - gets slower as the total number of sectors increases. Might have to do - with the search for tagged linedefs. -- Highlighting linedefs: same problem when some of the linedefs to - highlight have a non-zero tag. IMO, the key of the problem is the O(2) - part in the highlighting of sectors. Should restructure - HighlightObject() and HighlightObjects(). Build a bit vector of all - linedefs that should be highlighted and do them all in a loop, without - recursion. And thus we would not highlight the same linedef more than - once anymore. -- Highlighting linedefs: the test "tag > 0" is arguable. Shouldn't it be - "tag != 0" ? -- When merging superimposed 1S linedefs, the resulting 2S linedef often - has the middle textures the 1S linedefs had. -- [Shift][Ins] doesn't work. -- Split linedefs and sector: if there is no sector between the linedefs, - they shouldn't be split. -- Split linedefs and sector: if only one linedef is - selected/highlighted, assume that the other linedef is the one - opposite. -- Split linedef: if pointer is somewhere on top of linedef, split it - there (not in the middle). -- Split linedef: buglet: the new vertex is initially put at (0,0) and - MapMaxX and friends are updated accordingly. So if the centre of the - map is way off (0,0), the next centre-map command will appear to put - the map off-centre. -- Moving/scrolling: centre view around spot under pointer (binding : - perhaps [Ctrl][But2]). - Instead of { Beep(); Notify (); }, should have a specialized function. - Somehow unify configuration variables and game definition variables, at least so that "set" displays both. AYM 2000-07-11: mmm... @@ -776,18 +980,21 @@ - There is a way to trigger the "Callback %p did not set disp_" bug message. Don't remember where. Perphaps in the texture viewer. Had to do with missing patches ? -- James Caldwell says that, with v1.4, if you create a polygon, delete - the sector inside it and try to draw a selection box around the - linedefs, Yadex segfaults. James was not able to give me a backtrace - and, apparently, no one has been able to reproduce that bug. Does it - still occur with v1.5 ? + + yadex: viewflat checkers + Yadex: Bug: Callback 0x805a770 did not set disp_ + REPORT ALL "Bug:" MESSAGES TO THE MAINTAINER ! + +- Certain calls to InputInteger() should use different bounds so that + one can enter E.G. 0xffff as well as -1. +- InputInteger() should be objectified so that it doesn't force the + number back to decimal every time the user hits [Tab], [Down] and + friends. +- Wad_file has too many friends. +- Do not include so much of the Boost library in the distribution + archive. To do soon -- Try to restore the "save image to file" function. The data should - not be taken from the window, since clipping could occur, but directly - from the buffer. -- Talk about the above in the doc. Mention that ppm files are always - created with NL = LF. - Finish window_to_rgbbmp() - Transfer rgbbmp_to_rawppm() in another file (rgbppm2.cc ?) - Rename rgbbmp_to_rawppm() -> _ppm(), and add a parameter to choose @@ -798,12 +1005,32 @@ - Test XK_*_ISO_* on SCO X11R5. - Test on Final Doom. - Add option to let Yadex tell you with which options it was compiled. -- Generate text announcement (yadex-announce, freshmeat, rgcde, cola) - Fix any remaining problems that might remain in saving. - "create": Fix the problem with levelname being NULL in EditLoop(). Check [F3]. - "create": every time you [F2], the wad name is reset to the default (E.G. "map01.wad"). +- Replace Patch_dir by Lump_dir. + +Web +- Announce to cola automatically. +- Generate LSM and upload to ftp.metalab.edu. +- Upload to ftp.cdrom.com. +- faq.html bears the wrong version number. +- Bcc announcements to Oliver Kraus too. +- Add patches/ +- patches/README: on the version included with the distribution archive, + mention that the latest patches can be found in + http://www.teaser.fr/~amajorel/yadex/patches/. +- patches/README: mention the fate of the patches (some have already + made in into the dev version, some will have not because I haven't + decided yet or haven't even looked into them and some will never make + it). +- Have an index page for patches/ ready, in case the web server does not + support automatic indexing. Use dldir for that. +- Should all patches in the web page be also included in the + distribution, and vice-versa ? + ---------------------------------------- @@ -847,6 +1074,7 @@ (E.G. "startx -- -bpp 16"), - restart Yadex with -privatecmap. + WIDGETS A widget should have the following methods : - create: @@ -883,6 +1111,7 @@ Attribute: title Attribute: a list of widgets with placement information. + GEOMETRY MANAGER The geometry manager is passed a list of widgets with placement information. @@ -902,6 +1131,7 @@ - "^" place to the top - "v" place to the bottom + DRAG-AND-DROP When dragging a group of objects, I see two possible policies: 1. snap position of current object @@ -909,6 +1139,7 @@ The inconvenient of (1) is that, if no object was aligned, it is difficult to move the group by a whole number of grid steps. + MOVING AND DRAGGING WITH THE KEYBOARD From main mode: [c] move cursor @@ -930,6 +1161,7 @@ [c] coarser (grid step *= 4) Any other key returns to main mode. + FASTER DISPLAY I think that screen refreshes could be sped up a lot by avoiding to clear the pixmap but instead redrawing every widget as black. It would @@ -959,9 +1191,1151 @@ If it works well, I might even get be able to do without a pixmap :-). + FILE SELECTION BOX It would be nice to have a file selection box with a small window that shows a preview of the level(s) and also a few indicators for textures, flats and other lumps. +FUNCTIONS AND BINDINGS +As of version 1.6, there is a number of problems: +- There is no way to get a list of all the bindings in use. Because of + that, neither the user's guide nor the man page document them and the + [F1] online help is incomplete and often out of date. There is also no + way to detect conflicts (i.e. two functions having the same binding). +- It would be nice to be able to change the bindings for a function + without recompiling. +- It would be nice to be able to define aliases or macros for the + functions you use often. +- Adding a new function involves redundant changes to add it in both the + menus and in EditorLoop(). +- MiscOperations() makes me want to laugh. +- EditorLoop() makes me want to cry. +- Some functions are defined inside EditorLoop(). +- There is no simple way to define bindings using a sequence of keys + like g? and z? in vi. +- The mechanism used to override the selection operation is awkward. +- There is no support for a count prefix. +- There is no command mode as in vi so you can't script and you can't + add a function without assigning it a binding first. + +The solution: +All actions should, as far as possible be functions. A function is a +piece of code that acts on editing session. It's identified by its name +(E.G. "split_sector"). It can take parameters, such a count, the working +set, a texture name, etc. + +There are three ways to invoke functions : +- through the bindings, +- through the menus, +- in command mode. + +There should be a --list-functions option to print the list of functions +to stdout. The output of this command would be included, after some +massaging, into the man page and users guide. + +Bindings: a binding is a sequence of keystrokes, a function name and +directives which define how the parameters of the function are set. +There should be a --list-bindings option to print the list of bindings +to stdout. This option would be used to generated the .cfg and the doc. + +Keys: keys that have no corresponding character in ASCII should be +representable with something like "[keyname]": [ctrl], [alt], [shift], +[return], [left], [pageup], [home], [end], [f1], [tab], [backtab]. To +what KeySyms these map should be documented. There should be a +--list-keys option to list all those codes to stdout. FIXME: How do we +make the difference simultaneous and disjoint keystrokes ? Or do we just +assume that modifiers (ctrl/alt/shift) are always simultaneous and the +rest never are ? + +Command mode: by typing [:], you enter command mode. This is similar to +vi's. Any function name can be used as a command. Parameters such as +object numbers are entered literally (E.G. ":delete_vertex 69"). It +should be possible to use the selection and highlight, either implicitly +(E.G. ":delete_vertex") or explicitly (E.G. ":delete_vertex $S"). There +should be shortcuts for function names (E.G. "dv" for "delete_vertex"). +I'd like to unify the command mode and the .cfg syntax so that you can +call function in a .cfg, that sort of stuff. + +Interactivity: functions should probably refrain from popping up dialog +boxes when called from command mode (it could be script). Either the +caller should pass a "don't-be-interactive" flag or it's the caller that +should pop up the dialog boxes, in which case it would have to be aware +of an awful lot of things. + +Arguments 1: FIXME: named arguments ? Unix-style options ? Purely +positional ? + +Arguments 2: FIXME: if there are any commands that take more than one +list, arguments must be typed (is it a list or not) and command mode +must provide a syntax for lists, E.G. "item1,item2,item3". + +Arguments 3: FIXME: cardinality checks in the caller ? (E.G. "need +exactly two linedefs selected"). + +Movement functions: movement commands are used in several ways: +- to select everything between the current pointer position to where + destination position without actually moving the pointer, +- to move the pointer. +How ? + +Modifiers: some functions don't do anything by themselves but change the +way the next function behaves : +- ["] followed by a register name, causes the next cut or paste function + to used that register instead of the unnamed register +- Modifiers for selection operations. By default a selection function + replaces the current selection. With the following modifiers, the + output of the function is combined with the current selection by the + means of a selop : [^] xor (sel = sel ^ func), [&] intersection (sel = + sel & func), [|] union (sel = sel | func), [~] subtraction (sel = sel + & ~func). +- +- something to make the next command use a movement selection as its + working set (vi can afford the luxury of duplicating commands (c vs. s + and d vs. x, but Yadex cannot because it has too many commands). + +It is desirable that these modifiers be implemented as functions, so +that they use the same binding system as everything else. + +A problem with modifiers is who resets the default settings ? If it's +EditorLoop(), how does it know which functions trigger resetting and +which don't ? If it's the functions, isn't it a bit bletcherous ? Should +functions have to declare that they use, say, the working set and +EditorLoop() reset the working set only after such functions ? + +FIXME: at the moment, certain keys are bound to several different +functions, depending on the mode. How do we do that ? Does it make any +sense now that global mode is in sight ? + +Current functions: +- [!] _debug_info +- [#] move_num +- [%] toggle_show_things_sprites +- [&] toggle_show_object_numbers +- ['] view_centre +- [+] zoom_in +- [-] zoom_out +- [0]..[9] zoom_set +- [<] move_prev +- [=] zoom_in +- [>] move_next +- [@] pop up font window +- [E] select_linedefs_ss +- [G] grid_inc +- [H] grid_reset +- [_] zoom_out +- [`] view_centre_zoom_fit +- [a] pop up "Set flag" +- [alt][a] pop up "About" +- [alt][i] info_bar_toggle +- [b] pop up "Toggle flag" +- [backtab] mode_prev +- [c] pop up "Clear flag" +- [ctrl][E] ^select_linedefs_ss +- [ctrl][b] select_linedefs_whose_sidedefs_reference_non_existant_sector +- [ctrl][e] ^select_linedefs_nf +- [ctrl][g] mode_global_toggle +- [ctrl][k] sector_slice +- [ctrl][l] force_redraw +- [ctrl][p] pop up palette window +- [ctrl][r] print sidedef xref +- [ctrl][s] print secret sectors +- [ctrl][t] print tagged linedefs or sectors +- [ctrl][u] select linedefs with unknown type +- [ctrl][v] toggle snap vertex tool +- [ctrl][x] obj_exchange_numbers +- [del] obj_delete +- [down] scroll_down +- [e] select_linedefs_nf +- [end] scroll_down_page +- [esc] quit +- [f10] pop up "Checks" +- [f1] pop up "Help" +- [f2] save +- [f3] save_as +- [f5] pop up "Preferences" +- [f8] pop up "Misc. operations" +- [f9] pop up "Insert a standard object" +- [g] grid_dec +- [h] grid_toggle +- [home] scroll_up_page +- [i] info_box_toggle +- [ins] obj_insert +- [j] move_num +- [l] mode_linedefs +- [left] scroll_left +- [n] move_next +- [o] copy +- [p] move_prev +- [pagedown] scroll_right_page +- [pageup] scroll_left_page +- [q] quit +- [r] rulers_toggle +- [return] pop up "Properties" +- [right] scroll_right +- [s] mode_sectors +- [shift][f1] screenshot +- [shift][f2] test_entry2 +- [space] zoom_toggle +- [t] mode_things +- [tab] mode_next +- [up] scroll_up +- [v] mode_vertices +- [w] linedef_split_sector_split +- [w] thing_spin_ccw +- [x] linedef_split +- [x] thing_spin_cw +- [y] snap_toggle +- [z] grid_lock_toggle +- [|] pop up colour window + +Possible new functions: +- go to {start,end,middle,other end} of linedef +- go pixels toward the {start,end} of this linedef +- go to the {next,previous} angle along this path of linedefs (how are + "next" and "previous" defined ? what happens if you're on a vertex + that's shared by several linedefs ?) +- move {left,right,up,down} to the edge of the selection +- go to the centre of the rectangle that contains the selection +- go to the nearest vertex +- go to the nearest vertex to the {north,south,east,west} +- make sector from linedefs, adding linedefs if necessary +- select shortest closed linedef path +- raise or lower the {ceiling,floor} of a sector by units +- [e][space] select_clear +- [e][~] select_invert (in same class of objects ?) + +Implementation: Functions are C++ functions (FIXME: what about aliases +and macros ?). There is a global map named "function" whose key is the +name of the function and the value a pointer on the corresponding C++ +function. FIXME: How is this map filled ? Hard coded ? Is is possible to +insert new elements dynamically ? It should probably be forbidden to +modify an existing element. + +There is a global map named "binding" whose key is the key sequence and +whose value is a structure containing the function name and the binding +information. FIXME: How is this map filled ? Are the default binding +hard coded ? + +FIXME: what the syntax to modify the bindings from the .cfg ? A separate +keyword (bind [shift][f9] fart \$@) or a pseudo hash +(binding["[shift][f9]"] = fart \$@) ? The interesting feature of the +pseudo hash is that it can be read, not just written to. + +Functions that modify the selection: They do not necessarily operate on +the main selection but perhaps on a copy of it. If we want to implement +env_push and env_pop, it is necessary to be able to dissociate the +selection from the editing session. + +FIXME do we implement the selop in EditorLoop() or in the selection +functions ? The obvious drawback of doing it in the functions is +redundant code and more bugs. The advantage is that it permits certain +optimisations. For example, if selop is intersect, there is no need to +scan the objects that are not already in the selection. Is the +performance gain worth the ugliness ? A O(1) scan is fast and if we need +a O(2) scan (for example to get the list of linedefs tagged to a list a +sectors), we can make it O(1) again by using a temporary table. It's +also a more general way to improve performance ; what if the selection +contains everything ? + +I'm tempted to go for the clean, easy solution (having the functions +return a selection of their own and having EditorLoop() combine it with +the existing list). If performance is a problem, it can be changed +later. One thing that will not be possible with this approach, though, +is to write a function that inserts items in the selection a certain +places (silly example : a function that takes a list of linedefs and +inserts after each linedef the sectors it is tagged to). But I guess we +can do without such a feature for the time being. + +Combining code: + (*function) (old_list, new_list); + if (selop == replace) { + old_list = new_list; + } + else { + if (selop == intersection) { + // Make bitvector new_bv from new_list + for each item in old_list + if not in new_bv + remove it from old_list + } + else if (selop == union) { + // Make bitvector old_bv from old_list + for each item in new_list + if not in old_bv + append in to old_list + } + else if (selop == xor) { + // Make bitvector new_bv from new_list + for each item in old_list + if in new_bv + remove it from old_list and from new_bv + for each item in new_list + if in new_bv + append it to old_list + } + else if (selop == subtraction) { + // Make bitvector new_bv from new_list + for each item in old_list + if in new_bv + remove it from old_list + } + } + +In any case, it should be possible for functions to modify the input +selection because select_clear is going to be implemented as a function. + +There should be a way to override the selop until further notice. + +EditorLoop() algorithm: +1. Get keystroke +2. Append to buffer +3. Is there a binding that is exactly equal to the buffer ? If yes, call + the corresponding function, empty the buffer and go to 1. +4. Is there a binding of which the contents of the buffer is an initial + substring ? If no, beep and empty the buffer. +5. Go to 1. +Also accumulate count. + + +AJA PATCH +Below is a patch that implements two other things that I would've +liked. Firstly, being able to turn off the warning message for the +"Swap Sidedefs" functions for lines. I find that I often need to flip +a line but keep the sidedefs where they were. The patch adds a +"blindly_swap_sidedefs" field to the config file. Incidentally I +found it strange that using "Add a 2nd Sidedef" onto a fresh line +(with no sidedefs already) put it as the first, yet flipping a single +sided line happily swaps the sidedefs, making a line with no right +side. + +Secondly, the patch lets the zoom factors of the number keys be +configurable. + +Cheers, +__ +\/ Andrew Apted + + +=========================================================================== + +diff -u ./src/editloop.cc.prev ./src/editloop.cc +--- ./src/editloop.cc.prev Tue Sep 19 16:20:03 2000 ++++ ./src/editloop.cc Tue Sep 19 17:38:52 2000 +@@ -247,6 +247,8 @@ + OrigX = 0; + OrigY = 0; + ++edit_zoom_init (); ++ + if (zoom_default == 0) + { + zoom_fit (e); +@@ -1370,7 +1372,7 @@ + // [0], [1], ... [9]: set the zoom factor + else if (is.key >= '0' && is.key <= '9') + { +- int r = edit_set_zoom (&e, is.key == '0' ? 0.1 : 1.0 / dectoi(is.key)); ++ int r = edit_set_zoom (&e, digit_zoom_factors[dectoi(is.key)]); + if (r == 0) + RedrawMap = 1; + } +diff -u ./src/cfgfile.cc.prev ./src/cfgfile.cc +--- ./src/cfgfile.cc.prev Tue Sep 19 16:20:24 2000 ++++ ./src/cfgfile.cc Tue Sep 19 18:33:03 2000 +@@ -345,6 +345,13 @@ + "Merge vertices after ins. vertex", + &insert_vertex_merge_vertices }, + ++{ "blindly_swap_sidedefs", ++ NULL, ++ OPT_BOOLEAN, ++ NULL, ++ "Blindly swap sidedefs on a linedef", ++ &blindly_swap_sidedefs }, ++ + { "iwad1", + "i1", + OPT_STRINGPTR, +@@ -556,6 +563,20 @@ + NULL, + "Step between zoom factors (in %)", + &zoom_step }, ++ ++{ "digit_zoom_base", ++ NULL, ++ OPT_INTEGER, ++ NULL, ++ "Base zoom factor of digit keys (in %)", ++ &digit_zoom_base }, ++ ++{ "digit_zoom_step", ++ NULL, ++ OPT_INTEGER, ++ NULL, ++ "Step between zoom factors of digit keys (in %)", ++ &digit_zoom_step }, + + { NULL, + NULL, +diff -u ./src/yadex.cc.prev ./src/yadex.cc +--- ./src/yadex.cc.prev Tue Sep 19 16:21:16 2000 ++++ ./src/yadex.cc Tue Sep 19 18:33:03 2000 +@@ -109,8 +109,11 @@ + bool InfoShown = true; + int zoom_default = 0; // 0 means fit + int zoom_step = 0; // 0 means sqrt(2) ++int digit_zoom_base = 100; ++int digit_zoom_step = 30; + confirm_t insert_vertex_split_linedef = YC_ASK_ONCE; + confirm_t insert_vertex_merge_vertices = YC_ASK_ONCE; ++bool blindly_swap_sidedefs = false; + const char *Iwad1 = NULL; + const char *Iwad2 = NULL; + const char *Iwad3 = NULL; +diff -u ./src/yadex.h.prev ./src/yadex.h +--- ./src/yadex.h.prev Tue Sep 19 16:21:20 2000 ++++ ./src/yadex.h Tue Sep 19 18:33:03 2000 +@@ -396,8 +396,11 @@ + extern int idle_sleep_ms; // Time to sleep after empty XPending() + extern int zoom_default; // Initial zoom factor for map + extern int zoom_step; // Step between zoom factors in percent ++extern int digit_zoom_base; // Zoom factor of `1' key, in percent ++extern int digit_zoom_step; // Step between digit keys, in percent + extern confirm_t insert_vertex_merge_vertices; + extern confirm_t insert_vertex_split_linedef; ++extern bool blindly_swap_sidedefs; + extern const char *Iwad1; // Name of the Doom iwad + extern const char *Iwad2; // Name of the Doom II iwad + extern const char *Iwad3; // Name of the Heretic iwad +diff -u ./src/editobj.cc.prev ./src/editobj.cc +--- ./src/editobj.cc.prev Tue Sep 19 18:29:40 2000 ++++ ./src/editobj.cc Tue Sep 19 18:29:53 2000 +@@ -747,6 +747,7 @@ + if (objtype == OBJ_LINEDEFS) + { + if (Expert ++ || blindly_swap_sidedefs + || Confirm (-1, -1, + "Warning: the sector references are also swapped", + "You may get strange results if you don't know what you are doing...")) +diff -u ./src/editzoom.cc.prev ./src/editzoom.cc +--- ./src/editzoom.cc.prev Tue Sep 19 17:15:54 2000 ++++ ./src/editzoom.cc Tue Sep 19 17:42:57 2000 +@@ -36,6 +36,21 @@ + #include "gfx.h" + + ++double digit_zoom_factors[10]; ++ ++ ++void edit_zoom_init () ++{ ++ int i; ++ ++ double current = digit_zoom_base / 100.0; ++ double step = (digit_zoom_step + 100.0) / 100.0; ++ ++ for (i=1; i <= 10; i++, current /= step) ++ digit_zoom_factors[i % 10] = current; ++} ++ ++ + int edit_zoom_in (edit_t *e) + { + if (! e) return 1; // Prevent compiler warning about unused .p. +diff -u ./src/editzoom.h.prev ./src/editzoom.h +--- ./src/editzoom.h.prev Tue Sep 19 17:15:58 2000 ++++ ./src/editzoom.h Tue Sep 19 17:39:03 2000 +@@ -4,6 +4,17 @@ + */ + + ++/* zoom factors for the digit keys ++ */ ++extern double digit_zoom_factors[10]; ++ ++ ++/* ++ * edit_zoom_init - initialise ++ */ ++void edit_zoom_init (void); ++ ++ + /* + * edit_zoom_in - zoom_in + * +diff -u ./yadex.cfg.prev ./yadex.cfg +--- ./yadex.cfg.prev Tue Sep 19 16:30:47 2000 ++++ ./yadex.cfg Tue Sep 19 18:41:14 2000 +@@ -78,6 +78,11 @@ + + insert_vertex_split_linedef = yes + ++# Blindly swaps the sidedefs on a linedef, i.e. without any warning ++# prompt. Default is false. ++ ++ #blindly_swap_sidedefs = false ++ + # Is the infobar shown ? On by default. + + #info_bar = true +@@ -111,8 +116,8 @@ + #default_light_level = 144 + #default_lower_texture = STARTAN3 + #default_middle_texture = STARTAN3 +- #default_thing = 3004 + #default_upper_texture = STARTAN3 ++ #default_thing = 3004 + + # Initial zoom factor when opening a new edit window, in + # percent. The special value 0 causes Yadex to adjust the zoom +@@ -127,6 +132,12 @@ + # two (slightly above 41% increase). It's the default. + + #zoom_step = 0 ++ ++# Base zoom factor and step for the digit keys, in percent. They work ++# like zoom_default and zoom_step above, but no special values. ++ ++ #digit_zoom_base = 100 ++ #digit_zoom_step = 30 + + + # + + +AJA PATCH #2 +Hey all, + +One feature I've really wanted in Yadex is the ability to point to an +area, press a key, and have all the linedefs that face into that area +updated so that it forms a new sector. If the lines don't have a +sidedef on that side, it is added, otherwise the existing sidedef is +updated. + +Well I've implemented it, below is the patch :-). The key is capital +`Z'. I tried `S' initially but it was easy to get mixed up with the +sector mode switch key `s'. It hasn't gotten heavy testing yet, but +so far so good. One limitation is that it doesn't handle islands +within the chosen area -- for example the pillars near the start of +MAP01 of DOOM 2. Oh yeah if you're in sector mode and press the 'Z' +key while another sector is selected, that sector reference is used on +the updated sidedefs rather than making a new sector. + +Cheers, +__ +\/ Andrew Apted + + +diff -r -u src_aja/editloop.cc src/editloop.cc +--- src_aja/editloop.cc Tue Aug 15 11:14:25 2000 ++++ src/editloop.cc Wed May 9 17:19:27 2001 +@@ -2123,6 +2123,21 @@ + RedrawMap = 1; + } + ++ // [Z] Set sector on surrounding linedefs (AJA) ++ else if (is.key == 'Z' && e.pointer_in_window) ++ { ++ if (e.obj_type == OBJ_SECTORS && e.Selected) ++ { ++ SuperSectorSelector (e.pointer_x, e.pointer_y, ++ e.Selected->objnum); ++ } ++ else ++ { ++ SuperSectorSelector (e.pointer_x, e.pointer_y, OBJ_NO_NONE); ++ } ++ RedrawMap = 1; ++ } ++ + // [!] Debug info (not documented) + else if (is.key == '!') + { +diff -r -u src_aja/s_misc.cc src/s_misc.cc +--- src_aja/s_misc.cc Mon Aug 28 07:33:51 2000 ++++ src/s_misc.cc Thu May 10 22:16:49 2001 +@@ -29,10 +29,13 @@ + + + #include "yadex.h" ++#include ++ + #include "entry.h" + #include "gfx.h" + #include "levels.h" + #include "selectn.h" ++#include "dialog.h" + + + /* +@@ -176,6 +179,342 @@ + Sectors[cur->objnum].light = light; + } + MadeChanges = 1; ++} ++ ++ ++static int find_linedef_for_area (int x, int y, int& side) ++{ ++ int n, m, curx; ++ int best_match = -1; ++ ++ curx = 32767; // Oh yes, one more hard-coded constant! ++ ++ for (n = 0; n < NumLineDefs; n++) ++ if ((Vertices[LineDefs[n].start].y > y) ++ != (Vertices[LineDefs[n].end].y > y)) ++ { ++ int lx0 = Vertices[LineDefs[n].start].x; ++ int ly0 = Vertices[LineDefs[n].start].y; ++ int lx1 = Vertices[LineDefs[n].end].x; ++ int ly1 = Vertices[LineDefs[n].end].y; ++ m = lx0 + (int) ((long) (y - ly0) * (long) (lx1 - lx0) ++ / (long) (ly1 - ly0)); ++ if (m >= x && m < curx) ++ { ++ curx = m; ++ best_match = n; ++ } ++ } ++ ++ /* now look if this linedef has a sidedef bound to one sector */ ++ if (best_match < 0) ++ return OBJ_NO_NONE; ++ ++ if (Vertices[LineDefs[best_match].start].y ++ > Vertices[LineDefs[best_match].end].y) ++ side = 1; ++ else ++ side = 2; ++ ++ return best_match; ++} ++ ++/* ++ compute the angle between lines AB and BC, going anticlockwise. ++ result is in degrees 0 - 359. A, B and C are vertex indices. ++ -AJA- 2001-05-09 ++ */ ++#define DEBUG_ANGLE 0 ++ ++static double angle_between_linedefs (int A, int B, int C) ++{ ++ int a_dx = Vertices[B].x - Vertices[A].x; ++ int a_dy = Vertices[B].y - Vertices[A].y; ++ ++ int c_dx = Vertices[B].x - Vertices[C].x; ++ int c_dy = Vertices[B].y - Vertices[C].y; ++ ++ double AB_angle = (a_dx == 0) ? (a_dy >= 0 ? 90 : -90) : ++ atan2 (a_dy, a_dx) * 180 / M_PI; ++ ++ double CB_angle = (c_dx == 0) ? (c_dy >= 0 ? 90 : -90) : ++ atan2 (c_dy, c_dx) * 180 / M_PI; ++ ++ double result = CB_angle - AB_angle; ++ ++ if (result >= 360) ++ result -= 360; ++ ++ while (result < 0) ++ result += 360; ++ ++#if (DEBUG_ANGLE) ++ fprintf(stderr, "ANGLE %1.6f (%d,%d) -> (%d,%d) -> (%d,%d)\n", ++ result, Vertices[A].x, Vertices[A].y, ++ Vertices[B].x, Vertices[B].y, Vertices[C].x, Vertices[C].y); ++#endif ++ ++ return result; ++} ++ ++/* ++ follows the path clockwise from the given start line, adding each ++ line into the appropriate set. If the path is not closed, zero is ++ returned. ++ ++ -AJA- 2001-05-09 ++ */ ++#define DEBUG_PATH 0 ++ ++static int select_sides_in_closed_path (bitvec_c& ld_side1, ++ bitvec_c& ld_side2, int line, int side) ++{ ++ int cur_vert, prev_vert, final_vert; ++ ++ if (side == 1) ++ { ++ ld_side1.set (line); ++ cur_vert = LineDefs[line].end; ++ prev_vert = final_vert = LineDefs[line].start; ++ } ++ else ++ { ++ ld_side2.set (line); ++ cur_vert = LineDefs[line].start; ++ prev_vert = final_vert = LineDefs[line].end; ++ } ++ ++#if (DEBUG_PATH) ++ fprintf(stderr, "PATH: line %d side %d cur %d final %d\n", ++ line, side, cur_vert, final_vert); ++#endif ++ ++ while (cur_vert != final_vert) ++ { ++ int next_line = OBJ_NO_NONE; ++ int next_vert = OBJ_NO_NONE; ++ int next_side; ++ double best_angle = 999; ++ ++ // Look for the next linedef in the path. It's the linedef that ++ // uses the current vertex and is not the current one. ++ ++ for (int n = 0; n < NumLineDefs; n++) ++ { ++ if (n == line) ++ continue; ++ ++ int other_vert; ++ int which_side; ++ ++ if (LineDefs[n].start == cur_vert) ++ { ++ other_vert = LineDefs[n].end; ++ which_side = 1; ++ } ++ else if (LineDefs[n].end == cur_vert) ++ { ++ other_vert = LineDefs[n].start; ++ which_side = 2; ++ } ++ else ++ continue; ++ ++ // found adjoining linedef ++ ++ double angle = angle_between_linedefs (prev_vert, cur_vert, ++ other_vert); ++ ++ if (! is_obj (next_line) || angle < best_angle) ++ { ++ next_line = n; ++ next_vert = other_vert; ++ next_side = which_side; ++ ++ best_angle = angle; ++ } ++ ++ // Continue the search ++ } ++ ++ line = next_line; ++ side = next_side; ++ ++#if (DEBUG_PATH) ++ fprintf(stderr, "PATH NEXT: line %d side %d vert %d angle %1.6f\n", ++ line, side, next_vert, best_angle); ++#endif ++ ++ // None ? Path cannot be closed ++ if (! is_obj (line)) ++ return 0; ++ ++ // Line already seen ? Under normal circumstances this won't ++ // happen, but it _can_ happen and indicates a non-closed ++ // structure ++ if (ld_side1.get (line) || ld_side2.get (line)) ++ return 0; ++ ++ if (side == 1) ++ ld_side1.set (line); ++ else ++ ld_side2.set (line); ++ ++ prev_vert = cur_vert; ++ cur_vert = next_vert; ++ } ++ ++#if (DEBUG_PATH) ++ fprintf(stderr, "PATH CLOSED !\n"); ++#endif ++ ++ return 1; ++} ++ ++/* ++ update the side on a single linedef, using the given sector ++ reference. Will create a new sidedef if necessary. ++ */ ++static void super_set_sector_on_side (int line, wad_sdn_t& side, ++ wad_sdn_t& other, int side_no, int sector) ++{ ++ if (is_obj (side) && SideDefs[side].sector == sector) ++ { ++ // there was no change. ++ return; ++ } ++ ++ int must_flip = 0; ++ ++ if (! is_obj (side)) ++ { ++ // if we're adding a sidedef to a line that has no sides, and ++ // the sidedef would be the 2nd one, then flip the linedef. ++ // Thus we don't end up with invalid lines -- i.e. ones with a ++ // left side but no right side. ++ ++ if (! is_obj (other) && side_no == 2) ++ must_flip = 1; ++ ++ InsertObject (OBJ_SIDEDEFS, OBJ_NO_NONE, 0, 0); ++ side = NumSideDefs - 1; ++ ++ // if we're adding a second side to the linedef, clear out some ++ // of the properties that aren't needed anymore: middle texture, ++ // two-sided flag, and impassible flag. ++ ++ if (is_obj (other)) ++ { ++ strncpy (SideDefs[side].tex3, "-", WAD_TEX_NAME); ++ strncpy (SideDefs[other].tex3, "-", WAD_TEX_NAME); ++ ++ LineDefs[line].flags |= 4; // Set the 2S bit ++ LineDefs[line].flags &= ~1; // Clear the Im bit ++ } ++ } ++ ++ SideDefs[side].sector = sector; ++ ++ if (must_flip) ++ { ++ int temp = LineDefs[line].start; ++ LineDefs[line].start = LineDefs[line].end; ++ LineDefs[line].end = temp; ++ ++ temp = side; ++ side = other; ++ other = temp; ++ } ++ ++ MadeChanges = 1; ++ MadeMapChanges = 1; ++} ++ ++static int super_find_sector_model (bitvec_c& ld_side1, ++ bitvec_c& ld_side2) ++{ ++ for (int line=0; line < NumLineDefs; line++) ++ { ++ int side1 = LineDefs[line].sidedef1; ++ int side2 = LineDefs[line].sidedef2; ++ ++ if (ld_side1.get (line)) ++ if (is_obj (side2)) ++ return SideDefs[side2].sector; ++ ++ if (ld_side2.get (line)) ++ if (is_obj (side1)) ++ return SideDefs[side1].sector; ++ } ++ ++ return OBJ_NO_NONE; ++} ++ ++ ++/* ++ Change the closed sector at the pointer ++ ++ "sector" here really means a bunch of sidedefs that all face ++ inward to the current area under the mouse cursor. Two basic ++ operations: (a) set the sidedef sector references to a completely ++ new sector, or (b) set them to an existing sector. This is ++ controlled by the `new_sec' parameter. ++ ++ -AJA- 2001-05-08 ++ */ ++ ++void SuperSectorSelector (int map_x, int map_y, int new_sec) ++{ ++ int line, side; ++ char msg_buf[200]; ++ ++ line = find_linedef_for_area (map_x, map_y, side); ++ ++ if (! is_obj (line)) ++ { ++ Beep (); ++ sprintf (msg_buf, "Chosen area is not closed"); ++ Notify (-1, -1, msg_buf, NULL); ++ return; ++ } ++ ++ bitvec_c ld_side1 (NumLineDefs); ++ bitvec_c ld_side2 (NumLineDefs); ++ ++ int closed = select_sides_in_closed_path (ld_side1, ld_side2, ++ line, side); ++ ++ if (! closed) ++ { ++ Beep (); ++ sprintf (msg_buf, "Area chosen is not closed"); ++ Notify (-1, -1, msg_buf, NULL); ++ return; ++ } ++ ++ // -AJA- FIXME: look for "islands", closed linedef paths that lie ++ // completely inside the area, i.e. not connected to the main path. ++ // Example: the two pillars at the start of MAP01 of DOOM 2. See ++ // GetOppositeSector() and the end of SplitSector() for a possible ++ // algorithm. ++ ++ if (! is_obj (new_sec)) ++ { ++ int model = super_find_sector_model (ld_side1, ld_side2); ++ InsertObject (OBJ_SECTORS, model, 0, 0); ++ new_sec = NumSectors - 1; ++ } ++ ++ for (line=0; line < NumLineDefs; line++) ++ { ++ if (ld_side1.get (line)) ++ super_set_sector_on_side (line, LineDefs[line].sidedef1, ++ LineDefs[line].sidedef2, 1, new_sec); ++ ++ else if (ld_side2.get (line)) ++ super_set_sector_on_side (line, LineDefs[line].sidedef2, ++ LineDefs[line].sidedef1, 2, new_sec); ++ } + } + + /* end of file */ +diff -r -u src_aja/yadex.h src/yadex.h +--- src_aja/yadex.h Wed Aug 16 07:22:40 2000 ++++ src/yadex.h Tue May 8 20:32:53 2001 +@@ -584,6 +584,7 @@ + void DistributeSectorCeilings (SelPtr); /* SWAP! */ + void RaiseOrLowerSectors (SelPtr obj); + void BrightenOrDarkenSectors (SelPtr obj); ++void SuperSectorSelector (int map_x, int map_y, int new_sec); + + /* s_prop.cc (previously in editobj.cc) */ + void SectorProperties (int x0, int y0, SelPtr obj); + + +AJA PATCH #3 +Here is a patch that implements two features I mentioned before: + + (a) the 'w' key in vertex mode doing "split sector" function. + It's quite handy. (code was a doddle). + + (b) the 'T' key doing property transfer from highlighted object + to all selected objects. + +Patch is against 1.5.1 (like the SuperSector one, which BTW has been +extremely useful -- I use it all the time and wouldn't want to edit +without it. Plus it hasn't crashed or fouled up yet). I've tried to +keep both patches independent -- might cause a reject against yadex.h +though. Andre, if you'd rather one big patch, will do. + +Cheers, +__ +\/ Andrew Apted + + +diff -u -r src_aja/editloop.cc src/editloop.cc +--- src_aja/editloop.cc Tue Aug 15 11:14:25 2000 ++++ src/editloop.cc Sun May 27 15:46:12 2001 +@@ -1853,6 +1853,17 @@ + StretchSelBox = false; + } + ++ // [w]: split sector between vertices ++ else if (is.key == 'w' && e.obj_type == OBJ_VERTICES ++ && e.Selected && e.Selected->next && ! e.Selected->next->next) ++ { ++ SplitSector (e.Selected->next->objnum, e.Selected->objnum); ++ ForgetSelection (&e.Selected); ++ RedrawMap = 1; ++ DragObject = false; ++ StretchSelBox = false; ++ } ++ + // [x]: spin things 1/8 turn clockwise + else if (is.key == 'x' && e.obj_type == OBJ_THINGS + && (e.Selected || is_obj (e.highlight_obj_no))) +@@ -2134,6 +2160,30 @@ + { + show_font (); + RedrawMap = 1; ++ } ++ ++ // [T] Transfer properties to selected objects (AJA) ++ else if (is.key == 'T' && e.Selected ++ && e.highlight_obj_no >= 0) ++ { ++ switch (e.obj_type) ++ { ++ case OBJ_SECTORS: ++ TransferSectorProperties (e.highlight_obj_no, e.Selected); ++ RedrawMap = 1; ++ break; ++ case OBJ_THINGS: ++ TransferThingProperties (e.highlight_obj_no, e.Selected); ++ RedrawMap = 1; ++ break; ++ case OBJ_LINEDEFS: ++ TransferLinedefProperties (e.highlight_obj_no, e.Selected); ++ RedrawMap = 1; ++ break; ++ default: ++ Beep (); ++ break; ++ } + } + + // [|] Show colours (not documented) +diff -u -r src_aja/l_prop.cc src/l_prop.cc +--- src_aja/l_prop.cc Sun Apr 30 06:37:12 2000 ++++ src/l_prop.cc Sun May 27 15:41:37 2001 +@@ -477,3 +477,37 @@ + } + + ++/* ++ * TransferLinedefProperties ++ * ++ * Note: right now nothing is done about sidedefs. Being able to ++ * (intelligently) transfer sidedef properties from source line to ++ * destination linedefs could be a useful feature -- though it is ++ * unclear the best way to do it. OTOH not touching sidedefs might ++ * be useful too. ++ * ++ * -AJA- 2001-05-27 ++ */ ++#define LINEDEF_FLAG_KEEP (1 + 4) ++ ++void TransferLinedefProperties (int src_linedef, SelPtr linedefs) ++{ ++ SelPtr cur; ++ wad_ldflags_t src_flags = LineDefs[src_linedef].flags & ~LINEDEF_FLAG_KEEP; ++ ++ for (cur=linedefs; cur; cur=cur->next) ++ { ++ if (! is_obj(cur->objnum)) ++ continue; ++ ++ // don't transfer certain flags ++ LineDefs[cur->objnum].flags &= LINEDEF_FLAG_KEEP; ++ LineDefs[cur->objnum].flags |= src_flags; ++ ++ LineDefs[cur->objnum].type = LineDefs[src_linedef].type; ++ LineDefs[cur->objnum].tag = LineDefs[src_linedef].tag; ++ ++ MadeChanges = 1; ++ } ++} ++ +diff -u -r src_aja/s_prop.cc src/s_prop.cc +--- src_aja/s_prop.cc Tue Jan 11 00:40:11 2000 ++++ src/s_prop.cc Sun May 27 13:29:27 2001 +@@ -208,3 +208,32 @@ + } + + ++/* ++ * TransferSectorProperties ++ * ++ * -AJA- 2001-05-27 ++ */ ++void TransferSectorProperties (int src_sector, SelPtr sectors) ++{ ++ SelPtr cur; ++ ++ for (cur=sectors; cur; cur=cur->next) ++ { ++ if (! is_obj(cur->objnum)) ++ continue; ++ ++ strncpy (Sectors[cur->objnum].floort, Sectors[src_sector].floort, ++ WAD_FLAT_NAME); ++ strncpy (Sectors[cur->objnum].ceilt, Sectors[src_sector].ceilt, ++ WAD_FLAT_NAME); ++ ++ Sectors[cur->objnum].floorh = Sectors[src_sector].floorh; ++ Sectors[cur->objnum].ceilh = Sectors[src_sector].ceilh; ++ Sectors[cur->objnum].light = Sectors[src_sector].light; ++ Sectors[cur->objnum].special = Sectors[src_sector].special; ++ Sectors[cur->objnum].tag = Sectors[src_sector].tag; ++ ++ MadeChanges = 1; ++ } ++} ++ +diff -u -r src_aja/t_prop.cc src/t_prop.cc +--- src_aja/t_prop.cc Tue Jul 25 08:46:49 2000 ++++ src/t_prop.cc Sun May 27 15:22:29 2001 +@@ -315,4 +315,30 @@ + } + + ++/* ++ * TransferThingProperties ++ * ++ * -AJA- 2001-05-27 ++ */ ++void TransferThingProperties (int src_thing, SelPtr things) ++{ ++ SelPtr cur; ++ ++ for (cur=things; cur; cur=cur->next) ++ { ++ if (! is_obj(cur->objnum)) ++ continue; ++ ++ Things[cur->objnum].angle = Things[src_thing].angle; ++ Things[cur->objnum].type = Things[src_thing].type; ++ Things[cur->objnum].when = Things[src_thing].when; ++ ++ MadeChanges = 1; ++ ++ things_types++; ++ things_angles++; ++ } ++} ++ ++ + /* end of file */ +diff -u -r src_aja/yadex.h src/yadex.h +--- src_aja/yadex.h Wed Aug 16 07:22:40 2000 ++++ src/yadex.h Sun May 27 15:45:18 2001 +@@ -506,6 +506,7 @@ + + /* l_prop.cc (previously in editobj.cc) */ + void LinedefProperties (int x0, int y0, SelPtr obj); ++void TransferLinedefProperties (int src_linedef, SelPtr linedefs); + + /* l_unlink.cc */ + void unlink_sidedef (SelPtr linedefs, int side1, int side2); +@@ -587,6 +589,7 @@ + + /* s_prop.cc (previously in editobj.cc) */ + void SectorProperties (int x0, int y0, SelPtr obj); ++void TransferSectorProperties (int src_sector, SelPtr sectors); + + /* s_split.cc (previously in objects.cc) */ + void SplitSector (int, int); /* SWAP! */ +@@ -603,6 +606,7 @@ + /* selrect.cc */ + /* t_prop.c (previously in editobj.c) */ + void ThingProperties (int x0, int y0, SelPtr obj); ++void TransferThingProperties (int src_thing, SelPtr things); + + /* v_merge.cc */ + void DeleteVerticesJoinLineDefs (SelPtr ); /* SWAP! */ + + diff -uaNr yadex-1.5.2/VERSION yadex-1.6.0/VERSION --- yadex-1.5.2/VERSION 2001-06-21 16:05:44.000000000 +0200 +++ yadex-1.6.0/VERSION 2003-03-30 14:18:03.000000000 +0200 @@ -1 +1 @@ -1.5.2 +1.6.0 diff -uaNr yadex-1.5.2/atclib/al_sdup.c yadex-1.6.0/atclib/al_sdup.c --- yadex-1.5.2/atclib/al_sdup.c 1999-08-01 17:23:50.000000000 +0200 +++ yadex-1.6.0/atclib/al_sdup.c 2001-06-21 16:22:13.000000000 +0200 @@ -27,6 +27,7 @@ #include +#include #include "atclib.h" diff -uaNr yadex-1.5.2/boost/boost/config/compiler/borland.hpp yadex-1.6.0/boost/boost/config/compiler/borland.hpp --- yadex-1.5.2/boost/boost/config/compiler/borland.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/borland.hpp 2001-10-01 19:26:33.000000000 +0200 @@ -0,0 +1,55 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Borland C++ compiler setup: + +# if __BORLANDC__ <= 0x0550 +// Borland C++ Builder 4 and 5: +# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS +# if __BORLANDC__ == 0x0550 +// Borland C++ Builder 5, command-line compiler 5.5: +# define BOOST_NO_OPERATORS_IN_NAMESPACE +# endif +# endif + +#if (__BORLANDC__ >= 0x550) +// is partly broken, some macos define symbols that are really in +// namespace std, so you end up having to use illegal constructs like +// std::DBL_MAX, as a fix we'll just include float.h and have done with: +#include +#endif + +// Version 5.51: +#if (__BORLANDC__ <= 0x551) || !defined(BOOST_STRICT_CONFIG) +# define BOOST_NO_CV_SPECIALIZATIONS +# define BOOST_NO_CV_VOID_SPECIALIZATIONS +# define BOOST_NO_INTEGRAL_INT64_T +# define BOOST_NO_PRIVATE_IN_AGGREGATE +# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS +# define BOOST_NO_SWPRINTF +# define BOOST_NO_USING_TEMPLATE +#endif + +#define BOOST_COMPILER "Borland C++ version " BOOST_STRINGIZE(__BORLANDC__) + +// +// versions check: +// we don't support Borland prior to version 5.4: +#if __BORLANDC__ < 0x540 +# error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 5.51: +#if (__BORLANDC__ > 0x551) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# else +# pragma message( "Unknown compiler version - please run the configure tests and report the results") +# endif +#endif + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/comeau.hpp yadex-1.6.0/boost/boost/config/compiler/comeau.hpp --- yadex-1.5.2/boost/boost/config/compiler/comeau.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/comeau.hpp 2001-10-01 19:26:33.000000000 +0200 @@ -0,0 +1,38 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Comeau C++ compiler setup: + +#include "boost/config/compiler/common_edg.hpp" + +#if (__COMO_VERSION__ <= 4245) || !defined(BOOST_STRICT_CONFIG) +# define BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS +# if defined(_MSC_VER) && _MSC_VER <= 1300 +# define BOOST_NO_STDC_NAMESPACE +# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP +# define BOOST_NO_SWPRINTF +# endif +#endif + +#define BOOST_COMPILER "Comeau compiler version " BOOST_STRINGIZE(__COMO_VERSION__) + +// +// versions check: +// we don't know Comeau prior to version 4245: +#if __COMO_VERSION__ < 4245 +# error "Compiler not configured - please reconfigure" +#endif +// +// last known and checked version is 4245: +#if (__COMO_VERSION__ > 4245) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/common_edg.hpp yadex-1.6.0/boost/boost/config/compiler/common_edg.hpp --- yadex-1.5.2/boost/boost/config/compiler/common_edg.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/common_edg.hpp 2001-10-01 19:26:35.000000000 +0200 @@ -0,0 +1,25 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// +// Options common to all edg based compilers. +// +// This is included from within the individual compiler mini-configs. + +#ifndef __EDG_VERSION__ +# error This file requires that __EDG_VERSION__ be defined. +#endif + +#if (__EDG_VERSION__ <= 238) +# define BOOST_NO_VOID_RETURNS +#endif + +#if (__EDG_VERSION__ <= 241) && !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP) +# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP +#endif + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/compaq_cxx.hpp yadex-1.6.0/boost/boost/config/compiler/compaq_cxx.hpp --- yadex-1.5.2/boost/boost/config/compiler/compaq_cxx.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/compaq_cxx.hpp 2001-10-01 19:26:33.000000000 +0200 @@ -0,0 +1,18 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Dec Alpha True64 C++ compiler setup: + +#define BOOST_COMPILER "Dec Alpha True64 " BOOST_STRINGIZE(__DECCXX_VER) + +#include "boost/config/compiler/common_edg.hpp" + +// +// versions check: +// Nothing to do here? + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/gcc.hpp yadex-1.6.0/boost/boost/config/compiler/gcc.hpp --- yadex-1.5.2/boost/boost/config/compiler/gcc.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/gcc.hpp 2001-10-01 19:26:33.000000000 +0200 @@ -0,0 +1,54 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// GNU C++ compiler setup: + +# if __GNUC__ == 2 && __GNUC_MINOR__ == 91 + // egcs 1.1 won't parse smart_ptr.hpp without this: +# define BOOST_NO_AUTO_PTR +# endif +# if __GNUC__ == 2 && __GNUC_MINOR__ < 95 + // + // Prior to gcc 2.95 member templates only partly + // work - define BOOST_MSVC6_MEMBER_TEMPLATES + // instead since inline member templates mostly work. + // +# define BOOST_NO_MEMBER_TEMPLATES +# if __GNUC_MINOR__ >= 9 +# define BOOST_MSVC6_MEMBER_TEMPLATES +# endif +# endif + +# if __GNUC__ == 2 && __GNUC_MINOR__ <= 97 +# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS +# define BOOST_NO_OPERATORS_IN_NAMESPACE +# endif + +// +// Threading support: +// Turn this on unconditionally here, it will get turned off again later +// if no threading API is detected. +// +#define BOOST_HAS_THREADS + +#define BOOST_COMPILER "GNU C++ version " BOOST_STRINGIZE(__GNUC__) "." BOOST_STRINGIZE(__GNUC_MINOR__) + +// +// versions check: +// we don't know gcc prior to version 2.90: +#if (__GNUC__ == 2) && (__GNUC_MINOR__ < 90) +# error "Compiler not configured - please reconfigure" +#endif +// +// last known and checked version is 3.0: +#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 0)) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# else +# warning "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif diff -uaNr yadex-1.5.2/boost/boost/config/compiler/greenhills.hpp yadex-1.6.0/boost/boost/config/compiler/greenhills.hpp --- yadex-1.5.2/boost/boost/config/compiler/greenhills.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/greenhills.hpp 2001-10-01 19:26:33.000000000 +0200 @@ -0,0 +1,27 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Greenhills C++ compiler setup: + +#define BOOST_COMPILER "Greenhills C++ version " BOOST_STRINGIZE(__ghs) + +#include "boost/config/compiler/common_edg.hpp" + +// +// versions check: +// we don't support Greenhills prior to version 0: +#if __ghs < 0 +# error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 0: +#if (__ghs > 0) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/hp_acc.hpp yadex-1.6.0/boost/boost/config/compiler/hp_acc.hpp --- yadex-1.5.2/boost/boost/config/compiler/hp_acc.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/hp_acc.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,36 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// HP aCC C++ compiler setup: + +// THIS FILE IS INCOMPLETE: WE NEED THE CORRECT VERSION CHECKS ADDING!!! +#if (__HP_aCC <= 0) || !defined(BOOST_STRICT_CONFIG) +# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS +# define BOOST_NO_OPERATORS_IN_NAMESPACE +# if !defined(_NAMESPACE_STD) +# define BOOST_NO_STD_LOCALE +# define BOOST_NO_STRINGSTREAM +# endif +#endif + + +#define BOOST_COMPILER "HP aCC version " BOOST_STRINGIZE(__HP_aCC) + +// +// versions check: +// we don't support HP aCC prior to version 0: +#if __HP_aCC < 0 +# error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 0: +#if (__HP_aCC > 0) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/intel.hpp yadex-1.6.0/boost/boost/config/compiler/intel.hpp --- yadex-1.5.2/boost/boost/config/compiler/intel.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/intel.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,61 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Intel compiler setup: + +#include "boost/config/compiler/common_edg.hpp" + +#ifdef __ICL +# define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(__ICL) +# define BOOST_INTEL_CXX_VERSION __ICL +#else +# define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(__ICC) +# define BOOST_INTEL_CXX_VERSION __ICC +#endif + +#if (BOOST_INTEL_CXX_VERSION <= 600) || !defined(BOOST_STRICT_CONFIG) + +# if defined(_MSC_VER) + // Intel C++ 5.0.1 uses EDG 2.45, but fails to activate Koenig lookup + // in the frontend even in "strict" mode. (reported by Kirk Klobe) + // Intel C++ 6.0 (currently in Beta test) doesn't have any front-end + // changes at all. (reported by Kirk Klobe) +# ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP +# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP +# endif +# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS +# define BOOST_NO_SWPRINTF +# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION +# endif + +#endif + +#ifdef _MSC_VER +# ifndef _NATIVE_WCHAR_T_DEFINED +# define BOOST_NO_INTRINSIC_WCHAR_T +# endif +# define BOOST_NO_SWPRINTF +#endif + + +// +// versions check: +// we don't support Intel prior to version 5.0: +#if BOOST_INTEL_CXX_VERSION < 500 +# error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 500: +#if (BOOST_INTEL_CXX_VERSION > 500) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# elif defined(_MSC_VER) +# warning "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/kai.hpp yadex-1.6.0/boost/boost/config/compiler/kai.hpp --- yadex-1.5.2/boost/boost/config/compiler/kai.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/kai.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,27 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Kai C++ compiler setup: + +#include "boost/config/compiler/common_edg.hpp" + +# if (__KCC_VERSION <= 4001) || !defined(BOOST_STRICT_CONFIG) + // at least on Sun, the contents of is not in namespace std +# define BOOST_NO_STDC_NAMESPACE +# endif + +#define BOOST_COMPILER "Kai C++ version " BOOST_STRINGIZE(__KCC_VERSION) + +// +// last known and checked version is 4001: +#if (__KCC_VERSION > 4001) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/metrowerks.hpp yadex-1.6.0/boost/boost/config/compiler/metrowerks.hpp --- yadex-1.5.2/boost/boost/config/compiler/metrowerks.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/metrowerks.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,50 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Metrowerks C++ compiler setup: + +# if __MWERKS__ <= 0x2301 // 5.3 +# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING +# define BOOST_NO_POINTER_TO_MEMBER_CONST +# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS +# define BOOST_NO_MEMBER_TEMPLATE_KEYWORD +# endif + +# if __MWERKS__ <= 0x2401 // 6.2 +//# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING +# endif + +# if(__MWERKS__ <= 0x2405) || !defined(BOOST_STRICT_CONFIG) // 7.0 +# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS +# endif + +#if !__option(wchar_type) +# define BOOST_NO_INTRINSIC_WCHAR_T +#endif + + +#define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(__MWERKS__) + +// +// versions check: +// we don't support Metrowerks prior to version 5.3: +#if __MWERKS__ < 0x2301 +# error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 0x2405: +#if (__MWERKS__ > 0x2405) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + + + + + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/mpw.hpp yadex-1.6.0/boost/boost/config/compiler/mpw.hpp --- yadex-1.5.2/boost/boost/config/compiler/mpw.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/mpw.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,49 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// MPW C++ compilers setup: + +# if defined(__SC__) +# define BOOST_COMPILER "MPW SCpp version " BOOST_STRINGIZE(__SC__) +# elif defined(__MRC__) +# define BOOST_COMPILER "MPW MrCpp version " BOOST_STRINGIZE(__MRC__) +# else +# error "Using MPW compiler configuration by mistake. Please update." +# endif + +// +// MPW 8.90: +// +#if (MPW_CPLUS <= 0x890) || !defined(BOOST_STRICT_CONFIG) +# define BOOST_NO_CV_SPECIALIZATIONS +# define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS +# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS +# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION +# define BOOST_NO_INTRINSIC_WCHAR_T +# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +# define BOOST_NO_USING_TEMPLATE + +# define BOOST_NO_CWCHAR +# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS + +# define BOOST_NO_STD_ALLOCATOR /* actually a bug with const reference overloading */ +#endif + +// +// versions check: +// we don't support MPW prior to version 8.9: +#if MPW_CPLUS < 0x890 +# error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 0x890: +#if (MPW_CPLUS > 0x890) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/sgi_mipspro.hpp yadex-1.6.0/boost/boost/config/compiler/sgi_mipspro.hpp --- yadex-1.5.2/boost/boost/config/compiler/sgi_mipspro.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/sgi_mipspro.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,16 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// SGI C++ compiler setup: + +#define BOOST_COMPILER "SGI Irix compiler version " BOOST_STRINGIZE(_COMPILER_VERSION) + +#include "boost/config/compiler/common_edg.hpp" + +// +// version check: +// probably nothing to do here? diff -uaNr yadex-1.5.2/boost/boost/config/compiler/sunpro_cc.hpp yadex-1.6.0/boost/boost/config/compiler/sunpro_cc.hpp --- yadex-1.5.2/boost/boost/config/compiler/sunpro_cc.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/sunpro_cc.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,50 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Sun C++ compiler setup: + +# if __SUNPRO_CC >= 0x520 + // + // Sunpro 5.1 and later: + // + // although sunpro 5.1 supports the syntax for + // inline initialization it often gets the value + // wrong, especially where the value is computed + // from other constants (J Maddock 6th May 2001) +# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION + // although sunpro 5.1 supports the syntax for + // partial specialization, it often seems to + // bind to the wrong specialization. Better + // to disable it until suppport becomes more stable + // (J Maddock 6th May 2001). +# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION + + // integral constant expressions with 64 bit numbers fail +# define BOOST_NO_INTEGRAL_INT64_T +# endif +# if __SUNPRO_CC <= 0x500 +# define BOOST_NO_MEMBER_TEMPLATES +# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +# endif + +#define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC) + +// +// versions check: +// we don't support sunpro prior to version 4: +#if __SUNPRO_CC < 0x400 +#error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 0x520: +#if (__SUNPRO_CC > 0x520) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/vacpp.hpp yadex-1.6.0/boost/boost/config/compiler/vacpp.hpp --- yadex-1.5.2/boost/boost/config/compiler/vacpp.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/vacpp.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,37 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Visual Age (IBM) C++ compiler setup: + +#define BOOST_NO_MEMBER_TEMPLATE_FRIENDS +#define BOOST_NO_INCLASS_MEMBER_INITIALIZATION + +// +// On AIX thread support seems to be indicated by _THREAD_SAFE: +// +#ifdef _THREAD_SAFE +# define BOOST_HAS_THREADS +#endif + +#define BOOST_COMPILER "IBM Visual Age" BOOST_STRINGIZE(__IBMCPP__) + +// +// versions check: +// we don't support Visual age prior to version 5: +#if __IBMCPP__ < 500 +#error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 500: +#if (__IBMCPP__ > 500) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + + + diff -uaNr yadex-1.5.2/boost/boost/config/compiler/visualc.hpp yadex-1.6.0/boost/boost/config/compiler/visualc.hpp --- yadex-1.5.2/boost/boost/config/compiler/visualc.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/compiler/visualc.hpp 2001-10-01 19:26:34.000000000 +0200 @@ -0,0 +1,76 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Microsoft Visual C++ compiler setup: + +#define BOOST_MSVC _MSC_VER + +// turn off the warnings before we #include anything +#pragma warning( disable : 4786 ) // ident trunc to '255' chars in debug info +#pragma warning( disable : 4503 ) // warning: decorated name length exceeded + +#if _MSC_VER <= 1200 // 1200 == VC++ 6.0 +# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS +# define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS +# define BOOST_NO_VOID_RETURNS +#endif + +#if (_MSC_VER <= 1300) || !defined(BOOST_STRICT_CONFIG) // VC7 Beta 2 or later +# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION +# define BOOST_NO_PRIVATE_IN_AGGREGATE +# define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP +# define BOOST_NO_INTEGRAL_INT64_T + +// VC++ 6/7 has member templates but they have numerous problems including +// cases of silent failure, so for safety we define: +# define BOOST_NO_MEMBER_TEMPLATES +// For VC++ experts wishing to attempt workarounds, we define: +# define BOOST_MSVC6_MEMBER_TEMPLATES + +# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS +# define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +# define BOOST_NO_CV_VOID_SPECIALIZATIONS +# define BOOST_NO_FUNCTION_TEMPLATE_ORDERING +# define BOOST_NO_USING_TEMPLATE +# define BOOST_NO_SWPRINTF +//# define BOOST_NO_POINTER_TO_MEMBER_CONST + // + // disable min/max macros if defined: + // +# ifdef min +# undef min +# endif +# ifdef max +# undef max +# endif + // disable min/max macro defines on vc6: + // +# define NOMINMAX +#endif + +#ifndef _NATIVE_WCHAR_T_DEFINED +# define BOOST_NO_INTRINSIC_WCHAR_T +#endif + +#define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(_MSC_VER) + +// +// versions check: +// we don't support Visual C++ prior to version 6: +#if _MSC_VER < 1200 +#error "Compiler not supported or configured - please reconfigure" +#endif +// +// last known and checked version is 1300: +#if (_MSC_VER > 1300) +# if defined(BOOST_ASSERT_CONFIG) +# error "Unknown compiler version - please run the configure tests and report the results" +# else +# warning "Unknown compiler version - please run the configure tests and report the results" +# endif +#endif + diff -uaNr yadex-1.5.2/boost/boost/config/platform/aix.hpp yadex-1.6.0/boost/boost/config/platform/aix.hpp --- yadex-1.5.2/boost/boost/config/platform/aix.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/aix.hpp 2001-10-01 19:26:35.000000000 +0200 @@ -0,0 +1,20 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// IBM/Aix specific config options: + +#define BOOST_PLATFORM "IBM Aix" + +#define BOOST_HAS_UNISTD_H +#define BOOST_HAS_PTHREADS +#define BOOST_HAS_NL_TYPES_H + +// Threading API's: +#define BOOST_HAS_PTHREAD_DELAY_NP +#define BOOST_HAS_PTHREAD_YIELD + + diff -uaNr yadex-1.5.2/boost/boost/config/platform/beos.hpp yadex-1.6.0/boost/boost/config/platform/beos.hpp --- yadex-1.5.2/boost/boost/config/platform/beos.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/beos.hpp 2001-10-01 19:26:35.000000000 +0200 @@ -0,0 +1,23 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// BeOS specific config options: + +#define BOOST_PLATFORM "BeOS" + +#define BOOST_NO_CWCHAR +#define BOOST_NO_CWCTYPE +#define BOOST_HAS_UNISTD_H + +#define BOOST_HAS_BETHREADS + +#ifndef BOOST_DISABLE_THREADS +# define BOOST_HAS_THREADS +#endif + + + diff -uaNr yadex-1.5.2/boost/boost/config/platform/bsd.hpp yadex-1.6.0/boost/boost/config/platform/bsd.hpp --- yadex-1.5.2/boost/boost/config/platform/bsd.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/bsd.hpp 2001-10-01 19:26:35.000000000 +0200 @@ -0,0 +1,39 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// generic BSD config options: + +#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) +#error "This platform is not BSD" +#endif + +#ifdef __FreeBSD__ +#define BOOST_PLATFORM "FreeBSD " BOOST_STRINGIZE(__FreeBSD__) +#elif defined(__NetBSD__) +#define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__) +#elif defined(__OpenBSD__) +#define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__) +#endif + +// +// is this the correct version check? +// FreeBSD has but does not +// advertise the fact in : +// +#if defined(__FreeBSD__) && (__FreeBSD__ >= 4) +# define BOOST_HAS_NL_TYPES_H +#endif + +// +// No wide character support in the BSD header files: +// +#define BOOST_NO_CWCHAR + +// +// The BSD has macros only, no functions: +// +#define BOOST_NO_CTYPE_FUNCTIONS diff -uaNr yadex-1.5.2/boost/boost/config/platform/cygwin.hpp yadex-1.6.0/boost/boost/config/platform/cygwin.hpp --- yadex-1.5.2/boost/boost/config/platform/cygwin.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/cygwin.hpp 2001-10-01 19:26:35.000000000 +0200 @@ -0,0 +1,30 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// cygwin specific config options: + +#define BOOST_PLATFORM "Cygwin" +#define BOOST_NO_CWCTYPE +#define BOOST_NO_CWCHAR +#define BOOST_NO_SWPRINTF + +// +// Threading API: +// See if we have POSIX threads, if we do use them, otherwise +// revert to native Win threads. +#include +#if defined(_POSIX_THREADS) && (_POSIX_THREADS+0 >= 0) && !defined(BOOST_HAS_WINTHREADS) +# define BOOST_HAS_PTHREADS +# define BOOST_HAS_SCHED_YIELD +# define BOOST_HAS_GETTIMEOFDAY +#else +# define BOOST_HAS_WINTHREADS +# define BOOST_HAS_FTIME +#endif + + + diff -uaNr yadex-1.5.2/boost/boost/config/platform/hpux.hpp yadex-1.6.0/boost/boost/config/platform/hpux.hpp --- yadex-1.5.2/boost/boost/config/platform/hpux.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/hpux.hpp 2001-10-01 19:26:35.000000000 +0200 @@ -0,0 +1,19 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// hpux specific config options: + +#define BOOST_PLATFORM "HP-UX" + +// In principle, HP-UX has a nice under the name +// However, it has the following problem: +// Use of UINT32_C(0) results in "0u l" for the preprocessed source +// (verifyable with gcc 2.95.3, assumed for HP aCC) +// #define BOOST_HAS_STDINT_H + +#define BOOST_NO_SWPRINTF +#define BOOST_NO_CWCTYPE diff -uaNr yadex-1.5.2/boost/boost/config/platform/irix.hpp yadex-1.6.0/boost/boost/config/platform/irix.hpp --- yadex-1.5.2/boost/boost/config/platform/irix.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/irix.hpp 2001-10-01 19:26:36.000000000 +0200 @@ -0,0 +1,13 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// SGI Irix specific config options: + +#define BOOST_PLATFORM "SGI Irix" + +#define BOOST_NO_SWPRINTF + diff -uaNr yadex-1.5.2/boost/boost/config/platform/linux.hpp yadex-1.6.0/boost/boost/config/platform/linux.hpp --- yadex-1.5.2/boost/boost/config/platform/linux.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/linux.hpp 2001-10-01 19:26:36.000000000 +0200 @@ -0,0 +1,64 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// linux specific config options: + +#define BOOST_PLATFORM "linux" + +// make sure we have __GLIBC_PREREQ if available at all +#include + +// +// added to glibc 2.1.1 +// We can only test for 2.1 though: +// +#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))) + // defines int64_t unconditionally, but defines + // int64_t only if __GNUC__. Thus, assume a fully usable + // only when using GCC. +# if defined __GNUC__ +# define BOOST_HAS_STDINT_H +# endif +#endif + +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +// __GLIBC_PREREQ is available since 2.1.2 + + // swprintf is available since glibc 2.2.0 +# if !__GLIBC_PREREQ(2,2) || (!defined(__USE_ISOC99) && !defined(__USE_UNIX98)) +# define BOOST_NO_SWPRINTF +# endif +#else +# define BOOST_NO_SWPRINTF +#endif + +#ifndef __GNUC__ +// +// if the compiler is not gcc we still need to be able to parse +// the GNU system headers, some of which (mainly ) +// use GNU specific extensions: +// +# ifndef __extension__ +# define __extension__ +# endif +# ifndef __const__ +# define __const__ const +# endif +# ifndef __volatile__ +# define __volatile__ volatile +# endif +# ifndef __signed__ +# define __signed__ signed +# endif +# ifndef __typeof__ +# define __typeof__ typeof +# endif +# ifndef __inline__ +# define __inline__ inline +# endif +#endif + diff -uaNr yadex-1.5.2/boost/boost/config/platform/macos.hpp yadex-1.6.0/boost/boost/config/platform/macos.hpp --- yadex-1.5.2/boost/boost/config/platform/macos.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/macos.hpp 2001-10-01 19:26:36.000000000 +0200 @@ -0,0 +1,32 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Mac OS specific config options: + +#define BOOST_PLATFORM "Mac OS" + +// If __MACH__, we're using the BSD standard C library, not the MSL: +#if defined(__MACH__) + +# define BOOST_NO_CTYPE_FUNCTIONS +# define BOOST_NO_CWCHAR +# ifndef BOOST_HAS_UNISTD_H +# define BOOST_HAS_UNISTD_H +# endif +# ifndef BOOST_HAS_STDINT_H +# define BOOST_HAS_STDINT_H +# endif + +# ifndef __APPLE_CC__ + +// GCC strange "ignore std" mode works better if you pretend everything +// is in the std namespace, for the most part. + +# define BOOST_NO_STDC_NAMESPACE +# endif + +#endif diff -uaNr yadex-1.5.2/boost/boost/config/platform/solaris.hpp yadex-1.6.0/boost/boost/config/platform/solaris.hpp --- yadex-1.5.2/boost/boost/config/platform/solaris.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/solaris.hpp 2001-10-01 19:26:36.000000000 +0200 @@ -0,0 +1,13 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// sun specific config options: + +#define BOOST_PLATFORM "sun" + + + diff -uaNr yadex-1.5.2/boost/boost/config/platform/win32.hpp yadex-1.6.0/boost/boost/config/platform/win32.hpp --- yadex-1.5.2/boost/boost/config/platform/win32.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/platform/win32.hpp 2001-10-01 19:26:36.000000000 +0200 @@ -0,0 +1,36 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Win32 specific config options: + +#define BOOST_PLATFORM "Win32" + +#if defined BOOST_DECL_EXPORTS +# if defined BOOST_DECL_IMPORTS +# error Not valid to define both BOOST_DECL_EXPORTS and BOOST_DECL_IMPORTS +# endif +# define BOOST_DECL __declspec(dllexport) +#elif defined BOOST_DECL_IMPORTS +# define BOOST_DECL __declspec(dllimport) +#else +# define BOOST_DECL +#endif + +#if defined(__GNUC__) && !defined(BOOST_NO_SWPRINTF) +# define BOOST_NO_SWPRINTF +#endif + +// +// Win32 will normally be using native Win32 threads, +// but there is a pthread library avaliable as an option: +// +#ifndef BOOST_HAS_PTHREADS +# define BOOST_HAS_WINTHREADS +#endif + +// WEK: Added +#define BOOST_HAS_FTIME diff -uaNr yadex-1.5.2/boost/boost/config/posix_features.hpp yadex-1.6.0/boost/boost/config/posix_features.hpp --- yadex-1.5.2/boost/boost/config/posix_features.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/posix_features.hpp 2001-10-01 19:26:32.000000000 +0200 @@ -0,0 +1,65 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// All POSIX feature tests go in this file: + +# ifdef BOOST_HAS_UNISTD_H +# include + + // XOpen has , but is this the correct version check? +# if defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 3) +# define BOOST_HAS_NL_TYPES_H +# endif + + // POSIX version 6 requires +# if defined(_POSIX_VERSION) && (_POSIX_VERSION >= 200100) +# define BOOST_HAS_STDINT_H +# endif + + // POSIX defines _POSIX_THREADS > 0 for pthread support, + // however some platforms define _POSIX_THREADS without + // a value, hence the (_POSIX_THREADS+0 >= 0) check. + // Strictly speaking this may catch platforms with a + // non-functioning stub , but such occurrences should + // occur very rarely if at all. +# if defined(_POSIX_THREADS) && (_POSIX_THREADS+0 >= 0) && !defined(BOOST_HAS_WINTHREADS) +# define BOOST_HAS_PTHREADS +# endif + + // BOOST_HAS_NANOSLEEP: + // This is predicated on _POSIX_TIMERS: +# if defined(_POSIX_TIMERS) && (_POSIX_TIMERS+0 >= 0) +# define BOOST_HAS_NANOSLEEP +# endif + + // BOOST_HAS_SCHED_YIELD: + // This is predicated on _POSIX_PRIORITY_SCHEDULING or + // on _POSIX_THREAD_PRIORITY_SCHEDULING. +# if defined(_POSIX_PRIORITY_SCHEDULING) && (_POSIX_PRIORITY_SCHEDULING+0 > 0) +# define BOOST_HAS_SCHED_YIELD +# endif +# if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING+0 > 0) +# define BOOST_HAS_SCHED_YIELD +# endif + + // BOOST_HAS_GETTIMEOFDAY: + // BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE: + // These are predicated on _XOPEN_VERSION, and appears to be first released + // in issue 4, version 2 (_XOPEN_VERSION > 500). +# if defined(_XOPEN_VERSION) && (_XOPEN_VERSION+0 > 500) +# define BOOST_HAS_GETTIMEOFDAY +# define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE +# endif + + // BOOST_HAS_CLOCK_GETTIME: + // This is predicated on _POSIX_TIMERS. +# if defined(_POSIX_TIMERS) && (_POSIX_TIMERS+0 > 0) +# define BOOST_HAS_CLOCK_GETTIME +# endif + + +# endif diff -uaNr yadex-1.5.2/boost/boost/config/select_compiler_config.hpp yadex-1.6.0/boost/boost/config/select_compiler_config.hpp --- yadex-1.5.2/boost/boost/config/select_compiler_config.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/select_compiler_config.hpp 2001-10-01 19:26:32.000000000 +0200 @@ -0,0 +1,77 @@ +// Boost compiler configuration selection header file + +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// locate which compiler we are using and define +// BOOST_COMPILER_CONFIG as needed: + +#if defined __GNUC__ +// GNU C++: +# define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp" + +#elif defined __KCC +// Kai C++ +# define BOOST_COMPILER_CONFIG "boost/config/compiler/kai.hpp" + +#elif defined __sgi +// SGI MIPSpro C++ +# define BOOST_COMPILER_CONFIG "boost/config/compiler/sgi_mipspro.hpp" + +#elif defined __DECCXX +// Compaq Tru64 Unix cxx +# define BOOST_COMPILER_CONFIG "boost/config/compiler/compaq_cxx.hpp" + +#elif defined __ghs +// Greenhills C++ +# define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp" + +#elif defined __BORLANDC__ +// Borland +# define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp" + +#elif defined(__ICL) || defined(__ICC) +// Intel +# define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp" + +#elif defined __MWERKS__ +// Metrowerks CodeWarrior +# define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp" + +#elif defined __SUNPRO_CC +// Sun Workshop Compiler C++ +# define BOOST_COMPILER_CONFIG "boost/config/compiler/sunpro_cc.hpp" + +#elif defined __HP_aCC +// HP aCC +# define BOOST_COMPILER_CONFIG "boost/config/compiler/hp_acc.hpp" + +#elif defined(__MRC__) || defined(__SC__) +// MPW MrCpp or SCpp +# define BOOST_COMPILER_CONFIG "boost/config/compiler/mpw.hpp" + +#elif defined(__IBMCPP__) +// IBM Visual Age +# define BOOST_COMPILER_CONFIG "boost/config/compiler/vacpp.hpp" + +# elif defined __COMO__ +// Comeau C++ +# define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp" + +#elif defined _MSC_VER +// Microsoft Visual C++ +// +// Must remain the last #elif since some other vendors (Metrowerks, for +// example) also #define _MSC_VER +# define BOOST_COMPILER_CONFIG "boost/config/compiler/visualc.hpp" + +#elif defined (BOOST_ASSERT_CONFIG) +// this must come last - generate an error if we don't +// recognise the compiler: +# error "Unknown compiler - please configure and report the results to boost.org" + +#endif diff -uaNr yadex-1.5.2/boost/boost/config/select_platform_config.hpp yadex-1.6.0/boost/boost/config/select_platform_config.hpp --- yadex-1.5.2/boost/boost/config/select_platform_config.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/select_platform_config.hpp 2001-10-01 19:26:32.000000000 +0200 @@ -0,0 +1,62 @@ +// Boost compiler configuration selection header file + +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// locate which platform we are on and define BOOST_PLATFORM_CONFIG as needed. +// Note that we define the headers to include using "header_name" not +// in order to prevent macro expansion within the header +// name (for example "linux" is a macro on linux systems). + +#if defined(linux) || defined(__linux) || defined(__linux__) +// linux: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/linux.hpp" + +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +// BSD: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/bsd.hpp" + +#elif defined(sun) || defined(__sun) +// solaris: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/solaris.hpp" + +#elif defined(__sgi) +// SGI Irix: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/irix.hpp" + +#elif defined(__hpux) +// hp unix: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/hpux.hpp" + +#elif defined(__CYGWIN__) +// cygwin is not win32: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/cygwin.hpp" + +#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +// win32: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp" + +#elif defined(__BEOS__) +// BeOS +# define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp" + +#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +// MacOS +# define BOOST_PLATFORM_CONFIG "boost/config/platform/macos.hpp" + +#elif defined(__IBMCPP__) +// IBM +# define BOOST_PLATFORM_CONFIG "boost/config/platform/aix.hpp" + +#elif defined (BOOST_ASSERT_CONFIG) +// this must come last - generate an error if we don't +// recognise the platform: +# error "Unknown platform - please configure and report the results to boost.org" + +#endif + + diff -uaNr yadex-1.5.2/boost/boost/config/select_stdlib_config.hpp yadex-1.6.0/boost/boost/config/select_stdlib_config.hpp --- yadex-1.5.2/boost/boost/config/select_stdlib_config.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/select_stdlib_config.hpp 2001-10-01 19:26:32.000000000 +0200 @@ -0,0 +1,61 @@ +// Boost compiler configuration selection header file + +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// locate which std lib we are using and define BOOST_STDLIB_CONFIG as needed: + +// we need to include a std lib header here in order to detect which +// library is in use, use as it's about the smallest +// of the std lib headers - do not rely on this header being included - +// users can short-circuit this header if they know whose std lib +// they are using. + +#include + +#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) +// STLPort library; this _must_ come first, otherwise since +// STLport typically sits on top of some other library, we +// can end up detecting that first rather than STLport: +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/stlport.hpp" + +#elif defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER) +// Rogue Wave library: +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/roguewave.hpp" + +#elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER) +// Dinkumware Library: +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/dinkumware.hpp" + +#elif defined(__GLIBCPP__) +// GNU libstdc++ 3 +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/libstdcpp3.hpp" + +#elif defined(__STL_CONFIG_H) +// generic SGI STL +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/sgi.hpp" + +#elif defined(__MSL_CPP__) +// MSL standard lib: +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/msl.hpp" + +#elif defined(__IBMCPP__) +// take the default VACPP std lib +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/vacpp.hpp" + +#elif defined(MSIPL_COMPILE_H) +// Modena C++ standard library +# define BOOST_STDLIB_CONFIG "boost/config/stdlib/modena.hpp" + +#elif defined (BOOST_ASSERT_CONFIG) +// this must come last - generate an error if we don't +// recognise the library: +# error "Unknown standard library - please configure and report the results to boost.org" + +#endif + + diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/dinkumware.hpp yadex-1.6.0/boost/boost/config/stdlib/dinkumware.hpp --- yadex-1.5.2/boost/boost/config/stdlib/dinkumware.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/dinkumware.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,71 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Dinkumware standard library config: + +#if !defined(_YVALS) && !defined(_CPPLIB_VER) +#include +#if !defined(_YVALS) && !defined(_CPPLIB_VER) +#error This is not the Dinkumware lib! +#endif +#endif + + +#if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306) + // full dinkumware 3.06 and above + // fully conforming provided the compiler supports it: +# if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) // can be defined in yvals.h +# define BOOST_NO_STDC_NAMESPACE +# endif +# if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) +# define BOOST_NO_STD_ALLOCATOR +# endif +# if defined(_MSC_VER) && (_MSC_VER < 1300) + // if this lib version is set up for vc6 then there is no std::use_facet: +# define BOOST_NO_STD_USE_FACET +# define BOOST_HAS_TWO_ARG_USE_FACET +# endif +// 3.06 appears to have (non-sgi versions of) & , +// and no at all +#else +# define BOOST_MSVC_STD_ITERATOR 1 +# define BOOST_NO_STD_ITERATOR +# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS +# define BOOST_NO_STD_ALLOCATOR +# define BOOST_NO_STDC_NAMESPACE +# define BOOST_NO_STD_USE_FACET +# define BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN +# define BOOST_HAS_MACRO_USE_FACET +# ifndef _CPPLIB_VER + // Updated Dinkum library defines this, and provides + // its own min and max definitions. +# define BOOST_NO_STD_MIN_MAX +# undef min +# undef max +# endif +# ifndef NOMINMAX + // avoid spurious NOMINMAX redefinition warning +# define NOMINMAX +# endif +#endif + +#if defined(_MSC_VER) && (_MSC_VER <= 1200) + // if we're using a dinkum lib that's + // been configured for VC6 then there is + // no iterator traits (true even for icl) +# define BOOST_NO_STD_ITERATOR_TRAITS +#endif + +#ifdef _CPPLIB_VER +# define BOOST_STDLIB "Dinkumware standard library version " BOOST_STRINGIZE(_CPPLIB_VER) +#else +# define BOOST_STDLIB "Dinkumware standard library version 1.x" +#endif + + + + diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/libstdcpp3.hpp yadex-1.6.0/boost/boost/config/stdlib/libstdcpp3.hpp --- yadex-1.5.2/boost/boost/config/stdlib/libstdcpp3.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/libstdcpp3.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,20 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// config for libstdc++ v3 +// not much to go in here: + +#define BOOST_STDLIB "GNU libstdc++ version " BOOST_STRINGIZE(__GLIBCPP__) + +#ifndef _GLIBCPP_USE_WCHAR_T +# define BOOST_NO_CWCHAR +# define BOOST_NO_CWCTYPE +# define BOOST_NO_STD_WSTRING +#endif + + + diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/modena.hpp yadex-1.6.0/boost/boost/config/stdlib/modena.hpp --- yadex-1.5.2/boost/boost/config/stdlib/modena.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/modena.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,29 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Modena C++ standard library (comes with KAI C++) + +#if !defined(MSIPL_COMPILE_H) +# include +# if !defined(__MSIPL_COMPILE_H) +# error "This is not the Modena C++ library!" +# endif +#endif + +#ifndef MSIPL_NL_TYPES +#define BOOST_NO_STD_MESSAGES +#endif + +#ifndef MSIPL_WCHART +#define BOOST_NO_STD_WSTRING +#endif + +#define BOOST_STDLIB "Modena C++ standard library" + + + + diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/msl.hpp yadex-1.6.0/boost/boost/config/stdlib/msl.hpp --- yadex-1.5.2/boost/boost/config/stdlib/msl.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/msl.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,44 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Metrowerks standard library: + +#ifndef __MSL_CPP__ +# include +# ifndef __MSL_CPP__ +# error This is not the MSL standard library! +# endif +#endif + +#if __MSL_CPP__ >= 0x6000 // Pro 6 +# define BOOST_HAS_HASH +# define BOOST_STD_EXTENSION_NAMESPACE Metrowerks +#endif +#define BOOST_HAS_SLIST + +#if __MSL_CPP__ < 0x6209 +# define BOOST_NO_STD_MESSAGES +#endif + +// check C lib version for +#include + +#if defined(__MSL__) && (__MSL__ >= 0x5000) +# define BOOST_HAS_STDINT_H +# define BOOST_HAS_UNISTD_H +#endif + + +#define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__) + + + + + + + + diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/roguewave.hpp yadex-1.6.0/boost/boost/config/stdlib/roguewave.hpp --- yadex-1.5.2/boost/boost/config/stdlib/roguewave.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/roguewave.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,106 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Rogue Wave std lib: + +#if !defined(__STD_RWCOMPILER_H__) && !defined(_RWSTD_VER) +# include +# if !defined(__STD_RWCOMPILER_H__) && !defined(_RWSTD_VER) +# error This is not the Rogue Wave standard library +# endif +#endif +// +// figure out a consistent version number: +// +#ifndef _RWSTD_VER +# define BOOST_RWSTD_VER 0x010000 +#elif _RWSTD_VER < 0x010000 +# define BOOST_RWSTD_VER (_RWSTD_VER << 8) +#else +# define BOOST_RWSTD_VER _RWSTD_VER +#endif + +#ifndef _RWSTD_VER +# define BOOST_STDLIB "Rogue Wave standard library version (Unknown version)" +#else +# define BOOST_STDLIB "Rogue Wave standard library version " BOOST_STRINGIZE(_RWSTD_VER) +#endif + +// +// Prior to version 2.2.0 the primary template for std::numeric_limits +// does not have compile time constants, even though specializations of that +// template do: +// +#if BOOST_RWSTD_VER < 0x020200 +# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS +#endif + +// +// No std::iterator if it can't figure out default template args: +// +#if defined(_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) || defined(RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) || (BOOST_RWSTD_VER < 0x020000) +# define BOOST_NO_STD_ITERATOR +#endif + +// +// No iterator traits without partial specialization: +// +#if defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) || defined(RWSTD_NO_CLASS_PARTIAL_SPEC) +# define BOOST_NO_STD_ITERATOR_TRAITS +#endif + +// +// Prior to version 2.0, std::auto_ptr was buggy, and there were no +// new-style iostreams, and no conformant std::allocator: +// +#if (BOOST_RWSTD_VER < 0x020000) +# define BOOST_NO_AUTO_PTR +# define BOOST_NO_STRINGSTREAM +# define BOOST_NO_STD_ALLOCATOR +# define BOOST_NO_STD_LOCALE +#endif + +// +// No template iterator constructors without member template support: +// +#if defined(RWSTD_NO_MEMBER_TEMPLATES) || defined(_RWSTD_NO_MEMBER_TEMPLATES) +# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS +#endif + +// +// RW defines _RWSTD_ALLOCATOR if the allocator is conformant and in use +// (the or _HPACC_ part is a hack - the library seems to define _RWSTD_ALLOCATOR +// on HP aCC systems even though the allocator is in fact broken): +// +#if !defined(_RWSTD_ALLOCATOR) || defined(_HPACC_) || defined(__HP_aCC) +# define BOOST_NO_STD_ALLOCATOR +#endif + +// +// If we have a std::locale, we still may not have std::use_facet: +// +#if defined(_RWSTD_NO_TEMPLATE_ON_RETURN_TYPE) && !defined(BOOST_NO_STD_LOCALE) +# define BOOST_NO_STD_USE_FACET +# define BOOST_HAS_TWO_ARG_USE_FACET +#endif + +// +// There's no std::distance prior to version 2, or without +// partial specialization support: +// +#if (BOOST_RWSTD_VER < 0x020000) || defined(_RWSTD_NO_CLASS_PARTIAL_SPEC) + #define BOOST_NO_STD_DISTANCE +#endif + +// +// Some versions of the rogue wave library don't have assignable +// OutputIterators: +// +#if BOOST_RWSTD_VER < 0x020100 +# define BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN +#endif + diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/sgi.hpp yadex-1.6.0/boost/boost/config/stdlib/sgi.hpp --- yadex-1.5.2/boost/boost/config/stdlib/sgi.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/sgi.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,77 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// generic SGI STL: + +#if !defined(__STL_CONFIG_H) +# include +# if !defined(__STL_CONFIG_H) +# error "This is not the SGI STL!" +# endif +#endif + +// +// No std::iterator traits without partial specialisation: +// +#if !defined(__STL_CLASS_PARTIAL_SPECIALIZATION) +# define BOOST_NO_STD_ITERATOR_TRAITS +#endif + +// +// No std::stringstream with gcc < 3 +// +#if defined(__GNUC__) && (__GNUC__ < 3) && (__GNUC_MINOR__ < 95) && !defined(__STL_USE_NEW_IOSTREAMS) || defined(__APPLE_CC__) + // Note that we only set this for gnu C++ prior to 2.95 since the + // latest patches for that release do contain a minimal + // If you are running a 2.95 release prior to 2.95.3 then this will need + // setting, but there is no way to detect that automatically (other + // than by running the configure script). +# define BOOST_NO_STRINGSTREAM +#endif + +// +// Assume no std::locale without own iostreams (this may be an +// incorrect assumption in some cases): +// +#if !defined(__SGI_STL_OWN_IOSTREAMS) && !defined(__STL_USE_NEW_IOSTREAMS) +# define BOOST_NO_STD_LOCALE +#endif + +// +// No template iterator constructors, or std::allocator +// without member templates: +// +#if !defined(__STL_MEMBER_TEMPLATES) +# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS +# define BOOST_NO_STD_ALLOCATOR +#endif + +// +// We always have SGI style hash_set, hash_map, and slist: +// +#define BOOST_HAS_HASH +#define BOOST_HAS_SLIST + +// +// If this is GNU libstdc++2, then no and no std::wstring: +// +#if (defined(__GNUC__) && (__GNUC__ < 3)) +# include +# if defined(__BASTRING__) +# define BOOST_NO_LIMITS +# define BOOST_NO_STD_WSTRING +# endif +#endif + +// +// There is no standard iterator unless we have namespace support: +// +#if !defined(__STL_USE_NAMESPACES) +# define BOOST_NO_STD_ITERATOR +#endif + +#define BOOST_STDLIB "SGI standard library" diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/stlport.hpp yadex-1.6.0/boost/boost/config/stdlib/stlport.hpp --- yadex-1.5.2/boost/boost/config/stdlib/stlport.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/stlport.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,105 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// STLPort standard library config: + +#if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) +# include +# if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) +# error "This is not STLPort!" +# endif +#endif + +// +// __STL_STATIC_CONST_INIT_BUG implies BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS +// for versions prior to 4.1(beta) +// +#if (defined(__STL_STATIC_CONST_INIT_BUG) || defined(_STLP_STATIC_CONST_INIT_BUG)) && (__SGI_STL_PORT <= 0x400) +# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS +#endif + +// +// If STLport thinks that there is no partial specialisation, then there is no +// std::iterator traits: +// +#if !(defined(_STLP_CLASS_PARTIAL_SPECIALIZATION) || defined(__STL_CLASS_PARTIAL_SPECIALIZATION)) +# define BOOST_NO_STD_ITERATOR_TRAITS +#endif + +// +// No new style iostreams on GCC without STLport's iostreams enabled: +// +#if (defined(__GNUC__) && (__GNUC__ < 3)) && !(defined(__SGI_STL_OWN_IOSTREAMS) || defined(_STLP_OWN_IOSTREAMS)) +# define BOOST_NO_STRINGSTREAM +#endif + +// +// No new iostreams implies no std::locale, and no std::stringstream: +// +#if defined(__STL_NO_IOSTREAMS) || defined(__STL_NO_NEW_IOSTREAMS) || defined(_STLP_NO_IOSTREAMS) || defined(_STLP_NO_NEW_IOSTREAMS) +# define BOOST_NO_STD_LOCALE +# define BOOST_NO_STRINGSTREAM +#endif + +// +// Without member template support enabled, their are no template +// iterate constructors, and no std::allocator: +// +#if !(defined(__STL_MEMBER_TEMPLATES) || defined(_STLP_MEMBER_TEMPLATES)) +# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS +# define BOOST_NO_STD_ALLOCATOR +#endif + +#if !defined(_STLP_MEMBER_TEMPLATE_CLASSES) +# define BOOST_NO_STD_ALLOCATOR +#endif + +// +// We always have SGI style hash_set, hash_map, and slist: +// +#define BOOST_HAS_HASH +#define BOOST_HAS_SLIST + +// +// STLport does a good job of importing names into namespace std::, +// but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our +// workaround does not conflict with STLports: +// +#if defined(__STL_IMPORT_VENDOR_CSTD) || defined(__STL_USE_OWN_NAMESPACE) || defined(_STLP_IMPORT_VENDOR_CSTD) || defined(_STLP_USE_OWN_NAMESPACE) +# define BOOST_NO_STDC_NAMESPACE +#endif + +// +// std::reverse_iterate behaves like VC6's under some circumstances: +// +#if defined (_STLP_USE_OLD_HP_ITERATOR_QUERIES) || defined (__STL_USE_OLD_HP_ITERATOR_QUERIES)\ + || (!defined ( _STLP_CLASS_PARTIAL_SPECIALIZATION ) && !defined ( __STL_CLASS_PARTIAL_SPECIALIZATION )) +// disable this for now, it causes too many problems, we need a better +// fix for broken reverse iterators: +// # define BOOST_MSVC_STD_ITERATOR +#endif + +// +// std::use_facet may be non-standard, uses a class instead: +// +#if defined(__STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS) || defined(_STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS) +# define BOOST_NO_STD_USE_FACET +# define BOOST_HAS_STLP_USE_FACET +#endif + +// +// If STLport thinks there are no wide functions, etc. is not working. +// +#if defined(_STLP_NO_NATIVE_WIDE_FUNCTIONS) +# define BOOST_NO_CWCHAR +# define BOOST_NO_CWTYPE +#endif + + +#define BOOST_STDLIB "STLPort standard library version " BOOST_STRINGIZE(__SGI_STL_PORT) + + diff -uaNr yadex-1.5.2/boost/boost/config/stdlib/vacpp.hpp yadex-1.6.0/boost/boost/config/stdlib/vacpp.hpp --- yadex-1.5.2/boost/boost/config/stdlib/vacpp.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/stdlib/vacpp.hpp 2001-10-01 19:26:37.000000000 +0200 @@ -0,0 +1,13 @@ +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +#define BOOST_HAS_MACRO_USE_FACET +#define BOOST_NO_STD_ALLOCATOR + +#define BOOST_STDLIB "Visual Age default standard library" + + diff -uaNr yadex-1.5.2/boost/boost/config/suffix.hpp yadex-1.6.0/boost/boost/config/suffix.hpp --- yadex-1.5.2/boost/boost/config/suffix.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/suffix.hpp 2001-10-01 19:26:32.000000000 +0200 @@ -0,0 +1,311 @@ +// Boost config.hpp configuration header file ------------------------------// + +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Boost config.hpp policy and rationale documentation has been moved to +// http://www.boost.org/libs/config +// +// This file is intended to be stable, and relatively unchanging. +// It should contain boilerplate code only - no compiler specific +// code unless it is unavoidable - no changes unless unavoidable. + +#ifndef BOOST_CONFIG_SUFFIX_HPP +#define BOOST_CONFIG_SUFFIX_HPP + +# ifndef BOOST_DECL +# define BOOST_DECL // default for compilers not needing this decoration. +# endif + +// +// Assume any extensions are in namespace std:: unless stated otherwise: +// +# ifndef BOOST_STD_EXTENSION_NAMESPACE +# define BOOST_STD_EXTENSION_NAMESPACE std +# endif + +// +// If cv-qualified specializations are not allowed, then neither are cv-void ones: +// +# if defined(BOOST_NO_CV_SPECIALIZATIONS) \ + && !defined(BOOST_NO_CV_VOID_SPECIALIZATIONS) +# define BOOST_NO_CV_VOID_SPECIALIZATIONS +# endif + +// +// If there is no numeric_limits template, then it can't have any compile time +// constants either! +// +# if defined(BOOST_NO_LIMITS) \ + && !defined(BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS) +# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS +# endif + +// +// if member templates are supported then so is the +// VC6 subset of member templates: +// +# if !defined(BOOST_NO_MEMBER_TEMPLATES) \ + && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) +# define BOOST_MSVC6_MEMBER_TEMPLATES +# endif + +// +// Without partial specialization, std::iterator_traits can't work: +// +# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ + && !defined(BOOST_NO_STD_ITERATOR_TRAITS) +# define BOOST_NO_STD_ITERATOR_TRAITS +# endif + +// +// Without member template support, we can't have template constructors +// in the standard library either: +// +# if defined(BOOST_NO_MEMBER_TEMPLATES) \ + && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) \ + && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) +# define BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS +# endif + +// +// Without member template support, we can't have a conforming +// std::allocator template either: +// +# if defined(BOOST_NO_MEMBER_TEMPLATES) \ + && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) \ + && !defined(BOOST_NO_STD_ALLOCATOR) +# define BOOST_NO_STD_ALLOCATOR +# endif + +// +// We can't have a working std::use_facet if there is no std::locale: +// +# if defined(BOOST_NO_STD_LOCALE) && !defined(BOOST_NO_STD_USE_FACET) +# define BOOST_NO_STD_USE_FACET +# endif + +// +// We can't have a std::messages facet if there is no std::locale: +// +# if defined(BOOST_NO_STD_LOCALE) && !defined(BOOST_NO_STD_MESSAGES) +# define BOOST_NO_STD_MESSAGES +# endif + +// +// We can't have a if there is no : +// +# if defined(BOOST_NO_CWCHAR) && !defined(BOOST_NO_CWCTYPE) +# define BOOST_NO_CWCTYPE +# endif + +// +// We can't have a swprintf if there is no : +// +# if defined(BOOST_NO_CWCHAR) && !defined(BOOST_NO_SWPRINTF) +# define BOOST_NO_SWPRINTF +# endif + +// +// If the platform claims to be Unix, then it had better behave like Unix! +// +# if defined(unix) \ + || defined(__unix) \ + || defined(_XOPEN_SOURCE) \ + || defined(_POSIX_SOURCE) + +# ifndef BOOST_HAS_UNISTD_H +# define BOOST_HAS_UNISTD_H +# endif +# endif + +// +// If we have a then some options can be deduced from it: +// +# ifdef BOOST_HAS_UNISTD_H +# include +# endif + +// +// Turn on threading support if the compiler thinks that it's in +// multithreaded mode. We put this here because there are only a +// limited number of macros that identify this (if there's any missing +// from here then add to the appropriate compiler section): +// +#if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \ + || defined(_PTHREADS)) && !defined(BOOST_HAS_THREADS) +# define BOOST_HAS_THREADS +#endif + +// +// Turn threading support off if BOOST_DISABLE_THREADS is defined: +// +#if defined(BOOST_DISABLE_THREADS) && defined(BOOST_HAS_THREADS) +# undef BOOST_HAS_THREADS +#endif + +// +// Turn threading support off if we don't recognise the threading API: +// +#if defined(BOOST_HAS_THREADS) && !defined(BOOST_HAS_PTHREADS)\ + && !defined(BOOST_HAS_WINTHREADS) && !defined(BOOST_HAS_BETHREADS) +# undef BOOST_HAS_THREADS +#endif + +// +// If the compiler claims to be C99 conformant, then it had better +// have a : +// +# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) +# define BOOST_HAS_STDINT_H +# endif + +// +// Define BOOST_NO_SLIST and BOOST_NO_HASH if required. +// Note that this is for backwards compatibility only. +// +# ifndef BOOST_HAS_SLIST +# define BOOST_NO_SLIST +# endif + +# ifndef BOOST_HAS_HASH +# define BOOST_NO_HASH +# endif + +// BOOST_NO_STDC_NAMESPACE workaround --------------------------------------// +// Because std::size_t usage is so common, even in boost headers which do not +// otherwise use the C library, the workaround is included here so +// that ugly workaround code need not appear in many other boost headers. +// NOTE WELL: This is a workaround for non-conforming compilers; +// must still be #included in the usual places so that inclusion +// works as expected with standard conforming compilers. The resulting +// double inclusion of is harmless. + +# ifdef BOOST_NO_STDC_NAMESPACE +# include + namespace std { using ::ptrdiff_t; using ::size_t; } +# endif + +// BOOST_NO_STD_MIN_MAX workaround -----------------------------------------// + +# ifdef BOOST_NO_STD_MIN_MAX + +namespace std { + template + inline const _Tp& min(const _Tp& __a, const _Tp& __b) { + return __b < __a ? __b : __a; + } + template + inline const _Tp& max(const _Tp& __a, const _Tp& __b) { + return __a < __b ? __b : __a; + } +# ifdef BOOST_MSVC + inline long min(long __a, long __b) { + return __b < __a ? __b : __a; + } + inline long max(long __a, long __b) { + return __a < __b ? __b : __a; + } +# endif +} + +# endif + +// BOOST_STATIC_CONSTANT workaround --------------------------------------- // +// On compilers which don't allow in-class initialization of static integral +// constant members, we must use enums as a workaround if we want the constants +// to be available at compile-time. This macro gives us a convenient way to +// declare such constants. + +# ifdef BOOST_NO_INCLASS_MEMBER_INITIALIZATION +# define BOOST_STATIC_CONSTANT(type, assignment) enum { assignment } +# else +# define BOOST_STATIC_CONSTANT(type, assignment) static const type assignment +# endif + +// BOOST_USE_FACET workaround ----------------------------------------------// +// When the standard library does not have a conforming std::use_facet there +// are various workarounds available, but they differ from library to library. +// This macro provides a consistent way to access a locale's facets. +// Usage: +// replace +// std::use_facet(loc); +// with +// BOOST_USE_FACET(Type, loc); +// Note do not add a std:: prefix to the front of BOOST_USE_FACET! + +#if defined(BOOST_NO_STD_USE_FACET) +# ifdef BOOST_HAS_TWO_ARG_USE_FACET +# define BOOST_USE_FACET(Type, loc) std::use_facet(loc, static_cast(0)) +# elif defined(BOOST_HAS_MACRO_USE_FACET) +# define BOOST_USE_FACET(Type, loc) std::_USE(loc, Type) +# elif defined(BOOST_HAS_STLP_USE_FACET) +# define BOOST_USE_FACET(Type, loc) (*std::_Use_facet(loc)) +# endif +#else +# define BOOST_USE_FACET(Type, loc) std::use_facet< Type >(loc) +#endif + +// BOOST_NESTED_TEMPLATE workaround ------------------------------------------// +// Member templates are supported by some compilers even though they can't use +// the A::template member syntax, as a workaround replace: +// +// typedef typename A::template rebind binder; +// +// with: +// +// typedef typename A::BOOST_NESTED_TEMPLATE rebind binder; + +#ifndef BOOST_NO_MEMBER_TEMPLATE_KEYWORD +# define BOOST_NESTED_TEMPLATE template +#else +# define BOOST_NESTED_TEMPLATE +#endif + +// ---------------------------------------------------------------------------// + +// +// Helper macro BOOST_STRINGIZE: +// Converts the parameter X to a string after macro replacement +// on X has been performed. +// +#define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X) +#define BOOST_DO_STRINGIZE(X) #X + +// +// Helper macro BOOST_JOIN: +// The following piece of macro magic joins the two +// arguments together, even when one of the arguments is +// itself a macro (see 16.3.1 in C++ standard). The key +// is that macro expansion of macro arguments does not +// occur in BOOST_DO_JOIN2 but does in BOOST_DO_JOIN. +// +#define BOOST_JOIN( X, Y ) BOOST_DO_JOIN( X, Y ) +#define BOOST_DO_JOIN( X, Y ) BOOST_DO_JOIN2(X,Y) +#define BOOST_DO_JOIN2( X, Y ) X##Y + +// +// Set some default values for compiler/library/platform names. +// These are for debugging config setup only: +// +# ifndef BOOST_COMPILER +# define BOOST_COMPILER "Unknown ISO C++ Compiler" +# endif +# ifndef BOOST_STDLIB +# define BOOST_STDLIB "Unknown ISO standard library" +# endif +# ifndef BOOST_PLATFORM +# if defined(unix) || defined(__unix) || defined(_XOPEN_SOURCE) \ + || defined(_POSIX_SOURCE) +# define BOOST_PLATFORM "Generic Unix" +# else +# define BOOST_PLATFORM "Unknown" +# endif +# endif + +#endif + diff -uaNr yadex-1.5.2/boost/boost/config/user.hpp yadex-1.6.0/boost/boost/config/user.hpp --- yadex-1.5.2/boost/boost/config/user.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config/user.hpp 2001-10-01 19:26:32.000000000 +0200 @@ -0,0 +1,58 @@ +// (C) Copyright Boost.org 2001. +// Do not check in modified versions of this file, +// This file may be customized by the end user, but not by boost. + +// +// Use this file to define a site and compiler specific +// configuration policy: +// + +// define this to locate a compiler config file: +// #define BOOST_COMPILER_CONFIG + +// define this to locate a stdlib config file: +// #define BOOST_STDLIB_CONFIG + +// define this to locate a platform config file: +// #define BOOST_PLATFORM_CONFIG + +// define this to disable compiler config, +// use if your compiler config has nothing to set: +// #define BOOST_NO_COMPILER_CONFIG + +// define this to disable stdlib config, +// use if your stdlib config has nothing to set: +// #define BOOST_NO_STDLIB_CONFIG + +// define this to disable platform config, +// use if your platform config has nothing to set: +// #define BOOST_NO_PLATFORM_CONFIG + +// define this to disable all config options, +// excluding the user config. Use if your +// setup is fully ISO compliant, and has no +// useful extensions, or for autoconf generated +// setups: +// #define BOOST_NO_CONFIG + +// define this to make the config "optimistic" +// about unknown compiler versions. Normally +// unknown compiler versions are assumed to have +// all the defects of the last known version, however +// setting this flag, causes the config to assume +// that unknown compiler versions are fully conformant +// with the standard: +// #define BOOST_STRICT_CONFIG + +// define this to cause the config to halt compilation +// with an #error if it encounters anything unknown -- +// either an unknown compiler version or an unknown +// compiler/platform/library: +// #define BOOST_ASSERT_CONFIG + + +// define if you want to disable threading support, even +// when available: +// #define BOOST_DISABLE_THREADS + + diff -uaNr yadex-1.5.2/boost/boost/config.hpp yadex-1.6.0/boost/boost/config.hpp --- yadex-1.5.2/boost/boost/config.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/config.hpp 2001-10-01 19:25:36.000000000 +0200 @@ -0,0 +1,69 @@ +// Boost config.hpp configuration header file ------------------------------// + +// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version. + +// Boost config.hpp policy and rationale documentation has been moved to +// http://www.boost.org/libs/config +// +// CAUTION: This file is intended to be completely stable - +// DO NOT MODIFY THIS FILE! +// + +#ifndef BOOST_CONFIG_HPP +#define BOOST_CONFIG_HPP + +// if we don't have a user config, then use the default location: +#if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG) +# define BOOST_USER_CONFIG +#endif +// include it first: +#ifdef BOOST_USER_CONFIG +# include BOOST_USER_CONFIG +#endif + +// if we don't have a compiler config set, try and find one: +#if !defined(BOOST_COMPILER_CONFIG) && !defined(BOOST_NO_COMPILER_CONFIG) && !defined(BOOST_NO_CONFIG) +# include +#endif +// if we don't have a std library config set, try and find one: +#if !defined(BOOST_STDLIB_CONFIG) && !defined(BOOST_NO_STDLIB_CONFIG) && !defined(BOOST_NO_CONFIG) +# include +#endif +// if we don't have a platform config set, try and find one: +#if !defined(BOOST_PLATFORM_CONFIG) && !defined(BOOST_NO_PLATFORM_CONFIG) && !defined(BOOST_NO_CONFIG) +# include +#endif + + +// if we have a compiler config, include it now: +#ifdef BOOST_COMPILER_CONFIG +# include BOOST_COMPILER_CONFIG +#endif +// if we have a std library config, include it now: +#ifdef BOOST_STDLIB_CONFIG +# include BOOST_STDLIB_CONFIG +#endif +// if we have a platform config, include it now: +#ifdef BOOST_PLATFORM_CONFIG +# include BOOST_PLATFORM_CONFIG +#endif + +// get config suffix code: +#include + +#endif // BOOST_CONFIG_HPP + + + + + + + + + + diff -uaNr yadex-1.5.2/boost/boost/smart_ptr.hpp yadex-1.6.0/boost/boost/smart_ptr.hpp --- yadex-1.5.2/boost/boost/smart_ptr.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/smart_ptr.hpp 2001-10-01 19:25:39.000000000 +0200 @@ -0,0 +1,402 @@ +// Boost smart_ptr.hpp header file -----------------------------------------// + +// (C) Copyright Greg Colvin and Beman Dawes 1998, 1999. Permission to copy, +// use, modify, sell and distribute this software is granted provided this +// copyright notice appears in all copies. This software is provided "as is" +// without express or implied warranty, and with no claim as to its +// suitability for any purpose. + +// See http://www.boost.org for most recent version including documentation. + +// Revision History +// 6 Jul 01 Reorder shared_ptr code so VC++ 6 member templates work, allowing +// polymorphic pointers to now work with that compiler (Gary Powell) +// 21 May 01 Require complete type where incomplete type is unsafe. +// (suggested by Vladimir Prus) +// 21 May 01 operator= fails if operand transitively owned by *this, as in a +// linked list (report by Ken Johnson, fix by Beman Dawes) +// 21 Jan 01 Suppress some useless warnings with MSVC (David Abrahams) +// 19 Oct 00 Make shared_ptr ctor from auto_ptr explicit. (Robert Vugts) +// 24 Jul 00 Change throw() to // never throws. See lib guidelines +// Exception-specification rationale. (Beman Dawes) +// 22 Jun 00 Remove #if continuations to fix GCC 2.95.2 problem (Beman Dawes) +// 1 Feb 00 Additional shared_ptr BOOST_NO_MEMBER_TEMPLATES workarounds +// (Dave Abrahams) +// 31 Dec 99 Condition tightened for no member template friend workaround +// (Dave Abrahams) +// 30 Dec 99 Moved BOOST_NMEMBER_TEMPLATES compatibility code to config.hpp +// (Dave Abrahams) +// 30 Nov 99 added operator ==, operator !=, and std::swap and std::less +// specializations for shared types (Darin Adler) +// 11 Oct 99 replaced op[](int) with op[](std::size_t) (Ed Brey, Valentin +// Bonnard), added shared_ptr workaround for no member template +// friends (Matthew Langston) +// 25 Sep 99 added shared_ptr::swap and shared_array::swap (Luis Coelho). +// 20 Jul 99 changed name to smart_ptr.hpp, #include , +// #include and use boost::noncopyable +// 17 May 99 remove scoped_array and shared_array operator*() as +// unnecessary (Beman Dawes) +// 14 May 99 reorder code so no effects when bad_alloc thrown (Abrahams/Dawes) +// 13 May 99 remove certain throw() specifiers to avoid generated try/catch +// code cost (Beman Dawes) +// 11 May 99 get() added, conversion to T* placed in macro guard (Valentin +// Bonnard, Dave Abrahams, and others argued for elimination +// of the automatic conversion) +// 28 Apr 99 #include fix (Valentin Bonnard) +// 28 Apr 99 rename transfer() to share() for clarity (Dave Abrahams) +// 28 Apr 99 remove unsafe shared_array template conversions(Valentin Bonnard) +// 28 Apr 99 p(r) changed to p(r.px) for clarity (Dave Abrahams) +// 21 Apr 99 reset() self assignment fix (Valentin Bonnard) +// 21 Apr 99 dispose() provided to improve clarity (Valentin Bonnard) +// 27 Apr 99 leak when new throws fixes (Dave Abrahams) +// 21 Oct 98 initial Version (Greg Colvin/Beman Dawes) + +#ifndef BOOST_SMART_PTR_HPP +#define BOOST_SMART_PTR_HPP + +#include // for broken compiler workarounds +#include // for std::size_t +#include // for std::auto_ptr +#include // for std::swap +#include // for boost::noncopyable, checked_delete, checked_array_delete +#include // for std::less +#include // for BOOST_STATIC_ASSERT + +#ifdef BOOST_MSVC // moved here to work around VC++ compiler crash +# pragma warning(push) +# pragma warning(disable:4284) // return type for 'identifier::operator->' is not a UDT or reference to a UDT. Will produce errors if applied using infix notation +#endif + +namespace boost { + +// scoped_ptr --------------------------------------------------------------// + +// scoped_ptr mimics a built-in pointer except that it guarantees deletion +// of the object pointed to, either on destruction of the scoped_ptr or via +// an explicit reset(). scoped_ptr is a simple solution for simple needs; +// see shared_ptr (below) or std::auto_ptr if your needs are more complex. + +template class scoped_ptr : noncopyable { + + T* ptr; + + public: + typedef T element_type; + + explicit scoped_ptr( T* p=0 ) : ptr(p) {} // never throws + ~scoped_ptr() { checked_delete(ptr); } + void reset( T* p=0 ) { if ( ptr != p ) { checked_delete(ptr); ptr = p; } } + T& operator*() const { return *ptr; } // never throws + T* operator->() const { return ptr; } // never throws + T* get() const { return ptr; } // never throws +#ifdef BOOST_SMART_PTR_CONVERSION + // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! + operator T*() const { return ptr; } // never throws +#endif + }; // scoped_ptr + +// scoped_array ------------------------------------------------------------// + +// scoped_array extends scoped_ptr to arrays. Deletion of the array pointed to +// is guaranteed, either on destruction of the scoped_array or via an explicit +// reset(). See shared_array or std::vector if your needs are more complex. + +template class scoped_array : noncopyable { + + T* ptr; + + public: + typedef T element_type; + + explicit scoped_array( T* p=0 ) : ptr(p) {} // never throws + ~scoped_array() { checked_array_delete(ptr); } + + void reset( T* p=0 ) { if ( ptr != p ) + {checked_array_delete(ptr); ptr=p;} } + + T* get() const { return ptr; } // never throws +#ifdef BOOST_SMART_PTR_CONVERSION + // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! + operator T*() const { return ptr; } // never throws +#else + T& operator[](std::size_t i) const { return ptr[i]; } // never throws +#endif + }; // scoped_array + +// shared_ptr --------------------------------------------------------------// + +// An enhanced relative of scoped_ptr with reference counted copy semantics. +// The object pointed to is deleted when the last shared_ptr pointing to it +// is destroyed or reset. + +template class shared_ptr { + public: + typedef T element_type; + + explicit shared_ptr(T* p =0) : px(p) { + try { pn = new long(1); } // fix: prevent leak if new throws + catch (...) { checked_delete(p); throw; } + } + + ~shared_ptr() { dispose(); } + +#if !defined( BOOST_NO_MEMBER_TEMPLATES ) || defined (BOOST_MSVC6_MEMBER_TEMPLATES) + template + shared_ptr(const shared_ptr& r) : px(r.px) { // never throws + ++*(pn = r.pn); + } +#ifndef BOOST_NO_AUTO_PTR + template + explicit shared_ptr(std::auto_ptr& r) { + pn = new long(1); // may throw + px = r.release(); // fix: moved here to stop leak if new throws + } +#endif + + template + shared_ptr& operator=(const shared_ptr& r) { + share(r.px,r.pn); + return *this; + } + +#ifndef BOOST_NO_AUTO_PTR + template + shared_ptr& operator=(std::auto_ptr& r) { + // code choice driven by guarantee of "no effect if new throws" + if (*pn == 1) { checked_delete(px); } + else { // allocate new reference counter + long * tmp = new long(1); // may throw + --*pn; // only decrement once danger of new throwing is past + pn = tmp; + } // allocate new reference counter + px = r.release(); // fix: moved here so doesn't leak if new throws + return *this; + } +#endif +#else +#ifndef BOOST_NO_AUTO_PTR + explicit shared_ptr(std::auto_ptr& r) { + pn = new long(1); // may throw + px = r.release(); // fix: moved here to stop leak if new throws + } + + shared_ptr& operator=(std::auto_ptr& r) { + // code choice driven by guarantee of "no effect if new throws" + if (*pn == 1) { checked_delete(px); } + else { // allocate new reference counter + long * tmp = new long(1); // may throw + --*pn; // only decrement once danger of new throwing is past + pn = tmp; + } // allocate new reference counter + px = r.release(); // fix: moved here so doesn't leak if new throws + return *this; + } +#endif +#endif + + // The assignment operator and the copy constructor must come after + // the templated versions for MSVC6 to work. (Gary Powell) + shared_ptr(const shared_ptr& r) : px(r.px) { ++*(pn = r.pn); } // never throws + + shared_ptr& operator=(const shared_ptr& r) { + share(r.px,r.pn); + return *this; + } + + void reset(T* p=0) { + if ( px == p ) return; // fix: self-assignment safe + if (--*pn == 0) { checked_delete(px); } + else { // allocate new reference counter + try { pn = new long; } // fix: prevent leak if new throws + catch (...) { + ++*pn; // undo effect of --*pn above to meet effects guarantee + checked_delete(p); + throw; + } // catch + } // allocate new reference counter + *pn = 1; + px = p; + } // reset + + T& operator*() const { return *px; } // never throws + T* operator->() const { return px; } // never throws + T* get() const { return px; } // never throws + #ifdef BOOST_SMART_PTR_CONVERSION + // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! + operator T*() const { return px; } // never throws + #endif + + long use_count() const { return *pn; } // never throws + bool unique() const { return *pn == 1; } // never throws + + void swap(shared_ptr& other) // never throws + { std::swap(px,other.px); std::swap(pn,other.pn); } + +// Tasteless as this may seem, making all members public allows member templates +// to work in the absence of member template friends. (Matthew Langston) +// Don't split this line into two; that causes problems for some GCC 2.95.2 builds +#if ( defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) ) || !defined( BOOST_NO_MEMBER_TEMPLATE_FRIENDS ) + private: +#endif + + T* px; // contained pointer + long* pn; // ptr to reference counter + +// Don't split this line into two; that causes problems for some GCC 2.95.2 builds +#if !defined( BOOST_NO_MEMBER_TEMPLATES ) && !defined( BOOST_NO_MEMBER_TEMPLATE_FRIENDS ) + template friend class shared_ptr; +#endif + + void dispose() { if (--*pn == 0) { checked_delete(px); delete pn; } } + + void share(T* rpx, long* rpn) { + if (pn != rpn) { // Q: why not px != rpx? A: fails when both == 0 + ++*rpn; // done before dispose() in case rpn transitively + // dependent on *this (bug reported by Ken Johnson) + dispose(); + px = rpx; + pn = rpn; + } + } // share +}; // shared_ptr + +template + inline bool operator==(const shared_ptr& a, const shared_ptr& b) + { return a.get() == b.get(); } + +template + inline bool operator!=(const shared_ptr& a, const shared_ptr& b) + { return a.get() != b.get(); } + +// shared_array ------------------------------------------------------------// + +// shared_array extends shared_ptr to arrays. +// The array pointed to is deleted when the last shared_array pointing to it +// is destroyed or reset. + +template class shared_array { + public: + typedef T element_type; + + explicit shared_array(T* p =0) : px(p) { + try { pn = new long(1); } // fix: prevent leak if new throws + catch (...) { checked_array_delete(p); throw; } + } + + shared_array(const shared_array& r) : px(r.px) // never throws + { ++*(pn = r.pn); } + + ~shared_array() { dispose(); } + + shared_array& operator=(const shared_array& r) { + if (pn != r.pn) { // Q: why not px != r.px? A: fails when both px == 0 + ++*r.pn; // done before dispose() in case r.pn transitively + // dependent on *this (bug reported by Ken Johnson) + dispose(); + px = r.px; + pn = r.pn; + } + return *this; + } // operator= + + void reset(T* p=0) { + if ( px == p ) return; // fix: self-assignment safe + if (--*pn == 0) { checked_array_delete(px); } + else { // allocate new reference counter + try { pn = new long; } // fix: prevent leak if new throws + catch (...) { + ++*pn; // undo effect of --*pn above to meet effects guarantee + checked_array_delete(p); + throw; + } // catch + } // allocate new reference counter + *pn = 1; + px = p; + } // reset + + T* get() const { return px; } // never throws + #ifdef BOOST_SMART_PTR_CONVERSION + // get() is safer! Define BOOST_SMART_PTR_CONVERSION at your own risk! + operator T*() const { return px; } // never throws + #else + T& operator[](std::size_t i) const { return px[i]; } // never throws + #endif + + long use_count() const { return *pn; } // never throws + bool unique() const { return *pn == 1; } // never throws + + void swap(shared_array& other) // never throws + { std::swap(px,other.px); std::swap(pn,other.pn); } + + private: + + T* px; // contained pointer + long* pn; // ptr to reference counter + + void dispose() { if (--*pn == 0) { checked_array_delete(px); delete pn; } } + +}; // shared_array + +template + inline bool operator==(const shared_array& a, const shared_array& b) + { return a.get() == b.get(); } + +template + inline bool operator!=(const shared_array& a, const shared_array& b) + { return a.get() != b.get(); } + +} // namespace boost + +// specializations for things in namespace std -----------------------------// + +#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION + +namespace std { + +// Specialize std::swap to use the fast, non-throwing swap that's provided +// as a member function instead of using the default algorithm which creates +// a temporary and uses assignment. + +template + inline void swap(boost::shared_ptr& a, boost::shared_ptr& b) + { a.swap(b); } + +template + inline void swap(boost::shared_array& a, boost::shared_array& b) + { a.swap(b); } + +// Specialize std::less so we can use shared pointers and arrays as keys in +// associative collections. + +// It's still a controversial question whether this is better than supplying +// a full range of comparison operators (<, >, <=, >=). + +template + struct less< boost::shared_ptr > + : binary_function, boost::shared_ptr, bool> + { + bool operator()(const boost::shared_ptr& a, + const boost::shared_ptr& b) const + { return less()(a.get(),b.get()); } + }; + +template + struct less< boost::shared_array > + : binary_function, boost::shared_array, bool> + { + bool operator()(const boost::shared_array& a, + const boost::shared_array& b) const + { return less()(a.get(),b.get()); } + }; + +} // namespace std + +#endif // ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION + +#ifdef BOOST_MSVC +# pragma warning(pop) +#endif + +#endif // BOOST_SMART_PTR_HPP + + diff -uaNr yadex-1.5.2/boost/boost/static_assert.hpp yadex-1.6.0/boost/boost/static_assert.hpp --- yadex-1.5.2/boost/boost/static_assert.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/static_assert.hpp 2001-10-01 19:25:40.000000000 +0200 @@ -0,0 +1,86 @@ +// (C) Copyright John Maddock 2000. +// Permission to copy, use, modify, sell and +// distribute this software is granted provided this copyright notice appears +// in all copies. This software is provided "as is" without express or implied +// warranty, and with no claim as to its suitability for any purpose. + +// See http://www.boost.org for most recent version including documentation. + +/* + Revision history: + 02 August 2000 + Initial version. +*/ + +#ifndef BOOST_STATIC_ASSERT_HPP +#define BOOST_STATIC_ASSERT_HPP + +#include + +#ifdef __BORLANDC__ +// +// workaround for buggy integral-constant expression support: +#define BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS +#endif + +namespace boost{ + +// HP aCC cannot deal with missing names for template value parameters +template struct STATIC_ASSERTION_FAILURE; + +template <> struct STATIC_ASSERTION_FAILURE{}; + +// HP aCC cannot deal with missing names for template value parameters +template struct static_assert_test{}; + +} + +// +// Implicit instantiation requires that all member declarations be +// instantiated, but that the definitions are *not* instantiated. +// +// It's not particularly clear how this applies to enum's or typedefs; +// both are described as declarations [7.1.3] and [7.2] in the standard, +// however some compilers use "delayed evaluation" of one or more of +// these when implicitly instantiating templates. We use typedef declarations +// by default, but try defining BOOST_USE_ENUM_STATIC_ASSERT if the enum +// version gets better results from your compiler... +// +// Implementation: +// Both of these versions rely on sizeof(incomplete_type) generating an error +// message containing the name of the incomplete type. We use +// "STATIC_ASSERTION_FAILURE" as the type name here to generate +// an eye catching error message. The result of the sizeof expression is either +// used as an enum initialiser, or as a template argument depending which version +// is in use... +// Note that the argument to the assert is explicitly cast to bool using old- +// style casts: too many compilers currently have problems with static_cast +// when used inside integral constant expressions. +// +#if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) && !defined(__MWERKS__) +#ifndef BOOST_MSVC +#define BOOST_STATIC_ASSERT( B ) \ + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)>\ + BOOST_JOIN(boost_static_assert_typedef_, __LINE__) +#else +// __LINE__ macro broken when -ZI is used see Q199057 +// fortunately MSVC ignores duplicate typedef's. +#define BOOST_STATIC_ASSERT( B ) \ + typedef ::boost::static_assert_test<\ + sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)\ + > boost_static_assert_typedef_ +#endif +#else +// alternative enum based implementation: +#define BOOST_STATIC_ASSERT( B ) \ + enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \ + = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) } +#endif + + +#endif // BOOST_STATIC_ASSERT_HPP + + + + diff -uaNr yadex-1.5.2/boost/boost/utility/base_from_member.hpp yadex-1.6.0/boost/boost/utility/base_from_member.hpp --- yadex-1.5.2/boost/boost/utility/base_from_member.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/utility/base_from_member.hpp 2001-10-01 19:26:31.000000000 +0200 @@ -0,0 +1,59 @@ +// boost utility/base_from_member.hpp header file --------------------------// + +// (C) Copyright Daryle Walker 2001. Permission to copy, use, modify, sell +// and distribute this software is granted provided this copyright +// notice appears in all copies. This software is provided "as is" without +// express or implied warranty, and with no claim as to its suitability for +// any purpose. + +// See http://www.boost.org for most recent version including documentation. + +#ifndef BOOST_UTILITY_BASE_FROM_MEMBER_HPP +#define BOOST_UTILITY_BASE_FROM_MEMBER_HPP + +#include // required for parameter defaults + + +namespace boost +{ + +// Base-from-member class template -----------------------------------------// + +// Helper to initialize a base object so a derived class can use this +// object in the initialization of another base class. Used by +// Dietmar Kuehl from ideas by Ron Klatcho to solve the problem of a +// base class needing to be initialized by a member. + +// Contributed by Daryle Walker + +template < typename MemberType, int UniqueID > +class base_from_member +{ +protected: + MemberType member; + + explicit base_from_member() + : member() + {} + + template< typename T1 > + explicit base_from_member( T1 x1 ) + : member( x1 ) + {} + + template< typename T1, typename T2 > + base_from_member( T1 x1, T2 x2 ) + : member( x1, x2 ) + {} + + template< typename T1, typename T2, typename T3 > + base_from_member( T1 x1, T2 x2, T3 x3 ) + : member( x1, x2, x3 ) + {} + +}; // boost::base_from_member + +} // namespace boost + + +#endif // BOOST_UTILITY_BASE_FROM_MEMBER_HPP diff -uaNr yadex-1.5.2/boost/boost/utility.hpp yadex-1.6.0/boost/boost/utility.hpp --- yadex-1.5.2/boost/boost/utility.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/utility.hpp 2001-10-01 19:25:40.000000000 +0200 @@ -0,0 +1,86 @@ +// boost utility.hpp header file -------------------------------------------// + +// (C) Copyright boost.org 1999. Permission to copy, use, modify, sell +// and distribute this software is granted provided this copyright +// notice appears in all copies. This software is provided "as is" without +// express or implied warranty, and with no claim as to its suitability for +// any purpose. + +// See http://www.boost.org for most recent version including documentation. + +// Classes appear in alphabetical order + +#ifndef BOOST_UTILITY_HPP +#define BOOST_UTILITY_HPP + +#include // broken compiler workarounds +#include + +// certain headers are part of the interface +#include + +#include // for size_t +#include // for std::pair + +namespace boost +{ +// checked_delete() and checked_array_delete() -----------------------------// + + // verify that types are complete for increased safety + + template< typename T > + inline void checked_delete(T * x) + { + BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point + // of instantiation + delete x; + } + + template< typename T > + inline void checked_array_delete(T * x) + { + BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point + // of instantiation + delete [] x; + } + +// next() and prior() template functions -----------------------------------// + + // Helper functions for classes like bidirectional iterators not supporting + // operator+ and operator-. + // + // Usage: + // const std::list::iterator p = get_some_iterator(); + // const std::list::iterator prev = boost::prior(p); + + // Contributed by Dave Abrahams + + template + inline T next(T x) { return ++x; } + + template + inline T prior(T x) { return --x; } + + +// class noncopyable -------------------------------------------------------// + + // Private copy constructor and copy assignment ensure classes derived from + // class noncopyable cannot be copied. + + // Contributed by Dave Abrahams + + class noncopyable + { + protected: + noncopyable(){} + ~noncopyable(){} + private: // emphasize the following members are private + noncopyable( const noncopyable& ); + const noncopyable& operator=( const noncopyable& ); + }; // noncopyable + + +} // namespace boost + +#endif // BOOST_UTILITY_HPP + diff -uaNr yadex-1.5.2/boost/boost/utility_fwd.hpp yadex-1.6.0/boost/boost/utility_fwd.hpp --- yadex-1.5.2/boost/boost/utility_fwd.hpp 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/boost/boost/utility_fwd.hpp 2001-10-01 19:25:41.000000000 +0200 @@ -0,0 +1,38 @@ +// Boost utility_fwd.hpp header file ---------------------------------------// + +// (C) Copyright boost.org 2001. Permission to copy, use, modify, sell +// and distribute this software is granted provided this copyright +// notice appears in all copies. This software is provided "as is" without +// express or implied warranty, and with no claim as to its suitability for +// any purpose. + +// See http://www.boost.org for most recent version including documentation. + +#ifndef BOOST_UTILITY_FWD_HPP +#define BOOST_UTILITY_FWD_HPP + + +namespace boost +{ + + +// From -------------------------------// + +template < typename MemberType, int UniqueID = 0 > + class base_from_member; + + +// From ------------------------------------------------// + +class noncopyable; + +template < class A, class B > + class tied; + +// Also has a few function templates + + +} // namespace boost + + +#endif // BOOST_UTILITY_FWD_HPP diff -uaNr yadex-1.5.2/bsp-2.3/bsp.c yadex-1.6.0/bsp-2.3/bsp.c --- yadex-1.5.2/bsp-2.3/bsp.c 2001-06-30 23:34:36.000000000 +0200 +++ yadex-1.6.0/bsp-2.3/bsp.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,923 +0,0 @@ -/*- BSP.C -------------------------------------------------------------------* - - Node builder for DOOM levels (c) 1998 Colin Reed, version 2.3 (dos extended) - - Performance increased 200% over 1.2x - - Many thanks to Mark Harrison for finding a bug in 1.1 which caused some - texture align problems when a flipped SEG was split. - - Credit to:- - - Raphael Quinet (A very small amount of code has been borrowed from DEU). - - Matt Fell for the doom specs. - - Lee Killough for performance tuning, support for multilevel wads, special - effects, and wads with lumps besides levels. - - Also, the original idea for some of the techniques where also taken from the - comment at the bottom of OBJECTS.C in DEU, and the doc by Matt Fell about - the nodes. - - Use this code for your own editors, but please credit me. - -*---------------------------------------------------------------------------*/ - -#include "bsp.h" -#include "structs.h" - -/*- Global Vars ------------------------------------------------------------*/ - -static FILE *outfile; -static char *testwad; -static char *outwad; - -static struct directory *direc = NULL; - -static struct Thing *things; -static long num_things = 0; - -static struct Vertex *vertices; -static long num_verts = 0; - -static struct LineDef *linedefs; -static long num_lines = 0; - -static struct SideDef *sidedefs; -static long num_sides = 0; - -static struct Sector *sectors; -static long num_sects = 0; - -static struct SSector *ssectors; -static long num_ssectors = 0; - -static struct Pseg *psegs = NULL; -static long num_psegs = 0; - -static struct Pnode *pnodes = NULL; -static long num_pnodes = 0; -static long pnode_indx = 0; -static long num_nodes = 0; - -static struct Block blockhead; -static short int *blockptrs; -static short int *blocklists=NULL; -static long blockptrs_size; - -unsigned char *SectorHits; - -static short lminx; -static short lmaxx; -static short lminy; -static short lmaxy; - -static short mapminx; -static short mapmaxx; -static short mapminy; -static short mapmaxy; - -static int show_progress = 1; -static unsigned char pcnt; - -static struct Seg *PickNode_traditional(struct Seg *); -static struct Seg *PickNode_visplane(struct Seg *); -static struct Seg *(*PickNode)(struct Seg *)=PickNode_traditional; -static int visplane,visplane_warning,mark_visplanes,threshold=128; -static int noreject; - -static struct lumplist { - struct lumplist *next; - struct directory *dir; - void *data; - char islevel; -} *lumplist,*current_level; - -static char current_level_name[9]; - -static struct wad_header wad; - -/*- Prototypes -------------------------------------------------------------*/ - -static void OpenWadFile(char *); -static struct lumplist *FindDir(const char *); -static void GetThings(void); -static void GetVertexes(void); -static void GetLinedefs(void); -static void GetSidedefs(void); -static void GetSectors(void); -static void FindLimits(struct Seg *); - -static struct Seg *CreateSegs(); - -static struct Node *CreateNode(struct Seg *); -static int IsItConvex(const struct Seg *); -static void DelSegs(struct Seg *); - -static void ReverseNodes(struct Node *); -static long CreateBlockmap(void); - -static void progress(void); -static int IsLineDefInside(int, int, int, int, int); -static int CreateSSector(struct Seg *); - -/*--------------------------------------------------------------------------*/ - -static void progress() -{ - if(show_progress) - if(!((++pcnt)&31)) - fprintf(stderr,"%c\b","/-\\|"[((pcnt)>>5)&3]); -} - -/*--------------------------------------------------------------------------*/ -/* Find limits from a list of segs, does this by stepping through the segs*/ -/* and comparing the vertices at both ends.*/ -/*--------------------------------------------------------------------------*/ - -static void FindLimits(struct Seg *ts) -{ - int minx=INT_MAX,miny=INT_MAX,maxx=INT_MIN,maxy=INT_MIN; - int fv,tv; - - for(;;) { - fv = ts->start; - tv = ts->end; -/* printf("%d : %d,%d\n",n,vertices[n].x,vertices[n].y);*/ - if(vertices[fv].x < minx) minx = vertices[fv].x; - if(vertices[fv].x > maxx) maxx = vertices[fv].x; - if(vertices[fv].y < miny) miny = vertices[fv].y; - if(vertices[fv].y > maxy) maxy = vertices[fv].y; - if(vertices[tv].x < minx) minx = vertices[tv].x; - if(vertices[tv].x > maxx) maxx = vertices[tv].x; - if(vertices[tv].y < miny) miny = vertices[tv].y; - if(vertices[tv].y > maxy) maxy = vertices[tv].y; - if(ts->next == NULL) break; - ts = ts->next; - } - lminx = minx; - lmaxx = maxx; - lminy = miny; - lmaxy = maxy; -} - - -/*--------------------------------------------------------------------------*/ -#include "funcs.c" -#include "picknode.c" -#include "makenode.c" - - -static struct Seg *add_seg(struct Seg *cs, int n, int fv, int tv, - struct Seg **fs, struct SideDef *sd) -{ - struct Seg *ts = GetMemory( sizeof( struct Seg)); /* get mem for Seg*/ - cs = cs ? (cs->next = ts) : (*fs = ts); - cs->next = NULL; - cs->start = fv; - cs->end = tv; - cs->pdx = (long) (cs->pex = vertices[tv].x) - - (cs->psx = vertices[fv].x); - cs->pdy = (long) (cs->pey = vertices[tv].y) - - (cs->psy = vertices[fv].y); - cs->ptmp = cs->pdx*cs->psy-cs->psx*cs->pdy; - cs->len = (long) sqrt( (double) cs->pdx * cs->pdx + - (double) cs->pdy * cs->pdy); - - if ((cs->sector=sd->sector)==-1) - printf("\nWarning: Bad sidedef in linedef %d (Z_CheckHeap error)\n",n); - - cs->angle = ComputeAngle(cs->pdx,cs->pdy); - - if (linedefs[n].tag==999) - cs->angle=(cs->angle + (unsigned)(sd->xoff*(65536.0/360.0))) & 65535u; - - cs->linedef = n; - cs->dist = 0; - return cs; -} - -/*- initially creates all segs, one for each line def ----------------------*/ - -static struct Seg *CreateSegs() -{ - struct Seg *cs = NULL; /* current Seg */ - struct Seg *fs = NULL; /* first Seg in list */ - struct LineDef *l = linedefs; - int n; - - puts("Creating Segs .........."); - - for (n=0;nsidedef1 != -1) - (cs=add_seg(cs,n,l->start,l->end,&fs,sidedefs+l->sidedef1))->flip=0; - else - printf("\nWarning: Linedef %d has no right sidedef\n",n); - - if (l->sidedef2 != -1) - (cs=add_seg(cs,n,l->end,l->start,&fs,sidedefs+l->sidedef2))->flip=1; - else - if (l->flags & 4) - printf("\nWarning: Linedef %d is 2s but has no left sidedef\n",n); - } - return fs; -} - -/*- get the directory from a wad file --------------------------------------*/ -/* rewritten by Lee Killough to support multiple levels and extra lumps */ - -static void OpenWadFile(char *filename) -{ - long i; - register struct directory *dir; - struct lumplist *levelp=NULL; - FILE *infile; - - if (!(infile = fopen(filename,"rb"))) - ProgError("Error: Cannot open WAD file %s", filename); - - if (fread(&wad,1,sizeof(wad),infile)!=sizeof(wad) || - (wad.type[0]!='I' && wad.type[0]!='P') || wad.type[1]!='W' - || wad.type[2]!='A' || wad.type[3]!='D') - ProgError("%s does not appear to be a wad file -- bad magic", filename); - - printf("Opened %cWAD file : %s. %lu dir entries at 0x%lX.\n", - wad.type[0],filename,wad.num_entries,wad.dir_start); - - direc = GetMemory(sizeof(struct directory) * wad.num_entries); - - fseek(infile,wad.dir_start,0); - fread(direc,sizeof(struct directory),wad.num_entries,infile); - - current_level=NULL; - dir = direc; - for (i=wad.num_entries;i--;dir++) - { - register struct lumplist *l=GetMemory(sizeof(*l)); - l->dir=dir; - l->data=NULL; - l->next=NULL; - l->islevel=0; - - if ((dir->name[0]=='E' && dir->name[2]=='M' && - dir->name[1]>='1' && dir->name[1]<='9' && - dir->name[3]>='1' && dir->name[3]<='9' && - (!dir->name[4] || (dir->name[4]>='0' && - dir->name[4]<='9' && - !dir->name[5]) )) || ( - dir->name[0]=='M' && dir->name[1]=='A' && - dir->name[2]=='P' && !dir->name[5] && - dir->name[3]>='0' && dir->name[3]<='9' && - dir->name[4]>='0' && dir->name[4]<='9')) - { - dir->length=0; - l->islevel=1; /* Begin new level */ - } - else - { - if (levelp && (!strncmp(dir->name,"SEGS",8) || - !strncmp(dir->name,"SSECTORS",8) || - !strncmp(dir->name,"NODES",8) || - !strncmp(dir->name,"BLOCKMAP",8) || - (!noreject && !strncmp(dir->name,"REJECT",8)) || - FindDir(dir->name))) - continue; /* Ignore these since we're rebuilding them anyway */ - - if (levelp && FindDir(dir->name)) - { - printf("Warning: Duplicate entry \"%-8.8s\" ignored in %-.8s\n", - dir->name, current_level->dir->name); - continue; - } - - if (dir->length) - { - l->data=GetMemory(dir->length); - if (fseek(infile,dir->start,0) || - fread(l->data,1,dir->length,infile) != dir->length) - printf("Warning: Trouble reading wad directory entry \"%-8.8s\" in %-.8s\n", - dir->name, current_level->dir->name); - } - - if (levelp && (!strncmp(dir->name,"THINGS",8) || - !strncmp(dir->name,"LINEDEFS",8) || - !strncmp(dir->name,"SIDEDEFS",8) || - !strncmp(dir->name,"VERTEXES",8) || - !strncmp(dir->name,"SECTORS",8) || - (noreject && !strncmp(dir->name,"REJECT",8)))) - { /* Store in current level */ - levelp->next=l; - levelp=l; - continue; - } - } - - /* Mark end of level and advance one main lump entry */ - - if (levelp && !(current_level->data=current_level->next)) - current_level->islevel=0; /* Ignore oddly formed levels */ - - levelp = l->islevel ? l : NULL; - - if (current_level) - current_level->next=l; - else - lumplist=l; - current_level=l; - } - - if (levelp) - { - if (!(current_level->data=current_level->next)) - current_level->islevel=0; /* Ignore oddly formed levels */ - current_level->next=NULL; - } - fclose(infile); -} - -/*- find the pointer to a resource -----------------------*/ - -static struct lumplist *FindDir(const char *name) -{ - struct lumplist *l = current_level; - while (l && strncmp(l->dir->name,name,8)) - l=l->next; - return l; -} - -/*- read the things from the wad file and place in 'things' ----------------*/ -static void GetThings(void) -{ - struct lumplist *l; - - l = FindDir("THINGS"); - - if (!l || !(num_things = l->dir->length / sizeof( struct Thing))) - ProgError("Must have at least 1 Thing"); - - things = l->data; -} - -/*- read the vertices from the wad file and place in 'vertices' ------------ - Rewritten by Lee Killough, to speed up performance */ - -static struct lumplist *vertlmp; - -static void GetVertexes(void) -{ - long n,used_verts,i; - int *translate; - struct lumplist *l = FindDir("VERTEXES"); - - if(!l || !(num_verts = l->dir->length / sizeof(struct Vertex))) - ProgError("Couldn't find any Vertices"); - - vertlmp = l; - - vertices = l->data; - - translate = GetMemory(num_verts*sizeof(*translate)); - - for (n=0;n=num_verts || e<0 || e>=num_verts) - ProgError("Linedef %ld has vertex out of range\n",i); - if (vertices[s].x!=vertices[e].x || vertices[s].y!=vertices[e].y) - { - linedefs[n++]=linedefs[i]; - translate[s]=translate[e]=0; - } - } - i-=num_lines=n; - used_verts=0; - for (n=0;n= used_verts || e < 0 || e >= used_verts) - ProgError("Trouble in GetVertexes: Renumbering\n"); - linedefs[n].start=s; - linedefs[n].end=e; - } - - free(translate); - - printf("Loaded %ld vertices",num_verts); - if (num_verts>used_verts) - printf(", but %ld were unused\n(this is normal if the nodes were built before).\n", - num_verts-used_verts); - else - puts("."); - printf(i ? "%ld zero-length lines were removed.\n" : "\n",i); - num_verts = used_verts; - if (!num_verts) - ProgError("Couldn't find any used Vertices"); -} - -/*- read the linedefs from the wad file and place in 'linedefs' ------------*/ - -static void GetLinedefs(void) -{ - struct lumplist *l = FindDir("LINEDEFS"); - - if (!l || !(num_lines = l->dir->length / sizeof(struct LineDef))) - ProgError("Couldn't find any Linedefs"); - - linedefs = l->data; -} - -/*- read the sidedefs from the wad file and place in 'sidedefs' ------------*/ - -static void GetSidedefs(void) -{ - struct lumplist *l = FindDir("SIDEDEFS"); - - if (!l || !(num_sides = l->dir->length / sizeof(struct SideDef))) - ProgError("Couldn't find any Sidedefs"); - - sidedefs = l->data; -} - -/*- read the sectors from the wad file and place count in 'num_sectors' ----*/ - -static void GetSectors(void) -{ - struct lumplist *l = FindDir("SECTORS"); - - if (!l || !(num_sects = l->dir->length / sizeof(struct Sector))) - ProgError("Couldn't find any Sectors"); - - sectors = l->data; -} - -/*--------------------------------------------------------------------------*/ - -static int IsLineDefInside(int ldnum, int xmin, int ymin, int xmax, int ymax ) -{ - int x1 = vertices[ linedefs[ ldnum].start].x; - int y1 = vertices[ linedefs[ ldnum].start].y; - int x2 = vertices[ linedefs[ ldnum].end].x; - int y2 = vertices[ linedefs[ ldnum].end].y; - int count=2; - - for (;;) - if (y1>ymax) - { - if (y2>ymax) - return(FALSE); - x1=x1+(x2-x1)*(double)(ymax-y1)/(y2-y1); - y1=ymax; - count=2; - } - else - if (y1xmax) - { - if (x2>xmax) - return(FALSE); - y1=y1+(y2-y1)*(double)(xmax-x1)/(x2-x1); - x1=xmax; - count=2; - } - else - if (x1chright = tn->nextr ? ReverseNodes(tn->nextr), tn->nextr->node_num : - tn->chright | 0x8000; - - tn->chleft = tn->nextl ? ReverseNodes(tn->nextl), tn->nextl->node_num : - tn->chleft | 0x8000; - - pn = pnodes + pnode_indx++; - - pn->x = tn->x; - pn->y = tn->y; - pn->dx = tn->dx; - pn->dy = tn->dy; - pn->maxy1 = tn->maxy1; - pn->miny1 = tn->miny1; - pn->minx1 = tn->minx1; - pn->maxx1 = tn->maxx1; - pn->maxy2 = tn->maxy2; - pn->miny2 = tn->miny2; - pn->minx2 = tn->minx2; - pn->maxx2 = tn->maxx2; - pn->chright = tn->chright; - pn->chleft = tn->chleft; - tn->node_num = num_pnodes++; -} - -/* Add a lump to current level - by Lee Killough */ - -static void add_lump(const char *name, void *data, size_t length) -{ - struct lumplist *l; - for (l=current_level;l;l=l->next) - if (!strncmp(name,l->dir->name,8)) - break; - if (!l) - { - l=current_level; - while (l->next) - l=l->next; - l->next = GetMemory(sizeof(*l)); - l = l->next; - l->next=NULL; - l->dir = GetMemory(sizeof(struct directory)); - strncpy(l->dir->name,name,8); - } - l->dir->length=length; - l->islevel=0; - l->data=data; -} - -static struct directory write_lump(struct lumplist *lump) -{ - if (ftell(outfile)!=lump->dir->start || (lump->dir->length && - fwrite(lump->data, 1, lump->dir->length, outfile) != lump->dir->length)) - printf("Warning: Consistency check failure writing %-.8s\n", lump->dir->name); - return *lump->dir; -} - -static void sortlump(struct lumplist **link) -{ - static const char *const lumps[10]={"THINGS", "LINEDEFS", "SIDEDEFS", - "VERTEXES", "SEGS", "SSECTORS", "NODES", "SECTORS", "REJECT", "BLOCKMAP"}; - int i=sizeof(lumps)/sizeof(*lumps)-1; - struct lumplist **l; - do - for (l=link;*l;l=&(*l)->next) - if (!strncmp(lumps[i],(*l)->dir->name,8)) - { - struct lumplist *t=(*l)->next; - (*l)->next=*link; - *link=*l; - *l=t; - break; - } - while (--i>=0); -} - - -void usage(void) -{ - fprintf(stdout, - "\nThis Node builder was created from the basic theory stated in DEU5 (OBJECTS.C)\n" - "Credits should go to :-\n" - "Matt Fell (msfell@aol.com) for the Doom Specs.\n" - "Raphael Quinet (Raphael.Quinet@eed.ericsson.se) for DEU and the original idea.\n" - "Mark Harrison (harrison@lclark.edu) for finding a bug in 1.1x\n" - "Jim Flynn (jflynn@pacbell.net) for many good ideas and encouragement.\n" - "Jan Van der Veken for finding invisible barrier bug.\n" - "Colin Phipps for two bug fixes (http://lxdoom.linuxgames.com/notes.html#bsp).\n" -#ifdef MSDOS - "\nUsage: BSP [options] input.wad [[-o] ]\n" -#else - "\nUsage: BSP [options] input.wad [-o ]\n" -#endif - " (If no output.wad is specified, \"tmp.wad\" is written)\n\n" - "Options:\n\n" - " -factor Changes the cost assigned to SEG splits\n" - " -vp Attempts to prevent visplane overflows\n" - " -vpwarn Warns about potential visplane overflows\n" - " -vpmark Marks visplane overflows with player starts\n" - " -thold Threshold for visplane overflow (default 128)\n" - " -noreject Does not clobber reject map\n" - ); - exit(1); -} - -static void parse_options(int argc, char *argv[]) -{ - static char *fnames[2]; - static const struct { - const char *option; - void *var; - enum {NONE, STRING, INT} arg; - } tab[]= { {"-vp", &visplane, NONE}, - {"-vpwarn", &visplane_warning, NONE}, - {"-warnvp", &visplane_warning, NONE}, - {"-noreject", &noreject, NONE}, - {"-vpmark", &mark_visplanes, NONE}, - {"-markvp", &mark_visplanes, NONE}, - {"-factor", &factor, INT}, - {"-thold", &threshold, INT}, - {"-o", fnames+1, STRING}, - }; - int nf=0; - - while (--argc) - if (**++argv=='-') - { - int i=sizeof(tab)/sizeof(*tab); - for (;;) - if (!strcmp(*argv,tab[--i].option)) - { - if (tab[i].arg==INT) - if (--argc) - { - char *end; - *(int *) tab[i].var=strtol(*++argv,&end,0); - if (*end || factor<0) - usage(); - } - else - usage(); - else - if (tab[i].arg==STRING) - if (--argc) - *(char **) tab[i].var = *++argv; - else - usage(); - else - ++*(int *) tab[i].var; - break; - } - else - if (!i) - { - usage(); - break; - } - } - else -#ifdef MSDOS - if (nf<2) -#else - if (nf<1) -#endif - fnames[nf++]=*argv; - else - usage(); - - testwad = fnames[0]; /* Get input name*/ - - if (!testwad || factor<0 || threshold<0) - usage(); - - outwad = fnames[1] ? fnames[1] : "tmp.wad"; /* Get output name*/ -} - -/*- Main Program -----------------------------------------------------------*/ - -int main(int argc,char *argv[]) -{ - struct lumplist *lump,*l; - struct directory *newdirec; - - setbuf(stdout,NULL); -#ifndef MSDOS /* Unix: no whirling baton if stderr is redirected */ - if(!isatty(2)) - show_progress=0; -#endif - - puts("* Doom BSP node builder ver 2.3 (c) 1998 Colin Reed, Lee Killough *"); - printf("* This is the modified version that comes with Yadex %s. *\n", - YADEX_VERSION); - - parse_options(argc,argv); - - OpenWadFile(testwad); /* Opens and reads directory*/ - - printf("\nCreating nodes using tunable factor of %d\n",factor); - - if (visplane) - { - puts("\nTaking special measures to reduce the chances of visplane overflow"); - PickNode=PickNode_visplane; - } - - for (lump=lumplist; lump; lump=lump->next) - if (lump->islevel) - { - struct Seg *tsegs; - static struct Node *nodelist; - - current_level=lump->data; - strncpy(current_level_name,lump->dir->name,8); - printf("\nBuilding nodes on %-.8s\n\n",current_level_name); - - blockptrs=NULL; - blocklists=NULL; - blockptrs_size=0; - num_ssectors=0; - num_psegs=0; - num_nodes=0; - - GetThings(); - GetLinedefs(); /* Get linedefs and vertices*/ - GetVertexes(); /* and delete redundant.*/ - GetSidedefs(); - GetSectors(); - - tsegs = CreateSegs(); /* Initially create segs*/ - - FindLimits(tsegs); /* Find limits of vertices*/ - - mapminx = lminx; /* store as map limits*/ - mapmaxx = lmaxx; - mapminy = lminy; - mapmaxy = lmaxy; - - printf("Map goes from (%d,%d) to (%d,%d)\n",lminx,lminy,lmaxx,lmaxy); - - SectorHits = GetMemory(num_sects); - - nodelist = CreateNode(tsegs); /* recursively create nodes*/ - - fputs(" \n",stderr); - - printf("%lu NODES created, with %lu SSECTORS.\n",num_nodes,num_ssectors); - - printf("Found %lu used vertices\n",num_verts); - - printf("Heights of left and right subtrees = (%u,%u)\n", - height(nodelist->nextl), height(nodelist->nextr)); - - vertlmp->dir->length=num_verts * sizeof(struct Vertex); - vertlmp->data=vertices; - - add_lump("SEGS", psegs, sizeof(struct Pseg)*num_psegs); - - add_lump("SSECTORS", ssectors, sizeof(struct SSector)*num_ssectors); - - if (!FindDir("REJECT")) - { - long reject_size = (num_sects*num_sects+7)/8; - void *data = GetMemory(reject_size); - memset(data,0,reject_size); - add_lump("REJECT", data, reject_size); - } - - { - long blockmap_size = CreateBlockmap(); - char *data = GetMemory(blockmap_size+blockptrs_size+8); - memcpy(data,&blockhead,8); - memcpy(data+8,blockptrs,blockptrs_size); - memcpy(data+8+blockptrs_size,blocklists,blockmap_size); - free(blockptrs); - free(blocklists); - add_lump("BLOCKMAP",data,blockmap_size+blockptrs_size+8); - puts("Completed blockmap building"); - } - - if (visplane_warning || mark_visplanes) - warn_visplanes(nodelist); - - if (mark_visplanes) - add_lump("THINGS", things, sizeof(struct Thing)*num_things); - - pnodes = GetMemory(sizeof(struct Pnode)*num_nodes); - num_pnodes = 0; - pnode_indx = 0; - ReverseNodes(nodelist); - add_lump("NODES", pnodes, sizeof(struct Pnode)*num_pnodes); - - free(SectorHits); - - } /* if (lump->islevel) */ - - - { - long offs=12; - wad.num_entries=0; - for (lump=lumplist; lump; lump=lump->next) - { - lump->dir->start=offs; - offs+=lump->dir->length; - wad.num_entries++; - if (lump->islevel) - { - sortlump((struct lumplist **) &lump->data); - for (l=lump->data; l; l=l->next) - { - l->dir->start=offs; - offs+=l->dir->length; - wad.num_entries++; - } - } - } - - newdirec = GetMemory(wad.num_entries*sizeof(struct directory)); - - if (!(outfile=fopen(outwad,"wb"))) - { - fputs("Error: Could not open output PWAD file ",stderr); - perror(outwad); - exit(1); - } - - wad.dir_start=offs; - if (fwrite(&wad,1,12,outfile)!=12) - puts("Warning: Consistency check failure writing wad header"); - - for (offs=0,lump=lumplist; lump; lump=lump->next) - { - newdirec[offs++]=write_lump(lump); - if (lump->islevel) - for (l=lump->data; l; l=l->next) - newdirec[offs++]=write_lump(l); - } - - if (ftell(outfile)!=wad.dir_start || - fwrite(newdirec,sizeof(struct directory),wad.num_entries,outfile)!=wad.num_entries) - puts("Warning: Consistency check failure writing lump directory"); - fclose(outfile); - - if (offs!=wad.num_entries) - puts("Warning: Lump directory count consistency check failure"); - printf("\nSaved WAD as %s\n",outwad); - } - return 0; -} - -/*- end of file ------------------------------------------------------------*/ diff -uaNr yadex-1.5.2/bsp-2.3/bsp.h yadex-1.6.0/bsp-2.3/bsp.h --- yadex-1.5.2/bsp-2.3/bsp.h 1999-08-10 18:49:21.000000000 +0200 +++ yadex-1.6.0/bsp-2.3/bsp.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -/*- BSP.H ------------------------------------------------------------------*/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(MSDOS) || defined(__MSDOS__) -#include -#endif -#ifdef __TURBOC__ -#include -#endif -#ifndef MSDOS -#include /* Unix: isatty() */ -#endif - -/*- boolean constants ------------------------------------------------------*/ - -#define TRUE 1 -#define FALSE 0 - -/*- The function prototypes ------------------------------------------------*/ - -static void ProgError( char *, ...); -static void *GetMemory(size_t); -static void *ResizeMemory(void *, size_t); -static unsigned ComputeAngle(long,long); - -#undef max -#define max(a,b) (((a)>(b))?(a):(b)) - -/*- print a resource name by printing first 8 characters --*/ - -#define Printname(dir) printf("%-8.8s",(dir)->name) - -/*------------------------------- end of file ------------------------------*/ diff -uaNr yadex-1.5.2/bsp-2.3/bsp23x.txt yadex-1.6.0/bsp-2.3/bsp23x.txt --- yadex-1.5.2/bsp-2.3/bsp23x.txt 1998-12-19 13:18:16.000000000 +0100 +++ yadex-1.6.0/bsp-2.3/bsp23x.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,190 +0,0 @@ -This is BSP version 2.3 dos extended, written by Colin Reed, Lee Killough - -Please send all comments and/or questions about BSP to Lee Killough -(killough@rsn.hp.com). - ------------------------------------------------------------ -Changes in 2.3x: - -Lee Killough 2/98: - -Fixed a minor bug which caused textures to bleed sometimes. -Thanks to Jonathan Campbell (joncamp@tiac.net) for finding it. - -Switched from djgpp v1.12 to v2.01. - -Linux builds now supported (thanks to Andre Majorel for the port). - -Possible future enhancement: - ->64K blockmap support (requires changes in Doom source code as well). - ------------------------------------------------------------ -Changes in 2.2x: - -Lee Killough 10/97: - -Added -vp option to reduce the chances of visplane overflows, without loss -of detail. Using -vp causes node line picker to choose node lines in a way -that is empirically known to reduce or eliminate visplane overflows (see -visplane.txt). No guarantees, though!!! - -Added -vpwarn option to warn about possible visplane overflows (see -visplane.txt). - --vpmark option also added, which leaves permanent marks in the form of player -1 starts. It's a good idea to write to a separate output file when using this -option!!! You can then use an editor, play each alternate player start, and -see if each one causes visplane overflows, and then remove it. Usually no- -clipping must be used, at least to step out from the wall, since it inserts -player starts without regard to collisions, and it uses walls as a basis for -visplane calculations. - -Added -noreject option, to allow building nodes without messing up an -already-built reject map. - -Added -thold option to change the visplane threshold. May be used to report -more potential visplane overflows if the -vpwarn or -vpmark approximations -estimate too few visplanes. Default threshold is 128. - -Changed the way level markers in the lump directory are handled, to -accomodate DCK3.61, EdMap, and perhaps other editors. Some editors, such -as DCK3.61, do not always set the length field in a level marker to 0, and -EdMap requires that the offset field in a level marker be equal to the -offset of the first resource. - ------------------------------------------------------------ -Changes in 2.1x: - -Lee Killough 06/97 - -Fixed design bug which caused invisible barriers or disappearing Things. -Problem was in how segs incident to a partitioning node line were -partitioned -- they were partitioned according to sidedef, rather than -vertex, orientation w.r.t. the node line. Flipping the affected seg's -linedef usually fixed the problem. Now an incident seg is properly -partitioned either on the left or right side of a node line depending -on whether the two segs are in the same direction or not, not whether -they are both flipped or not. - -Added special effects features: - -If a linedef has a sector tag >= 900, then it is treated as "precious" -and will not be split unless absolutely necessary. This is good to use -around borders of deep water, invisible stairs, etc. - -Furthermore, just for grins, if the linedef's tag is 999, then the sidedefs' -x-offsets set an angle adjustment in degrees to be applied -- you can look -straight at a wall, but it might come right at you on both sides and -"stretch". - ------------------------------------------------------------ - -New to 2.0x: - -Multilevel support!!! Automatically builds all levels in wad. - -Does not strip textures or other lumps from wads anymore!!! - -Supports HOM-free transparent doors: - - Simply make the sector referenced by the doortracks have a - sector tag of >= 900. No need to remember sector numbers - and type them in on a command line -- just use any sector - tag >= 900 to permanently mark the sector special. - - See TRANSDOR.WAD for an example of sector tags in the 900's - being used to create HOM-free transparent door effects. - ------------------------------------------------------------ - -Changes from 1.4x to 1.5x: - -Replaced GO32.EXE with newer version, to support Windows -and DPMI. - ------------------------------------------------------------ - -Changes from 1.3x to 1.4x: - -Lee Killough: - -Fixed bug which caused BSP to "do nothing" on systems where -GO32.EXE was not in the user's path. - -Added -factor option to allow changing the heuristic used by the -node picker. Factor can be any positive integer, and the larger -the factor, the more costly seg splits are. A factor of 17 is the -default and behaves just like earlier versions of BSP. Changing the -factor can sometimes prevent visplane overflows in wads. But then -again, some wads have just too many visible 2s linedefs for the -node builder to make a difference. If you have visplane overflows, -experiment with the -factor option before giving up. - ------------------------------------------------------------ - -Changes from 1.2x to 1.3x: - -New version due to performance enhancements by Lee Killough -(killough@rsn.hp.com). - -Runs at least 3 times as fast as before, due to changes in PickNode. -Same results are obtained, but with greater speed. Differences from -1.2x: - - PickNode() rewritten to maximize performance. New PickNode() - algorithm features pruning strategy which allows inner loop - to exit as soon as a seg is detected as being worse than the - best so far. - - All floating-point arithmetic inside inner loop has been eliminated. - - GetVertexes() changed and Reference() removed, replaced with a - faster vertex renumbering algorithm which also removes lines of - length zero. - - IsLineDefInside() tuned by eliminating bit mask variable. - - Functions are static, to reduce code size by permitting total - inlining. - - Various other minor performance enhancements - ------------------------------------------------------------ - -Changes from 1.1 to 1.2x: - -New version 1.2 due to bug found by Mark Harrison that caused some -problems with flipped segs having their textures buggered up. - -The GO32 dos extender has been pre-pended to the executable. - ------------------------------------------------------------ - -This builds a BSP node tree for your DOOM wad files. - -Usage: - -BSP [-factor nnn] [] - -If no output file is specified 'tmp.wad' is written. - ------------------------------------------------------------ - -This ZIP includes the fullly commented source code for all you -Doom editor/utility writers out there. - ------------------------------------------------------------ - -A known problem is a conflict between the GO32 dos extender -and QEMM's DPMI... put 'set GO32=nodpmi' in your autoexec.bat -to avoid problems. - ------------------------------------------------------------ - -Future enhancements (possibly, depending on demand): - -* Ability to specify level(s) to build separately - -* Reject map build - diff -uaNr yadex-1.5.2/bsp-2.3/funcs.c yadex-1.6.0/bsp-2.3/funcs.c --- yadex-1.5.2/bsp-2.3/funcs.c 1998-12-19 13:18:16.000000000 +0100 +++ yadex-1.6.0/bsp-2.3/funcs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -/*- FUNCS.C ----------------------------------------------------------------*/ -/*- terminate the program reporting an error -------------------------------*/ - -static void ProgError( char *errstr, ...) -{ - va_list args; - - va_start( args, errstr); - fprintf(stderr, "\nProgram Error: *** "); - vfprintf( stderr, errstr, args); - fprintf(stderr, " ***\n"); - va_end( args); - exit( 5); -} - -/*- allocate memory with error checking ------------------------------------*/ - -static __inline__ void *GetMemory( size_t size) -{ - void *ret = malloc( size); - if (!ret) - ProgError( "out of memory (cannot allocate %u bytes)", size); - return ret; -} - -/*- reallocate memory with error checking ----------------------------------*/ - -static __inline__ void *ResizeMemory( void *old, size_t size) -{ - void *ret = realloc( old, size); - if (!ret) - ProgError( "out of memory (cannot reallocate %u bytes)", size); - return ret; -} - - -/*--------------------------------------------------------------------------*/ - diff -uaNr yadex-1.5.2/bsp-2.3/makenode.c yadex-1.6.0/bsp-2.3/makenode.c --- yadex-1.5.2/bsp-2.3/makenode.c 1999-11-23 22:22:22.000000000 +0100 +++ yadex-1.6.0/bsp-2.3/makenode.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,469 +0,0 @@ -/*- MAKENODE.C --------------------------------------------------------------* - Recursively create nodes and return the pointers. -*---------------------------------------------------------------------------*/ - -/*---------------------------------------------------------------------------* - Split a list of segs (ts) into two using the method described at bottom of - file, this was taken from OBJECTS.C in the DEU5beta source. - - This is done by scanning all of the segs and finding the one that does - the least splitting and has the least difference in numbers of segs on either - side. - If the ones on the left side make a SSector, then create another SSector - else put the segs into lefts list. - If the ones on the right side make a SSector, then create another SSector - else put the segs into rights list. -*---------------------------------------------------------------------------*/ - -static int DivideSegs(struct Seg *ts,struct Seg *best,struct Seg **rs,struct Seg **ls) -{ - struct Seg *rights=NULL,*lefts=NULL; - struct Seg *tmps,*news,*prev; - struct Seg *add_to_rs,*add_to_ls; - struct Seg *new_best=NULL,*new_rs,*new_ls; - struct Seg *strights=NULL,*stlefts=NULL; - - *rs=*ls=NULL; - -/* - printf("Picked linedef %d (%d,%d) (%d) as node line\n", - best->linedef, best->start, best->end, best->flip); -*/ - -/* When we get to here, best is a pointer to the partition seg. - Using this partition line, we must split any lines that are intersected - into a left and right half, flagging them to be put their respective sides - Ok, now we have the best line to use as a partitioning line, we must - split all of the segs into two lists (rightside & leftside). */ - - for(tmps=ts;tmps;tmps=tmps->next) - { - long a = best->pdy * tmps->psx - best->pdx * tmps->psy + best->ptmp; - long b = best->pdy * tmps->pex - best->pdx * tmps->pey + best->ptmp; - - if ((a^b) < 0) - if (a && b) - { /* Seg is split */ - double ds = (double) a / (a-b); /* 0 = start, 1 = end */ - int x = tmps->psx + tmps->pdx * ds + 0.5; - int y = tmps->psy + tmps->pdy * ds + 0.5; - - if (x==tmps->psx && y==tmps->psy) - { - if (b<0) - goto leftside; - else - goto rightside; - } - - if (x==tmps->pex && y==tmps->pey) - { - if (a<0) - goto leftside; - else - goto rightside; - } - -/* printf("Splitting Linedef %d at %d,%d\n",tmps->linedef,x,y); */ - - vertices = ResizeMemory(vertices, sizeof(struct Vertex) * (num_verts+1)); - - vertices[num_verts].x = x; - vertices[num_verts].y = y; - news = GetMemory(sizeof( struct Seg)); - - *news = *tmps; - tmps->next = news; - news->start = num_verts; - tmps->end = num_verts; - - news->pdx = (long) (news->pex = vertices[news->end].x) - - (news->psx = x); - news->pdy = (long) (news->pey = vertices[news->end].y) - - (news->psy = y); - news->ptmp = news->pdx*news->psy - news->psx*news->pdy; - news->len = (long) sqrt((double) news->pdx*news->pdx + - (double) news->pdy*news->pdy); - - tmps->pdx = (long) (tmps->pex = x) - - (tmps->psx = vertices[tmps->start].x); - tmps->pdy = (long) (tmps->pey = y) - - (tmps->psy = vertices[tmps->start].y); - tmps->ptmp = tmps->pdx*tmps->psy - tmps->psx*tmps->pdy; - tmps->len = (long) sqrt((double) tmps->pdx*tmps->pdx + - (double) tmps->pdy*tmps->pdy); - - { - long dx,dy; - if (news->flip) - { - dx = vertices[linedefs[news->linedef].end].x; - dy = vertices[linedefs[news->linedef].end].y; - } - else - { - dx = vertices[linedefs[news->linedef].start].x; - dy = vertices[linedefs[news->linedef].start].y; - } - dx -= news->psx; - dy -= news->psy; - news->dist = (int)(sqrt((double) dx*dx + (double) dy*dy)); - } - -/* printf("splitting dist = %d\n",news->dist);*/ -/* printf("splitting vertices = %d,%d,%d,%d\n",tmps->start,tmps->end,news->start,news->end);*/ - - if (a<0) - { - add_to_rs=news; - add_to_ls=tmps; - } - else - { - add_to_ls=news; - add_to_rs=tmps; - } - tmps = news; - num_verts++; - } - else - goto leftside; - else - if (a<=0 && (a || (!b && tmps->pdx*best->pdx+tmps->pdy*best->pdy < 0 ))) - { - leftside: - add_to_ls=tmps; /* Seg is on left side */ - add_to_rs=NULL; - } - else - { - rightside: - add_to_rs=tmps; /* Seg is on right side */ - add_to_ls=NULL; - } - - if (add_to_rs) /* CHECK IF SHOULD ADD RIGHT ONE */ - { -/* - printf("Adding linedef %d (%d,%d) (%d) to right side\n", - add_to_rs->linedef, add_to_rs->start, add_to_rs->end, - add_to_rs->flip); -*/ - new_rs = GetMemory(sizeof(struct Seg)); - if (add_to_rs == best) - new_best = new_rs; - *new_rs = *add_to_rs; - new_rs->next = NULL; - if (!rights) - strights = rights = new_rs; - else - { - rights->next = new_rs; - rights = new_rs; - } - } - - if (add_to_ls) /* CHECK IF SHOULD ADD LEFT ONE */ - { -/* - printf("Adding linedef %d (%d,%d) (%d) to left side\n", - add_to_ls->linedef, add_to_ls->start, add_to_ls->end, - add_to_ls->flip); -*/ - new_ls = GetMemory(sizeof(struct Seg)); - if (add_to_ls == best) - new_best = new_ls; - *new_ls = *add_to_ls; - new_ls->next = NULL; - if (!lefts) - stlefts = lefts = new_ls; - else - { - lefts->next = new_ls; - lefts = new_ls; - } - } - } - - if(strights == NULL) - { -/* printf("No right side, moving partition into right side\n"); */ - strights = rights = new_best; - prev = NULL; - for(tmps=stlefts;tmps;tmps=tmps->next) - { - if(tmps == new_best) - { - if(prev != NULL) prev->next=tmps->next; - else stlefts=tmps->next; - } - prev=tmps; - } - prev->next = NULL; - } - - if(stlefts == NULL) - { -/* printf("No left side, moving partition into left side\n"); */ - stlefts = lefts = new_best; - prev = NULL; - for(tmps=strights;tmps;tmps=tmps->next) - { - if(tmps == new_best) - { - if(prev != NULL) prev->next=tmps->next; - else strights=tmps->next; - } - prev=tmps; - } - stlefts->next = NULL; - prev->next = NULL; /* Make sure end of list = NULL*/ - } - - rights->next = NULL; - lefts->next = NULL; - - *rs = strights; - *ls = stlefts; - return 0; -} - -/*--------------------------------------------------------------------------*/ - -static int IsItConvex(const struct Seg *ts) -{ - const struct Seg *line; - register const struct Seg *check; - int sector; - - for (line=ts; line; line=line->next) - if (linedefs[line->linedef].tag >= 900 && - linedefs[line->linedef].flags & 4 && - sidedefs[linedefs[line->linedef].sidedef1].sector== - sidedefs[linedefs[line->linedef].sidedef2].sector) - for (check=line->next;check;check=check->next) - if (check->linedef==line->linedef && check->flip!=line->flip) - return FALSE; - - /* All ssectors must come from same sector unless it's marked - "special" with sector tag >= 900. Original idea, Lee Killough */ - - for (check=ts; check; check=check->next) - if (linedefs[check->linedef].tag < 900 && - sectors[sector=check->sector].tag < 900) - { - while ((check=check->next)!=NULL) - if (check->sector != sector && - sectors[check->sector].tag < 900 && - linedefs[check->linedef].tag < 900 ) - return FALSE; - break; - } - - /* all of the segs must be < 180 degrees apart */ - - for (line=ts;line;line=line->next) - for (check=ts;check;check=check->next) /* Check partition against all Segs*/ - { /* get state of lines' relation to each other */ - long a = line->pdy * check->psx - line->pdx * check->psy + line->ptmp; - long b = line->pdy * check->pex - line->pdx * check->pey + line->ptmp; - - if ((a^b)>=0 ? a<0 || b<0 || (!a && !b && check->pdx*line->pdx + - check->pdy*line->pdy < 0 && - (check->linedef != line->linedef || - !(linedefs[line->linedef].flags & 4) || - linedefs[line->linedef].sidedef1==-1 || - *sidedefs[linedefs[line->linedef].sidedef1].tex3-'-' || - linedefs[line->linedef].sidedef2==-1 || - *sidedefs[linedefs[line->linedef].sidedef2].tex3-'-' - ) - ) - : (b<0 || check->len*a/(a-b)>=2) && (a<0 || check->len*b/(b-a)>=2)) - return FALSE; - } - /* no need to split the list: these Segs can be put in a SSector */ - return TRUE; -} - -/*--------------------------------------------------------------------------*/ - -static int CreateSSector(struct Seg *tmps) -{ - int n=0; - struct Seg *ts; - - for (ts=tmps;ts;ts=ts->next) - n++; - - ssectors = num_ssectors ? ResizeMemory(ssectors,sizeof(struct SSector)*(num_ssectors+1)) - : GetMemory(sizeof(struct SSector)); - - ssectors[num_ssectors].num = n; - - ssectors[num_ssectors].first = num_psegs; - - psegs = num_psegs ? ResizeMemory(psegs,sizeof(struct Pseg)*(num_psegs+n)) - : GetMemory(sizeof(struct Pseg)*n); - - for (;tmps;tmps=tmps->next) - { - psegs[num_psegs].start = tmps->start; - psegs[num_psegs].end = tmps->end; - psegs[num_psegs].angle = tmps->angle; - psegs[num_psegs].linedef = tmps->linedef; - psegs[num_psegs].flip = tmps->flip; - psegs[num_psegs++].dist = tmps->dist; - } - - return num_ssectors++; -} - -/*- translate (dx, dy) into an integer angle value (0-65535) ---------------*/ - -static unsigned ComputeAngle(long dx, long dy) -{ - double w = atan2( (double) dy , (double) dx ) * (32768.0/M_PI); - if (w<0) w+=65536.0; - return (unsigned) w; -} - -static void DelSegs(struct Seg *ts) -{ - while (ts) - { - struct Seg *t=ts->next; - free(ts); - ts=t; - } -} - -static unsigned height(const struct Node *tn) -{ - if (tn) - { - unsigned l=height(tn->nextl),r=height(tn->nextr); - return l>r ? l+1 : r+1; - } - return 1; -} - -static struct Node *CreateNode(struct Seg *ts) -{ - struct Node node, *tn=&node; - struct Seg *rights,*lefts,*best; - - best = PickNode(ts); /* Pick best node to use.*/ - - if (!best) /* Failsafe measure */ - best=ts; - - DivideSegs(ts,best,&rights,&lefts); - - if (!rights || !lefts) /* Failsafe measure */ - return NULL; - - FindLimits(lefts); /* Find limits of vertices */ - tn->maxy2 = lmaxy; - tn->miny2 = lminy; - tn->minx2 = lminx; - tn->maxx2 = lmaxx; - - tn->nextl = IsItConvex(lefts) ? NULL : CreateNode(lefts); - - FindLimits(rights); /* Find limits of vertices*/ - tn->maxy1 = lmaxy; - tn->miny1 = lminy; - tn->minx1 = lminx; - tn->maxx1 = lmaxx; - - tn->nextr = IsItConvex(rights) ? NULL : CreateNode(rights); - - if (!tn->nextl) - tn->chleft = CreateSSector(lefts); - - if (!tn->nextr) - tn->chright = CreateSSector(rights); - - tn->x = best->psx; - tn->y = best->psy; - tn->dx = best->pdx; - tn->dy = best->pdy; - - tn->ptmp=tn->dx*tn->y-tn->dy*tn->x; - - DelSegs(ts); - - num_nodes++; - tn = GetMemory(sizeof(*tn)); /* Create a node*/ - *tn = node; - return tn; -} - -/* - * $Log: makenode.c,v $ - * Revision 1.2 1999/06/21 14:40:26 cphipps - * Make rounding better in DivideSegs() - * Fix logic errors in IsItConvex: - * - Even if both ends of a seg are the same side of a possible dividing seg, - * we must check that both are not on the wrong side still (one could be on the - * line) - * - Even if a split would be near the end of a line, the other end must be on - * the right side still - * - */ - -/*---------------------------------------------------------------------------* - - This message has been taken, complete, from OBJECTS.C in DEU5beta source. - It outlines the method used here to pick the nodelines. - - IF YOU ARE WRITING A DOOM EDITOR, PLEASE READ THIS: - - I spent a lot of time writing the Nodes builder. There are some bugs in - it, but most of the code is OK. If you steal any ideas from this program, - put a prominent message in your own editor to make it CLEAR that some - original ideas were taken from DEU. Thanks. - - While everyone was talking about LineDefs, I had the idea of taking only - the Segs into account, and creating the Segs directly from the SideDefs. - Also, dividing the list of Segs in two after each call to CreateNodes makes - the algorithm faster. I use several other tricks, such as looking at the - two ends of a Seg to see on which side of the nodeline it lies or if it - should be split in two. I took me a lot of time and efforts to do this. - - I give this algorithm to whoever wants to use it, but with this condition: - if your program uses some of the ideas from DEU or the whole algorithm, you - MUST tell it to the user. And if you post a message with all or parts of - this algorithm in it, please post this notice also. I don't want to speak - legalese; I hope that you understand me... I kindly give the sources of my - program to you: please be kind with me... - - If you need more information about this, here is my E-mail address: - Raphael.Quinet@eed.ericsson.se (Raphal Quinet). - - Short description of the algorithm: - 1 - Create one Seg for each SideDef: pick each LineDef in turn. If it - has a "first" SideDef, then create a normal Seg. If it has a - "second" SideDef, then create a flipped Seg. - 2 - Call CreateNodes with the current list of Segs. The list of Segs is - the only argument to CreateNodes. - 3 - Save the Nodes, Segs and SSectors to disk. Start with the leaves of - the Nodes tree and continue up to the root (last Node). - - CreateNodes does the following: - 1 - Pick a nodeline amongst the Segs (minimize the number of splits and - keep the tree as balanced as possible). - 2 - Move all Segs on the right of the nodeline in a list (segs1) and do - the same for all Segs on the left of the nodeline (in segs2). - 3 - If the first list (segs1) contains references to more than one - Sector or if the angle between two adjacent Segs is greater than - 180, then call CreateNodes with this (smaller) list. Else, create - a SubSector with all these Segs. - 4 - Do the same for the second list (segs2). - 5 - Return the new node (its two children are already OK). - - Each time CreateSSector is called, the Segs are put in a global list. - When there is no more Seg in CreateNodes' list, then they are all in the - global list and ready to be saved to disk. - -*---------------------------------------------------------------------------*/ diff -uaNr yadex-1.5.2/bsp-2.3/picknode.c yadex-1.6.0/bsp-2.3/picknode.c --- yadex-1.5.2/bsp-2.3/picknode.c 1999-11-23 22:24:32.000000000 +0100 +++ yadex-1.6.0/bsp-2.3/picknode.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1216 +0,0 @@ -/*- PICKNODE.C --------------------------------------------------------------* - To be able to divide the nodes down, this routine must decide which is the - best Seg to use as a nodeline. It does this by selecting the line with least - splits and has least difference of Segs on either side of it. - - Credit to Raphael Quinet and DEU, this routine is a copy of the nodeline - picker used in DEU5beta. I am using this method because the method I - originally used was not so good. - - Rewritten by Lee Killough to significantly improve performance, while - not affecting results one bit in >99% of cases (some tiny differences - due to roundoff error may occur, but they are insignificant). -*---------------------------------------------------------------------------*/ - -#define FACTOR 8 /* This is the original "factor" used by previous versions - of the code -- it must be maintained in a macro to avoid - mistakes if we are to keep the tradition of using it, - and being able to modify it. - */ - -static int factor=2*FACTOR+1; - -static struct Seg *PickNode_traditional(struct Seg *ts) -{ - struct Seg *best=NULL; - long bestcost=LONG_MAX; - struct Seg *part; - int cnt=0; - - for (part=ts;part;part=part->next) /* Count once and for all */ - cnt++; - - for (part=ts;part;part = part->next) /* Use each Seg as partition*/ - { - struct Seg *check; - long cost=0,tot=0,diff=cnt; - - progress(); /* Something for the user to look at.*/ - - for (check=ts;check;check=check->next) /* Check partition against all Segs*/ - { /* get state of lines' relation to each other */ - long a = part->pdy * check->psx - part->pdx * check->psy + part->ptmp; - long b = part->pdy * check->pex - part->pdx * check->pey + part->ptmp; - if ((a^b) < 0) - if (a && b) - { /* Line is split; a,b nonzero, opposite sign */ - long l=check->len; - long d=(l*a)/(a-b); /* Distance from start of intersection */ - if (d>=2) - { - /* If the linedef associated with this seg has a sector tag >= 900, - treat it as precious; i.e. don't split it unless all other options - are exhausted. This is used to protect deep water and invisible - lifts/stairs from being messed up accidentally by splits. */ - - if (linedefs[check->linedef].tag >= 900) - cost += factor*64; - - cost += factor; - - if (cost > bestcost) /* This is the heart of my pruning idea - */ - goto prune; /* it catches bad segs early on. Killough */ - - tot++; - } - else - if (l-d<2 ? check->pdx*part->pdx+check->pdy*part->pdy<0 : b<0) - goto leftside; - } - else - goto leftside; - else - if (a<=0 && (a || (!b && check->pdx*part->pdx+check->pdy*part->pdy<0))) - { - leftside: - diff-=2; - } - } - - if ((diff-=tot) < 0) /* Take absolute value. diff is being used to obtain the */ - diff= -diff; /* min/max values by way of: min(a,b)=(a+b-abs(a-b))/2 */ - - /* Make sure at least one Seg is on each side of the partition*/ - - if (tot+cnt > diff && (cost+=diff) < bestcost) - { /* We have a new better choice */ - bestcost = cost; - best = part; /* Remember which Seg*/ - } - prune:; /* Early exit and skip past the tests above */ - } - return best; /* All finished, return best Seg*/ -} - - -/* Lee Killough 06/1997: - - The chances of visplane overflows can be reduced by attemping to - balance the number of distinct sector references (as opposed to - SEGS) that are on each side of the node line, and by rejecting - node lines that cut across wide open space, as measured by the - proportion of the node line which is incident with segs, inside - the bounding box. - - Node lines which are extensions of linedefs whose vertices are - on the boundary of the bounding box, are therefore preferable, - as long as the number of sectors referenced on either side is - not too unbalanced. - - Contrary to what many say, visplane overflows are not simply - caused by too many sidedefs, linedefs, light levels, etc. All - of those factors are correlated with visplane overflows, but - most importantly, so is how the node builder selects node - lines. The number of visible changes in flats is the main - cause of visplane overflows, with visible changes not being - counted if only invisible regions separate the visible areas. -*/ - -static struct Seg *PickNode_visplane(struct Seg *ts) -{ - struct Seg *best=NULL; - long bestcost=LONG_MAX; - struct Seg *part; - int cnt=0; - - for (part=ts;part;part=part->next) /* Count once and for all */ - cnt++; - - FindLimits(ts); - - for (part=ts;part;part=part->next) /* Use each Seg as partition*/ - { - struct Seg *check; - long cost=0,slen=0; - int tot=0,diff=cnt; - memset(SectorHits,0,num_sects); - progress(); /* Something for the user to look at.*/ - - for (check=ts;check;check=check->next) /* Check partition against all Segs*/ - { - /* get state of lines' relation to each other */ - long a = part->pdy * check->psx - part->pdx * check->psy + part->ptmp; - long b = part->pdy * check->pex - part->pdx * check->pey + part->ptmp; - unsigned char mask=2; - - if ((a^b) < 0) - if (a && b) - { /* Line is split; a,b nonzero, opposite sign */ - long l=check->len; - long d=(l*a)/(a-b); /* Distance from start of intersection */ - if (d>=2) - { - /* If the linedef associated with this seg has a sector tag >= 900, - treat it as precious; i.e. don't split it unless all other options - are exhausted. This is used to protect deep water and invisible - lifts/stairs from being messed up accidentally by splits. */ - - if (linedefs[check->linedef].tag >= 900) - cost += factor*64; - - cost += factor; - - if (cost > bestcost) /* This is the heart of my pruning idea - */ - goto prune; /* it catches bad segs early on. Killough */ - - tot++; /* Seg is clearly split */ - mask=4; - } - else /* Distance from start < 2; check distance from end */ - if (l-d<2 ? check->pdx*part->pdx+check->pdy*part->pdy<0 : b<0) - goto leftside; - } - else - goto leftside; - else - if (a<=0 && (a || (!b && (slen+=check->len, - check->pdx*part->pdx+check->pdy*part->pdy<0)))) - { - leftside: - diff-=2; - mask=1; - } - SectorHits[check->sector] |= mask; - } - - if ((diff-=tot) < 0) /* Take absolute value. diff is being used to obtain the */ - diff= -diff; /* min/max values by way of: min(a,b)=(a+b-abs(a-b))/2 */ - - /* Make sure at least one Seg is on each side of the partition*/ - - if (tot+cnt <= diff) - continue; - - /* Compute difference in number of sector - references on each side of node line */ - - for (diff=tot=0;tot= bestcost) - continue; - - /* If the node line is incident with SEGS in less than 1/2th of its - length inside the bounding box, increase the cost since this is - likely a node line cutting across a large room but only sharing - space with a tiny SEG in the middle -- this is another contributor - to visplane overflows. */ - - { - long l; - if (!part->pdx) - l=lmaxy-lminy; - else - if (!part->pdy) - l=lmaxx-lminx; - else - { - double t1=(part->psx-lmaxx)/(double) part->pdx; - double t2=(part->psx-lminx)/(double) part->pdx; - double t3=(part->psy-lmaxy)/(double) part->pdy; - double t4=(part->psy-lminy)/(double) part->pdy; - if (part->pdx>0) - { - double t=t1; - t1=t2; - t2=t; - } - if (part->pdy>0) - { - double t=t3; - t3=t4; - t4=t; - } - l=((t1 > t3 ? t3 : t1) - (t2 < t4 ? t4 : t2))*part->len; - } - if (slen < l && (cost+=factor) >= bestcost) - continue; - } - - /* We have a new better choice */ - - bestcost = cost; - best = part; /* Remember which Seg*/ - prune:; /* Early exit and skip past the tests above */ - } - return best; /* All finished, return best Seg*/ -} - -struct halfplane { - long pdx,pdy,ptmp; -}; - -struct triangle { - long pdx1,pdy1,ptmp1; - long pdx2,pdy2,ptmp2; - long pdx3,pdy3,ptmp3; -}; - -struct polygon { - struct triangle tri; - long pdx1,pdy1,pdz1,ptmp1; - long pdx2,pdy2,pdz2,ptmp2; -}; - -struct view { - long pdx,pdy,ptmp; /* Used for 90 degree vertical view */ - double distr; - long x,y,z; /* Position */ - unsigned angle; /* Angle 0-65535 */ - const struct Pseg *ps; /* Seg the player is looking from */ - int sector; /* Sector player is in */ - void (*func)(int, struct view *); /* Function used in BSP traversal */ - int polarity; /* 1=back-to-front, 0=front-to-back traversal */ - struct triangle *poly; /* Polygon limiting all visible areas */ - int num_poly,num_poly_alloc; - struct halfplane *convex_hull; /* Convex hull limiting all visible areas */ - int num_convex_hull,num_convex_hull_alloc; - struct polygon *poly_3d; /* Polygon limiting floors & ceilings */ - int num_poly_3d,num_poly_3d_alloc; - unsigned char *hitlist; /* Used in searching algorithms */ - int visplanes; /* Visplane count */ - int max_visplanes,max_visplanes_linedef,max_visplanes_sector; - int start_markers; -}; - -static struct sector_limit { - struct { - long min,max; - short moves; - } floorh,ceilh; -} *sector_limits; - -static int light_changes(int type) -{ - return (type>=1 && type<=4) || type==8 || type==12 || type==13 || type==17; -} - -/* Whether two sectors' lighting is similar. - - Note: I've observed that even though lighting can only - be seen in multiples of 8, visplane overflows can be - caused by any difference in lighting, even if it's not - visible. killough */ - -static int lighting_similar(const struct Sector *s1, const struct Sector *s2) -{ - return - s1==s2 || - ( /* If initial lighting same, and tags are same */ - s1->light==s2->light && s1->tag==s2->tag - && - ( /* And both are the same synchronized lighting */ - (s1->special==s2->special && (s1->special==12 || s1->special==13)) - || /* Or neither one changes in lighting based on sector type */ - (!light_changes(s1->special) && !light_changes(s2->special)) - ) - ) - ; -} - -static int floor_similar(const struct Sector *s1, const struct Sector *s2) -{ - return s1==s2 || - (!strncmp(s1->floort,s2->floort,8) && (!strncmp(s1->floort,"F_SKY1",8) || - (s1->floorh==s2->floorh && (s1->tag==s2->tag || - (!sector_limits[s1-sectors].floorh.moves && - !sector_limits[s2-sectors].floorh.moves ))))); -} - -static int ceil_similar(const struct Sector *s1, const struct Sector *s2) -{ - return s1==s2 || - (!strncmp(s1->ceilt,s2->ceilt,8) && (!strncmp(s1->ceilt,"F_SKY1",8) || - (s1->ceilh==s2->ceilh && (s1->tag==s2->tag || - (!sector_limits[s1-sectors].ceilh.moves && - !sector_limits[s2-sectors].ceilh.moves ))))); -} - -/* Find blocking linedefs and create polygons representing view. - - This is perhaps the most important function. For each ssector - whose bounding box is contained within the convex hull of the - visibilty region, all segs in the ssector are examined and - any segs that face the viewer have their linedefs analyzed - for visibility-blocking properties. - - 4 structures are maintained for the view: - - A 2-d convex hull of the visible region - A set of 2-d triangles for 1s linedefs blocking visibility - A set of halfplanes for 2s linedefs blocking visibility - Two 3-d halfplanes limiting the player's vertical visibility - - Having these separate structures allows greater - optimization due to the 2-d nature of Doom. -*/ - -static void add_blocking_linedefs(int ss, struct view *v) -{ - const struct Pseg *ps=psegs+ssectors[ss].first; - int num; - - /* Go through every seg in the ssector and if the seg is facing - at all towards the player, and if its associated linedef has - not been seen before, process the linedef for its effect on - the view. - - This is more complicated, but faster, than going through all - linedefs once, since it allows us to skip entire ssectors and - nodes which are not in the player's view. - */ - - for (num=ssectors[ss].num;num--;ps++) - if (!v->hitlist[ps->linedef]) - { - const struct LineDef *l = ps->linedef+linedefs; - long psx=vertices[ps->flip ? l->end : l->start].x; - long psy=vertices[ps->flip ? l->end : l->start].y; - long pex=vertices[ps->flip ? l->start : l->end].x; - long pey=vertices[ps->flip ? l->start : l->end].y; - long pdx=pex-psx,pdy=pey-psy; - - if ((psx-v->x)*pdy < (psy-v->y)*pdx) - { /* Only consider segs facing towards player */ - struct triangle *tri; - - v->hitlist[ps->linedef]=1; /* Mark linedef as having been seen */ - - /* If a linedef does not have the 2s flag set, then regardless of - whether it has a second sidedef, it cannot be seen through. It - may be shot through with projectiles (rockets, plasma, monster - fire), but not bullets. Monsters cannot see through it either, - and will not intentionally attack through it, although they can - walk and hear through it, and fire through it if they fire at a - thing they can see which is in the same direction. killough */ - - if (!(l->flags & 4)) - { - struct halfplane *ch; - int num,start_is_out; - -onesided: - num=v->num_convex_hull; - start_is_out=0; - ch=v->convex_hull; - - /* If the starting and ending vertices are both outside any single - halfplane, ignore the line completely. */ - - do - if (ch->pdx*psy - ch->pdy*psx > ch->ptmp) /* Start */ - { - if (ch->pdx*pey - ch->pdy*pex > ch->ptmp) /* End */ - goto skip; - else - start_is_out=1; /* Mark starting vertex as outside */ - } - while (ch++,--num); - - /* If the starting and vertices are both outside of the convex hull, - but are not both outside of any single halfplane, then add the - line to the convex hull. */ - - if (start_is_out) - { /* Starting vertex is outside convex hull; check ending vertex */ - ch=v->convex_hull; - num=v->num_convex_hull; - do /* If ending vertex is outside of convex hull */ - if (ch->pdx*pey - ch->pdy*pex > ch->ptmp) - { /* Add the line to convex hull */ - - /* Add the extension of the linedef to the convex hull. - If it is totally outside of the convex hull, it has - no effect since the viewer is always inside its - halfplane. If it cuts across the convex hull, then - it restricts the visible area some more. */ - - if (v->num_convex_hull >= v->num_convex_hull_alloc) - v->convex_hull = ResizeMemory(v->convex_hull, - (v->num_convex_hull_alloc*=2)*sizeof(*v->convex_hull)); - ch=v->convex_hull+v->num_convex_hull++; - ch->ptmp=(ch->pdx=pdx)*psy-(ch->pdy=pdy)*psx; - goto skip; /* Skip to next seg */ - } - while (ch++,--num); - } - - /* At least one vertex is inside convex hull; add - triangle between viewer and linedef to polygon - (eye clipping could be used, to remove parts of - the triangle that have no effect, but I prefer - to stay simple). */ - - if (v->num_poly >= v->num_poly_alloc) - v->poly = ResizeMemory(v->poly, - (v->num_poly_alloc=v->num_poly_alloc*2+2)* - sizeof(*v->poly)); - tri = v->poly+v->num_poly++; - } - else /* Line is 2s, possibly see-through depending on sector heights */ - { - int s1 = sidedefs[ps->flip ? l->sidedef2 : l->sidedef1].sector; /* front */ - int s2 = sidedefs[ps->flip ? l->sidedef1 : l->sidedef2].sector; /* back */ - const long *lower_blocks=NULL, *upper_blocks=NULL; - - if (s1==s2) /* Skip linedefs with the same sector on both sides */ - goto skip; - - if (sector_limits[s2].floorh.min >= sector_limits[s2].ceilh.max) - goto onesided; /* If floor always touches ceiling, treat as 1s */ - - if (sector_limits[s1].floorh.min < sector_limits[s2].floorh.min) - lower_blocks=§or_limits[s2].floorh.min; - - if (sector_limits[s1].ceilh.max > sector_limits[s2].ceilh.max) - upper_blocks=§or_limits[s2].ceilh.max; - - if (!lower_blocks && !upper_blocks) - goto skip; /* Neither upper nor lower texture blocks */ - - /* Allocate a new 3d polygon to represent the view halfplanes */ - - if (v->num_poly_3d >= v->num_poly_3d_alloc) - v->poly_3d = ResizeMemory(v->poly_3d, - (v->num_poly_3d_alloc=v->num_poly_3d_alloc*2+1) * - sizeof(*v->poly_3d)); - - { - struct polygon *p = v->poly_3d + v->num_poly_3d++; - - long t1,t2=(t1=v->x*pdy+(psy-v->y)*pex+(v->y-pey)*psx)*v->z; - - /* Where to put triangle between player and linedef (irrespective of z) */ - - tri = &p->tri; - - /* Everything above triangle between the higher of the - two sectors' floors and the viewer is unblocked */ - - if (lower_blocks) - { - p->pdz1=t1; - p->ptmp1=(p->pdx1=(*lower_blocks-v->z)*pdy)*v->x+ - (p->pdy1=(v->z-*lower_blocks)*pdx)*v->y+t2; - - /* Everything below triangle between the lower of the - two sectors' ceilings and the viewer is unblocked */ - - if (upper_blocks) - { - p->pdz2= -t1; - p->ptmp2=(p->pdx2=(v->z-*upper_blocks)*pdy)*v->x+ - (p->pdy2=(*upper_blocks-v->z)*pdx)*v->y-t2; - } - else - p->ptmp2=p->pdx2=p->pdy2=p->pdz2=0; - } - else /* Lower texture does not block => upper blocks */ - { - /* Everything below triangle between the lower of the - two sectors' ceilings and the viewer is unblocked - (put in first entry for performance) */ - - p->pdz1= -t1; - p->ptmp1=(p->pdx1=(v->z-*upper_blocks)*pdy)*v->x+ - (p->pdy1=(*upper_blocks-v->z)*pdx)*v->y-t2; - p->ptmp2=p->pdx2=p->pdy2=p->pdz2=0; - } - } - } - - /* We form a triangle between the viewer and the linedef, - to indicate anything behind it is blocked (unless it's - in the visible area between two planes formed between - the viewer and the floor and ceiling, in which case the - linedef is 2s and this is part of a larger disjunction). */ - - /* Everything to the right of the linedef is unblocked */ - - tri->ptmp1 = (tri->pdx1=pdx )*psy-(tri->pdy1=pdy )*psx; - - /* Everything to the right of line between start and viewer is unblocked */ - - tri->ptmp2 = (tri->pdx2=v->x-psx)*psy-(tri->pdy2=v->y-psy)*psx; - - /* Everything to the right of line between viewer and end is unblocked */ - - tri->ptmp3 = (tri->pdx3=pex-v->x)*pey-(tri->pdy3=pey-v->y)*pex; - } -skip:; - } -} - -enum {FLOOR=1, CEILING=2}; - -/* Whether a seg is visible in the current view, at the heights indicated - by the sector. 0=totally invisible, 1=floor visible, 2=ceiling visible, - 3=both visible. Only the right side of a seg is considered, so if a - seg is incident with a closed halfplane, its right side must face - into the halfplane. - - Note: this is just an approximation; the exact way to tell visibility - is to compute the area of the intersection of the polygon and the - triangle between the viewer and the seg, which is more difficult. */ - -static int seg_is_visible(const struct Pseg *ps, - const struct Sector *sector, - const struct view *v) -{ - long psx=vertices[ps->start].x; - long psy=vertices[ps->start].y; - long pex=vertices[ps->end].x; - long pey=vertices[ps->end].y; - long pdx=pex-psx,pdy=pey-psy; /* (dx,dy) vector */ - - if ((psx-v->x)*pdy >= (psy-v->y)*pdx) /* backface cull */ - return 0; - else - { - int floorh=sector->floorh, ceilh=sector->ceilh; - int floor_blocked, ceil_blocked; - - /* Player's 90-degree vertical camera angle. - Limits how far up and down a player can see. */ - - { - long s=v->pdy*psx-v->pdx*psy-v->ptmp; - long e=v->pdy*pex-v->pdx*pey-v->ptmp; - double t; - if (e>s) - s=e; - if (s<0) - return 0; - t=s*v->distr; - floor_blocked = (e=v->z-floorh) > t || -e > t; - ceil_blocked = (e=v->z-ceilh) > t || -e > t; - if (floor_blocked && ceil_blocked) - return 0; - } - - /* If the starting or ending vertices are inside a 2-halfplane, - then the seg is at least partially inside the 2-halfplane. - If they are both incident to the 2-halfplane then one side - of the seg is inside the 2-halfplane and the other is not, - as determined by the dot product. Otherwise (if one vertex - is outside of the 2-halfplane and the other is outside or - incident to it), the seg is totally outside of the - 2-halfplane. We are only interested in whether the right - side is in the 2-halfplane. */ - - { - struct halfplane *ch=v->convex_hull; - int i=v->num_convex_hull; - do - { - long s,e; - if ( (s=ch->pdx*psy-ch->pdy*psx-ch->ptmp) >=0 && - (e=ch->pdx*pey-ch->pdy*pex-ch->ptmp) >=0 && - (e || s || ch->pdx*pdx+ch->pdy*pdy<0) ) - return 0; - ch++; - } - while (--i); - } - - /* Same as above, except that each triangle is an union - (OR) of three 2-halfplanes, and so if the seg is inside - any one of them it is considered unblocked. */ - - { - int i=v->num_poly; - if (i) - { - struct triangle *tri=v->poly; - do - { - long s1,e1,s2,e2,s3,e3; - if ( (s1=tri->pdx1*psy-tri->pdy1*psx-tri->ptmp1) >=0 && - (e1=tri->pdx1*pey-tri->pdy1*pex-tri->ptmp1) >=0 && - (s2=tri->pdx2*psy-tri->pdy2*psx-tri->ptmp2) >=0 && - (e2=tri->pdx2*pey-tri->pdy2*pex-tri->ptmp2) >=0 && - (s3=tri->pdx3*psy-tri->pdy3*psx-tri->ptmp3) >=0 && - (e3=tri->pdx3*pey-tri->pdy3*pex-tri->ptmp3) >=0 && - (e3 || s3 || tri->pdx3*pdx+tri->pdy3*pdy < 0) && - (e2 || s2 || tri->pdx2*pdx+tri->pdy2*pdy < 0) && - (e1 || s1 || tri->pdx1*pdx+tri->pdy1*pdy < 0) ) - return 0; - tri++; - } - while (--i); - } - } - - { - register struct polygon *p=v->poly_3d; - int i; - - for (i=v->num_poly_3d;i--;p++) - { - long s1,e1,s2,e2,s3,e3; - if ( (s1=p->tri.pdx1*psy-p->tri.pdy1*psx-p->tri.ptmp1) >= 0 && - (e1=p->tri.pdx1*pey-p->tri.pdy1*pex-p->tri.ptmp1) >= 0 && - (s2=p->tri.pdx2*psy-p->tri.pdy2*psx-p->tri.ptmp2) >= 0 && - (e2=p->tri.pdx2*pey-p->tri.pdy2*pex-p->tri.ptmp2) >= 0 && - (s3=p->tri.pdx3*psy-p->tri.pdy3*psx-p->tri.ptmp3) >= 0 && - (e3=p->tri.pdx3*pey-p->tri.pdy3*pex-p->tri.ptmp3) >= 0 && - (e3 || s3 || p->tri.pdx3*pdx+p->tri.pdy3*pdy < 0) && - (e2 || s2 || p->tri.pdx2*pdx+p->tri.pdy2*pdy < 0) && - (e1 || s1 || p->tri.pdx1*pdx+p->tri.pdy1*pdy < 0) ) - { - long as=p->pdx1*psx+p->pdy1*psy-p->ptmp1; - long ae=p->pdx1*pex+p->pdy1*pey-p->ptmp1; - long bs=p->pdx2*psx+p->pdy2*psy-p->ptmp2; - long be=p->pdx2*pex+p->pdy2*pey-p->ptmp2; - long dotax=p->pdx1*pdy, dotay=p->pdy1*pdx; - long dotbx=p->pdx2*pdy, dotby=p->pdy2*pdy; - register long t; - if (!floor_blocked && (((t=p->pdz1*floorh)+as<=0 && t+ae<=0 && - (t+ae || t+as || dotaxpdz2*floorh)+bs<=0 && t+be<=0 && - (t+be || t+bs || dotbxpdz1*ceilh)+as<=0 && t+ae<=0 && - (t+ae || t+as || dotaxpdz2*ceilh)+bs<=0 && t+be<=0 && - (t+be || t+bs || dotbxnum_convex_hull; - const struct halfplane *p=v->convex_hull; - do - { - long t1,t2,t3; - if ( (t1=p->pdx*maxy-p->ptmp) > (t2=p->pdy*minx) && - (t3=p->pdy*maxx) < t1 && - (t1=p->pdx*miny-p->ptmp) > t3 && - t1 > t2) - return FALSE; - p++; - } - while (--i); - return TRUE; -} - -/* This is the main BSP traversal. We find the viewer's position - by doing a binary search for the viewer's ssector. We process - it first, and then go back up the BSP tree after processing - the parent node's other child. Each time we reach a node, we - decide whether to render the left child first or the right - child first depending on the viewer's position w.r.t. that - node's line. This is essentially an inorder traversal of the - BSP tree. If the bounding box for a node or a ssector is - totally invisible based on the (possibly dynamic) convex - hull, we skip it, which is the main performance boost. killough */ - -static void bsp_traverse(const struct Node *tn, struct view *v) -{ - int lr=(tn->dx*v->y-tn->dy*v->x > tn->ptmp) ^ v->polarity; - if (lr) - goto leftside; - do - { - if (box_is_visible(tn->minx1,tn->miny1,tn->maxx1,tn->maxy1,v)) - { - if (tn->nextr) /* Process only if bounding box is visible */ - bsp_traverse(tn->nextr,v); - else /* Process right side */ - v->func(tn->chright,v); - } - if (lr) break; - -leftside: - if (box_is_visible(tn->minx2,tn->miny2,tn->maxx2,tn->maxy2,v)) - { - if (tn->nextl) /* Process only if bounding box is visible */ - bsp_traverse(tn->nextl,v); - else /* Process left side */ - v->func(tn->chleft,v); - } - } - while (lr); -} - -/* We compute the player's view, limited by left and right side - lines that are 90 degrees apart and centered at the player's - angle, and by planes 45 degrees above and below. */ - -static int setup_view(struct view *v, const struct Pseg *ps, const double *adj) -{ /* Compute the player's view to be */ - long psx=vertices[ps->start].x; /* Looking away from the seg, into */ - long psy=vertices[ps->start].y; /* the corresponding ssector. */ - long pdx=vertices[ps->end].x-psx; - long pdy=vertices[ps->end].y-psy; - - v->sector=sidedefs[ps->flip ? linedefs[ps->linedef].sidedef2 : - linedefs[ps->linedef].sidedef1].sector; - - v->ps=ps; - - v->x=(psx*2+pdx)/2; /* Midpoint */ - v->y=(psy*2+pdy)/2; - - v->z=sectors[v->sector].floorh+48; /* Player sees 48 units above floor level */ - - { - long temp=pdx*adj[0]+pdy*adj[1]; - pdx=pdx*adj[1]-pdy*adj[0]; - pdy=temp; - } - if (!pdy && !pdx) return 0; - v->angle=ComputeAngle(pdx,pdy); - - if (v->num_convex_hull_alloc<2) - { - v->num_convex_hull_alloc=2; - v->convex_hull = ResizeMemory(v->convex_hull,2*sizeof(*v->convex_hull)); - } - - v->num_convex_hull=2; - - v->convex_hull[0].ptmp=(v->convex_hull[0].pdx=pdy+pdx)*v->y- - (v->convex_hull[0].pdy=pdy-pdx)*v->x; - - v->convex_hull[1].ptmp=(v->convex_hull[1].pdx=pdx-pdy)*v->y- - (v->convex_hull[1].pdy=pdy+pdx)*v->x; - - v->num_poly_3d=v->num_poly=0; - - v->ptmp=pdy*psx-pdx*psy; - v->distr=1.618/sqrt((double) pdy*pdy + (double) pdx*pdx); - v->pdx=pdx; - v->pdy=pdy; - - /* No visplanes initially */ - v->visplanes=0; - return 1; -} - -static void R_DrawPlanes(int ss, struct view *v) -{ - const struct Pseg *ps=ssectors[ss].first+psegs; /* First seg in ssector */ - - /* The first seg in an ssector determines which sector describes its flats */ - - const struct Sector *sector=sectors+sidedefs[ps->flip ? - linedefs[ps->linedef].sidedef2 : - linedefs[ps->linedef].sidedef1 ].sector; - int num; - - for (num=ssectors[ss].num;num--;ps++) - { - if ((ps->angle-v->angle) & 0x8000) /* Backface cull the way Doom does it */ - { - const struct LineDef *l=linedefs+ps->linedef; /* linedef this seg's along */ - if (l->flags & 4) /* If linedef is 2s */ - { - const struct Sector *s1=sectors+sidedefs[l->sidedef1].sector; - const struct Sector *s2=sectors+sidedefs[l->sidedef2].sector; - - if (s1!=s2) /* If same sector, ignore */ - { - unsigned vp_mask = ~(v->hitlist[s1-sectors] & v->hitlist[s2-sectors]) & (FLOOR | CEILING); - - if (vp_mask) - { - - /* If a 2s linedef has identical floor or ceiling properties on - either side of it, then a new triangle is not drawn for it - (in the respective floor or ceiling), even if the two sectors - on either side of it are not the same sector. This is well-known - to those who have constructed invisible platforms or deep water. - Note that neither of these two sectors is necessarily the one - that governs flats drawing for this seg, if it is drawn at all -- - that is controlled by the sector of the first seg in the ssector. */ - - if (lighting_similar(s1,s2)) /* If lighting is similar */ - { - if (floor_similar(s1,s2)) /* If floor is similar */ - vp_mask &= ~FLOOR; /* Then ignore floor */ - if (ceil_similar(s1,s2)) /* If ceiling is similar */ - vp_mask &= ~CEILING; /* Then ignore ceiling */ - } - - if (vp_mask) - { - vp_mask &= seg_is_visible(ps, sector, v); - v->hitlist[s1-sectors] |= vp_mask; - v->hitlist[s2-sectors] |= vp_mask; - if (vp_mask & FLOOR) - v->visplanes++; - if (vp_mask & CEILING) - v->visplanes++; - } - } - } - } - } - } -} - -static int visplanes(const struct Node *tn, const struct Pseg *ps, struct view *v) -{ - int maxvp=INT_MIN,i; - double adj[][2]={{0,1},{-.7071067812,.7071067812}, - {.7071067812,.7071067812}}; - - for (i=0;ihitlist, 0, num_lines); - - /* Form the polygons that define the current view */ - - v->func=add_blocking_linedefs; - v->polarity=0; /* front-to-back */ - bsp_traverse(tn, v); - - /* Find the segs which are visible in the current view */ - v->polarity=1; /* back-to-front */ - v->func=R_DrawPlanes; - - memset(v->hitlist, 0, num_sects); - - bsp_traverse(tn, v); - - if (v->visplanes > maxvp) - maxvp=v->visplanes; - } - - if (maxvp > v->max_visplanes) - { - v->max_visplanes=maxvp; - v->max_visplanes_sector=v->sector; - v->max_visplanes_linedef=v->ps->linedef; - } - - return maxvp; -} - - -static void init_view(struct view *v) -{ - v->hitlist = GetMemory(num_sects > num_lines ? num_sects : num_lines); - v->max_visplanes=INT_MIN; - v->start_markers=num_things; -} - -/* Clean up view. */ - -static void free_view(struct view *v) -{ - free(v->convex_hull); - free(v->poly); - free(v->poly_3d); - free(v->hitlist); - - v->hitlist=NULL; - v->convex_hull=NULL; - v->poly=NULL; - v->poly_3d=NULL; - - v->num_convex_hull= - v->num_convex_hull_alloc= - v->num_poly= - v->num_poly_alloc= - v->num_poly_3d= - v->num_poly_3d_alloc= - 0; -} - -static void raise_ceil(int s, int depth) -{ - int i; - long l=LONG_MAX; - sector_limits[s].ceilh.moves=1; - for (i=0;i sector_limits[s].ceilh.max) - sector_limits[s].ceilh.max=l; -} - -static void lower_floor(int s) -{ - int i; - long l=LONG_MAX; - sector_limits[s].floorh.moves=1; - for (i=0;il) - l=sectors[s2].floorh; - } - if (l > LONG_MIN && (l+=depth) < sector_limits[s].floorh.min) - sector_limits[s].floorh.min=l; -} - -static void build_stairs(int s, int step, int h) -{ - int k; - -top: - if ((h+=step) < sector_limits[s].floorh.min) - sector_limits[s].floorh.min=h; - sector_limits[s].floorh.moves=3; - for (k=0;k= 0) /* normal door open */ - raise_ceil(sidedefs[linedefs[i].sidedef2].sector,4); - break; - case 4: case 29: case 90: case 63: - case 2: case 103: case 86: case 61: case 108: - case 111: case 105: case 114: case 109: case 112: - case 106: case 115: case 133: case 99: case 135: - case 134: case 136: case 137: case 40: - for (j=0;j=100 ? 16 : 8,sector_limits[j].floorh.min); - break; - - case 3: case 50: case 75: case 42: case 16: case 76: - case 110: case 113: case 107: case 116: case 41: - case 43: case 44: case 49: case 72: case 6: case 25: - case 73: case 77: case 141: - for (j=0;jstart_markers; - struct Thing *tp=things+i; - for (;ix-tp->xpos; - long dy=v->y-tp->ypos; - if (dx<0) dx=-dx; - if (dy<0) dy=-dy; - if (dx<=64 && dy<=64) return; - } - things = ResizeMemory(things,(num_things+1)*sizeof(*things)); - tp=things + num_things++; - tp->xpos=v->x; - tp->ypos=v->y; - tp->angle=(unsigned)(v->angle*(1.0/8192.0))*45; - tp->type=1; /* player 1 start (voodoo doll) */ - tp->when=7; /* all levels */ -} - -#define VPOF_MAX_SECTOR 2 /* Maximum number of visplane warnings per sector */ - -void warn_visplanes(const struct Node *tn) -{ - static struct view v; - int i; - unsigned char *sector_vp_hitlist=NULL; - - puts("\nLooking for visplane overflows\n"); - - sector_limits=GetMemory(num_sects*sizeof(*sector_limits)); - - find_sector_limits(); - - init_view(&v); - - for (i=0;ithreshold) - { - int sector=sidedefs[psegs[i].flip ? linedefs[l].sidedef2 : - linedefs[l].sidedef1 ].sector; - if (mark_visplanes) - mark_visplane(&v); - if (!sector_vp_hitlist) - memset( (sector_vp_hitlist = GetMemory(num_sects)), 0, num_sects); - - if (sector_vp_hitlist[sector] <= VPOF_MAX_SECTOR) - { - if (sector_vp_hitlist[sector]++ < VPOF_MAX_SECTOR) - { - printf( - "Warning: VPOF (%d) near linedef %4d, sector %d, (%ld,%ld) angle %d\n", - vp, l, sector, v.x, v.y, (int)(v.angle*(360.0/65536.0)+.5) - ); - } - else - printf("Further visplane overflow warnings suppressed in sector %d\n",sector); - } - } - } - printf(" \nMaximum number of visplanes=%d, near linedef %d, sector %d\n", - v.max_visplanes, v.max_visplanes_linedef, v.max_visplanes_sector); - free(sector_vp_hitlist); - free(sector_limits); - sector_limits=NULL; - free_view(&v); /* Free the view structures */ -} diff -uaNr yadex-1.5.2/bsp-2.3/structs.h yadex-1.6.0/bsp-2.3/structs.h --- yadex-1.5.2/bsp-2.3/structs.h 1998-12-19 13:18:16.000000000 +0100 +++ yadex-1.6.0/bsp-2.3/structs.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,130 +0,0 @@ -/*- Doom Structures .. Colin Reed 1994 -------------------------------------*/ - -struct wad_header /* Linked wad files list.*/ -{ - char type[4]; - long int num_entries; - long int dir_start; -}; - -struct directory /* The directory entry header*/ -{ - long int start; - long int length; - char name[8]; -}; - -struct Block -{ - short minx; - short miny; - short xblocks; - short yblocks; -}; - -/*- The level structures ---------------------------------------------------*/ - -struct Thing -{ - short xpos; /* x position */ - short ypos; /* y position */ - short angle; /* facing angle */ - short type; /* thing type */ - short when; /* appears when? */ -}; - -struct Vertex -{ - short int x; /* X coordinate */ - short int y; /* Y coordinate */ -}; - -struct LineDef -{ - short int start; /* from this vertex ... */ - short int end; /* ... to this vertex */ - short int flags; /* see NAMES.C for more info */ - short int type; /* see NAMES.C for more info */ - short int tag; /* crossing this linedef activates the sector with the same tag */ - short int sidedef1; /* sidedef */ - short int sidedef2; /* only if this line adjoins 2 sectors */ -}; - -struct SideDef -{ - short int xoff; /* X offset for texture */ - short int yoff; /* Y offset for texture */ - char tex1[8]; /* texture name for the part above */ - char tex2[8]; /* texture name for the part below */ - char tex3[8]; /* texture name for the regular part */ - short int sector; /* adjacent sector */ -}; - -struct Sector -{ - short int floorh; /* floor height */ - short int ceilh; /* ceiling height */ - char floort[8];/* floor texture */ - char ceilt[8]; /* ceiling texture */ - short int light; /* light level (0-255) */ - short int special; /* special behaviour (0 = normal, 9 = secret, ...) */ - short int tag; /* sector activated by a linedef with the same tag */ -}; - -/*--------------------------------------------------------------------------*/ -/* These are the structure used for creating the NODE bsp tree. */ -/*--------------------------------------------------------------------------*/ - -struct Seg -{ - short int start; /* from this vertex ... */ - short int end; /* ... to this vertex */ - unsigned short angle;/* angle (0 = east, 16384 = north, ...) */ - short int linedef; /* linedef that this seg goes along*/ - short int flip; /* true if not the same direction as linedef */ - unsigned short dist; /* distance from starting point */ - struct Seg *next; - short psx,psy,pex,pey; /* Start, end coordinates */ - long pdx,pdy,ptmp; /* Used in intersection calculations */ - long len; - short sector; -}; - -struct Pseg -{ - short int start; /* from this vertex ... */ - short int end; /* ... to this vertex */ - unsigned short angle;/* angle (0 = east, 16384 = north, ...) */ - short int linedef; /* linedef that this seg goes along*/ - short int flip; /* true if not the same direction as linedef */ - unsigned short dist; /* distance from starting point */ -}; - -struct Node -{ - short int x, y; /* starting point*/ - short int dx, dy; /* offset to ending point*/ - short int maxy1, miny1, minx1, maxx1; /* bounding rectangle 1*/ - short int maxy2, miny2, minx2, maxx2; /* bounding rectangle 2*/ - short int chright, chleft; /* Node or SSector (if high bit is set)*/ - struct Node *nextr,*nextl; - short int node_num; /* starting at 0 (but reversed when done)*/ - long ptmp; -}; - -struct Pnode -{ - short int x, y; /* starting point*/ - short int dx, dy; /* offset to ending point*/ - short int maxy1, miny1, minx1, maxx1; /* bounding rectangle 1*/ - short int maxy2, miny2, minx2, maxx2; /* bounding rectangle 2*/ - short int chright, chleft; /* Node or SSector (if high bit is set)*/ -}; - -struct SSector -{ - short int num; /* number of Segs in this Sub-Sector */ - short int first; /* first Seg */ -}; - -/*--------------------------------------------------------------------------*/ diff -uaNr yadex-1.5.2/bsp-2.3/transdor.wad yadex-1.6.0/bsp-2.3/transdor.wad --- yadex-1.5.2/bsp-2.3/transdor.wad 1998-12-19 13:19:41.000000000 +0100 +++ yadex-1.6.0/bsp-2.3/transdor.wad 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -PWADd@@Z  -  -  -    --WOOD1--WOOD1--WOOD1--WOOD1-----WOOD1--WOOD1--MIDGRATE--MIDGRATE--WOOD1--WOOD1-----GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1PP@@ @   @ - - -  @ @ @ @@P@PPP@DEM1_5FLOOR7_1DEM1_5FLOOR7_1DEM1_5FLOOR7_1DEM1_5FLOOR7_1 LNPTWZ]`cgikmoqtvxz|~        -  - @@Z  -  -  -    --WOOD1--WOOD1--WOOD1--WOOD1-----WOOD1--WOOD1--MIDGRATE--MIDGRATE--WOOD1--WOOD1-----GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1--GSTONE1PP@@ @   @ - - -  @ @ @ @@P@PPP@DEM1_5FLOOR7_1DEM1_5FLOOR7_1DEM1_5FLOOR7_1DEM1_5FLOOR7_1 LNPTWZ]`cgikmoqtvxz|~        -  - E1M1 -THINGSLINEDEFSXSIDEDEFSj@VERTEXESSEGSSSECTORSpNODEShSECTORSREJECT0BLOCKMAPMAP01 -THINGSLINEDEFSXSIDEDEFS @VERTEXESV SEGSF SSECTORSZ pNODES hSECTORS2 REJECT4 0BLOCKMAP \ No newline at end of file diff -uaNr yadex-1.5.2/bsp-2.3/ybsp.6 yadex-1.6.0/bsp-2.3/ybsp.6 --- yadex-1.5.2/bsp-2.3/ybsp.6 2000-01-10 17:01:52.000000000 +0100 +++ yadex-1.6.0/bsp-2.3/ybsp.6 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -.TH YBSP 6 1998-02-23 "Yadex $VERSION" - -.SH NAME -ybsp \- node builder for Doom wad files - -.SH SYNOPSIS -\fBybsp\fP [\fIoptions\fP] [\fB\-o \fP\fIfile\fP] \fIfile\fP - -.SH ATTENTION -This (\fBybsp\fP) is BSP 2.3 with the following changes: -.br -- includes man page written by Udo Munk and Andr Majorel, -.br -- includes automatic disabling of whirling baton if piped, -.br -- includes Colin Phipps' fix for the bugs in bsp23bug.zip, -.br -- renamed to \fBybsp\fP to avoid collision with xwadtools. - -This version of BSP is NOT quite the same as the one that comes -with Xwadtools or the one you would get by compiling bsp23x.zip. -It is not the same as bsp30x.zip either. - -Xwadtools' BSP has the \fB\-noprog\fP option. Zdoom's BSP has -support for Hexen. Yadex's BSP has Colin's bugfix and automatic -disabling of progress indicator. Please bear with us until we -get our acts together and release a common version that includes -all the above (and more ?). - -.SH DESCRIPTION -BSP builds the node and blockmap resources for a level map in -a wad file. Level maps created with level editors and level -compilers won't run without this resources build by a node builder. -The program supports multilevel building, means it automatically -builds the resources for all levels found in the input wad file. -.LP -If the program is used without the \fB\-o\fP option it will create an output -wad file with the name \fBtmp.wad\fP. -.LP -BSP has some special effect features: -.LP -If a linedef has a sector tag >= 900, then it is treated as "precious" -and will not be split unless absolutely necessary. This is good to use -around borders of deep water, invisible stairs, etc. -.LP -Furthermore, just for a grin, if the linedef's tag is 999, then the -sidedef's x-offset set an angle adjustment in degrees to be -applied\(emyou can look straight at a wall, but it might come -right at you on both sides and "stretch". -.LP -BSP supports HOM-free transparent doors. Simply make the sector -referenced by the doortracks have a sector tag of >= 900. No need to -remember sector numbers and type them in on a command line\(emjust use -any sector tag >= 900 to permanently mark the sector special. - -.SH OPTIONS -.TP -.BI "\-factor " number -Changes the cost assigned to seg splits. Factor can be any positive -integer, and the larger the factor, the more costly seg splits are. -A factor of 17 is the default and behaves just like earlier versions -of BSP. -Changing the factor can sometimes prevent visplane overflows in wads. -But then again, some wads have just too many visplane overflows, -experiment with the \fB\-factor\fP option before giving up. -.TP -.B \-noreject -Does not clobber already existing reject map. -.TP -.BI "\-o " file -Write output to \fIfile\fP instead of \fBtmp.wad\fP. -.TP -.BI "\-thold " number -Threshold for visplane overflow. May be used to report -more potential visplane overflows -if the \fB\-vpwarn\fP or \fB\-vpmark\fP options -estimate too few visplanes. Default threshold is 128. -.TP -.B \-vp -Attempts to prevent visplane overflows without loss of detail. Using the -option causes node line picker to choose node lines in a way that is -empirically known to reduce or eliminate visplane overflows. -.TP -.B \-vpmark -Marks visplane overflows with player starts. It's a good idea to write -to a separate output file when using this option! One can use an editor -then, play each alternate player start, and see if each one causes -visplane overflows, and then remove it. Usually no-clipping must be used, -at least to step out of walls, since it inserts player starts without -regards to collisions, and it uses walls as a basis for visplane -calculation. -.TP -.B \-vpwarn -Warns about potential visplane overflows. - -.SH BUGS -Will only work on little endian systems. - -We should integrate Randy Heit's modifications to handle Hexen -format wads. - -.SH AUTHOR -BSP was written by Colin Reed and Lee Killough -(killough@rsn.hp.com). Andr Majorel did the Unix port and wrote -the man page based on the one written by Udo Munk. Colin Phipps -contributed bug fixes. - -.SH SEE ALSO -.BR idbsp (6), -.BR warm (6), -.BR wreject (6), -.BR xwadtools (6) -.br -The Unofficial Doom Specs by Matthew S Fell. -.br -.B bsp23x.txt -.br -.B http://www.teaser.fr/~amajorel/doom/bsp23bug.zip -.br -.B http://lxdoom.linuxgames.com/notes.html#bsp - -.SH BUGS/ERRORS -This program will \fBNOT\fR built a reject map, it will build a zero-ed one, -where every sector is visible from any other sector, or with the appropriate -option it won't touch an existing reject map. So if this node builder is used -the WAD reject resource should be build with other tools. - -.SH AUTHOR -.B Bsp -was written by Colin Reed and Lee Killough (killough@rsn.hp.com), -based on the node builder included in DEU5 by Raphael Quinet -(Raphael.Quinet@eed.ericsson.se). -.LP -Linux port was done by Andre Majorel (amajorel@teaser.fr). -.LP -Port to other UNIX flavors and some minor modifications by -Udo Munk (um@compuserve.com) -.LP -Big endian support for Solaris SPARC done by Oliver Kraus -(kraus@lw010.e-technik.uni-erlangen.de) -.LP -Disabling progress indicator if stderr redirected done by -Andre Majorel (amajorel@teaser.fr). -.LP -Two bug fixes done by Colin Phipps (cph@lxdoom.linuxgames.com). - diff -uaNr yadex-1.5.2/cache/copyright.man yadex-1.6.0/cache/copyright.man --- yadex-1.5.2/cache/copyright.man 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/cache/copyright.man 2003-03-31 18:58:32.000000000 +0200 @@ -0,0 +1,10 @@ +Parts copyright Andrew Apted 2000-2001, GNU GPL v2 +.br +Parts copyright Andr Majorel 1997-2003, GNU GPL v2 +.br +Parts copyright Matthew W. Miller 2000, GNU GPL v2 +.br +Parts written by Raphal Quinet, public domain +.br +Parts written by Brendon Wyber, public domain +.br diff -uaNr yadex-1.5.2/cache/copyright.txt yadex-1.6.0/cache/copyright.txt --- yadex-1.5.2/cache/copyright.txt 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/cache/copyright.txt 2003-03-31 18:58:32.000000000 +0200 @@ -0,0 +1,5 @@ + Parts copyright Andrew Apted 2000-2001, GNU GPL v2 + Parts copyright Andr Majorel 1997-2003, GNU GPL v2 + Parts copyright Matthew W. Miller 2000, GNU GPL v2 + Parts written by Raphal Quinet, public domain + Parts written by Brendon Wyber, public domain diff -uaNr yadex-1.5.2/cache/pixlist yadex-1.6.0/cache/pixlist --- yadex-1.5.2/cache/pixlist 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/cache/pixlist 2003-04-01 00:00:01.000000000 +0200 @@ -0,0 +1,18 @@ +002f2f.png +E1.png +E2.png +e1.png +e2.png +logo.png +logo_small.png +mirror0.png +mirrorh.png +mirrorv.png +nook1.png +nook2.png +slice1.png +slice2.png +vflat.png +vsprite.png +vtexture.png +yadex1.png diff -uaNr yadex-1.5.2/cache/srcdate yadex-1.6.0/cache/srcdate --- yadex-1.5.2/cache/srcdate 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/cache/srcdate 2003-04-01 00:00:00.000000000 +0200 @@ -0,0 +1 @@ +2003-04-01 \ No newline at end of file diff -uaNr yadex-1.5.2/cache/uptodate yadex-1.6.0/cache/uptodate --- yadex-1.5.2/cache/uptodate 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/cache/uptodate 2003-04-01 00:00:01.000000000 +0200 @@ -0,0 +1 @@ +x diff -uaNr yadex-1.5.2/configure yadex-1.6.0/configure --- yadex-1.5.2/configure 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/configure 2003-03-05 22:09:25.000000000 +0100 @@ -0,0 +1,374 @@ +#!/bin/sh +# +# configure - configure script for Yadex +# AYM 2002-09-15 +# + +# This file is copyright Andr Majorel 2002-2003. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307, USA. + + +set -e + +APPNAME=yadex +VERSION=`cat VERSION` + +HAVE_GETTIMEOFDAY= +HAVE_NANOSLEEP= +HAVE_SNPRINTF= +HAVE_USLEEP= +INTERFACE=x11 # "bgi" or "x11" +PLATFORM=unix # "dos" or "unix" +PREFIX=/usr/local + + +# +# check - perform a test +# +check () { + cdir=/tmp + cbasename=${APPNAME}_$$.c + cout=${APPNAME}_$$.out + + printf '%s' "$3" >$cdir/$cbasename + printf 'checking %s...' "$1" + if (cd $cdir && cc -c $cbasename >$cout 2>&1) + then + echo " yes" + eval "$2=1" + return 0 + else + echo " no" + sed 's/^/> /' $cdir/$cout + eval "$2=" + return 1 + fi +} + + +# +# genc - generate config.cc +# +genc () { + pathname=$BUILDDIR/config.cc + echo generating $pathname + ( + set -e + echo '// DO NOT EDIT -- generated by ./configure' + echo + echo '#include "config.h"' + echo + echo 'extern const char *yadex_etc_path[] =' + echo '{' + sed 's/\\/\\\\/g; s/"/\\"/g; s/^.*/ "&",/;' $BUILDDIR/config.etc + echo ' 0' + echo '};' + echo + echo 'extern const char *yadex_share_path[] =' + echo '{' + sed 's/\\/\\\\/g; s/"/\\"/g; s/^.*/ "&",/;' $BUILDDIR/config.share + echo ' 0' + echo '};' + echo + ) >$pathname +} + + +# +# genbool - generate a boolean macro definition +# +genbool () { + name=$1 + if [ -n "`eval echo \\$HAVE_"$name"`" ]; then + echo "#define Y_$name" + else + echo "//#define Y_$name" + fi +} + + +# +# genh - generate config.h +# +genh () { + pathname=$BUILDDIR/config.h + echo generating $pathname + ( + set -e + echo '// DO NOT EDIT -- generated by ./configure' + echo + case "$PLATFORM" in + dos) + echo '#define Y_DOS' + echo '//#define Y_UNIX';; + unix) + echo '//#define Y_DOS' + echo '#define Y_UNIX';; + *) + echo "configure: bad \$PLATFORM \"$PLATFORM\"" >&2 + exit 1;; + esac + case "$INTERFACE" in + bgi) + echo '#define Y_BGI' + echo '//#define Y_X11';; + x11) + echo '//#define Y_BGI' + echo '#define Y_X11';; + *) + echo "configure: bad \$INTERFACE \"$INTERFACE\"" >&2 + exit 1;; + esac + genbool GETTIMEOFDAY + genbool NANOSLEEP + genbool SNPRINTF + genbool USLEEP + echo + echo 'extern const char *yadex_etc_path[];' + echo 'extern const char *yadex_share_path[];' + echo + ) >$pathname +} + + + +# +# Parse the command line +# +while [ "$#" -ge 1 ] +do + case "$1" in + --help) + echo "Usage:" + echo " configure --help" + echo " configure --prefix path" + exit 0 + ;; + + --prefix) + shift + if [ "$#" -lt 1 ] + then + echo "configure: --prefix requires an argument" 1>&2 + exit 1 + fi + PREFIX="$1" + ;; + + --prefix=*) # Support the funky GNU syntax + PREFIX=`expr "$1" : '--prefix=\(.*\)'` + ;; + + -*) + echo "configure: bad argument \"$1\"" 1>&2 + exit 1 + ;; + + *) + echo "configure: too many arguments" 1>&2 + exit 1 + esac + shift +done + +# +# Sanity checks +# +if expr "x$PREFIX" : x/ >/dev/null +then + true +else + echo "configure: --prefix: argument is not an absolute path" 1>&2 + exit 1 +fi + +# Solaris /bin/grep doesn't know about -Fx. +GREP=/usr/xpg4/bin/grep +[ -x $GREP ] || GREP=grep + +# +# Do we have a C compiler ? +# +cdir=/tmp +cbasename=${APPNAME}_$$.c +cout=${APPNAME}_$$.out +printf "checking whether the cc command works..." +echo 'int n;' >$cdir/$cbasename +if (cd $cdir && cc -c $cbasename >$cout 2>&1) +then + echo " yes" +else + echo " no" + sed 's/^/> /' $cdir/$cout + echo "error: looks like the cc command is not working" 1>&2 + exit 1 +fi + +# +# Do we have gettimeofday() ? +# +check "for gettimeofday" HAVE_GETTIMEOFDAY ' +#include +#include +int main (int argc, char *argv[]) +{ + struct timeval tv; + struct timezone tz; + int n = gettimeofday (&tv, &tz); + return n; +} +' || true + +# +# Do we have nanosleep() ? +# +check "for nanosleep" HAVE_NANOSLEEP ' +#include +int main (int argc, char *argv[]) +{ + struct timespec ts; + ts.tv_sec = 1; + ts.tv_nsec = 1; + nanosleep (&ts, &ts); + return 0; +} +' || true + +# +# Do we have snprintf() ? +# +check "for snprintf" HAVE_SNPRINTF ' +#include +int main (int argc, char *argv[]) +{ + char buf[1]; + int n = snprintf (buf, sizeof buf, "%d", 42); + return n; +} +' || true + +# +# Do we have usleep() ? +# +check "for usleep" HAVE_USLEEP ' +#include +int main (int argc, char *argv[]) +{ + unsigned long usec = 1; + usleep (usec); + return 0; +} +' || true + +# +# Create the directory where the build-specific files go +# +SYSTEM_RAW="`uname -n`_`uname -a | cksum`" +SYSTEM="`echo "$SYSTEM_RAW" | tr -dc '[:alnum:]._-'`" +BUILDDIR=obj/$SYSTEM +echo "build directory is $BUILDDIR" +mkdir -p $BUILDDIR + +# +# FHS paths +# +if expr "$PREFIX" : '//*usr/*$' >/dev/null +then + BINDIR=/usr/bin # FHS-ly correct is /usr/games + ETCDIR=/etc/$APPNAME/%v + ETCDIRNV=/etc/$APPNAME + MANDIR=/usr/share/man + SHAREDIR=/usr/share/games/$APPNAME/%v + SHAREDIRNV=/usr/share/games/$APPNAME +elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null +then + BINDIR=/usr/local/bin # FHS-ly correct is /usr/local/games + ETCDIR=/etc/$APPNAME/%v + ETCDIRNV=/etc/$APPNAME + MANDIR=/usr/local/man + SHAREDIR=/usr/local/share/games/$APPNAME/%v + SHAREDIRNV=/usr/local/share/games/$APPNAME +elif expr "$PREFIX" : '//*opt/*$' >/dev/null +then + echo '/opt ? Surely you mean /opt/something, Mr. Feynman !' 1>&2 + exit 1 +elif expr "$PREFIX" : '//*opt//*[^/]' >/dev/null +then + BINDIR=$PREFIX/bin + ETCDIR=/etc/opt/`expr "$PREFIX" : '//*opt//*\(.*\)'` + ETCDIRNV= + MANDIR=$PREFIX/man + SHAREDIR=$PREFIX/share + SHAREDIRNV= +else # Probably /home/joe/* + BINDIR=$PREFIX/bin + ETCDIR=$PREFIX/etc + ETCDIRNV= + MANDIR=$PREFIX/man + SHAREDIR=$PREFIX/share + SHAREDIRNV= +fi + +# +# Write Makefile.config +# +echo generating $BUILDDIR/Makefile.config +( + echo "# DO NOT EDIT -- generated by ./configure" + echo + echo "BINDIR = $BINDIR" + echo "ETCDIR = $ETCDIR" | sed "s/%v/$VERSION/g" + echo "ETCDIRNV = $ETCDIRNV" + echo "HAVE_GETTIMEOFDAY = $HAVE_GETTIMEOFDAY" + echo "HAVE_NANOSLEEP = $HAVE_NANOSLEEP" + echo "HAVE_SNPRINTF = $HAVE_SNPRINTF" + echo "HAVE_USLEEP = $HAVE_USLEEP" + echo "INTERFACE = $INTERFACE" + echo "MANDIR = $MANDIR" + echo "PLATFORM = $PLATFORM" + echo "SHAREDIR = $SHAREDIR" | sed "s/%v/$VERSION/g" + echo "SHAREDIRNV = $SHAREDIRNV" +) >$BUILDDIR/Makefile.config + +# +# YGD files search path +# +echo generating $BUILDDIR/config.share +$GREP -Fvx '' <"$BUILDDIR/config.share" +. +~/.$APPNAME/%v +~/.$APPNAME +$SHAREDIR +$SHAREDIRNV +EOF + +# +# Config files search path +# +echo generating $BUILDDIR/config.etc +$GREP -Fvx '' <"$BUILDDIR/config.etc" +. +~/.$APPNAME/%v +~/.$APPNAME +$ETCDIR +$ETCDIRNV +EOF + +# +# Write config.h and config.cc +# +genc +genh + +exit 0 diff -uaNr yadex-1.5.2/docsrc/.pixlist yadex-1.6.0/docsrc/.pixlist --- yadex-1.5.2/docsrc/.pixlist 2000-08-27 23:18:29.000000000 +0200 +++ yadex-1.6.0/docsrc/.pixlist 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -E1.png -E2.png -e1.png -e2.png -logo.png -logo_small.png -mirror0.png -mirrorh.png -mirrorv.png -nook1.png -nook2.png -vflat.png -vsprite.png -vtexture.png -yadex1.png diff -uaNr yadex-1.5.2/docsrc/002f2f.png yadex-1.6.0/docsrc/002f2f.png --- yadex-1.5.2/docsrc/002f2f.png 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/docsrc/002f2f.png 2000-01-06 13:09:33.000000000 +0100 @@ -0,0 +1,3 @@ +PNG + + IHDRKm)gAMA1_IDATxcdgp)On7IENDB` \ No newline at end of file diff -uaNr yadex-1.5.2/docsrc/README yadex-1.6.0/docsrc/README --- yadex-1.5.2/docsrc/README 2000-01-10 15:35:44.000000000 +0100 +++ yadex-1.6.0/docsrc/README 2003-02-15 16:17:11.000000000 +0100 @@ -9,8 +9,9 @@ PREREQUISITES You need : - - Some flavour of Unix, - - X11R6 or X11R5 and a display of at least 640x480x256, + - Some flavour of Unix (known to work with AIX, FreeBSD, HP-UX, + Irix, Linux, NetBSD, OpenBSD, OpenUnix, QNX and Solaris), + - X11R6 or X11R5 and a display of at least 640x480, - a Doom/Doom II/Heretic/Strife iwad (shareware/demo is OK), - GNU make (vanilla make won't do), - a standard C compiler (ISO 9899:1990), @@ -18,46 +19,46 @@ - hypot() and either nanosleep() or usleep(). BUILDING AND INSTALLING - Type this : + To install in /usr/local : - make - su -c 'make install' + ./configure + make + su -c 'make install' - Notes : - 1) If you get an error on -lX11, add X11LIBDIR= to the make - command line, where is the path to your libX11* files. - E.G. "make X11LIBDIR=/usr/lpp/X11/lib" + To install somewhere else, for example in ~/yadex : + + ./configure --prefix ~/yadex + make + make install + + Got problems getting Yadex to compile ? See doc/faq.html. + Got no problem ? Read the FAQ anyway. See doc/faq.html. - 2) If you want to install somewhere else than in /usr/local/bin, - add PREFIX= to the "make install" command line. - E.G. "su -c 'make install PREFIX=/opt/yadex'" - or "make install PREFIX=~" - - 3) Beware, the installation OVERWRITES the following files: - /usr/local/bin/ybsp - /usr/local/bin/ybsp-$VERSION - /usr/local/bin/yadex - /usr/local/bin/yadex-$VERSION - /usr/local/etc/yadex/$VERSION/yadex.cfg - /usr/local/share/games/yadex/$VERSION/doom.ygd - /usr/local/share/games/yadex/$VERSION/doom02.ygd - /usr/local/share/games/yadex/$VERSION/doom04.ygd - /usr/local/share/games/yadex/$VERSION/doom05.ygd - /usr/local/share/games/yadex/$VERSION/doom2.ygd - /usr/local/share/games/yadex/$VERSION/doompr.ygd - /usr/local/share/games/yadex/$VERSION/heretic.ygd - /usr/local/share/games/yadex/$VERSION/hexen.ygd - /usr/local/share/games/yadex/$VERSION/strife.ygd - /usr/local/share/games/yadex/$VERSION/strife10.ygd - /usr/local/[share/]man/man6/ybsp.6 - /usr/local/[share/]man/man6/yadex.6 + Beware, the installation OVERWRITES the following files (assuming + you're installing in /usr/local) : + /etc/yadex/$VERSION/yadex.cfg + /usr/local/bin/yadex + /usr/local/bin/yadex-$VERSION + /usr/local/man/man6/yadex.6 + /usr/local/man/man6/yadex-$VERSION.6 + /usr/local/share/games/yadex/$VERSION/doom.ygd + /usr/local/share/games/yadex/$VERSION/doom02.ygd + /usr/local/share/games/yadex/$VERSION/doom04.ygd + /usr/local/share/games/yadex/$VERSION/doom05.ygd + /usr/local/share/games/yadex/$VERSION/doom2.ygd + /usr/local/share/games/yadex/$VERSION/doompr.ygd + /usr/local/share/games/yadex/$VERSION/heretic.ygd + /usr/local/share/games/yadex/$VERSION/hexen.ygd + /usr/local/share/games/yadex/$VERSION/strife.ygd + /usr/local/share/games/yadex/$VERSION/strife10.ygd CONFIGURING AND RUNNING Before you run Yadex, you need to tell it where to find your iwads. - Open /usr/local/etc/yadex/$VERSION/yadex.cfg with your favourite - text editor and insert the appropriate values for the parameters - "iwad1", "iwad2", etc. If you don't want Doom II to be the default - iwad, also change the value of the "game" parameter. + Assuming you have installed in /usr/local, open + /etc/yadex/$VERSION/yadex.cfg with your favourite text editor and + insert the appropriate values for the parameters "iwad1", "iwad2", + etc. If you don't want Doom II to be the default iwad, also change + the value of the "game" parameter. You can now run Yadex by typing : @@ -74,11 +75,14 @@ Have fun ! DOCUMENTATION - There are man pages and quite a lot of documentation, most of it in + There is a man page and quite a lot of documentation, most of it in HTML format. Start at : doc/index.html + If you're upgrading from a previous version of Yadex, please read + carefully CHANGES. + STATUS Yadex is work in progress. It still lacks important features like a better interface, cut-and-paste, undo/redo, support for Boom and @@ -86,23 +90,40 @@ code is a horrible mess. I'm not proud of it. Be indulgent. LEGAL - Yadex is GPL'd libre software. It incorporates code from DEU 5.21 - that was put in the public domain in 1994 by Raphal Quinet and - Brendon Wyber. The rest is Copyright 1997-2000 Andr Majorel. - - Now comes the part I like best : This program is free software; you - can redistribute it and/or modify it under the terms of the GNU - General Public License as published by the Free Software Foundation; - either version 2 of the License, or (at your option) any later - version. This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied warranty - of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. You should have received a - copy of the GNU General Public License along with this program; if - not, write to the Free Software Foundation, Inc., 675 Mass Ave, - Cambridge, MA 02139, USA. + 1. Yadex + + $COPYRIGHT_TXT + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + 2. Atclib + + The Yadex distribution includes a subset of Atclib. + + Atclib is copyright Andr Majorel 1995-1999 and distributed under + the terms of version 2 of the GNU Library General Public License. + + 3. Boost - All trademarks are the propriety of their owners. + The Yadex distribution includes a subset of Boost 1.25.0. Boost + 1.25.0 is copyright various authors and released under the following + terms : Permission to copy, use, modify, sell and distribute this + software is granted provided this copyright notice appears in all + copies. This software is provided "as is" without express or + implied warranty, and with no claim as to its suitability for any + purpose. CONTACT See doc/contact.html for addresses. diff -uaNr yadex-1.5.2/docsrc/contact.html yadex-1.6.0/docsrc/contact.html --- yadex-1.5.2/docsrc/contact.html 1999-08-13 19:05:09.000000000 +0200 +++ yadex-1.6.0/docsrc/contact.html 2003-03-26 19:34:18.000000000 +0100 @@ -24,25 +24,25 @@

Mailing lists

-

yadex-announce
Announcements regarding Yadex. This is a very low-volume list.

To subscribe to yadex-announce, send a message -to listar@middleearth.telefragged.com with +to ecartis@freelists.org with "subscribe yadex-announce" as the subject.

To unsubscribe from yadex-announce, send a -message to listar@middleearth.telefragged.com with +message to ecartis@freelists.org with "unsubscribe yadex-announce" as the subject.

You cannot post to this list. -

yadex +
yadex
General discussions about Yadex. On-topic subjects include questions, bug reports, suggesting and discussing features, @@ -52,18 +52,18 @@ href="help.html">somewhere else.

To subscribe to yadex, send a message to listar@middleearth.telefragged.com with +href="mailto:ecartis@freelists.org" +>ecartis@freelists.org with "subscribe yadex" as the subject.

To unsubscribe from yadex, send a message to listar@middleearth.telefragged.com with +href="mailto:ecartis@freelists.org" +>ecartis@freelists.org with "unsubscribe yadex" as the subject. -

To post to yadex, send mail to yadex@middleearth.telefragged.com. +

To post to yadex, send mail to +spambait@freelists.org (except that it's +yadex, not spambait).

When following up to the list, quote only the relevant parts of the original message. Your efforts to keep the signal/noise @@ -74,8 +74,16 @@

Maintainer

-The current maintainer is Andr Majorel <amajorel@teaser.fr> +

Send all email to spambait@freelists.org, +not to me.

+ +

The current maintainer is Andr Majorel http://www.teaser.fr/~amajorel/.

+ +

Send all email to spambait@freelists.org, +not to me.

+ +(It's really yadex, not spambait).

AYM $SELF_DATE diff -uaNr yadex-1.5.2/docsrc/copyright yadex-1.6.0/docsrc/copyright --- yadex-1.5.2/docsrc/copyright 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/docsrc/copyright 2003-02-11 14:17:59.000000000 +0100 @@ -0,0 +1,5 @@ +Apted Andrew 2000-2001 GPL +Majorel Andr 1997-2003 GPL +Miller Matthew W. 2000 GPL +Quinet Raphal 1993-1994 PD +Wyber Brendon 1993-1994 PD diff -uaNr yadex-1.5.2/docsrc/credits.html yadex-1.6.0/docsrc/credits.html --- yadex-1.5.2/docsrc/credits.html 2000-08-19 16:41:30.000000000 +0200 +++ yadex-1.6.0/docsrc/credits.html 2003-03-28 18:57:49.000000000 +0100 @@ -153,16 +153,20 @@

As for Yadex per se, the contributors are :

-
Andrew Apted -
Wrote the ygd for EDGE. Final Doom testing. +
Andrew J. Apted (AJA) +
Wrote the ygd for Boom and EDGE. Variables digit_zoom_base, + digit_zoom_step and blindly_swap_sidedefs. Final + Doom testing.

Jean Forget (JF)
Provided the base of the "youngest" perl script.

Matthew W. Miller + (MWM) +
Wrote most of strife.ygd. -

Andr Majorel (AYM) +

Andr Majorel (AYM)
Did the rest ;-).
@@ -173,13 +177,7 @@ include, by alphabetical order :

-

Pierre Baillargeon <pb@artquest.net> -
C++ help. - -

Carl Barron <cbarron3@ix.netcom.com> -
C++ help. - -

Joseph Carter <knghtbrd@debian.org> +
Joseph Carter <knghtbrd@debian.org>
Debian package. Convinced me to support /usr/local/share/man/. Put up with my sick makefiles. @@ -187,8 +185,8 @@
A post by him and another one by Nathan Lucas in r.g.c.d.e. led to the development of the "save image to a file" feature. Gave thorough reports. -

David Ferguson <DavidFerguson@NOcsiSPAM.com> -
C++ help. +

Max Heijndijk +
RPM package.

Joe Koperski <joekoperski@hotmail.com> (JK)
Encouragements. @@ -196,32 +194,35 @@

Oliver Kraus <lrs.e-technik.uni-erlangen.de>
Helped with Solaris port. +

Ingo van Lil +
Bug reports and suggestions. +

Udo Munk <um@compuserve.com> (UM)
Requested scrolling with arrow keys and possibility to disable the autoscrolling. Helped a lot with Final Doom compatibility and porting - issues. Wrote XDoom - and Xwadtools. + issues. Wrote XDoom and Xwadtools.

Kim "Sparky" Parrott <kelm@eisa.net.au>
Indirect bug report.

Colin Phipps -
Encouragements. Wrote the FreeBSD testing. Wrote the fix for two bugs in - BSP 2.3. Wrote LxDoom. + BSP 2.3. Wrote LxDoom. Now + maintains BSP.

Len Pitre
Helped with Strife support. -

John Potter <jpotter@falcon.lhup.edu> -
C++ help. +

Jrme Raciazek +
Let me play with his QNX machine.

"Ras2" -
More bug reports than everybody else combined. - -

Atgeirr F. Rasmussen <atgeirr@sintef.no> -
C++ help. +
More bug reports than everybody else combined. Provides a mirror of the + web page.

Josh R. Ray <joshray@prodigy.net> (JRR)
Encouragements. @@ -239,9 +240,6 @@ splitting, single-key linedefs of sector splitting and scrolling with arrow keys. -

Ivan Vecerina <ivec@mail.com> -
C++ help. -

The Wildman
Encouragements. @@ -249,6 +247,19 @@
Figured out the picture format for the Doom alpha and press release versions and told us about it on rgcde. Without him, Yadex probably wouldn't support them. + +

Pierre Baillargeon <pb@artquest.net> +
Carl Barron <cbarron3@ix.netcom.com> +
David Ferguson <DavidFerguson@NOcsiSPAM.com> +
John Potter <jpotter@falcon.lhup.edu> +
Atgeirr F. Rasmussen <atgeirr@sintef.no> +
Ivan Vecerina <ivec@mail.com> +
C++ help. + +

Benjamin Bayart +
Ouafae Kotby +
diff consulting. +

If I'm forgetting you, pardon my mistake and please send me a @@ -277,7 +288,7 @@ The rgcders for their interesting answers and questions. The level designers who have made all the wonderful levels and graphics I've been admiring. -Linuxgames for providing the mailing list. +Linuxgames and freelists.org for providing the mailing lists. The makers of the internet for connecting us all. All the other people who help making this world bearable. diff -uaNr yadex-1.5.2/docsrc/editing_docs.html yadex-1.6.0/docsrc/editing_docs.html --- yadex-1.5.2/docsrc/editing_docs.html 1999-08-13 19:05:53.000000000 +0200 +++ yadex-1.6.0/docsrc/editing_docs.html 2003-03-27 20:20:16.000000000 +0100 @@ -22,27 +22,27 @@

General editing

@@ -58,11 +58,11 @@

Special effects

AYM $SELF_DATE diff -uaNr yadex-1.5.2/docsrc/feedback.html yadex-1.6.0/docsrc/feedback.html --- yadex-1.5.2/docsrc/feedback.html 1999-08-13 18:24:30.000000000 +0200 +++ yadex-1.6.0/docsrc/feedback.html 2003-04-01 00:00:00.000000000 +0200 @@ -29,23 +29,16 @@ yadex mailing list. +

Yes, suggestions to switch to toolkit x have +already been offered for most values of x. +There even is a FAQ item. +

For a list of known issues and solutions that have been considered, see TODO.

Contributions

-

Contributions are welcome. Should you ever get short of ideas, -you'll find plenty in TODO :-). -Guidelines for contributors : - -

    -
  • read TODO, -
  • talk to the the current maintainer first ! The -job you want to do might be already underway, or might be -conflicting with something else, -
  • read the hacker's guide. -
+

See the hacker's guide.

AYM $SELF_DATE diff -uaNr yadex-1.5.2/docsrc/getting_started.html yadex-1.6.0/docsrc/getting_started.html --- yadex-1.5.2/docsrc/getting_started.html 2000-01-10 21:47:35.000000000 +0100 +++ yadex-1.6.0/docsrc/getting_started.html 2003-03-31 19:28:26.000000000 +0200 @@ -59,12 +59,12 @@ The installation procedure will try to copy files in the following directories, creating the directories if they don't exist ;
    +
  • /etc/yadex/$VERSION
  • /usr/local/bin -
  • /usr/local/etc/yadex -
  • /usr/local/share/games/yadex +
  • /usr/local/share/games/yadex/$VERSION

So make sure you have the necessary rights before installing -(or change the makefile). +(or install in a different location).

Display

@@ -99,9 +99,11 @@

Don't forget to tell Yadex where your iwads are by changing the lines "iwad1 =", "iwad2 =" etc. in -/usr/local/etc/version/yadex.cfg. If -there is an iwad you don't have, you can just comment out the -corresponding line. +~/.yadex/yadex.cfg or +/etc/yadex/$VERSION/yadex.cfg (the actual location +might be different if you compiled with another prefix than the +default). If there is an iwad you don't have, you can just +comment out the corresponding line.

2. Quick start

@@ -324,13 +326,14 @@ strange results or you'll crash the game.

There are several nodes builders around. One of the best is -BSP 2.3. Lee Killough kindly allowed me to include it with the -Yadex distribution. To build the nodes on your level with BSP -and then test it with Doom, type something along the lines -of : +BSP, which you can download from http://doombsp.sourceforge.net/. To build the nodes +on your level with BSP and then test it with Doom, type +something along the lines of : 

-$ ybsp mywad.wad -o final.wad
+$ bsp -o final.wad mywad.wad
 $ doom -file final.wad
diff -uaNr yadex-1.5.2/docsrc/hackers_guide.html yadex-1.6.0/docsrc/hackers_guide.html --- yadex-1.5.2/docsrc/hackers_guide.html 2000-07-23 23:03:44.000000000 +0200 +++ yadex-1.6.0/docsrc/hackers_guide.html 2003-04-01 00:00:00.000000000 +0200 @@ -1,6 +1,21 @@ Yadex hacker's guide + + @@ -13,6 +28,69 @@

+

Read this first

+ +Before you start hacking—no, before you even +think about hacking—Yadex, you should do +this : + +
+
Read the TODO file + +
+ Many possible improvements and fixes have been identified + and sometimes a particular approach has already been decided + on and written down in TODO. Yes it's tedious + reading. But if you skip it, you run the risk of seeing your + work go to waste because it's in conflict with an earlier + plan. + +
Read the hacker's guide + +
+ Patches that don't at the minimum abide by the + coding standards and other guidelines in this document are + not very likely to be accepted. + +
Subscribe to the yadex list + +
+ The mailing list is the way by which users and developers + communicate. Subscribe to the list and do all communication + through the list. It allows developers to coordinate and to + benefit from the feedback of all other developers and users. + +

+ For whatever reason, some contributors seem to think they + don't need to subscribe to the list. But the need for + coordination remains. Each contributor needs a + communication channel with the rest of the project. If + it's not the mailing list, it'll probably be the + maintainer (me) and I don't want to have to play the role + of a mailing list digest server. +

+ +

+ Having a single many-to-many communication channel is + better than having many one-to-one channels because you + don't have to repeat the same thing n times to + n people. +

+ +

+ The mailing list is archived and the archives are publicly + accessible by anyone at any time. Private mail isn't. +

+ +
Post on the list about your plans + +
+ The job you want to do might be already underway, or might + be conflicting with something else. + +
+

Blah

Foreword

@@ -877,15 +955,18 @@

Indent style

-I use the Whitesmiths style with an indent width of 3. +BSD style with an indent width of 2.
  • tab stops every 8 characters, -
  • indent width is 3 spaces, +
  • indent width is 2 spaces,
  • line width limited to 80 characters,
  • the braces have the same indentation as the text they contain,
  • the body of a function is not indented.
+Many files still use Whitesmiths with an indent width of 3. They +will be reformatted. + Whitespace :
  • one space between the name of the function/statement and the "(", @@ -907,15 +988,15 @@ 

    static const char *foo (int n)
 {
-for (stuff; stuff; stuff)
-   {
-   if (thingie || gadget ())
+  for (stuff; stuff; stuff)
+  {
+    if (thingie || gadget ())
       call_this_one (with, three, exactly[arguments]);
-   else
+    else
       dont ();
-   call_that_one ();
-   }
-return NULL;
+    call_that_one ();
+  }
+  return NULL;
 }

    Identifiers

    @@ -928,6 +1009,50 @@

    I consistently use the English spelling (E.G. "colour", not "color"). +

    Conditionals

    + +The argument of if and while and the +second argument of for are booleans, not integers, +so you should provide a boolean expression. The following +expressions are not booleans : + +
      +
    • pointers, +
    • the return value of strcmp(), +
    • the return value of functions to return 0 to indicate + success and non-zero to indicate failure, +
    + +Therefore, don't write + +

    +if (! fopen (filename, "r"))  // Test for failure
+  ...
+if (strcmp (str1, str2))  // Test for non-equality
+  ...
+if (! strcmp (str1, str2))  // Test for equality
+  ...
+if (remove (filename))  // Test for failure
+  ...
+

    + +but + +

    +if (fopen (filename, "r") == NULL)
+  ...
+if (strcmp (str1, str2) != 0)
+  ...
+if (strcmp (str1, str2) == 0)
+  ...
+if (remove (filename) != 0)
+  ...
+

    + +On the other hand, when an expression is a boolean, you don't +need to add anything. Don't write if (boolvar == +true). +

    General style

    My general style is to try to make it look clear and pretty. If there diff -uaNr yadex-1.5.2/docsrc/help.html yadex-1.6.0/docsrc/help.html --- yadex-1.5.2/docsrc/help.html 1999-08-13 18:24:39.000000000 +0200 +++ yadex-1.6.0/docsrc/help.html 2003-03-26 19:19:53.000000000 +0100 @@ -15,11 +15,10 @@

    The preferred place to put a question about Yadex is the yadex mailing -list. Alternatively, you can mail the maintainer (me). I'll be -happy to help you if I can. Just be nice with me by not making -me answer the same questions over and over. Many common -questions are already answered in the documentation. +list. + +

    Do not mail the maintainer. Yes, this means you. +Send all mail to the list.

    General Doom editing questions are better answered on diff -uaNr yadex-1.5.2/docsrc/index.html yadex-1.6.0/docsrc/index.html --- yadex-1.5.2/docsrc/index.html 1999-12-10 23:32:14.000000000 +0100 +++ yadex-1.6.0/docsrc/index.html 2002-05-09 15:36:06.000000000 +0200 @@ -18,6 +18,7 @@

  • Getting started
  • User's guide
  • Tips +
  • FAQ

Any trouble ?

@@ -26,6 +27,7 @@
  • Troubleshooting
  • Reporting bugs
  • Getting help +
  • FAQ

    Additional documents

    @@ -35,10 +37,10 @@
  • Advanced user's guide
  • TODO
  • The man page for Yadex -
  • The man page for BSP
  • Yadex game definition files
  • Wad specs
  • Hacker's guide +
  • Packager's guide
  • Differences between Yadex and DEU 5.21 diff -uaNr yadex-1.5.2/docsrc/keeping_up.html yadex-1.6.0/docsrc/keeping_up.html --- yadex-1.5.2/docsrc/keeping_up.html 1999-08-13 18:24:45.000000000 +0200 +++ yadex-1.6.0/docsrc/keeping_up.html 2003-03-31 23:48:46.000000000 +0200 @@ -27,10 +27,12 @@ href="news:rec.games.computer.doom.editing" >rec.games.computer.doom.editing and Freshmeat. Several news sites -such as Doomworld, Linux Game Tome -and Linuxgames have -been witnessed to echo the announcements. +such as Doom center, Doomworld, Linux Game Tome, New Doom and Linuxgames have been +witnessed to echo the announcements.

    To download the latest version, see the Yadex home page. diff -uaNr yadex-1.5.2/docsrc/packagers_guide.html yadex-1.6.0/docsrc/packagers_guide.html --- yadex-1.5.2/docsrc/packagers_guide.html 1970-01-01 01:00:00.000000000 +0100 +++ yadex-1.6.0/docsrc/packagers_guide.html 2003-04-01 00:00:00.000000000 +0200 @@ -0,0 +1,79 @@ + + + Yadex packager's guide + + +

    + Fancy logo +
    Yadex $VERSION ($SOURCE_DATE) +

    Packager's guide

    + + + + + + +
    + + This is for people who plan to package Yadex. + +
    +
    + +
    +
    +
    + +

    So you want to package Yadex ? Here is a list of things you should + probably know :

    + +

    +

      +

    • To make it install in /usr instead of + /usr/local, re-run configure with the right + --prefix option, type make clean && make + all. That's all there is to it.

      + +

      You shouldn't have to make any manual changes ; most + references to the prefix in the documentation and elsewhere use the + files generated by configure (you'll have to make + clean, however). One possibly undesirable consequence of this + is that the doc from your package and the doc that one would get + after installing from the source will not be identical. I suppose it + doesn't matter.

      + +

    • From version 1.6 on, alternative prefixes are better supported + but the behaviour has changed somewhat. Instead of looking for files + in both /usr and /usr/local, Yadex uses + only the prefix directory. The goal was to reduce the unwanted + interactions between Yadexes installed with different prefixes on the + same system. Since packagers typically use /usr, users + should be able to have on their system both the original and the + packaged version of Yadex. (Incidentally, that's not true for + /etc/yadex/$VERSION/yadex.cfg but the FHS is to + blame).

      + +

    • To allow one to have several different versions installed at the + same time on the same system, Yadex uses a somewhat unusual scheme + where each file installed has the version number somewhere in its + pathname. If your packaging system allows version n + 1 to + have a different set of files than version n of the same + package, this should cause no problem. In fact, if the package + manager allows that, two different versions of the package could + coexist (except that they would overwrite each other's symlinks in + bin/ and man/, but that's what they're + for). + +

      If you have problems with that scheme, let me know.

      + +

    • If you actually try to understand the makefile, you're going to + end up hating me.

      + +
    +

    + +

    AYM $SELF_DATE

    + + + + diff -uaNr yadex-1.5.2/docsrc/reporting.html yadex-1.6.0/docsrc/reporting.html --- yadex-1.5.2/docsrc/reporting.html 2000-08-27 23:18:02.000000000 +0200 +++ yadex-1.6.0/docsrc/reporting.html 2003-04-01 00:00:00.000000000 +0200 @@ -13,9 +13,10 @@

    -

    If you find a bug, tell me about it. It's important. Especially -if it makes Yadex crash or lose data. However, there are a few -things to bear in mind : +

    If you find a bug, tell the list about it. It's +important. Especially if it makes Yadex crash or lose data. +However, there are a few things to bear in mind :

    -

    Iwad

    +

    1.2.1. Iwad

    A shareware Doom or Heretic iwad or a demo Hexen or Strife iwad is okay but you need a registered iwad if you want to be able to save your changes. -

    Directories

    +

    1.2.2. Directories

    + +

    Yadex mostly conforms to the FHS (filesystem hierarchy +standard). By default, the installation procedure will try +to copy files in the following directories, creating the +directories if they don't exist ; -

    Yadex conforms to the -FHS (filesystem hierarchy standard). -The installation procedure will try to copy files in the following -directories, creating the directories if they don't exist ;

    • /usr/local/bin -
    • /usr/local/etc +
    • /etc/yadex/$VERSION
    • /usr/local/man/man6 -
    • /usr/local/share/games +
    • /usr/local/share/games/yadex/$VERSION
    -

    So make sure you have the necessary rights before installing -(or change the makefile). -

    Display

    +

    So make sure you have the necessary rights before installing. +If you don't, install in a different directory by running +./configure with the --prefix option. + +

    1.2.3. Display

    Yadex uses about 270 different colours. In most cases, on PseudoColor displays, there aren't that many free colour cells. So, if it detects a PseudoColor display, Yadex uses a private colormap so as to get as many free colour cells as possible. -The inconvenient of this method is that, when you're in the -Yadex window, all other windows are displayed with wrong colours -and vice-versa. +The drawback of this method is that, when you're in the Yadex +window, all other windows are displayed with wrong colours and +vice-versa.

    What's more, as PseudoColor displays typically have 256 colours (at least on PC), which is less than the number of @@ -173,8 +230,6 @@ to render the colours of the game accurately at the expense of the application colours. -

    Monochrome displays might work but they have not been tested. -

    Executive summary: if you can, use a TrueColor or DirectColor display and a depth of more than 8 bits per pixel (E.G. by launching X with "startx -- -bpp 16"). @@ -182,22 +237,21 @@

    A 640x480 screen is okay though, of course, a larger display is better. -

    Compiling and installing Yadex

    +

    1.3. Compiling and installing Yadex

    See README.

    Don't forget to tell Yadex where your iwads are by changing the lines "iwad1 =", "iwad2 =" etc. in -/usr/local/etc/yadex/version/yadex.cfg. +/etc/yadex/$VERSION/yadex.cfg. If there is an iwad you don't have, you can just comment out the corresponding line. -

    -

    - 2. Running Yadex

    +
    +

    2. Running Yadex

    -

    The command line arguments

    +

    2.1. The command line arguments

    Yadex takes two sorts of command line arguments : parameters and options. An option is a command line argument @@ -236,7 +290,7 @@ of specifying pwad names are discussed there. -

    Options

    +

    2.2. Options

    To know about the command line options that Yadex understands, type @@ -245,7 +299,7 @@

    You'll get this: -

    +
     -b                 string     Run benchmark and exit successfully
 -f  -config_file   string     Config file
 -d  -debug                    Debug mode
@@ -285,8 +339,8 @@
 compatibility with previous versions of Yadex/Yade/DEU. Don't
 use them. They might go away one day.
 
-		
    
-		Specifying the game for which you want to edit
    
+		
    2.3. Specifying the game for which
+		you want to edit
    
 
 
    Yadex can handle several games (Doom, Doom II, Heretic, etc.)
 but only one at a time. Unfortunately, that game can't be
@@ -334,15 +388,16 @@
 
    Not all those games are fully supported. For details, see there.
 
-		
    
-		Specifying the names of pwads to load
    
+
+		
    2.4. Specifying the names of
+		pwads to load
    
 
 
    When you have to specify the name of a pwad to load, for
 example in the r command, or as a command line
 argument, you don't always have to spell it all out.
 
 
      
-  
    • The .wad extension can be omitted, it will
+  
    • The .wad extension can be omitted, it will
     be added automatically.  For example, specifying the name
     "foo" is equivalent to specifying
     "foo.wad".  An unfortunate consequence of this
@@ -351,11 +406,15 @@
     can still work around this limitation by specifying the name
     with a trailing dot, ("foo.").
 
-  
    • The path can sometimes be omitted too, if the wad is in
-    one of the standard directories, or one of their
-    subdirectories.  If no file of the name you specified is
-    found in the current directory, Yadex will look for a file
-    of that name in the standard directories, which are :
+  
    • 
+    
      
+      The path can sometimes be omitted too, if the wad is in
+      one of the standard directories, or one of
+      their subdirectories.  If no file of the name you
+      specified is found in the current directory, Yadex will
+      look for a file of that name in the standard directories,
+      which are :
+    
      
 
     
        
       
      1. your home directory,
@@ -365,8 +424,8 @@
       
      2. /usr/share/games/wads,
     
      
 
-    (where game is the name of the game).
+    
      (where game is the name of the game).
      
 
     
      On the other hand, if you give an absolute file name,
     that is one that begins with a "/", the
@@ -375,7 +434,7 @@
 
     
      For example, if you type "yadex -g doom2
     foo/bar", Yadex will look for the following files in
-    order :
+    order :
      
 
     
        
       
      1. ~/foo/bar.wad,
@@ -385,7 +444,7 @@
       
      2. /usr/share/games/wads/foo/bar.wad,
     
      
 
-    and open the first it finds.
+    
      and open the first it finds.
      
 
     
      But if you type
     "yadex -g doom2 /foo/bar" (note
@@ -406,7 +465,7 @@
 always have to specify the exact name, with the full path and
 extension.
 
-		
      Environment variables
      
+		
      2.5. Environment variables
      
 
 
      
   
      DOOMWADDIR
@@ -417,17 +476,29 @@
   
      Unix only. The name of the X display that Yadex will try
     to connect to.
 
+  
      HOME
+  
      Used to expand ~ when locating configuration
+    and game definition files.
+
+  
      LINES
+  
      If set, Yadex assumes the tty has that many lines instead
+    of 24. The value must be an unsigned, non-zero decimal
+    integer.
+
+  
      TMPDIR
+  
      If set, swap files are created there. Otherwise, in
+    /tmp.
+
   
      YADEX_GAME
   
      Indicates the game to use. Overrides the game
     parameter in the config file, is overridden by the
     -g command line option.
 
      
 
-	
      
-	
      
-	3. Editing levels with Yadex
      
+	
      
+	
      3. Editing levels with Yadex
      
 
-		
      Using external textures, flats, etc.
      
+		
      3.1. Using external textures, flats, etc.
      
 
 
      Like Doom, Yadex accepts the addition and replacement of
 resources from a pwad. In general, if the same resource is
@@ -435,10 +506,10 @@
 also true if the same resource is defined several times in the
 same wad. It's not recommended that you use lower case names in
 your wads; sometimes it's handled but sometimes it's not. So
-always use upper-case names.
+always use upper-case names.
      
 
 
      
-  
      Flats
+  
      Flats
   
      New or replacement flats are recognized iff they're placed
     between FF_START/F_END or
     FF_START/FF_END labels. There can
@@ -447,12 +518,12 @@
     don't have to be in the same pwad. If there are several
     lumps for the same flat, the last one is used.
 
-  
      Palette
+  
      Palette
   
      If there is a replacement PLAYPAL lump, it's
     used. If there are several PLAYPAL lumps, the
     last one is used.
 
-  
      Patches
+  
      Patches
   
      New or replacement patches are recognized iff they're
     between P_START and P_END or
     PP_START and PP_END. Within a
@@ -466,7 +537,7 @@
     lumps, the last one is used. If there are several lumps for
     the same flat, the last one is used.
 
-  
      Sprites
+  
      Sprites
   
      New or replacement sprites are recognized iff they're
     between one of the following pair of labels :
     S_START/S_END,
@@ -476,7 +547,7 @@
     pwad. If there are several lumps for the same sprite, the
     last one is used.
 
-  
      Textures
+  
      Textures
   
      New or replacement textures are recognized iff they're in
     a TEXTURE1 or TEXTURE2 lump. If
     the same texture happens to be defined in both
@@ -490,7 +561,7 @@
     supposed to exist, like Doom II.
 
      
 
-		
      Logging of time spent
      
+		
      3.2. Logging of time spent
      
 
 
      If you edit a level from a file and there exists a file in
 the same directory with the same name but with the extension
@@ -507,19 +578,19 @@
 logging, you need to manually create the log file first with a
 command such as "touch name.yl".
 
-		
      The prompt commands
      
+		
      3.3. The prompt commands
      
 
 
      You can get a summary of the prompt commands
 by typing "?" at the Yadex prompt.
 
-		
      Moving around
      
+		
      3.4. Moving around
      
 
-			
      Moving the pointer
      
+			
      3.4.1. Moving the pointer
      
 
 
      In the X11 version, the only way to do that is to
 move the pointer device (i.e. the mouse).
 
-			
      Scrolling
      
+			
      3.4.2. Scrolling
      
 
 
      The arrow keys [Left], [Right],
 [Up] and [Down] scroll a little at a time,
@@ -533,7 +604,7 @@
 the exact amount by setting the variable
 scroll_more in the configuration file.
 
-			
      Autoscrolling
      
+			
      3.4.3. Autoscrolling
      
 
 
      By default, autoscrolling is disabled. You can enable it by
 setting autoscroll to true in the
@@ -548,7 +619,7 @@
 
      You can fine tune autoscrolling by changing the variables
 autoscroll_amp and autoscroll_edge.
 
-			
      Jumping
      
+			
      3.4.4. Jumping
      
 
 
      I plan to develop a full set-mark/jump-to-mark system similar
 to the one in vi, with
@@ -564,32 +635,40 @@
 is adjusted so that the whole map is visible and almost fills
 the screen/window.
 
-		
      Zooming in and out
      
+		
      3.5. Zooming in and out
      
 
 
      The current zoom factor is shown on the info bar, after the
 word "Scale:". It is shown in pixels per map
-units. The indication "Scale: 1/2" means that one
+units. The indication "Scale: 50%" means that one
 pixel of the display corresponds to 2 map units.
 
 
      You can zoom in by pressing [+] or [=]
-or the 4th mouse button or by moving the mouse wheel "up".
+or the 4th mouse button or by moving the mouse wheel "up". See
+the zoom_default and zoom_step
+variables.
 
 
       You can zoom out by pressing [-] or
 [_] or the 5th mouse button or by moving the mouse
-wheel "down".
+wheel "down". See the zoom_default and
+zoom_step variables.
 
 
       You can also set the zoom factor directly with the keys
-[0] through [9].
+[1] through [9] and [0].
+[1] sets the zoom factor to a value that is
+controlled by the digit_zoom_base variable (by
+default, 100%). Each successive key down the keyboard sets the
+zoom factor digit_zoom_step percents higher than
+the previous one (by default, -29%).
 
-		
      The grid
      
+		
      3.6. The grid
      
 
-
      The grid is a square mesh of blue lines in the
-background. It's here to help you aligning your objects
+
      The grid is a square mesh of blue dots and lines
+in the background. It's here to help you aligning your objects
 correctly with regard to Doom's metrics, which will save you a
 lot of textures misalignments.
 
 
       When you insert or drag objects, they are snapped to
-grid. That is Yadex prevents you from placing them
+grid. That is, Yadex prevents you from placing them
 off the grid. You can toggle the snap_to_grid flag
 by pressing [y].
 
@@ -613,7 +692,7 @@
 
 
      You can also use [H] to reset the grid step.
 
-		
      Inserting objects
      
+		
      3.7. Inserting objects
      
 
 
      By pressing [Ins], you insert a new object under
 the pointer.
@@ -624,13 +703,13 @@
 always true, particularly if some objects are already
 selected :
 
-
        
+
          
   
        • If you are in vertices mode and there are two or more
   vertices selected, pressing [Ins] will insert a
   linedef from the first vertex to the second, another one from
   the second to the third and so on. That is, a path of linedefs
   is created from the first to the last vertex. The path is not
-  closed.
+  closed (but see [Shift][Ins] below).
 
   
        • If you are in linedefs mode and there are selected
   linedefs, pressing [Ins] will create a new sector
@@ -649,9 +728,9 @@
 you press [Ins], the properties of the new object are
 copied from the highlighted object. In other words, the
 highlighted object serves as a "model". Else the properties of
-the new object are set to default values.
+the new object are set to default values.
          
 
-
          
+
          
   
          
     Object type
     Property
@@ -756,9 +835,15 @@
   
          
     Vertex
     Coordinates
+  
          
 
          
 
-		
          Copying objects
          
+
          In vertex mode, pressing [Shift][Ins]
+is the same as pressing [Ins] except that the path is
+closed (an additional linedef is created from the last to the
+first vertex).
+
+		
          3.8. Copying objects
          
 
 
          When you press [o], the selected or highlighted
 object(s) is(are) copied. If only one object has been copied,
@@ -808,26 +893,26 @@
 special precautions to take when duplicating them. Except for
 the position, the copy is exactly identical to the original.
 
-		
          Deleting objects
          
+		
          3.9. Deleting objects
          
 
 To be written. There is already a concise description in the getting started document.
 
 
          Basically, use [Del].
 
-		
          Changing the properties of objects
          
+		
          3.10. Changing the properties of objects
          
 
 To be written. There is already a concise description in the getting started document.
 
 
          Executive summary: use [Return] and double-click.
 
-		
          Moving objects a.k.a. drag-and-drop
          
+		
          3.11. Moving objects a.k.a. drag-and-drop
          
 
 To be written. There is already a concise description in the getting started document.
 
-		
          Renumbering objects
          
+		
          3.12. Renumbering objects
          
 
 Normally, you don't have to worry very much about the actual
 numbers of the linedefs, sectors, sidedefs, things and vertices
@@ -840,29 +925,29 @@
 
 
            
   
          • if you have several player 1 starts in your level (which
-  is how the voodoo doll trick is done), it's the
-  lowest-numbered one that the player incarnates in at level
-  start,
-
-  
          • if there are several teleport exits in the same sector, I
-  think only the lowest-numbered one is used (but I don't know
-  of any interesting application of this fact),
+    is how the voodoo doll trick is done), it's the
+    highest-numbered one that the player incarnates in at level
+    start,
+
+  
          • if there are several teleport exits in the same sector,
+    only the lowest-numbered one is used (but I don't know of
+    any interesting application of this fact),
 
   
          • if there are several superimposed linedefs, the
-  lowest-numbered one is drawn like it was in front,
+    lowest-numbered one is drawn like it was in front,
 
   
          • BSP's transparent doors need one of the door tracks to be
-  the lowest-numbered linedef,
+    the lowest-numbered linedef,
 
   
          • certain linedef types apply only to the lowest-numbered of
-  the tagged sectors (IIRC),
+    the tagged sectors (IIRC),
 
   
          • raising stairs use the lowest-numbered linedef.
 
          
 
 
          So how do you control the ordering of objects ?
 
-			
          Exchanging objects numbers
          
+			
          3.12.1. Exchanging objects numbers
          
 
 This function works the same way in all modes. If you select
 exactly two objects and press [Ctrl-x] (or use
@@ -886,7 +971,7 @@
 it by replacing true by false in the
 call to exchange_objects_numbers().)
 
-		
          Selecting objects
          
+		
          3.13. Selecting objects
          
 
 There are several ways to select objects. The simplest is to
 click on an object with the left mouse button. By default, when
@@ -913,19 +998,21 @@
 
          To use the first, you must first highlight a linedef. Then
 press [e]. All the linedefs that belong to the same
 non-forked path as the highlighted linedef are selected. For
-example :
+example :
          
 
-

          
+
          
-    
+    
+  
-    
+    
+  
          
   
          Before pressing [e]
-    After pressing [e]
+    Before pressing [e]After pressing [e]
          
   
          Before pressing [e]
-    After pressing [e]
+    Before pressing [e]After pressing [e]
          
 
          
 
-

          Note how the selection stop at the first fork in the
-path.  That kind a path selection is good to select a path of
+
          Note how the selection stop at the first fork in the
+path. That kind a path selection is good to select a path of
 single- or double-sided linedefs that belong to the same sector.
 
 
          The other variant of path selection is better to select all
@@ -933,18 +1020,20 @@
 sides face the same sector. To use it, highlight a single-sided
 linedef and press [E]. All the single-sided linedefs
 that belong to the same path as the original one are
-highlighted. For example :
+highlighted. For example :
          
 
-

          
+
          
-    
+    
+  
-    
          
   
          Before pressing [E]
-    After pressing [E]
+    Before pressing [E]After pressing [E]
          
   
          Before pressing [E]
-    After pressing [E]
-  
          
+    Before pressing [E]
+    After pressing [E]
+  
+
 
-

          Note that the selection is not stopped by the forks in
+
          Note that the selection is not stopped by the forks in
 the path.  Also note that the double-sided linedefs are not
 selected.
 
@@ -958,7 +1047,7 @@
 selection (if they weren't). This is actually simpler than it
 sounds.
 
-		
          The use of [Shift]
          
+		
          3.14. The use of [Shift]
          
 
 
          The [Shift] key has an interesting property ; as
 long as you hold it down, the highlight is locked. If an object
@@ -966,57 +1055,68 @@
 pointer over it. Likewise, if an object is already highlighted,
 it remains so, even if you move the pointer away from it.
 
-
           This can be useful in certain occasions, such as when you
+
          This can be useful in certain occasions, such as when you
 want to compare two sectors that have other sectors between
 them.
 
-		
          Sector miscellaneous operations
          
+		
          3.15. Sector miscellaneous operations
          
+
+
          Unless otherwise specified, all the operation below act on
+all the objects in the working set. If there is at
+least one selected object, the working set is equal to the
+selection. If there is no selected object, the working set is
+the currently highlighted object (the object under the pointer).
+If there is no selection and no highlighted object, the
+selection is empty, of course. If there is a selection and an
+object outside the selection, the latter is not part of
+the working set.
          
 
 
          
-  
          Find first free tag number
+  
          Find first free tag number
   
          Displays the smallest tag number greater than 0 and not
     used by any linedef or sector.
 
-  
          Rotate and scale sectors
+  
          Rotate and scale sectors
   
          (description to be written)
 
-  
          Make door from sector
+  
          Make door from sector
   
          (description to be written)
 
-  
          Make lift from sector
+  
          Make lift from sector
   
          (description to be written)
 
-  
          Distribute sector floor heights
+  
          Distribute sector floor heights
   
          (description to be written)
 
-  
          Distribute sector ceiling heights
+  
          Distribute sector ceiling heights
   
          (description to be written)
 
-  
          Raise or lower sectors...
+  
          Raise or lower sectors...
   
          Prompts you for a number (N) and adds that number to the
-    floor and ceiling heights of all selected sectors. If N is
-    positive, this results in raising the sectors by N units. If
-    N is negative, this results in lowering the sectors by -N
-    units.
+    floor and ceiling heights of all the sectors in the working
+    set. If N is positive, this results in raising the sectors
+    by N units. If N is negative, this results in lowering the
+    sectors by -N units.
 
-  
          Brighten or darken sectors...
+  
          Brighten or darken sectors...
   
          Prompts you for a number (N) and adds that number to the
-    light level of all selected sectors. If N is positive, this
-    results in sectors becoming brighter. If N is positive, this
-    results in sectors becoming darker. No light level is
-    decreased below 0 or increased above 255.
+    light level of all the sectors in the working set. If N is
+    positive, this results in sectors becoming brighter. If N is
+    positive, this results in sectors becoming darker. No light
+    level is decreased below 0 or increased above 255.
 
-  
          Unlink room
+  
          Unlink room
   
          This function is not implemented yet.
 
-  
          Mirror horizontally
+  
          Mirror horizontally
   
          This function starts by determining the set S
-    of vertices that are used by the selected sectors. Then all
-    the vertices in S have their x-coordinate changed
-    so that they're "mirrored" around the vertical axis that
-    intersects the geometric centre of S. Finally,
-    all the linedefs whose both vertices belong to S
-    are flipped so that the sector references remain correct.
+    of vertices that are used by the sectors in the working set.
+    Then all the vertices in S have their
+    x-coordinate changed so that they're "mirrored" around the
+    vertical axis that intersects the geometric centre of
+    S. Finally, all the linedefs whose both vertices
+    belong to S are flipped so that the sector
+    references remain correct.
 
     
          This function is designed to be used on either the whole
     level or a group of isolated sectors (like in the
@@ -1034,14 +1134,15 @@
 
     
          See the "Mirror horizontally" linedef function.
 
-  
          Mirror vertically
+  
          Mirror vertically
   
          This function starts by determining the set S
-    of vertices that are used by the selected sectors. Then all
-    the vertices in S have their y-coordinate changed
-    so that they're "mirrored" around the horizontal axis that
-    intersects the geometric centre of S. Finally,
-    all the linedefs whose both vertices belong to S
-    are flipped so that the sector references remain correct.
+    of vertices that are used by the sectors in the working set.
+    Then all the vertices in S have their
+    y-coordinate changed so that they're "mirrored" around the
+    horizontal axis that intersects the geometric centre of
+    S. Finally, all the linedefs whose both vertices
+    belong to S are flipped so that the sector
+    references remain correct.
 
     
          This function is designed to be used on either the whole
     level or a group of isolated sectors (like in the
@@ -1059,132 +1160,163 @@
 
     
          See the "Mirror vertically" linedef function.
 
-  
          Swap flats
-  
          For each selected sector (or the highlighted sector if the
-    selection is empty), exchange the floor texture with the
-    ceiling texture.
+  
          Swap flats
+  
          For each sector in the working set, exchange the floor
+    texture with the ceiling texture.
 
 
          
 
-		
          Thing miscellaneous operations
          
+		
          3.16. Thing miscellaneous operations
          
+
+
          Unless otherwise specified, all the operation below act on
+all the objects in the working set. If there is at
+least one selected object, the working set is equal to the
+selection. If there is no selected object, the working set is
+the currently highlighted object (the object under the pointer).
+If there is no selection and no highlighted object, the
+selection is empty, of course. If there is a selection and an
+object outside the selection, the latter is not part of
+the working set.
          
 
 
          
-  
          Find first free tag number
+  
          Find first free tag number
   
          Displays the smallest tag number greater than 0 and not
-  used by any linedef or sector.
+    used by any linedef or sector.
 
-  
          Rotate and scale things
+  
          Rotate and scale things
   
          (description to be written)
 
-  
          Spin things 45 clockwise
-  
          Subtract 45 to the angle of all selected things. This is
-    not to be confused with "Rotate and scale things" where it's
-    the position of the things that is changed.
-
-  
          Spin things 45 counter-clockwise
-  
          Add 45 to the angle of all selected things. This is not to
-    be confused with "Rotate and scale things" where it's the
-    position of the things that is changed.
-
-  
          Mirror horizontally
-  
          All the selected things have their x-coordinate changed so
-    that they're "mirrored" around the horizontal axis that
-    intersects the geometric centre of the selected things.
-    Their angle is also adjusted.
+  
          Spin things 45 clockwise
+  
          Subtract 45 to the angle of all the things in the working
+    set. This is not to be confused with "Rotate and scale
+    things" where it's the position of the things that
+    is changed.
+
+  
          Spin things 45 counter-clockwise
+  
          Add 45 to the angle of all the things in the working set.
+    This is not to be confused with "Rotate and scale things"
+    where it's the position of the things that is
+    changed.
+
+  
          Mirror horizontally
+  
          All the things in the working set have their x-coordinate
+    changed so that they're "mirrored" around the horizontal
+    axis that intersects the geometric centre of the things in
+    the working set. Their angle is also adjusted.
 
     
          It is not possible to mirror things without changing
     their angle (short of commenting out a couple of lines in
     x_mirror.cc and recompiling, of course).
 
-  
          Mirror vertically
-  
          All the selected things have their y-coordinate changed so
-    that they're "mirrored" around the horizontal axis that
-    intersects the geometric centre of the selected things.
-    Their angle is also adjusted.
+  
          Mirror vertically
+  
          All the things in the working set have their y-coordinate
+    changed so that they're "mirrored" around the horizontal
+    axis that intersects the geometric centre of the things in
+    the working set. Their angle is also adjusted.
 
     
          It is not possible to mirror things without changing
     their angle (short of commenting out a couple of lines in
     x_mirror.cc and recompiling, of course).
 
          
 
-		
          Setting/toggling/clearing thing flags
          
+		
          3.17. Setting/toggling/clearing thing flags
          
 
 
          In things mode, press [a] to open the "set thing
 flags" popup menu. 
          Press [b] to open the "toggle
 thing flags" popup menu. 
          Press [c] to open the
 "clear thing flags" popup menu.
 
-		
          Vertex miscellaneous operations
          
+		
          3.18. Vertex miscellaneous operations
          
+
+
          Unless otherwise specified, all the operation below act on
+all the objects in the working set. If there is at
+least one selected object, the working set is equal to the
+selection. If there is no selected object, the working set is
+the currently highlighted object (the object under the pointer).
+If there is no selection and no highlighted object, the
+selection is empty, of course. If there is a selection and an
+object outside the selection, the latter is not part of
+the working set.
          
 
 
          
-  
          Find first free tag number
+  
          Find first free tag number
   
          Displays the smallest tag number greater than 0 and not
   used by any linedef or sector.
 
-  
          Rotate and scale vertices
+  
          Rotate and scale vertices
   
          (description to be written)
 
-  
          Delete vertex and join linedefs
+  
          Delete vertex and join linedefs
   
          (description to be written)
 
-  
          Merge several vertices into one
+  
          Merge several vertices into one
   
          (description to be written)
 
-  
          Add a linedef and split sector
+  
          Add a linedef and split sector
   
          To perform this operation, you must have exactly two
-    vertices selected and there must be an uninterrupted path of
-    linedefs that face a common sector between them. A new
-    linedef is inserted from the first vertex you selected to
-    the second.  The newly created sector is put on the left
-    side of the new linedef.
-
-  
          Mirror horizontally
-  
          All the selected vertices have their x-coordinate changed
-    so that they're "mirrored" around the vertical axis that
-    intersects the geometric centre of the selected vertices.
-    Then all the linedefs whose both vertices belong to the
-    group of selected vertices are flipped so that the sector
-    references remain correct.
+    vertices in the working set and there must be an
+    uninterrupted path of linedefs that face a common sector
+    between them. A new linedef is inserted from the first
+    vertex to the second. The newly created sector is put on the
+    left side of the new linedef.
+
+  
          Mirror horizontally
+  
          All the vertices in the working set have their
+    x-coordinate changed so that they're "mirrored" around the
+    vertical axis that intersects the geometric centre of the
+    selected vertices.  Then all the linedefs whose both
+    vertices belong to the group of selected vertices are
+    flipped so that the sector references remain correct.
 
     
          See the "Mirror horizontally" linedef function.
 
-  
          Mirror vertically
-  
          All the selected vertices have their y-coordinate changed
-    so that they're "mirrored" around the horizontal axis that
-    intersects the geometric centre of the the selected
-    vertices.  Then all the linedefs whose both vertices belong
-    to the group of selected vertices are flipped so that the
-    sector references remain correct.
+  
          Mirror vertically
+  
          All the vertices in the working set have their
+    y-coordinate changed so that they're "mirrored" around the
+    horizontal axis that intersects the geometric centre of the
+    the selected vertices. Then all the linedefs whose both
+    vertices belong to the group of selected vertices are
+    flipped so that the sector references remain correct.
 
     
          See the "Mirror vertically" linedef function.
 
          
 
-		
          Linedef miscellaneous operations
          
+		
          3.19. Linedef miscellaneous operations
          
+
+
          Unless otherwise specified, all the operation below act on
+all the objects in the working set. If there is at
+least one selected object, the working set is equal to the
+selection. If there is no selected object, the working set is
+the currently highlighted object (the object under the pointer).
+If there is no selection and no highlighted object, the
+selection is empty, of course. If there is a selection and an
+object outside the selection, the latter is not part of
+the working set.
          
 
 
          
   
          Find first free tag number
   
          Displays the smallest tag number greater than 0 and not
   used by any linedef or sector.
 
-  
          Rotate and scale LD & SD...
+  
          Rotate and scale LD & SD...
   
          (description to be written)
 
-  
          Split linedefs (add new vertex)
-  
          Split all selected linedefs, by adding a vertex in the
-    middle.
+  
          Split linedefs (add new vertex)
+  
          Split all linedefs in the working set, by adding a vertex
+    in the middle.
 
     
          The key [x] is a shortcut to this function.
 
-  
          Split linedefs and sector
-  
          Split both selected linedefs in the middle by adding a
-    vertex for each, create a linedef between the two new
-    vertices and split the sector with this new linedef.  There
-    must be exactly 2 selected linedefs and they must face a
-    common sector.
-
-    
          The new linedef goes from the first selected linedef to
-    the second selected linedef. The new sector is on the second
-    sidedef of the new linedef.
+  
          Split linedefs and sector
+  
          Split both linedefs in the working set in the middle by
+    adding a vertex for each, create a linedef between the two
+    new vertices and split the sector with this new linedef.
+    There must be exactly 2 linedefs in the working set and they
+    must face a common sector.
+
+    
          The new linedef goes from the first linedef in the
+    working set to the second linedef in the working set. The
+    new sector is on the second sidedef of the new linedef.
 
     
          There is a bug in this function ; if the sector contains
     other sectors, some sidedefs are given the wrong sector
@@ -1193,69 +1325,74 @@
 
     
          The key [w] is a shortcut to this function.
 
-  
          Delete linedefs and join sector
+  
          Delete linedefs and join sector
   
          (description to be written)
 
-  
          Flip linedefs
-  
          The start and end vertices of the selected linedefs are
-    swapped. Their sidedefs are also swapped, so that the sector
-    references remain correct.
+  
          Flip linedefs
+  
          The start and end vertices of the linedefs in the working
+    set are swapped. Their sidedefs are also swapped, so that
+    the sector references remain correct.
 
     
          If you want to flip linedefs without swapping their
     sidedefs, you have to use "Flip linedefs" then "Swap
     sidedefs" on them.
 
-  
          Swap sidedefs
-  
          Swap the sidedefs of the selected linedefs
+  
          Swap sidedefs
+  
          Swap the sidedefs of the linedefs in the working set
     without flipping the linedefs. This means that the
     sector references are also swapped. If you don't understand
     what this implies, don't use this function.
 
-  
          Align textures (Y offset)
+  
          Align textures (Y offset)
   
          This function is buggy.
 
-  
          Align textures (X offset)
+  
          Align textures (X offset)
   
          This function is buggy.
 
-  
          Remove 2nd sidedef (make single-sided)
+  
          Remove 2nd sidedef (make single-sided)
   
          When two superimposed linedefs are merged, the result is
     often a two-sided linedefs, even though the second sidedef
     faces no sector.  Use this function to fix the mess.
 
-    
          It sets the I flag, clears the 2 flag and sets the second
-    sidedef to -1.
+    
          It sets the I flag, clears the 2 flag, sets the second
+      sidedef to -1, clears the upper and lower texture and
+      resets the middle texture to the default (as defined in
+      the preferences).
 
-  
          Make rectangular nook (32x16)
+  
          Make rectangular nook (32x16)
   
          This is a single-key function to make a rectangular nook
     in the middle of a linedef. "Nook" means that, seen from the
     first side of the original linedef, the resulting 5 linedefs
     form a concave figure.
 
     
          If the linedef is not long enough, the length of the nook
-    is one third of the length of the linedef.
+    is one third of the length of the linedef.
          
 
-    
          
+    
          
       
          
 	Before
 	After
+      
          
       
          
 	Before
 	After
+      
          
     
          
 
-  
          Make rectangular boss (32x16)
+  
          Make rectangular boss (32x16)
   
          Same thing as "Make rectangular nook" but the resulting
-  figure is convex.
+    figure is convex.
 
-  
          Set length (move 1st vertex)
+  
          Set length (move 1st vertex)
   
          Prompts you for a length and moves the 1st vertex of the
-  selected linedefs so that they have the length you specified. 
+    linedefs in the working set so that they have the length you
+    specified.
 
-  
          Set length (move 2nd vertex)
+  
          Set length (move 2nd vertex)
   
          Same thing as "Set length (move 1st vertex) but moves the
-  2nd vertex.
+    2nd vertex.
 
-  
          Unlink 1st sidedef
+  
          Unlink 1st sidedef
   
          This function is used when you have several linedefs
     sharing common sidedefs and you don't want them to share any
     sidedefs anymore so that you can, for instance, change the
@@ -1263,43 +1400,45 @@
     independently from the others.
 
     
          Here is how it works : all sidedefs that are used on
-    the first side of any linedef in the selection and on any
-    side of any linedef not in the selection are
+    the first side of any linedef in the working set and on any
+    side of any linedef not in the working set are
     duplicated and the first side of the concerned linedefs in
-    the selection is set to use the copy instead of the
+    the working set is set to use the copy instead of the
     original.
 
-    
          Gotcha : note that the selected linedefs are not
-    "unlinked" from each other. They are only "unlinked" from
-    any other (i.e. non-selected) linedefs.  Thus, if you have
-    n linedefs that you want to unlink from each other,
-    you have to unlink every one of them separately. This is so
-    that, if you have, say, two square pillars (2 x 4 linedefs
-    that all use the same sidedef), you can easily unlink one
-    pillar from the other while still having its 4 linedefs all
-    use the same sidedef.
+    
          Gotcha : note that the linedefs in the working set
+    are not "unlinked" from each other. They are only "unlinked"
+    from any other (i.e. not in the working set) linedefs.
+    Thus, if you have n linedefs that you want to
+    unlink from each other, you have to unlink every one of them
+    separately. This is so that, if you have, say, two square
+    pillars (2 x 4 linedefs that all use the same sidedef), you
+    can easily unlink one pillar from the other while still
+    having its 4 linedefs all use the same sidedef.
 
-  
          Unlink 2nd sidedef
+  
          Unlink 2nd sidedef
   
          Same as "Unlink 1st sidedef" but with second sidedef
-  instead of first sidedef.
+    instead of first sidedef.
 
-  
          Mirror horizontally
-  
          This function starts by determining the set S
-    of vertices that are used by any of the selected linedefs.
-    Then all the vertices in S have their
-    x-coordinate changed so that they're "mirrored" around the
-    vertical axis that intersects the geometric centre of
+  
          Mirror horizontally
+  
          This function starts by determining the set S
+    of vertices that are used by any of the linedefs in the
+    working set. Then all the vertices in S have
+    their x-coordinate changed so that they're "mirrored" around
+    the vertical axis that intersects the geometric centre of
     S. Finally, all the linedefs whose both vertices
     belong to S are flipped so that the sector
-    references remain correct.
+    references remain correct.
          
 
-    
          
-    
-    
-    
          Before
-    After
-    
          Before
-    After
+    
+      
+	
+      
+	
          Before
+	After
+      
          Before
+	After
+      
          
     
          
 
     
          This function is designed to be used on either the whole
@@ -1316,23 +1455,25 @@
     copy of it, mirror the copy and paste it on the other side
     of the room.
 
-  
          Mirror vertically
-  
          This function starts by determining the set S
-    of vertices that are used by any of the selected linedefs.
-    Then all the vertices in S have their
-    y-coordinate changed so that they're "mirrored" around the
-    horizontal axis that intersects the geometric centre of
+  
          Mirror vertically
+  
          This function starts by determining the set S
+    of vertices that are used by any of the linedefs in the
+    working set. Then all the vertices in S have
+    their y-coordinate changed so that they're "mirrored" around
+    the horizontal axis that intersects the geometric centre of
     S. Finally, all the linedefs whose both vertices
     belong to S are flipped so that the sector
-    references remain correct.
+    references remain correct.
          
 
-    
          
+    
          
       
          
 	Before
 	After
+      
          
       
          
 	Before
 	After
+      
          
     
          
 
     
          This function is designed to be used on either the whole
@@ -1348,24 +1489,90 @@
     of the axis of symmetry. You can build one staircase, make a
     copy of it, mirror the copy and paste it on the other side
     of the room.
+
+  
          Cut a slice out of a sector
+  
          You must select exactly two linedefs that face the same
+    sector S. This function creates a linedef A that goes from
+    the first selected linedef to the second and a linedef B
+    that goes from the second to the first. A new sector is
+    created between those four linedefs, with attributes
+    identical to those of S.
          
+
+    
+      
+	
+      
+	
+    
          Before
+	After
+      
          Before
+	After
+      
          
+
+    
          This function is somewhat similar to
+    "split-linedefs-and-sector" except that it creates two
+    linedefs instead of one and that it works on doughnut-shaped
+    sectors. In fact, this function is the only one that can
+    split a sector when there is no linedef path between the
+    split points (which is the case when splitting a
+    doughnut-shaped sector between its inner and outer borders).
+
+    
          If there is a linedef path between the selected linedefs,
+    this function is equivalent to using
+    "add-linedefs-and-split-sector" twice, except that you end
+    up with two sectors, not three. FIXME - need a figure.
+
+    
          If the selected linedefs happen to share a vertex, only
+    one linedef is created and the new sector is triangular. The
+    linedefs must not be the same or superimposed. FIXME - need
+    a figure.
+
+    
          Linedefs A and B are created with all their attributes
+    set to zero and their middle textures set to "-".
+    They're oriented so that their right sidedefs face the new
+    sector. Linedef A is the lowest-numbered one.
+
+    
          The following restrictions apply :
+
+    
            
+      
          • selected linedefs must not have two sidedefs in the same sector,
+      
          • selected linedefs must not share more than one sector,
+      
          • there must be no linedef that would be superimposed with A or B.
+    
          
+
+    
          These restrictions are stricter than necessary. They may
+    be lifted in the future if time and brain power permit.
+
+    
          Because this function is not aware of the geometry of the
+    selected linedefs, but only of the sectors they face, it can
+    be used to split sectors in impossible ways. FIXME - need a
+    figure.
+
+    
          This function assumes the space between the selected
+    linedefs is empty. If there are any other linedefs there,
+    you will have to fix their sector references manually
+    afterwards.
+
+    
          The key [Ctrl-k] is a shortcut to this
+    function.
 
 
-		
          Setting/toggling/clearing linedef flags
          
+		
          3.20. Setting/toggling/clearing linedef flags
          
 
 
          In linedefs mode, press [a] to open the "set
 linedef flags" popup menu.
 
          Press [b] to open the "toggle linedef flags" popup menu.
 
          Press [c] to open the "clear linedef flags" popup menu.
 
-		
          Undoing
          
+		
          3.21. Undoing
          
 
 
          As of this release, undoing is not implemented.
 
-		
          Cut-and-paste from one level to another
          
+		
          3.22. Cut-and-paste from one level to another
          
 
 
          As of this release, it's not possible.
 
-		
          Using the flat/patch/sprite/texture viewer
          
+		
          3.23. Using the flat/patch/sprite/texture viewer
          
 
 
          Flats, patches, sprites and textures are browsed and selected
 with the same basic tool, snappily named the
@@ -1420,16 +1627,34 @@
 (invalid), [Return] does not work. To cancel, press
 [Esc].
 
-
          In the DOS version, pressing [Shift-F1] used to
-save the current flat/patch/sprite/texture to a GIF file.
-However, in the X11 version, this function is currently a no-op
-because I've not taken the time to port the Gifsave library to
-Unix yet. Besides, I'd rather use PPM and/or PNG than GIF.
+
          [Shift-F1] saves the current image to file, in
+packed PPM (P6) format. This can be useful for
+textures, that cannot be directly extracted from wads.
+Transparent areas are represented according to the DeuTex
+convention by colour rgb:0/2f/2f (). The file is created in the
+working directory and its name is the name of the image
+lowercased and suffixed by ".ppm".  For example, flat
+"FLOOR0_7" would be saved as "./floor0_7.ppm".
+If the file already exists, it's mercilessly overwritten.
+
+
          Note that under MS-DOS, newlines in the PPM header are in
+Unix format (LF, not CR LF).
          
+
+
          There are a few bugs left in this function. Textures are
+clipped to the dimension of the viewer window. Under MS-DOS,
+some "VILE*" sprites will not save, because their names
+contain characters that are not allowed in file names
+("[", "\" and "]").
 
 
          [F1] prints to stdout the location (file name and
 offset) of the current flat, patch or sprite. For debugging
 purposes.
 
+
          When viewing textures, you may press [Ctrl-a] and
+[Ctrl-x] to cycle through the patches that make up
+the texture.
+
 
          Finally when viewing sprites, two other useful commands are
 [Ctrl-n] and [Ctrl-p]. These go
 respectively to the next and previous group of sprites (all
@@ -1437,12 +1662,12 @@
 group). It's handy to skip the 69 animation frames of the heavy
 weapon dude at once.
 
-		
          Saving
          
+		
          3.24. Saving
          
 
 
          There are two ways to save :
 
-

            
-  
          • Press [F2] or do "File->Save". If the level
+
              
+  
            • Press [F2] or do "File->Save". If the level
     comes from the iwad or if its level name or file name is
     unknown (because it's a new level), you are prompted for a
     level name (EnMn or MAPnm) and a file name first. If the
@@ -1453,7 +1678,7 @@
     
              The level in the window is saved in the specified file,
     in the pwad format, under the specified .
 
-  

            • Press [F3] or do "File->Save as".
+  
            • Press [F3] or do "File->Save as".
     This procedure is identical to the "Save" procedure except
     that the query for a level name and file name is
     unconditional.
@@ -1466,16 +1691,16 @@
 
 
 
-		
              Closing a window
              
+		
              3.25. Closing a window
              
 
 
              There are two ways to close a window :
 
-

                
-  
              • Press [Esc]. If you have made changes since the
+
                  
+  
                • Press [Esc]. If you have made changes since the
     last time you saved, or if you have never saved, Yadex
     requires confirmation before closing the window.
 
-  

                • Press [q] or do "File->Quit". If
+  
                • Press [q] or do "File->Quit". If
     you have made changes since the last time you saved, or if
     you have never saved, Yadex first saves the level, using the
     same procedure as when you press [F2]. After that
@@ -1485,171 +1710,578 @@
 
 
                
 
-	
                
-	
                
-	4. Configuring and customizing Yadex
                
+	
                
+	
                4. Variables and configuration
                
 
-
                There are several ways to configure Yadex :
-the configuration file, the environment variables,
-the command line options and the Preferences menu.
+
                
+  Yadex has internal variables that serve to configure its
+  behaviour. Variables have a name (a string of letters, digits
+  and underscores), a type and a value. The type constraints
+  the value (boolean, integer, strings, etc.).
+
                
 
-
                 The choices made in the Preferences menu override all others
-but they are lost when you exit Yadex.
+
                
+  Variables can be set in four ways : 
+
                
+
+
                  
+  
                • from the Preferences menu,
+  
                • from the command line,
+  
                • through environment variables.
+  
                • from the configuration files,
+
                
 
-
                 The command line options override the environment variables
-which in turn override the configuration file.
+
                
+  The settings from the Preferences menu override those from the
+  command line options which in turn override those from the
+  environment variables which in turn override those from the
+  configuration files.
+
                
 
-
                 The details of command line options and environment
-variables are explained elsewhere.
+		
                4.1. Variables
                
 
-		
                Preferences
                
+
                
+  You can get a list of variables with their description and value
+  by typing set at the yadex: prompt.
+
                
 
-
                When you create objects, their properties are automatically
-given default values. Some of those default values can be set
-from the configuration file or from the command line but also
-through the Preferences menu, that pops up when you press
-[F5].
+			
                4.1.1. The font
                
 
-
                 The settings entered through the Preferences menu are lost
-when you exit Yadex.
+
                
+  By default, Yadex uses the default font of your system (that
+  is often "fixed" a.k.a. "6x13"). But
+  you can use the font of your choice by using the "-fn
+  font_name" option or setting
+  "font = font_name" in
+  yadex.cfg. You should use a fixed-width font and
+  not one that is too large for the size of your Yadex window or
+  the display will look ugly. If Yadex does not find the
+  specified font, it emits a warning and falls back on the
+  default system font.
+
                
 
-		
                Configuration file
                
+
                
+  You can get a list of all available fonts on your system with
+  the command xlsfonts.
+
                
 
-
                If you don't specify "-f" on the command line,
-Yadex tries to open the following files in order :
+			
                4.1.2. Mouse wheel and other mouse issues
                
 
-
                  
-  
                1. ./yadex.cfg
-  
                2. ~/.yadex/version/yadex.cfg
-  
                3. ~/.yadex/yadex.cfg
-  
                4. install_dir/yadex.cfg
-  
                5. /usr/local/etc/yadex/version/yadex.cfg
-  
                6. /usr/local/etc/yadex/yadex.cfg
-  
                7. /etc/yadex/version/yadex.cfg
+
                  
+  The 3rd mouse button (middle button) is not used yet but you
+  can bet it will a future version. So a 3-button mouse is of
+  course recommended.
+
                  
+
+
                  
+  You can swap the left and right buttons by setting the swap_buttons
+  variable.
+
                  
+
+
                  
+  Buttons 4 and 5 are used for zooming in and out. Wheel mice
+  typically have the wheel mapped to buttons 4 and 5 in such a
+  way that when you roll the wheel "up" (forwards), button4
+  press events are generated and when you roll the wheel "down"
+  (backwards), button5 press events are generated.
+
                  
+  
+
                  
+  To configure your X server in the way described above, check
+  the vendor documentation. I have XFree86 and a Logitech Pilot
+  Mouse + and this is what I put in my XF86Config
+  file :
+
                  
+
+
                  
+  
                  Section "Pointer"
+    Protocol      "Intellimouse"
+    Device        "/dev/mouse"
+    Buttons       5
+    ZAxisMapping  4 5
                  
+
                  
+
+		
                  4.2. Preferences
                  
+
+
                  
+  When you create objects, their properties are automatically
+  given default values. Some of those default values can be set
+  from the configuration file or from the command line but also
+  through the Preferences menu, that pops up when you press
+  [F5].
+
                  
+
+
                  
+  The Preferences menu lets you set the default_*
+  variables interactively. The settings made from the
+  Preferences menu are lost when you exit Yadex.
+
                  
+
+		
                  4.3. Command line
                  
+
+
                  
+  See the Options section.
+
                  
+
+		
                  4.4. Environment variables
                  
+
+
                  
+  See the Environment variables section.
+
                  
+
+		
                  4.5. Configuration files
                  
+
+			
                  4.5.1. Contents of configuration files
                  
+
+
                  Configuration files are text files. White space at the
+beginning of a line is ignored. There are three kinds of
+lines :
+
+
                  
+  
                  Empty lines (lines containing only white space)
+  
                  
+    
                  
+      No effect.
+    
                  
+  
+  
                  Comments (lines whose first non white space character is a
+      #)
+  
                  
+    
                  
+      No effect.
+    
                  
+
+  
                  Variable assignments (lines of the form "name
+      = value")
+  
                  
+    
                  The effect is to assign value to the variable
+      name. name is a string of one or more
+      identifier characters i.e. letters, digits and
+      underscores. value is a string of zero or more
+      non white space characters. There may be any amount of
+      white space around and between the three tokens, including
+      none at all.
+    
                  
+
+    
                  
+      Please note that :
+    
                  
+
+    
                    
+      
                  • 
+        
                    
+	  # is special only at the beginning of a
+	  line. Therefore you can't put a comment on the same
+	  line as a variable assignment.
+	
                    
+      
                    • 
+
+      
                  • 
+        
                    
+	  Because white space is a token delimiter and there's
+	  no way to quote or escape it, including white space in
+	  a value is impossible.
+	
                    
+      
                    • 
+
+      
                  • 
+        
                    
+	  Yadex's idea of what is a letter or digit is
+	  deliberately locale-independent. Whether it's white
+	  space or not, on the other hand, is locale-dependent
+	  (isspace(3)).
+	
                    
+      
                    • 
+    
                  
+
                  
+
+
                  
+  Parse errors are not fatal. In general, they cause a warning
+  message to be printed and the entire line to be ignored. This
+  is to facilitate the sharing of configuration files across
+  versions of Yadex.
+
                  
+
+
                  
+  The configuration file is self-documenting. Look at the sample
+  configuration file in the Yadex distribution to see what
+  options are available.
+
                  
+
+			
                  4.5.2. Locating
+			configuration files
                  
+
+
                  
+  This is the process by which Yadex turns a configuration file
+  name into one or more actual pathnames.
+
                  
+
+
                  
+  If the specified name is absolute, the location yields exactly
+  that. A name is considered absolute if and only if it begins
+  with a /.
+
                  
+
+
                  
+  If the specified name is relative, Yadex uses a search path,
+  much like the shell uses $PATH to locate
+  commands. The composition of the search path depends on the
+  installation prefix (the argument to ./configure
+  --prefix).
+
                  
+
+
                  
+  
                  /usr/local or /usr :
+  
                  
+    
                    
+      
                  1. .
+      
                  2. ~/.yadex/$VERSION
+      
                  3. ~/.yadex
+      
                  4. /etc/yadex/$VERSION
+      
                  5. /etc/yadex
+    
                  
+
+  
                  /opt/some/path :
+  
                  
+    
                    
+      
                  1. .
+      
                  2. ~/.yadex/$VERSION
+      
                  3. ~/.yadex
+      
                  4. /etc/opt/some/path
+    
                  
+
+  
                  /some/path :
+  
                  
+    
                    
+      
                  1. .
+      
                  2. ~/.yadex/$VERSION
+      
                  3. ~/.yadex
+      
                  4. /some/path/etc
+    
                  
+
                  
+
+
                  
+  The search path may be walked in either direction, depending
+  on the application. For each element in the search path, a
+  pathname is made by concatenating the path and the specified
+  name. The pathname is tested with stat(2). The
+  result of the location is the list of the pathnames that exist
+  and are not directories.
+
                  
+
+
                  
+  For example, assuming Yadex was compiled with the
+  /usr/local prefix, a front-to-back search for a
+  file named foo/bar.cfg would return those of the
+  following pathnames that exist and are not directories :
+
                  
+
+
                    
+  
                  1. ./foo/bar.cfg
+  
                  2. ~/.yadex/$VERSION/foo/bar.cfg
+  
                  3. ~/.yadex/foo/bar.cfg
+  
                  4. /etc/yadex/$VERSION/foo/bar.cfg
+  
                  5. /etc/yadex/foo/bar.cfg
+
                  
+
+			
                  4.5.3. Default configuration files
                  
+
+
                  
+  By default, Yadex performs a back-to-front search for files
+  named yadex.cfg and reads all the matches in
+  order. For example, assuming Yadex was compiled with the
+  /usr/local prefix, the following configuration
+  files will be read if they exist :
+
                  
+
+
                    
   
                  1. /etc/yadex/yadex.cfg
+  
                  2. /etc/yadex/$VERSION/yadex.cfg
+  
                  3. ~/.yadex/yadex.cfg
+  
                  4. ~/.yadex/$VERSION/yadex.cfg
+  
                  5. ./yadex.cfg
 
                  
 
-
                  The first file found is used.
+
                  
+  Because the search path is walked back-to-front, any parameter
+  settings in a local configuration file override the settings
+  inherited from less local configuration files. For example,
+  assuming /etc/yadex/$VERSION/yadex.cfg
+  contains :
+
                  
+
+
                  
+  
+    a = old
                  
+    b = old
+                    
+
                  
+
+
                  
+  and ./yadex.cfg contains :
+
                  
+
+
                  
+  
+     a = new
                  
+     c = new
+                    
+
                  
+
+
                  
+  the net effect is :
+
                  
+
+
                  
+  
+     a = new
                  
+     b = old
                  
+     c = new
+                    
+
                  
+
+			
                  4.5.4. User-specified configuration files
                  
+
+
                  
+  The -f option can be used to override Yadex's
+  default choice of configuration files.
+
                  
+
+
                  
+  If Yadex is started with the -f option, the
+  default configuration files are not used. Instead, Yadex
+  performs a front-to-back search for the argument of the
+  -f option, according to the algorithm described
+  in Locating configuration files.
+  The first match is used as a configuration file. Any other
+  matches are ignored.
+
                  
 
-
                  If you use "-f file" and
-"file" is an absolute name (i.e. it
-starts with "/"), only that name is used.
-
-
                  If "file" is a relative name, the
-standard directories will be searched for a file of that name
-instead of "yadex.cfg". For example, if you
-specify "-f foo/bar", Yadex will try to open
-"./foo/bar",
-"~/.yadex/version/foo/bar", and so on.
-
-
                  For Yadex to recognize the file as a configuration file, its
-first line must contain exactly the following characters :
-"# Yadex configuration file version 2"
-(without the double quotes). If it doesn't, Yadex will print an
-error message and bail out. The reason for being so fussy is to
-avoid headaches when the configuration file format changes and
-there are old configuration files lying around in your
-directories.
-
-
                  The configuration file is self-documenting. Look at the
-sample configuration file in the Yadex distribution to see what
-options are available.
-
-		
                  Game definition files
                  
-
-
                  A lot of Yadex's knowledge about thing numbers and names,
-linedef types etc. is stored in so-called game definition files.
-When you specify "-g foo", it in fact means that
-Yadex should use the game definition file named
-"foo.ygd".
+
                  
+  For example, assuming Yadex was built with the
+  /usr/local prefix and run with the
+  -f myown.cfg option, it will use the first
+  file in this list that exists and is not a directory :
+
                  
 
-
                  When looking for the game definition file, Yadex tries those
-names in order :
 
                    
-  
                  1. ./game.ygd
-  
                  2. ~/.yadex/version/game.ygd
-  
                  3. install_dir/game.ygd
-  
                  4. /usr/local/share/games/yadex/version/game.ygd
-  
                  5. /usr/share/games/yadex/version/game.ygd
+  
                  6. ./myown.cfg
+  
                  7. ~/.yadex/$VERSION/myown.cfg
+  
                  8. ~/.yadex/myown.cfg
+  
                  9. /etc/yadex/$VERSION/myown.cfg
+  
                  10. /etc/yadex/myown.cfg
 
                  
 
-
                  For Yadex to recognize the file as a game definition file,
-they must begin with a certain magic string. If they don't,
-Yadex will print an error message an bail out. The reason for
-being so fussy is to avoid headaches when the game definition
-file format changes and there are old game definition files
-lying around in your directories.
+			
                  4.5.5. Organising your configuration files
                  
+
+
                  
+  As Yadex looks for its configuration files in several places,
+  you are put in the situation of having to decide which one to
+  use. Here are a few guidelines to help you make a decision.
+
                  
+
+
                  
+  
                  Avoid redundancy
+  
                  
+    
                  
+      Take advantage of Yadex's ability to use more than one
+      config file. Put each setting in the right place. Your
+      config files will be easier to read and maintain.
+    
                  
+
+  
                  Versionless vs. versionful files
+  
                  
+    
                  
+      Versionful files
+      (/etc/yadex/$VERSION/yadex.cfg and
+      ~/.yadex/$VERSION/yadex.cfg) are useful to
+      store settings that only work with a particular version of
+      Yadex. But remember that the versionful system-wide file
+      can be clobbered by a reinstallation.
+    
                  
+
+    
                  
+      Versionless files (/etc/yadex/yadex.cfg and
+      ~/.yadex/yadex.cfg) have the advantage of
+      being seen by all versions of Yadex. If you enter your
+      settings there, you won't have to enter them again when
+      you install a new version of Yadex, as long as the config
+      file syntax remains compatible. 
+    
                  
+
+  
                  System-wide vs. user vs. local files
+  
                  
+    
                  
+      System-wide configuration files have the theoretical
+      advantage of being seen by all users, which makes them a
+      good place to put settings that apply to everybody, such
+      as the pathnames of the iwads. Of course, it doesn't make
+      any difference for the typical (single-user) Yadex
+      installation.
+    
                  
+
+    
                  
+      Per-user files (the ones in ~/.yadex) are
+      appropriate for settings that have to do with personal
+      preferences (fonts etc.). They also have the advantage
+      over system-wide files of not being overwritten by the
+      installation procedure (typing make install a
+      second time will wipe the versionful system file).
+    
                  
+
+    
                  
+      Local files (./yadex.cfg) are well suited to
+      settings that vary from project to project, such as
+      default textures.
+    
                  
+
                  
+
+
                  
+  Concrete application : Yadex was compiled with
+  /usr/local as the prefix. You are the only user
+  on your system. All your levels are for Doom 2, except
+  the one in ~/herewad which is for Heretic. One of
+  your Doom 2 levels (~/cave) is quite dark
+  and requires a different default light level. You usually run
+  Yadex from the directory where the pwad is.
+
                  
 
-
                  Game definition files are not supposed to be modified in
-normal use. Their format is described there.
+
                  
+  There are several ways to configure Yadex for this setup.
+  Here's a solution in accordance with the above
+  guidelines :
+
                  
 
+
                  
+  ~/.yadex/yadex.cfg :
+
                  
 
-		
                  The font
                  
+
                  
+  
                  iwad2 = /somewhere/doom2.wad
+iwad3 = /somewhere/else/heretic.wad
+game  = doom2
                  
+
                  
 
-
                  By default, Yadex uses the default font of your system (that
-is often "fixed" a.k.a. "6x13"). But
-you can use the font of your choice by using the "-fn
-font_name" option or setting
-"font = font_name" in
-yadex.cfg. You should use a fixed-width font and
-not one that is too large for the size of your Yadex window or
-the display will look ugly. If Yadex does not find the specified
-font, it emits a warning and falls back on the default system
-font.
+
                  
+  ~/herewad/yadex.cfg :
+
                  
 
-
                   You can get a list of all available fonts on your system
-with the command xlsfonts.
+
                  
+  
                  game                    = heretic
+default_floor_texture   = floor11
+default_ceiling_texture = floor06
+default_lower_texture   = sandsq2
+default_middle_texture  = sandsq2
+default_upper_texture   = sandsq2
+default_thing           = 66
                  
+
                  
 
-		
                  Mouse wheel and other mouse issues
                  
+
                  
+  ~/cave/yadex.cfg :
+
                  
 
-			
                  Button 3
                  
+
                  
+  
                  default_light_level = 112
                  
+
                  
 
-
                  The mouse 3rd button is not used yet but you can bet it will
-a future version. So a 3-button mouse is of course recommended.
+
                  
+  Note how game is set in the per-user config file
+  (the general case) and overridden in the local config file for
+  Heretic level (the exception).  
+
                  
 
-			
                  Buttons 4 and 5
                  
+	
                  
+	
                  5. Game definition files
                  
 
-
                  People who have a mouse with more than 3 buttons,
-rejoyce !  Buttons 4 and 5 are used (for zooming in and
-out). See the paragraph on mice wheels below.
+
                  
+  Most of Yadex's knowledge about thing numbers and names,
+  linedef types etc. is retrieved from so-called game definition
+  files. When you specify "-g foo", it in
+  fact means that Yadex should use the game definition file
+  named "foo.ygd".
+
                  
 
-			
                  Swapping buttons
                  
+		
                  5.1. Contents of game definition files
                  
 
-
                  You can swap the left and right buttons by setting the swap_buttons
-variable.
+
                  
+  For Yadex to recognize the file as a game definition file, it
+  must begin with a certain magic string. If it doesn't, Yadex
+  will print an error message an bail out. The reason for being
+  so fussy is to avoid headaches when the game definition file
+  format changes and there are old game definition files lying
+  around in your directories.
+
                  
 
-			
                  Wheel
                  
+
                  
+  Game definition files are not supposed to be modified in
+  normal use. Their format is described in ygd.html.
+
                  
 
-
                  The wheel that certain recent mice have is supported. But to
-be able to use it, you need to first make X aware that your
-mouse has a wheel. There are several ways to do that and they
-might vary depending on which X server you have. I have XFree86
-and a Logitech Pilot Mouse + and this is what I put in my
-XF86Config file :
+		
                  5.2. Locating game definition
+		files
                  
 
 
                  
-
                  Section "Pointer"
-    Protocol      "Intellimouse"                                      
-    Device        "/dev/mouse"                                      
-    Buttons       5                                                 
-    ZAxisMapping  4 5
                  
+  The algorithm used to locate game definition files is exactly
+  the same as the one described in  Locating configuration files. Only
+  the search path is different. As is the case for config files,
+  it depends on the prefix for which Yadex was compiled.
+
                  
 
-
                  This means that the wheel is mapped to buttons 4 and 5. When
-you roll the wheel "up" (forwards), button4 press events are
-generated. When you roll the wheel "down" (backwards), button5
-press events are generated.
-
-
                   Once you have done that, not only you can use the wheel in
-Yadex to zoom in and out but can also use it in all other X
-applications. That is, those that have bindings for buttons 4
-and 5. One such application is xterm : the wheel
-scrolls the window up and down through the scrolling region.
-
-	
                  
-	
                  
-	Annex A: known bugs
                  
+
                  
+  
                  /usr :
+  
                  
+    
                    
+      
                  1. .
+      
                  2. ~/.yadex/$VERSION
+      
                  3. ~/.yadex
+      
                  4. /usr/share/games/yadex/$VERSION
+      
                  5. /usr/share/games/yadex
+    
                  
+
+  
                  /usr/local :
+  
                  
+    
                    
+      
                  1. .
+      
                  2. ~/.yadex/$VERSION
+      
                  3. ~/.yadex
+      
                  4. /usr/local/share/games/yadex/$VERSION
+      
                  5. /usr/local/share/games/yadex
+    
                  
+
+  
                  /opt/some/path :
+  
                  
+    
                    
+      
                  1. .
+      
                  2. ~/.yadex/$VERSION
+      
                  3. ~/.yadex
+      
                  4. /opt/some/path/share
+    
                  
+
+  
                  /some/path :
+  
                  
+    
                    
+      
                  1. .
+      
                  2. ~/.yadex/$VERSION
+      
                  3. ~/.yadex
+      
                  4. /some/path/share
+    
                  
+
                  
+
+		
                  5.3. Use of game definition files
                  
+
+
                  
+  On startup, Yadex loads the game definition file corresponding
+  to the game variable. It performs a front-to-back
+  search (see Locating game definition
+  files) for a file named game.ygd.
+  The first match is used.
+
                  
+
+	
                  
+	
                  6. Known bugs
                  
 
 
                  Though Yadex has quite a few bugs, most of them are
 inconsequential, i.e. not likely to make Yadex unusable or
@@ -1657,43 +2289,63 @@
 bite. Those are the ones you should know about :
 
 
                    
-  
                  • Command line options that take an argument need to have a
-  space between their argument and themselves.
+  
                  • 
+    
                    Command line options that take an argument need to have
+    a space between their argument and themselves.
                    
+
+  
                  • 
+    
                    Exposure events are not always handled.  If the Yadex
+    window turns black, back out by pressing [Esc],
+    several times if necessary.
                    
+
+  
                  • 
+    
                    If you edit a level from a file that contains several and
+    save it, all the other levels, textures, flats, etc. from
+    that file are lost.
                    
+
+  
                  • 
+    
                    Out-of-memory conditions and certain wad I/O errors are
+    handled in a very ungraceful manner. Basically,
+    Yadex aborts and if you haven't saved, you've lost all your
+    work. My advice :
                    
 
-  
                  • Exposure events are not always handled.  If the Yadex
-  window turns black, back out by pressing [Esc],
-  several times if necessary.
-
-  
                  • If you edit a level from a file that contains several and
-  save it, all the other levels, textures, flats, etc. from that
-  file are lost.
+    
                      
+      
                    • Make sure you have at least a couple of megs of free
+	memory.
+      
                    • Save often and make backups.
+      
                    • Don't use wads that contain errors.
+      
                    • Make sure you have enough disk space and adequate
+	permissions.
+      
                    • Don't modify files with an external program while
+	Yadex uses them. For example, if you use a texture wad,
+	don't rebuild it without quitting Yadex first.
+    
                    
 
                  
 
-Check TODO for a complete list
-of things to fix.
+
                  Check TODO for a complete
+list of things to fix.
 
-	
                  
-	
                  
-	Annex B: Which games are supported ?
                  
+	
                  
+	
                  7. Supported games
                  
 
-		
                  Doom
                  
+		
                  7.1. Doom
                  
 
 
                  Supported. Linedef types and sector types added in v. 1.666
 are supported and marked with "[v1.6]".
 
-		
                  Doom II
                  
+		
                  7.2. Doom II
                  
 
 
                  Supported.
 
-		
                  Doom alpha
                  
+		
                  7.3. Doom alpha
                  
 
 
                  Mostly supported. There are three Doom alpha versions that I
 know of : 0.2,
+href="ftp://3darchives.in-span.net/pub/idgames/historic/doom0_2.zip">0.2,
 0.4
+href="ftp://3darchives.in-span.net/pub/idgames/historic/doom0_4.zip">0.4
 and 0.5.
+href="ftp://3darchives.in-span.net/pub/idgames/historic/doom0_5.zip">0.5.
 They're supported to varying degrees of completeness. All
 graphics resources (flats, patches, PLAYPAL,
 sprites and textures) are supported for all versions with the
@@ -1722,7 +2374,7 @@
 of it. If you want to do it, I won't discourage you and I will
 gladly accept patches.
 
-		
                  Doom press release pre-beta
                  
+		
                  7.4. Doom press release pre-beta
                  
 
 
                  Supported. The different picture format is handled. Things
 type 2016 (evil sceptre) and 2017 (unholy bible) are defined in
@@ -1735,34 +2387,47 @@
 does not support sprites in pwads (yet). To see the sprites for
 the evil sceptre and the unholy bible as well as the alternate
 versions of the other sprites, you need to use the iwad from doomprbt.zip.
 
-		
                  Final Doom
                  
+		
                  7.5. Final Doom
                  
 
 
                  Supported, AFAIK. The iwads have no
 F1_START/F1_END labels and some levels contain a
 thing of type 0 which made older versions of Yadex crash. This
 has been fixed in version 1.1.0.
 
-		
                  Heretic
                  
+		
                  7.6. Heretic
                  
 
-
                  Supported. Still missing: the sprite names for a couple of
-thing types. If there is a Heretic hacker out there willing to
-help, he/she is welcome. See "heretic.ygd".
+
                  Supported.
 
-		
                  Hexen
                  
+		
                  7.7. Hexen
                  
 
 
                  Very rudimentary support. You can load Hexen wads and edit
-the maps. But the things types are not all there. And the
-special features of Hexen (BEHAVIOR lump, new thing
-and linedef fields) are stripped off on reading. So don't try to
-save a Hexen level after editing it, you won't be able to use it
-with Hexen. And if you're saving it to the file it comes from,
-you'll lose your file. Don't save when in Hexen
-mode.
+the maps but most of Hexen's special features are stripped off
+on reading. So don't try to save a Hexen level after editing it,
+you won't be able to use it with Hexen. And if you're saving it
+to the file it comes from, you'll lose your file. Don't
+save when in Hexen mode.. Here's the breakdown :
 
-		
                  Strife
                  
+
                    
+  
                  • Most thing types, and some sector and linedef types are
+    missing from hexen.ygd.
+  
                  • For things, tid, z,
+    special and arg1 through
+    arg5 are discarded. There is currently no way
+    to examine or manipulate them from Yadex.
+  
                  • For linedefs, arg1 is put into
+    tag. arg2 through
+    arg5 are discarded and there is currently no way
+    to examine or manipulate them from Yadex.
+  
                  • The Hexen-specific thing and linedef flags are not
+    recognized (but you can manipulate them).
+  
                  • BEHAVIOR is ignored.
+  
                  • MAPINFO is ignored.
+
                  
+
+		
                  7.8. Strife
                  
 
 
                  Supported, except that :
 
@@ -1782,11 +2447,11 @@
 format as Doom for textures, Strife 1.1 and later use a
 different format.
 
-		
                  Ultimate Doom
                  
+		
                  7.9. Ultimate Doom
                  
 
 
                  Supported.
 
-		
                  Boom
                  
+		
                  7.10. Boom
                  
 
 
                  Kind of supported, only very inconvenient to use <g>.
 
@@ -1812,43 +2477,31 @@
 
 In progress...
 
-		
                  MBF
                  
+		
                  7.11. EDGE
                  
+
+
                  The default DDF definitions included in EDGE 1.24 have been
+added to doom.ygd and doom2.ygd,
+marked with "[EDGE]". When the pointer moves over a
+sector that has extrafloors, the object info window shows the
+information relevant to those. To see the sprite for the night
+vision goggles (thing #7000), you must load
+edge.wad.
+
+
                  As of 1.5.0, the support for DDF is static : custom DDF
+files or DDF lumps are ignored. In other words, you are limited
+to the default DDF definitions.
+
+		
                  7.12. MBF
                  
 
-Mostly supported, I think. Thing 888 (dog), thing flag 80h
+
                  Mostly supported, I think. Thing 888 (dog), thing flag 80h
 (friendly), linedef types 271 and 272 are all in. You can't see
 the sprite for the dog because it's embedded in the MBF
 executable.
 
-		
                  Other derivatives
                  
-
-
                  Not supported so far.
-
-	
                  
-	
                  
-	Annex C: Legal
                  
-
-
                  Yadex is GPL'd libre software. It incorporates code from DEU
-5.21 that was put in the public domain in 1994 by Raphal Quinet
-and Brendon Wyber. The rest is Copyright  1997-2000 Andr
-Majorel.
-
-
                  This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of
-the License, or (at your option) any later version.
-
-
                  This program is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
-
-
                   You should have received a copy of the GNU General Public
-License along with this program; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
-USA.
+		
                  7.13. Other derivatives
                  
 
-
                  All trademarks are the propriety of their owners.
+
                  Not supported so far.
                  
 
-
                  AYM $SELF_DATE
+
                  AYM $SELF_DATE
 
 
diff -uaNr yadex-1.5.2/docsrc/yadex.6 yadex-1.6.0/docsrc/yadex.6
--- yadex-1.5.2/docsrc/yadex.6	2000-08-13 20:21:12.000000000 +0200
+++ yadex-1.6.0/docsrc/yadex.6	2003-03-31 19:05:07.000000000 +0200
@@ -227,8 +227,8 @@
 ("\fB$VERSION\fP"). The third field is the release date, between
 parentheses ("\fB($SOURCE_DATE)\fP").
 
-The second line contains the magic string that this version
-requires at the beginning of configuration files.
+The second line contains a configuration file magic string (not
+used).
 
 The third line contains the magic string that this version
 requires at the beginning of game definition files.
@@ -250,49 +250,30 @@
 This option is equivalent to and overrides the \fBzoom_default\fP
 directive of the configuration file.
 .SH FILES
-.TP
-.B Configuration file
-.B ./yadex.cfg
-.br
-.B ~/.yadex/$VERSION/yadex.cfg
-.br
-.B ~/.yadex/yadex.cfg
-.br
-.IB install_dir /yadex.cfg
-.br
-.B /usr/local/etc/yadex/$VERSION/yadex.cfg
-.br
-.B /usr/local/etc/yadex/yadex.cfg
-.br
-.B /etc/yadex/$VERSION/yadex.cfg
-.br
-.B /etc/yadex/yadex.cfg
-.TP
-.B Game definition file
-.BI ./ game .ygd
-.br
-.BI ~/.yadex/$VERSION/ game .ygd
-.br
-.IB install_dir / game .ygd
+.SS Configuration files
+.nf
+$FILES_ETC
+.fi
+.SS Game definition files
+.nf
+$FILES_SHARE
+.fi
+.SS Swap files
+.B $TMPDIR/yadexswp??????
 .br
-.BI /usr/local/share/games/yadex/$VERSION/ game .ygd
-.br
-.BI /usr/share/games/yadex/$VERSION/ game .ygd
-.br
-.BI /usr/local/share/games/yadex/ game .ygd
-.br
-.BI /usr/share/games/yadex/ game .ygd
+.B /tmp/yadexswp??????
 .SH ENVIRONMENT VARIABLES
 .IP \fBDISPLAY\fP
 X11 only. The name of the X display that Yadex will try to
 connect to.
+.IP \fBHOME\fP
+Used to expand \fB~\fP when locating configuration and game
+definition files.
 .IP \fBLINES\fP
 If set, Yadex assumes the tty has that many lines instead of 24.
 The value must be an unsigned, non-zero decimal integer.
-.IP \fBYADEX_DIR\fP
-Unix only. Where Yadex is installed. Can be used to look for the
-configuration file and friends. For testing purposes only. Not
-needed in normal use.
+.IP \fBTMPDIR\fP
+If set, swap files are created there. Otherwise, in \fB/tmp\fP.
 .IP \fBYADEX_GAME\fP
 Indicates the game to use. Overrides the \fBgame\fP parameter in
 the config file, is overridden by the \fB\-g\fP command line
@@ -316,17 +297,23 @@
 
 And many more. See \fBTODO\fP.
 .SH AUTHOR
-Andr Majorel .
+Andr Majorel (http://www.teaser.fr/~amajorel/)
+
+.nf
+Contributors:
+Andrew J. Apted (http://www.netspace.net.au/~ajapted/)
+Matthew W. Miller (mwmiller@columbus.rr.com)
+.fi
 
 Yadex is derived from DEU 5.21 that was written by Raphal Quinet,
 Brendon Wyber and others.
 
 See the HTML documentation for detailed credits.
 .SH LEGAL
-Yadex incorporates code from DEU 5.21 that was put in the public
-domain in 1994 by Raphal Quinet and Brendon Wyber.
-
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+.SS Yadex
+.nf
+$COPYRIGHT_MAN
+.fi
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -342,20 +329,46 @@
 License along with this library; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 02111-1307, USA.
+.SS Atclib
+The Yadex distribution includes a subset of Atclib.
+
+Atclib is copyright Andr Majorel 1995-1999 and distributed under the terms of
+version 2 of the GNU Library General Public License.
 
-All trademarks are the propriety of their owners.
+This library is free software; you can redistribute it and/or
+modify it under the terms of version 2 of the GNU Library General Public
+License as published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA
+.SS Boost
+The Yadex distribution includes a subset of Boost 1.25.0.
+
+Boost 1.25.0 is copyright various authors and released under the following
+terms\ : Permission to copy, use, modify, sell and distribute this software is
+granted provided this copyright notice appears in all copies.
+This software is provided "as is" without express or implied warranty, and with
+no claim as to its suitability for any purpose.
 .SH SEE ALSO
 .BR bsp (6),
 .BR idbsp (6),
 .BR tkwadcad (6),
 .BR warm (6),
-.BR xwadtools (6),
-.BR ybsp (6)
+.BR xwadtools (6)
 .IP LDE
-http://www-unix.oit.umass.edu/~tetron/lde/
+http://interreality.org/~tetron/technology/lde/
 .IP PFME
 http://www.purplefrog.com/~thoth/purplefrog/editor.html
+.IP Why
+http://www.hut.fi/~jpakkane/why/
 .IP "Xwad (part of Dumb)"
 http://stekt.oulu.fi/~tosi/dumb/dumb.html
 .IP Xwadtools
-ftp://ftp.cdrom.com/pub/idgames/source/
+ftp://3darchives.in-span.net/pub/idgames/source/
diff -uaNr yadex-1.5.2/docsrc/ygd.html yadex-1.6.0/docsrc/ygd.html
--- yadex-1.5.2/docsrc/ygd.html	2000-06-03 14:20:19.000000000 +0200
+++ yadex-1.6.0/docsrc/ygd.html	2003-02-21 23:34:55.000000000 +0100
@@ -448,7 +448,7 @@
 		colour
 		desc
                  
 
-
                  Defines a group of thing types. Takes exactly 4 arguments.
                  
+
                  Defines a group of thing types. Takes exactly 3 arguments.
                  
 
   
                  
diff -uaNr yadex-1.5.2/patch/README yadex-1.6.0/patch/README
--- yadex-1.5.2/patch/README	2000-08-27 21:08:48.000000000 +0200
+++ yadex-1.6.0/patch/README	1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-Patches for Yadex
------------------
-
-gcc-2.7.diff	To compile Yadex 1.5.0 with GCC 2.7. To apply,
-		
-		  cd yadex-1.5.0
-		  patch -p1 .
-		It barfs if you use -> on the right hand of an
-		iterator. It's a pain.
-
-		I consider GCC 2.7 obsolete, and not a supported
-		compiler for Yadex. This patch will rot or go
-		away. Please upgrade. More recent versions of
-		EGCS and GCC work fine.
-
--- AYM 2000-08-27
diff -uaNr yadex-1.5.2/patch/gcc-2.7.diff yadex-1.6.0/patch/gcc-2.7.diff
--- yadex-1.5.2/patch/gcc-2.7.diff	2000-08-27 20:20:14.000000000 +0200
+++ yadex-1.6.0/patch/gcc-2.7.diff	1970-01-01 01:00:00.000000000 +0100
@@ -1,220 +0,0 @@
-diff -ur yadex-1.5.0/src/bench.cc yadex-1.5.0-gcc27/src/bench.cc
---- yadex-1.5.0/src/bench.cc	Sun Aug 13 16:43:11 2000
-+++ yadex-1.5.0-gcc27/src/bench.cc	Sun Aug 27 17:41:26 2000
-@@ -33,10 +33,12 @@
- #include 
- #include 
- 
-+#define times FOOBAR
- #include "gfx.h"
- #include "img.h"
- #include "pic2img.h"
- #include "wadres.h"
-+#undef times
- 
- 
- 
-diff -ur yadex-1.5.0/src/drawmap.cc yadex-1.5.0-gcc27/src/drawmap.cc
---- yadex-1.5.0/src/drawmap.cc	Thu Aug 24 15:36:36 2000
-+++ yadex-1.5.0-gcc27/src/drawmap.cc	Sun Aug 27 18:03:49 2000
-@@ -518,6 +518,7 @@
- class Thing_npixels
- {
-   public :
-+    Thing_npixels () : thing_no (0), npixels (0), type (0) { }
-     Thing_npixels (i16 thing_no, unsigned long npixels, wad_ttype_t type)
-       : thing_no (thing_no), npixels (npixels), type (type) { }
-     bool operator< (const Thing_npixels& other) const
-@@ -541,7 +542,7 @@
-     const Thing_npixels& operator[] (int n) { return a[n]; }
-     void refresh ()
-     {
--      a.clear ();
-+      a.erase (a.begin (), a.end ());
-       a.reserve (NumThings);
-       for (int n = 0; n < NumThings; n++)
-       {
-@@ -576,7 +577,20 @@
-   unsigned short height;
- };
- 
--typedef map  dim_map_t;
-+class Dim_map_key
-+{
-+  public :
-+    Dim_map_key () { value = 0; }
-+    Dim_map_key (i16 v) { value = v; }
-+    i16 value;
-+};
-+
-+bool operator< (Dim_map_key a, Dim_map_key b)
-+{
-+  return a.value - b.value;
-+}
-+
-+typedef map  > dim_map_t;
- static dim_map_t dim_map;  // FIXME there should be one for each game
- 
- 
-@@ -638,10 +652,10 @@
-       }
-       else
-       {
--	mapx0 = MAPX (0)       - dim->second.width / 2;
--	mapx9 = MAPX (ScrMaxX) + dim->second.width / 2;
--	mapy0 = MAPY (ScrMaxY) - dim->second.height / 2;
--	mapy9 = MAPY (0)       + dim->second.height / 2;
-+	mapx0 = MAPX (0)       - (*dim).second.width / 2;
-+	mapx9 = MAPX (ScrMaxX) + (*dim).second.width / 2;
-+	mapy0 = MAPY (ScrMaxY) - (*dim).second.height / 2;
-+	mapy9 = MAPY (0)       + (*dim).second.height / 2;
-       }
-     }
-     int mapx = Things[t.thing_no].xpos;
-diff -ur yadex-1.5.0/src/lumpdir.cc yadex-1.5.0-gcc27/src/lumpdir.cc
---- yadex-1.5.0/src/lumpdir.cc	Mon Jun  5 13:46:40 2000
-+++ yadex-1.5.0-gcc27/src/lumpdir.cc	Sun Aug 27 17:38:44 2000
-@@ -64,7 +64,7 @@
-   if (dependency)
-     delete dependency;
-   if (! lump_map.empty ())
--    lump_map.clear ();
-+    lump_map.erase (lump_map.begin (), lump_map.end ());
- }
- 
- 
-@@ -92,7 +92,7 @@
-   if (i == lump_map.end ())
-     loc.wad = loc_prev.wad = 0;
-   else
--    loc = loc_prev = i->second;
-+    loc = loc_prev = (*i).second;
- }
- 
- 
-@@ -122,7 +122,7 @@
-      And usually is ! */
-   have_prev = false;
-   if (! lump_map.empty ())
--    lump_map.clear ();
-+    lump_map.erase (lump_map.begin (), lump_map.end ());
- 
-   /* Get list of lumps in the master directory. Everything
-      that is between X_START/X_END or XX_START/XX_END and that
-@@ -231,7 +231,8 @@
-   {
-     array[n] = new char[WAD_NAME + 1];
-     *array[n] = '\0';
--    strncat (array[n], i++->first.name, WAD_NAME);
-+    strncat (array[n], (*i).first.name, WAD_NAME);
-+    i++;
-   }
- }
- 
-diff -ur yadex-1.5.0/src/lumpdir.h yadex-1.5.0-gcc27/src/lumpdir.h
---- yadex-1.5.0/src/lumpdir.h	Thu Jun  1 14:25:30 2000
-+++ yadex-1.5.0-gcc27/src/lumpdir.h	Sun Aug 27 17:38:44 2000
-@@ -34,10 +34,11 @@
- 
- #include 
- 
-+#include "wadname.h"
-+
- 
- class Dependency;
- class Serial_num;
--class Wad_name;
- 
- 
- /*
-diff -ur yadex-1.5.0/src/objinfo.cc yadex-1.5.0-gcc27/src/objinfo.cc
---- yadex-1.5.0/src/objinfo.cc	Sat Aug 26 16:22:37 2000
-+++ yadex-1.5.0-gcc27/src/objinfo.cc	Sun Aug 27 18:07:51 2000
-@@ -56,6 +56,12 @@
- class Extraf
- {
-   public :
-+    Extraf ()
-+    {
-+      sector = 0;
-+      memset (tex, '\0', sizeof tex);
-+      height = 0;
-+    }
-     Extraf (obj_no_t sector, wad_name_t& tex, wad_z_t height)
-     {
-       this->sector = sector;
-@@ -683,7 +689,7 @@
-  */
- static void get_extrafloors (vector& v, wad_tag_t tag)
- {
--  v.clear ();
-+  v.erase (v.begin (), v.end ());
-   for (obj_no_t l = 0; l < NumLineDefs; l++)
-   {
-     if (LineDefs[l].tag == tag
-diff -ur yadex-1.5.0/src/patchdir.cc yadex-1.5.0-gcc27/src/patchdir.cc
---- yadex-1.5.0/src/patchdir.cc	Sat Apr 29 00:57:39 2000
-+++ yadex-1.5.0-gcc27/src/patchdir.cc	Sun Aug 27 17:38:44 2000
-@@ -60,7 +60,7 @@
-   if (pnames != 0)
-     FreeMemory (pnames);
-   if (! patch_lumps.empty ())
--    patch_lumps.clear ();
-+    patch_lumps.erase (patch_lumps.begin (), patch_lumps.end ());
- }
- 
- 
-@@ -78,7 +78,7 @@
-     npnames = 0;
-   }
-   if (! patch_lumps.empty ())
--    patch_lumps.clear ();
-+    patch_lumps.erase (patch_lumps.begin (), patch_lumps.end ());
- 
-   /* First load PNAMES so that we known in which order we should
-      put the patches in the array. */
-@@ -221,7 +221,7 @@
-     loc.wad = 0;
-     return;
-   }
--  loc = i->second;
-+  loc = (*i).second;
- }
- 
- 
-@@ -293,7 +293,8 @@
-   {
-     array[n] = new char[WAD_PIC_NAME + 1];
-     *array[n] = '\0';
--    strncat (array[n], i++->first._name, WAD_PIC_NAME);
-+    strncat (array[n], (*i).first._name, WAD_PIC_NAME);
-+    i++;
-   }
- }
- 
-diff -ur yadex-1.5.0/src/patchdir.h yadex-1.5.0-gcc27/src/patchdir.h
---- yadex-1.5.0/src/patchdir.h	Mon Jan 10 13:40:12 2000
-+++ yadex-1.5.0-gcc27/src/patchdir.h	Sun Aug 27 17:38:44 2000
-@@ -76,6 +76,7 @@
- 
- struct Pllik
- {
-+  Pllik () { memset (_name, '\0', sizeof _name); }
-   Pllik (const char *name);
-   wad_pic_name_t _name;
- };
-diff -ur yadex-1.5.0/src/spritdir.cc yadex-1.5.0-gcc27/src/spritdir.cc
---- yadex-1.5.0/src/spritdir.cc	Sun Jul  9 23:04:18 2000
-+++ yadex-1.5.0-gcc27/src/spritdir.cc	Sun Aug 27 17:38:44 2000
-@@ -58,9 +58,9 @@
- 
-   Lump_map::const_iterator i = lump_map.lower_bound (name);
-   have_prev = true;
--  if (i == lump_map.end () || y_strnicmp (name, i->first.name, strlen (name)))
-+  if (i == lump_map.end () || y_strnicmp (name, (*i).first.name, strlen (name)))
-     loc.wad = loc_prev.wad = 0;
-   else
--    loc = loc_prev = i->second;
-+    loc = loc_prev = (*i).second;
- }
- 
diff -uaNr yadex-1.5.2/patches/1.5.0_gcc27.diff yadex-1.6.0/patches/1.5.0_gcc27.diff
--- yadex-1.5.2/patches/1.5.0_gcc27.diff	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/patches/1.5.0_gcc27.diff	2000-08-27 20:20:14.000000000 +0200
@@ -0,0 +1,240 @@
+yadex-1.5.0_gcc-2.7.diff - make compile Yadex 1.5.0 with GCC 2.7
+
+To apply,
+
+  cd yadex-1.5.0
+  patch -p1 . It barfs if you use -> on the right hand
+of an iterator. It's a pain.
+
+I consider GCC 2.7 obsolete, and not a supported compiler for
+Yadex. This patch will rot or go away. Please upgrade. More
+recent versions of EGCS and GCC work fine.
+
+-- AYM 2000-08-27
+
+diff -ur yadex-1.5.0/src/bench.cc yadex-1.5.0-gcc27/src/bench.cc
+--- yadex-1.5.0/src/bench.cc	Sun Aug 13 16:43:11 2000
++++ yadex-1.5.0-gcc27/src/bench.cc	Sun Aug 27 17:41:26 2000
+@@ -33,10 +33,12 @@
+ #include 
+ #include 
+ 
++#define times FOOBAR
+ #include "gfx.h"
+ #include "img.h"
+ #include "pic2img.h"
+ #include "wadres.h"
++#undef times
+ 
+ 
+ 
+diff -ur yadex-1.5.0/src/drawmap.cc yadex-1.5.0-gcc27/src/drawmap.cc
+--- yadex-1.5.0/src/drawmap.cc	Thu Aug 24 15:36:36 2000
++++ yadex-1.5.0-gcc27/src/drawmap.cc	Sun Aug 27 18:03:49 2000
+@@ -518,6 +518,7 @@
+ class Thing_npixels
+ {
+   public :
++    Thing_npixels () : thing_no (0), npixels (0), type (0) { }
+     Thing_npixels (i16 thing_no, unsigned long npixels, wad_ttype_t type)
+       : thing_no (thing_no), npixels (npixels), type (type) { }
+     bool operator< (const Thing_npixels& other) const
+@@ -541,7 +542,7 @@
+     const Thing_npixels& operator[] (int n) { return a[n]; }
+     void refresh ()
+     {
+-      a.clear ();
++      a.erase (a.begin (), a.end ());
+       a.reserve (NumThings);
+       for (int n = 0; n < NumThings; n++)
+       {
+@@ -576,7 +577,20 @@
+   unsigned short height;
+ };
+ 
+-typedef map  dim_map_t;
++class Dim_map_key
++{
++  public :
++    Dim_map_key () { value = 0; }
++    Dim_map_key (i16 v) { value = v; }
++    i16 value;
++};
++
++bool operator< (Dim_map_key a, Dim_map_key b)
++{
++  return a.value - b.value;
++}
++
++typedef map  > dim_map_t;
+ static dim_map_t dim_map;  // FIXME there should be one for each game
+ 
+ 
+@@ -638,10 +652,10 @@
+       }
+       else
+       {
+-	mapx0 = MAPX (0)       - dim->second.width / 2;
+-	mapx9 = MAPX (ScrMaxX) + dim->second.width / 2;
+-	mapy0 = MAPY (ScrMaxY) - dim->second.height / 2;
+-	mapy9 = MAPY (0)       + dim->second.height / 2;
++	mapx0 = MAPX (0)       - (*dim).second.width / 2;
++	mapx9 = MAPX (ScrMaxX) + (*dim).second.width / 2;
++	mapy0 = MAPY (ScrMaxY) - (*dim).second.height / 2;
++	mapy9 = MAPY (0)       + (*dim).second.height / 2;
+       }
+     }
+     int mapx = Things[t.thing_no].xpos;
+diff -ur yadex-1.5.0/src/lumpdir.cc yadex-1.5.0-gcc27/src/lumpdir.cc
+--- yadex-1.5.0/src/lumpdir.cc	Mon Jun  5 13:46:40 2000
++++ yadex-1.5.0-gcc27/src/lumpdir.cc	Sun Aug 27 17:38:44 2000
+@@ -64,7 +64,7 @@
+   if (dependency)
+     delete dependency;
+   if (! lump_map.empty ())
+-    lump_map.clear ();
++    lump_map.erase (lump_map.begin (), lump_map.end ());
+ }
+ 
+ 
+@@ -92,7 +92,7 @@
+   if (i == lump_map.end ())
+     loc.wad = loc_prev.wad = 0;
+   else
+-    loc = loc_prev = i->second;
++    loc = loc_prev = (*i).second;
+ }
+ 
+ 
+@@ -122,7 +122,7 @@
+      And usually is ! */
+   have_prev = false;
+   if (! lump_map.empty ())
+-    lump_map.clear ();
++    lump_map.erase (lump_map.begin (), lump_map.end ());
+ 
+   /* Get list of lumps in the master directory. Everything
+      that is between X_START/X_END or XX_START/XX_END and that
+@@ -231,7 +231,8 @@
+   {
+     array[n] = new char[WAD_NAME + 1];
+     *array[n] = '\0';
+-    strncat (array[n], i++->first.name, WAD_NAME);
++    strncat (array[n], (*i).first.name, WAD_NAME);
++    i++;
+   }
+ }
+ 
+diff -ur yadex-1.5.0/src/lumpdir.h yadex-1.5.0-gcc27/src/lumpdir.h
+--- yadex-1.5.0/src/lumpdir.h	Thu Jun  1 14:25:30 2000
++++ yadex-1.5.0-gcc27/src/lumpdir.h	Sun Aug 27 17:38:44 2000
+@@ -34,10 +34,11 @@
+ 
+ #include 
+ 
++#include "wadname.h"
++
+ 
+ class Dependency;
+ class Serial_num;
+-class Wad_name;
+ 
+ 
+ /*
+diff -ur yadex-1.5.0/src/objinfo.cc yadex-1.5.0-gcc27/src/objinfo.cc
+--- yadex-1.5.0/src/objinfo.cc	Sat Aug 26 16:22:37 2000
++++ yadex-1.5.0-gcc27/src/objinfo.cc	Sun Aug 27 18:07:51 2000
+@@ -56,6 +56,12 @@
+ class Extraf
+ {
+   public :
++    Extraf ()
++    {
++      sector = 0;
++      memset (tex, '\0', sizeof tex);
++      height = 0;
++    }
+     Extraf (obj_no_t sector, wad_name_t& tex, wad_z_t height)
+     {
+       this->sector = sector;
+@@ -683,7 +689,7 @@
+  */
+ static void get_extrafloors (vector& v, wad_tag_t tag)
+ {
+-  v.clear ();
++  v.erase (v.begin (), v.end ());
+   for (obj_no_t l = 0; l < NumLineDefs; l++)
+   {
+     if (LineDefs[l].tag == tag
+diff -ur yadex-1.5.0/src/patchdir.cc yadex-1.5.0-gcc27/src/patchdir.cc
+--- yadex-1.5.0/src/patchdir.cc	Sat Apr 29 00:57:39 2000
++++ yadex-1.5.0-gcc27/src/patchdir.cc	Sun Aug 27 17:38:44 2000
+@@ -60,7 +60,7 @@
+   if (pnames != 0)
+     FreeMemory (pnames);
+   if (! patch_lumps.empty ())
+-    patch_lumps.clear ();
++    patch_lumps.erase (patch_lumps.begin (), patch_lumps.end ());
+ }
+ 
+ 
+@@ -78,7 +78,7 @@
+     npnames = 0;
+   }
+   if (! patch_lumps.empty ())
+-    patch_lumps.clear ();
++    patch_lumps.erase (patch_lumps.begin (), patch_lumps.end ());
+ 
+   /* First load PNAMES so that we known in which order we should
+      put the patches in the array. */
+@@ -221,7 +221,7 @@
+     loc.wad = 0;
+     return;
+   }
+-  loc = i->second;
++  loc = (*i).second;
+ }
+ 
+ 
+@@ -293,7 +293,8 @@
+   {
+     array[n] = new char[WAD_PIC_NAME + 1];
+     *array[n] = '\0';
+-    strncat (array[n], i++->first._name, WAD_PIC_NAME);
++    strncat (array[n], (*i).first._name, WAD_PIC_NAME);
++    i++;
+   }
+ }
+ 
+diff -ur yadex-1.5.0/src/patchdir.h yadex-1.5.0-gcc27/src/patchdir.h
+--- yadex-1.5.0/src/patchdir.h	Mon Jan 10 13:40:12 2000
++++ yadex-1.5.0-gcc27/src/patchdir.h	Sun Aug 27 17:38:44 2000
+@@ -76,6 +76,7 @@
+ 
+ struct Pllik
+ {
++  Pllik () { memset (_name, '\0', sizeof _name); }
+   Pllik (const char *name);
+   wad_pic_name_t _name;
+ };
+diff -ur yadex-1.5.0/src/spritdir.cc yadex-1.5.0-gcc27/src/spritdir.cc
+--- yadex-1.5.0/src/spritdir.cc	Sun Jul  9 23:04:18 2000
++++ yadex-1.5.0-gcc27/src/spritdir.cc	Sun Aug 27 17:38:44 2000
+@@ -58,9 +58,9 @@
+ 
+   Lump_map::const_iterator i = lump_map.lower_bound (name);
+   have_prev = true;
+-  if (i == lump_map.end () || y_strnicmp (name, i->first.name, strlen (name)))
++  if (i == lump_map.end () || y_strnicmp (name, (*i).first.name, strlen (name)))
+     loc.wad = loc_prev.wad = 0;
+   else
+-    loc = loc_prev = i->second;
++    loc = loc_prev = (*i).second;
+ }
+ 
diff -uaNr yadex-1.5.2/patches/README yadex-1.6.0/patches/README
--- yadex-1.5.2/patches/README	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/patches/README	2001-07-01 15:57:05.000000000 +0200
@@ -0,0 +1,26 @@
+These are patches for Yadex that have for some reason not made
+it in the stable version. Some were written by me, some by
+others.
+
+Please note :
+
+- These patches are not part of the stable version; they come
+  with NO WARRANTY (as if the stable version came with any sort
+  of warranty). They may not have been given even the slightest
+  amount of testing. How long since your last backup ?
+
+- These diffs are against various versions of Yadex, not
+  necessarily the latest one or the one you have. Sometimes a
+  patch against version X works against version Y, sometimes
+  not. While patching, keep an eye open for error messages such
+  as "Hunk #n FAILED".
+
+- To apply, try this :
+
+    $ cd yadex-$VERSION
+    $ patch -p1  'GNU GPL v2', 
+  'LGPL' => 'GNU LGPL v2',
+  'PD'   => 'public domain'
+);
+
+
+my @items;
+my $what = 'copyright';
+my $format = undef;
+
+
+#
+#	Parse the command line
+#
+{
+  Getopt::Long::Configure 'bundling', 'noignorecase';
+  die "copyright: syntax error\n"
+    if ! GetOptions
+      'a' => sub { $what   = 'authors'; },
+      'c' => sub { $format = 'c';       },
+      'h' => sub { $format = 'html';    },
+      'm' => sub { $format = 'troff';   },
+      't' => sub { $format = 'text';    };
+  die "copyright: use one of -chmt\n" if ! defined $format;
+}
+
+
+#
+#	Load the AUTHORS file
+#
+while (defined (my $line = <>))
+{
+  chomp $line;
+  my @fields = split "\t", $line;
+  die "copyright: $ARGV($.): wrong number of fields\n" if (@fields != 4);
+  my %authinfo;
+  $authinfo{name}      = $fields[0];
+  $authinfo{firstname} = $fields[1];
+  $authinfo{years}     = $fields[2];
+  $authinfo{licence}   = $fields[3];
+  push @items, \%authinfo;
+}
+
+
+#
+#	Write the output into @output (one line per element)
+#
+my @output;
+if ($what eq 'authors')		# Print the list of authors
+{
+  foreach my $item (sort byname @items)
+  {
+    push @output, "$item->{firstname} $item->{name}";
+  }
+}
+elsif ($what eq 'copyright')	# Print the list of copyright holders
+{
+  foreach my $item (sort byname @items)
+  {
+    my $licence;
+    die "copyright: bad licence \"$item->{licence}\"\n"
+      if ! exists $licences{$item->{licence}};
+    $licence = $licences{$item->{licence}};
+
+    my $string;
+    if ($item->{licence} eq 'PD')
+    {
+      $string = "Parts written by"
+	. " $item->{firstname} $item->{name}"
+	. ", $licence";
+    }
+    else
+    {
+      $string = "Parts copyright"
+	. " $item->{firstname} $item->{name}"
+	. " $item->{years}"
+	. ", $licence";
+    }
+    push @output, $string;
+  }
+}
+else
+{
+  die "copyright: bad \$what \"$what\"";
+}
+
+
+#
+#	Dump @output to stdout using the specified format
+#	(text, troff, HTML, C)
+#
+if ($format eq 'c')
+{
+  print "\n";
+  print "extern const char *const yadex_copyright[] =\n";
+  print "{\n";
+}
+foreach my $string (@output)
+{
+  if ($format eq 'c')
+  {
+    $string =~ s/\\/\\\\/g;		# Escape backslashes
+    $string =~ s/"/\"/g;		# Escape double quotes
+    print "  \"$string\",\n";
+  }
+  elsif ($format eq 'html')
+  {
+    $string =~ s/\n";
+  }
+  elsif ($format eq 'text')
+  {
+    print "$string\n";
+  }
+  elsif ($format eq 'troff')
+  {
+    $string =~ s/\\/\\\\/g;		# Escape backslashes
+    $string =~ s//\\(co/g;		# Encode the copyright symbol
+    print "$string\n";
+    print ".br\n";
+  }
+  else
+  {
+    die "copyright: bad format \"$format\"\n";
+  }
+}
+if ($format eq 'c')
+{
+  print "  0\n";
+  print "};\n";
+  print "\n";
+}
+
+exit 0;
+
+
+#
+#	byname - sort() callback to sort by (lastname, firstname)
+#
+sub byname ($$)
+{
+  my ($a, $b) = @_;
+  return "$a->{name}\01$a->{firstname}" cmp "$b->{name}\01$b->{firstname}";
+}
+
diff -uaNr yadex-1.5.2/scripts/ftime.1 yadex-1.6.0/scripts/ftime.1
--- yadex-1.5.2/scripts/ftime.1	1999-08-31 15:37:21.000000000 +0200
+++ yadex-1.6.0/scripts/ftime.1	2000-09-07 05:17:42.000000000 +0200
@@ -7,7 +7,7 @@
 Amazingly, there does not seem to exist any simple and portable way to
 retrieve the last modification time of a file from the shell. GNU awk, GNU
 find, perl and stat allow to do it but they're not part of the standard.
-Parsing the output ls \-l could do, but it would be disgustingly complicated
+Parsing the output of ls \-l could do, but it would be disgustingly complicated
 and the time of day is lost anyway. This program was written to plug that
 hole.
 
diff -uaNr yadex-1.5.2/scripts/install.c yadex-1.6.0/scripts/install.c
--- yadex-1.5.2/scripts/install.c	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/scripts/install.c	2001-04-11 00:25:16.000000000 +0200
@@ -0,0 +1,239 @@
+/*
+ *	install - install files
+ *	AYM 2001-04-10
+ */
+
+
+/*
+This file is Copyright  2001 Andr Majorel.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+
+static void usage (void);
+static int install_file (const char ifile[], const char ofile[], mode_t omode);
+static void err (const char *fmt, ...);
+
+
+int main (int argc, char *argv[])
+{
+  int rc = 0;
+  const char *target_dir = NULL;
+  mode_t mode = 0;
+  int help = 0;
+
+  /* Parse the command line */
+  if (argc == 2 && strcmp (argv[1], "--help") == 0)
+  {
+    usage ();
+    exit (0);
+  }
+  else
+  {
+    int g;
+    while ((g = getopt (argc, argv, "d:m:")) != EOF)
+    {
+      if (g == 'd')
+	target_dir = optarg;
+      else if (g == 'm')
+	mode = (mode_t) strtol (optarg, NULL, 8);
+      else
+      {
+	err ("syntax error");
+	exit (1);
+      }
+    }
+  }
+  if (target_dir == NULL && argc - optind != 2)
+  {
+    err ("syntax error");
+    exit (1);
+  }
+
+  /* Copy all files */
+  if (target_dir == NULL)
+  {
+    if (install_file (argv[optind], argv[optind + 1], mode) != 0)
+      rc = 1;
+  }
+  else
+  {
+    int n;
+
+    for (n = optind; n < argc; n++)
+    {
+      char *ofile = NULL;
+      char *ibasename;
+
+      ibasename = strrchr (argv[n], '/');  /* FIXME unixism */
+      if (ibasename == NULL)
+	ibasename = argv[n];
+      ofile = malloc (strlen (target_dir) + strlen (ibasename) + 2);
+      if (ofile == NULL)
+      {
+	err (strerror (ENOMEM));
+	exit (1);
+      }
+      strcpy (ofile, target_dir);
+      if (strlen (ofile) > 0 && ofile[strlen (ofile) - 1] != '/')  /* FIXME */
+	strcat (ofile, "/");
+      strcat (ofile, ibasename);
+      if (install_file (argv[n], ofile, mode) != 0)
+	rc = 1;
+      free (ofile);
+    }
+  }
+
+  return rc;
+}
+
+
+static void usage (void)
+{
+  puts ("Usage:");
+  puts ("  install --help");
+  puts ("  install [-m mode] ifile ofile");
+  puts ("  install [-m mode] [-d dir] [file ...]");
+}
+
+
+static int install_file (const char ifile[], const char ofile[], mode_t omode)
+{
+  int rc       = 0;
+  FILE *ifp    = NULL;
+  FILE *ofp    = NULL;
+  char *buf    = NULL;
+  size_t bufsz = 0x4000;
+
+  ifp = fopen (ifile, "rb");
+  if (ifp == NULL)
+  {
+    err ("%s: %s", ifile, strerror (errno));
+    rc = 1;
+    goto byebye;
+  }
+  ofp = fopen (ofile, "wb");
+  if (ofp == NULL)
+  {
+    err ("%s: %s", ofile, strerror (errno));
+    rc = 1;
+    goto byebye;
+  }
+  buf = malloc (bufsz);
+  if (buf == NULL)
+  {
+    err (strerror (ENOMEM));
+    rc = 1;
+    goto byebye;
+  }
+
+  /* Copy the data */
+  {
+    size_t nbytes;
+
+    while ((nbytes = fread (buf, 1, bufsz, ifp)) != 0)
+    {
+      if (fwrite (buf, 1, nbytes, ofp) != nbytes)
+      {
+	err ("%s: write error", ofile);
+	rc = 1;
+	goto byebye;
+      }
+    }
+    if (ferror (ifp))
+    {
+      err ("%s: read error", ifile);
+      rc = 1;
+    }
+  }
+
+  /* Force the ownership to EUID:EGID. Useful if the targets
+     already exist. */
+  if (chown (ofile, geteuid (), getegid ()) != 0)
+  {
+    err ("%s: %s", ofile, strerror (errno));
+    rc = 1;
+    goto byebye;
+  }
+
+  /* Set the mode */
+  if (chmod (ofile, omode) != 0)
+  {
+    err ("%s: %s", ofile, strerror (errno));
+    rc = 1;
+    goto byebye;
+  }
+
+  /* Copy the mtime */
+  {
+    struct stat s;
+    struct utimbuf u;
+
+    if (stat (ifile, &s) != 0)
+    {
+      err ("%s: %s", ifile, strerror (errno));
+      rc = 1;
+      goto byebye;
+    }
+    u.actime  = s.st_atime;
+    u.modtime = s.st_mtime;
+    if (utime (ofile, &u) != 0)
+    {
+      err ("%s: %s", ofile, strerror (errno));
+      rc = 1;
+      goto byebye;
+    }
+  }
+
+
+byebye:
+  if (ifp != NULL)
+    fclose (ifp);
+  if (ofp != NULL)
+    if (fclose (ofp) != 0)
+    {
+      err ("%s: %s", ofile, strerror (errno));
+      rc = 1;
+    }
+  if (buf != NULL)
+    free (buf);
+  return rc;
+}
+
+
+static void err (const char *fmt, ...)
+{
+  va_list argp;
+
+  fflush (stdout);
+  fputs ("install: ", stderr);
+  va_start (argp, fmt);
+  vfprintf (stderr, fmt, argp);
+  va_end (argp);
+  fputc ('\n', stderr);
+}
+
diff -uaNr yadex-1.5.2/scripts/notexist.c yadex-1.6.0/scripts/notexist.c
--- yadex-1.5.2/scripts/notexist.c	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/scripts/notexist.c	2001-04-10 15:31:26.000000000 +0200
@@ -0,0 +1,68 @@
+/*
+ *	notexist - complain if given directory entries exist
+ *	AYM 2000-09-06
+ */
+
+
+/*
+This file is Copyright  2000 Andr Majorel.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+
+int main (int argc, char *argv[])
+{
+  int n;
+
+  for (n = 1; n < argc; n++)
+  {
+    struct stat s;
+
+    if (lstat (argv[n], &s) == 0)
+    {
+      fprintf (stderr, "%s already exists. Delete it.\n", argv[n]);
+      exit (1);
+    }
+    else if (errno != ENOENT)
+    {
+      fprintf (stderr, "%s: can't lstat (%s)\n", argv[n], strerror (errno));
+      exit (1);
+    }
+    if (stat (argv[n], &s) == 0)
+    {
+      fprintf (stderr, "%s already exists. Delete it.\n", argv[n]);
+      exit (1);
+    }
+    else if (errno != ENOENT)
+    {
+      fprintf (stderr, "%s: can't stat (%s)\n", argv[n], strerror (errno));
+      exit (1);
+    }
+  }
+  exit (0);
+}
+
+
diff -uaNr yadex-1.5.2/scripts/process yadex-1.6.0/scripts/process
--- yadex-1.5.2/scripts/process	2000-01-14 14:56:54.000000000 +0100
+++ yadex-1.6.0/scripts/process	2003-03-31 18:58:25.000000000 +0200
@@ -6,17 +6,37 @@
 #
 
 # In , replace occurrences of
-# - "$DATE"        by the YYYY-MM-DD current time,
-# - "$SELF_DATE"   by the YYYY-MM-DD mtime of ,
-# - "$SOURCE_DATE" by the contents of the file ./.srcdate,
-# - "$VERPREV"     by the contents of the file ./VERSION~.
-# - "$VERSION"     by the contents of the file ./VERSION.
+# - "$COPYRIGHT_MAN" by the contents of the file cache/copyright.man.
+# - "$COPYRIGHT_TXT" by the contents of the file cache/copyright.txt.
+# - "$DATE"          by the YYYY-MM-DD current time,
+# - "$FILES_ETC"     by the contents of the file obj/0/file_etc.man
+# - "$FILES_SHARE"   by the contents of the file obj/0/file_share.man
+# - "$SELF_DATE"     by the YYYY-MM-DD mtime of ,
+# - "$SOURCE_DATE"   by the contents of the file cache/srcdate,
+# - "$VERPREV"       by the contents of the file ./VERPREV.
+# - "$VERSION"       by the contents of the file ./VERSION.
 # Output is written on stdout.
 
 file=$1
 shift
-sed -e "s/\$DATE/`date +%Y-%m-%d`/;
-	s/\$SELF_DATE/`scripts/ftime -d $file`/;
-	s/\$SOURCE_DATE/`cat src/.srcdate`/;
-	s/\$VERPREV/`test -f VERSION~ && cat VERSION~`/;
-	s/\$VERSION/`cat VERSION`/;" $file
+sed -e "/\$COPYRIGHT_MAN/ {
+	  r cache/copyright.man
+	  d
+	}
+	/\$COPYRIGHT_TXT/ {
+	  r cache/copyright.txt
+	  d
+	}
+	/\$FILES_ETC/ {
+	  r obj/0/files_etc.man
+	  d
+	}
+	/\$FILES_SHARE/ {
+	  r obj/0/files_share.man
+	  d
+	}
+	s/\$DATE/`date +%Y-%m-%d`/g
+	s/\$SELF_DATE/`obj/0/ftime -d $file`/g
+	s/\$SOURCE_DATE/`cat cache/srcdate`/g
+	s/\$VERPREV/`test -r VERPREV && cat VERPREV`/g
+	s/\$VERSION/`cat VERSION`/g" $file
diff -uaNr yadex-1.5.2/src/.srcdate yadex-1.6.0/src/.srcdate
--- yadex-1.5.2/src/.srcdate	2001-06-30 00:00:00.000000000 +0200
+++ yadex-1.6.0/src/.srcdate	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2001-06-30
\ No newline at end of file
diff -uaNr yadex-1.5.2/src/_edit.h yadex-1.6.0/src/_edit.h
--- yadex-1.5.2/src/_edit.h	2000-06-23 00:24:31.000000000 +0200
+++ yadex-1.6.0/src/_edit.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -27,12 +27,15 @@
 */
 
 
-#ifndef YH__EDIT	/* Prevent multiple inclusion */
+#ifndef YH__EDIT	/* DO NOT INSERT ANYTHING BEFORE THIS LINE */
 #define YH__EDIT
 
 
+#include "objid.h"
+
+
 class edisplay_c;
-class menu_c;
+class Menu;
 class menubar_c;
 class modpopup_c;
 class selbox_c;
@@ -41,87 +44,88 @@
 
 // The numbers of the items on the menu bar
 enum
-   {
-   MBI_FILE,
-   MBI_EDIT,
-   MBI_VIEW,
-   MBI_SEARCH,
-   MBI_MISC,
-   MBI_OBJECTS,
-   MBI_CHECK,
-   MBI_HELP,
-   MBI_COUNT
-   };
+{
+  MBI_FILE,
+  MBI_EDIT,
+  MBI_VIEW,
+  MBI_SEARCH,
+  MBI_MISC,
+  MBI_OBJECTS,
+  MBI_CHECK,
+  MBI_HELP,
+  MBI_COUNT
+};
 
 
-// The numbers of the actual menus (menu_c objects)
+// The numbers of the actual menus (Menu objects)
 enum
-   {
-   MBM_FILE,
-   MBM_EDIT,
-   MBM_VIEW,
-   MBM_SEARCH,
-   MBM_MISC_L,  // The "Misc. operations" menus changes with the mode
-   MBM_MISC_S,
-   MBM_MISC_T,
-   MBM_MISC_V,
-   MBM_OBJECTS,
-   MBM_CHECK,
-   MBM_HELP,
-   MBM_COUNT
-   };
+{
+  MBM_FILE,
+  MBM_EDIT,
+  MBM_VIEW,
+  MBM_SEARCH,
+  MBM_MISC_L,  // The "Misc. operations" menus changes with the mode
+  MBM_MISC_S,
+  MBM_MISC_T,
+  MBM_MISC_V,
+  MBM_OBJECTS,
+  MBM_CHECK,
+  MBM_HELP,
+  MBM_COUNT
+};
 
 
 typedef enum
-   {
-   TOOL_NORMAL,
-   TOOL_SNAP_VERTEX
-   } tool_t;
+{
+  TOOL_NORMAL,
+  TOOL_SNAP_VERTEX
+} tool_t;
 
 
 /* This structure holds all the data necessary to an edit window. */
 // FIXME: make a class of it.
 typedef struct
-   {
-   int    mb_ino[MBI_COUNT];	// The numbers of the items on the menu bar
-   menu_c *mb_menu[MBM_COUNT];	// The actual menu objects
-
-   int move_speed;		// Movement speed.
-   int extra_zoom;		// Act like the zoom was 4 times what it is
-   int obj_type;		// The mode (OBJ_LINEDEF, OBJ_SECTOR...)
-   tool_t tool;			// The current tool
-   int grid_step;		// The grid step
-   int grid_step_min;		// The floor of the grid step
-   int grid_step_max;		// The ceiling of the grid step
-   int grid_step_locked;	// Whether the grid step is locked
-   int grid_shown;		// Whether the grid is shown
-   int grid_snap;		// Whether objects forced to be on the grid
-   int infobar_shown;		// Whether the info bar is shown
-   bool show_object_numbers;	// Whether the object numbers are shown
-   bool show_things_squares;	// Whether the things squares are shown
-   bool show_things_sprites;	// Whether the things sprites are shown
-   int rulers_shown;		// Whether the rulers are shown (unused ?)
-   int pointer_x;		// Map coordinates of pointer
-   int pointer_y;
-   int pointer_in_window;	// If false, pointer_[xy] are not meaningful.
-   int click_obj_no;		// The no. and type of the object the pointer
-   int click_obj_type;		// was on top of when the left click occured
-				// (*obj_no = -1 if clicked on empty space).
-   int click_ctrl;		// Was Ctrl pressed at the moment of the click?
-   unsigned long click_time;	// Date of last left click in ms
-   int highlight_obj_no;	// The no. and type of the highlighted object
-   int highlight_obj_type;	// (obj_no = -1 if no object is highlighted).
-   SelPtr Selected;		// Linked list of selected objects (or NULL)
-
-   selbox_c   *selbox;		// The selection box
-   edisplay_c *edisplay;	// The display manager
-   menubar_c  *menubar;		// The menu bar
-   spot_c     *spot;		// The insertion spot
-
-   modpopup_c *modpopup;	// The modal popup menu (only one at a time!)
-   char modal;
-   } edit_t;
-
+{
+  public :
+    int   mb_ino[MBI_COUNT];	// The numbers of the items on the menu bar
+    Menu *mb_menu[MBM_COUNT];	// The actual menu objects
+
+    int move_speed;		// Movement speed.
+    int extra_zoom;		// Act like the zoom was 4 times what it is
+    int obj_type;		// The mode (OBJ_LINEDEF, OBJ_SECTOR...)
+    bool global;		// Global mode (experimental)
+    tool_t tool;		// The current tool
+    int grid_step;		// The grid step
+    int grid_step_min;		// The floor of the grid step
+    int grid_step_max;		// The ceiling of the grid step
+    int grid_step_locked;	// Whether the grid step is locked
+    int grid_shown;		// Whether the grid is shown
+    int grid_snap;		// Whether objects forced to be on the grid
+    bool infobar_shown;		// Whether the info bar is shown
+    bool objinfo_shown;		// Whether the object info boxes are shown
+    bool show_object_numbers;	// Whether the object numbers are shown
+    bool show_things_squares;	// Whether the things squares are shown
+    bool show_things_sprites;	// Whether the things sprites are shown
+    int rulers_shown;		// Whether the rulers are shown (unused ?)
+    int pointer_x;		// Map coordinates of pointer
+    int pointer_y;
+    int pointer_in_window;	// If false, pointer_[xy] are not meaningful.
+    Objid clicked;		// The object that was under the pointer when
+				// when the left click occurred. If clicked on
+				// empty space, == CANVAS.
+    int click_ctrl;		// Was Ctrl pressed at the moment of the click?
+    unsigned long click_time;	// Date of last left click in ms
+    Objid highlighted;		// The highlighted object
+    SelPtr Selected;		// Linked list of selected objects (or NULL)
+
+    selbox_c   *selbox;		// The selection box
+    edisplay_c *edisplay;	// The display manager
+    menubar_c  *menubar;	// The menu bar
+    spot_c     *spot;		// The insertion spot
+
+    modpopup_c *modpopup;	// The modal popup menu (only one at a time!)
+    char modal;
+} edit_t;
 
-#endif  /* Prevent multiple inclusion */
 
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/acolours.cc yadex-1.6.0/src/acolours.cc
--- yadex-1.5.2/src/acolours.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/acolours.cc	2003-03-28 13:37:32.000000000 +0100
@@ -20,7 +20,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -44,10 +44,10 @@
 
 
 typedef struct
-   {
-   rgb_c rgb;
-   char deleted;
-   } ac_table_entry_t;
+{
+  rgb_c rgb;
+  char deleted;
+} ac_table_entry_t;
 
 static ac_table_entry_t *table     = 0;  // The list
 static acolour_t        table_size = 0;  // The size of the list
@@ -61,24 +61,23 @@
  */
 pcolour_t add_app_colour (rgb_c rgb)
 {
-size_t i;
-
+  size_t i;
 
-for (i = 0; i < table_size; i++)
-   if (table[i].deleted)
+  for (i = 0; i < table_size; i++)
+    if (table[i].deleted)
       break;
 
-if (i == table_size)
-   {
-   table_size++;
-   table = (ac_table_entry_t *) realloc (table, table_size * sizeof *table);
-   if (table == NULL)
+  if (i == table_size)
+  {
+    table_size++;
+    table = (ac_table_entry_t *) realloc (table, table_size * sizeof *table);
+    if (table == NULL)
       fatal_error (msg_nomem);
-   }
-ac_count++;
-table[i].rgb     = rgb;
-table[i].deleted = 0;
-return i;
+  }
+  ac_count++;
+  table[i].rgb     = rgb;
+  table[i].deleted = 0;
+  return i;
 }
 
 
@@ -88,18 +87,18 @@
  */
 void delete_app_colour (acolour_t acn)
 {
-if (acn >= table_size)
-   fatal_error ("delete_app_colour called with non-existent colour %d", acn);
-if (table[acn].deleted)
-   fatal_error ("colour %d deleted twice", acn);
-ac_count--;
-table[acn].deleted = 1;
+  if (acn >= table_size)
+    fatal_error ("delete_app_colour called with non-existent colour %d", acn);
+  if (table[acn].deleted)
+    fatal_error ("colour %d deleted twice", acn);
+  ac_count--;
+  table[acn].deleted = 1;
 }
 
 
-// FIXME a very quick-and-dirty way of preventing
-// changes to the list done between commit_() and
-// uncommit_() to corrupt things.
+/* FIXME a very quick-and-dirty way of preventing
+   changes to the list done between commit_() and
+   uncommit_() to corrupt things. */
 static size_t committed_colours = 0;
 
 
@@ -110,26 +109,35 @@
  */
 pcolour_t *commit_app_colours ()
 {
-verbmsg ("committing %d colours\n", ac_count);
+  verbmsg ("colours: committing %d colours\n", ac_count);
 
-// First create an array of RGB values
-// for all the colours in the list.
-verbmsg ("rgb_values=%p\n");
-rgb_c *rgb_values = new rgb_c[ac_count];
-rgb_c *rgb = rgb_values;
-for (size_t n = 0; n < table_size; n++)
-   if (! table[n].deleted)
-      {
-      verbmsg ("%p ", rgb - rgb_values);
+  /* First create an array of RGB values
+     for all the colours in the list. */
+  verbmsg ("colours: rgb_values %p\n");
+  rgb_c *rgb_values = new rgb_c[ac_count];
+  rgb_c *rgb = rgb_values;
+  int items_on_line = 0;
+  for (size_t n = 0; n < table_size; n++)
+    if (! table[n].deleted)
+    {
+      if (items_on_line == 0)
+	verbmsg ("colours: committing: ");
+      verbmsg ("%d ", int (rgb - rgb_values));
       *rgb++ = table[n].rgb;
+      if (++items_on_line == 16)
+      {
+	verbmsg ("\n");
+	items_on_line = 0;
       }
-verbmsg ("\n");
-
-// Then do the actual allocation.
-committed_colours = ac_count;
-pcolour_t *app_colours = alloc_colours (rgb_values, committed_colours);
-delete[] rgb_values;
-return app_colours;
+    }
+  if (items_on_line != 0)
+    verbmsg ("\n");
+
+  // Then do the actual allocation.
+  committed_colours = ac_count;
+  pcolour_t *app_colours = alloc_colours (rgb_values, committed_colours);
+  delete[] rgb_values;
+  return app_colours;
 }
 
 
@@ -140,8 +148,8 @@
  */
 void uncommit_app_colours (pcolour_t *app_colours)
 {
-free_colours (app_colours, committed_colours);
-committed_colours = 0;
+  free_colours (app_colours, committed_colours);
+  committed_colours = 0;
 }
 
 
diff -uaNr yadex-1.5.2/src/aym.cc yadex-1.6.0/src/aym.cc
--- yadex-1.5.2/src/aym.cc	2000-05-12 22:41:05.000000000 +0200
+++ yadex-1.6.0/src/aym.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -44,33 +44,33 @@
  */
 int levelname2levelno (const char *name)
 {
-const unsigned char *s = (const unsigned char *) name;
-if (toupper (s[0]) == 'E'
- && isdigit (s[1])
- && s[1] != '0'
- && toupper (s[2]) == 'M'
- && isdigit (s[3])
- && s[3] != '0'
- && s[4] == '\0')
-   return 10 * dectoi (s[1]) + dectoi (s[3]);
-if (yg_level_name == YGLN_E1M10
- && toupper (s[0]) == 'E'
- && isdigit (s[1])
- && s[1] != '0'
- && toupper (s[2]) == 'M'
- && isdigit (s[3])
- && s[3] != '0'
- && isdigit (s[4])
- && s[5] == '\0')
-   return 100 * dectoi (s[1]) + 10 * dectoi (s[3]) + dectoi (s[4]);
-if (toupper (s[0]) == 'M'
- && toupper (s[1]) == 'A'
- && toupper (s[2]) == 'P'
- && isdigit (s[3])
- && isdigit (s[4])
- && s[5] == '\0')
-   return 1000 + 10 * dectoi (s[3]) + dectoi (s[4]);
-return 0;
+  const unsigned char *s = (const unsigned char *) name;
+  if (toupper (s[0]) == 'E'
+   && isdigit (s[1])
+   && s[1] != '0'
+   && toupper (s[2]) == 'M'
+   && isdigit (s[3])
+   && s[3] != '0'
+   && s[4] == '\0')
+    return 10 * dectoi (s[1]) + dectoi (s[3]);
+  if (yg_level_name == YGLN_E1M10
+   && toupper (s[0]) == 'E'
+   && isdigit (s[1])
+   && s[1] != '0'
+   && toupper (s[2]) == 'M'
+   && isdigit (s[3])
+   && s[3] != '0'
+   && isdigit (s[4])
+   && s[5] == '\0')
+    return 100 * dectoi (s[1]) + 10 * dectoi (s[3]) + dectoi (s[4]);
+  if (toupper (s[0]) == 'M'
+   && toupper (s[1]) == 'A'
+   && toupper (s[2]) == 'P'
+   && isdigit (s[3])
+   && isdigit (s[4])
+   && s[5] == '\0')
+    return 1000 + 10 * dectoi (s[3]) + dectoi (s[4]);
+  return 0;
 }
 
 
@@ -87,33 +87,33 @@
  */
 int levelname2rank (const char *name)
 {
-const unsigned char *s = (const unsigned char *) name;
-if (toupper (s[0]) == 'E'
- && isdigit (s[1])
- && s[1] != '0'
- && toupper (s[2]) == 'M'
- && isdigit (s[3])
- && s[3] != '0'
- && s[4] == '\0')
-   return 100 * dectoi (s[1]) + dectoi (s[3]);
-if (yg_level_name == YGLN_E1M10
- && toupper (s[0]) == 'E'
- && isdigit (s[1])
- && s[1] != '0'
- && toupper (s[2]) == 'M'
- && isdigit (s[3])
- && s[3] != '0'
- && isdigit (s[4])
- && s[5] == '\0')
-   return 100 * dectoi (s[1]) + 10 * dectoi (s[3]) + dectoi (s[4]);
-if (toupper (s[0]) == 'M'
- && toupper (s[1]) == 'A'
- && toupper (s[2]) == 'P'
- && isdigit (s[3])
- && isdigit (s[4])
- && s[5] == '\0')
-   return 1000 + 10 * dectoi (s[3]) + dectoi (s[4]);
-return 0;
+  const unsigned char *s = (const unsigned char *) name;
+  if (toupper (s[0]) == 'E'
+   && isdigit (s[1])
+   && s[1] != '0'
+   && toupper (s[2]) == 'M'
+   && isdigit (s[3])
+   && s[3] != '0'
+   && s[4] == '\0')
+    return 100 * dectoi (s[1]) + dectoi (s[3]);
+  if (yg_level_name == YGLN_E1M10
+   && toupper (s[0]) == 'E'
+   && isdigit (s[1])
+   && s[1] != '0'
+   && toupper (s[2]) == 'M'
+   && isdigit (s[3])
+   && s[3] != '0'
+   && isdigit (s[4])
+   && s[5] == '\0')
+    return 100 * dectoi (s[1]) + 10 * dectoi (s[3]) + dectoi (s[4]);
+  if (toupper (s[0]) == 'M'
+   && toupper (s[1]) == 'A'
+   && toupper (s[2]) == 'P'
+   && isdigit (s[3])
+   && isdigit (s[4])
+   && s[5] == '\0')
+    return 1000 + 10 * dectoi (s[3]) + dectoi (s[4]);
+  return 0;
 }
 
 
@@ -123,15 +123,15 @@
  */
 const char *spec_path (const char *spec)
 {
-static char path[Y_PATH + 1];
-size_t n;
+  static char path[Y_PATH + 1];
+  size_t n;
 
-*path = '\0';
-strncat (path, spec, sizeof path - 1);
-for (n = strlen (path); n > 0 && ! al_fisps (path[n-1]); n--)
-   ;
-path[n] = '\0';
-return path;
+  *path = '\0';
+  strncat (path, spec, sizeof path - 1);
+  for (n = strlen (path); n > 0 && ! al_fisps (path[n-1]); n--)
+    ;
+  path[n] = '\0';
+  return path;
 }
 
 
@@ -145,22 +145,22 @@
 int fncmp (const char *name1, const char *name2)
 {
 #if defined Y_DOS
-char c1, c2;
-for (;;)
-   {
-   c1 = tolower ((unsigned char) *name1++);
-   c2 = tolower ((unsigned char) *name2++);
-   if (c1=='\\')
+  char c1, c2;
+  for (;;)
+  {
+    c1 = tolower ((unsigned char) *name1++);
+    c2 = tolower ((unsigned char) *name2++);
+    if (c1=='\\')
       c1 = '/';
-   if (c2=='\\')
+    if (c2=='\\')
       c2 = '/';
-   if (c1 != c2)
+    if (c1 != c2)
       return c1-c2;
-   if (!c1)
+    if (!c1)
       return 0;
-   }
+  }
 #elif defined Y_UNIX
-return strcmp (name1, name2);
+  return strcmp (name1, name2);
 #endif
 }
 
@@ -307,16 +307,16 @@
 /*
  *	file_exists
  *	Check whether a file exists and is readable.
- *	Returns non-zero if it is, 0 if it isn't.
+ *	Returns true if it is, false if it isn't.
  */
 bool file_exists (const char *filename)
 {
-FILE *test;
+  FILE *test;
 
-if ((test = fopen (filename, "rb")) == NULL)
-   return 0;
-fclose (test);
-return 1;
+  if ((test = fopen (filename, "rb")) == NULL)
+    return 0;
+  fclose (test);
+  return 1;
 }
 
 
@@ -374,4 +374,5 @@
   }
   *p++ = '\0';
 }
+ 
 
diff -uaNr yadex-1.5.2/src/aym.h yadex-1.6.0/src/aym.h
--- yadex-1.5.2/src/aym.h	2000-05-11 00:23:27.000000000 +0200
+++ yadex-1.6.0/src/aym.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -93,13 +93,67 @@
   else if (c >= 'a' && c <= 'f')
     return c - 'a' + 10;
   else if (c >= 'A' && c <= 'F')
-    return c = 'A' + 10;
+    return c - 'A' + 10;
   else
     return -1;
 }
 
 
 /*
+ *	b36toi
+ *	If  is a base 36 digit ("[0-9A-Za-z]"), return its value.
+ *	Else, return a negative number.
+ */
+inline int b36toi (char c)
+{
+  if (isdigit ((unsigned char) c))
+    return c - '0';
+  else if (islower (c))
+    return c - 'a' + 10;
+  else if (isupper (c))
+    return c - 'A' + 10;
+  else
+    return -1;
+}
+
+
+/*
+ *	y_isident - return true iff  is one of a-z, A-Z, 0-9 or "_".
+ *
+ *	Intentionally not using isalpha() and co. because I
+ *	don't want the results to depend on the locale.
+ */
+inline bool y_isident (char c)
+{
+  switch (c)
+  {
+    case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+    case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
+    case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
+    case 's': case 't': case 'u': case 'v': case 'w': case 'x':
+    case 'y': case 'z':
+
+    case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+    case 'G': case 'H': case 'I': case 'J': case 'K': case 'L':
+    case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
+    case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
+    case 'Y': case 'Z':
+
+    case '0': case '1': case '2': case '3': case '4': case '5':
+    case '6': case '7': case '8': case '9':
+
+    case '_':
+
+      return true;
+
+    default:
+
+      return false;
+  }
+}
+
+
+/*
  *	fnewline
  *	Write a newline to a binary file. For Unix, LF. For
  *	other platforms, CR LF.
@@ -110,7 +164,7 @@
 #ifdef Y_UNIX
   return putc ('\n', fd);
 #else
-  return putc ('\n', fd), putc ('\r', fd);
+  return putc ('\r', fd), putc ('\n', fd);
 #endif
 }
 
diff -uaNr yadex-1.5.2/src/bench.cc yadex-1.6.0/src/bench.cc
--- yadex-1.5.2/src/bench.cc	2001-06-21 15:55:01.000000000 +0200
+++ yadex-1.6.0/src/bench.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -69,7 +69,7 @@
   if (sprite_loc.wad == 0)
     fprintf (stderr, "Could not locate sprite %s\n", sprite_name);
 
-  Img img (width, height);
+  Img img (width, height, false);
   struct tms t0;
   times (&t0);
   for (unsigned long n = 0; n < iterations; n++)
@@ -77,11 +77,11 @@
   struct tms t1;
   times (&t1);
 
-  // Have to use CLK_TCK because glibc has a broken CLOCKS_PER_SEC.
-  const char *unit  = "s";
+// Glibc 2.1 (?) has a broken CLOCKS_PER_SEC.
 #ifndef CLOCKS_PER_SEC
 #define CLOCKS_PER_SEC CLK_TCK
 #endif
+  const char *unit  = "s";
   double value = (double) (t1.tms_utime - t0.tms_utime)
 		 / CLOCKS_PER_SEC / iterations;
   if (value < 1E-3)
@@ -97,5 +97,3 @@
   printf ("LoadPicture: %f %s per call\n", value, unit);
 }
 
-
-
diff -uaNr yadex-1.5.2/src/bitvec.h yadex-1.6.0/src/bitvec.h
--- yadex-1.5.2/src/bitvec.h	2000-04-15 16:20:54.000000000 +0200
+++ yadex-1.6.0/src/bitvec.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/cfgfile.cc yadex-1.6.0/src/cfgfile.cc
--- yadex-1.5.2/src/cfgfile.cc	2000-08-26 22:21:12.000000000 +0200
+++ yadex-1.6.0/src/cfgfile.cc	2003-04-01 00:00:00.000000000 +0200
@@ -3,14 +3,13 @@
  *	AYM 1998-09-30
  */
 
-
 /*
 This file is part of Yadex.
 
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,824 +27,957 @@
 
 
 #include "yadex.h"
+
+#include 
+#include 
+
 #include "cfgfile.h"
 #include "gfx.h"
 #include "help1.h"
 #include "levels.h"
-#include "macro.h"
+#include "locate.h"
 #include "trace.h"
 #include "windim.h"
 
 
-const char config_file_magic[] = "# Yadex configuration file version 3";
+const char config_file_magic[] = "# Yadex configuration file version 4";
 
 
 /*
  *	Description of the command line arguments and config file keywords
  */
 typedef enum
-   {
-   // Boolean (toggle)
-   // Receptacle is of type bool
-   // data_ptr is of type (bool *)
-   OPT_BOOLEAN,
-
-   // "yes", "no", "ask"
-   // Receptacle is of type confirm_t
-   // data_ptr is of type confirm_t
-   OPT_CONFIRM,
-
-   // Integer number,
-   // Receptacle is of type int
-   // data_ptr is of type (int *)
-   OPT_INTEGER,
-
-   // Window dimension, either integer (pixels) or integer%
-   // (percentage of total display dimension)
-   // Receptacle is of type ...
-   // data_ptr is of type ...
-   OPT_WINDIM,
-
-   // String
-   // Receptacle is of type (char[9])
-   // data_ptr is of type (char *)
-   OPT_STRINGBUF8,
-
-   // String
-   // Receptacle is of type (const char *)
-   // data_ptr is of type (const char **)
-   OPT_STRINGPTR,
-
-   // String, but store in a list
-   // Receptacle is of type ??
-   // data_ptr is of type ??
-   OPT_STRINGPTRACC,
-
-   // List of strings
-   // Receptacle is of type (const char *[])
-   // data_ptr is of type (const char ***)
-   OPT_STRINGPTRLIST,
-
-   // End of the options description
-   OPT_END
-   } opt_type_t;
-typedef struct
-   {
-   const char *long_name;	// Command line arg. or keyword
-   const char *short_name;	// Abbreviated command line argument
-   opt_type_t opt_type;		// Type of this option
-   const char *flags;		// Flags for this option :
-				// "1" = process only on pass 1 of
-				//       parse_command_line_options()
-				// "b" = BGI only (ignored ifndef Y_BGI)
-				// "x" = X only (ignored ifndef Y_X11)
-   const char *desc;		// Description of the option
-   void *data_ptr;              // Pointer to the data
-   } opt_desc_t;
-
-/* The first option has neither long name nor short name.
-   It is used for "lonely" arguments (i.e. file names). */
-opt_desc_t options[] =		/* description of the command line options */
 {
-{ NULL,
-  NULL,
-  OPT_STRINGPTRACC,
-  NULL,
-  "Patch wad file",
-  &PatchWads },
-
-{ "autoscroll",
-  NULL,
+  // Boolean (toggle)
+  // Receptacle is of type bool
+  // data_ptr is of type (bool *)
   OPT_BOOLEAN,
-  NULL,
-  "Enable autoscrolling",
-  &autoscroll },
-
-{ "autoscroll_amp",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Amp. of scrolling (% of screen size)",
-  &autoscroll_amp },
-
-{ "autoscroll_edge",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Max. dist. to edge (pixels)",
-  &autoscroll_edge },
-
-{ NULL,
-  "b",
-  OPT_STRINGPTR,
-  NULL,
-  "Run benchmark and exit successfully",
-  &bench },
-
-{ "bgi",
-  NULL,
-  OPT_STRINGPTR,
-  "b",
-  "(BGI only) BGI video driver",
-  &BGIDriver },
-
-{ "cirrus_cursor",
-  "cc",
-  OPT_BOOLEAN,
-  "b",
-  "(BGI only) Cirrus hardware cursor",
-  &CirrusCursor },
-
-{ "config_file",
-  "f",
-  OPT_STRINGPTR,
-  "1",
-  "Config file",
-  &config_file },
-
-{ "copy_linedef_reuse_sidedefs",
-  NULL,
-  OPT_BOOLEAN,
-  NULL,
-  "Use same sidedefs as original linedef",
-  ©_linedef_reuse_sidedefs },
-
-{ "debug",
-  "d",
-  OPT_BOOLEAN,
-  NULL,
-  "Debug mode",
-  &Debug },
-
-{ "default_ceiling_height",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Default ceiling height",
-  &default_ceiling_height },
-
-{ "default_ceiling_texture",
-  NULL,
-  OPT_STRINGBUF8,
-  NULL,
-  "Default ceiling texture",
-  default_ceiling_texture },
 
-{ "default_floor_height",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Default floor height",
-  &default_floor_height },
-
-{ "default_floor_texture",
-  NULL,
-  OPT_STRINGBUF8,
-  NULL,
-  "Default floor texture",
-  default_floor_texture },
-
-{ "default_light_level",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Default light level",
-  &default_light_level },
-
-{ "default_lower_texture",
-  NULL,
-  OPT_STRINGBUF8,
-  NULL,
-  "Default lower texture",
-  default_lower_texture },
-
-{ "default_middle_texture",
-  NULL,
-  OPT_STRINGBUF8,
-  NULL,
-  "Default middle texture",
-  default_middle_texture },
-
-{ "default_thing",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Default thing number",
-  &default_thing },
-
-{ "default_upper_texture",
-  NULL,
-  OPT_STRINGBUF8,
-  NULL,
-  "Default upper texture",
-  default_upper_texture },
+  // "yes", "no", "ask"
+  // Receptacle is of type confirm_t
+  // data_ptr is of type confirm_t
+  OPT_CONFIRM,
 
-{ "double_click_timeout",
-  NULL,
+  // Integer number,
+  // Receptacle is of type int
+  // data_ptr is of type (int *)
   OPT_INTEGER,
-  NULL,
-  "Max delay in ms between clicks",
-  &double_click_timeout },
-
-{ "expert",
-  NULL,
-  OPT_BOOLEAN,
-  NULL,
-  "Expert mode",
-  &Expert },
 
-{ "fake_cursor",
-  "fc",
-  OPT_BOOLEAN,
-  NULL,
-  "(X11 only) Fake cursor",
-  &FakeCursor },
-
-{ "file",
-  NULL,
-  OPT_STRINGPTRLIST,
-  NULL,
-  "Patch wad file",
-  &PatchWads },
-
-{ "font",
-  "fn",
-  OPT_STRINGPTR,
-  NULL,
-  "(X11 only) Font name",
-  &font_name },
-
-{ "game",
-  "g",
-  OPT_STRINGPTR,
-  NULL,
-  "Game",
-  &Game },
-
-{ "height",
-  "h",
+  // Unsigned long integer
+  // Receptacle is of type unsigned
+  // data_ptr is of type (unsigned long *)
+  OPT_UNSIGNED,
+
+  // Window dimension, either integer (pixels) or integer%
+  // (percentage of total display dimension)
+  // Receptacle is of type ...
+  // data_ptr is of type ...
   OPT_WINDIM,
-  "x",
-  "(X11 only) Initial window height",
-  &initial_window_height },
-
-{ "help",
-  "?",
-  OPT_BOOLEAN,
-  "1",
-  "Show usage summary",
-  &show_help },
-
-{ "grid_max",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Max grid step (map units)",
-  &GridMax },
-
-{ "grid_min",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Min grid step (map units)",
-  &GridMin },
-
-{ "grid_pixels_min",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Min grid step (pixels)",
-  &grid_pixels_min },
-
-{ "idle_sleep_ms",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "ms to sleep before XPending()",
-  &idle_sleep_ms },
-
-{ "info_bar",
-  NULL,
-  OPT_BOOLEAN,
-  NULL,
-  "Show the info bar",
-  &InfoShown },
-
-{ "insert_vertex_split_linedef",
-  NULL,
-  OPT_CONFIRM,
-  NULL,
-  "Split ld after ins. vertex",
-  &insert_vertex_split_linedef },
-
-{ "insert_vertex_merge_vertices",
-  NULL,
-  OPT_CONFIRM,
-  NULL,
-  "Merge vertices after ins. vertex",
-  &insert_vertex_merge_vertices },
-
-{ "iwad1",
-  "i1",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Doom/Ultimate D. iwad",
-  &Iwad1 },
 
-{ "iwad2",
-  "i2",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Doom II/Final D. iwad",
-  &Iwad2 },
-
-{ "iwad3",
-  "i3",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Heretic iwad",
-  &Iwad3 },
-
-{ "iwad4",
-  "i4",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Hexen iwad",
-  &Iwad4 },
+  // String
+  // Receptacle is of type (char[9])
+  // data_ptr is of type (char *)
+  OPT_STRINGBUF8,
 
-{ "iwad5",
-  "i5",
+  // String
+  // Receptacle is of type (const char *)
+  // data_ptr is of type (const char **)
   OPT_STRINGPTR,
-  NULL,
-  "The name of the Strife iwad",
-  &Iwad5 },
 
-{ "iwad6",
-  "i6",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Doom alpha 0.2 iwad",
-  &Iwad6 },
+  // String, but store in a list
+  // Receptacle is of type ??
+  // data_ptr is of type ??
+  OPT_STRINGPTRACC,
 
-{ "iwad7",
-  "i7",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Doom alpha 0.4 iwad",
-  &Iwad7 },
+  // List of strings
+  // Receptacle is of type (const char *[])
+  // data_ptr is of type (const char ***)
+  OPT_STRINGPTRLIST,
 
-{ "iwad8",
-  "i8",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Doom alpha 0.5 iwad",
-  &Iwad8 },
+  // End of the options description
+  OPT_END
+} opt_type_t;
 
-{ "iwad9",
-  "i9",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Doom press rel. iwad",
-  &Iwad9 },
+typedef struct
+{
+  const char *long_name;	// Command line arg. or keyword
+  const char *short_name;	// Abbreviated command line argument
+  opt_type_t opt_type;		// Type of this option
+  const char *flags;		// Flags for this option :
+				// "1" = process only on pass 1 of
+				//       parse_command_line_options()
+				// "b" = BGI only (ignored ifndef Y_BGI)
+				// "x" = X only (ignored ifndef Y_X11)
+  const char *desc;		// Description of the option
+  void *data_ptr;		// Pointer to the data
+} opt_desc_t;
 
-{ "iwad10",
-  "i10",
-  OPT_STRINGPTR,
-  NULL,
-  "The name of the Strife 1.0 iwad",
-  &Iwad10 },
+/* The first option has neither long name nor short name.
+   It is used for "lonely" arguments (i.e. file names). */
+opt_desc_t options[] =		// Description of the command line options
+{
+  { 0,
+    0,
+    OPT_STRINGPTRACC,
+    0,
+    "Patch wad file",
+    &PatchWads },
+
+  { "autoscroll",
+    0,
+    OPT_BOOLEAN,
+    0,
+    "Enable autoscrolling",
+    &autoscroll },
+
+  { "autoscroll_amp",
+    0,
+    OPT_UNSIGNED,
+    0,
+    "Amp. of scrolling (% of screen size)",
+    &autoscroll_amp },
+
+  { "autoscroll_edge",
+    0,
+    OPT_UNSIGNED,
+    0,
+    "Max. dist. to edge (pixels)",
+    &autoscroll_edge },
+
+  { 0,
+    "b",
+    OPT_STRINGPTR,
+    0,
+    "Run benchmark and exit successfully",
+    &bench },
+
+  { "bgi",
+    0,
+    OPT_STRINGPTR,
+    "b",
+    "(BGI only) BGI video driver",
+    &BGIDriver },
+
+  { "blindly_swap_sidedefs",
+    0,
+    OPT_BOOLEAN,
+    0,
+    "Blindly swap sidedefs on a linedef",
+    &blindly_swap_sidedefs },
+
+  { "cirrus_cursor",
+    "cc",
+    OPT_BOOLEAN,
+    "b",
+    "(BGI only) Cirrus hardware cursor",
+    &CirrusCursor },
+
+  { "config_file",
+    "f",
+    OPT_STRINGPTR,
+    "1",
+    "Config file",
+    &config_file },
+
+  { "copy_linedef_reuse_sidedefs",
+    0,
+    OPT_BOOLEAN,
+    0,
+    "Use same sidedefs as original linedef",
+    ©_linedef_reuse_sidedefs },
+
+  { "debug",
+    "d",
+    OPT_BOOLEAN,
+    0,
+    "Debug mode",
+    &Debug },
+
+  { "default_ceiling_height",
+    0,
+    OPT_INTEGER,
+    0,
+    "Default ceiling height",
+    &default_ceiling_height },
+
+  { "default_ceiling_texture",
+    0,
+    OPT_STRINGBUF8,
+    0,
+    "Default ceiling texture",
+    default_ceiling_texture },
+
+  { "default_floor_height",
+    0,
+    OPT_INTEGER,
+    0,
+    "Default floor height",
+    &default_floor_height },
+
+  { "default_floor_texture",
+    0,
+    OPT_STRINGBUF8,
+    0,
+    "Default floor texture",
+    default_floor_texture },
+
+  { "default_light_level",
+    0,
+    OPT_INTEGER,
+    0,
+    "Default light level",
+    &default_light_level },
+
+  { "default_lower_texture",
+    0,
+    OPT_STRINGBUF8,
+    0,
+    "Default lower texture",
+    default_lower_texture },
+
+  { "default_middle_texture",
+    0,
+    OPT_STRINGBUF8,
+    0,
+    "Default middle texture",
+    default_middle_texture },
+
+  { "default_thing",
+    0,
+    OPT_INTEGER,
+    0,
+    "Default thing number",
+    &default_thing },
+
+  { "default_upper_texture",
+    0,
+    OPT_STRINGBUF8,
+    0,
+    "Default upper texture",
+    default_upper_texture },
+
+  { "digit_zoom_base",
+    0,
+    OPT_INTEGER,
+    0,
+    "[0]-[9]: base zoom factor (in %)",
+    &digit_zoom_base },
+
+  { "digit_zoom_step",
+    0,
+    OPT_INTEGER,
+    0,
+    "[0]-[9]: step between factors (in %)",
+    &digit_zoom_step },
+
+  { "double_click_timeout",
+    0,
+    OPT_INTEGER,
+    0,
+    "Max delay in ms between clicks",
+    &double_click_timeout },
+
+  { "expert",
+    0,
+    OPT_BOOLEAN,
+    0,
+    "Expert mode",
+    &Expert },
+
+  { "fake_cursor",
+    "fc",
+    OPT_BOOLEAN,
+    0,
+    "(X11 only) Fake cursor",
+    &FakeCursor },
+
+  { "file",
+    0,
+    OPT_STRINGPTRLIST,
+    0,
+    "Patch wad file",
+    &PatchWads },
+
+  { "font",
+    "fn",
+    OPT_STRINGPTR,
+    0,
+    "(X11 only) Font name",
+    &font_name },
+
+  { "game",
+    "g",
+    OPT_STRINGPTR,
+    0,
+    "Game",
+    &Game },
+
+  { "grid_max",
+    0,
+    OPT_INTEGER,
+    0,
+    "Max grid step (map units)",
+    &GridMax },
+
+  { "grid_min",
+    0,
+    OPT_INTEGER,
+    0,
+    "Min grid step (map units)",
+    &GridMin },
+
+  { "grid_pixels_min",
+    0,
+    OPT_INTEGER,
+    0,
+    "Min grid step (pixels)",
+    &grid_pixels_min },
+
+  { "height",
+    "h",
+    OPT_WINDIM,
+    "x",
+    "(X11 only) Initial window height",
+    &initial_window_height },
+
+  { "help",
+    "?",
+    OPT_BOOLEAN,
+    "1",
+    "Show usage summary",
+    &show_help },
+
+  { "idle_sleep_ms",
+    0,
+    OPT_INTEGER,
+    0,
+    "ms to sleep before XPending()",
+    &idle_sleep_ms },
+
+  { "info_bar",
+    0,
+    OPT_BOOLEAN,
+    0,
+    "Show the info bar",
+    &InfoShown },
+
+  { "insert_vertex_split_linedef",
+    0,
+    OPT_CONFIRM,
+    0,
+    "Split ld after ins. vertex",
+    &insert_vertex_split_linedef },
+
+  { "insert_vertex_merge_vertices",
+    0,
+    OPT_CONFIRM,
+    0,
+    "Merge vertices after ins. vertex",
+    &insert_vertex_merge_vertices },
+
+  { "iwad1",
+    "i1",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Doom/Ultimate D. iwad",
+    &Iwad1 },
+
+  { "iwad2",
+    "i2",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Doom II/Final D. iwad",
+    &Iwad2 },
+
+  { "iwad3",
+    "i3",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Heretic iwad",
+    &Iwad3 },
+
+  { "iwad4",
+    "i4",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Hexen iwad",
+    &Iwad4 },
+
+  { "iwad5",
+    "i5",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Strife iwad",
+    &Iwad5 },
+
+  { "iwad6",
+    "i6",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Doom alpha 0.2 iwad",
+    &Iwad6 },
+
+  { "iwad7",
+    "i7",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Doom alpha 0.4 iwad",
+    &Iwad7 },
+
+  { "iwad8",
+    "i8",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Doom alpha 0.5 iwad",
+    &Iwad8 },
+
+  { "iwad9",
+    "i9",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Doom press rel. iwad",
+    &Iwad9 },
+
+  { "iwad10",
+    "i10",
+    OPT_STRINGPTR,
+    0,
+    "The name of the Strife 1.0 iwad",
+    &Iwad10 },
 
 #ifdef AYM_MOUSE_HACKS
-{ "mouse_horizontal_sens",
-  "mh",
-  OPT_INTEGER,
-  "b",
-  "(BGI only) Mouse horizontal sensitivity",
-  &MouseMickeysH },
-
-{ "mouse_vertical_sens",
-  "mv",
-  OPT_INTEGER,
-  "b",
-  "(BGI only) Mouse vertical sensitivity",
-  &MouseMickeysV },
+  { "mouse_horizontal_sens",
+    "mh",
+    OPT_INTEGER,
+    "b",
+    "(BGI only) Mouse horizontal sensitivity",
+    &MouseMickeysH },
+
+  { "mouse_vertical_sens",
+    "mv",
+    OPT_INTEGER,
+    "b",
+    "(BGI only) Mouse vertical sensitivity",
+    &MouseMickeysV },
 #endif
 
-{ "pwad",
-  "pw",
-  OPT_STRINGPTRACC,
-  NULL,
-  "Pwad file to load",
-  &PatchWads },
-
-{ "no_pixmap",
-  "P",
-  OPT_BOOLEAN,
-  NULL,
-  "(X11 only) Use no pixmap",
-  &no_pixmap },
-
-{ "quiet",
-  "q",
-  OPT_BOOLEAN,
-  NULL,
-  "Quiet mode",
-  &Quiet },
-
-{ "quieter",
-  "qq",
-  OPT_BOOLEAN,
-  NULL,
-  "Quieter mode",
-  &Quieter },
-
-{ "scroll_less",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Amp. of scrolling (% of screen size)",
-  &scroll_less },
-
-{ "scroll_more",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Amp. of scrolling (% of screen size)",
-  &scroll_more },
-
-{ "select0",
-  "s0",
-  OPT_BOOLEAN,
-  NULL,
-  "Automatic selection of 0th object",
-  &Select0 },
-
-{ "sprite_scale",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Relative scale of sprites",
-  &sprite_scale },
-
-{ "swap_buttons",
-  "sb",
-  OPT_BOOLEAN,
-  NULL,
-  "Swap mouse buttons",
-  &SwapButtons },
-
-{ "text_dot",
-  "td",
-  OPT_BOOLEAN,
-  NULL,
-  "DrawScreenText debug flag",
-  &text_dot },
-
-{ "thing_fudge",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Radius to highlight things",
-  &thing_fudge },
-
-{ "verbose",
-  "v",
-  OPT_BOOLEAN,
-  NULL,
-  "Verbose mode",
-  &verbose },
-
-{ "vertex_fudge",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Radius to highlight vertices",
-  &vertex_fudge },
-
-{ "video",
-  "V",
-  OPT_INTEGER,
-  "b",
-  "(BGI only) Video mode",
-  &VideoMode },
-
-{ "welcome_message",
-  NULL, 
-  OPT_BOOLEAN,
-  NULL,
-  "Print welcome message",
-  &welcome_message },
-
-{ "width",
-  "w",
-  OPT_WINDIM,
-  "x",
-  "(X11 only) Initial window width",
-  &initial_window_width },
-
-{ "zoom_default",
-  "z",
-  OPT_INTEGER,
-  NULL,
-  "Initial zoom factor",
-  &zoom_default },
-
-{ "zoom_step",
-  NULL,
-  OPT_INTEGER,
-  NULL,
-  "Step between zoom factors (in %)",
-  &zoom_step },
-
-{ NULL,
-  NULL,
-  OPT_END,
-  NULL,
-  NULL,
-  NULL }
+  { "no_pixmap",
+    "P",
+    OPT_BOOLEAN,
+    0,
+    "(X11 only) Use no pixmap",
+    &no_pixmap },
+
+  { "pwad",
+    "pw",
+    OPT_STRINGPTRACC,
+    0,
+    "Pwad file to load",
+    &PatchWads },
+
+  { "quiet",
+    "q",
+    OPT_BOOLEAN,
+    0,
+    "Quiet mode",
+    &Quiet },
+
+  { "quieter",
+    "qq",
+    OPT_BOOLEAN,
+    0,
+    "Quieter mode",
+    &Quieter },
+
+  { "scroll_less",
+    0,
+    OPT_UNSIGNED,
+    0,
+    "Amp. of scrolling (% of screen size)",
+    &scroll_less },
+
+  { "scroll_more",
+    0,
+    OPT_UNSIGNED,
+    0,
+    "Amp. of scrolling (% of screen size)",
+    &scroll_more },
+
+  { "select0",
+    "s0",
+    OPT_BOOLEAN,
+    0,
+    "Automatic selection of 0th object",
+    &Select0 },
+
+  { "sprite_scale",
+    0,
+    OPT_INTEGER,
+    0,
+    "Relative scale of sprites",
+    &sprite_scale },
+
+  { "swap_buttons",
+    "sb",
+    OPT_BOOLEAN,
+    0,
+    "Swap mouse buttons",
+    &SwapButtons },
+
+  { "text_dot",
+    "td",
+    OPT_BOOLEAN,
+    0,
+    "DrawScreenText debug flag",
+    &text_dot },
+
+  { "verbose",
+    "v",
+    OPT_BOOLEAN,
+    "1",
+    "Verbose mode",
+    &verbose },
+
+  { "video",
+    "V",
+    OPT_INTEGER,
+    "b",
+    "(BGI only) Video mode",
+    &VideoMode },
+
+  { "welcome_message",
+    0, 
+    OPT_BOOLEAN,
+    0,
+    "Print welcome message",
+    &welcome_message },
+
+  { "width",
+    "w",
+    OPT_WINDIM,
+    "x",
+    "(X11 only) Initial window width",
+    &initial_window_width },
+
+  { "zoom_default",
+    "z",
+    OPT_INTEGER,
+    0,
+    "Initial zoom factor",
+    &zoom_default },
+
+  { "zoom_step",
+    0,
+    OPT_INTEGER,
+    0,
+    "Step between zoom factors (in %)",
+    &zoom_step },
+
+  { 0,
+    0,
+    OPT_END,
+    0,
+    0,
+    0 }
 };
 
 
-static const char *standard_directories[] =
-   {
-   "./%b",
-   "~/.yadex/%v/%b",
-   "~/.yadex/%b",
-   "%i/%b",
-   "/usr/local/etc/yadex/%v/%b",
-   "/usr/local/etc/yadex/%b",
-   "/etc/yadex/%v/%b",
-   "/etc/yadex/%b",
-   0
-   };
+typedef enum
+{
+  CFG_PARSE_            = 0x00,
+  CFG_PARSE_MAGIC_ERROR = 0x01,
+  CFG_PARSE_MAGIC_WARN  = 0x02,
+  CFG_PARSE_ANAL_NAME   = 0x04,
+  CFG_PARSE_ANAL_SYNTAX = 0x08
+} cfg_parse_flags_t;
 
 
 static void append_item_to_list (const char ***list, const char *item);
-int parse_one_config_file (const char *filename);
+static int parse_config_file (const char *filename,
+  cfg_parse_flags_t flags = CFG_PARSE_);
 static confirm_t confirm_e2i (const char *external);
 static const char *confirm_i2e (confirm_t internal);
 
 
 /*
- *	parse_config_file
+ *	parse_config_file_default - parse the default config file(s)
  *
- *	If  is NULL, the standard directories are searched
- *	for a file named "yadex.cfg".
- *
- *	If  is not NULL and is not an absolute name (i.e.
- *	does not start with a "/"), the standard directories are
- *	searched for a file named .  may contain
- *	slashes, E.G. if you use "-f foo/bar", the function will search
- *	for "./yadex//foo/bar", "~/.yadex/foo/bar",
- *	"/usr/local/etc/yadex/foo/bar", and so on.
- *
- *	If  is not NULL but is an absolute name, only that
- *	file is searched.
- *
- *	Return 0 on success, non-zero on failure.
+ *	Return non-zero if parse error occurred (i.e. at least
+ *	one call to parse_config_file() returned non-zero), zero
+ *	otherwise.
  */
-int parse_config_file (const char *filename)
+int parse_config_file_default ()
 {
-bool absolute = filename && is_absolute (filename);
+  int rc = 0;
+  int matches;
+  const char *pathname;
+  const char *name = "yadex.cfg";
+  Locate locate (yadex_etc_path, name, true);
+
+  for (matches = 0; (pathname = locate.get_next ()) != NULL; matches++)
+  {
+    printf ("Reading config file \"%s\".\n", pathname);
+    int r = parse_config_file (pathname);
+    if (r != 0)
+      rc = 1;
+  }
+  if (matches == 0)
+    warn ("%s: not found\n", name);
+  return rc;
+}
 
-if (absolute)
-   {
-   printf ("Using config file \"%s\".\n", filename);
-   int failure = parse_one_config_file (filename);
-   return failure;
-   }
-else
-   {
-   char name[257];
-   const char *home = getenv ("HOME");
-   for (const char **dirname = standard_directories; *dirname; dirname++)
-      {
-      int r = macro_expand (name, sizeof name - 1, *dirname,
-	  "%b", filename ? filename : "yadex.cfg",
-	  "%i", install_dir,
-	  "%v", yadex_version,
-	  "~",  home,
-	  (const char *) 0);
-      if (r)
-	 {
-	 trace ("cfgloc", "%s: Could not expand macro #%d", *dirname, r);
-	 continue;
-	 }
-      if (file_exists (name))
-	 {
-	 trace ("cfgloc", "%s: hit", name);
-	 printf ("Using config file \"%s\".\n", name);
-	 int failure = parse_one_config_file (name);
-	 return failure;
-	 }
-      trace ("cfgloc", "%s: miss (%s)", name, strerror (errno));
-      }
-   warn ("No config file found.\n");
-   return 0;
-   }
+
+/*
+ *	parse_config_file_user - parse a user-specified config file
+ *
+ *	Return non-zero if the file couldn't be found or if
+ *	parse error occurred (i.e. parse_config_file() returned
+ *	non-zero), zero otherwise.
+ */
+int parse_config_file_user (const char *name)
+{
+  const char *pathname;
+  Locate locate (yadex_etc_path, name, false);
+  
+  pathname = locate.get_next ();
+  if (pathname == NULL)
+  {
+    err ("%s: not found", name);
+    return 1;
+  }
+  printf ("Reading config file \"%s\".\n", pathname);
+  return parse_config_file (pathname);
 }
 
 
 /*
- *	parse_one_config_file
- *	Try to parse one particular config file.
+ *	parse_config_file - try to parse a config file by pathname.
+ *
+ *	If (flags & CFG_PARSE_MAGIC_ERROR) is true, the file must
+ *	begin with config_file_magic on a line by itself or the
+ *	function will exit immediately with a non-zero value.
+ *
+ *	If (flags & CFG_PARSE_MAGIC_WARN) is true, the file must
+ *	begin with config_file_magic on a line by itself or the
+ *	function will print a warning.
+ *
+ *	If (flags & CFG_PARSE_ANAL_NAME) is true, unknown
+ *	variables name cause the function to return immediately
+ *	with a non-zero value. Otherwise, unknown variables
+ *	cause the line to be skipped with a warning and do not
+ *	cause the return value to be non-zero.
+ *
+ *	If (flags & CFG_PARSE_ANAL_SYNTAX) is true, lines that
+ *	do not follow the  =  syntax cause the
+ *	function to emit an error message and return immediately
+ *	with a non-zero value. Otherwise, such lines are simply
+ *	ignored with a warning message and do not cause the
+ *	return value to be non-zero.
+ *
  *	Return 0 on success, <>0 on failure.
  */
 #define RETURN_FAILURE do { rc = 1; goto byebye; } while (0)
-int parse_one_config_file (const char *filename)
+static int parse_config_file (const char *filename, cfg_parse_flags_t flags)
 {
-int   rc = 0;
-FILE *cfgfile;
-char  line[1024];
-char *value;
-char *p;
-const opt_desc_t *o;
-
-cfgfile = fopen (filename, "r");
-if (cfgfile == NULL)
-   {
-   report_error ("Can't open config file \"%s\" (%s)\n.",
-      filename, strerror (errno));
-   RETURN_FAILURE;
-   }
-
-/* The first line of the configuration file must
-   contain exactly config_file_magic. */
-if (fgets (line, sizeof line, cfgfile) == NULL
-   || memcmp (line, config_file_magic, sizeof config_file_magic - 1)
-   || line[sizeof config_file_magic - 1] != '\n'
-   || line[sizeof config_file_magic] != '\0')
-   {
-   report_error ("%s is not a valid Yadex configuration file", filename);
-   report_error ("Perhaps a leftover from a previous version of Yadex ?");
-   RETURN_FAILURE;
-   }
-
-/* Execute one line on each iteration. */
-for (unsigned lnum = 2; fgets (line, sizeof line, cfgfile) != NULL; lnum++)
-   {
-   /* Skip leading whitespace */
-   char *option = line;
-   while (isspace (*option))
-      option++;
-
-   /* Skip comments */
-   if (*option == '#')
-      continue;
-
-   /* Remove trailing newline */
-   {
-   size_t len = strlen (option);
-   if (len >= 1 && option[len - 1] == '\n')
-      option[len - 1] = '\0';
-   }
+  int   rc = 0;
+  FILE *cfgfile;
+  char  line[1024];
+
+  cfgfile = fopen (filename, "r");
+  if (cfgfile == NULL)
+  {
+    err ("Can't open config file \"%s\" (%s)", filename, strerror (errno));
+    RETURN_FAILURE;
+  }
+
+  /* The first line of the configuration file must
+     contain exactly config_file_magic. */
+  if (fgets (line, sizeof line, cfgfile) == NULL
+     || memcmp (line, config_file_magic, sizeof config_file_magic - 1)
+     || line[sizeof config_file_magic - 1] != '\n'
+     || line[sizeof config_file_magic] != '\0')
+  {
+    if (flags & CFG_PARSE_MAGIC_ERROR)
+    {
+      err ("%s(1): bad magic, not a valid Yadex configuration file", filename);
+      err ("Perhaps a leftover from a previous version of Yadex ?");
+      RETURN_FAILURE;
+    }
+    if (flags & CFG_PARSE_MAGIC_WARN)
+      warn ("%s(1): bad magic, perhaps from a different version of Yadex\n",
+	  filename);
+    rewind (cfgfile);
+  }
+
+  // Execute one line on each iteration
+  for (unsigned lnum = 1; fgets (line, sizeof line, cfgfile) != NULL; lnum++)
+  {
+    char *name  = 0;
+    char *op    = 0;
+    char *value = 0;
+    char *p     = line;
+
+    // Skip leading whitespace
+    while (isspace (*p))
+      p++;
 
-   /* Skip empty lines */
-   if (! *option)
+    // Skip comments
+    if (*p == '#')
       continue;
 
-   /* Skip the option name */
-   value = option;
-   while (*value && *value != '=' && !isspace ((unsigned char) *value))
-      value++;
-   if (! *value)
+    // Remove trailing newline
+    {
+      size_t len = strlen (p);
+      if (len >= 1 && p[len - 1] == '\n')
+	p[len - 1] = '\0';
+    }
+
+    // Skip empty lines
+    if (*p == '\0')
+       continue;
+
+    // Make  point on the  field
+    name = p;
+    while (y_isident (*p))
+      p++;
+    if (*p == '\0')
+    {
+      if (flags & CFG_PARSE_ANAL_SYNTAX)
       {
-      report_error ("%s(%u): line ends prematurely", filename, lnum);
-      RETURN_FAILURE;
+	err ("%s(%u): expected an \"=\"", filename, lnum);
+	RETURN_FAILURE;
       }
-   if (*value == '=')
+      else
       {
-      /* mark the end of the option name */
-      *value = '\0';
+	warn ("%s(%u): expected an \"=\", skipping\n", filename, lnum);
+	goto next_line;
       }
-   else
+    }
+    if (*p == '=')
+    {
+      // Mark the end of the option name
+      *p = '\0';
+    }
+    else
+    {
+      // Mark the end of the option name
+      *p = '\0';
+      p++;
+      // Skip blanks after the option name
+      while (isspace ((unsigned char) *p))
+	p++;
+      if (*p != '=')
       {
-      /* mark the end of the option name */
-      *value = '\0';
-      value++;
-      /* skip blanks after the option name */
-      while (isspace ((unsigned char) *value))
-	 value++;
-      if (*value != '=')
-         {
-	 report_error ("%s(%u,%d): expected an \"=\"",
-	    filename, lnum, (int) (value - line) + 1);
-	 RETURN_FAILURE;
-         }
+	if (flags & CFG_PARSE_ANAL_SYNTAX)
+	{
+	  err ("%s(%u,%d): expected an \"=\"",
+	    filename, lnum, 1 + (int) (p - line));
+	  RETURN_FAILURE;
+	}
+	else
+	{
+	  warn ("%s(%u,%d): expected an \"=\", skipping\n",
+	    filename, lnum, 1 + (int) (p - line));
+	  goto next_line;
+	}
       }
-   value++;
-   /* skip blanks after the equal sign */
-   while (isspace ((unsigned char) *value))
-      value++;
-   for (o = options + 1; ; o++)
+    }
+    p++;
+
+    /* First parameter :  points on the first character.
+       Put a NUL at the end. If there is a second parameter,
+       holler. */
+    while (isspace ((unsigned char) *p))
+      p++;
+    value = p;
+    {
+      unsigned char *p2 = (unsigned char *) value;
+      while (*p2 != '\0' && ! isspace (*p2))
+	p2++;
+      if (*p2 != '\0')  // There's trailing whitespace after 1st parameter
       {
+	for (unsigned char *p3 = p2; *p3 != '\0'; p3++)
+	  if (! isspace (*p3))
+	  {
+	    err ("%s(%u,%d): extraneous argument",
+	      filename, lnum, 1 + (int) ((char *) p3 - line));
+	    RETURN_FAILURE;
+	  }
+      }
+      *p2 = '\0';
+    }
+
+    for (const opt_desc_t *o = options + 1; ; o++)
+    {
       if (o->opt_type == OPT_END)
-         {
-	 warn ("%s(%u): invalid variable \"%s\" - skipping\n",
-	   filename, lnum, option);
-	 goto next_line;
-         }
-      if (o->long_name && ! strcmp (option, o->long_name))
-	 {
-	 if (o->flags != NULL && strchr (o->flags, '1'))
-	    break;
+      {
+	if (flags & CFG_PARSE_ANAL_NAME)
+	{
+	  err ("%s(%u): invalid variable \"%s\"", filename, lnum, name);
+	  RETURN_FAILURE;
+	}
+	else
+	{
+	  warn ("%s(%u): invalid variable \"%s\", skipping\n",
+	    filename, lnum, name);
+	  goto next_line;
+	}
+      }
+      if (! o->long_name || strcmp (name, o->long_name) != 0)
+        continue;
+
+      if (o->flags != NULL && strchr (o->flags, '1'))
+	 break;
 #if ! defined Y_BGI
-	 if (o->flags != NULL && strchr (o->flags, 'b'))
-	    break;
+      if (o->flags != NULL && strchr (o->flags, 'b'))
+	 break;
 #endif
 #if ! defined Y_X11
-	 if (o->flags != NULL && strchr (o->flags, 'x'))
-	    break;
+      if (o->flags != NULL && strchr (o->flags, 'x'))
+	 break;
 #endif
-	 switch (o->opt_type)
+      switch (o->opt_type)
+      {
+	case OPT_BOOLEAN:
+	  if (! strcmp (value, "yes") || ! strcmp (value, "true")
+	   || ! strcmp (value, "on") || ! strcmp (value, "1"))
+	  {
+	    if (o->data_ptr)
+	      *((bool *) (o->data_ptr)) = true;
+	  }
+	  else if (! strcmp (value, "no") || ! strcmp (value, "false")
+		|| ! strcmp (value, "off") || ! strcmp (value, "0"))
+	  {
+	    if (o->data_ptr)
+	      *((bool *) (o->data_ptr)) = false;
+	  }
+	  else
+	  {
+	    err ("%s(%u): invalid value for option %s: \"%s\"",
+	      filename, lnum, name, value);
+	    RETURN_FAILURE;
+	  }
+	  break;
+
+	case OPT_CONFIRM:
+	  if (o->data_ptr)
+	    *((confirm_t *) o->data_ptr) = confirm_e2i (value);
+	  break;
+
+	case OPT_INTEGER:
+	  if (o->data_ptr)
+	    *((int *) (o->data_ptr)) = atoi (value);
+	  break;
+
+	case OPT_UNSIGNED:
+	  if (o->data_ptr)
+	  {
+	    if (*value == '\0')
 	    {
-	    case OPT_BOOLEAN:
-	       if (! strcmp (value, "yes") || ! strcmp (value, "true")
-	        || ! strcmp (value, "on") || ! strcmp (value, "1"))
-		  {
-		  if (o->data_ptr)
-		     *((bool *) (o->data_ptr)) = true;
-		  }
-	       else if (! strcmp (value, "no") || ! strcmp (value, "false")
-	             || ! strcmp (value, "off") || ! strcmp (value, "0"))
-		  {
-		  if (o->data_ptr)
-		     *((bool *) (o->data_ptr)) = false;
-		  }
-	       else
-                  {
-		  report_error ("%s(%u): invalid value for option %s: \"%s\"",
-		    filename, lnum, option, value);
-		  RETURN_FAILURE;
-                  }
-	       break;
-            case OPT_CONFIRM:
-               if (o->data_ptr)
-                  *((confirm_t *) o->data_ptr) = confirm_e2i (value);
-               break;
-	    case OPT_INTEGER:
-	       if (o->data_ptr)
-	          *((int *) (o->data_ptr)) = atoi (value);
-	       break;
-	    case OPT_WINDIM:
-	       if (o->data_ptr)
-		  if (((Win_dim *) (o->data_ptr))->set (value))
-		     {
-		     report_error ("%s(%u): bad dimension spec \"%s\"",
-		        filename, lnum, value);
-		     RETURN_FAILURE;
-		     }
-	       break;
-            case OPT_STRINGBUF8:
-               if (o->data_ptr)
-                  al_scps ((char *) o->data_ptr, value, 8);
-               break;
-	    case OPT_STRINGPTR:
-	       p = (char *) GetMemory (strlen (value) + 1);
-	       strcpy (p, value);
-	       if (o->data_ptr)
-	          *((char **) (o->data_ptr)) = p;
-	       break;
-	    case OPT_STRINGPTRACC:
-	       p = (char *) GetMemory (strlen (value) + 1);
-	       strcpy (p, value);
-	       if (o->data_ptr)
-	          append_item_to_list ((const char ***) o->data_ptr, p);
-	       break;
-	    case OPT_STRINGPTRLIST:
-	       while (value[0])
-		  {
-		  option = value;
-		  while (option[0] && !isspace ((unsigned char) option[0]))
-		     option++;
-		  option[0] = '\0';
-		  option++;
-		  while (isspace (option[0]))
-		     option++;
-		  p = (char *) GetMemory (strlen (value) + 1);
-		  strcpy (p, value);
-	          if (o->data_ptr)
-		     append_item_to_list ((const char ***) o->data_ptr, p);
-		  value = option;
-		  }
-	       break;
-	    default:
-               {
-               report_error ("%s(%u): unknown option type %d (BUG!)",
-	         filename, lnum, (int) o->opt_type);
-	       RETURN_FAILURE;
-               }
+	      err ("%s(%u,%d): missing argument",
+	        filename, lnum, 1 + (int) (value - line));
+	      RETURN_FAILURE;
 	    }
-	 break;
-	 }
-      }
-   next_line:;
-   }
+	    bool neg = false;
+	    if (value[0] == '-')
+	      neg = true;
+	    char *endptr;
+	    errno = 0;
+	    *((unsigned long *) (o->data_ptr)) = strtoul (value, &endptr, 0);
+	    if (*endptr != '\0' && ! isspace (*endptr))
+	    {
+	      err ("%s(%u,%d): illegal character in unsigned integer",
+		filename, lnum, 1 + (int) (endptr - line));
+	      RETURN_FAILURE;
+	    }
+	    /* strtoul() sets errno to ERANGE if overflow. In
+	       addition, we don't want any non-zero negative
+	       numbers. In terms of regexp, /^(0x)?0*$/i. */
+	    if
+	    (
+	      errno != 0
+	      || neg
+	        && !
+		(
+		  strspn (value + 1, "0") == strlen (value + 1)
+		  || value[1] == '0'
+		    && tolower (value[2]) == 'x'
+		    && strspn (value + 3, "0") == strlen (value + 3)
+		)
+	    )
+	    {
+	      err ("%s(%u,%d): unsigned integer out of range",
+		filename, lnum, 1 + (int) (value - line));
+	      RETURN_FAILURE;
+	    }
+	  }
+	  break;
 
-byebye:
-if (cfgfile != 0)
-   fclose (cfgfile);
-return rc;
+	case OPT_WINDIM:
+	  if (o->data_ptr)
+	    if (((Win_dim *) (o->data_ptr))->set (value))
+	    {
+	      err ("%s(%u): bad dimension spec \"%s\"", filename, lnum, value);
+	      RETURN_FAILURE;
+	    }
+	  break;
+
+	case OPT_STRINGBUF8:
+	  if (o->data_ptr)
+	    al_scps ((char *) o->data_ptr, value, 8);
+	  break;
+
+	case OPT_STRINGPTR:
+	  {
+	    char *dup = (char *) GetMemory (strlen (value) + 1);
+	    strcpy (dup, value);
+	    if (o->data_ptr)
+	      *((char **) (o->data_ptr)) = dup;
+	    break;
+	  }
+
+	case OPT_STRINGPTRACC:
+	  {
+	    char *dup = (char *) GetMemory (strlen (value) + 1);
+	    strcpy (dup, value);
+	    if (o->data_ptr)
+	      append_item_to_list ((const char ***) o->data_ptr, dup);
+	    break;
+	  }
+
+	case OPT_STRINGPTRLIST:
+	  while (*value != '\0')
+	  {
+	    char *v = value;
+	    while (*v != '\0' && ! isspace ((unsigned char) *v))
+	      v++;
+	    char *dup = (char *) GetMemory (v - value + 1);
+	    memcpy (dup, value, v - value);
+	    dup[v - value] = '\0';
+	    if (o->data_ptr)
+	      append_item_to_list ((const char ***) o->data_ptr, dup);
+	    while (isspace (*v))
+	      v++;
+	    value = v;
+	  }
+	  break;
+
+	default:
+	  {
+	    nf_bug ("%s(%u): unknown option type %d",
+	      filename, lnum, (int) o->opt_type);
+	    RETURN_FAILURE;
+	  }
+      }
+      break;
+    }
+    next_line:;
+  }
+
+  byebye:
+  if (cfgfile != 0)
+    fclose (cfgfile);
+  return rc;
 }
 
 
@@ -854,149 +986,208 @@
  *	If  is set to 1, ignores all options except those
  *	that have the "1" flag.
  *	Else, ignores all options that have the "1" flag.
- *	If an error occurs, report it with report_error()
+ *	If an error occurs, report it with err()
  *	and returns non-zero. Else, returns 0.
  */
 int parse_command_line_options (int argc, const char *const *argv, int pass)
 {
-const opt_desc_t *o;
+  const opt_desc_t *o;
 
-while (argc > 0)
-   {
-   int ignore;
-
-   // Which option is this ?
-   if (**argv != '-' && **argv != '+')
-      {
+  while (argc > 0)
+  {
+    int ignore;
+
+    // Which option is this ?
+    if (**argv != '-' && **argv != '+')
+    {
       o = options;
       argc++;
       argv--;
-      }
-   else
+    }
+    else
       for (o = options + 1; ; o++)
-	 {
-	 if (o->opt_type == OPT_END)
-	    {
-	    report_error ("invalid option: \"%s\"", argv[0]);
-	    return 1;
-	    }
-	 if (o->short_name && ! strcmp (argv[0]+1, o->short_name)
-	  || o->long_name  && ! strcmp (argv[0]+1, o->long_name))
-            break;
-         }
-
-   // If this option has the "1" flag but pass is not 1
-   // or it doesn't but pass is 1, ignore it.
-   ignore = (o->flags != NULL && strchr (o->flags, '1')) != (pass == 1);
-
-   switch (o->opt_type)
       {
+	if (o->opt_type == OPT_END)
+	{
+	  err ("invalid option: \"%s\"", argv[0]);
+	  return 1;
+	}
+	if (o->short_name && ! strcmp (argv[0]+1, o->short_name)
+	 || o->long_name  && ! strcmp (argv[0]+1, o->long_name))
+	  break;
+      }
+
+    // If this option has the "1" flag but pass is not 1
+    // or it doesn't but pass is 1, ignore it.
+    ignore = (o->flags != NULL && strchr (o->flags, '1')) != (pass == 1);
+
+    switch (o->opt_type)
+    {
       case OPT_BOOLEAN:
-	 if (argv[0][0] == '-')
-	    {
-	    if (o->data_ptr && ! ignore)
-	       *((bool *) (o->data_ptr)) = true;
-	    }
-	 else
-	    {
-	    if (o->data_ptr && ! ignore)
-	       *((bool *) (o->data_ptr)) = false;
-	    }
-	 break;
+	if (argv[0][0] == '-')
+	{
+	  if (o->data_ptr && ! ignore)
+	     *((bool *) (o->data_ptr)) = true;
+	}
+	else
+	{
+	  if (o->data_ptr && ! ignore)
+	     *((bool *) (o->data_ptr)) = false;
+	}
+	break;
+
       case OPT_CONFIRM:
-	 if (argc <= 1)
-	    {
-	    report_error ("missing argument after \"%s\"", argv[0]);
-	    return 1;
-	    }
-         argv++;
-         argc--;
-	 if (o->data_ptr && ! ignore)
-	    *((confirm_t *) o->data_ptr) = confirm_e2i (argv[0]);
-	 break;
+	if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	argv++;
+	argc--;
+	if (o->data_ptr && ! ignore)
+	   *((confirm_t *) o->data_ptr) = confirm_e2i (argv[0]);
+	break;
+
       case OPT_INTEGER:
-	 if (argc <= 1)
-	    {
-	    report_error ("missing argument after \"%s\"", argv[0]);
+	if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	argv++;
+	argc--;
+	if (o->data_ptr && ! ignore)
+	  *((int *) (o->data_ptr)) = atoi (argv[0]);
+	break;
+
+      case OPT_UNSIGNED:
+        if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	argv++;
+	argc--;
+	if (o->data_ptr && ! ignore)
+	{
+	  const char *value = argv[0];
+	  if (*value == '\0')
+	  {
+	    err ("not an unsigned integer \"%s\"", value);
 	    return 1;
-	    }
-	 argv++;
-	 argc--;
-	 if (o->data_ptr && ! ignore)
-	    *((int *) (o->data_ptr)) = atoi (argv[0]);
-	 break;
+	  }
+	  bool neg = false;
+	  if (*value == '-')
+	    neg = true;
+	  char *endptr;
+	  errno = 0;
+	  *((unsigned long *) (o->data_ptr)) = strtoul (value, &endptr, 0);
+	  while (*endptr != '\0' && isspace (*endptr))
+	    endptr++;
+	  if (*endptr != '\0')
+	  {
+	    err ("illegal characters in unsigned int \"%s\"", endptr);
+	    return 1;
+	  }
+	  /* strtoul() sets errno to ERANGE if overflow. In
+	     addition, we don't want any non-zero negative
+	     numbers. In terms of regexp, /^(0x)?0*$/i. */
+	  if
+	  (
+	    errno != 0
+	    || neg
+	      && !
+	      (
+		strspn (value + 1, "0") == strlen (value + 1)
+		|| value[1] == '0'
+		  && tolower (value[2]) == 'x'
+		  && strspn (value + 3, "0") == strlen (value + 3)
+	      )
+	  )
+	  {
+	    err ("unsigned integer out of range \"%s\"", value);
+	    return 1;
+	  }
+	}
+	break;
+
       case OPT_WINDIM:
-         if (argc <= 1)
-	    {
-	    report_error ("missing argument after \"%s\"", argv[0]);
+	if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	argv++;
+	argc--;
+	if (o->data_ptr && ! ignore)
+	  if (((Win_dim *) (o->data_ptr))->set (argv[0]))
+	  {
+	    err ("bad dimension spec \"%s\"", argv[0]);
 	    return 1;
-	    }
-	 argv++;
-	 argc--;
-	 if (o->data_ptr && ! ignore)
-	    if (((Win_dim *) (o->data_ptr))->set (argv[0]))
-	       {
-	       report_error ("bad dimension spec \"%s\"", argv[0]);
-	       return 1;
-	       }
-	 break;
+	  }
+	break;
+
       case OPT_STRINGBUF8:
-         if (argc <= 1)
-            {
-	    report_error ("missing argument after \"%s\"", argv[0]);
-	    return 1;
-            }
-	 argv++;
-	 argc--;
-	 if (o->data_ptr && ! ignore)
-	    al_scps ((char *) o->data_ptr, argv[0], 8);
-	 break;
+	if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	argv++;
+	argc--;
+	if (o->data_ptr && ! ignore)
+	  al_scps ((char *) o->data_ptr, argv[0], 8);
+	break;
+
       case OPT_STRINGPTR:
-	 if (argc <= 1)
-	    {
-	    report_error ("missing argument after \"%s\"", argv[0]);
-	    return 1;
-	    }
-	 argv++;
-	 argc--;
-	 if (o->data_ptr && ! ignore)
-	    *((const char **) (o->data_ptr)) = argv[0];
-	 break;
+	if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	argv++;
+	argc--;
+	if (o->data_ptr && ! ignore)
+	  *((const char **) (o->data_ptr)) = argv[0];
+	break;
+
       case OPT_STRINGPTRACC:
-	 if (argc <= 1)
-	    {
-	    report_error ("missing argument after \"%s\"", argv[0]);
-	    return 1;
-	    }
-	 argv++;
-	 argc--;
-	 if (o->data_ptr && ! ignore)
-	    append_item_to_list ((const char ***) o->data_ptr, argv[0]);
-	 break;
+	if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	argv++;
+	argc--;
+	if (o->data_ptr && ! ignore)
+	  append_item_to_list ((const char ***) o->data_ptr, argv[0]);
+	break;
+
       case OPT_STRINGPTRLIST:
-	 if (argc <= 1)
-	    {
-	    report_error ("missing argument after \"%s\"", argv[0]);
-	    return 1;
-	    }
-	 while (argc > 1 && argv[1][0] != '-' && argv[1][0] != '+')
-	    {
-	    argv++;
-	    argc--;
-	    if (o->data_ptr && ! ignore)
-	       append_item_to_list ((const char ***) o->data_ptr, argv[0]);
-	    }
-	 break;
+	if (argc <= 1)
+	{
+	  err ("missing argument after \"%s\"", argv[0]);
+	  return 1;
+	}
+	while (argc > 1 && argv[1][0] != '-' && argv[1][0] != '+')
+	{
+	  argv++;
+	  argc--;
+	  if (o->data_ptr && ! ignore)
+	    append_item_to_list ((const char ***) o->data_ptr, argv[0]);
+	}
+	break;
+
       default:
-	 {
-	 report_error ("unknown option type (BUG!)");
-	 return 1;
-	 }
-      }
-   argv++;
-   argc--;
-   }
-return 0;
+	{
+	  nf_bug ("unknown option type (%d)", (int) o->opt_type);
+	  return 1;
+	}
+    }
+    argv++;
+    argc--;
+  }
+  return 0;
 }
 
 
@@ -1006,63 +1197,65 @@
  */
 void dump_parameters (FILE *fp)
 {
-const opt_desc_t *o;
-int desc_maxlen = 0;
-int name_maxlen = 0;
-
-for (o = options + 1; o->opt_type != OPT_END; o++)
-   {
-   int len = strlen (o->desc);
-   desc_maxlen = al_amax (desc_maxlen, len);
-   if (o->long_name)
-      {
+  const opt_desc_t *o;
+  int desc_maxlen = 0;
+  int name_maxlen = 0;
+
+  for (o = options + 1; o->opt_type != OPT_END; o++)
+  {
+    int len = strlen (o->desc);
+    desc_maxlen = al_amax (desc_maxlen, len);
+    if (o->long_name)
+    {
       len = strlen (o->long_name);
       name_maxlen = al_amax (name_maxlen, len);
-      }
-   }
+    }
+  }
 
-for (o = options + 1; o->opt_type != OPT_END; o++)
-   {
-   if (! o->long_name)
+  for (o = options + 1; o->opt_type != OPT_END; o++)
+  {
+    if (! o->long_name)
       continue;
-   fprintf (fp, "%-*s  %-*s  ",name_maxlen, o->long_name, desc_maxlen, o->desc);
-   if (o->opt_type == OPT_BOOLEAN)
-      fprintf (fp, "%s", *((int *)o->data_ptr) ? "enabled" : "disabled");
-   else if (o->opt_type == OPT_CONFIRM)
+    fprintf (fp, "%-*s  %-*s  ",name_maxlen, o->long_name, desc_maxlen, o->desc);
+    if (o->opt_type == OPT_BOOLEAN)
+      fprintf (fp, "%s", *((bool *) o->data_ptr) ? "enabled" : "disabled");
+    else if (o->opt_type == OPT_CONFIRM)
       fputs (confirm_i2e (*((confirm_t *) o->data_ptr)), fp);
-   else if (o->opt_type == OPT_STRINGBUF8)
+    else if (o->opt_type == OPT_STRINGBUF8)
       fprintf (fp, "\"%s\"", (char *) o->data_ptr);
-   else if (o->opt_type == OPT_STRINGPTR)
-      {
+    else if (o->opt_type == OPT_STRINGPTR)
+    {
       if (o->data_ptr)
-         fprintf (fp, "\"%s\"", *((char **) o->data_ptr));
+	fprintf (fp, "\"%s\"", *((char **) o->data_ptr));
       else
-         fprintf (fp, "--none--");
-      }
-   else if (o->opt_type == OPT_INTEGER)
-      fprintf (fp, "%d", *((int *)o->data_ptr));
-   else if (o->opt_type == OPT_WINDIM)
-      {
+	fprintf (fp, "--none--");
+    }
+    else if (o->opt_type == OPT_INTEGER)
+      fprintf (fp, "%d", *((int *) o->data_ptr));
+    else if (o->opt_type == OPT_UNSIGNED)
+      fprintf (fp, "%lu", *((unsigned long *) o->data_ptr));
+    else if (o->opt_type == OPT_WINDIM)
+    {
       char buf[50];  // Much slack
       ((Win_dim *) (o->data_ptr))->string (buf, sizeof buf);
       fputs (buf, fp);
-      }
-   else if (o->opt_type == OPT_STRINGPTRACC
-         || o->opt_type == OPT_STRINGPTRLIST)
-      {
+    }
+    else if (o->opt_type == OPT_STRINGPTRACC
+	  || o->opt_type == OPT_STRINGPTRLIST)
+    {
       if (o->data_ptr)
-         {
-         char **list;
-         for (list = *((char ***) o->data_ptr); list && *list; list++)
-            fprintf (fp, "\"%s\" ", *list);
-         if (list == *((char ***) o->data_ptr))
-            fprintf (fp, "--none--");
-         }
-      else
-         fprintf (fp, "--none--");
+      {
+	char **list;
+	for (list = *((char ***) o->data_ptr); list && *list; list++)
+	  fprintf (fp, "\"%s\" ", *list);
+	if (list == *((char ***) o->data_ptr))
+	  fprintf (fp, "--none--");
       }
-   fputc ('\n', fp);
-   }
+      else
+	fprintf (fp, "--none--");
+    }
+    fputc ('\n', fp);
+  }
 }
 
 
@@ -1072,58 +1265,59 @@
  */
 void dump_command_line_options (FILE *fd)
 {
-const opt_desc_t *o;
-int desc_maxlen = 0;
-int name_maxlen = 0;
-
-for (o = options + 1; o->opt_type != OPT_END; o++)
-   {
-   int len;
-   if (! o->short_name)
+  const opt_desc_t *o;
+  int desc_maxlen = 0;
+  int name_maxlen = 0;
+
+  for (o = options + 1; o->opt_type != OPT_END; o++)
+  {
+    int len;
+    if (! o->short_name)
       continue;
-   len = strlen (o->desc);
-   desc_maxlen = al_amax (desc_maxlen, len);
-   if (o->long_name)
-      {
+    len = strlen (o->desc);
+    desc_maxlen = al_amax (desc_maxlen, len);
+    if (o->long_name)
+    {
       len = strlen (o->long_name);
       name_maxlen = al_amax (name_maxlen, len);
-      }
-   }
+    }
+  }
 
-for (o = options; o->opt_type != OPT_END; o++)
-   {
-   if (! o->short_name)
+  for (o = options; o->opt_type != OPT_END; o++)
+  {
+    if (! o->short_name)
       continue;
 #if ! defined Y_BGI
-   if (o->flags && strchr (o->flags, 'b'))
+    if (o->flags && strchr (o->flags, 'b'))
       continue;
 #endif
 #if ! defined Y_X11
-   if (o->flags && strchr (o->flags, 'x'))
+    if (o->flags && strchr (o->flags, 'x'))
       continue;
 #endif
-   if (o->short_name)
+    if (o->short_name)
       fprintf (fd, " -%-3s ", o->short_name);
-   else
+    else
       fprintf (fd, "      ");
-   if (o->long_name)
+    if (o->long_name)
       fprintf (fd, "-%-*s ", name_maxlen, o->long_name);
-   else
+    else
       fprintf (fd, "%*s", name_maxlen + 2, "");
-   switch (o->opt_type)
-      {
+    switch (o->opt_type)
+    {
       case OPT_BOOLEAN:       fprintf (fd, "            "); break;
       case OPT_CONFIRM:       fprintf (fd, "yes|no|ask  "); break;
       case OPT_STRINGBUF8:
       case OPT_STRINGPTR:
       case OPT_STRINGPTRACC:  fprintf (fd, "    "); break;
       case OPT_INTEGER:       fprintf (fd, "   "); break;
+      case OPT_UNSIGNED:      fprintf (fd, "  "); break;
       case OPT_WINDIM:        fprintf (fd, "[%%]"); break;
       case OPT_STRINGPTRLIST: fprintf (fd, " ..."); break;
       case OPT_END: ;  // This line is here only to silence a GCC warning.
-      }
-   fprintf (fd, " %s\n", o->desc);
-   }
+    }
+    fprintf (fd, " %s\n", o->desc);
+  }
 }
 
 
@@ -1136,18 +1330,18 @@
  */
 static confirm_t confirm_e2i (const char *external)
 {
-if (external != NULL)
-   {
-   if (! strcmp (external, "yes"))
+  if (external != NULL)
+  {
+    if (! strcmp (external, "yes"))
       return YC_YES;
-   if (! strcmp (external, "no"))
+    if (! strcmp (external, "no"))
       return YC_NO;
-   if (! strcmp (external, "ask"))
+    if (! strcmp (external, "ask"))
       return YC_ASK;
-   if (! strcmp (external, "ask_once"))
+    if (! strcmp (external, "ask_once"))
       return YC_ASK_ONCE;
-   }
-return YC_ASK;
+  }
+  return YC_ASK;
 }
 
 
@@ -1159,15 +1353,15 @@
  */
 static const char *confirm_i2e (confirm_t internal)
 {
-if (internal == YC_YES)
-   return "yes";
-if (internal == YC_NO)
-   return "no";
-if (internal == YC_ASK)
-   return "ask";
-if (internal == YC_ASK_ONCE)
-   return "ask_once";
-return "?";
+  if (internal == YC_YES)
+    return "yes";
+  if (internal == YC_NO)
+    return "no";
+  if (internal == YC_ASK)
+    return "ask";
+  if (internal == YC_ASK_ONCE)
+    return "ask_once";
+  return "?";
 }
 
 
@@ -1177,24 +1371,81 @@
  */
 static void append_item_to_list (const char ***list, const char *item)
 {
-int i;
+  int i;
 
-i = 0;
-if (*list != NULL)
-   {
-   /* count the number of elements in the list (last = null) */
-   while ((*list)[i] != NULL)
+  i = 0;
+  if (*list != 0)
+  {
+    // Count the number of elements in the list (last = null)
+    while ((*list)[i] != 0)
       i++;
-   /* expand the list */
-   *list = (const char **) ResizeMemory (*list, (i + 2) * sizeof **list);
-   }
-else
-   {
-   /* create a new list */
-   *list = (const char **) GetMemory (2 * sizeof **list);
-   }
-/* append the new element */
-(*list)[i] = item;
-(*list)[i + 1] = NULL;
+    // Expand the list
+    *list = (const char **) ResizeMemory (*list, (i + 2) * sizeof **list);
+  }
+  else
+  {
+    // Create a new list
+    *list = (const char **) GetMemory (2 * sizeof **list);
+  }
+  // Append the new element
+  (*list)[i] = item;
+  (*list)[i + 1] = 0;
+}
+
+
+#include 
+#include 
+
+const size_t MAX_TOKENS = 10;
+
+/*
+ *	word_splitting - perform word splitting on a string
+ */
+int word_splitting (std::vector& tokens, const char *string)
+{
+  size_t      ntokens     = 0;
+  const char *iptr        = string;
+  const char *token_start = 0;
+  bool        in_token    = false;
+  bool        quoted      = false;
+
+  /* break the line into whitespace-separated tokens.
+     whitespace can be enclosed in double quotes. */
+  for (; ; iptr++)
+  {
+    if (*iptr == '\n' || *iptr == '\0')
+      break;
+
+    else if (*iptr == '"')
+      quoted = ! quoted;
+
+    // "#" at the beginning of a token
+    else if (! in_token && ! quoted && *iptr == '#')
+      break;
+
+    // First character of token
+    else if (! in_token && (quoted || ! isspace (*iptr)))
+    {
+      ntokens++;
+      if (ntokens > MAX_TOKENS)
+	return 2;  // Too many tokens
+      in_token = true;
+    }
+
+    // First space between two tokens
+    else if (in_token && ! quoted && isspace (*iptr))
+    {
+      tokens.push_back (std::string (token_start, iptr - token_start));
+      in_token = false;
+    }
+  }
+  
+  if (in_token)
+    tokens.push_back (std::string (token_start, iptr - token_start));
+
+  if (quoted)
+    return 1;  // Unmatched double quote
+  return 0;
 }
 
+
diff -uaNr yadex-1.5.2/src/cfgfile.h yadex-1.6.0/src/cfgfile.h
--- yadex-1.5.2/src/cfgfile.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/cfgfile.h	2003-03-24 17:52:19.000000000 +0100
@@ -4,7 +4,8 @@
  */
 
 
-int  parse_config_file (const char *);
+int parse_config_file_default ();
+int parse_config_file_user (const char *name);
 int  parse_command_line_options (int argc, const char *const *argv, int pass);
 void dump_parameters (FILE *fd);
 void dump_command_line_options (FILE *fd);
diff -uaNr yadex-1.5.2/src/checks.cc yadex-1.6.0/src/checks.cc
--- yadex-1.5.2/src/checks.cc	2000-08-13 17:15:17.000000000 +0200
+++ yadex-1.6.0/src/checks.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -35,6 +35,8 @@
 #include "gfx.h"
 #include "gotoobj.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "oldmenus.h"
 #include "selectn.h"
 
@@ -60,12 +62,12 @@
    */
       line5 = "Check texture names";
    }
-switch (DisplayMenu (x0, y0, "Check level consistency",
-                     "Number of objects",
-                     "Check if all Sectors are closed",
-                     "Check all cross-references",
-                     "Check for missing textures",
-                     line5,
+switch (vDisplayMenu (x0, y0, "Check level consistency",
+                     "Number of objects",		YK_, 0,
+                     "Check if all Sectors are closed",	YK_, 0,
+                     "Check all cross-references",	YK_, 0,
+                     "Check for missing textures",	YK_, 0,
+                     line5,				YK_, 0,
                      NULL))
    {
    case 1:
@@ -282,7 +284,7 @@
 	 sprintf (msg2, "There is no sidedef ending at Vertex #%d", n);
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_VERTICES, n);
+	    GoToObject (Objid (OBJ_VERTICES, n));
 	    return;
 	    }
 	 }
@@ -292,7 +294,7 @@
 	 sprintf (msg2, "There is no sidedef starting at Vertex #%d", n);
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_VERTICES, n);
+	    GoToObject (Objid (OBJ_VERTICES, n));
 	    return;
 	    }
 	 }
@@ -341,7 +343,7 @@
 	    }
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_LINEDEFS, n);
+	    GoToObject (Objid (OBJ_LINEDEFS, n));
 	    return;
 	    }
 	 }
@@ -368,7 +370,7 @@
 	    }
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_LINEDEFS, n);
+	    GoToObject (Objid (OBJ_LINEDEFS, n));
 	    return;
 	    }
 	 }
@@ -398,7 +400,7 @@
       {
       sprintf (msg, "ERROR: linedef #%d has no first sidedef!", n);
       CheckFailed (-1, -1, msg, 0, 1, first_time);
-      GoToObject (OBJ_LINEDEFS, n);
+      GoToObject (Objid (OBJ_LINEDEFS, n));
       return;
       }
 
@@ -410,7 +412,7 @@
       sprintf (msg, "ERROR: linedef #%d uses the same sidedef twice (#%d)",
 	n, LineDefs[n].sidedef1);
       CheckFailed (-1, -1, msg, 0, 1, first_time);
-      GoToObject (OBJ_LINEDEFS, n);
+      GoToObject (Objid (OBJ_LINEDEFS, n));
       return;
       }
 #endif
@@ -421,7 +423,7 @@
       sprintf (msg, "ERROR: linedef #%d uses the same vertex twice (#%d)",
 	n, LineDefs[n].start);
       CheckFailed (-1, -1, msg, 0, 1, first_time);
-      GoToObject (OBJ_LINEDEFS, n);
+      GoToObject (Objid (OBJ_LINEDEFS, n));
       return;
       }
    }
@@ -611,7 +613,7 @@
       sprintf (msg1, "Error: sector #%d has no ceiling texture", n);
       sprintf (msg2, "You probably used a brain-damaged editor to do that...");
       CheckFailed (-1, -1, msg1, msg2, 1, first_time);
-      GoToObject (OBJ_SECTORS, n);
+      GoToObject (Objid (OBJ_SECTORS, n));
       return;
       }
    if (strcmp (Sectors[n].floort, "-") == 0
@@ -621,7 +623,7 @@
       sprintf (msg1, "Error: sector #%d has no floor texture", n);
       sprintf (msg2, "You probably used a brain-damaged editor to do that...");
       CheckFailed (-1, -1, msg1, msg2, 1, first_time);
-      GoToObject (OBJ_SECTORS, n);
+      GoToObject (Objid (OBJ_SECTORS, n));
       return;
       }
    if (Sectors[n].ceilh < Sectors[n].floorh)
@@ -631,7 +633,7 @@
       sprintf (msg2,
 	"The textures will never be displayed if you cannot go there");
       CheckFailed (-1, -1, msg1, msg2, 1, first_time);
-      GoToObject (OBJ_SECTORS, n);
+      GoToObject (Objid (OBJ_SECTORS, n));
       return;
       }
 #if 0  /* AYM 2000-08-13 */
@@ -640,7 +642,7 @@
       sprintf (msg1, "Error: sector #%d has its ceiling too high", n);
       sprintf (msg2, "The maximum difference allowed is 1023 (ceiling - floor)");
       CheckFailed (-1, -1, msg1, msg2, 1, first_time);
-      GoToObject (OBJ_SECTORS, n);
+      GoToObject (Objid (OBJ_SECTORS, n));
       return;
       }
 #endif
@@ -670,7 +672,7 @@
 	   " and continue?", default_middle_texture);
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_LINEDEFS, n);
+	    GoToObject (Objid (OBJ_LINEDEFS, n));
 	    return;
 	    }
 	 strncpy (SideDefs[sd1].tex3, default_middle_texture, WAD_TEX_NAME);
@@ -689,7 +691,7 @@
 	   " and continue?", default_upper_texture);
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_LINEDEFS, n);
+	    GoToObject (Objid (OBJ_LINEDEFS, n));
 	    return;
 	    }
 	 strncpy (SideDefs[sd1].tex1, default_upper_texture, WAD_TEX_NAME);
@@ -707,7 +709,7 @@
 	   " and continue?", default_lower_texture);
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_LINEDEFS, n);
+	    GoToObject (Objid (OBJ_LINEDEFS, n));
 	    return;
 	    }
 	 strncpy (SideDefs[sd1].tex2, default_lower_texture, WAD_TEX_NAME);
@@ -726,7 +728,7 @@
 	   " and continue?", default_upper_texture);
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_LINEDEFS, n);
+	    GoToObject (Objid (OBJ_LINEDEFS, n));
 	    return;
 	    }
 	 strncpy (SideDefs[sd2].tex1, default_upper_texture, WAD_TEX_NAME);
@@ -744,7 +746,7 @@
 	   " and continue?", default_lower_texture);
 	 if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	    {
-	    GoToObject (OBJ_LINEDEFS, n);
+	    GoToObject (Objid (OBJ_LINEDEFS, n));
 	    return;
 	    }
 	 strncpy (SideDefs[sd2].tex2, default_lower_texture, WAD_TEX_NAME);
@@ -798,7 +800,7 @@
 	(int) WAD_FLAT_NAME, Sectors[n].ceilt);
       if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	 {
-	 GoToObject (OBJ_SECTORS, n);
+	 GoToObject (Objid (OBJ_SECTORS, n));
 	 return;
 	 }
       CheckingObjects ();
@@ -810,7 +812,7 @@
 	(int) WAD_FLAT_NAME, Sectors[n].floort);
       if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	 {
-	 GoToObject (OBJ_SECTORS, n);
+	 GoToObject (Objid (OBJ_SECTORS, n));
 	 return;
 	 }
       CheckingObjects ();
@@ -826,7 +828,7 @@
 	(int) WAD_TEX_NAME, SideDefs[n].tex1);
       if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	 {
-	 GoToObject (OBJ_SIDEDEFS, n);
+	 GoToObject (Objid (OBJ_SIDEDEFS, n));
 	 return;
 	 }
       CheckingObjects ();
@@ -838,7 +840,7 @@
 	(int) WAD_TEX_NAME, SideDefs[n].tex2);
       if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	 {
-	 GoToObject (OBJ_SIDEDEFS, n);
+	 GoToObject (Objid (OBJ_SIDEDEFS, n));
 	 return;
 	 }
       CheckingObjects ();
@@ -850,7 +852,7 @@
 	(int) WAD_TEX_NAME, SideDefs[n].tex3);
       if (CheckFailed (-1, -1, msg1, msg2, 0, first_time))
 	 {
-	 GoToObject (OBJ_SIDEDEFS, n);
+	 GoToObject (Objid (OBJ_SIDEDEFS, n));
 	 return;
 	 }
       CheckingObjects ();
diff -uaNr yadex-1.5.2/src/colour1.cc yadex-1.6.0/src/colour1.cc
--- yadex-1.5.2/src/colour1.cc	2000-01-12 22:45:50.000000000 +0100
+++ yadex-1.6.0/src/colour1.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -44,52 +44,52 @@
  */
 int getcolour (const char *s, rgb_c *rgb)
 {
-int i;
-int digit;
-int rdigits;
-int gdigits;
-int bdigits;
-unsigned r;
-unsigned g;
-unsigned b;
-int globaldigits;
-
-if (strncmp (s, "rgb:", 4))
-   return 1;
-
-for (i = 4, r = 0, rdigits = 0; (digit = hextoi (s[i])) >= 0; i++, rdigits++)
-   r = (r << 4) | digit;
-if (s[i++] != '/')
-   return 2;
-
-for (g = 0, gdigits = 0; (digit = hextoi (s[i])) >= 0; i++, gdigits++)
-   g = (g << 4) | digit;
-if (s[i++] != '/')
-   return 3;
-  
-for (b = 0, bdigits = 0; (digit = hextoi (s[i])) >= 0; i++, bdigits++)
-   b = (b << 4) | digit;
-if (s[i++] != '\0')
-   return 4;
-
-/* force to 8 bits (RGB_DIGITS hex digits) by scaling up or down */
-globaldigits = rdigits;
-globaldigits = y_max (globaldigits, gdigits);
-globaldigits = y_max (globaldigits, bdigits);
-for (; globaldigits < RGB_DIGITS; globaldigits++)
-   {
-   r <<= 4;
-   g <<= 4;
-   b <<= 4;
-   }
-for (; globaldigits > RGB_DIGITS; globaldigits--)
-   {
-   r >>= 4;
-   g >>= 4;
-   b >>= 4;
-   }
-rgb->set (r, g, b);
-return 0;
+  int i;
+  int digit;
+  int rdigits;
+  int gdigits;
+  int bdigits;
+  unsigned r;
+  unsigned g;
+  unsigned b;
+  int globaldigits;
+
+  if (strncmp (s, "rgb:", 4))
+    return 1;
+
+  for (i = 4, r = 0, rdigits = 0; (digit = hextoi (s[i])) >= 0; i++, rdigits++)
+    r = (r << 4) | digit;
+  if (s[i++] != '/')
+    return 2;
+
+  for (g = 0, gdigits = 0; (digit = hextoi (s[i])) >= 0; i++, gdigits++)
+    g = (g << 4) | digit;
+  if (s[i++] != '/')
+    return 3;
+    
+  for (b = 0, bdigits = 0; (digit = hextoi (s[i])) >= 0; i++, bdigits++)
+    b = (b << 4) | digit;
+  if (s[i++] != '\0')
+    return 4;
+
+  // Force to 8 bits (RGB_DIGITS hex digits) by scaling up or down
+  globaldigits = rdigits;
+  globaldigits = y_max (globaldigits, gdigits);
+  globaldigits = y_max (globaldigits, bdigits);
+  for (; globaldigits < RGB_DIGITS; globaldigits++)
+  {
+    r <<= 4;
+    g <<= 4;
+    b <<= 4;
+  }
+  for (; globaldigits > RGB_DIGITS; globaldigits--)
+  {
+    r >>= 4;
+    g >>= 4;
+    b >>= 4;
+  }
+  rgb->set (r, g, b);
+  return 0;
 }
 
 
diff -uaNr yadex-1.5.2/src/colour2.cc yadex-1.6.0/src/colour2.cc
--- yadex-1.5.2/src/colour2.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/colour2.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -37,11 +37,11 @@
  */
 int rgb2irgb (int r, int g, int b)
 {
-int c;
+  int c;
 
-c = 4*!!r + 2*!!g + 1*!!b;
-if (r > 128 || g > 128 || b > 128)
-   c += 8;  /* Set high intensity bit */
-return c;
+  c = 4*!!r + 2*!!g + 1*!!b;
+  if (r > 128 || g > 128 || b > 128)
+    c += 8;  // Set high intensity bit
+  return c;
 }
 
diff -uaNr yadex-1.5.2/src/colour3.cc yadex-1.6.0/src/colour3.cc
--- yadex-1.5.2/src/colour3.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/colour3.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -39,13 +39,13 @@
  */
 void irgb2rgb (int c, rgb_c *rgb)
 {
-if (c == 8)  /* Special case for DARKGRAY */
-   rgb->r = rgb->g = rgb->b = 0x40;
-else
-   {
-   rgb->r = (c & 4) ? ((c & 8) ? 0xff : 0x80) : 0;
-   rgb->g = (c & 2) ? ((c & 8) ? 0xff : 0x80) : 0;
-   rgb->b = (c & 1) ? ((c & 8) ? 0xff : 0x80) : 0;
-   }
+  if (c == 8)  // Special case for DARKGREY
+    rgb->r = rgb->g = rgb->b = 0x40;
+  else
+  {
+    rgb->r = (c & 4) ? ((c & 8) ? 0xff : 0x80) : 0;
+    rgb->g = (c & 2) ? ((c & 8) ? 0xff : 0x80) : 0;
+    rgb->b = (c & 1) ? ((c & 8) ? 0xff : 0x80) : 0;
+  }
 }
 
diff -uaNr yadex-1.5.2/src/colour4.cc yadex-1.6.0/src/colour4.cc
--- yadex-1.5.2/src/colour4.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/colour4.cc	2003-03-28 13:37:32.000000000 +0100
@@ -1,4 +1,3 @@
-
 /*
  *	colour4.cc
  *	Allocate and free physical colours.
@@ -12,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -42,11 +41,11 @@
 /* This table contains all the physical colours allocated,
    with their rgb value and usage count. */
 typedef struct 
-   {
-   pcolour_t pcn;	// The physical colour# (pixel value).
-   rgb_c rgb;		// Its RGB value.
-   int usage_count;	// Number of logical colours that use it.
-   } pcolours_table_entry_t;
+{
+  pcolour_t pcn;	// The physical colour# (pixel value).
+  rgb_c rgb;		// Its RGB value.
+  int usage_count;	// Number of logical colours that use it.
+} pcolours_table_entry_t;
 pcolours_table_entry_t *pcolours = 0;
 size_t physical_colours = 0;  // Number of entries in 
 
@@ -61,7 +60,7 @@
  */
 inline u16 eight2sixteen (u8 v)
 {
-return (v << 8) | v;
+  return (v << 8) | v;
 }
 
 
@@ -72,81 +71,81 @@
  */
 pcolour_t *alloc_colours (rgb_c rgb_values[], size_t count)
 {
-verbmsg ("alloc_colours count=%d\n", count);
+  verbmsg ("colours: alloc_colours: count %d\n", count);
 
-pcolour_t *pcn_table = (pcolour_t *) malloc (count * sizeof *pcn_table);
-if (pcn_table == NULL)
-   fatal_error (msg_nomem);
-
-// Allocate the physical colours if necessary.
-// Should not do it for static visuals (StaticColor, TrueColor).
-// It doesn't harm but it's useless.
-for (size_t n = 0; n < count; n++)
-   {
-   // Is there already a physical colour for this RGB value ?
-   pcn_table[n] = PCOLOUR_NONE;
-   for (size_t i = 0; i < physical_colours; i++)
-      {
+  pcolour_t *pcn_table = (pcolour_t *) malloc (count * sizeof *pcn_table);
+  if (pcn_table == NULL)
+    fatal_error (msg_nomem);
+
+  /* Allocate the physical colours if necessary. Should not do
+     it for static visuals (StaticColor, TrueColor). It does no
+     harm but it's useless. */
+  for (size_t n = 0; n < count; n++)
+  {
+    // Is there already a physical colour for this RGB value ?
+    pcn_table[n] = PCOLOUR_NONE;
+    for (size_t i = 0; i < physical_colours; i++)
+    {
       if (pcolours[i].rgb == rgb_values[n])
-         {
-         // There is. Reuse it.
-         pcn_table[n] = pcolours[i].pcn;
-         pcolours[i].usage_count++;
-         break;
-         }
+      {
+	// There is. Reuse it.
+	pcn_table[n] = pcolours[i].pcn;
+	pcolours[i].usage_count++;
+	break;
       }
+    }
 
-   // There isn't. Try to create a new physical colour.
-   if (pcn_table[n] == PCOLOUR_NONE)
-      {
+    // There isn't. Try to create a new physical colour.
+    if (pcn_table[n] == PCOLOUR_NONE)
+    {
       XColor xc;
       xc.red   = eight2sixteen (rgb_values[n].r);
       xc.green = eight2sixteen (rgb_values[n].g);
       xc.blue  = eight2sixteen (rgb_values[n].b);
       Status r = XAllocColor (dpy, cmap, &xc);
 
-      // Allocation successful. Add a new entry to
-      // the table of physical colours.
+      /* Allocation successful. Add a new entry to
+	 the table of physical colours. */
       if (r != 0)
-         {
-         pcn_table[n] = (pcolour_t) xc.pixel;
-         physical_colours++;
-         pcolours = (pcolours_table_entry_t *)
-            realloc (pcolours, physical_colours * sizeof *pcolours);
-         if (pcolours == NULL)
-            fatal_error (msg_nomem);
-         pcolours[physical_colours - 1].pcn        = (pcolour_t) xc.pixel;
-         pcolours[physical_colours - 1].rgb         = rgb_values[n];
-         pcolours[physical_colours - 1].usage_count = 1;
-         }
+      {
+	pcn_table[n] = (pcolour_t) xc.pixel;
+	physical_colours++;
+	pcolours = (pcolours_table_entry_t *)
+	  realloc (pcolours, physical_colours * sizeof *pcolours);
+	if (pcolours == NULL)
+	  fatal_error (msg_nomem);
+	pcolours[physical_colours - 1].pcn         = (pcolour_t) xc.pixel;
+	pcolours[physical_colours - 1].rgb         = rgb_values[n];
+	pcolours[physical_colours - 1].usage_count = 1;
+      }
 
-      // Couldn't allocate (the colormap is full).
-      // Reuse the nearest existing physical colour.
+      /* Couldn't allocate (the colormap is full).
+	 Reuse the nearest existing physical colour. */
       else
-	 {
-	 size_t best_fit = 0;
-	 int best_delta = INT_MAX;
-	 
-	 for (size_t m = 0; m < physical_colours; m++)
-	    {
-	    int delta = pcolours[m].rgb - rgb_values[n];
-	    if (delta < best_delta)
-               {
-               best_fit = m;
-               best_delta = delta;
-               }
-	    }
-         verbmsg ("alloc_colours %d/%d/%d: reused %d/%d/%d, delta=%d\n",
-            rgb_values[n].r, rgb_values[n].g, rgb_values[n].b, 
-            pcolours[best_fit].rgb.r, pcolours[best_fit].rgb.g,
-            pcolours[best_fit].rgb.b,
-            best_delta);
-         pcn_table[n] = pcolours[best_fit].pcn;
-         pcolours[best_fit].usage_count++;
-	 }
+      {
+	size_t best_fit = 0;
+	int best_delta = INT_MAX;
+	
+	for (size_t m = 0; m < physical_colours; m++)
+	{
+	  int delta = pcolours[m].rgb - rgb_values[n];
+	  if (delta < best_delta)
+	  {
+	    best_fit = m;
+	    best_delta = delta;
+	  }
+	}
+	verbmsg ("colours: alloc_colours %d/%d/%d: reused %d/%d/%d, delta=%d\n",
+	   rgb_values[n].r, rgb_values[n].g, rgb_values[n].b, 
+	   pcolours[best_fit].rgb.r, pcolours[best_fit].rgb.g,
+	   pcolours[best_fit].rgb.b,
+	   best_delta);
+	pcn_table[n] = pcolours[best_fit].pcn;
+	pcolours[best_fit].usage_count++;
       }
-   }
-return pcn_table;
+    }
+  }
+  return pcn_table;
 }
 
 
@@ -156,33 +155,33 @@
  */
 void free_colours (pcolour_t *pcn_table, size_t count)
 {
-verbmsg ("free_colours count=%d:\n", count);
-if (verbose)
-   dump_pcolours ();
-
-if (pcn_table == NULL)  // Sanity
-   return;
-
-// Decrement the usage count for all those physical colours.
-// If the usage count reaches 0, actually free them.
-for (pcolour_t *pcn = pcn_table; count; count--, pcn++)
-   {
-   size_t i;
+  verbmsg ("colours: free_colours: count %d\n", count);
+  if (verbose)
+    dump_pcolours ();
+
+  if (pcn_table == NULL)  // Sanity
+    return;
+
+  /* Decrement the usage count for all those physical colours.
+     If the usage count reaches 0, actually free them. */
+  for (pcolour_t *pcn = pcn_table; count; count--, pcn++)
+  {
+    size_t i;
 
-   for (i = 0; i < physical_colours; i++)
+    for (i = 0; i < physical_colours; i++)
       if (pcolours[i].pcn == *pcn)
-         break;
-   
-   if (i == physical_colours)
+	break;
+    
+    if (i == physical_colours)
       fatal_error ("Trying to free pc[%d]=%ld that does not exist",
-         (int) i, (long) *pcn);
+	(int) i, (long) *pcn);
 
-   if (pcolours[i].usage_count < 1)
+    if (pcolours[i].usage_count < 1)
       fatal_error ("Freeing unused colour %ld", (long) *pcn);
 
-   pcolours[i].usage_count--;
-   if (pcolours[i].usage_count == 0)
-      {
+    pcolours[i].usage_count--;
+    if (pcolours[i].usage_count == 0)
+    {
       unsigned long pixel = (unsigned long) *pcn;
       x_catch_on ();
       XFreeColors (dpy, cmap, &pixel, 1, 0);
@@ -191,47 +190,47 @@
 	warn ("error freeing colour %08lXh (%s).\n", pixel, err_msg);
       x_catch_off ();
       pcolours[i].pcn = PCOLOUR_NONE;
-      }
-   }
+    }
+  }
 
-// If physical colours have actually been freed,
-// remove them from the table of physical colours.
-size_t new_physical_colours = 0;
+  /* If physical colours have actually been freed,
+     remove them from the table of physical colours. */
+  size_t new_physical_colours = 0;
 
-{
-for (size_t i = 0; i < physical_colours; i++)
-   if (pcolours[i].pcn != PCOLOUR_NONE)
-      new_physical_colours++;  // Number of phys. colours still in use.
-}
+  {
+    for (size_t i = 0; i < physical_colours; i++)
+      if (pcolours[i].pcn != PCOLOUR_NONE)
+	new_physical_colours++;  // Number of physical colours still in use.
+  }
 
-verbmsg ("freed %d physical colours of %d\n",
-   physical_colours - new_physical_colours, physical_colours);
+  verbmsg ("colours: freed %d of %d physical colours\n",
+    physical_colours - new_physical_colours, physical_colours);
 
-if (new_physical_colours == 0)
-   {
-   free (pcolours);
-   pcolours = 0;
-   }
-else
-   {
-   pcolours_table_entry_t *new_item;
-   pcolours_table_entry_t *new_pcolours = (pcolours_table_entry_t *)
+  if (new_physical_colours == 0)
+  {
+    free (pcolours);
+    pcolours = 0;
+  }
+  else
+  {
+    pcolours_table_entry_t *new_item;
+    pcolours_table_entry_t *new_pcolours = (pcolours_table_entry_t *)
       malloc (new_physical_colours * sizeof *new_pcolours);
-   if (new_pcolours == NULL)
+    if (new_pcolours == NULL)
       fatal_error (msg_nomem);
-   new_item = new_pcolours;
-   for (size_t i = 0; i < physical_colours; i++)
+    new_item = new_pcolours;
+    for (size_t i = 0; i < physical_colours; i++)
       if (pcolours[i].pcn != PCOLOUR_NONE)
-         memcpy (new_item++, pcolours + i, sizeof *new_pcolours);
-   free (pcolours);
-   pcolours = new_pcolours;
-   }
-physical_colours = new_physical_colours;
+	memcpy (new_item++, pcolours + i, sizeof *new_pcolours);
+    free (pcolours);
+    pcolours = new_pcolours;
+  }
+  physical_colours = new_physical_colours;
 
-//if (verbose)
-//   dump_pcolours ();
+  //if (verbose)
+  //   dump_pcolours ();
 
-free (pcn_table);
+  free (pcn_table);
 }
 
 
@@ -241,7 +240,7 @@
  */
 size_t get_pcolours_count ()
 {
-return physical_colours;
+  return physical_colours;
 }
 
 
@@ -252,12 +251,12 @@
  */
 pcolour_t get_pcolour_pcn (size_t i)
 {
-if (i >= physical_colours)
-   {
-   nf_bug ("get_pcolour_pcn: i=%d\n", (int) i);
-   return ULONG_MAX;
-   }
-return pcolours[i].pcn;
+  if (i >= physical_colours)
+  {
+    nf_bug ("get_pcolour_pcn: i=%d\n", (int) i);
+    return ULONG_MAX;
+  }
+  return pcolours[i].pcn;
 }
 
 
@@ -267,22 +266,36 @@
  */
 static void dump_pcolours ()
 {
-for (size_t i = 0; i < physical_colours; i++)
-   {
+  int items_on_current_line = 0;
+
+  for (size_t i = 0; i < physical_colours; i++)
+  {
 #if 0
-   printf ("%02lX %02X/%02X/%02X %d",
-      pcolours[i].pcn,
-      pcolours[i].rgb.r,
-      pcolours[i].rgb.g,
-      pcolours[i].rgb.b,
-      pcolours[i].usage_count);
-   fputs (i % 5 == 4 ? "\n" : "  ", stdout);
+    printf ("%02lX %02X/%02X/%02X %d",
+       pcolours[i].pcn,
+       pcolours[i].rgb.r,
+       pcolours[i].rgb.g,
+       pcolours[i].rgb.b,
+       pcolours[i].usage_count);
+    fputs (i % 5 == 4 ? "\n" : "  ", stdout);
 #endif
-   putchar (pcolours[i].usage_count == 1 ? '.' : '0' + pcolours[i].usage_count);
-   if (i % 79 == 78)
-      putchar ('\n');
-   }
-putchar ('\n');
+    if (items_on_current_line == 0)
+      verbmsg ("colours: ");
+    verbmsg ("%c",
+	(pcolours[i].usage_count == 1) ? '.' : '0' + pcolours[i].usage_count);
+    if (++items_on_current_line % 10 == 0)
+    {
+      if (items_on_current_line == 50)
+      {
+	items_on_current_line = 0;
+	verbmsg ("\n");
+      }
+      else
+        verbmsg (" ");
+    }
+  }
+  if (items_on_current_line != 0)
+    verbmsg ("\n");
 }
 
 
diff -uaNr yadex-1.5.2/src/credits.cc yadex-1.6.0/src/credits.cc
--- yadex-1.5.2/src/credits.cc	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/credits.cc	2003-03-31 18:58:35.000000000 +0200
@@ -0,0 +1,12 @@
+// DO NOT EDIT -- generated from docsrc/copyright
+
+extern const char *const yadex_copyright[] =
+{
+  "Parts copyright Andrew Apted 2000-2001, GNU GPL v2",
+  "Parts copyright Andr Majorel 1997-2003, GNU GPL v2",
+  "Parts copyright Matthew W. Miller 2000, GNU GPL v2",
+  "Parts written by Raphal Quinet, public domain",
+  "Parts written by Brendon Wyber, public domain",
+  0
+};
+
diff -uaNr yadex-1.5.2/src/credits.h yadex-1.6.0/src/credits.h
--- yadex-1.5.2/src/credits.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/credits.h	2002-09-16 13:29:24.000000000 +0200
@@ -0,0 +1 @@
+extern const char *const yadex_copyright[];
diff -uaNr yadex-1.5.2/src/dependcy.cc yadex-1.6.0/src/dependcy.cc
--- yadex-1.5.2/src/dependcy.cc	2000-04-12 03:38:15.000000000 +0200
+++ yadex-1.6.0/src/dependcy.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -52,3 +52,4 @@
   serial_num->update (token);
   token_valid = true;
 }
+
diff -uaNr yadex-1.5.2/src/dialog.cc yadex-1.6.0/src/dialog.cc
--- yadex-1.5.2/src/dialog.cc	2000-05-07 14:26:30.000000000 +0200
+++ yadex-1.6.0/src/dialog.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -35,139 +35,145 @@
 
 
 /*
-   ask for confirmation (prompt2 may be NULL)
-   Returns zero for "no", non-zero for "yes".
-*/
+ *	Confirm - ask for confirmation
+ *
+ *	Ask for confirmation (prompt2 may be NULL).
+ *
+ *	Return zero for "no", non-zero for "yes".
+ */
 bool Confirm (int x0, int y0, const char *prompt1, const char *prompt2)
 {
-const char *const prompt3 = "Press [Y] to confirm, [N] to cancel...";
-size_t maxlen;
-double n_lines_of_text;
-int width;
-int height;
-int text_x0;
-int text_x1;
-int x1;
-int text_y0;
-int text_y1;
-int y1;
-bool rc;
-
-maxlen = strlen (prompt3);
-if (strlen (prompt1) > maxlen)
-   maxlen = strlen (prompt1);
-if (prompt2 != NULL && strlen (prompt2) > maxlen)
-   maxlen = strlen (prompt2);
-n_lines_of_text = (prompt2 == NULL ? 2.5 : 3.5);
-width = 2 * BOX_BORDER + 2 * WIDE_HSPACING + maxlen * FONTW;
-height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (n_lines_of_text * FONTH);
-if (x0 < 0)
-   x0 = (ScrMaxX - width) / 2;
-if (y0 < 0)
-   y0 = (ScrMaxY - height) / 2;
-text_x0 = x0 + BOX_BORDER + WIDE_HSPACING;
-text_x1 = text_x0 + maxlen * FONTW - 1;
-x1      = text_x1 + WIDE_HSPACING + BOX_BORDER;
-text_y0 = y0 + BOX_BORDER + WIDE_VSPACING;
-text_y1 = text_y0 + (int) (n_lines_of_text * FONTH) - 1;
-y1      = text_y1 + WIDE_HSPACING + BOX_BORDER;
-HideMousePointer ();
-for (bool first_time = true; ; first_time = false)
-   {
-   if (first_time || is.key == YE_EXPOSE)
-      {
+  const char *const prompt3 = "Press [Y] to confirm, [N] to cancel...";
+  size_t maxlen;
+  double n_lines_of_text;
+  int width;
+  int height;
+  int text_x0;
+  int text_x1;
+  int x1;
+  int text_y0;
+  int text_y1;
+  int y1;
+  bool rc;
+
+  maxlen = strlen (prompt3);
+  if (strlen (prompt1) > maxlen)
+    maxlen = strlen (prompt1);
+  if (prompt2 != NULL && strlen (prompt2) > maxlen)
+    maxlen = strlen (prompt2);
+  n_lines_of_text = (prompt2 == NULL ? 2.5 : 3.5);
+  width = 2 * BOX_BORDER + 2 * WIDE_HSPACING + maxlen * FONTW;
+  height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (n_lines_of_text * FONTH);
+  if (x0 < 0)
+    x0 = (ScrMaxX - width) / 2;
+  if (y0 < 0)
+    y0 = (ScrMaxY - height) / 2;
+  text_x0 = x0 + BOX_BORDER + WIDE_HSPACING;
+  text_x1 = text_x0 + maxlen * FONTW - 1;
+  x1      = text_x1 + WIDE_HSPACING + BOX_BORDER;
+  text_y0 = y0 + BOX_BORDER + WIDE_VSPACING;
+  text_y1 = text_y0 + (int) (n_lines_of_text * FONTH) - 1;
+  y1      = text_y1 + WIDE_HSPACING + BOX_BORDER;
+  HideMousePointer ();
+  for (bool first_time = true; ; first_time = false)
+  {
+    if (first_time || is.key == YE_EXPOSE)
+    {
       DrawScreenBox3D (x0, y0, x1, y1);
       set_colour (WHITE);
       DrawScreenText (text_x0, text_y0, prompt1);
       if (prompt2 != NULL)
-	 DrawScreenText (text_x0, text_y0 + FONTH, prompt2);
+	DrawScreenText (text_x0, text_y0 + FONTH, prompt2);
       set_colour (YELLOW);
       DrawScreenText (text_x0, text_y1 - FONTH - 1, prompt3);
-      }
-   get_input_status ();
-   if (is.key == 'y' || is.key == 'Y' || is.key == YK_RETURN)
-      {
+    }
+    get_input_status ();
+    if (is.key == 'y' || is.key == 'Y' || is.key == YK_RETURN)
+    {
       rc = true;
       break;
-      }
-   if (is.key == 'n' || is.key == 'N' || is.key == YK_ESC)
-      {
+    }
+    if (is.key == 'n' || is.key == 'N' || is.key == YK_ESC)
+    {
       rc = false;
       break;
-      }
-   }
-is.key = 0;  // Shouldn't have to do that but EditorLoop() is broken
-ShowMousePointer ();
-return rc;
+    }
+  }
+  is.key = 0;  // Shouldn't have to do that but EditorLoop() is broken
+  ShowMousePointer ();
+  return rc;
 }
 
 
 /*
- *	Confirm2
- *	Ask for confirmation, in a smarter fashion
- *	Returns zero for "no", non-zero for "yes".
+ *	Confirm2 - ask for confirmation, in a smarter fashion
+ *
+ *	Return zero for "no", non-zero for "yes".
  */
 int Confirm2 (int x0, int y0, confirm_t *confirm_flag,
    const char *prompt1, const char *prompt2)
 {
-int r;
+  int r;
 
-if (*confirm_flag == YC_YES)
-   return 1;
-if (*confirm_flag == YC_NO)
-   return 0;
-r = Confirm (x0, y0, prompt1, prompt2);
-if (*confirm_flag == YC_ASK_ONCE)
-   *confirm_flag = r ? YC_YES : YC_NO;  // We won't ask again
-return r;
+  if (*confirm_flag == YC_YES)
+    return 1;
+  if (*confirm_flag == YC_NO)
+    return 0;
+  r = Confirm (x0, y0, prompt1, prompt2);
+  if (*confirm_flag == YC_ASK_ONCE)
+    *confirm_flag = r ? YC_YES : YC_NO;  // We won't ask again
+  return r;
 }
 
 
 /*
-   display a notification and wait for a key (prompt2 may be NULL)
-*/
+ *	Notify - notification dialog box
+ *
+ *	Display a notification and wait for a key (prompt2 may
+ *	be NULL)
+ */
 void Notify (int x0, int y0, const char *prompt1, const char *prompt2)
 {
-const char *const prompt3 = "Press any key to continue...";
-size_t maxlen;
-double n_lines_of_text;
-int width;
-int height;
-int text_x0;
-int text_x1;
-int x1;
-int text_y0;
-int text_y1;
-int y1;
-
-HideMousePointer ();
-maxlen = strlen (prompt3);
-if (strlen (prompt1) > maxlen)
-   maxlen = strlen (prompt1);
-if (prompt2 != NULL && strlen (prompt2) > maxlen)
-   maxlen = strlen (prompt2);
-n_lines_of_text = (prompt2 == NULL ? 2.5 : 3.5);
-width = 2 * BOX_BORDER + 2 * WIDE_HSPACING + maxlen * FONTW;
-height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (n_lines_of_text * FONTH);
-if (x0 < 0)
-   x0 = (ScrMaxX - width) / 2;
-if (y0 < 0)
-   y0 = (ScrMaxY - height) / 2;
-text_x0 = x0 + BOX_BORDER + WIDE_HSPACING;
-text_x1 = text_x0 + maxlen * FONTW - 1;
-x1      = text_x1 + WIDE_HSPACING + BOX_BORDER;
-text_y0 = y0 + BOX_BORDER + WIDE_VSPACING;
-text_y1 = text_y0 + (int) (n_lines_of_text * FONTH) - 1;
-y1      = text_y1 + WIDE_HSPACING + BOX_BORDER;
-DrawScreenBox3D (x0, y0, x1, y1);
-set_colour (WHITE);
-DrawScreenText (text_x0, text_y0, prompt1);
-if (prompt2 != NULL)
-   DrawScreenText (text_x0, text_y0 + FONTH, prompt2);
-set_colour (YELLOW);
-DrawScreenText (text_x0, text_y1 - FONTH - 1, prompt3);
-get_key_or_click ();
-ShowMousePointer ();
+  const char *const prompt3 = "Press any key to continue...";
+  size_t maxlen;
+  double n_lines_of_text;
+  int width;
+  int height;
+  int text_x0;
+  int text_x1;
+  int x1;
+  int text_y0;
+  int text_y1;
+  int y1;
+
+  HideMousePointer ();
+  maxlen = strlen (prompt3);
+  if (strlen (prompt1) > maxlen)
+    maxlen = strlen (prompt1);
+  if (prompt2 != NULL && strlen (prompt2) > maxlen)
+    maxlen = strlen (prompt2);
+  n_lines_of_text = (prompt2 == NULL ? 2.5 : 3.5);
+  width = 2 * BOX_BORDER + 2 * WIDE_HSPACING + maxlen * FONTW;
+  height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (n_lines_of_text * FONTH);
+  if (x0 < 0)
+    x0 = (ScrMaxX - width) / 2;
+  if (y0 < 0)
+    y0 = (ScrMaxY - height) / 2;
+  text_x0 = x0 + BOX_BORDER + WIDE_HSPACING;
+  text_x1 = text_x0 + maxlen * FONTW - 1;
+  x1      = text_x1 + WIDE_HSPACING + BOX_BORDER;
+  text_y0 = y0 + BOX_BORDER + WIDE_VSPACING;
+  text_y1 = text_y0 + (int) (n_lines_of_text * FONTH) - 1;
+  y1      = text_y1 + WIDE_HSPACING + BOX_BORDER;
+  DrawScreenBox3D (x0, y0, x1, y1);
+  set_colour (WHITE);
+  DrawScreenText (text_x0, text_y0, prompt1);
+  if (prompt2 != NULL)
+    DrawScreenText (text_x0, text_y0 + FONTH, prompt2);
+  set_colour (YELLOW);
+  DrawScreenText (text_x0, text_y1 - FONTH - 1, prompt3);
+  get_key_or_click ();
+  ShowMousePointer ();
 }
 
 
@@ -181,53 +187,53 @@
  */
 void debmes (const char *fmt, ...)
 {
-char buf[200];
-va_list arglist;
+  char buf[200];
+  va_list arglist;
 
-if (Debug != 1)
-  return;
-va_start (arglist, fmt);
-y_vsnprintf (buf, sizeof buf, fmt, arglist);
+  if (Debug != 1)
+    return;
+  va_start (arglist, fmt);
+  y_vsnprintf (buf, sizeof buf, fmt, arglist);
 #ifdef Y_BGI
-setviewport (0, 0, ScrMaxX, ScrMaxY, 1);
-#endif /* FIXME! */
-Notify (-1, -1, buf, NULL);
+  setviewport (0, 0, ScrMaxX, ScrMaxY, 1);
+#endif  /* FIXME! */
+  Notify (-1, -1, buf, NULL);
 }
 
 
 /*
-   clear the screen and display a message
-*/
+ *	DisplayMessage - clear the screen and display a message
+ */
 void DisplayMessage (int x0, int y0, const char *msg, ...)
 {
-char prompt[120];
-va_list args;
+  char prompt[120];
+  va_list args;
 
-va_start (args, msg);
-y_vsnprintf (prompt, sizeof prompt, msg, args);
-int width = 2 * BOX_BORDER + 2 * WIDE_HSPACING + FONTW * strlen (prompt);
-int height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + FONTH;
-if (x0 < 0)
-   x0 = (ScrMaxX - width) / 2;
-if (y0 < 0)
-   y0 = (ScrMaxY - height) / 2;
-HideMousePointer ();
-DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
-push_colour (WINFG);
-DrawScreenText (x0 + BOX_BORDER + WIDE_HSPACING,
-   y0 + BOX_BORDER + WIDE_VSPACING, prompt);
-pop_colour ();
-ShowMousePointer ();
-XFlush (dpy);
+  va_start (args, msg);
+  y_vsnprintf (prompt, sizeof prompt, msg, args);
+  int width = 2 * BOX_BORDER + 2 * WIDE_HSPACING + FONTW * strlen (prompt);
+  int height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + FONTH;
+  if (x0 < 0)
+    x0 = (ScrMaxX - width) / 2;
+  if (y0 < 0)
+    y0 = (ScrMaxY - height) / 2;
+  HideMousePointer ();
+  DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
+  push_colour (WINFG);
+  DrawScreenText (x0 + BOX_BORDER + WIDE_HSPACING,
+    y0 + BOX_BORDER + WIDE_VSPACING, prompt);
+  pop_colour ();
+  ShowMousePointer ();
+  XFlush (dpy);
 }
 
 
 /*
-   let's make the user angry...
-*/
+ *	NotImplemented - make the user angry...
+ */
 void NotImplemented (void)
 {
-Notify (-1, -1, "This function is not implemented... Yet!", NULL);
+  Notify (-1, -1, "This function is not implemented... Yet!", NULL);
 }
 
 
diff -uaNr yadex-1.5.2/src/disppic.cc yadex-1.6.0/src/disppic.cc
--- yadex-1.5.2/src/disppic.cc	2000-08-13 18:03:55.000000000 +0200
+++ yadex-1.6.0/src/disppic.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -41,9 +41,9 @@
 
 
 /*
- *	display_pic()
- *	Load a picture and display it.
- *	A wrapper for LoadPicture() and Sprite.load()/draw().
+ *	display_pic() -	load a picture and display it
+ *
+ *	A wrapper for LoadPicture() and Sticker.load()/draw().
  */
 void display_pic (hookfunc_comm_t *c)
 {
@@ -51,44 +51,34 @@
   int height = c->y1 - c->y0 + 1;
   Lump_loc loc;
 
-  Img img (width, height);
+  c->img.clear ();
+  c->img.set_opaque (false);
   if (c->flags & HOOK_PATCH)
     patch_dir.loc_by_name (c->name, loc);
   else if ((c->flags & HOOK_SPRITE) && (c->flags & HOOK_ROOT))
     wad_res.sprites.loc_by_root (c->name, loc);
   else if ((c->flags & HOOK_SPRITE) && ! (c->flags & HOOK_ROOT))
     wad_res.sprites.loc_by_name (c->name, loc);
-  if (! LoadPicture (img,
+  if (! LoadPicture (c->img,
     c->name,
     loc,
-    INT_MIN, // Not very clean, should use c->xofs but *WithFunc doesn't set it
-    INT_MIN, // Not very clean, should use c->yofs but *WithFunc doesn't set it
+    0, // Not very clean, should use c->xofs but *WithFunc doesn't set it
+    0, // Not very clean, should use c->yofs but *WithFunc doesn't set it
     &c->width,
     &c->height))
   {
+    c->disp_x0 = c->x0 + (width - c->width) / 2;
+    c->disp_y0 = c->y0 + (height - c->height) / 2;
+    c->disp_x1 = c->disp_x0 + c->width - 1;
+    c->disp_y1 = c->disp_y0 + c->height - 1;
     c->flags |= HOOK_SIZE_VALID;
     c->lump_loc = loc;
     c->flags |= HOOK_LOC_VALID;
     if (c->flags & HOOK_SPECTRAL)
-      spectrify_img (img);
-    Sticker sticker (img, true);  // Use opaque because it's faster
-    sticker.draw (drw, 't', c->x0, c->y0);
+      spectrify_img (c->img);
+    Sticker sticker (c->img, true);  // Use opaque because it's faster
+    sticker.draw (drw, 't', c->disp_x0, c->disp_y0);
     c->flags |= HOOK_DRAWN;
-
-    /* Alas, drawing the smallest possible rectangle is not implemented
-       yet because the allocation of the game image happens before the
-       size of the picture is known. -- AYM 2000-03-29 */
-#if 0
-    c->disp_x0 = c->x0 + (width - c->width) / 2;
-    c->disp_y0 = c->y0 + (height - c->height) / 2;
-    c->disp_x1 = c->disp_x0 + c->width - 1;
-    c->disp_y1 = c->disp_y0 + c->height - 1;
-#else
-    c->disp_x0 = c->x0;
-    c->disp_y0 = c->y0;
-    c->disp_x1 = c->x1;
-    c->disp_y1 = c->y1;
-#endif
   }
   else
   {
diff -uaNr yadex-1.5.2/src/drawmap.cc yadex-1.6.0/src/drawmap.cc
--- yadex-1.5.2/src/drawmap.cc	2001-06-21 15:55:40.000000000 +0200
+++ yadex-1.6.0/src/drawmap.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -52,13 +52,59 @@
 #include "wadres.h"
 
 
-void draw_grid (edit_t *e);
+static void draw_grid (edit_t *e);
+static void draw_vertices (edit_t *e);
+static void draw_linedefs (edit_t *e);
 static void draw_things_squares (edit_t *e);
 static void draw_things_sprites (edit_t *e);
 static void draw_obj_no (int x, int y, int obj_no, acolour_t c);
 
 
 /*
+ *	vertex_radius - apparent radius of a vertex, in pixels
+ *
+ *	Try this in Gnuplot :
+ *
+ *	  plot [0:10] x                                          
+ *	  replot log(x+1.46)/log(1.5)-log(2.46)/log(1.5)+1
+ */
+int vertex_radius (double scale)
+{
+#if 0
+  static double last_scale = 0;
+  static int    last_result = 0;
+
+  if (scale == last_scale)
+    return last_result;
+
+  const int    VERTEX_PIXELS  = 5;
+
+  // The scale past which we switch from linear to logarithmic.
+  const double crossover      = 0.1;
+
+  // The base of the log. The higher, the stronger the effect.
+  const double base           = 1.4;
+
+  /* The point at which the derivative of log{base}(x) is 1.
+     This is where we want the crossover to occur. */
+  const double knee_x         = 1 / log (base);
+  const double knee_y         = log (knee_x) / log (base);
+
+  double factor;
+  if (scale <= crossover)
+    factor = scale;
+  else
+    factor = crossover + log (scale -crossover + knee_x) / log (base) - knee_y;
+  last_result = (int) (VERTEX_PIXELS * factor + 0.5);
+  return last_result;
+#else
+  const int VERTEX_PIXELS = 6;
+  return (int) (VERTEX_PIXELS * (0.2 + scale / 2));
+#endif
+}
+
+
+/*
   draw the actual game map
 */
 
@@ -74,206 +120,32 @@
   // Draw the grid first since it's in the background
   draw_grid (e);
 
-  // Then the things "reminders"
-  if (e->obj_type != OBJ_THINGS)
-    draw_things_squares (e);
-
-  /* Draw the linedefs to form the map.
-     Optimization: off-screen lines are not drawn
-     and set_colour is not called unnecessarily. */
-  switch (e->obj_type)
-  {
-    case OBJ_THINGS:
-    {
-      int current_colour = INT_MIN;  /* Some impossible colour no. */
-      int new_colour;
-      
-      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
-      for (n = 0; n < NumLineDefs; n++)
-      {
-	register int x1 = Vertices[LineDefs[n].start].x;
-	register int x2 = Vertices[LineDefs[n].end  ].x;
-	register int y1 = Vertices[LineDefs[n].start].y;
-	register int y2 = Vertices[LineDefs[n].end  ].y;
-	if (x1 < mapx0 && x2 < mapx0
-	 || x1 > mapx9 && x2 > mapx9
-	 || y1 < mapy0 && y2 < mapy0
-	 || y1 > mapy9 && y2 > mapy9)
-	  continue;
-	if (LineDefs[n].flags & 1)
-	  new_colour = WHITE;
-	else
-	  new_colour = LIGHTGRAY;
-	if (new_colour != current_colour)
-	  set_colour (current_colour = new_colour);
-	DrawMapLine (x1, y1, x2, y2);
-      }
-      break;
-    }
-
-    case OBJ_VERTICES:
-      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
-      set_colour (LIGHTGRAY);
-      for (n = 0; n < NumLineDefs; n++)
-      {
-	register int x1 = Vertices[LineDefs[n].start].x;
-	register int x2 = Vertices[LineDefs[n].end  ].x;
-	register int y1 = Vertices[LineDefs[n].start].y;
-	register int y2 = Vertices[LineDefs[n].end  ].y;
-	if (x1 < mapx0 && x2 < mapx0
-	 || x1 > mapx9 && x2 > mapx9
-	 || y1 < mapy0 && y2 < mapy0
-	 || y1 > mapy9 && y2 > mapy9)
-	  continue;
-	DrawMapVector (x1, y1, x2, y2);
-      }
-      break;
-
-    case OBJ_LINEDEFS:
-    {
-      int current_colour = INT_MIN;  /* Some impossible colour no. */
-      int new_colour;
-
-      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
-      for (n = 0; n < NumLineDefs; n++)
-      {
-	register int x1 = Vertices[LineDefs[n].start].x;
-	register int x2 = Vertices[LineDefs[n].end  ].x;
-	register int y1 = Vertices[LineDefs[n].start].y;
-	register int y2 = Vertices[LineDefs[n].end  ].y;
-	if (x1 < mapx0 && x2 < mapx0
-	 || x1 > mapx9 && x2 > mapx9
-	 || y1 < mapy0 && y2 < mapy0
-	 || y1 > mapy9 && y2 > mapy9)
-	  continue;
-	if (LineDefs[n].type != 0)  /* AYM 19980207: was "> 0" */
-	{
-	  if (LineDefs[n].tag != 0)  /* AYM 19980207: was "> 0" */
-	    new_colour = LIGHTMAGENTA;
-	  else
-	    new_colour = LIGHTGREEN;
-	}
-	else if (LineDefs[n].tag != 0)  /* AYM 19980207: was "> 0" */
-	  new_colour = LIGHTRED;
-	else if (LineDefs[n].flags & 1)
-	  new_colour = WHITE;
-	else
-	  new_colour = LIGHTGRAY;
-	if (new_colour != current_colour)
-	  set_colour (current_colour = new_colour);
-	DrawMapLine (x1, y1, x2, y2);
-
-	if (e->show_object_numbers)
-	{
-	  int scnx0       = SCREENX (x1);
-	  int scnx1       = SCREENX (x2);
-	  int scny0       = SCREENY (y1);
-	  int scny1       = SCREENY (y2);
-	  int label_width = ((int) log10 (n) + 1) * FONTW;
-	  if (abs (scnx1 - scnx0) > label_width + 4
-	   || abs (scny1 - scny0) > label_width + 4)
-	  {
-	    int scnx = (scnx0 + scnx1) / 2 - label_width / 2;
-	    int scny = (scny0 + scny1) / 2 - FONTH / 2;
-	    draw_obj_no (scnx, scny, n, LINEDEF_NO);
-	  }
-	}
-      }
-      break;
-    }
-
-    case OBJ_SECTORS:
-    {
-      int current_colour = INT_MIN;  /* Some impossible colour no. */
-      int new_colour;
-
-      ObjectsNeeded (OBJ_LINEDEFS, OBJ_SIDEDEFS, 0);
-      for (n = 0; n < NumLineDefs; n++)
-      {
-	register int x1 = Vertices[LineDefs[n].start].x;
-	register int x2 = Vertices[LineDefs[n].end  ].x;
-	register int y1 = Vertices[LineDefs[n].start].y;
-	register int y2 = Vertices[LineDefs[n].end  ].y;
-	if (x1 < mapx0 && x2 < mapx0
-	 || x1 > mapx9 && x2 > mapx9
-	 || y1 < mapy0 && y2 < mapy0
-	 || y1 > mapy9 && y2 > mapy9)
-	  continue;
-	int m;
-	if ((m = LineDefs[n].sidedef1) < 0 || (m = SideDefs[m].sector) < 0)
-	  new_colour = LIGHTRED;
-	else
-	{
-	  if (Sectors[m].tag != 0)  /* AYM 19980207: was "> 0" */
-	    new_colour = LIGHTGREEN;
-	  else if (Sectors[m].special > 0)
-	    new_colour = LIGHTCYAN;
-	  else if (LineDefs[n].flags & 1)
-	    new_colour = WHITE;
-	  else
-	    new_colour = LIGHTGRAY;
-	  if ((m = LineDefs[n].sidedef2) >= 0)
-	  {
-	    if ((m = SideDefs[m].sector) < 0)
-	      new_colour = LIGHTRED;
-	    else if (Sectors[m].tag != 0)  /* AYM 19980207: was "> 0" */
-	      new_colour = LIGHTGREEN;
-	    else if (Sectors[m].special > 0)
-	      new_colour = LIGHTCYAN;
-	  }
-	}
-	ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
-	if (new_colour != current_colour)
-	  set_colour (current_colour = new_colour);
-	DrawMapLine (x1, y1, x2, y2);
-      }
-      break;
-    }
-  }
-
-  /* Draw in the vertices.
-     Optimization: off-screen vertices are not drawn. */
-  if (e->obj_type == OBJ_VERTICES)
-  {
-    int r = (int) (OBJSIZE * y_min (Scale, 1));
-    set_colour (LIGHTGREEN);
-    for (n = 0; n < NumVertices; n++)
-    {
-      int mapx = Vertices[n].x;
-      int mapy = Vertices[n].y;
-      if (mapx >= mapx0 && mapx <= mapx9 && mapy >= mapy0 && mapy <= mapy9)
-      {
-	register int scrx = SCREENX (mapx);
-	register int scry = SCREENY (mapy);
-	DrawScreenLine (scrx - r, scry - r, scrx + r, scry + r);
-	DrawScreenLine (scrx + r, scry - r, scrx - r, scry + r);
-      }
-    }
-    if (e->show_object_numbers && e->obj_type == OBJ_VERTICES)
-    {
-      for (n = 0; n < NumVertices; n++)
-      {
-	int mapx = Vertices[n].x;
-	int mapy = Vertices[n].y;
-	if (mapx >= mapx0 && mapx <= mapx9 && mapy >= mapy0 && mapy <= mapy9)
-	{
-	  int x = (int) (SCREENX (mapx) + 2 * VERTEXSIZE);
-	  int y = SCREENY (mapy) + 2;
-	  draw_obj_no (x, y, n, VERTEX_NO);
-	}
-      }
-    }
-  }
-
-  // Draw the things in things mode
-  if (e->obj_type == OBJ_THINGS)
+  if (e->global)
   {
+    draw_linedefs (e);
     if (e->show_things_sprites)
       draw_things_sprites (e);
     else
       draw_things_squares (e);
+    draw_vertices (e);
+  }
+  else
+  {
+    if (e->obj_type != OBJ_THINGS)
+      draw_things_squares (e);
+    draw_linedefs (e);
+    if (e->obj_type == OBJ_VERTICES)
+      draw_vertices (e);
+    if (e->obj_type == OBJ_THINGS)
+    {
+      if (e->show_things_sprites)
+	draw_things_sprites (e);
+      else
+	draw_things_squares (e);
+    }
   }
 
+
   // Draw the things numbers
   if (e->obj_type == OBJ_THINGS && e->show_object_numbers)
   {
@@ -290,15 +162,18 @@
   // Draw the sector numbers
   if (e->obj_type == OBJ_SECTORS && e->show_object_numbers)
   {
+    int xoffset = - FONTW / 2;
+
     for (n = 0; n < NumSectors; n++)
     {
       int mapx;
       int mapy;
       centre_of_sector (n, &mapx, &mapy);
-      if (mapx < mapx0 || mapx > mapx9 || mapy < mapy0 || mapy > mapy9)
-	continue;
-      draw_obj_no (SCREENX (mapx) - FONTW, SCREENY (mapy) - FONTH / 2, n,
-	SECTOR_NO);
+      if (mapx >= mapx0 && mapx <= mapx9 && mapy >= mapy0 && mapy <= mapy9)
+	draw_obj_no (SCREENX (mapx) + xoffset, SCREENY (mapy) - FONTH / 2, n,
+	  SECTOR_NO);
+      if (n == 10 || n == 100 || n == 1000 || n == 10000)
+	xoffset -= FONTW / 2;
     }
   }
 }
@@ -307,11 +182,11 @@
 /*
  *	draw_grid - draw the grid in the background of the edit window
  */
-void draw_grid (edit_t *e)
+static void draw_grid (edit_t *e)
 {
   if (! e->grid_shown)
     return;
-
+  
   int mapx0   = MAPX (0);
   int mapx1   = MAPX (ScrMaxX);
   int mapy0   = MAPY (ScrMaxY);
@@ -433,6 +308,235 @@
 
 
 /*
+ *	draw_vertices - draw the vertices, and possibly their numbers
+ */
+static void draw_vertices (edit_t *e)
+{
+  int mapx0 = MAPX (0);
+  int mapx9 = MAPX (ScrMaxX);
+  int mapy0 = MAPY (ScrMaxY);
+  int mapy9 = MAPY (0);
+  const int r = vertex_radius (Scale);
+
+  push_colour (LIGHTGREEN);
+  for (int n = 0; n < NumVertices; n++)
+  {
+    int mapx = Vertices[n].x;
+    int mapy = Vertices[n].y;
+    if (mapx >= mapx0 && mapx <= mapx9 && mapy >= mapy0 && mapy <= mapy9)
+    {
+      register int scrx = SCREENX (mapx);
+      register int scry = SCREENY (mapy);
+      DrawScreenLine (scrx - r, scry - r, scrx + r, scry + r);
+      DrawScreenLine (scrx + r, scry - r, scrx - r, scry + r);
+    }
+  }
+  if (e->show_object_numbers)
+  {
+    for (int n = 0; n < NumVertices; n++)
+    {
+      int mapx = Vertices[n].x;
+      int mapy = Vertices[n].y;
+      if (mapx >= mapx0 && mapx <= mapx9 && mapy >= mapy0 && mapy <= mapy9)
+      {
+	int x = (int) (SCREENX (mapx) + 2 * r);
+	int y = SCREENY (mapy) + 2;
+	draw_obj_no (x, y, n, VERTEX_NO);
+      }
+    }
+  }
+  pop_colour ();
+}
+
+
+/*
+ *	draw_linedefs - draw the linedefs
+ */
+static void draw_linedefs (edit_t *e)
+{
+  int mapx0 = MAPX (0);
+  int mapx9 = MAPX (ScrMaxX);
+  int mapy0 = MAPY (ScrMaxY);
+  int mapy9 = MAPY (0);
+
+  switch (e->obj_type)
+  {
+    case OBJ_THINGS:
+    {
+      int current_colour = INT_MIN;  /* Some impossible colour no. */
+      int new_colour;
+      
+      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
+      for (int n = 0; n < NumLineDefs; n++)
+      {
+	register int x1 = Vertices[LineDefs[n].start].x;
+	register int x2 = Vertices[LineDefs[n].end  ].x;
+	register int y1 = Vertices[LineDefs[n].start].y;
+	register int y2 = Vertices[LineDefs[n].end  ].y;
+	if (x1 < mapx0 && x2 < mapx0
+	 || x1 > mapx9 && x2 > mapx9
+	 || y1 < mapy0 && y2 < mapy0
+	 || y1 > mapy9 && y2 > mapy9)
+	  continue;
+	if (LineDefs[n].flags & 1)
+	  new_colour = WHITE;
+	else
+	  new_colour = LIGHTGREY;
+	if (new_colour != current_colour)
+	  set_colour (current_colour = new_colour);
+	DrawMapLine (x1, y1, x2, y2);
+      }
+      break;
+    }
+
+    case OBJ_VERTICES:
+      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
+      set_colour (LIGHTGREY);
+      for (int n = 0; n < NumLineDefs; n++)
+      {
+	register int x1 = Vertices[LineDefs[n].start].x;
+	register int x2 = Vertices[LineDefs[n].end  ].x;
+	register int y1 = Vertices[LineDefs[n].start].y;
+	register int y2 = Vertices[LineDefs[n].end  ].y;
+	if (x1 < mapx0 && x2 < mapx0
+	 || x1 > mapx9 && x2 > mapx9
+	 || y1 < mapy0 && y2 < mapy0
+	 || y1 > mapy9 && y2 > mapy9)
+	  continue;
+	DrawMapVector (x1, y1, x2, y2);
+      }
+      break;
+
+    case OBJ_LINEDEFS:
+    {
+      int current_colour = INT_MIN;  /* Some impossible colour no. */
+      int new_colour;
+
+      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
+      for (int n = 0; n < NumLineDefs; n++)
+      {
+	register int x1 = Vertices[LineDefs[n].start].x;
+	register int x2 = Vertices[LineDefs[n].end  ].x;
+	register int y1 = Vertices[LineDefs[n].start].y;
+	register int y2 = Vertices[LineDefs[n].end  ].y;
+	if (x1 < mapx0 && x2 < mapx0
+	 || x1 > mapx9 && x2 > mapx9
+	 || y1 < mapy0 && y2 < mapy0
+	 || y1 > mapy9 && y2 > mapy9)
+	  continue;
+	if (LineDefs[n].type != 0)  /* AYM 19980207: was "> 0" */
+	{
+	  if (LineDefs[n].tag != 0)  /* AYM 19980207: was "> 0" */
+	    new_colour = LIGHTMAGENTA;
+	  else
+	    new_colour = LIGHTGREEN;
+	}
+	else if (LineDefs[n].flags & 1)
+	  new_colour = WHITE;
+	else
+	  new_colour = LIGHTGREY;
+
+	// Signal errors by drawing the linedef in red. Needs work.
+	// Tag on a typeless linedef
+	if (LineDefs[n].type == 0 && LineDefs[n].tag != 0)
+	  new_colour = LIGHTRED;
+	// No first sidedef
+	if (! is_sidedef (LineDefs[n].sidedef1))
+	  new_colour = LIGHTRED;
+	// Bad second sidedef
+	if (! is_sidedef (LineDefs[n].sidedef2) && LineDefs[n].sidedef2 != -1)
+	  new_colour = LIGHTRED;
+
+	if (new_colour != current_colour)
+	  set_colour (current_colour = new_colour);
+	DrawMapLine (x1, y1, x2, y2);
+
+	if (e->show_object_numbers)
+	{
+	  int scnx0       = SCREENX (x1);
+	  int scnx1       = SCREENX (x2);
+	  int scny0       = SCREENY (y1);
+	  int scny1       = SCREENY (y2);
+	  int label_width = ((int) log10 (n) + 1) * FONTW;
+	  if (abs (scnx1 - scnx0) > label_width + 4
+	   || abs (scny1 - scny0) > label_width + 4)
+	  {
+	    int scnx = (scnx0 + scnx1) / 2 - label_width / 2;
+	    int scny = (scny0 + scny1) / 2 - FONTH / 2;
+	    draw_obj_no (scnx, scny, n, LINEDEF_NO);
+	  }
+	}
+      }
+      break;
+    }
+
+    case OBJ_SECTORS:
+    {
+      int current_colour = INT_MIN;  /* Some impossible colour no. */
+      int new_colour;
+
+      for (int n = 0; n < NumLineDefs; n++)
+      {
+	register int x1 = Vertices[LineDefs[n].start].x;
+	register int x2 = Vertices[LineDefs[n].end  ].x;
+	register int y1 = Vertices[LineDefs[n].start].y;
+	register int y2 = Vertices[LineDefs[n].end  ].y;
+	if (x1 < mapx0 && x2 < mapx0
+	 || x1 > mapx9 && x2 > mapx9
+	 || y1 < mapy0 && y2 < mapy0
+	 || y1 > mapy9 && y2 > mapy9)
+	  continue;
+	int sd1 = OBJ_NO_NONE;
+	int sd2 = OBJ_NO_NONE;
+	int s1  = OBJ_NO_NONE;
+	int s2  = OBJ_NO_NONE;
+	// FIXME should flag negative sidedef numbers as errors
+	// FIXME should flag unused tag as errors
+	if ((sd1 = LineDefs[n].sidedef1) < 0 || sd1 >= NumSideDefs
+	  || (s1 = SideDefs[sd1].sector) < 0 || s1 >= NumSectors
+	  || (sd2 = LineDefs[n].sidedef2) >= NumSideDefs
+	  || sd2 >= 0 && ((s2 = SideDefs[sd2].sector) < 0
+			|| s2 >= NumSectors))
+	{
+	  new_colour = LIGHTRED;
+	}
+	else
+	{
+	  bool have_tag  = false;
+	  bool have_type = false;
+	  if (Sectors[s1].tag != 0)
+	    have_tag = true;
+	  if (Sectors[s1].special != 0)
+	    have_type = true;
+	  if (sd2 >= 0)
+	  {
+	    if (Sectors[s2].tag != 0)
+	      have_tag = true;
+	    if (Sectors[s2].special != 0)
+	      have_type = true;
+	  }
+	  if (have_tag && have_type)
+	    new_colour = SECTOR_TAGTYPE;
+	  else if (have_tag)
+	    new_colour = SECTOR_TAG;
+	  else if (have_type)
+	    new_colour = SECTOR_TYPE;
+	  else if (LineDefs[n].flags & 1)
+	    new_colour = WHITE;
+	  else
+	    new_colour = LIGHTGREY;
+	}
+	if (new_colour != current_colour)
+	  set_colour (current_colour = new_colour);
+	DrawMapLine (x1, y1, x2, y2);
+      }
+      break;
+    }
+  }
+}
+
+
+/*
  *	draw_things_squares - the obvious
  */
 static void draw_things_squares (edit_t *e)
@@ -440,9 +544,9 @@
   // The radius of the largest thing.
   int max_radius = get_max_thing_radius ();
 
-  // A thing is guaranteed to be totally off-screen
-  // if its centre is more than  units
-  // beyond the edge of the screen.
+  /* A thing is guaranteed to be totally off-screen
+     if its centre is more than  units
+     beyond the edge of the screen. */
   int mapx0      = MAPX (0)       - max_radius;
   int mapx9      = MAPX (ScrMaxX) + max_radius;
   int mapy0      = MAPY (ScrMaxY) - max_radius;
@@ -694,27 +798,28 @@
 
 
 /*
- *	draw_obj_no
- *	Draw a number at screen coordinates (x, y)
+ *	draw_obj_no - draw a number at screen coordinates (x, y)
+ *
+ *	FIXME too slow.
  */
 static void draw_obj_no (int x, int y, int obj_no, acolour_t c)
 {
-push_colour (BLACK);
+  push_colour (BLACK);
 #if 1
-DrawScreenText (x - 2, y,     "%d", obj_no);
-DrawScreenText (x - 1, y,     "%d", obj_no);
-DrawScreenText (x + 1, y,     "%d", obj_no);
-DrawScreenText (x + 2, y,     "%d", obj_no);
-DrawScreenText (x,     y + 1, "%d", obj_no);
-DrawScreenText (x,     y - 1, "%d", obj_no);
+  DrawScreenText (x - 2, y,     "%d", obj_no);
+  DrawScreenText (x - 1, y,     "%d", obj_no);
+  DrawScreenText (x + 1, y,     "%d", obj_no);
+  DrawScreenText (x + 2, y,     "%d", obj_no);
+  DrawScreenText (x,     y + 1, "%d", obj_no);
+  DrawScreenText (x,     y - 1, "%d", obj_no);
 #else
-DrawScreenText (x + 1, y + 1, "%d", obj_no);
-DrawScreenText (x + 1, y - 1, "%d", obj_no);
-DrawScreenText (x - 1, y + 1, "%d", obj_no);
-DrawScreenText (x - 1, y - 1, "%d", obj_no);
+  DrawScreenText (x + 1, y + 1, "%d", obj_no);
+  DrawScreenText (x + 1, y - 1, "%d", obj_no);
+  DrawScreenText (x - 1, y + 1, "%d", obj_no);
+  DrawScreenText (x - 1, y - 1, "%d", obj_no);
 #endif
-set_colour (c);
-DrawScreenText (x,     y,     "%d", obj_no);
-pop_colour ();
+  set_colour (c);
+  DrawScreenText (x,     y,     "%d", obj_no);
+  pop_colour ();
 }
 
diff -uaNr yadex-1.5.2/src/drawmap.h yadex-1.6.0/src/drawmap.h
--- yadex-1.5.2/src/drawmap.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/drawmap.h	2003-02-12 17:17:03.000000000 +0100
@@ -4,8 +4,16 @@
  */
 
 
+#ifndef YH_DRAWMAP
+#define YH_DRAWMAP
+
 #include "_edit.h"
 
-void draw_map (edit_t *e); /* SWAP! */
+
+int vertex_radius (double scale);
+
+void draw_map (edit_t *e);
 void draw_infobar (const edit_t *e);
 
+
+#endif
diff -uaNr yadex-1.5.2/src/edisplay.cc yadex-1.6.0/src/edisplay.cc
--- yadex-1.5.2/src/edisplay.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/edisplay.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -64,150 +64,154 @@
 #include "menu.h"
 #include "menubar.h"
 #include "modpopup.h"
+#include "objects.h"
 #include "objinfo.h"
 #include "selbox.h"
 #include "spot.h"
+#include "wadfile.h"
 
 
 edisplay_c::edisplay_c (edit_t *e)
 {
-this->e = e;
-pointer_scnx = 0;
-pointer_scny = 0;
-refresh_needed = 1;
-highlight = new highlight_c;
-objinfo   = new objinfo_c;
-infobar   = new infobar_c;
+  this->e = e;
+  pointer_scnx = 0;
+  pointer_scny = 0;
+  refresh_needed = 1;
+  highlight = new highlight_c;
+  objinfo   = new objinfo_c;
+  infobar   = new infobar_c;
 }
 
 
 edisplay_c::~edisplay_c ()
 {
-delete highlight;
-delete objinfo;
+  delete highlight;
+  delete objinfo;
 }
 
 
 // FIXME this should not be a separate method
-void edisplay_c::highlight_object (int obj_no)
+void edisplay_c::highlight_object (Objid& obj)
 {
-highlight->set (e->obj_type, obj_no);
-objinfo->set (e->obj_type, obj_no);
+  highlight->set (obj);
+  objinfo->set (obj.type, obj.num);
 }
 
 
 // FIXME this should not be a separate method
 void edisplay_c::forget_highlight ()
 {
-highlight->unset ();
-/* I don't unset objinfo because, as it can't undraw
-   itself, it would lead to redrawing everything from
-   scratch everytime an object passes out of focus. */
-//objinfo->unset ();
+  highlight->unset ();
+  /* I don't unset objinfo because, as it can't undraw
+     itself, it would lead to redrawing everything from
+     scratch everytime an object passes out of focus. */
+  //objinfo->unset ();
 }
 
 
 void edisplay_c::need_refresh ()
 {
-refresh_needed = 1;
+  refresh_needed = 1;
 }
 
 
 void edisplay_c::refresh ()
 {
-int redraw_from_scratch;
+  int redraw_from_scratch;
 
-// The poor hacker's geometry manager (FIXME: this needs work!)
-infobar->set_x1 (ScrMaxX);
-infobar->set_y1 (ScrMaxY);
-infobar->set_x0 (0);
-infobar->set_y0 (ScrMaxY - (infobar->req_height () - 1));
-objinfo->set_y1 (e->infobar_shown ? infobar->get_y0 () - 1 : ScrMaxY);
-
-/* Extract the interesting data from the edit_c object
-   and feed it to the widgets. */
-infobar->set_visible          (e->infobar_shown);
-infobar->set_file_name        (Level
-				  ?  (const char *) Level->wadfile->filename
-				  : 0);
-infobar->set_level_name       (Level
-				  ? (const char *) Level->dir.name
-				  : 0);
-infobar->set_obj_type         (e->obj_type);
-infobar->set_changes          (MadeMapChanges ? 2 : (MadeChanges ? 1 : 0));
-infobar->set_grid_snap        (e->grid_snap);
-infobar->set_grid_step_locked (e->grid_step_locked);
-infobar->set_scale            (Scale);
-infobar->set_grid_step        (e->grid_step);
-if (e->pointer_in_window)
-   infobar->set_pointer (e->pointer_x, e->pointer_y);
-else
-   infobar->unset_pointer ();
-
-redraw_from_scratch =
-   refresh_needed
-   || e->selbox->need_to_clear   ()
-   || e->spot->need_to_clear     ()
-   || highlight->need_to_clear   ()
-   || objinfo->need_to_clear     ()
-   || infobar->need_to_clear     ()
-   || e->menubar->need_to_clear  ()
-   || e->modpopup->need_to_clear ();
-  
-/* If we can update the display in an incremental fashion
-   (not from scratch), do it by telling all widgets, from
-   the top to the bottom, to undraw themselves if necessary. */
-if (! redraw_from_scratch)
-   {
-   e->modpopup->undraw ();
-   e->menubar->undraw  ();
-   infobar->undraw     ();
-   objinfo->undraw     ();
-   highlight->undraw   ();
-   e->spot->undraw     ();
-   e->selbox->undraw   ();
-   }
-
-/* If a complete refresh is required, call the clear()
-   method for all widgets to make them aware that they're
-   not visible anymore. */
-else
-   {
-   e->selbox->clear   ();
-   e->spot->clear     ();
-   highlight->clear   ();
-   objinfo->clear     ();
-   infobar->clear     ();
-   e->menubar->clear  ();
-   e->modpopup->clear ();
-
-   // A piece of ad-hockery
-   objinfo->unset ();
-
-   // As we said, "from scratch".
-   ClearScreen ();
-   draw_map (e);     // FIXME should be widgetized
-   // draw_menubar ();  // FIXME should be widgetized
-   HighlightSelection (e->obj_type, e->Selected); // FIXME should be widgetized
-   refresh_needed = 0;
-   }
-
-/* Tell all widgets from to bottom to the top
-   to draw themselves if necessary. */
-e->selbox->draw   ();
-e->spot->draw     ();
-highlight->draw   ();
-objinfo->draw     ();
-infobar->draw     ();
-e->menubar->draw  ();
-e->modpopup->draw ();
-
-// Redraw the pointer if necessary.
-if (refresh_needed && (FakeCursor || e->rulers_shown))
-   DrawPointer (e->rulers_shown);  // FIXME should be widgetized
+  // The poor hacker's geometry manager (FIXME: this needs work!)
+  infobar->set_x1 (ScrMaxX);
+  infobar->set_y1 (ScrMaxY);
+  infobar->set_x0 (0);
+  infobar->set_y0 (ScrMaxY - (infobar->req_height () - 1));
+  objinfo->set_y1 (e->infobar_shown ? infobar->get_y0 () - 1 : ScrMaxY);
+
+  /* Extract the interesting data from the edit_c object
+     and feed it to the widgets. */
+  infobar->set_visible          (e->infobar_shown);
+  infobar->set_file_name        (Level
+				   ? Level->wadfile->pathname ()
+				   : 0);
+  infobar->set_level_name       (Level
+				   ? (const char *) Level->dir.name
+				   : 0);
+  infobar->set_obj_type         (e->obj_type);
+  infobar->set_changes          (MadeMapChanges ? 2 : (MadeChanges ? 1 : 0));
+  infobar->set_grid_snap        (e->grid_snap);
+  infobar->set_grid_step_locked (e->grid_step_locked);
+  infobar->set_scale            (Scale);
+  infobar->set_grid_step        (e->grid_step);
+  if (e->pointer_in_window)
+    infobar->set_pointer (e->pointer_x, e->pointer_y);
+  else
+    infobar->unset_pointer ();
+
+
+  redraw_from_scratch =
+    refresh_needed
+    || e->selbox->need_to_clear   ()
+    || e->spot->need_to_clear     ()
+    || highlight->need_to_clear   ()
+    || objinfo->need_to_clear     ()
+    || infobar->need_to_clear     ()
+    || e->menubar->need_to_clear  ()
+    || e->modpopup->need_to_clear ();
+   
+  /* If we can update the display in an incremental fashion
+     (not from scratch), do it by telling all widgets, from
+     the top to the bottom, to undraw themselves if necessary. */
+  if (! redraw_from_scratch)
+  {
+    e->modpopup->undraw ();
+    e->menubar->undraw  ();
+    infobar->undraw     ();
+    objinfo->undraw     ();
+    highlight->undraw   ();
+    e->spot->undraw     ();
+    e->selbox->undraw   ();
+  }
+
+  /* If a complete refresh is required, call the clear()
+     method for all widgets to make them aware that they're
+     not visible anymore. */
+  else
+  {
+    e->selbox->clear   ();
+    e->spot->clear     ();
+    highlight->clear   ();
+    objinfo->clear     ();
+    infobar->clear     ();
+    e->menubar->clear  ();
+    e->modpopup->clear ();
+
+    // A piece of ad-hockery
+    objinfo->unset ();
+
+    // As we said, "from scratch".
+    ClearScreen ();
+    draw_map (e);     // FIXME should be widgetized
+    // draw_menubar ();  // FIXME should be widgetized
+    HighlightSelection (e->obj_type, e->Selected); // FIXME should be widgetized
+    refresh_needed = 0;
+  }
+
+  /* Tell all widgets from to bottom to the top
+     to draw themselves if necessary. */
+  e->selbox->draw   ();
+  e->spot->draw     ();
+  highlight->draw   ();
+  if (e->objinfo_shown)
+    objinfo->draw     ();
+  infobar->draw     ();
+  e->menubar->draw  ();
+  e->modpopup->draw ();
+
+  // Redraw the pointer if necessary.
+  if (refresh_needed && (FakeCursor || e->rulers_shown))
+    DrawPointer (e->rulers_shown);  // FIXME should be widgetized
 
-// Refresh the physical display
-update_display ();
+  // Refresh the physical display
+  update_display ();
 }
 
 
diff -uaNr yadex-1.5.2/src/edisplay.h yadex-1.6.0/src/edisplay.h
--- yadex-1.5.2/src/edisplay.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/edisplay.h	2003-02-12 17:16:08.000000000 +0100
@@ -16,7 +16,7 @@
       ~edisplay_c ();
       void refresh ();
       void need_refresh ();
-      void highlight_object (int obj_no);
+      void highlight_object (Objid& obj);
       void forget_highlight ();
 
    private :
diff -uaNr yadex-1.5.2/src/editgrid.cc yadex-1.6.0/src/editgrid.cc
--- yadex-1.5.2/src/editgrid.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/editgrid.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -34,10 +34,10 @@
 
 void edit_grid_adapt (edit_t *e)
 {
-if (! e->grid_step_locked)
-   for (e->grid_step = e->grid_step_max;
-	e->grid_step * Scale / 2 >= grid_pixels_min;
-	e->grid_step /= 2)
+  if (! e->grid_step_locked)
+    for (e->grid_step = e->grid_step_max;
+	 e->grid_step * Scale / 2 >= grid_pixels_min;
+	 e->grid_step /= 2)
       ;
 }
 
diff -uaNr yadex-1.5.2/src/editgrid.h yadex-1.6.0/src/editgrid.h
--- yadex-1.5.2/src/editgrid.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/editgrid.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/editlev.cc yadex-1.6.0/src/editlev.cc
--- yadex-1.5.2/src/editlev.cc	2000-05-27 14:26:04.000000000 +0200
+++ yadex-1.6.0/src/editlev.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -39,6 +39,7 @@
 #include "gfx.h"
 #include "levels.h"
 #include "patchdir.h"
+#include "wadfile.h"
 
 
 static void WriteYadexLog (const char *file, const char *level,
@@ -233,7 +234,7 @@
 if (Level && Level->wadfile)
    {
    const char *const file_name =
-      Level->wadfile ? Level->wadfile->filename : "(New level)";
+      Level->wadfile ? Level->wadfile->pathname () : "(New level)";
    WriteYadexLog (file_name, levelname, &t0, &t1);
    }
 }
diff -uaNr yadex-1.5.2/src/editloop.cc yadex-1.6.0/src/editloop.cc
--- yadex-1.5.2/src/editloop.cc	2000-08-15 03:14:25.000000000 +0200
+++ yadex-1.6.0/src/editloop.cc	2003-03-28 13:37:32.000000000 +0100
@@ -1,5 +1,4 @@
 /*
-
  *	editloop.cc
  *	The main loop of the editor.
  *	BW & RQ sometime in 1993 or 1994.
@@ -12,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -55,9 +54,12 @@
 #include "menubar.h"
 #include "menu.h"
 #include "modpopup.h"
+#include "objects.h"
+#include "objid.h"
 #include "palview.h"
 #include "prefer.h"
 #include "rgbbmp.h"
+#include "s_slice.h"
 #include "selbox.h"
 #include "selectn.h"
 #include "selpath.h"
@@ -66,6 +68,7 @@
 #include "t_spin.h"
 #include "x_centre.h"
 #include "x_exchng.h"
+#include "x_hover.h"
 #include "xref.h"
 
 #ifdef Y_X11
@@ -192,6 +195,13 @@
 }
 
 
+// Used by the View menu
+bool mode_th (micbarg_t p) { return ((edit_t *) p)->obj_type == OBJ_THINGS;   }
+bool mode_l  (micbarg_t p) { return ((edit_t *) p)->obj_type == OBJ_LINEDEFS; }
+bool mode_v  (micbarg_t p) { return ((edit_t *) p)->obj_type == OBJ_VERTICES; }
+bool mode_s  (micbarg_t p) { return ((edit_t *) p)->obj_type == OBJ_SECTORS;  }
+
+
 /*
   the editor main loop
 */
@@ -206,7 +216,8 @@
 
 bool   StretchSelBox = false;  // FIXME apparently not used anymore...
 
-int object = OBJ_NO_NONE;  /* The object under the pointer */
+Objid object;			// The object under the pointer
+const Objid CANVAS (OBJ_NONE, OBJ_NO_CANVAS);
 
 memset (&e, 0, sizeof e);	/* Catch-all */
 e.move_speed          = 20;
@@ -214,6 +225,7 @@
 // If you change this, don't forget to change
 // the initialisation of the menu bar below.
 e.obj_type            = OBJ_THINGS;
+e.global              = false;
 e.tool                = TOOL_NORMAL;
 e.grid_step           = 128;
 e.grid_step_min       = GridMin;
@@ -221,16 +233,19 @@
 e.grid_step_locked    = 0;
 e.grid_shown          = 1;
 e.grid_snap           = 1;
-e.infobar_shown       = InfoShown;
+e.infobar_shown       = (bool) InfoShown;
+e.objinfo_shown       = true;
 e.show_object_numbers = false;
 e.show_things_squares = false;
 e.show_things_sprites = true;
 e.rulers_shown        = 0;
-e.click_obj_no        = OBJ_NO_NONE;
-e.click_obj_type      = -1;
+e.clicked.nil ();
+//e.click_obj_no        = OBJ_NO_NONE;
+//e.click_obj_type      = -1;
 e.click_ctrl          = 0;
-e.highlight_obj_no    = OBJ_NO_NONE;
-e.highlight_obj_type  = -1;
+e.highlighted.nil ();
+//e.highlight_obj_no    = OBJ_NO_NONE;
+//e.highlight_obj_type  = -1;
 e.Selected            = 0;
 e.selbox              = new selbox_c;
 e.edisplay            = new edisplay_c (&e);
@@ -247,6 +262,8 @@
 OrigX = 0;
 OrigY = 0;
 
+edit_zoom_init ();
+
 if (zoom_default == 0)
    {
    zoom_fit (e);
@@ -278,122 +295,127 @@
 {
 e.menubar->compute_menubar_coords (0, 0, ScrMaxX, ScrMaxY);
 
-e.mb_menu[MBM_FILE] = new menu_c (NULL,
-   "Save",       0, YK_F2, 0,
-   "Save as...", 5, YK_F3, 0,
-// "Print",      0, -1,    MEN_GRAY,
-   "Quit",       0, 'q',   0,
+e.mb_menu[MBM_FILE] = new Menu (NULL,
+   "~Save",       YK_F2, 0,
+   "Save ~as...", YK_F3, 0,
+// "~Print",      YK_,   MIF_SACTIVE, false, 0,
+   "~Quit",       'q',   0,
    NULL);
 
-e.mb_menu[MBM_EDIT] = new menu_c (NULL,
-   "Copy object(s)",          0, 'o',    0,
-   "Add object",              0, YK_INS, 0,
-   "Delete object(s)",        0, YK_DEL, 0,
-   "Exchange object numbers", 0, 24,     0,
-   "Preferences",             0, YK_F5,  0,
-   "Snap to grid",            0, 'y',    MEN_TICK, !! e.grid_snap,
-   "Lock grid step",          0, 'z',    MEN_TICK, !! e.grid_step_locked,
+e.mb_menu[MBM_EDIT] = new Menu (NULL,
+   "~Copy object(s)",          'o',    0,
+   "~Add object",              YK_INS, 0,
+   "~Delete object(s)",        YK_DEL, 0,
+   "~Exchange object numbers", 24,     0,
+   "~Preferences...",          YK_F5,  0,
+   "~Snap to grid",            'y',    MIF_VTICK, &e.grid_snap,		     0,
+   "~Lock grid step",          'z',    MIF_VTICK, &e.grid_step_locked,	     0,
    NULL);
 
 // If you change the order of modes here, don't forget
 // to modify the  array.
-e.mb_menu[MBM_VIEW] = new menu_c (NULL,
-   "Things",               0, 't',        MEN_TICK, e.obj_type==OBJ_THINGS,
-   "Linedefs & sidedefs",  0, 'l',        MEN_TICK, e.obj_type==OBJ_LINEDEFS,
-   "Vertices",             0, 'v',        MEN_TICK, e.obj_type==OBJ_VERTICES,
-   "Sectors",              0, 's',        MEN_TICK, e.obj_type==OBJ_SECTORS,
-   "Next mode",            0, YK_TAB,     0,
-   "Prev mode",            0, YK_BACKTAB, 0,
-   "Zoom in",              5, '+',        0,
-   "Zoom out",             5, '-',        0,
-   "Extra zoom",           6, ' ',        MEN_TICK, !! e.extra_zoom,
-   "Whole level",          0, '`',        0,
-   "Show object numbers", -1, '&',        MEN_TICK, !! e.show_object_numbers,
-   "Show sprites",        -1, '%',        MEN_TICK, !! e.show_things_sprites,
-   "Show grid",            5, 'h',        MEN_TICK, !! e.grid_shown,
-// "3D preview",           0, '3',        MEN_GRAY,
+e.mb_menu[MBM_VIEW] = new Menu (NULL,
+   "~Things",              't',        MIF_FTICK,   mode_th, (micbarg_t) &e, 0,
+   "~Linedefs & sidedefs", 'l',        MIF_FTICK,   mode_l,  (micbarg_t) &e, 0,
+   "~Vertices",            'v',        MIF_FTICK,   mode_v,  (micbarg_t) &e, 0,
+   "~Sectors",             's',        MIF_FTICK,   mode_s,  (micbarg_t) &e, 0,
+   "Global",               '\7',       MIF_VTICK,   &e.global,               0,
+   "~Next mode",           YK_TAB,     0,
+   "~Prev mode",           YK_BACKTAB, 0,
+   MI_SEPARATION,
+   "Zoom ~in",             '+',        0,
+   "Zoom ~out",            '-',        0,
+   "Extra ~zoom",          ' ',        MIF_VTICK,   &e.extra_zoom,           0,
+   "~Whole level",         '`',        0,
+   MI_SEPARATION,
+   "Show object numbers",  '&',        MIF_VTICK,   &e.show_object_numbers,  0,
+   "Show sprites",         '%',        MIF_VTICK,   &e.show_things_sprites,  0,
+   "Show ~grid",           'h',        MIF_VTICK,   &e.grid_shown,           0,
+   "Info bar",             YK_ALT+'i', MIF_VTICK,   &e.infobar_shown,        0,
+   "Object info boxes",    'i',        MIF_VTICK,   &e.objinfo_shown,        0,
+// "3D preview",           '3',        MIF_SACTIVE, false,                   0,
    NULL);
 
-e.mb_menu[MBM_SEARCH] = new menu_c (NULL,
-// "Find/change",       0, YK_F4, MEN_GRAY,
-// "Repeat last find",  0, -1,    MEN_GRAY,
-   "Next object",       0, 'n',   0,
-   "Prev object",       0, 'p',   0,
-   "Jump to object...", 0, 'j',   0,
+e.mb_menu[MBM_SEARCH] = new Menu (NULL,
+// "~Find/change",       YK_F4, MIF_SACTIVE, false, 0,
+// "~Repeat last find",  -1,    MIF_SACTIVE, false, 0,
+   "~Next object",       'n',   0,
+   "~Prev object",       'p',   0,
+   "~Jump to object...", 'j',   0,
    NULL);
 
-e.mb_menu[MBM_MISC_L] = new menu_c ("Misc. operations",
-   "Find first free tag number",		16, -1, 0,
-   "Rotate and scale linedefs",			 0, -1, 0,
-   "Split linedefs (add new vertex)",		23, -1, 0,
-   "Split linedefs and sector",			 0, -1, 0,
-   "Delete linedefs and join sectors",		 0, -1, 0,
-   "Flip linedefs",				 0, -1, 0,
-   "Swap sidedefs",				 1, -1, 0,
-   "Align textures (Y offset)",			16, -1, 0,
-   "Align textures (X offset)",			16, -1, 0,
-   "Remove 2nd sidedef (make single-sided)",	 7, -1, 0,
-   "Make rectangular nook (32x16)",		17, -1, 0,
-   "Make rectangular boss (32x16)",		17, -1, 0,
-   "Set length (move 1st vertex)...",		 4, -1, 0,
-   "Set length (move 2nd vertex)...",		-1, -1, 0,
-   "Unlink 1st sidedef",			 0, -1, 0,
-   "Unlink 2nd sidedef",			-1, -1, 0,
-   "Mirror horizontally",			 0, -1, 0,
-   "Mirror vertically",				 0, -1, 0,
+e.mb_menu[MBM_MISC_L] = new Menu ("Misc. operations",
+   "Find first free ~tag number",		YK_, 0,
+   "~Rotate and scale linedefs...",		YK_, 0,
+   "Split linedefs (add new ~vertex)",		YK_, 0,
+   "~Split linedefs and sector",		YK_, 0,
+   "~Delete linedefs and join sectors",		YK_, 0,
+   "~Flip linedefs",				YK_, 0,
+   "S~wap sidedefs",				YK_, 0,
+   "Align textures (~Y offset)",		YK_, 0,
+   "Align textures (~X offset)...",		YK_, 0,
+   "Remove ~2nd sidedef (make single-sided)",	YK_, 0,
+   "Make rectangular ~nook (32x16)",		YK_, 0,
+   "Make rectangular ~boss (32x16)",		YK_, 0,
+   "Set ~length (move 1st vertex)...",		YK_, 0,
+   "Set length (move 2nd vertex)...",		YK_, 0,
+   "~Unlink 1st sidedef",			YK_, 0,
+   "Unlink 2nd sidedef",			YK_, 0,
+   "~Mirror horizontally",			YK_, 0,
+   "Mirror v~ertically",			YK_, 0,
+   "~Cut a slice out of a sector",		YK_, 0,
    NULL);
 
-e.mb_menu[MBM_MISC_S] = new menu_c ("Misc. operations",
-   "Find first free tag number",	16, -1, 0,
-   "Rotate and scale sectors",		 0, -1, 0,
-   "Make door from sector",		 5, -1, 0,
-   "Make lift from sector",		 5, -1, 0,
-   "Distribute sector floor heights",	18, -1, 0,
-   "Distribute sector ceiling heights",	18, -1, 0,
-   "Raise or lower sectors...",		 9, -1, 0,
-   "Brighten or darken sectors...",	 0, -1, 0,
-   "Unlink room",			 0, -1, 0,
-   "Mirror horizontally",		 0, -1, 0,
-   "Mirror vertically",			 0, -1, 0,
-   "Swap flats",			 0, -1, 0,
+e.mb_menu[MBM_MISC_S] = new Menu ("Misc. operations",
+   "Find first free ~tag number",	YK_, 0,
+   "~Rotate and scale sectors...",	YK_, 0,
+   "Make ~door from sector",		YK_, 0,
+   "Make ~lift from sector",		YK_, 0,
+   "Distribute sector ~floor heights",	YK_, 0,
+   "Distribute sector ~ceiling heights",YK_, 0,
+   "R~aise or lower sectors...",	YK_, 0,
+   "~Brighten or darken sectors...",	YK_, 0,
+   "~Unlink room",			YK_, 0,
+   "~Mirror horizontally",		YK_, 0,
+   "Mirror ~vertically",		YK_, 0,
+   "~Swap flats",			YK_, 0,
    NULL);
 
-e.mb_menu[MBM_MISC_T] = new menu_c ("Misc. operations",
-   "Find first free tag number",	16,  -1, 0,
-   "Rotate and scale things",		 0,  -1, 0,
-   "Spin things 45 clockwise",		 0, 'x', 0,
-   "Spin things 45 counter-clockwise",	16, 'w', 0,
-   "Mirror horizontally",		 0,  -1, 0,
-   "Mirror vertically",			 0,  -1, 0,
+e.mb_menu[MBM_MISC_T] = new Menu ("Misc. operations",
+   "Find first free ~tag number",	 YK_, 0,
+   "~Rotate and scale things...",	 YK_, 0,
+   "~Spin things 45 clockwise",	 'x', 0,
+   "Spin things 45 ~counter-clockwise", 'w', 0,
+   "~Mirror horizontally",		 YK_, 0,
+   "Mirror ~vertically",		 YK_, 0,
    NULL);
 
-e.mb_menu[MBM_MISC_V] = new menu_c ("Misc. operations",
-   "Find first free tag number",	16, -1, 0,
-   "Rotate and scale vertices",		 0, -1, 0,
-   "Delete vertex and join linedefs",	 0, -1, 0,
-   "Merge several vertices into one",	 0, -1, 0,
-   "Add a linedef and split sector",	18, -1, 0,
-   "Mirror horizontally",		 0, -1, 0,
-   "Mirror vertically",			 0, -1, 0,
+e.mb_menu[MBM_MISC_V] = new Menu ("Misc. operations",
+   "Find first free ~tag number",	YK_, 0,
+   "~Rotate and scale vertices...",	YK_, 0,
+   "~Delete vertex and join linedefs",	YK_, 0,
+   "~Merge several vertices into one",	YK_, 0,
+   "Add a linedef and ~split sector",	YK_, 0,
+   "Mirror ~horizontally",		YK_, 0,
+   "Mirror ~vertically",		YK_, 0,
    NULL);
 
-e.mb_menu[MBM_OBJECTS] = new menu_c ("Insert a pre-defined object",
-   "Rectangle",         0, -1, 0,
-   "Polygon (N sides)", 0, -1, 0,
+e.mb_menu[MBM_OBJECTS] = new Menu ("Insert a pre-defined object",
+   "~Rectangle...",         YK_, 0,
+   "~Polygon (N sides)...", YK_, 0,
    NULL);
 
-e.mb_menu[MBM_CHECK] = new menu_c ("Check level consistency",
-   "Number of objects",			 0, -1, 0,
-   "Check if all sectors are closed",	13, -1, 0,
-   "Check all cross-references",	10, -1, 0,
-   "Check for missing textures",	10, -1, 0,
-   "Check texture names",		 6, -1, 0,
+e.mb_menu[MBM_CHECK] = new Menu ("Check level consistency",
+   "~Number of objects",		YK_, 0,
+   "Check if all ~sectors are closed",	YK_, 0,
+   "Check all ~cross-references",	YK_, 0,
+   "Check for ~missing textures",	YK_, 0,
+   "Check ~texture names",		YK_, 0,
    NULL);
 
-e.mb_menu[MBM_HELP] = new menu_c (NULL,
-   "Keyboard & mouse...", 0, YK_F1, 0,
-   "Info bar",            0, 'i',   MEN_TICK, e.infobar_shown,
-   "About Yadex...",      0, YK_ALT + 'a', 0,
+e.mb_menu[MBM_HELP] = new Menu (NULL,
+   "~Keyboard & mouse...", YK_F1,        0,
+   "~About Yadex...",      YK_ALT + 'a', 0,
    NULL);
 
 e.mb_ino[MBI_FILE] =
@@ -418,42 +440,42 @@
 
 // FIXME this should come from the .ygd
 // instead of being hard-coded.
-menu_c *menu_linedef_flags = new menu_c (NULL,
-   "Impassable",		0, -1, 0,
-   "Monsters cannot cross",	0, -1, 0,
-   "Double-sided",		0, -1, 0,
-   "Upper texture unpegged",	0, -1, 0,
-   "Lower texture unpegged",	0, -1, 0,
-   "Secret (shown as normal)",	0, -1, 0,
-   "Blocks sound",		0, -1, 0,
-   "Never shown on the map",	0, -1, 0,
-   "Always shown on the map",	0, -1, 0,
-   "Pass through [Boom]",	0, -1, 0,  // Boom extension
-   "b10 0400h",			2, -1, 0,  // Undefined
-   "b11 0800h",			2, -1, 0,  // Undefined
-   "Translucent [Strife]",	0, -1, 0,  // Strife
-   "b13 2000h",			2, -1, 0,  // Undefined
-   "b14 4000h",			2, -1, 0,  // Undefined
-   "b15 8000h",			2, -1, 0,  // Undefined
+Menu *menu_linedef_flags = new Menu (NULL,
+   "~Impassable",		YK_, 0,
+   "~Monsters cannot cross",	YK_, 0,
+   "~Double-sided",		YK_, 0,
+   "~Upper texture unpegged",	YK_, 0,
+   "~Lower texture unpegged",	YK_, 0,
+   "~Secret (shown as normal)",	YK_, 0,
+   "~Blocks sound",		YK_, 0,
+   "~Never shown on the map",	YK_, 0,
+   "~Always shown on the map",	YK_, 0,
+   "~Pass through [Boom]",	YK_, 0,  // Boom extension
+   "b1~0 0400h",		YK_, 0,  // Undefined
+   "b1~1 0800h",		YK_, 0,  // Undefined
+   "~Translucent [Strife]",	YK_, 0,  // Strife
+   "b1~3 2000h",		YK_, 0,  // Undefined
+   "b1~4 4000h",		YK_, 0,  // Undefined
+   "b1~5 8000h",		YK_, 0,  // Undefined
    NULL);
 
-menu_c *menu_thing_flags = new menu_c (NULL,
-   "Easy",			0, -1, 0,
-   "Medium",			4, -1, 0,
-   "Hard",			0, -1, 0,
-   "Deaf",			0, -1, 0,
-   "Multiplayer",		0, -1, 0,
-   "Not in DM [Boom]",		0, -1, 0,  // Boom extension
-   "Not in coop [Boom]", 	7, -1, 0,  // Boom extension
-   "Friendly [MBF]",		1, -1, 0,  // MBF extension
-   "b8  0100h",			1, -1, 0,  // Undefined
-   "b9  0200h",			1, -1, 0,  // Undefined
-   "b10 0400h",			2, -1, 0,  // Undefined
-   "b11 0800h",			2, -1, 0,  // Undefined
-   "b12 1000h",			2, -1, 0,  // Undefined
-   "b13 2000h",			2, -1, 0,  // Undefined
-   "b14 4000h",			2, -1, 0,  // Undefined
-   "b15 8000h",			2, -1, 0,  // Undefined
+Menu *menu_thing_flags = new Menu (NULL,
+   "~Easy",			YK_, 0,
+   "Medi~um",			YK_, 0,
+   "~Hard",			YK_, 0,
+   "~Deaf",			YK_, 0,
+   "~Multiplayer",		YK_, 0,
+   "~Not in DM [Boom]",		YK_, 0,  // Boom extension
+   "Not in ~coop [Boom]", 	YK_, 0,  // Boom extension
+   "F~riendly [MBF]",		YK_, 0,  // MBF extension
+   "b~8  0100h",		YK_, 0,  // Undefined
+   "b~9  0200h",		YK_, 0,  // Undefined
+   "b1~0 0400h",		YK_, 0,  // Undefined
+   "b1~1 0800h",		YK_, 0,  // Undefined
+   "b1~2 1000h",		YK_, 0,  // Undefined
+   "b1~3 2000h",		YK_, 0,  // Undefined
+   "b1~4 4000h",		YK_, 0,  // Undefined
+   "b1~5 8000h",		YK_, 0,  // Undefined
    NULL);
 
 /* AYM 1998-06-22
@@ -481,10 +503,10 @@
    if (! has_event () && ! has_input_event ())
       {
 #endif
-      if (is_obj (e.highlight_obj_no))				// FIXME
-	 e.edisplay->highlight_object (e.highlight_obj_no);	// Should
-      else							// be in
-	 e.edisplay->forget_highlight ();			// edisplay_c !
+      if (e.highlighted ())				// FIXME
+	 e.edisplay->highlight_object (e.highlighted);	// Should
+      else						// be in
+	 e.edisplay->forget_highlight ();		// edisplay_c !
 
    if (is.in_window)
       e.spot->set (edit_mapx_snapped (&e, e.pointer_x),
@@ -521,7 +543,8 @@
 
       e.pointer_x = MAPX (is.x);
       e.pointer_y = MAPY (is.y);
-      object = GetCurObject (e.obj_type, e.pointer_x, e.pointer_y, 20);
+      obj_type_t t = e.global ? OBJ_ANY : e.obj_type;
+      GetCurObject (object, t, e.pointer_x, e.pointer_y);
       }
 
    /*
@@ -537,7 +560,7 @@
    if (e.menubar->pulled_down () >= 0)
       {
       int menu_no = e.menubar->pulled_down ();
-      menu_c *menu = e.menubar->get_menu (menu_no);
+      Menu *menu = e.menubar->get_menu (menu_no);
       int r = menu->process_event (&is);
 
       if (r == MEN_CANCEL)
@@ -568,13 +591,13 @@
 	       MiscOperations (e.obj_type, &e.Selected, r + 1);
 	    else
 	       {
-	       if (is_obj (e.highlight_obj_no))
-		  SelectObject (&e.Selected, e.highlight_obj_no);
+	       if (e.highlighted ())
+		  SelectObject (&e.Selected, e.highlighted.num);
 	       MiscOperations (e.obj_type, &e.Selected, r + 1);
-	       if (is_obj (e.highlight_obj_no))
-		  UnSelectObject (&e.Selected, e.highlight_obj_no);
+	       if (e.highlighted ())
+		  UnSelectObject (&e.Selected, e.highlighted.num);
 	       }
-	    e.highlight_obj_no = OBJ_NO_NONE;
+	    e.highlighted.nil ();
 	    DragObject = false;
 	    StretchSelBox = false;
 	    RedrawMap = 1;
@@ -590,7 +613,7 @@
 	       e.obj_type = OBJ_LINEDEFS;
 	       for (int i = savednum; i < NumLineDefs; i++)
 		  SelectObject (&e.Selected, i);
-	       e.highlight_obj_no = OBJ_NO_NONE;
+	       e.highlighted.nil ();
 	       DragObject = false;
 	       StretchSelBox = false;
 	       }
@@ -653,13 +676,13 @@
 	    MiscOperations (e.obj_type, &e.Selected, r + 1);
 	 else
 	    {
-	    if (is_obj (e.highlight_obj_no))
-	       SelectObject (&e.Selected, e.highlight_obj_no);
+	    if (e.highlighted ())
+	       SelectObject (&e.Selected, e.highlighted.num);
 	    MiscOperations (e.obj_type, &e.Selected, r + 1);
-	    if (is_obj (e.highlight_obj_no))
-	       UnSelectObject (&e.Selected, e.highlight_obj_no);
+	    if (e.highlighted ())
+	       UnSelectObject (&e.Selected, e.highlighted.num);
 	    }
-	 e.highlight_obj_no = OBJ_NO_NONE;
+	 e.highlighted.nil ();
 	 DragObject = false;
 	 StretchSelBox = false;
 	 goto done2;
@@ -705,7 +728,7 @@
 	    e.obj_type = OBJ_LINEDEFS;
 	    for (int i = savednum; i < NumLineDefs; i++)
 	       SelectObject (&e.Selected, i);
-	    e.highlight_obj_no = OBJ_NO_NONE;
+	    e.highlighted.nil ();
 	    DragObject = false;
 	    StretchSelBox = false;
 	    }
@@ -754,9 +777,9 @@
             fatal_error ("modal=%02X", e.modal);
          if (! e.Selected)
             {
-            SelectObject (&e.Selected, e.highlight_obj_no);
+            SelectObject (&e.Selected, e.highlighted.num);
             frob_linedefs_flags (e.Selected, op, r);
-            UnSelectObject (&e.Selected, e.highlight_obj_no);
+            UnSelectObject (&e.Selected, e.highlighted.num);
             }
          else
             {
@@ -807,9 +830,9 @@
             fatal_error ("modal=%02X", e.modal);
          if (! e.Selected)
             {
-            SelectObject (&e.Selected, e.highlight_obj_no);
+            SelectObject (&e.Selected, e.highlighted.num);
             frob_things_flags (e.Selected, op, r);
-            UnSelectObject (&e.Selected, e.highlight_obj_no);
+            UnSelectObject (&e.Selected, e.highlighted.num);
             }
          else
             {
@@ -859,7 +882,7 @@
       {
       int itemno;
 
-      e.click_obj_no = OBJ_NO_NONE;
+      e.clicked.nil ();
       itemno = e.menubar->is_on_menubar_item (is.x, is.y);
       if (itemno >= 0)
          e.menubar->pull_down (itemno);
@@ -872,11 +895,11 @@
       Unless [Ctrl] is pressed, it also clears the current selection. */
    else if (is.key == YE_BUTL_PRESS
 	 && e.tool == TOOL_NORMAL
-	 && ! is_obj (object))
+	 && object.is_nil ())
       {
       e.menubar->highlight (-1);  // Close any open menu
-      e.click_obj_no = OBJ_NO_CANVAS;
-      e.click_ctrl   = is.ctrl;
+      e.clicked    = CANVAS;
+      e.click_ctrl = is.ctrl;
       if (! is.ctrl)
          {
          ForgetSelection (&e.Selected);
@@ -892,24 +915,23 @@
       the user is about to drag it. */
    else if (is.key == YE_BUTL_PRESS && ! is.ctrl
 	 && e.tool == TOOL_NORMAL
-	 && ! IsSelected (e.Selected, object))
+	 && ! IsSelected (e.Selected, object.num))
       {
       e.menubar->highlight (-1);  // Close any open menu
-      e.click_obj_no   = object;
-      e.click_obj_type = e.obj_type;
+      e.clicked        = object;
       e.click_ctrl     = 0;
       e.click_time     = is.time;
       ForgetSelection (&e.Selected);
-      SelectObject (&e.Selected, object);
+      SelectObject (&e.Selected, object.num);
       /* I don't like having to do that */
-      if (e.obj_type == OBJ_THINGS && is_obj (object))
-	 MoveObjectsToCoords (e.obj_type, 0,
-            Things[object].xpos, Things[object].ypos, 0);
-      else if (e.obj_type == OBJ_VERTICES && is_obj (object))
-	 MoveObjectsToCoords (e.obj_type, 0,
-            Vertices[object].x, Vertices[object].y, 0);
+      if (object.type == OBJ_THINGS && object ())
+	 MoveObjectsToCoords (object.type, 0,
+            Things[object.num].xpos, Things[object.num].ypos, 0);
+      else if (object.type == OBJ_VERTICES && object ())
+	 MoveObjectsToCoords (object.type, 0,
+            Vertices[object.num].x, Vertices[object.num].y, 0);
       else
-	 MoveObjectsToCoords (e.obj_type, 0,
+	 MoveObjectsToCoords (object.type, 0,
             e.pointer_x, e.pointer_y, e.grid_snap ? e.grid_step : 0);
       RedrawMap = 1;
       }
@@ -917,14 +939,13 @@
    /* Second click of a double click on an object */
    else if (is.key == YE_BUTL_PRESS && ! is.ctrl
 	 && e.tool == TOOL_NORMAL
-	 && IsSelected (e.Selected, object)
-	 && object == e.click_obj_no
-	 && e.obj_type == e.click_obj_type
+	 && IsSelected (e.Selected, object.num)
+	 && object  == e.clicked
 	 && is.time - e.click_time <= (unsigned long) double_click_timeout)
       {
       // Very important! If you don't do that, the release of the
       // click that closed the properties menu will drag the object.
-      e.click_obj_no = OBJ_NO_NONE;
+      e.clicked.nil ();
       send_event (YK_RETURN);
       goto done;
       }
@@ -933,22 +954,21 @@
       the user might want to drag the selection. */
    else if (is.key == YE_BUTL_PRESS && ! is.ctrl
 	 && e.tool == TOOL_NORMAL
-	 && IsSelected (e.Selected, object))
+	 && IsSelected (e.Selected, object.num))
       {
       e.menubar->highlight (-1);  // Close any open menu
-      e.click_obj_no   = object;
-      e.click_obj_type = e.obj_type;
+      e.clicked        = object;
       e.click_ctrl     = 0;
       e.click_time     = is.time;
       /* I don't like having to do that */
-      if (e.obj_type == OBJ_THINGS && is_obj (object))
-	 MoveObjectsToCoords (e.obj_type, 0,
-            Things[object].xpos, Things[object].ypos, 0);
-      else if (e.obj_type == OBJ_VERTICES && is_obj (object))
-	 MoveObjectsToCoords (e.obj_type, 0,
-            Vertices[object].x, Vertices[object].y, 0);
+      if (object.type == OBJ_THINGS && object ())
+	 MoveObjectsToCoords (object.type, 0,
+            Things[object.num].xpos, Things[object.num].ypos, 0);
+      else if (object.type == OBJ_VERTICES && object ())
+	 MoveObjectsToCoords (object.type, 0,
+            Vertices[object.num].x, Vertices[object.num].y, 0);
       else
-	 MoveObjectsToCoords (e.obj_type, 0,
+	 MoveObjectsToCoords (object.type, 0,
             e.pointer_x, e.pointer_y, e.grid_snap ? e.grid_step : 0);
       }
 
@@ -956,16 +976,15 @@
       Clicking on unselected object with [Ctrl] pressed selects it. */
    else if (is.key == YE_BUTL_PRESS && is.ctrl
 	 && e.tool == TOOL_NORMAL
-	 && is_obj (object))
+	 && object ())
       {
       e.menubar->highlight (-1);  // Close any open menu
-      e.click_obj_no   = object;
-      e.click_obj_type = e.obj_type;
+      e.clicked        = object;
       e.click_ctrl     = 1;
-      if (IsSelected (e.Selected, object))
-	UnSelectObject (&e.Selected, object);
+      if (IsSelected (e.Selected, object.num))
+	UnSelectObject (&e.Selected, object.num);
       else
-	SelectObject (&e.Selected, object);
+	SelectObject (&e.Selected, object.num);
       RedrawMap = 1;
       }
 
@@ -973,13 +992,13 @@
    else if (is.key == YE_BUTL_PRESS
 	    && e.tool == TOOL_SNAP_VERTEX
 	    && e.obj_type == OBJ_VERTICES
-	    && is_obj (object)
+	    && object ()
 	    // Can't delete vertex that is referenced by the selection
-	    && ! IsSelected (e.Selected, object))
+	    && ! IsSelected (e.Selected, object.num))
       {
-      printf ("SNAP %d\n", (int) object);
+      printf ("SNAP %d\n", (int) object.num);
       SelPtr list = 0;
-      SelectObject (&list, object);
+      SelectObject (&list, object.num);
       DeleteVerticesJoinLineDefs (list);
       ForgetSelection (&list);
       RedrawMap = 1;
@@ -994,7 +1013,7 @@
    // FIXME : should call this automatically when switching tool
    else if (is.key == YE_BUTL_RELEASE
 	 && e.tool == TOOL_NORMAL
-	 && e.click_obj_no == OBJ_NO_CANVAS)
+	 && e.clicked == CANVAS)
       {
       int x1, y1, x2, y2;
       e.selbox->get_corners (&x1, &y1, &x2, &y2);
@@ -1007,7 +1026,7 @@
    // FIXME : should call this automatically when switching tool
    else if (is.key == YE_BUTL_RELEASE
 	 && e.tool == TOOL_NORMAL
-	 && is_obj (e.click_obj_no))
+	 && e.clicked ())
       {
       if (AutoMergeVertices (&e.Selected, e.obj_type, 'm'))
          RedrawMap = 1;
@@ -1019,7 +1038,7 @@
    else if (is.key == YE_MOTION
       && e.tool == TOOL_NORMAL
       && is.butl
-      && e.click_obj_no == OBJ_NO_NONE)
+      && ! e.clicked () && ! (e.clicked == CANVAS))
       {
       int itemno = e.menubar->is_on_menubar_item (is.x, is.y);
       if (itemno >= 0)
@@ -1032,7 +1051,7 @@
       corner of the selection box. */
    else if ((is.key == YE_MOTION || motion)
       && e.tool == TOOL_NORMAL
-      && is.butl && e.click_obj_no == OBJ_NO_CANVAS)
+      && is.butl && e.clicked == CANVAS)
       {
       e.selbox->set_2nd_corner (e.pointer_x, e.pointer_y);
       }
@@ -1044,19 +1063,19 @@
    else if ((is.key == YE_MOTION || motion)
       && e.tool == TOOL_NORMAL
       && is.butl
-      && is_obj (e.click_obj_no)
+      && e.clicked ()
       && ! e.click_ctrl)
       {
       if (! e.Selected)
 	 {
-	 SelectObject (&e.Selected, e.click_obj_no);
-	 if (MoveObjectsToCoords (e.obj_type, e.Selected,
+	 SelectObject (&e.Selected, e.clicked.num);
+	 if (MoveObjectsToCoords (e.clicked.type, e.Selected,
             e.pointer_x, e.pointer_y, e.grid_snap ? e.grid_step : 0))
 	    RedrawMap = 1;
 	 ForgetSelection (&e.Selected);
 	 }
       else
-	 if (MoveObjectsToCoords (e.obj_type, e.Selected,
+	 if (MoveObjectsToCoords (e.clicked.type, e.Selected,
             e.pointer_x, e.pointer_y, e.grid_snap ? e.grid_step : 0))
 	    RedrawMap = 1;
       }
@@ -1065,8 +1084,7 @@
    if (is.in_window && ! is.butl && ! is.shift)
       {
       /* Check if there is something near the pointer */
-      e.highlight_obj_no   = object;
-      e.highlight_obj_type = e.obj_type;
+      e.highlighted = object;
       }
 
    /*
@@ -1206,6 +1224,9 @@
 	 if (! outfile)
 	    goto cancel_save;
 	 SaveLevelData (outfile, newlevelname);
+	 levelname = newlevelname;
+	 // Sigh. Shouldn't have to do that. Level must die !
+	 Level = FindMasterDir (MasterDir, levelname);
 cancel_save:
 	 RedrawMap = 1;
          }
@@ -1229,23 +1250,26 @@
 	    // Horrible indeed -- AYM 1999-07-30
 	    newLevel = FindMasterDir (MasterDir, newlevelname);
 	    if (! newLevel)
-	       nf_bug ("newLevel is NULL");
-	    oldl = Level;
-	    newl = newLevel;
-	    for (int m = 0; m < 11; m++)
+	       nf_bug ("newLevel is NULL");  // Debatable ! -- AYM 2001-05-29
+	    if (Level)  // If new level ("create" command), Level is NULL
 	       {
-	       newl->wadfile = oldl->wadfile;
-	       if (m > 0)
-		  newl->dir = oldl->dir;
-	       /*
-	       if (!fncmp (outfile, oldl->wadfile->filename))
+	       oldl = Level;
+	       newl = newLevel;
+	       for (int m = 0; m < 11; m++)
 		  {
-		  oldl->wadfile = WadFileList;
-		  oldl->dir = lost...
+		  newl->wadfile = oldl->wadfile;
+		  if (m > 0)
+		     newl->dir = oldl->dir;
+		  /*
+		  if (!fncmp (outfile, oldl->wadfile->filename))
+		     {
+		     oldl->wadfile = WadFileList;
+		     oldl->dir = lost...
+		     }
+		  */
+		  oldl = oldl->next;
+		  newl = newl->next;
 		  }
-	       */
-	       oldl = oldl->next;
-	       newl = newl->next;
 	       }
 	    Level = newLevel;
 	    }
@@ -1269,7 +1293,7 @@
       // [a]: pop up the "Set flag" menu
       else if (is.key == 'a'
          && e.menubar->highlighted () < 0
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
          {
          e.modal = 's';  // Set
          if (e.obj_type == OBJ_LINEDEFS)
@@ -1287,7 +1311,7 @@
       // [b]: pop up the "Toggle flag" menu
       else if (is.key == 'b'
          && e.menubar->highlighted () < 0
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
          {
          e.modal = 't';  // Toggle
          if (e.obj_type == OBJ_LINEDEFS)
@@ -1305,7 +1329,7 @@
       // [c]: pop up the "Clear flag" menu
       else if (is.key == 'c'
          && e.menubar->highlighted () < 0
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
          {
          e.modal = 'c';  // Clear;
          if (e.obj_type == OBJ_LINEDEFS)
@@ -1342,15 +1366,20 @@
 	 RedrawMap = 1;
          }
 
-      // [i]: show/hide the info bar
-      else if (is.key == 'i')
+      // [Alt][i]: show/hide the info bar
+      else if (is.key == YK_ALT + 'i')
          {
 	 e.infobar_shown = !e.infobar_shown;
-         // In the "Help" menu tick/untick the "Info bar" item.
-         e.mb_menu[MBM_HELP]->set_ticked (1, e.infobar_shown);
 	 RedrawMap = 1;
          }
 
+      // [i]: show/hide the object info boxes
+      else if (is.key == 'i')
+         {
+	 e.objinfo_shown = !e.objinfo_shown;
+	 RedrawMap = 1;
+	 }
+
       // [+], [=], wheel: zooming in
       else if (is.key == '+' || is.key == '=' || is.key == YE_WHEEL_UP)
          {
@@ -1367,10 +1396,10 @@
 	   RedrawMap = 1;
          }
 
-      // [0], [1], ... [9]: set the zoom factor
+      // [1] - [9], [0]: set the zoom factor
       else if (is.key >= '0' && is.key <= '9')
          {
-         int r = edit_set_zoom (&e, is.key == '0' ? 0.1 : 1.0 / dectoi(is.key));
+         int r = edit_set_zoom (&e, digit_zoom_factors[dectoi(is.key)]);
 	 if (r == 0)
 	   RedrawMap = 1;
          }
@@ -1494,8 +1523,6 @@
          {
          e.extra_zoom = ! e.extra_zoom;
          edit_set_zoom (&e, Scale * (e.extra_zoom ? 4 : 0.25));
-         // In the "View" menu, tick/untick the "Extra zoom" item
-         e.mb_menu[MBM_VIEW]->set_ticked (8, e.extra_zoom);
          RedrawMap = 1;
          }
 
@@ -1535,11 +1562,6 @@
          // Set the object type according to the new mode.
          e.obj_type = modes[new_mode].obj_type;
 
-         // In the "View" menu, untick the old mode
-         // and tick the new mode.
-         e.mb_menu[MBM_VIEW]->set_ticked (modes[old_mode].item_no, 0);
-         e.mb_menu[MBM_VIEW]->set_ticked (modes[new_mode].item_no, 1);
-
          // Change the flavour of the "Misc" menu.
          e.menubar->set_menu (e.mb_ino[MBI_MISC],
             e.mb_menu[modes[new_mode].menu_no]);
@@ -1626,52 +1648,77 @@
 	    else
 	       ForgetSelection (&e.Selected);
 	    }
-	 if (GetMaxObjectNum (e.obj_type) >= 0 && Select0)
-	    e.highlight_obj_no = 0;
+	 if (GetMaxObjectNum (e.obj_type) >= 0 && Select0 && ! e.global)
+	 {
+	    e.highlighted.type = e.obj_type;
+	    e.highlighted.num  = 0;
+	 }
 	 else
-	    e.highlight_obj_no = OBJ_NO_NONE;
-         e.highlight_obj_type = e.obj_type;
+	    e.highlighted.nil ();
 
 	 DragObject = false;
 	 StretchSelBox = false;
 	 RedrawMap = 1;
 	 }
 
+      // [Ctrl][g]: toggle global mode
+      else if (is.key == '\7')
+	 {
+	 static bool dont_warn = false;
+	 bool        ok        = false;
+	 if (e.global)
+	    ok = true;  // No confirmation needed to switch off
+	 else if (dont_warn)
+	    ok = true;
+	 else
+	    {
+	    ok = Confirm (-1, -1,
+			  "Global mode is experimental and probably highly",
+			  "unstable. This means crashes. Are you sure ?");
+	    RedrawMap = 1;
+	    if (ok)
+	       {
+	       dont_warn = true;  // User is sure. Won't ask again
+	       Notify (-1, -1,
+		   "Selection does not work in global mode. Don't",
+		   "bother reporting it, I'm aware of it already.");
+	       }
+	    }
+	 if (ok)
+	    {
+	    ForgetSelection (&e.Selected);
+	    e.global = ! e.global;
+	    RedrawMap = 1;
+	    }
+	 }
+
       // [e]: Select/unselect all linedefs in non-forked path
-      else if (is.key == 'e'
-	  && e.highlight_obj_type == OBJ_LINEDEFS
-	  && e.highlight_obj_no != OBJ_NO_NONE)
+      else if (is.key == 'e' && e.highlighted._is_linedef ())
 	 {
 	 ForgetSelection (&e.Selected);
-	 select_linedefs_path (&e.Selected, e.highlight_obj_no, YS_ADD);
+	 select_linedefs_path (&e.Selected, e.highlighted.num, YS_ADD);
 	 RedrawMap = 1;
 	 }
 
       // [Ctrl][e] Select/unselect all linedefs in path
-      else if (is.key == '\5' && ! is.shift
-	  && e.highlight_obj_type == OBJ_LINEDEFS
-	  && e.highlight_obj_no != OBJ_NO_NONE)
+      else if (is.key == '\5' && ! is.shift && e.highlighted._is_linedef ())
 	 {
-	 select_linedefs_path (&e.Selected, e.highlight_obj_no, YS_TOGGLE);
+	 select_linedefs_path (&e.Selected, e.highlighted.num, YS_TOGGLE);
 	 RedrawMap = 1;
 	 }
 
       // [E]: Select/unselect all 1s linedefs in path
-      else if (is.key == 'E'
-	  && e.highlight_obj_type == OBJ_LINEDEFS
-	  && e.highlight_obj_no != OBJ_NO_NONE)
+      else if (is.key == 'E' && e.highlighted._is_linedef ())
 	 {
 	 ForgetSelection (&e.Selected);
-	 select_1s_linedefs_path (&e.Selected, e.highlight_obj_no, YS_ADD);
+	 select_1s_linedefs_path (&e.Selected, e.highlighted.num, YS_ADD);
 	 RedrawMap = 1;
 	 }
 
       // [Ctrl][Shift][e]: Select/unselect all 1s linedefs in path
-      else if (is.key == '\5' && is.shift
-	  && e.highlight_obj_type == OBJ_LINEDEFS
-	  && e.highlight_obj_no != OBJ_NO_NONE)
+      else if (is.key == '\5' && is.shift && e.highlighted._is_linedef ())
 	 {
-	 select_1s_linedefs_path (&e.Selected, e.highlight_obj_no, YS_TOGGLE);
+	 select_1s_linedefs_path (&e.Selected, e.highlighted.num, YS_TOGGLE);
 	 RedrawMap = 1;
 	 }
 
@@ -1699,7 +1746,6 @@
       else if (is.key == 'h')
 	 {
 	 e.grid_shown = ! e.grid_shown;
-         e.mb_menu[MBM_VIEW]->set_ticked (11, e.grid_shown);
 	 RedrawMap = 1;
 	 }
 
@@ -1714,14 +1760,12 @@
       else if (is.key == 'y')
          {
          e.grid_snap = ! e.grid_snap;
-         e.mb_menu[MBM_EDIT]->set_ticked (5, e.grid_snap);
          }
 
       // [z]: toggle the lock_grip_step flag
       else if (is.key == 'z')
          {
          e.grid_step_locked = ! e.grid_step_locked;
-         e.mb_menu[MBM_EDIT]->set_ticked (6, e.grid_step_locked);
          }
  
       // [r]: toggle the rulers
@@ -1729,40 +1773,64 @@
 	 e.rulers_shown = !e.rulers_shown;
 
       // [n], [>]: highlight the next object
-      else if (is.key == 'n' || is.key == '>')
+      else if ((is.key == 'n' || is.key == '>')
+	 && (! e.global || e.highlighted ()))
 	 {
-	 obj_no_t nmax = GetMaxObjectNum (e.obj_type);
+	 obj_type_t t = e.highlighted () ? e.highlighted.type : e.obj_type;
+	 obj_no_t nmax = GetMaxObjectNum (t);
 	 if (is_obj (nmax))
 	    {
-	    e.highlight_obj_no++;
-	    if (e.highlight_obj_no > nmax)
-	       e.highlight_obj_no = 0;
-	    GoToObject (e.obj_type, e.highlight_obj_no);
+	    if (e.highlighted.is_nil ())
+	       {
+	       e.highlighted.type = t;
+	       e.highlighted.num = 0;
+	       }
+	    else
+	       {
+	       e.highlighted.num++;
+	       if (e.highlighted.num > nmax)
+		  e.highlighted.num = 0;
+	       }
+	    GoToObject (e.highlighted);
 	    RedrawMap = 1;
 	    }
 	 }
 
       // [p], [<]: highlight the previous object
-      else if (is.key == 'p' || is.key == '<')
+      else if ((is.key == 'p' || is.key == '<')
+	 && (! e.global || e.highlighted ()))
 	 {
-	 obj_no_t nmax = GetMaxObjectNum (e.obj_type);
+	 obj_type_t t = e.highlighted () ? e.highlighted.type : e.obj_type;
+	 obj_no_t nmax = GetMaxObjectNum (t);
 	 if (is_obj (nmax))
 	    {
-	    e.highlight_obj_no--;
-	    if (e.highlight_obj_no < 0)
-	       e.highlight_obj_no = nmax;
-	    GoToObject (e.obj_type, e.highlight_obj_no);
+	    if (e.highlighted.is_nil ())
+	       {
+	       e.highlighted.type = t;
+	       e.highlighted.num = nmax;
+	       }
+	    else
+	       {
+	       e.highlighted.num--;
+	       if (e.highlighted.num < 0)
+		  e.highlighted.num = nmax;
+	       }
+	    GoToObject (e.highlighted);
 	    RedrawMap = 1;
 	    }
 	 }
 
       // [j], [#]: jump to object by number
-      else if (is.key == 'j' || is.key == '#')
+      else if ((is.key == 'j' || is.key == '#')
+	 && (! e.global || e.highlighted ()))
 	 {
-	 e.highlight_obj_no = InputObjectNumber (-1, -1, e.obj_type,
-                                                 e.highlight_obj_no);
-	 if (is_obj (e.highlight_obj_no))
-	    GoToObject (e.obj_type, e.highlight_obj_no);
+	 Objid default_obj;
+	 default_obj.type = e.highlighted () ? e.highlighted.type : e.obj_type;
+	 default_obj.num  = e.highlighted () ? e.highlighted.num  : 0;
+	 Objid target_obj;
+	 input_objid (target_obj, default_obj, -1, -1);
+	 if (target_obj ())
+	    GoToObject (target_obj);
 	 RedrawMap = 1;
 	 }
 
@@ -1779,13 +1847,13 @@
 
       // [o]: copy a group of objects
       else if (is.key == 'o'
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
 	 {
          int x, y;
 
 	 /* copy the object(s) */
 	 if (! e.Selected)
-	    SelectObject (&e.Selected, e.highlight_obj_no);
+	    SelectObject (&e.Selected, e.highlighted.num);
 	 CopyObjects (e.obj_type, e.Selected);
 	 /* enter drag mode */
 	 //DragObject = true;
@@ -1793,8 +1861,8 @@
 	 //e.highlight_obj_no = e.Selected->objnum;
 
          // Find the "hotspot" in the object(s)
-         if (is_obj (e.highlight_obj_no) && ! e.Selected)
-            GetObjectCoords (e.highlight_obj_type, e.highlight_obj_no, &x, &y);
+         if (e.highlighted () && ! e.Selected)
+            GetObjectCoords (e.highlighted.type, e.highlighted.num, &x, &y);
          else
             centre_of_objects (e.obj_type, e.Selected, &x, &y);
 
@@ -1808,15 +1876,15 @@
 
       // [Return]: edit the properties of the current object.
       else if (is.key == YK_RETURN
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
 	 {
 	 if (e.Selected)
 	    EditObjectsInfo (0, menubar_out_y1 + 1, e.obj_type, e.Selected);
 	 else
 	    {
-	    SelectObject (&e.Selected, e.highlight_obj_no);
-	    EditObjectsInfo (0, menubar_out_y1 + 1, e.obj_type, e.Selected);
-	    UnSelectObject (&e.Selected, e.highlight_obj_no);
+	    SelectObject (&e.Selected, e.highlighted.num);
+	    EditObjectsInfo (0, menubar_out_y1 + 1, e.highlighted.type, e.Selected);
+	    UnSelectObject (&e.Selected, e.highlighted.num);
 	    }
 	 RedrawMap = 1;
 	 DragObject = false;
@@ -1825,13 +1893,13 @@
 
       // [w]: spin things 1/8 turn counter-clockwise
       else if (is.key == 'w' && e.obj_type == OBJ_THINGS
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
 	 {
 	 if (! e.Selected)
 	    {
-	    SelectObject (&e.Selected, e.highlight_obj_no);
+	    SelectObject (&e.Selected, e.highlighted.num);
 	    spin_things (e.Selected, 45);
-	    UnSelectObject (&e.Selected, e.highlight_obj_no);
+	    UnSelectObject (&e.Selected, e.highlighted.num);
 	    }
 	 else
 	    {
@@ -1855,13 +1923,13 @@
 
       // [x]: spin things 1/8 turn clockwise
       else if (is.key == 'x' && e.obj_type == OBJ_THINGS
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
 	 {
 	 if (! e.Selected)
 	    {
-	    SelectObject (&e.Selected, e.highlight_obj_no);
+	    SelectObject (&e.Selected, e.highlighted.num);
 	    spin_things (e.Selected, -45);
-	    UnSelectObject (&e.Selected, e.highlight_obj_no);
+	    UnSelectObject (&e.Selected, e.highlighted.num);
 	    }
 	 else
 	    {
@@ -1874,13 +1942,13 @@
 
       // [x]: split linedefs
       else if (is.key == 'x' && e.obj_type == OBJ_LINEDEFS
-         && (e.Selected || is_obj (e.highlight_obj_no)))
+         && (e.Selected || e.highlighted ()))
          {
          if (! e.Selected)
             {
-            SelectObject (&e.Selected, e.highlight_obj_no);
+            SelectObject (&e.Selected, e.highlighted.num);
             SplitLineDefs (e.Selected);
-            UnSelectObject (&e.Selected, e.highlight_obj_no);
+            UnSelectObject (&e.Selected, e.highlighted.num);
             }
          else
             SplitLineDefs (e.Selected);
@@ -1907,9 +1975,20 @@
 	    }
 	 }
 
+      // [Ctrl][k]: cut a slice out of a sector
+      else if (is.key == 11 && e.obj_type == OBJ_LINEDEFS
+         && e.Selected && e.Selected->next && ! e.Selected->next->next)
+      {
+         sector_slice (e.Selected->next->objnum, e.Selected->objnum);
+         ForgetSelection (&e.Selected);
+         RedrawMap = 1;
+         DragObject = false;
+         StretchSelBox = false;
+      }
+      
       // [Del]: delete the current object
       else if (is.key == YK_DEL
-         && (e.Selected || e.highlight_obj_no >= 0)) /* 'Del' */
+         && (e.Selected || e.highlighted ())) /* 'Del' */
 	 {
 	 if (e.obj_type == OBJ_THINGS
 	  || Expert
@@ -1924,19 +2003,19 @@
 	    if (e.Selected)
 	       DeleteObjects (e.obj_type, &e.Selected);
 	    else
-	       DeleteObject (e.obj_type, e.highlight_obj_no);
+	       DeleteObject (e.highlighted);
 	    }
          // AYM 1998-09-20 I thought I'd add this
          // (though it doesn't fix the problem : if the object has been
          // deleted, HighlightObject is still called with a bad object#).
-         e.highlight_obj_no = OBJ_NO_NONE;
+         e.highlighted.nil ();
 	 DragObject = false;
 	 StretchSelBox = false;
 	 RedrawMap = 1;
 	 }
 
       // [Ins]: insert a new object
-      else if (is.key == YK_INS) /* 'Ins' */
+      else if (is.key == YK_INS || is.key == YK_INS + YK_SHIFT) /* 'Ins' */
 	 {
 	 SelPtr cur;
          int prev_obj_type = e.obj_type;
@@ -1970,32 +2049,35 @@
 	       else
 		  {
 		  InsertObject (OBJ_LINEDEFS, -1, 0, 0);
-		  e.highlight_obj_no = NumLineDefs - 1;
-		  LineDefs[e.highlight_obj_no].start = cur->next->objnum;
-		  LineDefs[e.highlight_obj_no].end = cur->objnum;
-		  cur->objnum = e.highlight_obj_no;
+		  e.highlighted.type = OBJ_LINEDEFS;
+		  e.highlighted.num  = NumLineDefs - 1;
+		  LineDefs[e.highlighted.num].start = cur->next->objnum;
+		  LineDefs[e.highlighted.num].end = cur->objnum;
+		  cur->objnum = e.highlighted.num;  // FIXME cur = e.highlighted
 		  }
 	       }
 	    /* close the polygon if there are more than 2 vertices */
 	    if (firstv >= 0 && is.shift)
 	       {
-	       for (e.highlight_obj_no = 0;
-                    e.highlight_obj_no < NumLineDefs;
-                    e.highlight_obj_no++)
-		  if ((LineDefs[e.highlight_obj_no].start == firstv
-		    && LineDefs[e.highlight_obj_no].end   == cur->objnum)
-		   || (LineDefs[e.highlight_obj_no].end   == firstv
-		    && LineDefs[e.highlight_obj_no].start == cur->objnum))
+	       e.highlighted.type = OBJ_LINEDEFS;
+	       for (e.highlighted.num = 0;
+                    e.highlighted.num < NumLineDefs;
+                    e.highlighted.num++)
+		  if ((LineDefs[e.highlighted.num].start == firstv
+		    && LineDefs[e.highlighted.num].end   == cur->objnum)
+		   || (LineDefs[e.highlighted.num].end   == firstv
+		    && LineDefs[e.highlighted.num].start == cur->objnum))
 		     break;
-	       if (e.highlight_obj_no < NumLineDefs)
+	       if (e.highlighted.num < NumLineDefs)
 		  cur->objnum = obj_no;
 	       else
 		  {
 		  InsertObject (OBJ_LINEDEFS, -1, 0, 0);
-		  e.highlight_obj_no = NumLineDefs - 1;
-		  LineDefs[e.highlight_obj_no].start = firstv;
-		  LineDefs[e.highlight_obj_no].end   = cur->objnum;
-		  cur->objnum = e.highlight_obj_no;
+		  e.highlighted.type = OBJ_LINEDEFS;
+		  e.highlighted.num  = NumLineDefs - 1;
+		  LineDefs[e.highlighted.num].start = firstv;
+		  LineDefs[e.highlighted.num].end   = cur->objnum;
+		  cur->objnum = e.highlighted.num;  // FIXME cur = e.highlighted
 		  }
 	       }
 	    else
@@ -2021,11 +2103,12 @@
 	       {
 	       e.obj_type = OBJ_SECTORS;
 	       InsertObject (OBJ_SECTORS, -1, 0, 0);
-	       e.highlight_obj_no = NumSectors - 1;
+	       e.highlighted.type = OBJ_SECTORS;
+	       e.highlighted.num  = NumSectors - 1;
 	       for (cur = e.Selected; cur; cur = cur->next)
 		  {
 		  InsertObject (OBJ_SIDEDEFS, -1, 0, 0);
-		  SideDefs[NumSideDefs - 1].sector = e.highlight_obj_no;
+		  SideDefs[NumSideDefs - 1].sector = e.highlighted.num;
 		  ObjectsNeeded (OBJ_LINEDEFS, OBJ_SIDEDEFS, 0);
 		  if (LineDefs[cur->objnum].sidedef1 >= 0)
 		     {
@@ -2034,13 +2117,13 @@
 		     s = SideDefs[LineDefs[cur->objnum].sidedef1].sector;
 		     if (s >= 0)
 			{
-			Sectors[e.highlight_obj_no].floorh = Sectors[s].floorh;
-			Sectors[e.highlight_obj_no].ceilh = Sectors[s].ceilh;
-			strncpy (Sectors[e.highlight_obj_no].floort,
+			Sectors[e.highlighted.num].floorh = Sectors[s].floorh;
+			Sectors[e.highlighted.num].ceilh = Sectors[s].ceilh;
+			strncpy (Sectors[e.highlighted.num].floort,
 			   Sectors[s].floort, WAD_FLAT_NAME);
-			strncpy (Sectors[e.highlight_obj_no].ceilt,
+			strncpy (Sectors[e.highlighted.num].ceilt,
 			   Sectors[s].ceilt, WAD_FLAT_NAME);
-			Sectors[e.highlight_obj_no].light = Sectors[s].light;
+			Sectors[e.highlighted.num].light = Sectors[s].light;
 			}
 		     LineDefs[cur->objnum].sidedef2 = NumSideDefs - 1;
 		     LineDefs[cur->objnum].flags = 4;
@@ -2053,36 +2136,40 @@
 		     LineDefs[cur->objnum].sidedef1 = NumSideDefs - 1;
 		  }
 	       ForgetSelection (&e.Selected);
-	       SelectObject (&e.Selected, e.highlight_obj_no);
+	       SelectObject (&e.Selected, e.highlighted.num);
 	       }
 	    }
 	 /* normal case: add a new object of the current type */
 	 else
 	    {
 	    ForgetSelection (&e.Selected);
-	    InsertObject (e.obj_type, e.highlight_obj_no,
+	    /* FIXME how do you insert a new object of type T if
+	       no object of that type already exists ? */
+	    obj_type_t t = e.highlighted () ? e.highlighted.type : e.obj_type;
+	    InsertObject (t, e.highlighted.num,
 	       edit_mapx_snapped (&e, e.pointer_x),
 	       edit_mapy_snapped (&e, e.pointer_y));
-	    e.highlight_obj_no = GetMaxObjectNum (e.obj_type);
+	    e.highlighted.type = t;
+	    e.highlighted.num  = GetMaxObjectNum (e.obj_type);
 	    if (e.obj_type == OBJ_LINEDEFS)
 	       {
-	       int v1 = LineDefs[e.highlight_obj_no].start;
-	       int v2 = LineDefs[e.highlight_obj_no].end;
+	       int v1 = LineDefs[e.highlighted.num].start;
+	       int v2 = LineDefs[e.highlighted.num].end;
 	       if (! Input2VertexNumbers (-1, -1,
 		 "Choose the two vertices for the new linedef", &v1, &v2))
 		  {
-		  DeleteObject (e.obj_type, e.highlight_obj_no);
-		  e.highlight_obj_no = OBJ_NO_NONE;
+		  DeleteObject (e.highlighted);
+		  e.highlighted.nil ();
 		  }
 	       else
 		  {
-		  LineDefs[e.highlight_obj_no].start = v1;
-		  LineDefs[e.highlight_obj_no].end   = v2;
+		  LineDefs[e.highlighted.num].start = v1;
+		  LineDefs[e.highlighted.num].end   = v2;
 		  }
 	       }
 	    else if (e.obj_type == OBJ_VERTICES)
 	       {
-	       SelectObject (&e.Selected, e.highlight_obj_no);
+	       SelectObject (&e.Selected, e.highlighted.num);
 	       if (AutoMergeVertices (&e.Selected, e.obj_type, 'i'))
 		  RedrawMap = 1;
 	       ForgetSelection (&e.Selected);
@@ -2099,20 +2186,11 @@
          // have the time (as of 1998-12-14) to do it now.
          if (e.obj_type != prev_obj_type)
 	    {
-            int old_mode;
 	    int new_mode;
 
-	    // What's the number of the current mode ?
-	    old_mode = obj_type_to_mode_no (prev_obj_type);
-
 	    // What's the number of the new mode ?
             new_mode = obj_type_to_mode_no (e.obj_type);
 
-	    // In the "View" menu, untick the old mode
-	    // and tick the new mode.
-	    e.mb_menu[MBM_VIEW]->set_ticked (modes[old_mode].item_no, 0);
-	    e.mb_menu[MBM_VIEW]->set_ticked (modes[new_mode].item_no, 1);
-
 	    // Change the flavour of the "Misc" menu.
 	    e.menubar->set_menu (e.mb_ino[MBI_MISC],
 	       e.mb_menu[modes[new_mode].menu_no]);
@@ -2170,6 +2248,17 @@
 	 secret_sectors ();
 	 }
 
+      // [Ctrl][t] List tagged linedefs or sectors
+      else if (is.key == 20)
+	 {
+	 if (e.highlighted._is_sector ())
+	    list_tagged_linedefs (Sectors[e.highlighted.num].tag);
+	 else if (e.highlighted._is_linedef ())
+	    list_tagged_sectors (LineDefs[e.highlighted.num].tag);
+	 else
+	    Beep ();
+	 }
+
       // [Ctrl][u] Select linedefs with unknown type (not documented)
       else if (is.key == 21)
 	 {
@@ -2198,7 +2287,6 @@
       else if (is.key == '&')
          {
          e.show_object_numbers = ! e.show_object_numbers;
-         e.mb_menu[MBM_VIEW]->set_ticked (9, e.show_object_numbers);
          RedrawMap = 1;
          }
 
@@ -2207,7 +2295,6 @@
 	 {
 	 e.show_things_sprites = ! e.show_things_sprites;
 	 e.show_things_squares = ! e.show_things_sprites;  // Not a typo !
-         e.mb_menu[MBM_VIEW]->set_ticked (10, e.show_things_sprites);
 	 RedrawMap = 1;
 	 }
 
@@ -2237,7 +2324,7 @@
       && ! is.scroll_lock
       && e.menubar->pulled_down () < 0)
       {
-      int distance;		// In pixels
+      unsigned distance;		// In pixels
 
 #define actual_move(total,dist) \
    ((int) (((total * autoscroll_amp / 100)\
@@ -2290,7 +2377,7 @@
       // Note: the ordinate "3 * FONTH" is of course not
       // critical. It's just a rough approximation.
       distance = ScrMaxX - is.x;
-      if (distance <= autoscroll_edge && is.y >= 3 * FONTH)
+      if (distance <= autoscroll_edge && (unsigned) is.y >= 3 * FONTH)
 	 {
 	 if (! UseMouse)
 	    is.x -= e.move_speed;
diff -uaNr yadex-1.5.2/src/editobj.cc yadex-1.6.0/src/editobj.cc
--- yadex-1.5.2/src/editobj.cc	2000-08-12 16:28:23.000000000 +0200
+++ yadex-1.6.0/src/editobj.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -37,7 +37,10 @@
 #include "game.h"
 #include "gfx.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "oldmenus.h"
+#include "s_slice.h"
 #include "s_swapf.h"
 #include "selectn.h"
 #include "t_spin.h"
@@ -56,7 +59,8 @@
 char prompt[80];
 
 HideMousePointer ();
-sprintf (prompt, "Enter a %s number between 0 and %d:", GetObjectTypeName (objtype), GetMaxObjectNum (objtype));
+sprintf (prompt, "Enter a %s number between 0 and %d:",
+   GetObjectTypeName (objtype), GetMaxObjectNum (objtype));
 if (x0 < 0)
    x0 = (ScrMaxX - 25 - 8 * strlen (prompt)) / 2;
 if (y0 < 0)
@@ -74,6 +78,48 @@
 }
 
 
+/*
+ *	input_objid - ask for an object number of the specified	type
+ *
+ *	If the user hit [Return], set objid.type to init.type
+ *	and objid.num to whatever number the user entered. If
+ *	the user hit [Esc], call nil() on objid.
+ */
+void input_objid (Objid& objid, const Objid& init, int x0, int y0)
+{
+char prompt[80];
+
+HideMousePointer ();
+sprintf (prompt, "Enter a %s number between 0 and %d:",
+   GetObjectTypeName (init.type), GetMaxObjectNum (init.type));
+if (x0 < 0)
+   x0 = (ScrMaxX - 25 - 8 * strlen (prompt)) / 2;
+if (y0 < 0)
+   y0 = (ScrMaxY - 55) / 2;
+DrawScreenBox3D (x0, y0, x0 + 25 + 8 * strlen (prompt), y0 + 55);
+set_colour (WHITE);
+DrawScreenText (x0 + 10, y0 + 8, prompt);
+int  num = init.num;
+int  key;
+while ((key
+       = InputInteger (x0 + 10, y0 + 28, &num, 0, GetMaxObjectNum (init.type)))
+       != YK_RETURN && key != YK_ESC)
+   Beep ();
+if (key == YK_ESC)
+   objid.nil ();
+else if (key == YK_RETURN)
+   {
+   objid.type = init.type;
+   objid.num  = num;
+   }
+else
+   {
+   nf_bug ("input_objid: bad key %d", (int) key);  // Can't happen
+   objid.nil ();
+   }
+ShowMousePointer ();
+}
+
 
 /*
    ask for an object number and display a warning message
@@ -81,33 +127,60 @@
 
 int InputObjectXRef (int x0, int y0, int objtype, bool allownone, int curobj)
 {
-int val, key;
+const char *const msg1 = "Warning: modifying the cross-references";
+const char *const msg2 = "between some objects may crash the game.";
 char prompt[80];
+size_t maxlen = 0;
+size_t nlines = 0;
+int width;
+int height;
 
-HideMousePointer ();
+// Dimensions
 sprintf (prompt, "Enter a %s number between 0 and %d%c",
- GetObjectTypeName (objtype),
- GetMaxObjectNum (objtype), allownone ? ',' : ':');
-val = strlen (prompt);
-if (val < 40)
-   val = 40;
+  GetObjectTypeName (objtype),
+  GetMaxObjectNum (objtype), allownone ? ',' : ':');
+maxlen = 40;				// Why 40 ? -- AYM 2002-04-17
+if (strlen (prompt) > maxlen);
+   maxlen = strlen (prompt);
+if (strlen (msg1) > maxlen)
+   maxlen = strlen (msg1);
+if (strlen (msg2) > maxlen)
+   maxlen = strlen (msg2);
+int ya = 0 + BOX_BORDER + WIDE_VSPACING;
+int yb = ya;
+if (allownone)
+  yb += FONTH;
+int yc = yb + FONTH + WIDE_VSPACING;
+// FIXME should query InputInteger() instead
+int yd = yc + 2 * HOLLOW_BORDER + 2 * NARROW_VSPACING + FONTH + WIDE_VSPACING;
+int ye = yd + FONTH;
+int yf = ye + FONTH + WIDE_VSPACING + BOX_BORDER;
+width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + maxlen * FONTW;
+height = yf - 0;
+
+// Position
 if (x0 < 0)
-   x0 = (ScrMaxX - 25 - 8 * val) / 2;
+   x0 = (ScrMaxX - width) / 2;
 if (y0 < 0)
-   y0 = (ScrMaxY - (allownone ? 85 : 75)) / 2;
-DrawScreenBox3D (x0, y0, x0 + 25 + 8 * val, y0 + (allownone ? 85 : 75));
+   y0 = (ScrMaxY - height) / 2;
+
+HideMousePointer ();
+DrawScreenBox3D (x0, y0, x0 + width, y0 + height);
 set_colour (WHITE);
-DrawScreenText (x0 + 10, y0 + 8, prompt);
+int x = x0 + BOX_BORDER + WIDE_HSPACING;
+DrawScreenText (x, y0 + ya, prompt);
 if (allownone)
-   DrawScreenText (x0 + 10, y0 + 18, "or -1 for none:");
+   DrawScreenText (x, y0 + yb, "or -1 for none:");
 set_colour (LIGHTRED);
-DrawScreenText (x0 + 10, y0 + (allownone ? 60 : 50),
- "Warning: modifying the cross-references");
-DrawScreenText (x0 + 10, y0 + (allownone ? 70 : 60),
- "between some objects may crash the game.");
-val = curobj;
-while ((key = InputInteger (x0 + 10, y0 + (allownone ? 38 : 28), &val,
- allownone ? -1 : 0, GetMaxObjectNum (objtype))) != YK_RETURN && key != YK_ESC)
+DrawScreenText (x, y0 + yd, msg1);
+DrawScreenText (x, y0 + ye, msg2);
+
+int val = curobj;
+int key;
+int min = allownone ? -1 : 0;
+int max = GetMaxObjectNum (objtype);
+while (key = InputInteger (x, y0 + yc, &val, min, max),
+       key != YK_RETURN && key != YK_ESC)
    Beep ();
 ShowMousePointer ();
 return val;
@@ -169,13 +242,13 @@
    {
    DrawScreenBoxHollow (entry1_x0, entry1_y0,
       entry1_x0 + entry_width - 1, entry1_y0 + entry_height - 1, BLACK);
-   set_colour (first ? WHITE : DARKGRAY);
+   set_colour (first ? WHITE : DARKGREY);
    DrawScreenText (entry1_x0 + HOLLOW_BORDER + NARROW_HSPACING,
       entry1_y0 + HOLLOW_BORDER + NARROW_VSPACING, "%d", *v1);
 
    DrawScreenBoxHollow (entry2_x0, entry2_y0,
       entry2_x0 + entry_width - 1, entry2_y0 + entry_height - 1, BLACK);
-   set_colour (! first ? WHITE : DARKGRAY);
+   set_colour (! first ? WHITE : DARKGREY);
    DrawScreenText (entry2_x0 + HOLLOW_BORDER + NARROW_HSPACING,
       entry2_y0 + HOLLOW_BORDER + NARROW_VSPACING, "%d", *v2);
 
@@ -234,8 +307,15 @@
          Vertices[obj->objnum].x);
       sprintf (menustr[1], "Change Y position (Current: %d)",
          Vertices[obj->objnum].y);
+#ifdef OLDMEN
       val = DisplayMenuArray (0, y0,
          menustr[2], 2, NULL, menustr, NULL, NULL, NULL);
+#else
+      val = vDisplayMenu (0, y0, menustr[2],
+         menustr[0], YK_, 0,
+         menustr[1], YK_, 0,
+	 NULL);
+#endif
       for (n = 0; n < 3; n++)
 	 FreeMemory (menustr[n]);
       subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
@@ -351,21 +431,21 @@
       entry1_out_x1, entry1_out_y1, BLACK);
    if (*v1 < 0 || *v1 > v1max)
       {
-      set_colour (DARKGRAY);
+      set_colour (DARKGREY);
       ok = false;
       }
    else
-      set_colour (LIGHTGRAY);
+      set_colour (LIGHTGREY);
    DrawScreenText (entry1_text_x0, entry1_text_y0, "%d", *v1);
    DrawScreenBoxHollow (entry2_out_x0, entry2_out_y0,
       entry2_out_x1, entry2_out_y1, BLACK);
    if (*v2 < 0 || *v2 > v2max)
       {
-      set_colour (DARKGRAY);
+      set_colour (DARKGREY);
       ok = false;
       }
    else
-      set_colour (LIGHTGRAY);
+      set_colour (LIGHTGREY);
    DrawScreenText (entry2_text_x0, entry2_text_y0, "%d", *v2);
    if (first)
       key = InputInteger (entry1_out_x0, entry1_out_y0, v1, 0, v1max);
@@ -408,7 +488,9 @@
 DrawPointer (1);
 ShowMousePointer ();
 /* are we inside a Sector? */
-sector = GetCurObject (OBJ_SECTORS, xpos, ypos, 1);
+Objid o;
+GetCurObject (o, OBJ_SECTORS, xpos, ypos);
+sector = o.num;
 
 /* !!!! Should also check for overlapping objects (sectors) !!!! */
 switch (choice)
@@ -580,6 +662,9 @@
    Notify (-1, -1, msg, 0);
    return;
    }
+
+/* I think this switch statement deserves a prize for "worst
+   gratuitous obfuscation" or something. -- AYM 2000-11-07 */
 switch (val)
    {
    case 1:
@@ -587,6 +672,7 @@
       sprintf (msg, "First free tag number: %d", FindFreeTag ());
       Notify (-1, -1, msg, 0);
       break;
+
    case 2:
       // * -> Rotate and scale
       if ((objtype == OBJ_THINGS
@@ -605,6 +691,7 @@
 	 RotateAndScaleObjects (objtype, *list, (double) angle * 0.0174533,
             (double) scale * 0.01);
       break;
+
    case 3:
       // Linedef -> Split
       if (objtype == OBJ_LINEDEFS)
@@ -636,6 +723,7 @@
 	 ForgetSelection (list);
 	 }
       break;
+
    case 4:
       // Linedef -> Split linedefs and sector
       if (objtype == OBJ_LINEDEFS)
@@ -673,6 +761,7 @@
 	 MergeVertices (list);
 	 }
       break;
+
    case 5:
       // Linedef -> Delete linedefs and join sectors
       if (objtype == OBJ_LINEDEFS)
@@ -712,6 +801,7 @@
 	    }
 	 }
       break;
+
    case 6:
       // Linedef -> Flip
       if (objtype == OBJ_LINEDEFS)
@@ -742,11 +832,13 @@
 	 flip_mirror (*list, OBJ_VERTICES, 'm');
 	 }
       break;
+
    case 7:
       // Linedefs -> Swap sidedefs
       if (objtype == OBJ_LINEDEFS)
 	 {
 	 if (Expert
+            || blindly_swap_sidedefs
             || Confirm (-1, -1,
                "Warning: the sector references are also swapped",
                "You may get strange results if you don't know what you are doing..."))
@@ -763,6 +855,7 @@
 	 flip_mirror (*list, OBJ_VERTICES, 'f');
 	 }
       break;
+
    case 8:
       // Linedef ->  Align textures vertically
       if (objtype == OBJ_LINEDEFS)
@@ -788,6 +881,7 @@
 	 BrightenOrDarkenSectors (*list);
 	 }
       break;
+
    case 9:
       // Linedef -> Align texture horizontally
       if (objtype == OBJ_LINEDEFS)
@@ -823,9 +917,18 @@
 	 ObjectsNeeded (OBJ_LINEDEFS, 0);
 	 for (cur = *list; cur; cur = cur->next)
 	    {
-	    LineDefs[cur->objnum].sidedef2 = -1;  /* remove ref. to 2nd SD */
-	    LineDefs[cur->objnum].flags &= ~0x04; /* clear "2S" bit */
-	    LineDefs[cur->objnum].flags |= 0x01;  /* set "Im" bit */
+	    struct LineDef *l = LineDefs + cur->objnum;
+	    l->sidedef2 = -1;  /* remove ref. to 2nd SD */
+	    l->flags &= ~0x04; /* clear "2S" bit */
+	    l->flags |= 0x01;  /* set "Im" bit */
+
+	    if (is_sidedef (l->sidedef1))
+	       {
+	       struct SideDef *s = SideDefs + l->sidedef1;
+	       strcpy (s->tex1, "-");
+	       strcpy (s->tex2, "-");
+	       strcpy (s->tex3, default_middle_texture);
+	       }
 	    /* Don't delete the 2nd sidedef, it could be used
                by another linedef. And if it isn't, the next
                cross-references check will delete it anyway. */
@@ -902,6 +1005,22 @@
       flip_mirror (*list, OBJ_LINEDEFS, 'f');
       break;
 
+   case 19 :
+      // Linedef -> Cut a slice out of a sector
+      if (objtype == OBJ_LINEDEFS)
+	 {
+	 if (! (*list)->next || (*list)->next->next)
+	    {
+	    Beep ();
+	    Notify (-1, -1, "You must select exactly two linedefs", 0);
+	    }
+	 else
+	    {
+	    sector_slice ((*list)->next->objnum, (*list)->objnum);
+	    ForgetSelection (list);
+	    }
+	 }
+      break;
    }
 }
 
diff -uaNr yadex-1.5.2/src/editobj.h yadex-1.6.0/src/editobj.h
--- yadex-1.5.2/src/editobj.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/editobj.h	2003-02-12 17:16:22.000000000 +0100
@@ -5,4 +5,5 @@
 
 
 void DisplayObjectInfo (const edit_t *e, int); /* SWAP! */
+void input_objid (Objid& objid, const Objid& init, int x0, int y0);
 
diff -uaNr yadex-1.5.2/src/editsave.cc yadex-1.6.0/src/editsave.cc
--- yadex-1.5.2/src/editsave.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/editsave.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -29,10 +29,13 @@
 
 
 #include "yadex.h"
+#include "dialog.h"
 #include "editsave.h"
 #include "entry.h"
 #include "game.h"
 #include "levels.h"
+#include "wadfile.h"
+#include "wadlist.h"
 
 
 #ifndef NEW_SAVE_METHOD
@@ -167,66 +170,104 @@
 char *GetWadFileName (const char *levelname)
 {
 #define BUFSZ 79
-char *outfile = (char *) GetMemory (BUFSZ + 1);
-WadPtr wad;
+  char *outfile = (char *) GetMemory (BUFSZ + 1);
 
-/* get the file name */
-// If no name, find a default one
-if (! levelname)
-   {
-   if (yg_level_name == YGLN_E1M1 || yg_level_name == YGLN_E1M10)
+  /* get the file name */
+  // If no name, find a default one
+  if (! levelname)
+  {
+    if (yg_level_name == YGLN_E1M1 || yg_level_name == YGLN_E1M10)
       levelname = "E1M1";
-   else if (yg_level_name == YGLN_MAP01)
+    else if (yg_level_name == YGLN_MAP01)
       levelname = "MAP01";
-   else
-      {
+    else
+    {
       nf_bug ("Bad ygd_level_name %d, using E1M1.", (int) yg_level_name);
       levelname = "E1M1";
-      }
-   }
+    }
+  }
 
-if (! Level || ! Level->wadfile || ! fncmp (Level->wadfile->filename, MainWad))
-   {
-   al_scpslower (outfile, levelname, BUFSZ);
-   al_saps (outfile, ".wad", BUFSZ);
-   }
-else
-   strcpy (outfile, Level->wadfile->filename);
-do
-   InputFileName (-1, -1, "Name of the new wad file:", BUFSZ, outfile);
-while (! fncmp (outfile, MainWad));
-/* escape */
-if (outfile[0] == '\0')
-   {
-   FreeMemory (outfile);
-   return 0;
-   }
-/* if the wad file already exists, rename it to "*.bak" */
-for (wad = WadFileList; wad; wad = wad->next)
-   if (! fncmp (outfile, wad->filename))
-   {
-   al_fdrv_t drv;
-   al_fpath_t path;
-   al_fbase_t base;
-
-   al_fana (wad->filename, drv, path, base, 0);
-   sprintf (wad->filename, "%s%s%s.bak", drv, path, base);
-   /* Need to close, then reopen: problems with SHARE.EXE */
-   fclose (wad->fd);
-   if (rename (outfile, wad->filename) < 0)
+  if (! Level
+    || ! Level->wadfile
+    || ! fncmp (Level->wadfile->filename, MainWad))
+  {
+    al_scpslower (outfile, levelname, BUFSZ);
+    al_saps (outfile, ".wad", BUFSZ);
+  }
+  else
+    strcpy (outfile, Level->wadfile->filename);
+  do
+    InputFileName (-1, -1, "Name of the new wad file:", BUFSZ, outfile);
+  while (! fncmp (outfile, MainWad));
+  /* escape */
+  if (outfile[0] == '\0')
+  {
+    FreeMemory (outfile);
+    return 0;
+  }
+  /* if the wad file already exists, rename it to "*.bak" */
+  Wad_file *wf;
+  for (wad_list.rewind (); wad_list.get (wf);)
+    if (fncmp (outfile, wf->filename) == 0)
+    {
+      verbmsg ("wf->filename: %s\n", wf->filename);	// DEBUG
+      verbmsg ("wf->fp        %p\n", wf->fp);		// DEBUG
+      verbmsg ("outfile       %s\n", outfile);		// DEBUG
+      al_fdrv_t drv;
+      al_fpath_t path;
+      al_fbase_t base;
+
+      al_fana (wf->filename, drv, path, base, 0);
+      sprintf (wf->filename, "%s%s%s.bak", drv, path, base);
+      verbmsg ("setting wf->filename to %s\n", wf->filename);  // DEBUG
+      /* Need to close, then reopen: problems with SHARE.EXE */
+      verbmsg ("closing %p\n", wf->fp);				// DEBUG
+      fclose (wf->fp);
+      verbmsg ("renaming %s -> %s\n", outfile, wf->filename);	// DEBUG
+      if (rename (outfile, wf->filename) != 0)
+      {
+	verbmsg ("removing %s\n", wf->filename);  // DEBUG
+	if (remove (wf->filename) != 0 && errno != ENOENT)
+	{
+	  char buf1[81];
+	  char buf2[81];
+	  y_snprintf (buf1, sizeof buf1, "Could not delete \"%.64s\"",
+	    wf->filename);
+	  y_snprintf (buf2, sizeof buf2, "(%.64s)", strerror (errno));
+	  Notify (-1, -1, buf1, buf2);
+	  return 0;
+	}
+	verbmsg ("renaming %s -> %s\n", outfile, wf->filename);  // DEBUG
+	if (rename (outfile, wf->filename))
+	{
+	  char buf1[81];
+	  char buf2[81];
+	  y_snprintf (buf1, sizeof buf1, "Could not rename \"%.64s\"",
+	    outfile);
+	  y_snprintf (buf2, sizeof buf2, "as \"%.64s\" (%.64s)",
+	    wf->filename, strerror (errno));
+	  Notify (-1, -1, buf1, buf2);
+	  return 0;
+	}
+      }
+      verbmsg ("opening %s\n", wf->filename); // DEBUG
+      wf->fp = fopen (wf->filename, "rb");
+      if (wf->fp == 0)
       {
-      if (remove (wad->filename))
-	 fatal_error ("could not delete file \"%s\"", wad->filename);
-      if (rename (outfile, wad->filename))
-	 fatal_error ("could not rename \"%s\" to \"%s\"", outfile,
-            wad->filename);
+	char buf1[81];
+	char buf2[81];
+	y_snprintf (buf1, sizeof buf1, "Could not reopen \"%.64s\"",
+	  wf->filename);
+	y_snprintf (buf2, sizeof buf2, "(%.64s)", strerror (errno));
+	Notify (-1, -1, buf1, buf2);
+	return 0;
       }
-   wad->fd = fopen (wad->filename, "rb");
-   if (! wad->fd)
-      fatal_error ("could not reopen file \"%s\"", wad->filename);
-   break;
-   }
-return outfile;
+      verbmsg ("wf->filename: %s\n", wf->filename);	// DEBUG
+      verbmsg ("wf->fp        %p\n", wf->fp);		// DEBUG
+      verbmsg ("outfile       %s\n", outfile);		// DEBUG
+      break;
+    }
+  return outfile;
 }
 #endif
 
diff -uaNr yadex-1.5.2/src/editzoom.cc yadex-1.6.0/src/editzoom.cc
--- yadex-1.5.2/src/editzoom.cc	2000-08-13 19:33:00.000000000 +0200
+++ yadex-1.6.0/src/editzoom.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -36,6 +36,19 @@
 #include "gfx.h"
 
 
+double digit_zoom_factors[10];
+
+
+void edit_zoom_init ()
+{
+  double factor = digit_zoom_base / 100.0;
+  double step   = digit_zoom_step != 0 ? (digit_zoom_step + 100.0) / 100
+				       : pow (2, -.5);
+  for (int i = 1; i <= 10; i++, factor *= step)
+    digit_zoom_factors[i % 10] = factor;
+}
+
+
 int edit_zoom_in (edit_t *e)
 {
   if (! e) return 1;  // Prevent compiler warning about unused .p.
diff -uaNr yadex-1.5.2/src/editzoom.h yadex-1.6.0/src/editzoom.h
--- yadex-1.5.2/src/editzoom.h	2000-07-09 18:44:42.000000000 +0200
+++ yadex-1.6.0/src/editzoom.h	2003-02-12 17:16:31.000000000 +0100
@@ -4,6 +4,17 @@
  */
 
 
+/* zoom factors for the digit keys
+ */
+extern double digit_zoom_factors[10];
+
+
+/*
+ *      edit_zoom_init - initialise
+ */
+void edit_zoom_init (void);
+
+
 /*
  *	edit_zoom_in - zoom_in
  *
diff -uaNr yadex-1.5.2/src/endian.cc yadex-1.6.0/src/endian.cc
--- yadex-1.5.2/src/endian.cc	2000-06-06 00:38:11.000000000 +0200
+++ yadex-1.6.0/src/endian.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/entry.cc yadex-1.6.0/src/entry.cc
--- yadex-1.5.2/src/entry.cc	2000-05-07 14:34:47.000000000 +0200
+++ yadex-1.6.0/src/entry.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -33,83 +33,104 @@
 #include "gfx.h"
 
 
+const char *strgetl (const char *& str, long& value);
+
+
 /*
-   display the integer input box
-*/
+ *	InputInteger - display the integer input box
+ *
+ *	FIXME *valp, minv and maxv should be changed to long.
+ */
 int InputInteger (int x0, int y0, int *valp, int minv, int maxv)
 {
-int  key, val;
-bool neg, ok, firstkey;
-int entry_out_x0;
-int entry_out_y0;
-int entry_out_x1;
-int entry_out_y1;
-int entry_text_x0;
-int entry_text_y0;
-int entry_text_x1;
-int entry_text_y1;
-
-entry_out_x0  = x0;
-entry_text_x0 = entry_out_x0 + HOLLOW_BORDER + NARROW_HSPACING;
-entry_text_x1 = entry_text_x0 + 7 * FONTW - 1;
-entry_out_x1  = entry_text_x1 + HOLLOW_BORDER + NARROW_HSPACING;
-entry_out_y0  = y0;
-entry_text_y0 = entry_out_y0 + HOLLOW_BORDER + NARROW_VSPACING;
-entry_text_y1 = entry_text_y0 + FONTH - 1;
-entry_out_y1  = entry_text_y1 + HOLLOW_BORDER + NARROW_VSPACING;
-DrawScreenBoxHollow (entry_out_x0, entry_out_y0, entry_out_x1, entry_out_y1, BLACK);
-neg = (*valp < 0);
-val = neg ? -(*valp) : *valp;
-firstkey = true;
-for (;;)
-   {
-   ok = (neg ? -val : val) >= minv && (neg ? -val : val) <= maxv;
-   set_colour (BLACK);
-   DrawScreenBox (entry_text_x0, entry_text_y0, entry_text_x1, entry_text_y1);
-   if (ok)
+  int key;
+  int entry_out_x0;
+  int entry_out_y0;
+  int entry_out_x1;
+  int entry_out_y1;
+  int entry_text_x0;
+  int entry_text_y0;
+  int entry_text_x1;
+  int entry_text_y1;
+  const size_t boxlen    = 7;    // Visible width of entry box
+  const size_t bufmaxlen = 50;     // Slack enough
+  char *buf = new char[bufmaxlen + 1];
+
+  entry_out_x0  = x0;
+  entry_text_x0 = entry_out_x0 + HOLLOW_BORDER + NARROW_HSPACING;
+  entry_text_x1 = entry_text_x0 + boxlen * FONTW - 1;
+  entry_out_x1  = entry_text_x1 + HOLLOW_BORDER + NARROW_HSPACING;
+  entry_out_y0  = y0;
+  entry_text_y0 = entry_out_y0 + HOLLOW_BORDER + NARROW_VSPACING;
+  entry_text_y1 = entry_text_y0 + FONTH - 1;
+  entry_out_y1  = entry_text_y1 + HOLLOW_BORDER + NARROW_VSPACING;
+  DrawScreenBoxHollow (entry_out_x0, entry_out_y0, entry_out_x1, entry_out_y1,
+    BLACK);
+  long val = *valp;
+  sprintf (buf, "%d", *valp);    // FIXME what if we were in hex ?
+  for (bool firstkey = true; ; firstkey = false)
+  {
+    bool ok;
+    {
+      const char *checkp = buf;
+      ok = strgetl (checkp, val) == 0
+        && checkp == buf + strlen (buf)
+	&& val >= minv && val <= maxv;
+    }
+    set_colour (BLACK);
+    DrawScreenBox (entry_text_x0, entry_text_y0, entry_text_x1, entry_text_y1);
+    if (ok)
       set_colour (WHITE);
-   else
-      set_colour (LIGHTGRAY);
-   if (neg)
-      DrawScreenText (entry_text_x0, entry_text_y0, "-%d", val);
-   else
-      DrawScreenText (entry_text_x0, entry_text_y0, "%d",  val);
-   key = get_key ();
-   if (firstkey && is_ordinary (key) && key != ' ')
-      {
-      val = 0;
-      neg = false;
-      }
-   firstkey = false;
-   if (val < 3275 && key >= '0' && key <= '9')
-      val = val * 10 + dectoi (key);
-   else if (val > 0 && key == YK_BACKSPACE)
-      val = val / 10;
-   else if (neg && key == YK_BACKSPACE)
-      neg = false;
-   else if (key == '-')
-      neg = !neg;
-   else if (ok && key == YK_RETURN)
-      break; /* return "val" */
-   else if (key == YK_LEFT || key == YK_RIGHT
-	 || key == YK_UP   || key == YK_DOWN
-	 || key == YK_TAB  || key == YK_BACKTAB)
-      break; /* return "val", even if not valid */
-   else if (key == YK_ESC)
-      {
-      neg = false;
-      val = IIV_CANCEL; /* return a value out of range */
+    else
+      set_colour (LIGHTRED);
+    if (strlen (buf) > boxlen)
+    {
+      DrawScreenText (entry_text_x0, entry_text_y0, "<%s",
+	buf + (strlen (buf) - boxlen + 1));
+    }
+    else
+      DrawScreenString (entry_text_x0, entry_text_y0, buf);
+
+    key = get_key ();
+    if (key == YK_BACKSPACE && strlen (buf) > 0)
+    {
+      buf[strlen (buf) - 1] = '\0';
+    }
+    else if (key == YK_RETURN && ok)
+    {
+      *valp = (int) val;
+      break;    // Return current value
+    }
+    else if (key == YK_LEFT || key == YK_RIGHT
+	  || key == YK_UP   || key == YK_DOWN
+	  || key == YK_TAB  || key == YK_BACKTAB)
+    {
+      *valp = (int) val;
+      break;    // Return current value, even if not valid
+    }
+    else if (key == YK_ESC)
+    {
+      *valp = IIV_CANCEL;    // Return an out of range value
       break;
-      }
-   else
+    }
+    else if (is_ordinary (key) && strlen (buf) < bufmaxlen)
+    {
+      if (firstkey)
+	if (key == ' ')    // Kludge : hit space to append to initial value
+	  continue;
+	else
+	  *buf = '\0';
+      al_sapc (buf, key, bufmaxlen);
+    }
+    else
+    {
       Beep ();
-   }
-if (neg)
-   *valp = -val;
-else
-   *valp = val;
-is.key = 0;  // Shouldn't have to do that but EditorLoop() is broken
-return key;
+    }
+  }
+
+  is.key = 0;    // Shouldn't have to do that but EditorLoop() is broken
+  delete[] buf;
+  return key;
 }
 
 
@@ -118,25 +139,26 @@
 */
 int InputIntegerValue (int x0, int y0, int minv, int maxv, int defv)
 {
-int  val, key;
-char prompt[80];
+  int  val, key;
+  char prompt[80];
 
-HideMousePointer ();
-y_snprintf (prompt, sizeof prompt, "Enter a decimal number between %d and %d:",
-   minv, maxv);
-if (x0 < 0)
-   x0 = (ScrMaxX - 25 - FONTW * strlen (prompt)) / 2;
-if (y0 < 0)
-   y0 = (ScrMaxY - 55) / 2;
-DrawScreenBox3D (x0, y0, x0 + 25 + FONTW * strlen (prompt), y0 + 55);
-set_colour (WHITE);
-DrawScreenText (x0 + 10, y0 + 8, prompt);
-val = defv;
-while ((key = InputInteger (x0 + 10, y0 + 28, &val, minv, maxv)) != YK_RETURN
- && key != YK_ESC)
-   Beep ();
-ShowMousePointer ();
-return val;
+  HideMousePointer ();
+  y_snprintf (prompt, sizeof prompt,
+    "Enter a number between %d and %d:",
+    minv, maxv);
+  if (x0 < 0)
+    x0 = (ScrMaxX - 25 - FONTW * strlen (prompt)) / 2;
+  if (y0 < 0)
+    y0 = (ScrMaxY - 55) / 2;
+  DrawScreenBox3D (x0, y0, x0 + 25 + FONTW * strlen (prompt), y0 + 55);
+  set_colour (WHITE);
+  DrawScreenText (x0 + 10, y0 + 8, prompt);
+  val = defv;
+  while ((key = InputInteger (x0 + 10, y0 + 28, &val, minv, maxv)) != YK_RETURN
+   && key != YK_ESC)
+    Beep ();
+  ShowMousePointer ();
+  return val;
 }
 
 
@@ -146,104 +168,161 @@
 void InputFileName (int x0, int y0, const char *prompt, size_t maxlen,
    char *filename)
 {
-int   key;
-size_t l;
-size_t boxlen;
-bool  firstkey;
-int width;
-int title_y0;
-int entry_out_x0;
-int entry_out_y0;
-int entry_out_x1;
-int entry_out_y1;
-int entry_text_x0;
-int entry_text_y0;
-int entry_text_x1;
-int entry_text_y1;
-
-HideMousePointer ();
-for (l = strlen (filename) + 1; l <= maxlen; l++)
-   filename [l] = '\0';
-/* compute the width of the input box */
-if (maxlen > 20)
-   boxlen = 20;
-else
-   boxlen = maxlen;
-/* compute the width of the dialog box */
-if (strlen (prompt) > boxlen)
-   l = strlen (prompt);
-else
-   l = boxlen;
-
-width = 2 * HOLLOW_BORDER + 2 * NARROW_HSPACING + boxlen * FONTW;
-if ((int) (strlen (prompt) * FONTW) > width)
-   width = strlen (prompt) * FONTW;
-width += 2 * BOX_BORDER + 2 * WIDE_HSPACING;
-
-if (x0 < 0)
-   x0 = (ScrMaxX - width) / 2;
-if (y0 < 0)
-   y0 = (ScrMaxY - 2 * BOX_BORDER
-                 - 2 * WIDE_VSPACING
-                 - (int) (2.5 * FONTH)
-                 - 2 * HOLLOW_BORDER
-                 - 2 * NARROW_VSPACING) / 2;
-/* draw the dialog box */
-entry_out_x0  = x0 + BOX_BORDER + WIDE_HSPACING;
-entry_text_x0 = entry_out_x0  + HOLLOW_BORDER + NARROW_HSPACING;
-entry_text_x1 = entry_text_x0 + boxlen * FONTW - 1;
-entry_out_x1  = entry_text_x1 + NARROW_HSPACING + HOLLOW_BORDER;
-title_y0      = y0 + BOX_BORDER + WIDE_VSPACING;
-entry_out_y0  = title_y0 + (int) (1.5 * FONTH);
-entry_text_y0 = entry_out_y0  + HOLLOW_BORDER + NARROW_VSPACING;
-entry_text_y1 = entry_text_y0 + FONTH - 1;
-entry_out_y1  = entry_text_y1 + NARROW_VSPACING + HOLLOW_BORDER;
-
-DrawScreenBox3D (x0, y0, x0 + width - 1, entry_out_y1 + WIDE_VSPACING);
-DrawScreenBoxHollow (entry_out_x0, entry_out_y0, entry_out_x1, entry_out_y1, BLACK);
-set_colour (YELLOW);
-DrawScreenText (entry_out_x0, title_y0, prompt);
-firstkey = true;
-for (;;)
-   {
-   l = strlen (filename);
-   set_colour (BLACK);
-   DrawScreenBox (entry_text_x0, entry_text_y0, entry_text_x1, entry_text_y1);
-   set_colour (WHITE);
-   if (l > boxlen)
-      {
+  int   key;
+  size_t l;
+  size_t boxlen;
+  bool  firstkey;
+  int width;
+  int title_y0;
+  int entry_out_x0;
+  int entry_out_y0;
+  int entry_out_x1;
+  int entry_out_y1;
+  int entry_text_x0;
+  int entry_text_y0;
+  int entry_text_x1;
+  int entry_text_y1;
+
+  HideMousePointer ();
+  for (l = strlen (filename) + 1; l <= maxlen; l++)
+    filename [l] = '\0';
+  /* compute the width of the input box */
+  if (maxlen > 20)
+    boxlen = 20;
+  else
+    boxlen = maxlen;
+  /* compute the width of the dialog box */
+  if (strlen (prompt) > boxlen)
+    l = strlen (prompt);
+  else
+    l = boxlen;
+
+  width = 2 * HOLLOW_BORDER + 2 * NARROW_HSPACING + boxlen * FONTW;
+  if ((int) (strlen (prompt) * FONTW) > width)
+    width = strlen (prompt) * FONTW;
+  width += 2 * BOX_BORDER + 2 * WIDE_HSPACING;
+
+  if (x0 < 0)
+    x0 = (ScrMaxX - width) / 2;
+  if (y0 < 0)
+    y0 = (ScrMaxY - 2 * BOX_BORDER
+		  - 2 * WIDE_VSPACING
+		  - (int) (2.5 * FONTH)
+		  - 2 * HOLLOW_BORDER
+		  - 2 * NARROW_VSPACING) / 2;
+  /* draw the dialog box */
+  entry_out_x0  = x0 + BOX_BORDER + WIDE_HSPACING;
+  entry_text_x0 = entry_out_x0  + HOLLOW_BORDER + NARROW_HSPACING;
+  entry_text_x1 = entry_text_x0 + boxlen * FONTW - 1;
+  entry_out_x1  = entry_text_x1 + NARROW_HSPACING + HOLLOW_BORDER;
+  title_y0      = y0 + BOX_BORDER + WIDE_VSPACING;
+  entry_out_y0  = title_y0 + (int) (1.5 * FONTH);
+  entry_text_y0 = entry_out_y0  + HOLLOW_BORDER + NARROW_VSPACING;
+  entry_text_y1 = entry_text_y0 + FONTH - 1;
+  entry_out_y1  = entry_text_y1 + NARROW_VSPACING + HOLLOW_BORDER;
+
+  DrawScreenBox3D (x0, y0, x0 + width - 1, entry_out_y1 + WIDE_VSPACING);
+  DrawScreenBoxHollow (entry_out_x0, entry_out_y0, entry_out_x1, entry_out_y1, BLACK);
+  set_colour (YELLOW);
+  DrawScreenString (entry_out_x0, title_y0, prompt);
+  firstkey = true;
+  for (;;)
+  {
+    l = strlen (filename);
+    set_colour (BLACK);
+    DrawScreenBox (entry_text_x0, entry_text_y0, entry_text_x1, entry_text_y1);
+    set_colour (WHITE);
+    if (l > boxlen)
+    {
       DrawScreenText (entry_text_x0, entry_text_y0, "<%s",
-	  filename + (l - boxlen + 1));
-      }
-   else
-      DrawScreenText (entry_text_x0, entry_text_y0, filename);
-   key = get_key ();
-   if (firstkey && is_ordinary (key))
-      {
+	filename + (l - boxlen + 1));
+    }
+    else
+      DrawScreenString (entry_text_x0, entry_text_y0, filename);
+    key = get_key ();
+    if (firstkey && is_ordinary (key))
+    {
       for (l = 0; l <= maxlen; l++)
-	 filename[l] = '\0';
+	filename[l] = '\0';
       l = 0;
-      }
-   firstkey = false;
-   if (l < maxlen && is_ordinary (key))
-      {
+    }
+    firstkey = false;
+    if (l < maxlen && is_ordinary (key))
+    {
       filename[l] = key;
       filename[l + 1] = '\0';
-      }
-   else if (l > 0 && key == YK_BACKSPACE)
+    }
+    else if (l > 0 && key == YK_BACKSPACE)
       filename[l-1] = '\0';
-   else if (key == YK_RETURN)
+    else if (key == YK_RETURN)
       break;  /* return "filename" */
-   else if (key == YK_ESC)
-      {
+    else if (key == YK_ESC)
+    {
       filename[0] = '\0'; /* return an empty string */
       break;
-      }
-   else
+    }
+    else
       Beep ();
-   }
-ShowMousePointer ();
-is.key = 0;  // Shouldn't have to do that but EditorLoop() is broken
+  }
+  ShowMousePointer ();
+  is.key = 0;  // Shouldn't have to do that but EditorLoop() is broken
 }
 
 
+/*
+ *      strgetl - parse a C-style signed long integer
+ *
+ *	Parse anything that would be a legal C signed long
+ *	integer literal (L and U suffixes are not allowed).
+ *	After the function returns,  points on the first
+ *	character that could not be parsed. If what was parsed
+ *	constitutes a valid integer,  contains its value
+ *	and the return value is a null pointer. Otherwise,
+ *	 is undefined and the return value is a static
+ *	string describing the error.
+ */
+const char *strgetl (const char *& str, long& value)
+{
+  int base = 10;
+  int sign = 1;
+
+  // Leading + or -
+  if (*str == '-')
+  {
+    sign = -1;
+    str++;
+  }
+  else if (*str == '+')
+    str++;
+
+  // 0- or 0x- prefix
+  if (*str == '0' && (str[1] == 'x' || str[1] == 'X'))
+  {
+    base = 16;
+    str += 2;
+  }
+  else if (*str == '0')
+    base = 8;    // Don't advance str, so that "0" passes the next test
+
+  // Check that there is at least one digit
+  if (hextoi (*str) < 0 || hextoi (*str) >= base)
+  {
+    if (base == 8)
+      return "expected an octal digit";
+    else if (base == 10)
+      return "expected a decimal digit";
+    else
+      return "expected a hex digit";
+  }
+
+  // Swallow all non-prefix digits
+  for (value = 0; *str != '\0'; str++)
+  {
+    int digitval = hextoi (*str);
+    if (digitval < 0 || digitval >= base)
+      return 0;
+    value = base * value + sign * digitval;
+  }
+  return 0;
+}
+
diff -uaNr yadex-1.5.2/src/entry2.cc yadex-1.6.0/src/entry2.cc
--- yadex-1.5.2/src/entry2.cc	2000-05-12 23:34:46.000000000 +0200
+++ yadex-1.6.0/src/entry2.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/events.cc yadex-1.6.0/src/events.cc
--- yadex-1.5.2/src/events.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/events.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -63,8 +63,8 @@
  */
 void init_event ()
 {
-head = 0;
-events_in_queue = 0;
+  head = 0;
+  events_in_queue = 0;
 }
 
 
@@ -73,10 +73,10 @@
  */
 void send_event (int event)
 {
-if (events_in_queue == Y_EVENT_QUEUE)
-   fatal_error ("Event buffer full");
-event_queue[(head + events_in_queue) % Y_EVENT_QUEUE] = event;
-events_in_queue++;
+  if (events_in_queue == Y_EVENT_QUEUE)
+    fatal_error ("Event buffer full");
+  event_queue[(head + events_in_queue) % Y_EVENT_QUEUE] = event;
+  events_in_queue++;
 }
 
 
@@ -86,7 +86,7 @@
  */
 int has_event ()
 {
-return events_in_queue != 0;
+  return events_in_queue != 0;
 }
 
 
@@ -96,8 +96,8 @@
  */
 int has_event (int event)
 {
-return events_in_queue != 0
-   && event_queue[head] == event;
+  return events_in_queue != 0
+    && event_queue[head] == event;
 }
 
 
@@ -108,9 +108,9 @@
  */
 int has_key_press_event ()
 {
-return events_in_queue != 0
-   && event_queue[head]
-   && (event_queue[head] & ~ (YK_ALT | YK_CTRL | YK_SHIFT)) < YK__LAST;
+  return events_in_queue != 0
+    && event_queue[head]
+    && (event_queue[head] & ~ (YK_ALT | YK_CTRL | YK_SHIFT)) < YK__LAST;
 }
 
 
@@ -120,15 +120,15 @@
  */
 int get_event ()
 {
-if (events_in_queue == 0)  // The buffer is empty
-   return 0;
+  if (events_in_queue == 0)  // The buffer is empty
+    return 0;
 
-int e = event_queue[head];
-events_in_queue--;
-head++;
-if (head == Y_EVENT_QUEUE)
-   head = 0;
-return e;
+  int e = event_queue[head];
+  events_in_queue--;
+  head++;
+  if (head == Y_EVENT_QUEUE)
+    head = 0;
+  return e;
 }
 
 
diff -uaNr yadex-1.5.2/src/flats.cc yadex-1.6.0/src/flats.cc
--- yadex-1.5.2/src/flats.cc	2000-08-13 18:38:27.000000000 +0200
+++ yadex-1.6.0/src/flats.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -37,6 +37,7 @@
 #include "levels.h"
 #include "lists.h"
 #include "sticker.h"
+#include "wadfile.h"
 #include "wads.h"
 
 
@@ -47,29 +48,30 @@
 
 void ChooseFloorTexture (int x0, int y0, const char *prompt, int listsize, char **list, char *name)
 {
-(void) list;
-(void) listsize;
-// Build a list of char *, for InputNameFromListWithFunc()'s sake
-char **flat_names = (char **) GetMemory (NumFTexture * sizeof *flat_names);
-for (size_t n = 0; n < NumFTexture; n++)
-   flat_names[n] = flat_list[n].name;
-
-HideMousePointer ();
-
-SwitchToVGA256 ();
-/* If we only have a 320x200x256 VGA driver, we must change x0 and y0.
-   Yuck! */
-if (GfxMode > -2)
-   {
-   x0 = -1;
-   y0 = -1;
-   }
-InputNameFromListWithFunc (x0, y0, prompt, (size_t) NumFTexture, flat_names, 5,
-    name, 64, 64, DisplayFloorTexture);
-SwitchToVGA16 ();
+  (void) list;
+  (void) listsize;
+  // Build a list of char *, for InputNameFromListWithFunc()'s sake
+  char **flat_names = (char **) GetMemory (NumFTexture * sizeof *flat_names);
+  for (size_t n = 0; n < NumFTexture; n++)
+    flat_names[n] = flat_list[n].name;
+
+  HideMousePointer ();
+
+  SwitchToVGA256 ();
+  /* If we only have a 320x200x256 VGA driver, we must change x0 and y0.
+     Yuck! */
+  if (GfxMode > -2)
+  {
+    x0 = -1;
+    y0 = -1;
+  }
+  InputNameFromListWithFunc (x0, y0, prompt, (size_t) NumFTexture, flat_names,
+    5, name, 64, 64, DisplayFloorTexture);
 
-ShowMousePointer ();
-FreeMemory (flat_names);
+  SwitchToVGA16 ();
+
+  ShowMousePointer ();
+  FreeMemory (flat_names);
 }
 
 
@@ -80,7 +82,7 @@
  */
 static int flat_list_entry_match (const void *key, const void *flat_list_entry)
 {
-return y_strnicmp ((const char *) key,
+  return y_strnicmp ((const char *) key,
     ((const flat_list_entry_t *) flat_list_entry)->name,
     WAD_FLAT_NAME);
 }
@@ -93,62 +95,54 @@
 
 void DisplayFloorTexture (hookfunc_comm_t *c)
 {
-c->width  = DOOM_FLAT_WIDTH;  // Big deal !
-c->height = DOOM_FLAT_HEIGHT;
-c->flags  = HOOK_SIZE_VALID;
-
-flat_list_entry_t *flat = (flat_list_entry_t *)
-  bsearch (c->name, flat_list, NumFTexture, sizeof *flat_list,
-      flat_list_entry_match);
-if (! flat)  // Not found in list
-   {
-   push_colour (WINBG);
-   DrawScreenBox (c->x0, c->y0, c->x1, c->y1);
-   set_colour (WINFG_DIM);
-   DrawScreenLine (c->x0, c->y0, c->x1, c->y1);
-   DrawScreenLine (c->x0, c->y1, c->x1, c->y0);
-   pop_colour ();
-   return;
-   }
-c->lump_loc.wad = flat->wadfile;
-c->lump_loc.ofs = flat->offset;
-c->lump_loc.len = DOOM_FLAT_WIDTH * DOOM_FLAT_HEIGHT;  // Sorry.
-c->flags |= HOOK_LOC_VALID;
-WadPtr wadfile = flat->wadfile;
-wad_seek (wadfile, flat->offset);
-
-// Optimization for BGI
-#if defined Y_BGI
-unsigned char *pixels;	/* array of pixels that hold the image */
-
-pixels = GetFarMemory (c->width * c->height + 4);
-wad_read_bytes (wadfile, pixels + 4, (long) c->width * c->height);
-if (GfxMode < -1)
-   {
-   /* Probably a bug in the VESA driver...    */
-   /* It requires "size-1" instead of "size"! */
-   ((unsigned short huge *)pixels)[0] = c->width - 1;
-   ((unsigned short huge *)pixels)[1] = c->height - 1;
-   }
-else
-   {
-   ((unsigned short huge *)pixels)[0] = c->width;
-   ((unsigned short huge *)pixels)[1] = c->height;
-   }
-putimage (c->x0, c->y0, pixels, COPY_PUT);
-FreeFarMemory (pixels);
-#else
-Img img (c->width, c->height);
-wad_read_bytes (wadfile, img.wbuf (), (long) c->width * c->height);
-Sticker sticker (img, true);  // Use opaque because it's faster
-sticker.draw (drw, 't', c->x0, c->y0);
-#endif
-c->disp_x0 = c->x0;
-c->disp_y0 = c->y0;
-c->disp_x1 = c->x1;
-c->disp_y1 = c->y1;
+  c->width  = DOOM_FLAT_WIDTH;  // Big deal !
+  c->height = DOOM_FLAT_HEIGHT;
+  c->flags  = HOOK_SIZE_VALID;
+
+  flat_list_entry_t *flat = (flat_list_entry_t *)
+    bsearch (c->name, flat_list, NumFTexture, sizeof *flat_list,
+	flat_list_entry_match);
+  if (flat == 0)  // Not found in list
+  {
+    push_colour (WINBG);
+    DrawScreenBox (c->x0, c->y0, c->x1, c->y1);
+    set_colour (WINFG_DIM);
+    DrawScreenLine (c->x0, c->y0, c->x1, c->y1);
+    DrawScreenLine (c->x0, c->y1, c->x1, c->y0);
+    pop_colour ();
+    return;
+  }
+  c->lump_loc.wad = flat->wadfile;
+  c->lump_loc.ofs = flat->offset;
+  c->lump_loc.len = DOOM_FLAT_WIDTH * DOOM_FLAT_HEIGHT;  // Sorry.
+  c->flags |= HOOK_LOC_VALID;
+  const Wad_file *wadfile = flat->wadfile;
+  wadfile->seek (flat->offset);
+  if (wadfile->error ())
+  {
+    warn ("%s: can't seek to %lXh\n",
+	wadfile->pathname (), (unsigned long) flat->offset);
+    warn ("%.8s: seek error\n", c->name);
+  }
+
+  c->img.resize (c->width, c->height);
+  c->img.set_opaque (true);
+  long nbytes = (long) c->width * c->height;
+  wadfile->read_bytes (c->img.wbuf (), nbytes);
+  if (wadfile->error ())
+  {
+    warn ("%s: read error\n", wadfile->where ());
+    warn ("%.8s: short read\n", c->name);
+  }
+  Sticker sticker (c->img, true);  // Use opaque because it's faster
+  sticker.draw (drw, 't', c->x0, c->y0);
+
+  c->disp_x0 = c->x0;
+  c->disp_y0 = c->y0;
+  c->disp_x1 = c->x1;
+  c->disp_y1 = c->y1;
 
-c->flags |= HOOK_DRAWN;
+  c->flags |= HOOK_DRAWN;
 }
 
 
@@ -158,17 +152,17 @@
  */
 void display_flat_depressed (hookfunc_comm_t *c)
 {
-draw_box_border (c->x0, c->y0, c->x1 - c->x0 + 1, c->y1 - c->y0 + 1,
-   HOLLOW_BORDER, 0);
-c->x0 += HOLLOW_BORDER;
-c->y0 += HOLLOW_BORDER;
-c->x1 -= HOLLOW_BORDER;
-c->y1 -= HOLLOW_BORDER;
-DisplayFloorTexture (c);
-c->x0 -= HOLLOW_BORDER;
-c->y0 -= HOLLOW_BORDER;
-c->x1 += HOLLOW_BORDER;
-c->y1 += HOLLOW_BORDER;
+  draw_box_border (c->x0, c->y0, c->x1 - c->x0 + 1, c->y1 - c->y0 + 1,
+    HOLLOW_BORDER, 0);
+  c->x0 += HOLLOW_BORDER;
+  c->y0 += HOLLOW_BORDER;
+  c->x1 -= HOLLOW_BORDER;
+  c->y1 -= HOLLOW_BORDER;
+  DisplayFloorTexture (c);
+  c->x0 -= HOLLOW_BORDER;
+  c->y0 -= HOLLOW_BORDER;
+  c->x1 += HOLLOW_BORDER;
+  c->y1 += HOLLOW_BORDER;
 }
 
 
diff -uaNr yadex-1.5.2/src/game.cc yadex-1.6.0/src/game.cc
--- yadex-1.5.2/src/game.cc	2000-05-11 00:01:58.000000000 +0200
+++ yadex-1.6.0/src/game.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,24 +32,11 @@
 #include "acolours.h"
 #include "game.h"
 #include "gamesky.h"
-#include "macro.h"
+#include "locate.h"
 #include "things.h"
 #include "trace.h"
 
 
-static const char *standard_directories[] =
-   {
-   "./%b",
-   "~/.yadex/%v/%b",
-   "%i/%b",
-   "/usr/local/share/games/yadex/%v/%b",
-   "/usr/share/games/yadex/%v/%b",
-   "/usr/local/share/games/yadex/%b",
-   "/usr/share/games/yadex/%b",
-   0
-   };
-
-
 const char ygd_file_magic[] = "# Yadex game definition file version 4";
 
 
@@ -80,47 +67,28 @@
 char readbuf[YGD_BUF];		/* buffer the line is read into */
 #define MAX_TOKENS 10		/* tokens per line */
 int lineno;			/* current line of file */
-const char **dirname;
-char filename[257];
-char basename[13];
+char filename[1025];
+char basename[256];
 
 al_scps (basename, game,   sizeof basename - 1);
 al_saps (basename, ".ygd", sizeof basename - 1);
 
 /* Locate the game definition file. */
 {
-   const char *home = getenv ("HOME");
-
-   for (dirname = standard_directories; *dirname; dirname++)
-      {
-      int r = macro_expand (filename, sizeof filename - 1, *dirname,
-	  "%b", basename,
-	  "%g", game,
-	  "%i", install_dir,
-	  "%v", yadex_version,
-	  "~",  home,
-	  (const char *) 0);
-      if (r)
-      {
-	trace ("ygdloc", "%s: Could not expand macro #%d", *dirname, r);
-	continue;
-      }
-      ygdfile = fopen (filename, "r");
-      if (ygdfile)
-	 {
-	 trace ("ygdloc", "%s: hit", filename);
-	 break;
-	 }
-      trace ("ygcloc", "%s: miss (%s)", filename, strerror (errno));
-      }
-
-   if (! ygdfile)
-      fatal_error ("Game definition file \"%s\" not found (%s)",
-	 basename, strerror (errno));
-   else
-      printf ("Using game definition file \"%s\".\n", filename);
+   Locate locate (yadex_share_path, basename, false);
+   const char *pathname = locate.get_next ();
+   if (pathname == NULL)
+      fatal_error ("Game definition file \"%s\" not found", basename);
+   if (strlen (pathname) > sizeof filename - 1)
+      fatal_error ("%s: file name too long");
+   strcpy (filename, pathname);
+   printf ("Reading game definition file \"%s\".\n", filename);
 }
 
+ygdfile = fopen (filename, "r");
+if (ygdfile == NULL)
+   fatal_error ("%s: %s", filename, strerror (errno));
+
 /* The first line of the ygd file must
    contain exactly ygd_file_magic. */
 if (fgets (readbuf, sizeof readbuf, ygdfile) == NULL
@@ -128,7 +96,7 @@
    || readbuf[sizeof ygd_file_magic - 1] != '\n'
    || readbuf[sizeof ygd_file_magic] != '\0')
    {
-   report_error ("%s is not a valid Yadex game definition file", filename);
+   err ("%s is not a valid Yadex game definition file", filename);
    fatal_error ("Perhaps a leftover from a previous version of Yadex ?");
    }
 
@@ -368,12 +336,12 @@
 bool abort = false;
 if (yg_level_format == YGLF__)
    {
-   report_error ("%s: Missing \"level_format\" directive.", filename);
+   err ("%s: Missing \"level_format\" directive.", filename);
    abort = true;
    }
 if (yg_level_name == YGLN__)
    {
-   report_error ("%s: Missing \"level_name\" directive.", filename);
+   err ("%s: Missing \"level_name\" directive.", filename);
    abort = true;
    }
 // FIXME perhaps print a warning message if picture_format
@@ -383,6 +351,10 @@
    exit (2);
 }
 
+#if 0
+
+#endif
+
 /*
  *	Second pass
  */
diff -uaNr yadex-1.5.2/src/game.h yadex-1.6.0/src/game.h
--- yadex-1.5.2/src/game.h	2000-04-24 02:17:20.000000000 +0200
+++ yadex-1.6.0/src/game.h	2002-05-09 10:36:19.000000000 +0200
@@ -15,7 +15,7 @@
  *	Data structures for game definition data
  */
 
-/* ldt     */
+// ldt    
 typedef struct
    {
    int number;
@@ -24,14 +24,14 @@
    const char *longdesc;
    } ldtdef_t;
 
-/* ldtgroup   */
+// ldtgroup  
 typedef struct
    {
    char ldtgroup;
    const char *desc;
    } ldtgroup_t;
 
-/* st    */
+// st   
 typedef struct
    {
    int number;
@@ -39,7 +39,7 @@
    const char *longdesc;
    } stdef_t;
 
-/* thing      []*/
+// thing      []
 typedef struct
    {
    int number;		// Thing number
@@ -53,7 +53,7 @@
         thinggroup for each thing when drawing things */
 const char THINGDEF_SPECTRAL = 0x01;
 
-/* thinggroup    */
+// thinggroup   
 typedef struct
    {
    char thinggroup;	// Thing group
@@ -83,7 +83,7 @@
 extern al_llist_t *thinggroup;
 
 
-/* shorthands to make program more readable */
+// Shorthands to make the code more readable
 #define CUR_LDTDEF     ((ldtdef_t     *)al_lptr (ldtdef    ))
 #define CUR_LDTGROUP   ((ldtgroup_t   *)al_lptr (ldtgroup  ))
 #define CUR_STDEF      ((stdef_t      *)al_lptr (stdef     ))
diff -uaNr yadex-1.5.2/src/gamedef.h yadex-1.6.0/src/gamedef.h
--- yadex-1.5.2/src/gamedef.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/gamedef.h	2001-10-11 11:08:22.000000000 +0200
@@ -0,0 +1,111 @@
+/*
+ *	gamedef.h - Game_def class
+ *	AYM 2000-08-30
+ */
+
+
+#ifndef YH_GAMEDEF  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_GAMEDEF
+
+
+class Game_def_priv;
+
+
+typedef struct
+{
+  char ldtgroup;
+  const char *shortdesc;
+  const char *longdesc;
+} linedef_type_t;
+
+
+typedef char linedef_type_group_id_t;
+
+
+typedef struct
+{
+  const char *desc;
+} linedef_type_group_t;
+
+
+typedef struct
+{
+  const char *shortdesc;
+  const char *longdesc;
+} sector_type_t;
+
+
+typedef char thing_type_group_id_t;
+
+
+typedef struct
+{
+  char flags;		// Flags
+  int radius;		// Radius of thing
+  const char *desc;	// Short description of thing
+  const char *sprite;	// Root of name of sprite for thing
+} thing_type_t;
+
+
+const char THINGDEF_SPECTRAL = 0x01;
+
+
+typedef struct
+{
+  char thinggroup;	// Thing group
+  rgb_c rgb;		// RGB colour
+  acolour_t acn;	// Application colour#
+  const char *desc;	// Description of thing group
+} thing_type_group_t;
+
+
+typedef enum { YGLF__, YGLF_ALPHA, YGLF_DOOM, YGLF_HEXEN } yglf_t;
+typedef enum { YGLN__, YGLN_E1M10, YGLN_E1M1, YGLN_MAP01 } ygln_t;
+typedef enum { YGPF_NORMAL, YGPF_ALPHA, YGPF_PR } ygpf_t;
+typedef enum { YGTF_NORMAL, YGTF_NAMELESS, YGTF_STRIFE11 } ygtf_t;
+typedef enum { YGTL_NORMAL, YGTL_TEXTURES, YGTL_NONE } ygtl_t;
+
+
+/* shorthands to make program more readable */
+
+#define LDT_FREE    '\0'  /* KLUDGE: bogus ldt group   (see game.c) */
+#define ST_FREE     '\0'  /* KLUDGE: bogus sector type (see game.c) */
+#define THING_FREE  '\0'  /* KLUDGE: bogus thing group (see game.c) */
+
+
+/*
+ *	Game_def - contain all the definitions relative to a game
+ */
+class Game_def
+{
+  public :
+    Game_def ();
+    ~Game_def ();
+    const linedef_type_t& linedef_type (wad_ldtype_t type) const;
+    const sector_type_t&  sector_type  (wad_stype_t  type) const;
+    const thing_type_t&   thing_type   (wad_ttype_t  type) const;
+    void linedef_type     (wad_ldtype_t type, linedef_type_t& data);
+    void sector_type      (wad_stype_t type,  sector_type_t&  data);
+    void thing_type       (wad_ttype_t type,  thing_type_t&   data);
+    void del_linedef_type (wad_ldtype_t type);
+    void del_sector_type  (wad_stype_t  type);
+    void del_thing_type   (wad_ttype_t  type);
+    int level_format      (yglf_t level_format);
+    int level_name        (yglf_t level_name);
+    int picture_format    (ygpf_t picture_format);
+    int texture_format    (ygtf_t texture_format);
+    int texture_lumps     (ygtl_t texture_lumps);
+    yglf_t level_format   () const;
+    ygln_t level_name     () const;
+    ygpf_t picture_format () const;
+    ygtf_t texture_format () const;
+    ygtl_t texture_lumps  () const;
+
+  private :
+    Game_def            (const Game_def&);	// Too lazy to implement it
+    Game_def& operator= (const Game_def&);	// Too lazy to implement it
+    Game_def_priv *priv;
+};
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/gcolour1.cc yadex-1.6.0/src/gcolour1.cc
--- yadex-1.5.2/src/gcolour1.cc	2000-08-10 23:57:40.000000000 +0200
+++ yadex-1.6.0/src/gcolour1.cc	2003-03-28 13:37:32.000000000 +0100
@@ -20,7 +20,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -41,7 +41,9 @@
 #include "gcolour1.h"
 #include "gcolour2.h"
 #include "gfx.h"
+#include "img.h"	/* IMG_TRANSP */
 #include "rgb.h"
+#include "wadfile.h"
 #include "wads.h"
 
 
@@ -73,9 +75,22 @@
    }
 
 dpal = (u8 *) GetFarMemory (3 * DOOM_COLOURS);
-wad_seek (dir->wadfile, dir->dir.start);
+dir->wadfile->seek (dir->dir.start);
+if (dir->wadfile->error ())
+   {
+   warn ("%s: can't seek to %lXh\n",
+       dir->wadfile->pathname (), (unsigned long) dir->dir.start);
+   warn ("PLAYPAL: seek error\n");
+   }
 for (int n = 0; n <= playpalnum; n++)
-   wad_read_bytes (dir->wadfile, dpal, 3 * DOOM_COLOURS);
+   {
+   dir->wadfile->read_bytes (dpal, 3 * DOOM_COLOURS);
+   if (dir->wadfile->error ())
+      {
+      warn ("%s: read error\n", dir->wadfile->where ());
+      warn ("PLAYPAL: error reading entry #%d\n", n);
+      }
+   }
 #if defined Y_BGI
 for (int n = 0; n < 3 * DOOM_COLOURS; n++)
    dpal[n] /= 4;
@@ -96,21 +111,22 @@
    }
 game_colours = alloc_colours (rgb_values, DOOM_COLOURS);
 
-// Find the colour closest to colour 0
+// Find the colour closest to IMG_TRANSP
 {
-  colour0 = 0;
+  colour0 = IMG_TRANSP;
   int smallest_delta = INT_MAX;
 
   for (size_t n = 1; n < DOOM_COLOURS; n++)
   {
-    int delta = rgb_values[0] - rgb_values[n];
+    int delta = rgb_values[IMG_TRANSP] - rgb_values[n];
     if (delta < smallest_delta)
     {
       colour0 = n;
       smallest_delta = delta;
     }
   }
-  verbmsg ("Colour 0 remapped to %d (delta %d)\n", colour0, smallest_delta);
+  verbmsg ("colours: colour %d remapped to %d (delta %d)\n",
+    IMG_TRANSP, colour0, smallest_delta);
 }
 
 #endif
diff -uaNr yadex-1.5.2/src/gcolour2.cc yadex-1.6.0/src/gcolour2.cc
--- yadex-1.5.2/src/gcolour2.cc	2000-08-10 23:04:26.000000000 +0200
+++ yadex-1.6.0/src/gcolour2.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/gcolour3.cc yadex-1.6.0/src/gcolour3.cc
--- yadex-1.5.2/src/gcolour3.cc	2000-04-20 23:52:42.000000000 +0200
+++ yadex-1.6.0/src/gcolour3.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/gcolour3.h yadex-1.6.0/src/gcolour3.h
--- yadex-1.5.2/src/gcolour3.h	2000-06-21 00:53:57.000000000 +0200
+++ yadex-1.6.0/src/gcolour3.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/geom.cc yadex-1.6.0/src/geom.cc
--- yadex-1.5.2/src/geom.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/geom.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/gfx.cc yadex-1.6.0/src/gfx.cc
--- yadex-1.5.2/src/gfx.cc	2000-08-16 00:08:41.000000000 +0200
+++ yadex-1.6.0/src/gfx.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -39,7 +39,7 @@
 #include "gcolour2.h"
 #include "gcolour3.h"
 #include "gfx.h"
-#include "levels.h"  // Level
+#include "levels.h"  /* Level */
 #include "x11.h"
 
 #ifdef Y_DOS
@@ -48,13 +48,13 @@
 
 
 
-/* if your graphics driver doesn't like circles, draw squares instead */
+// If your graphics driver doesn't like circles, draw squares instead
 #if defined NO_CIRCLES && defined Y_BGI
 #define circle (x, y, r)	line (x - r, y - r, x - r, y + r); \
 				line (x - r, y + r, x + r, y + r); \
 				line (x + r, y + r, x + r, y - r); \
 				line (x + r, y - r, x - r, y - r)
-#endif /* NO_CIRCLES */
+#endif  /* NO_CIRCLES */
 
 /* Parameters set by the command line args and config file */
 const char *BGIDriver = "VESA";	// BGI: default extended BGI driver
@@ -77,8 +77,8 @@
 int ScrMaxY;		// Maximum display Y-coord of screen/window
 int ScrCenterX;		// Display X-coord of centre of screen/window
 int ScrCenterY;		// Display Y-coord of centre of screen/window
-int FONTH;
-int FONTW;
+unsigned FONTH;
+unsigned FONTW;
 int font_xofs;
 int font_yofs;
 
@@ -112,7 +112,6 @@
 int      win_vis_class;	// The class of win's visual
 VisualID win_vis_id;	// The ID of win's visual
 int      win_depth;	// The depth of win in bits
-int      win_bpp;	// The depth of win in bytes
 int      x_server_big_endian = 0;	// Is the X server big endian ?
 int      ximage_bpp;	// Number of bytes per pixels in XImages
 int      ximage_quantum;// Pad XImages lines to a multiple of that many bytes
@@ -129,41 +128,41 @@
 #if defined Y_BGI && defined CIRRUS_PATCH
 char mp[256];
 char HWCursor[] =
-   {
-   0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
-   0x30, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00,
-   0x1F, 0x00, 0x00, 0x00, 0x1F, 0xC0, 0x00, 0x00,
-   0x0F, 0xF0, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00,
-   0x07, 0xC0, 0x00, 0x00, 0x07, 0xE0, 0x00, 0x00,
-   0x03, 0x70, 0x00, 0x00, 0x02, 0x38, 0x00, 0x00,
-   0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x3F, 0xFF, 0xFF, 0xFF, 0x0F, 0xFF, 0xFF, 0xFF,
-   0x83, 0xFF, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0xFF,
-   0xC0, 0x3F, 0xFF, 0xFF, 0xC0, 0x0F, 0xFF, 0xFF,
-   0xE0, 0x07, 0xFF, 0xFF, 0xE0, 0x0F, 0xFF, 0xFF,
-   0xF0, 0x1F, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF,
-   0xF8, 0x07, 0xFF, 0xFF, 0xF8, 0x83, 0xFF, 0xFF,
-   0xFD, 0xC7, 0xFF, 0xFF, 0xFF, 0xEF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
-   };
-#endif /* Y_BGI && CIRRUS_PATCH */
+{
+  0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x30, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00,
+  0x1F, 0x00, 0x00, 0x00, 0x1F, 0xC0, 0x00, 0x00,
+  0x0F, 0xF0, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00,
+  0x07, 0xC0, 0x00, 0x00, 0x07, 0xE0, 0x00, 0x00,
+  0x03, 0x70, 0x00, 0x00, 0x02, 0x38, 0x00, 0x00,
+  0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3F, 0xFF, 0xFF, 0xFF, 0x0F, 0xFF, 0xFF, 0xFF,
+  0x83, 0xFF, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0xFF,
+  0xC0, 0x3F, 0xFF, 0xFF, 0xC0, 0x0F, 0xFF, 0xFF,
+  0xE0, 0x07, 0xFF, 0xFF, 0xE0, 0x0F, 0xFF, 0xFF,
+  0xF0, 0x1F, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF,
+  0xF8, 0x07, 0xFF, 0xFF, 0xF8, 0x83, 0xFF, 0xFF,
+  0xFD, 0xC7, 0xFF, 0xFF, 0xFF, 0xEF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+#endif  /* Y_BGI && CIRRUS_PATCH */
 
 
 /*
@@ -181,584 +180,589 @@
  */
 int InitGfx (void)
 {
-// Initialization is in fact not necessary
-int width;
-int height;
+  // Initialization is in fact not necessary
+  int width;
+  int height;
 
 #if defined Y_BGI
-static bool firsttime = true;
-static int  gdriver;
-static int  gmode;
-int         errorcode = grNoInitGraph;
+  static bool firsttime = true;
+  static int  gdriver;
+  static int  gmode;
+  int         errorcode = grNoInitGraph;
 
-verbmsg ("Switching to graphics mode...\n");
+  verbmsg ("Switching to graphics mode...\n");
 #if defined Y_BGI && defined CIRRUS_PATCH
-if (CirrusCursor)
-   SetHWCursorMap (HWCursor);
-#endif /* Y_BGI && CIRRUS_PATCH */
-if (firsttime)
-   {
-   if (VideoMode > 0)
-      {
+  if (CirrusCursor)
+    SetHWCursorMap (HWCursor);
+#endif  /* Y_BGI && CIRRUS_PATCH */
+  if (firsttime)
+  {
+    if (VideoMode > 0)
+    {
       gdriver = cooked_installuserdriver (BGIDriver, NULL);
       gmode = VideoMode;
       initgraph (&gdriver, &gmode, install_dir);
       errorcode = graphresult ();
-      }
-   if (errorcode != grOk)
-      {
+    }
+    if (errorcode != grOk)
+    {
       gdriver = VGA;
       gmode = VGAHI;
-      }
-   }
-if (gdriver == VGA || !firsttime)
-   {
-   initgraph (&gdriver, &gmode, install_dir);
-   errorcode = graphresult ();
-   if (errorcode != grOk)
+    }
+  }
+  if (gdriver == VGA || !firsttime)
+  {
+    initgraph (&gdriver, &gmode, install_dir);
+    errorcode = graphresult ();
+    if (errorcode != grOk)
       fatal_error ("graphics error: %s", grapherrormsg (errorcode));
-   }
-if (gdriver == VGA)
-   GfxMode = 2; /* 640x480x16 */
-else
-   {
-   GfxMode = -gmode; /* 640x480x256, 800x600x256, or 1024x768x256 */
-   SetDoomPalette (0);
-   }
-verbmsg ("GfxMode=%d\n", GfxMode);
-setlinestyle (0, 0, 1);
-setbkcolor (TranslateToDoomColor (BLACK));
-settextstyle (0, 0, 1);
-firsttime = false;
-width = getmaxx () + 1;
-height = getmaxy () + 1;
-
-#elif defined Y_X11
-
-/*
- *	Open display and get screen number
- */
-dpy = XOpenDisplay (0);
-if (! dpy)
-   {
-   report_error ("Can't open display");
-   return 1;
-   }
-scn = DefaultScreen (dpy);
-{
-verbmsg ("X server endianness: ");
-int r = ImageByteOrder (dpy);
-if (r == LSBFirst)
-   {
-   verbmsg ("little-endian\n");
-   x_server_big_endian = 0;
-   }
-else if (r == MSBFirst)
-   {
-   verbmsg ("big-endian\n");
-   x_server_big_endian = 1;
-   }
-else
-   {
-   verbmsg ("unknown\n");
-   warn ("don't understand X server's endianness code %d\n", r);
-   warn ("assuming same endianness as CPU.\n");
-   x_server_big_endian = cpu_big_endian;
-   }
-}
-int screen_width  = DisplayWidth  (dpy, scn);
-int screen_height = DisplayHeight (dpy, scn);
-
-
-/*
- *	Create the window
- */
-width  = initial_window_width.pixels  (screen_width);
-height = initial_window_height.pixels (screen_height);
-win = XCreateSimpleWindow (dpy, DefaultRootWindow (dpy),
-   10, 10, width, height, 0, 0, 0);
-//win = DefaultRootWindow (dpy);
-{
-XWindowAttributes wa;
-XVisualInfo model;
-XVisualInfo *vis_info;
-int nvisuals;
-
-XGetWindowAttributes (dpy, win, &wa);
-win_vis   = wa.visual;
-win_depth = wa.depth;
-if (win_depth == 8)
-   win_bpp = 1;
-else if (win_depth == 16)
-   win_bpp = 2;
-else if (win_depth == 24)
-   win_bpp = 3;
-else if (win_depth == 32)
-   win_bpp = 4;
-else
-   fatal_error ("win_depth = %d", win_depth);
-verbmsg ("depth %d (%d B)\n", win_depth, win_bpp);
-
-/*
- *	Retrieve info regarding win's visual
- */
-model.visualid = XVisualIDFromVisual (win_vis);
-vis_info = XGetVisualInfo (dpy, VisualIDMask, &model, &nvisuals);
-if (! vis_info)
-   fatal_error ("XGetVisualInfo returned NULL for ID %d", model.visualid);
-if (nvisuals != 1)
-   fatal_error ("XGetVisualInfo returned %d visuals", nvisuals);
-if (vis_info->depth != win_depth)
-   fatal_error ("Visual depth %d <> win depth %d", vis_info->depth, win_depth);
-win_vis_id    = vis_info->visualid;
+  }
+  if (gdriver == VGA)
+    GfxMode = 2;  // 640x480x16
+  else
+  {
+    GfxMode = -gmode;  // 640x480x256, 800x600x256, or 1024x768x256
+    SetDoomPalette (0);
+  }
+  verbmsg ("GfxMode=%d\n", GfxMode);
+  setlinestyle (0, 0, 1);
+  setbkcolor (TranslateToDoomColor (BLACK));
+  settextstyle (0, 0, 1);
+  firsttime = false;
+  width = getmaxx () + 1;
+  height = getmaxy () + 1;
+
+#elif defined Y_X11
+
+  /*
+   *	Open display and get screen number
+   */
+  dpy = XOpenDisplay (0);
+  if (! dpy)
+  {
+    err ("Can't open display");
+    return 1;
+  }
+  scn = DefaultScreen (dpy);
+  {
+    verbmsg ("X: server endianness: ");
+    int r = ImageByteOrder (dpy);
+    if (r == LSBFirst)
+    {
+      verbmsg ("little-endian\n");
+      x_server_big_endian = 0;
+    }
+    else if (r == MSBFirst)
+    {
+      verbmsg ("big-endian\n");
+      x_server_big_endian = 1;
+    }
+    else					// Can't happen
+    {
+      verbmsg ("unknown\n");
+      warn ("don't understand X server's endianness code %d\n", r);
+      warn ("assuming same endianness as CPU.\n");
+      x_server_big_endian = cpu_big_endian;
+    }
+  }
+  int screen_width  = DisplayWidth  (dpy, scn);
+  int screen_height = DisplayHeight (dpy, scn);
+  // On QNX 6, XFree returns silly values. Use a plausible default instead.
+  if (screen_width == 16383 && screen_height == 16383)
+  {
+    warn ("QNX XFree bug detected (width %d, height %d)\n",
+	screen_width, screen_height);
+    screen_width  = 1024;
+    screen_height = 768;
+  }
+
+
+  /*
+   *	Create the window
+   */
+  width  = initial_window_width.pixels  (screen_width);
+  height = initial_window_height.pixels (screen_height);
+  win = XCreateSimpleWindow (dpy, DefaultRootWindow (dpy),
+    10, 10, width, height, 0, 0, 0);
+  //win = DefaultRootWindow (dpy);
+  {
+    XWindowAttributes wa;
+    XVisualInfo model;
+    XVisualInfo *vis_info;
+    int nvisuals;
+
+    XGetWindowAttributes (dpy, win, &wa);
+    win_vis   = wa.visual;
+    win_depth = wa.depth;
+    verbmsg ("X: window depth: %d b\n", win_depth);
+
+    /*
+     *	Retrieve info regarding win's visual
+     */
+    model.visualid = XVisualIDFromVisual (win_vis);
+    vis_info = XGetVisualInfo (dpy, VisualIDMask, &model, &nvisuals);
+    if (! vis_info)
+      fatal_error ("XGetVisualInfo returned NULL for ID %d", model.visualid);
+    if (nvisuals != 1)
+      fatal_error ("XGetVisualInfo returned %d visuals", nvisuals);
+    if (vis_info->depth != win_depth)
+      fatal_error ("Visual depth %d <> win depth %d", vis_info->depth, win_depth);
+    win_vis_id    = vis_info->visualid;
 #if defined _cplusplus || defined __cplusplus
-win_vis_class = vis_info->c_class;
+    win_vis_class = vis_info->c_class;
 #elif
-win_vis_class = vis_info->class;
+    win_vis_class = vis_info->class;
 #endif
-win_ncolours  = vis_info->colormap_size;
-win_r_mask    = vis_info->red_mask;
-win_g_mask    = vis_info->green_mask;
-win_b_mask    = vis_info->blue_mask;
-XFree (vis_info);
-verbmsg ("id %d  class ", (int) win_vis_id);
-if (win_vis_class == PseudoColor)
-   verbmsg ("PseudoColor");
-else if (win_vis_class == TrueColor)
-   verbmsg ("TrueColor");
-else if (win_vis_class == DirectColor)
-   verbmsg ("DirectColor");
-else if (win_vis_class == StaticColor)
-   verbmsg ("StaticColor");
-else if (win_vis_class == GrayScale)
-   verbmsg ("GrayScale");
-else if (win_vis_class == StaticGray)
-   verbmsg ("StaticGray");
-else
-   verbmsg ("unknown (%d)", win_vis_class);
-verbmsg (" colours %d  masks %08lX %08lX %08lX\n",
-   win_ncolours, win_r_mask, win_g_mask, win_b_mask);
-
-/* Compute win_[rgb]_bits and win_[rgb]_ofs */
-/* FIXME can enter infinite loop if MSb of either mask is set
-   and >> sign extends. */
-if (win_r_mask)
-   {
-   xpv_t mask;
-   for (mask = win_r_mask, win_r_ofs = 0; ! (mask & 1); mask >>= 1)
-      win_r_ofs++;
-   for (win_r_bits = 0; mask & 1; mask >>= 1)
-      win_r_bits++;
-   }
-if (win_g_mask)
-   {
-   xpv_t mask;
-   for (mask = win_g_mask, win_g_ofs = 0; ! (mask & 1); mask >>= 1)
-      win_g_ofs++;
-   for (win_g_bits = 0; mask & 1; mask >>= 1)
-      win_g_bits++;
-   }
-if (win_b_mask)
-   {
-   xpv_t mask;
-   for (mask = win_b_mask, win_b_ofs = 0; ! (mask & 1); mask >>= 1)
-      win_b_ofs++;
-   for (win_b_bits = 0; mask & 1; mask >>= 1)
-      win_b_bits++;
-   }
-verbmsg ("r_ofs %d  r_bits %d  ", win_r_ofs, win_r_bits);
-verbmsg ("g_ofs %d  g_bits %d  ", win_g_ofs, win_g_bits);
-verbmsg ("b_ofs %d  b_bits %d\n", win_b_ofs, win_b_bits);
-}
-
-/*
- *	Get info relevant to XImages
- */
-ximage_bpp     = 0;
-ximage_quantum = 0;
-{
-int nformats = 0;
-XPixmapFormatValues *format = XListPixmapFormats (dpy, &nformats);
-if (format == 0 || nformats < 1)
-   {
-   warn ("XListPixmapFormats() trouble (ret=%p, n=%d).\n", format, nformats);
-   goto ximage_done;
-   }
-/* Pick the best possible pixmap format. It must have the same
-   depth as the drawable. Should there be several formats that
-   satisfy that requirement (I don't think that ever happens),
-   prefer the one where the line quantum is equal to the number
-   of bits per pixel, as that is easier to work with. */
-{
-const XPixmapFormatValues *best = 0;
-for (int n = 0; n < nformats; n++)
-   {
-   if (format[n].depth != win_depth)
-      continue;
-   best = format + n;
-   if (format[n].scanline_pad == format[n].bits_per_pixel)
-      break;
-   }
-if (best != 0)
-   {
-   int bits_per_pixel = best->bits_per_pixel;
-   if (bits_per_pixel % 8)  // Paranoia
+    win_ncolours  = vis_info->colormap_size;
+    win_r_mask    = vis_info->red_mask;
+    win_g_mask    = vis_info->green_mask;
+    win_b_mask    = vis_info->blue_mask;
+    XFree (vis_info);
+    verbmsg ("X: visual: id %xh, class ", (unsigned) win_vis_id);
+    if (win_vis_class == PseudoColor)
+      verbmsg ("PseudoColor");
+    else if (win_vis_class == TrueColor)
+      verbmsg ("TrueColor");
+    else if (win_vis_class == DirectColor)
+      verbmsg ("DirectColor");
+    else if (win_vis_class == StaticColor)
+      verbmsg ("StaticColor");
+    else if (win_vis_class == GrayScale)
+      verbmsg ("GrayScale");
+    else if (win_vis_class == StaticGray)
+      verbmsg ("StaticGray");
+    else
+      verbmsg ("unknown (%d)", win_vis_class);
+    verbmsg (", colours %d, masks %08lX %08lX %08lX\n",
+      win_ncolours, win_r_mask, win_g_mask, win_b_mask);
+
+    // Compute win_[rgb]_bits and win_[rgb]_ofs
+    /* FIXME can enter infinite loop if MSb of either mask is set
+       and >> sign extends. */
+    if (win_r_mask)
+    {
+      xpv_t mask;
+      for (mask = win_r_mask, win_r_ofs = 0; ! (mask & 1); mask >>= 1)
+	 win_r_ofs++;
+      for (win_r_bits = 0; mask & 1; mask >>= 1)
+	 win_r_bits++;
+    }
+    if (win_g_mask)
+    {
+      xpv_t mask;
+      for (mask = win_g_mask, win_g_ofs = 0; ! (mask & 1); mask >>= 1)
+	 win_g_ofs++;
+      for (win_g_bits = 0; mask & 1; mask >>= 1)
+	 win_g_bits++;
+    }
+    if (win_b_mask)
+    {
+      xpv_t mask;
+      for (mask = win_b_mask, win_b_ofs = 0; ! (mask & 1); mask >>= 1)
+	 win_b_ofs++;
+      for (win_b_bits = 0; mask & 1; mask >>= 1)
+	 win_b_bits++;
+    }
+    verbmsg ("X: visual: "
+	     "r_ofs %d, r_bits %d, ", win_r_ofs, win_r_bits);
+    verbmsg ("g_ofs %d, g_bits %d, ", win_g_ofs, win_g_bits);
+    verbmsg ("b_ofs %d, b_bits %d\n", win_b_ofs, win_b_bits);
+  }
+
+  /*
+   *	Get info relevant to XImages
+   */
+  ximage_bpp     = 0;
+  ximage_quantum = 0;
+  {
+    int nformats = 0;
+    XPixmapFormatValues *format = XListPixmapFormats (dpy, &nformats);
+    if (format == 0 || nformats < 1)
+    {
+      warn ("XListPixmapFormats() trouble (ret=%p, n=%d).\n", format, nformats);
+      goto ximage_done;
+    }
+    /* Pick the best possible pixmap format. Prefer one that has the
+       same depth as the drawable, as it is likely to be the fastest
+       one. Should there be several formats that satisfy that
+       requirement (I don't think that ever happens), prefer the one
+       where the line quantum is equal to the number of bits per
+       pixel, as that is easier to work with. */
+    {
+      const XPixmapFormatValues *best = 0;
+      for (int n = 0; n < nformats; n++)
       {
-      round_up (bits_per_pixel, 8);
-      warn ("XImage format has bad bits_per_pixel %d. Rounding up to %d.\n",
-	 best->bits_per_pixel, bits_per_pixel);
+	const XPixmapFormatValues *current = format + n;
+	verbmsg ("X: pixmap format:"
+	    " #%d, depth %2d, bits_per_pixel %2d, scanline_pad %2d\n",
+	    n, current->depth, current->bits_per_pixel, current->scanline_pad);
+	if (best == 0)
+	{
+	  best = current;
+	  continue;
+	}
+	int cgoodness = 2 * (current->depth == win_depth)
+		      + 1 * (current->scanline_pad == current->bits_per_pixel);
+	int bgoodness = 2 * (best->depth == win_depth)
+		      + 1 * (best->scanline_pad == best->bits_per_pixel);
+	if (cgoodness > bgoodness)
+	  best = current;
       }
-   int scanline_pad = best->scanline_pad;
-   if (best->scanline_pad % 8)  // Paranoia
+      verbmsg ("X: pixmap format: best is #%d\n", int (best - format));
+      if (best != 0)
       {
-      round_up (scanline_pad, 8);
-      warn ("XImage format has bad scanline_pad %d. Rounding up to %d.\n",
-	 best->scanline_pad, scanline_pad);
+	int bits_per_pixel = best->bits_per_pixel;
+	if (bits_per_pixel % 8)  // Paranoia
+	 {
+	   round_up (bits_per_pixel, 8);
+	   warn ("XImage format has bad bits_per_pixel %d. Rounding up to %d.\n",
+	      best->bits_per_pixel, bits_per_pixel);
+	 }
+	int scanline_pad = best->scanline_pad;
+	if (best->scanline_pad % 8)  // Paranoia
+	 {
+	   round_up (scanline_pad, 8);
+	   warn ("XImage format has bad scanline_pad %d. Rounding up to %d.\n",
+	      best->scanline_pad, scanline_pad);
+	 }
+	ximage_bpp     = bits_per_pixel / 8;
+	ximage_quantum = scanline_pad   / 8;
       }
-   ximage_bpp     = bits_per_pixel / 8;
-   ximage_quantum = scanline_pad   / 8;
-   }
-}
-if (ximage_bpp == 0 || ximage_quantum == 0)
-   {
-   warn ("XListPixmapFormats() returned not suitable formats.\n"); 
-   goto ximage_done;
-   }
-ximage_done:
-if (format != 0)
-   XFree (format);
-}
-/* Could not obtain authoritative/good values. Warn and guess
-   plausible values. */
-if (ximage_bpp == 0 || ximage_quantum == 0)
-   {
-   if (ximage_bpp == 0)
-      ximage_bpp = win_bpp;
-   if (ximage_quantum == 0)
+    }
+    if (ximage_bpp == 0 || ximage_quantum == 0)
+    {
+      warn ("XListPixmapFormats() returned no suitable formats.\n"); 
+      goto ximage_done;
+    }
+    ximage_done:
+    if (format != 0)
+      XFree (format);
+  }
+  /* Could not obtain authoritative/good values. Warn and guess
+     plausible values. */
+  if (ximage_bpp == 0 || ximage_quantum == 0)
+  {
+    if (ximage_bpp == 0)
+      ximage_bpp = (win_depth + 7) / 8;
+    if (ximage_quantum == 0)
       ximage_quantum = 4;
-   warn ("guessing format. Images will probably not be displayed correctly\n");
-   }
-verbmsg ("XImage format: %d B per pixel, %d B quantum.\n",
-   ximage_bpp, ximage_quantum);
-
-/*
- *	Further configure the window
- */
+    warn ("guessing format. Images will probably not be displayed correctly\n");
+  }
+  verbmsg ("X: pixmap format: %d B per pixel, %d B quantum.\n",
+    ximage_bpp, ximage_quantum);
+
+  /*
+   *	Further configure the window
+   */
 #if 0
-{
-XSetWindowAttributes wa;
-wa.win_gravity = CenterGravity;
-XChangeWindowAttributes (dpy, win, CWWinGravity, &wa);
-}
-#endif
-
-XStoreName (dpy, win, "Yadex");  // Temporary name -- will be overwritten
-XSelectInput (dpy, win,
-  KeyPressMask | KeyReleaseMask
-  | ButtonPressMask | ButtonReleaseMask
-  | PointerMotionMask
-  | EnterWindowMask | LeaveWindowMask
-  | ExposureMask
-  | StructureNotifyMask);
-
-/*
- *	Possibly load and query the font
- */
-{
-XFontStruct *xqf;
-
-// Load the font or use the default font.
-default_font = true;
-if (font_name != NULL)
-   {
-   x_catch_on ();  // Catch errors in XLoadFont()
-   font_xfont = XLoadFont (dpy, font_name);
-   if (const char *err_msg = x_error ())
+  {
+    XSetWindowAttributes wa;
+    wa.win_gravity = CenterGravity;
+    XChangeWindowAttributes (dpy, win, CWWinGravity, &wa);
+  }
+#endif
+
+  XStoreName (dpy, win, "Yadex");  // Temporary name -- will be overwritten
+  XSelectInput (dpy, win,
+    KeyPressMask | KeyReleaseMask
+    | ButtonPressMask | ButtonReleaseMask
+    | PointerMotionMask
+    | EnterWindowMask | LeaveWindowMask
+    | ExposureMask
+    | StructureNotifyMask);
+
+  /*
+   *	Possibly load and query the font
+   */
+  {
+    XFontStruct *xqf;
+
+    // Load the font or use the default font.
+    default_font = true;
+    if (font_name != NULL)
+    {
+      x_catch_on ();  // Catch errors in XLoadFont()
+      font_xfont = XLoadFont (dpy, font_name);
+      if (const char *err_msg = x_error ())
       {
-      warn ("can't load font \"%s\" (%s).\n", font_name, err_msg);
-      warn ("using default font instead.\n");
+	warn ("can't load font \"%s\" (%s).\n", font_name, err_msg);
+	warn ("using default font instead.\n");
       }
-   else
-      default_font = false;
-   x_catch_off ();
-   }
-
-// Query the font we'll use for FONTW, FONTH and FONTYOFS.
-xqf = XQueryFont (dpy,
-   default_font ? XGContextFromGC (DefaultGC (dpy, scn)) : font_xfont);
-if (xqf->direction != FontLeftToRight)
-   warn ("this font is not left-to-right !\n");
-if (xqf->min_byte1 != 0 || xqf->max_byte1 != 0)
-   warn ("this is not a single-byte font !\n");
-if (xqf->min_char_or_byte2 > 32 || xqf->max_char_or_byte2 < 126)
-   warn ("this font does not support the ASCII character set !\n");
-if (xqf->min_bounds.width != xqf->max_bounds.width)
-   warn ("this is not a fixed-width font !\n");
-FONTW     = xqf->max_bounds.width;
-FONTH     = xqf->ascent + xqf->descent;
-font_xofs = xqf->min_bounds.lbearing;
-font_yofs = xqf->max_bounds.ascent;
-XFreeFontInfo (NULL, xqf, 1);
-verbmsg ("  Font metrics: %dx%d, xofs=%d yofs=%d\n",
-   FONTW, FONTH, font_xofs, font_yofs);
-}
-
-/*
- *	Get/create the colormap
- *	and allocate the colours.
- */
-if (win_vis_class == PseudoColor)
-   {
-   verbmsg ("  Running on PseudoColor visual, using private Colormap\n");
-   cmap = XCreateColormap (dpy, win, win_vis, AllocNone);
-   }
-else
-   cmap = DefaultColormap (dpy, scn);
-
-XSetWindowColormap (dpy, win, cmap);
-game_colour = alloc_game_colours (0);
-app_colour = commit_app_colours ();
-if (win_depth == 24)
-   game_colour_24.refresh (game_colour, x_server_big_endian);
-
-/*
- *	Create the GC
- */
-{
-XGCValues gcv;
-unsigned long mask;
-
-mask = GCForeground | GCFunction | GCLineWidth;
-if (! default_font)
-   {
-   mask |= GCFont;
-   gcv.font = font_xfont;
-   }
-gcv.foreground = app_colour[0];  // Default colour
-gcv.line_width = 0;
-gcv.function   = GXcopy;
-gc = XCreateGC (dpy, win, mask, &gcv);
-if (gc == 0)
-   fatal_error ("XCreateGC() returned NULL");
-}
-
-
-/*
- *	More stuff
- */
-
-XMapWindow (dpy, win);
-
-// Unless no_pixmap is set, create the pixmap
-// and its own pet GC.
-if (no_pixmap)
-   drw = win;
-else
-   {
-   XGCValues gcv;
-
-   pixmap = XCreatePixmap (dpy, win, width, height, win_depth);
-   gcv.foreground = BlackPixel (dpy, scn);
-   gcv.graphics_exposures = False;  // We don't want NoExpose events
-   pixmap_gc = XCreateGC (dpy, pixmap, GCForeground | GCGraphicsExposures, &gcv);
-   drw = win;
-   drw_mods = 0;  // Force display the first time
-   }
-XSync (dpy, False);
-GfxMode = - VideoMode;
+      else
+	 default_font = false;
+      x_catch_off ();
+    }
+
+    // Query the font we'll use for FONTW, FONTH and FONTYOFS.
+    xqf = XQueryFont (dpy,
+      default_font ? XGContextFromGC (DefaultGC (dpy, scn)) : font_xfont);
+    if (xqf->direction != FontLeftToRight)
+      warn ("this font is not left-to-right !\n");
+    if (xqf->min_byte1 != 0 || xqf->max_byte1 != 0)
+      warn ("this is not a single-byte font !\n");
+    if (xqf->min_char_or_byte2 > 32 || xqf->max_char_or_byte2 < 126)
+      warn ("this font does not support the ASCII character set !\n");
+    if (xqf->min_bounds.width != xqf->max_bounds.width)
+      warn ("this is not a fixed-width font !\n");
+    FONTW     = xqf->max_bounds.width;
+    FONTH     = xqf->ascent + xqf->descent;
+    font_xofs = xqf->min_bounds.lbearing;
+    font_yofs = xqf->max_bounds.ascent;
+    XFreeFontInfo (NULL, xqf, 1);
+    verbmsg ("X: font: metrics: %dx%d, xofs %d, yofs %d\n",
+      FONTW, FONTH, font_xofs, font_yofs);
+  }
+
+  /*
+   *	Get/create the colormap
+   *	and allocate the colours.
+   */
+  if (win_vis_class == PseudoColor)
+  {
+    verbmsg ("X: running on PseudoColor visual, using private Colormap\n");
+    cmap = XCreateColormap (dpy, win, win_vis, AllocNone);
+  }
+  else
+    cmap = DefaultColormap (dpy, scn);
+
+  XSetWindowColormap (dpy, win, cmap);
+  game_colour = alloc_game_colours (0);
+  app_colour = commit_app_colours ();
+  if (win_depth == 24)
+    game_colour_24.refresh (game_colour, x_server_big_endian);
+
+  /*
+   *	Create the GC
+   */
+  {
+    XGCValues gcv;
+    unsigned long mask;
+
+    mask = GCForeground | GCFunction | GCLineWidth;
+    if (! default_font)
+    {
+      mask |= GCFont;
+      gcv.font = font_xfont;
+    }
+    gcv.foreground = app_colour[0];  // Default colour
+    gcv.line_width = 0;
+    gcv.function   = GXcopy;
+    gc = XCreateGC (dpy, win, mask, &gcv);
+    if (gc == 0)
+      fatal_error ("XCreateGC() returned NULL");
+  }
+
+
+  /*
+   *	More stuff
+   */
+  XSetWindowBackground (dpy, win, app_colour[0]);
+  XMapWindow (dpy, win);
+
+  // Unless no_pixmap is set, create the pixmap and its own pet GC.
+  if (no_pixmap)
+    drw = win;
+  else
+  {
+    XGCValues gcv;
+
+    pixmap = XCreatePixmap (dpy, win, width, height, win_depth);
+    gcv.foreground = app_colour[0];
+    gcv.graphics_exposures = False;  // We don't want NoExpose events
+    pixmap_gc = XCreateGC (dpy, pixmap, GCForeground | GCGraphicsExposures,
+	&gcv);
+    drw = win;
+    drw_mods = 0;  // Force display the first time
+  }
+  XSync (dpy, False);
+  GfxMode = - VideoMode;
 #endif
 
-SetWindowSize (width, height);
-return 0;
+  SetWindowSize (width, height);
+  return 0;
 }
 
 
-
 /*
-   terminate the graphics display
-*/
-
+ *	TermGfx - terminate the graphics display
+ */
 void TermGfx ()
 {
-verbmsg ("TermGfx: GfxMode=%d\n", GfxMode);
-if (GfxMode)
-   {
+  verbmsg ("TermGfx: GfxMode=%d\n", GfxMode);
+  if (GfxMode)
+  {
 #if defined Y_BGI
-   closegraph ();
+    closegraph ();
 #elif defined Y_X11
-   int r;
+    int r;
 
-   if (! no_pixmap)
-      {
+    if (! no_pixmap)
+    {
       XFreePixmap (dpy, pixmap);
       XFreeGC     (dpy, pixmap_gc);
-      }
-   r = XDestroyWindow (dpy, win);
-   verbmsg ("  XDestroyWindow returned %d\n", r);
-   free_game_colours (game_colour);
-   game_colour = 0;
-   uncommit_app_colours (app_colour);
-   app_colour = 0;
-   if (cmap != DefaultColormap (dpy, scn))
-      {
-      verbmsg ("  Freeing Colormap\n");
+    }
+    r = XDestroyWindow (dpy, win);
+    verbmsg ("X: XDestroyWindow returned %d\n", r);
+    free_game_colours (game_colour);
+    game_colour = 0;
+    uncommit_app_colours (app_colour);
+    app_colour = 0;
+    if (cmap != DefaultColormap (dpy, scn))
+    {
+      verbmsg ("X: freeing Colormap\n");
       XFreeColormap  (dpy, cmap);
-      }
-   if (! default_font)
-      {
-      verbmsg ("  Unloading font\n");
+    }
+    if (! default_font)
+    {
+      verbmsg ("X: unloading font\n");
       XUnloadFont (dpy, font_xfont);
-      }
-   XFreeGC (dpy, gc);
-   gc = 0;
-   /* FIXME there is surely more to do ... */
-   XCloseDisplay (dpy);
+    }
+    XFreeGC (dpy, gc);
+    gc = 0;
+    // FIXME there is surely more to do...
+    XCloseDisplay (dpy);
 #endif
-   GfxMode = 0;
-   }
+    GfxMode = 0;
+  }
 }
 
 
-
 /*
- *	SetWindowSize
- *	Set the size of the edit window
+ *	SetWindowSize - set the size of the edit window
  */
 void SetWindowSize (int width, int height)
 {
-// Am I called uselessly ?
-if (width == ScrMaxX + 1 && height == ScrMaxY + 1)
-   return;
-
-ScrMaxX = width - 1;
-ScrMaxY = height - 1;
-ScrCenterX = ScrMaxX / 2;
-ScrCenterY = ScrMaxY / 2;
+  // Am I called uselessly ?
+  if (width == ScrMaxX + 1 && height == ScrMaxY + 1)
+    return;
+
+  ScrMaxX = width - 1;
+  ScrMaxY = height - 1;
+  ScrCenterX = ScrMaxX / 2;
+  ScrCenterY = ScrMaxY / 2;
 #ifdef Y_X11
-// Replace the old pixmap by another of the new size
-if (! no_pixmap)
-   {
-   XFreePixmap (dpy, pixmap);
-   pixmap = XCreatePixmap (dpy, win, width, height, win_depth);
-   drw = pixmap;
-   }
+  // Replace the old pixmap by another of the new size
+  if (! no_pixmap)
+  {
+    XFreePixmap (dpy, pixmap);
+    pixmap = XCreatePixmap (dpy, win, width, height, win_depth);
+    drw = pixmap;
+  }
 #endif
 }
 
 
 /*
-   switch from VGA 16 colours to VGA 256 colours
-
-   This function does something only in the BGI version and if
-   the current mode is 16 colours (typically because the video
-   card is a plain VGA one (as opposed to an SVGA one) so the
-   only 256-colour mode is 320x200).
-
-   If compiled with Y_X11, this function is a no-op.
-*/
-
+ *	SwitchToVGA256 - switch from VGA 16 colours to VGA 256 colours
+ *
+ *	This function does something only in the BGI version and
+ *	if the current mode is 16 colours (typically because the
+ *	video card is a plain VGA one (as opposed to an SVGA
+ *	one) so the only 256-colour mode is 320x200).
+ *
+ *	If compiled with Y_X11, this function is a no-op.
+ */
 void SwitchToVGA256 (void)
 {
 #if defined Y_X11
-return;
+  return;
 #elif defined Y_BGI
-static int gdriver = -1;
-int gmode, errorcode;
+  static int gdriver = -1;
+  int gmode, errorcode;
 
-if (GfxMode > 0 && gdriver != VGA) /* if 16 colors and not failed before */
-   {
-   if (gdriver == -1)
-      {
-      gdriver = cooked_installuserdriver ("VGA256", NULL);
-      errorcode = graphresult ();
-      }
-   HideMousePointer ();
-   closegraph ();
-   gmode = 0;
-   initgraph (&gdriver, &gmode, install_dir);
-   errorcode = graphresult ();
-   if (errorcode != grOk)
-      {
-      /* failed for 256 colors - back to 16 colors */
-      gdriver = VGA;
-      gmode = VGAHI;
-      initgraph (&gdriver, &gmode, install_dir);
-      errorcode = graphresult ();
-      }
-   if (errorcode != grOk) /* shouldn't happen */
-      fatal_error ("graphics error: %s", grapherrormsg (errorcode));
-   ShowMousePointer ();
-   GfxMode = -1 /* 320x200x256 */;
-   SetDoomPalette (0);
-   ScrMaxX = getmaxx ();
-   ScrMaxY = getmaxy ();
-   ScrCenterX = ScrMaxX / 2;
-   ScrCenterY = ScrMaxY / 2;
-   }
+  if (GfxMode > 0 && gdriver != VGA) /* if 16 colors and not failed before */
+  {
+  if (gdriver == -1)
+  {
+    gdriver = cooked_installuserdriver ("VGA256", NULL);
+    errorcode = graphresult ();
+  }
+  HideMousePointer ();
+  closegraph ();
+  gmode = 0;
+  initgraph (&gdriver, &gmode, install_dir);
+  errorcode = graphresult ();
+  if (errorcode != grOk)
+  {
+    // Failed for 256 colors - back to 16 colors
+    gdriver = VGA;
+    gmode = VGAHI;
+    initgraph (&gdriver, &gmode, install_dir);
+    errorcode = graphresult ();
+  }
+  if (errorcode != grOk)  // Shouldn't happen
+    fatal_error ("graphics error: %s", grapherrormsg (errorcode));
+  ShowMousePointer ();
+  GfxMode = -1;  // 320x200x256
+  SetDoomPalette (0);
+  ScrMaxX = getmaxx ();
+  ScrMaxY = getmaxy ();
+  ScrCenterX = ScrMaxX / 2;
+  ScrCenterY = ScrMaxY / 2;
+  }
 #endif
 }
 
 
-
 /*
-   switch from VGA 256 colours to VGA 16 colours
-   See comments for SwitchToVGA256().
-*/
-
+ *	SwitchToVGA16 -  switch from VGA 256 colours to VGA 16 colours
+ *
+ *	See comments for SwitchToVGA256().
+ */
 void SwitchToVGA16 (void)
 {
 #if defined Y_X11
-return;
+  return;
 #elif defined Y_BGI
-int gdriver, gmode, errorcode;
+  int gdriver, gmode, errorcode;
 
-if (GfxMode == -1) /* switch only if we are in 320x200x256 colors */
-   {
-   HideMousePointer ();
-   closegraph ();
-   gdriver = VGA;
-   gmode = VGAHI;
-   initgraph (&gdriver, &gmode, install_dir);
-   errorcode = graphresult ();
-   if (errorcode != grOk) /* shouldn't happen */
+  if (GfxMode == -1)  // Switch only if we are in 320x200x256 colors
+  {
+    HideMousePointer ();
+    closegraph ();
+    gdriver = VGA;
+    gmode = VGAHI;
+    initgraph (&gdriver, &gmode, install_dir);
+    errorcode = graphresult ();
+    if (errorcode != grOk)  // Shouldn't happen
       fatal_error ("graphics error: %s", grapherrormsg (errorcode));
-   ShowMousePointer ();
-   GfxMode = 2; /* 640x480x16 */
-   ScrMaxX = getmaxx ();
-   ScrMaxY = getmaxy ();
-   ScrCenterX = ScrMaxX / 2;
-   ScrCenterY = ScrMaxY / 2;
-   }
+    ShowMousePointer ();
+    GfxMode = 2;  // 640x480x16
+    ScrMaxX = getmaxx ();
+    ScrMaxY = getmaxy ();
+    ScrCenterX = ScrMaxX / 2;
+    ScrCenterY = ScrMaxY / 2;
+  }
 #else
-;
+  ;
 #endif
 }
 
 
 /*
-   clear the screen
-*/
-
+ *	ClearScreen - clear the screen
+ */
 void ClearScreen ()
 {
 #if defined Y_BGI
-cleardevice ();
+  cleardevice ();
 #elif defined Y_X11
-if (no_pixmap)
-   XClearWindow (dpy, win);
-else
-   {
-   XFillRectangle (dpy, pixmap, pixmap_gc, 0, 0, ScrMaxX + 1, ScrMaxY + 1);
-   drw = pixmap;  // Redisplaying from scratch so let's use the pixmap
-   }
+  if (no_pixmap)
+    XClearWindow (dpy, win);
+  else
+  {
+    XFillRectangle (dpy, pixmap, pixmap_gc, 0, 0, ScrMaxX + 1, ScrMaxY + 1);
+    drw = pixmap;  // Redisplaying from scratch so let's use the pixmap
+  }
 #else
-;
+  ;
 #endif
 }
 
 
 /*
- *	update_display
+ *	update_display - update the physical display
+ *
  *	Make sure the physical bitmap display (the X window)
  *	is up to date WRT the logical bitmap display (the X
  *	pixmap).
@@ -771,48 +775,50 @@
 void update_display ()
 {
 #if defined Y_BGI
-;  // Nothing ; with BGI, screen output is synchronous
+  ;  // Nothing ; with BGI, screen output is synchronous
 #elif defined Y_X11
-//if (drw_mods == 0)  // Nothing to do, display is already up to date
-//   return;
-//printf (" [");
-//fflush (stdout);
-if (! no_pixmap && drw == pixmap)
-   {
-   //putchar ('*');
-   XCopyArea (dpy, pixmap, win, pixmap_gc, 0, 0, ScrMaxX+1, ScrMaxY+1, 0, 0);
-   }
-XFlush (dpy);
-//printf ("] ");
-//fflush (stdout);
-drw_mods = 0;
-drw = win;  // If they don't like it, they can call ClearScreen() [HHOS]
+  //if (drw_mods == 0)  // Nothing to do, display is already up to date
+  //   return;
+  //printf (" [");
+  //fflush (stdout);
+  if (! no_pixmap && drw == pixmap)
+  {
+    //putchar ('*');
+    XCopyArea (dpy, pixmap, win, pixmap_gc, 0, 0, ScrMaxX+1, ScrMaxY+1, 0, 0);
+  }
+  XFlush (dpy);
+  //printf ("] ");
+  //fflush (stdout);
+  drw_mods = 0;
+  drw = win;  // If they don't like it, they can call ClearScreen() [HHOS]
 #else
-;
+  ;
 #endif
 }
 
 
 /*
- *	force_window_not_pixmap
- *	Redirect graphic output to window, not pixmap.
- *	Used only in yadex.cc, before calling the sprite viewer.
+ *	force_window_not_pixmap - force graphic ops to use window
+ *
+ *	Redirect graphic output to window, not pixmap. Used only
+ *	in yadex.cc, before calling the sprite viewer.
+ *
  *	FIXME this is not a clean way to do things.
  */
 void force_window_not_pixmap ()
 {
-drw = win;
+  drw = win;
 }
 
 
 /*
- *	set_pcolour
- *	Set the current drawing colour
+ *	set_pcolour - set the current drawing colour
+ *
  *	 must be an physical colour number (a.k.a. pixel value).
  */
 void set_pcolour (pcolour_t colour)
 {
-XSetForeground (dpy, gc, (xpv_t) colour);
+  XSetForeground (dpy, gc, (xpv_t) colour);
 }
 
 
@@ -824,511 +830,528 @@
 
 
 /*
- *	set_colour
- *	Set the current drawing color
+ *	get_colour - get the current drawing colour
+ */
+acolour_t get_colour ()
+{
+  return current_acolour;
+}
+
+
+/*
+ *	set_colour - set the current drawing colour
+ *
  *	 must be an application colour number.
  */
 void set_colour (acolour_t colour)
 {
 #if defined Y_BGI
-if (colour != current_acolour)
-   {
-   current_acolour = colour;
-   current_bgicolour = (GfxMode < 0) ? TranslateToDoomColor (colour) : colour;
-   setcolor (current_bgicolour);
-   }
+  if (colour != current_acolour)
+  {
+    current_acolour = colour;
+    current_bgicolour = (GfxMode < 0) ? TranslateToDoomColor (colour) : colour;
+    setcolor (current_bgicolour);
+  }
 #elif defined Y_X11
-if (colour != current_acolour)
-   {
-   current_acolour = colour;
-   XSetForeground (dpy, gc, app_colour[colour]);
-   }
+  if (colour != current_acolour)
+  {
+    current_acolour = colour;
+    XSetForeground (dpy, gc, app_colour[colour]);
+  }
 #endif
 }
 
 
 /*
- *	push_colour
+ *	push_colour - push a colour into the colour stack
+ *
  *	Like set_colour() except that it will only last until
  *	the next call to pop_colour().
  */
 void push_colour (acolour_t colour)
 {
-if (colour_stack_pointer >= (int) (sizeof colour_stack / sizeof *colour_stack))
-   {
-   nf_bug ("Colour stack overflow");
-   return;
-   }
-colour_stack[colour_stack_pointer] = current_acolour;
-colour_stack_pointer++;
-set_colour (colour);
+  if (colour_stack_pointer >= (int) (sizeof colour_stack / sizeof *colour_stack))
+  {
+    nf_bug ("Colour stack overflow");
+    return;
+  }
+  colour_stack[colour_stack_pointer] = current_acolour;
+  colour_stack_pointer++;
+  set_colour (colour);
 }
 
 
 /*
- *	pop_colour
+ *	pop_colour - pop the colour stack
+ *
  *	Cancel the effect of the last call to push_colour().
  */
 void pop_colour (void)
 {
-if (colour_stack_pointer < 1)
-   {
-   nf_bug ("Colour stack underflow");
-   return;
-   }
-colour_stack_pointer--;
-set_colour (colour_stack[colour_stack_pointer]);
+  if (colour_stack_pointer < 1)
+  {
+    nf_bug ("Colour stack underflow");
+    return;
+  }
+  colour_stack_pointer--;
+  set_colour (colour_stack[colour_stack_pointer]);
 }
 
 
 /*
-   set the line style (thin or thick)
-*/
-
+ *	SetLineThickness - set the line style (thin or thick)
+ */
 void SetLineThickness (int thick)
 {
 #if defined Y_BGI
-setlinestyle (SOLID_LINE, 0, thick ? THICK_WIDTH : NORM_WIDTH);
+  setlinestyle (SOLID_LINE, 0, thick ? THICK_WIDTH : NORM_WIDTH);
 #elif defined Y_X11
-if (!! thick != LineThickness)
-   {
-   LineThickness = !! thick;
-   XGCValues gcv;
-   gcv.line_width = LineThickness ? 3 : (DrawingMode ? 1 : 0);
-   // ^ It's important to use a line_width of 1 when in xor mode.
-   // See note (1) in the hacker's guide.
-   XChangeGC (dpy, gc, GCLineWidth, &gcv);
-   }
+  if (!! thick != LineThickness)
+  {
+    LineThickness = !! thick;
+    XGCValues gcv;
+    gcv.line_width = LineThickness ? 3 : (DrawingMode ? 1 : 0);
+    // ^ It's important to use a line_width of 1 when in xor mode.
+    // See note (1) in the hacker's guide.
+    XChangeGC (dpy, gc, GCLineWidth, &gcv);
+  }
 #endif
 }
 
 
 /*
-   set the drawing mode (copy or xor)
-*/
-
+ *	SetDrawingMode - set the drawing mode (copy or xor)
+ */
 void SetDrawingMode (int _xor)
 {
 #if defined Y_BGI
-setwritemode (_xor ? XOR_PUT : COPY_PUT);
+  setwritemode (_xor ? XOR_PUT : COPY_PUT);
 #elif defined Y_X11
-if (!! _xor != DrawingMode)
-   {
-   DrawingMode = !! _xor;
-   XGCValues gcv;
-   gcv.function = DrawingMode ? GXxor : GXcopy;
-   gcv.line_width = LineThickness ? 3 : (DrawingMode ? 1 : 0);
-   // ^ It's important to use a line_width of 1 when in xor mode.
-   // See note (1) in the hacker's guide.
-   XChangeGC (dpy, gc, GCFunction | GCLineWidth, &gcv);
-   }
+  if (!! _xor != DrawingMode)
+  {
+    DrawingMode = !! _xor;
+    XGCValues gcv;
+    gcv.function = DrawingMode ? GXxor : GXcopy;
+    gcv.line_width = LineThickness ? 3 : (DrawingMode ? 1 : 0);
+    // ^ It's important to use a line_width of 1 when in xor mode.
+    // See note (1) in the hacker's guide.
+    XChangeGC (dpy, gc, GCFunction | GCLineWidth, &gcv);
+  }
 #endif
 }
 
 
 /*
- *	draw_point - draw a point at display coordinates (, )
+ *	draw_point - draw a point at display coordinates
+ *
+ *	The point is drawn at display coordinates (, ).
  */
 void draw_point (int x, int y)
 {
 #if defined Y_BGI
-putpixel (x, y, current_bgicolour);
+  putpixel (x, y, current_bgicolour);
 #elif defined Y_X11
-XDrawPoint (dpy, drw, gc, x, y);
+  XDrawPoint (dpy, drw, gc, x, y);
 #endif
 }
 
 
 /*
-
- *	draw_map_point
- *	Draw a point at map coordinates , 
+ *	draw_map_point - draw a point at map coordinates
+ *
+ *	The point is drawn at map coordinates (, )
  */
 void draw_map_point (int mapx, int mapy)
 {
 #if defined Y_BGI
-putpixel (SCREENX (mapx), SCREENY (mapy), current_bgicolour);
+  putpixel (SCREENX (mapx), SCREENY (mapy), current_bgicolour);
 #elif defined Y_X11
-XDrawPoint (dpy, drw, gc, SCREENX (mapx), SCREENY (mapy));
-drw_mods++;
+  XDrawPoint (dpy, drw, gc, SCREENX (mapx), SCREENY (mapy));
+  drw_mods++;
 #endif
 }
 
 
 /*
-   draw a line on the screen from map coords
-*/
-
+ *	DrawMapLine - draw a line on the screen from map coords
+ */
 void DrawMapLine (int mapx1, int mapy1, int mapx2, int mapy2)
 {
 #if defined Y_BGI
-line (SCREENX (mapx1), SCREENY (mapy1), SCREENX (mapx2), SCREENY (mapy2));
+  line (SCREENX (mapx1), SCREENY (mapy1), SCREENX (mapx2), SCREENY (mapy2));
 #elif defined Y_X11
-XDrawLine (dpy, drw, gc, SCREENX (mapx1), SCREENY (mapy1),
-                         SCREENX (mapx2), SCREENY (mapy2));
-drw_mods++;
+  XDrawLine (dpy, drw, gc, SCREENX (mapx1), SCREENY (mapy1),
+			   SCREENX (mapx2), SCREENY (mapy2));
+  drw_mods++;
 #endif
 }
 
 
-
 /*
-   draw a circle on the screen from map coords
-*/
-
+ *	DrawMapCircle - draw a circle on the screen from map coords
+ */
 void DrawMapCircle (int mapx, int mapy, int mapradius)
 {
 #if defined Y_BGI
-circle (SCREENX (mapx), SCREENY (mapy), (int) (mapradius * Scale));
+  circle (SCREENX (mapx), SCREENY (mapy), (int) (mapradius * Scale));
 #elif defined Y_X11
-XDrawArc (dpy, drw, gc, SCREENX (mapx - mapradius), SCREENY (mapy + mapradius),
-  (unsigned int) (2 * mapradius * Scale),
-  (unsigned int) (2 * mapradius * Scale), 0, 360*64);
-drw_mods++;
+  XDrawArc (dpy, drw, gc, SCREENX (mapx - mapradius), SCREENY (mapy + mapradius),
+    (unsigned int) (2 * mapradius * Scale),
+    (unsigned int) (2 * mapradius * Scale), 0, 360*64);
+  drw_mods++;
 #endif
 }
 
 
 
 /*
-   draw an arrow on the screen from map coords
-*/
-
+ *	DrawMapVector - draw an arrow on the screen from map coords
+ */
 void DrawMapVector (int mapx1, int mapy1, int mapx2, int mapy2)
 {
-int    scrx1   = SCREENX (mapx1);
-int    scry1   = SCREENY (mapy1);
-int    scrx2   = SCREENX (mapx2);
-int    scry2   = SCREENY (mapy2);
-double r       = hypot ((double) (scrx1 - scrx2), (double) (scry1 - scry2));
-/* AYM 19980216 to avoid getting huge arrowheads when zooming in */
-int    scrXoff = (r >= 1.0) ? (int) ((scrx1 - scrx2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
-int    scrYoff = (r >= 1.0) ? (int) ((scry1 - scry2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
+  int    scrx1   = SCREENX (mapx1);
+  int    scry1   = SCREENY (mapy1);
+  int    scrx2   = SCREENX (mapx2);
+  int    scry2   = SCREENY (mapy2);
+  double r       = hypot ((double) (scrx1 - scrx2), (double) (scry1 - scry2));
+#if 0
+  /* AYM 19980216 to avoid getting huge arrowheads when zooming in */
+  int    scrXoff = (r >= 1.0) ? (int) ((scrx1 - scrx2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
+  int    scrYoff = (r >= 1.0) ? (int) ((scry1 - scry2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
+#else
+  int    scrXoff = (r >= 1.0) ? (int) ((scrx1 - scrx2) * 8.0 / r * (Scale / 2)) : 0;
+  int    scrYoff = (r >= 1.0) ? (int) ((scry1 - scry2) * 8.0 / r * (Scale / 2)) : 0;
+#endif
 
 #if defined Y_BGI
-line (scrx1, scry1, scrx2, scry2);
-scrx1 = scrx2 + 2 * scrXoff;
-scry1 = scry2 + 2 * scrYoff;
-line (scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
-line (scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
+  line (scrx1, scry1, scrx2, scry2);
+  scrx1 = scrx2 + 2 * scrXoff;
+  scry1 = scry2 + 2 * scrYoff;
+  line (scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
+  line (scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
 #elif defined Y_X11
-XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry2);
-scrx1 = scrx2 + 2 * scrXoff;
-scry1 = scry2 + 2 * scrYoff;
-XDrawLine (dpy, drw, gc, scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
-XDrawLine (dpy, drw, gc, scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
-drw_mods++;
+  XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry2);
+  scrx1 = scrx2 + 2 * scrXoff;
+  scry1 = scry2 + 2 * scrYoff;
+  XDrawLine (dpy, drw, gc, scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
+  XDrawLine (dpy, drw, gc, scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
+  drw_mods++;
 #endif
 }
 
 
-
 /*
-   draw an arrow on the screen from map coords and angle (0 - 65535)
-*/
-
+ *	DrawMapArrow - draw an arrow on the screen from map coords and angle (0 - 65535)
+ */
 void DrawMapArrow (int mapx1, int mapy1, unsigned angle)
 {
-int    mapx2   = mapx1 + (int) (50 * cos (angle / 10430.37835));
-int    mapy2   = mapy1 + (int) (50 * sin (angle / 10430.37835));
-int    scrx1   = SCREENX (mapx1);
-int    scry1   = SCREENY (mapy1);
-int    scrx2   = SCREENX (mapx2);
-int    scry2   = SCREENY (mapy2);
-double r       = hypot (scrx1 - scrx2, scry1 - scry2);
-int    scrXoff = (r >= 1.0) ? (int) ((scrx1 - scrx2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
-int    scrYoff = (r >= 1.0) ? (int) ((scry1 - scry2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
+  int    mapx2   = mapx1 + (int) (50 * cos (angle / 10430.37835));
+  int    mapy2   = mapy1 + (int) (50 * sin (angle / 10430.37835));
+  int    scrx1   = SCREENX (mapx1);
+  int    scry1   = SCREENY (mapy1);
+  int    scrx2   = SCREENX (mapx2);
+  int    scry2   = SCREENY (mapy2);
+  double r       = hypot (scrx1 - scrx2, scry1 - scry2);
+#if 0
+  int    scrXoff = (r >= 1.0) ? (int) ((scrx1 - scrx2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
+  int    scrYoff = (r >= 1.0) ? (int) ((scry1 - scry2) * 8.0 / r * (Scale < 1 ? Scale : 1)) : 0;
+#else
+  int    scrXoff = (r >= 1.0) ? (int) ((scrx1 - scrx2) * 8.0 / r * (Scale / 2)) : 0;
+  int    scrYoff = (r >= 1.0) ? (int) ((scry1 - scry2) * 8.0 / r * (Scale / 2)) : 0;
+#endif
 
 #if defined Y_BGI
-line (scrx1, scry1, scrx2, scry2);
-scrx1 = scrx2 + 2 * scrXoff;
-scry1 = scry2 + 2 * scrYoff;
-line (scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
-line (scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
+  line (scrx1, scry1, scrx2, scry2);
+  scrx1 = scrx2 + 2 * scrXoff;
+  scry1 = scry2 + 2 * scrYoff;
+  line (scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
+  line (scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
 #elif defined Y_X11
-XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry2);
-scrx1 = scrx2 + 2 * scrXoff;
-scry1 = scry2 + 2 * scrYoff;
-XDrawLine (dpy, drw, gc, scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
-XDrawLine (dpy, drw, gc, scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
-drw_mods++;
+  XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry2);
+  scrx1 = scrx2 + 2 * scrXoff;
+  scry1 = scry2 + 2 * scrYoff;
+  XDrawLine (dpy, drw, gc, scrx1 - scrYoff, scry1 + scrXoff, scrx2, scry2);
+  XDrawLine (dpy, drw, gc, scrx1 + scrYoff, scry1 - scrXoff, scrx2, scry2);
+  drw_mods++;
 #endif
 }
 
 
-
 /*
-   draw a line on the screen from screen coords
-*/
-
+ *	DrawScreenLine - draw a line on the screen from screen coords
+ */
 void DrawScreenLine (int Xstart, int Ystart, int Xend, int Yend)
 {
 #if defined Y_BGI
-line (Xstart, Ystart, Xend, Yend);
+  line (Xstart, Ystart, Xend, Yend);
 #elif defined Y_X11
-XDrawLine (dpy, drw, gc, Xstart, Ystart, Xend, Yend);
-drw_mods++;
+  XDrawLine (dpy, drw, gc, Xstart, Ystart, Xend, Yend);
+  drw_mods++;
 #endif
 }
 
 
+/*
+ *	DrawScreenLineLen - draw a line on the screen
+ */
 void DrawScreenLineLen (int x, int y, int width, int height)
 {
 #if defined Y_BGI
-line (x, y, x + width - 1, y + height - 1);
+  line (x, y, x + width - 1, y + height - 1);
 #elif defined Y_X11
-if (width > 0)
-  width--;
-else if (width < 0)
-  width++;
-if (height > 0)
-  height--;
-else if (height < 0)
-  height++;
-XDrawLine (dpy, drw, gc, x, y, x + width, y + height);
-drw_mods++;
+  if (width > 0)
+    width--;
+  else if (width < 0)
+    width++;
+  if (height > 0)
+    height--;
+  else if (height < 0)
+    height++;
+  XDrawLine (dpy, drw, gc, x, y, x + width, y + height);
+  drw_mods++;
 #endif
 }
 
 
 /*
- *	DrawScreenRect
- *	Draw a rectangle
+ *	DrawScreenRect - draw a rectangle
+ *
  *	Unlike most functions here, the 3rd and 4th parameters
  *	specify lengths, not coordinates.
  */
 void DrawScreenRect (int x, int y, int width, int height)
 {
 #if defined Y_BGI
-rectangle (x, y, x + width - 1, y + height - 1);
+  rectangle (x, y, x + width - 1, y + height - 1);
 #elif defined Y_X11
-XDrawRectangle (dpy, drw, gc, x, y, width - 1, height - 1);
-drw_mods++;
+  XDrawRectangle (dpy, drw, gc, x, y, width - 1, height - 1);
+  drw_mods++;
 #endif
 }
 
 
 /*
-   draw a filled in box on the screen from screen coords
-   (scrx1, scry1) is the top left corner
-   (scrx2, scry2) is the bottom right corner
-   If scrx2 < scrx1 or scry2 < scry1, the function does nothing.
-*/
-
+ *	DrawScreenBox - draw a filled in box on the screen from screen coords
+ *
+ *	(scrx1, scry1) is the top left corner
+ *	(scrx2, scry2) is the bottom right corner
+ *	If scrx2 < scrx1 or scry2 < scry1, the function does nothing.
+ */
 void DrawScreenBox (int scrx1, int scry1, int scrx2, int scry2)
 {
-if (scrx2 < scrx1 || scry2 < scry1)
-  return;
+  if (scrx2 < scrx1 || scry2 < scry1)
+    return;
 #if defined Y_BGI
-setfillstyle (1, getcolor ());
-bar (scrx1, scry1, scrx2, scry2);
+  setfillstyle (1, getcolor ());
+  bar (scrx1, scry1, scrx2, scry2);
 #elif defined Y_X11
-// FIXME missing gc fill_style
-XFillRectangle (dpy, drw, gc, scrx1, scry1,
-  scrx2 - scrx1 + 1, scry2 - scry1 + 1);
-drw_mods++;
+  // FIXME missing gc fill_style
+  XFillRectangle (dpy, drw, gc, scrx1, scry1,
+    scrx2 - scrx1 + 1, scry2 - scry1 + 1);
+  drw_mods++;
 #endif
 }
 
 
 /*
- *	DrawScreenBoxwh
- *	Draw a filled rectangle of width x height pixels
+ *	DrawScreenBoxwh - draw a filled rectangle of width x height pixels
+ *
  *	(scrx0, scry0) is the top left corner
  *	(width, height) is the obvious
  *	If width < 1 or height < 1, does nothing.
  */
 void DrawScreenBoxwh (int scrx0, int scry0, int width, int height)
 {
-if (width < 1 || height < 1)
-   return;
+  if (width < 1 || height < 1)
+    return;
 #if defined Y_BGI
-setfillstyle (1, getcolor ());
-bar (scrx0, scry0, scrx0 + width - 1, scry0 + height - 1);
+  setfillstyle (1, getcolor ());
+  bar (scrx0, scry0, scrx0 + width - 1, scry0 + height - 1);
 #elif defined Y_X11
-// FIXME missing gc fill_style
-XFillRectangle (dpy, drw, gc, scrx0, scry0, width, height);
-drw_mods++;
+  // FIXME missing gc fill_style
+  XFillRectangle (dpy, drw, gc, scrx0, scry0, width, height);
+  drw_mods++;
 #endif
 }
 
 
 /*
-   draw a filled-in 3D-box on the screen from screen coords
-   The 3D border is rather wide (BOX_BORDER pixels wide).
-*/
-
+ *	DrawScreenBox3D - draw a filled-in 3D box on the screen
+ *
+ *	The 3D border is rather wide (BOX_BORDER pixels wide).
+ */
 void DrawScreenBox3D (int scrx1, int scry1, int scrx2, int scry2)
 {
-DrawScreenBox3DShallow (scrx1, scry1, scrx2, scry2);
-push_colour (WINBG_DARK);
+  DrawScreenBox3DShallow (scrx1, scry1, scrx2, scry2);
+  push_colour (WINBG_DARK);
 #if defined Y_BGI
-line (scrx1 + 1, scry2 - 1, scrx2 - 1, scry2 - 1);
-line (scrx2 - 1, scry1 + 1, scrx2 - 1, scry2 - 1);
+  line (scrx1 + 1, scry2 - 1, scrx2 - 1, scry2 - 1);
+  line (scrx2 - 1, scry1 + 1, scrx2 - 1, scry2 - 1);
 #elif defined Y_X11
-XDrawLine (dpy, drw, gc, scrx1 + 1, scry2 - 1, scrx2 - 1, scry2 - 1);
-XDrawLine (dpy, drw, gc, scrx2 - 1, scry1 + 1, scrx2 - 1, scry2 - 1);
+  XDrawLine (dpy, drw, gc, scrx1 + 1, scry2 - 1, scrx2 - 1, scry2 - 1);
+  XDrawLine (dpy, drw, gc, scrx2 - 1, scry1 + 1, scrx2 - 1, scry2 - 1);
 #endif
-set_colour (WINBG_LIGHT);
+  set_colour (WINBG_LIGHT);
 #if defined Y_BGI
-line (scrx1 + 1, scry1 + 1, scrx1 + 1, scry2 - 1);
-line (scrx1 + 1, scry1 + 1, scrx2 - 1, scry1 + 1);
+  line (scrx1 + 1, scry1 + 1, scrx1 + 1, scry2 - 1);
+  line (scrx1 + 1, scry1 + 1, scrx2 - 1, scry1 + 1);
 #elif defined Y_X11
-XDrawLine (dpy, drw, gc, scrx1 + 1, scry1 + 1, scrx1 + 1, scry2 - 1);
-XDrawLine (dpy, drw, gc, scrx1 + 1, scry1 + 1, scrx2 - 1, scry1 + 1);
-drw_mods++;
+  XDrawLine (dpy, drw, gc, scrx1 + 1, scry1 + 1, scrx1 + 1, scry2 - 1);
+  XDrawLine (dpy, drw, gc, scrx1 + 1, scry1 + 1, scrx2 - 1, scry1 + 1);
+  drw_mods++;
 #endif
-pop_colour ();
+  pop_colour ();
 }
 
 
 /*
- *	DrawScreenBox3DShallow
+ *	DrawScreenBox3DShallow - draw a filled-in 3D box on the screen
+ *
  *	Same thing as DrawScreenBox3D but shallow (the 3D border
  *	is NARROW_BORDER pixels wide).
  */
 void DrawScreenBox3DShallow (int scrx1, int scry1, int scrx2, int scry2)
 {
 #if defined Y_BGI
-setfillstyle (1, TranslateToDoomColor (LIGHTGRAY));
-bar (scrx1 + 1, scry1 + 1, scrx2 - 1, scry2 - 1);
-push_colour (WINBG_DARK);
-line (scrx1, scry2, scrx2, scry2);
-line (scrx2, scry1, scrx2, scry2);
-set_colour (WINBG_LIGHT);
-line (scrx1, scry1, scrx2, scry1);
-line (scrx1, scry1, scrx1, scry2);
-pop_colour ();
-
-#elif defined Y_X11
-push_colour (WINBG);
-XFillRectangle (dpy, drw, gc, scrx1+1, scry1+1, scrx2-scrx1, scry2-scry1);
-set_colour (WINBG_DARK);
-XDrawLine (dpy, drw, gc, scrx1, scry2, scrx2, scry2);
-XDrawLine (dpy, drw, gc, scrx2, scry1, scrx2, scry2);
-set_colour (WINBG_LIGHT);
-XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry1);
-XDrawLine (dpy, drw, gc, scrx1, scry1, scrx1, scry2);
-drw_mods++;
-pop_colour ();
+  setfillstyle (1, TranslateToDoomColor (LIGHTGREY));
+  bar (scrx1 + 1, scry1 + 1, scrx2 - 1, scry2 - 1);
+  push_colour (WINBG_DARK);
+  line (scrx1, scry2, scrx2, scry2);
+  line (scrx2, scry1, scrx2, scry2);
+  set_colour (WINBG_LIGHT);
+  line (scrx1, scry1, scrx2, scry1);
+  line (scrx1, scry1, scrx1, scry2);
+  pop_colour ();
+
+#elif defined Y_X11
+  push_colour (WINBG);
+  XFillRectangle (dpy, drw, gc, scrx1+1, scry1+1, scrx2-scrx1, scry2-scry1);
+  set_colour (WINBG_DARK);
+  XDrawLine (dpy, drw, gc, scrx1, scry2, scrx2, scry2);
+  XDrawLine (dpy, drw, gc, scrx2, scry1, scrx2, scry2);
+  set_colour (WINBG_LIGHT);
+  XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry1);
+  XDrawLine (dpy, drw, gc, scrx1, scry1, scrx1, scry2);
+  drw_mods++;
+  pop_colour ();
 #endif
 }
 
 
 /*
- *	draw_box_border
- *	Draw the 3D border of a box.
+ *	draw_box_border - draw the 3D border of a box.
+ *
  *	(x, y) is the outer top left corner.
  *	(width, height) are the outer dimensions.
  *	(thickness) is the thickness of the border in pixels.
  *	(raised) is zero for depressed, non-zero for raised.
  */
 void draw_box_border (int x, int y, int width, int height,
-   int thickness, int raised)
+  int thickness, int raised)
 {
 #if defined Y_BGI
 #error "You need to write the BGI version of draw_box_border()"
 #elif defined Y_X11
-int n;
-XPoint points[3];
+  int n;
+  XPoint points[3];
 
-// We want offsets, not distances
-width--;
-height--;
-
-// Draw the right and bottom edges
-push_colour (raised ? WINBG_DARK : WINBG_LIGHT);
-points[0].x = x + width;
-points[0].y = y;
-points[1].x = 0;
-points[1].y = height;
-points[2].x = -width;
-points[2].y = 0;
-for (n = 0; n < thickness; n++)
-   {
-   XDrawLines (dpy, drw, gc, points, 3, CoordModePrevious);
-   points[0].x--;
-   points[0].y++;
-   points[1].y--;
-   points[2].x++;
-   }
-
-// Draw the left and top edges
-set_colour (raised ? WINBG_LIGHT : WINBG_DARK);
-points[0].x = x;
-points[0].y = y + height;
-points[1].x = 0;
-points[1].y = -height;
-points[2].x = width;
-points[2].y = 0;
-for (n = 0; n < thickness; n++)
-   {
-   XDrawLines (dpy, drw, gc, points, 3, CoordModePrevious);
-   points[0].x++;
-   points[0].y--;
-   points[1].y++;
-   points[2].x--;
-   }
+  // We want offsets, not distances
+  width--;
+  height--;
+
+  // Draw the right and bottom edges
+  push_colour (raised ? WINBG_DARK : WINBG_LIGHT);
+  points[0].x = x + width;
+  points[0].y = y;
+  points[1].x = 0;
+  points[1].y = height;
+  points[2].x = -width;
+  points[2].y = 0;
+  for (n = 0; n < thickness; n++)
+  {
+    XDrawLines (dpy, drw, gc, points, 3, CoordModePrevious);
+    points[0].x--;
+    points[0].y++;
+    points[1].y--;
+    points[2].x++;
+  }
+
+  // Draw the left and top edges
+  set_colour (raised ? WINBG_LIGHT : WINBG_DARK);
+  points[0].x = x;
+  points[0].y = y + height;
+  points[1].x = 0;
+  points[1].y = -height;
+  points[2].x = width;
+  points[2].y = 0;
+  for (n = 0; n < thickness; n++)
+  {
+    XDrawLines (dpy, drw, gc, points, 3, CoordModePrevious);
+    points[0].x++;
+    points[0].y--;
+    points[1].y++;
+    points[2].x--;
+  }
 
-pop_colour ();
+  pop_colour ();
 #endif
 }
 
 
 /*
-   draw a hollow 3D-box on the screen from screen coords
-   The 3D border is HOLLOW_BORDER pixels wide.
-*/
-
+ *	DrawScreenBoxHollow - draw a hollow 3D box on the screen
+ *
+ *	The 3D border is HOLLOW_BORDER pixels wide.
+ */
 void DrawScreenBoxHollow (int scrx1, int scry1, int scrx2, int scry2, acolour_t colour)
 {
 #if defined Y_BGI
-setfillstyle (1, TranslateToDoomColor (colour));
-bar (scrx1 + HOLLOW_BORDER, scry1 + HOLLOW_BORDER,
-     scrx2 - HOLLOW_BORDER, scry2 - HOLLOW_BORDER);
-push_colour (WINBG_LIGHT);
-line (scrx1, scry2, scrx2, scry2);
-line (scrx2, scry1, scrx2, scry2);
-set_colour (WINBG_DARK);
-line (scrx1, scry1, scrx2, scry1);
-line (scrx1, scry1, scrx1, scry2);
-pop_colour ();
-
-#elif defined Y_X11
-push_colour (colour);
-XFillRectangle (dpy, drw, gc,
-   scrx1 + HOLLOW_BORDER, scry1 + HOLLOW_BORDER,
-   scrx2 + 1 - scrx1 - 2 * HOLLOW_BORDER, scry2 + 1 - scry1 - 2 * HOLLOW_BORDER);
-set_colour (WINBG_LIGHT);
-XDrawLine (dpy, drw, gc, scrx1, scry2, scrx2, scry2);
-XDrawLine (dpy, drw, gc, scrx2, scry1, scrx2, scry2);
-set_colour (WINBG_DARK);
-XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry1);
-XDrawLine (dpy, drw, gc, scrx1, scry1, scrx1, scry2);
-drw_mods++;
-pop_colour ();
+  setfillstyle (1, TranslateToDoomColor (colour));
+  bar (scrx1 + HOLLOW_BORDER, scry1 + HOLLOW_BORDER,
+       scrx2 - HOLLOW_BORDER, scry2 - HOLLOW_BORDER);
+  push_colour (WINBG_LIGHT);
+  line (scrx1, scry2, scrx2, scry2);
+  line (scrx2, scry1, scrx2, scry2);
+  set_colour (WINBG_DARK);
+  line (scrx1, scry1, scrx2, scry1);
+  line (scrx1, scry1, scrx1, scry2);
+  pop_colour ();
+
+#elif defined Y_X11
+  push_colour (colour);
+  XFillRectangle (dpy, drw, gc,
+      scrx1 + HOLLOW_BORDER, scry1 + HOLLOW_BORDER,
+      scrx2 + 1 - scrx1 - 2 * HOLLOW_BORDER, scry2 + 1 - scry1 - 2 * HOLLOW_BORDER);
+  set_colour (WINBG_LIGHT);
+  XDrawLine (dpy, drw, gc, scrx1, scry2, scrx2, scry2);
+  XDrawLine (dpy, drw, gc, scrx2, scry1, scrx2, scry2);
+  set_colour (WINBG_DARK);
+  XDrawLine (dpy, drw, gc, scrx1, scry1, scrx2, scry1);
+  XDrawLine (dpy, drw, gc, scrx1, scry1, scrx1, scry2);
+  drw_mods++;
+  pop_colour ();
 #endif
 }
 
 
-
 /*
-   draw a meter bar on the screen from screen coords (in a hollow box); max. value = 1.0
-*/
-
+ *	DrawScreenMeter - draw a meter bar on the screen
+ *
+ *	In a hollow box; max. value = 1.0
+ */
 void DrawScreenMeter (int scrx1, int scry1, int scrx2, int scry2, float value)
 {
 #if defined Y_BGI
-if (value < 0.0)
-   value = 0.0;
-if (value > 1.0)
-   value = 1.0;
-setfillstyle (1, TranslateToDoomColor (BLACK));
-bar (scrx1 + 1 + (int) ((scrx2 - scrx1 - 2) * value), scry1 + 1, scrx2 - 1, scry2 - 1);
-setfillstyle (1, TranslateToDoomColor (LIGHTGREEN));
-bar (scrx1 + 1, scry1 + 1, scrx1 + 1 + (int) ((scrx2 - scrx1 - 2) * value), scry2 - 1);
+  if (value < 0.0)
+    value = 0.0;
+  if (value > 1.0)
+    value = 1.0;
+  setfillstyle (1, TranslateToDoomColor (BLACK));
+  bar (scrx1 + 1 + (int) ((scrx2 - scrx1 - 2) * value), scry1 + 1, scrx2 - 1, scry2 - 1);
+  setfillstyle (1, TranslateToDoomColor (LIGHTGREEN));
+  bar (scrx1 + 1, scry1 + 1, scrx1 + 1 + (int) ((scrx2 - scrx1 - 2) * value), scry2 - 1);
 #elif defined Y_X11
-printf ("DrawScreenMeter()\n");  /* FIXME ! */
+  printf ("DrawScreenMeter()\n");  // FIXME
 #endif
 }
 
@@ -1340,13 +1363,14 @@
 static int lastx0;
 static int lasty0;
 
-/* Where the last DrawScreen{Text,String}() left the "cursor". */
+// Where the last DrawScreen{Text,String}() left the "cursor".
 static int lastxcur;
 static int lastycur;
 
 
 /*
- *	DrawScreenText
+ *	DrawScreenText - format and display a string
+ *
  *	Write text to the screen in printf() fashion.
  *	The top left corner of the first character is at (, )
  *	If  == -1, the text is printed at the same abscissa
@@ -1358,168 +1382,236 @@
  */
 void DrawScreenText (int scrx, int scry, const char *msg, ...)
 {
-char temp[120];
-va_list args;
+  char temp[120];
+  va_list args;
 
-//  == NULL: print nothing, just set the coordinates.
-if (msg == NULL)
-   {
-   if (scrx != -1 && scrx != -2)
-      {
+  //  == NULL: print nothing, just set the coordinates.
+  if (msg == NULL)
+  {
+    if (scrx != -1 && scrx != -2)
+    {
       lastx0   = scrx;
-      lastxcur = scry;
-      }
-   if (scry != -1 && scry != -2)
-      {
+      lastxcur = scrx;
+    }
+    if (scry != -1 && scry != -2)
+    {
       lasty0   = scry;  // Note: no "+ FONTH"
       lastycur = scry;
-      }
-   return;
-   }
+    }
+    return;
+  }
 
-va_start (args, msg);
-y_vsnprintf (temp, sizeof temp, msg, args);
-DrawScreenString (scrx, scry, temp);
+  va_start (args, msg);
+  y_vsnprintf (temp, sizeof temp, msg, args);
+  DrawScreenString (scrx, scry, temp);
 }
 
 
 /*
- *	DrawScreenString
+ *	DrawScreenString - display a string
+ *
  *	Same thing as DrawScreenText() except that the string is
  *	printed verbatim (no formatting or conversion).
+ *
+ *	A "\1" in the string is not displayed but causes
+ *	subsequent characters to be displayed in WINLABEL (or
+ *	WINLABEL_DIM if the current colour before the function
+ *	was called was WINFG_DIM).
+ *
+ *	A "\2" in the string is not displayed but causes
+ *	subsequent characters to be displayed in the same colour
+ *	that was active before the function was called.
+ *
+ *	The string can contain any number of "\1" and "\2".
+ *	Regardless, upon return from the function, the current
+ *	colour is restored to what it was before the function
+ *	was called.
+ *
+ *	This colour switching business was hacked in a hurry.
+ *	Feel free to improve it.
  */
 void DrawScreenString (int scrx, int scry, const char *str)
 {
-int x;
-int y;
+  int x; int y;
 
-/* FIXME originally, the test was "< 0". Because it broke
-   when the screen was too small, I changed it to a more
-   specific "== -1". A quick and very dirty hack ! */
-if (scrx == -1)
-   x = lastx0;
-else if (scrx == -2)
-   x = lastxcur;
-else
-   x = scrx;
-if (scry == -1)
-   y = lasty0;
-else if (scry == -2)
-   y = lastycur;
-else
-   y = scry;
-const size_t len = strlen (str);
-#if defined Y_BGI
-outtextxy (x, y, str);
-#elif defined Y_X11
-XDrawString (dpy, drw, gc, x - font_xofs, y + font_yofs, str, len);
-if (text_dot)
-   XDrawPoint (dpy, drw, gc, x, y);
-drw_mods++;
-#endif
-
-lastxcur = x + FONTW * len;
-lastycur = y;
-if (scrx != -2)
-   lastx0 = x;
-if (scry != -2)
-   lasty0 = y + FONTH;
+  /* FIXME originally, the test was "< 0". Because it broke
+     when the screen was too small, I changed it to a more
+     specific "== -1". A quick and very dirty hack ! */
+  if (scrx == -1)
+    x = lastx0;
+  else if (scrx == -2)
+    x = lastxcur;
+  else
+    x = scrx;
+  if (scry == -1)
+    y = lasty0;
+  else if (scry == -2)
+    y = lastycur;
+  else
+    y = scry;
+  size_t len = strlen (str);
+#if defined Y_BGI
+  outtextxy (x, y, str);
+  // FIXME implement colour changes (\1, \2)
+#elif defined Y_X11
+  if (strchr (str, '\1') == 0)
+  {
+    XDrawString (dpy, drw, gc, x - font_xofs, y + font_yofs, str, len);
+  }
+  else
+  {
+    acolour_t save = get_colour ();
+    int xx = x;
+    len = 0;
+    for (const char *p = str; *p != '\0';)
+    {
+      int i;
+      for (i = 0; p[i] != '\0' && p[i] != '\1' && p[i] != '\2'; i++)
+	;
+      len += i;
+      if (i > 0)
+      {
+	XDrawString (dpy, drw, gc, xx - font_xofs, y + font_yofs, p, i);
+	xx += i * FONTW;
+      }
+      if (p[i] == '\0')
+	break;
+      if (p[i] == '\1')
+	set_colour (save == WINFG_DIM ? WINLABEL_DIM : WINLABEL);
+      else if (p[i] == '\2')
+	set_colour (save);
+      i++;
+      p += i;
+    }
+    set_colour (save);
+  }
+  if (text_dot)
+    XDrawPoint (dpy, drw, gc, x, y);
+  drw_mods++;
+#endif
+
+  lastxcur = x + FONTW * len;
+  lastycur = y;
+  if (scrx != -2)
+    lastx0 = x;
+  if (scry != -2)
+    lasty0 = y + FONTH;
 }
 
 
 /*
-   draw (or erase) the pointer if we aren't using the mouse
-*/
+ *	DrawScreenChar - display a character
+ *
+ *	Same thing as DrawScreenText() except that the string is
+ *	printed verbatim (no formatting or conversion).
+ */
+void DrawScreenChar (int x, int y, char c)
+{
+#if defined Y_BGI
+  char buf[2];
+  buf[0] = c;
+  buf[1] = '\0';
+  outtextxy (x, y, buf);
+#elif defined Y_X11
+  XDrawString (dpy, drw, gc, x - font_xofs, y + font_yofs, &c, 1);
+  if (text_dot)
+    XDrawPoint (dpy, drw, gc, x, y);
+  drw_mods++;
+#endif
+}
 
+
+/*
+ *	DrawPointer  - draw (or erase) the pointer if we aren't using the mouse
+ */
 void DrawPointer (bool rulers)
 {
 #ifdef Y_BGI
-int r;
+  int r;
 
-/* use XOR mode : drawing the pointer twice erases it */
-SetDrawingMode (1);
-/* draw the pointer */
-if  (rulers)
-   {
-   set_colour (MAGENTA);
-   r = (int) (512 * Scale);
-   circle (is.x, is.y, r);
-   r >>= 1;
-   circle (is.x, is.y, r);
-   r >>= 1;
-   circle (is.x, is.y, r);
-   r >>= 1;
-   circle (is.x, is.y, r);
-   r = (int) (1024 * Scale);
-   line (is.x - r, is.y, is.x + r, is.y);
-   line (is.x, is.y - r, is.x, is.y + r);
-   }
-else
-   {
-   set_colour (YELLOW);
-   line (is.x - 15, is.y - 13, is.x + 15, is.y + 13);
-   line (is.x - 15, is.y + 13, is.x + 15, is.y - 13);
-   }
-/* restore normal write mode */
-SetDrawingMode (0);
+  // Use XOR mode : drawing the pointer twice erases it
+  SetDrawingMode (1);
+  // Draw the pointer
+  if (rulers)
+  {
+    set_colour (MAGENTA);
+    r = (int) (512 * Scale);
+    circle (is.x, is.y, r);
+    r >>= 1;
+    circle (is.x, is.y, r);
+    r >>= 1;
+    circle (is.x, is.y, r);
+    r >>= 1;
+    circle (is.x, is.y, r);
+    r = (int) (1024 * Scale);
+    line (is.x - r, is.y, is.x + r, is.y);
+    line (is.x, is.y - r, is.x, is.y + r);
+  }
+  else
+  {
+    set_colour (YELLOW);
+    line (is.x - 15, is.y - 13, is.x + 15, is.y + 13);
+    line (is.x - 15, is.y + 13, is.x + 15, is.y - 13);
+  }
+  // Restore normal write mode
+  SetDrawingMode (0);
 #else
-;
+  ;
 #endif
 }
 
 
 #ifdef Y_BGI
 /*
-   translate a standard color to Doom palette 0 (approx.)
-*/
-
-int TranslateToDoomColor (int color)
+ *	TranslateToDoomColor - translate a standard color to Doom palette 0 (approx.)
+ */
+int TranslateToDoomColor (int colour)
 {
-if (GfxMode < 0)
-   switch (color)
-      {
+  if (GfxMode < 0)
+    switch (colour)
+    {
       case BLACK:
-	 return 0;
+	return 0;
       case BLUE:
-	 return 202;
+	return 202;
       case GREEN:
-	 return 118;
+	return 118;
       case CYAN:
-	 return 194;
+	return 194;
       case RED:
-	 return 183;
+	return 183;
       case MAGENTA:
-	 return 253;
+	return 253;
       case BROWN:
-	 return 144;
-      case LIGHTGRAY:
-	 return 88;
-      case DARKGRAY:
-	 return 96;
+	return 144;
+      case LIGHTGREY:
+	return 88;
+      case DARKGREY:
+	return 96;
       case LIGHTBLUE:
-	 return 197;
+	return 197;
       case LIGHTGREEN:
-	 return 112;
+	return 112;
       case LIGHTCYAN:
-	 return 193;
+	return 193;
       case LIGHTRED:
-	 return 176;
+	return 176;
       case LIGHTMAGENTA:
-	 return 250;
+	return 250;
       case YELLOW:
-	 return 231;
+	return 231;
       case WHITE:
-	 return 4;
-      }
-return color;
+	return 4;
+    }
+  return colour;
 }
 #endif
 
 
 #if defined Y_BGI && defined CIRRUS_PATCH
 /*
-   Cirrus Logic Hardware Mouse Cursor Stuff
-*/
+ *	Cirrus Logic Hardware Mouse Cursor Stuff
+ */
 
 #define CRTC 0x3D4
 #define ATTR 0x3C0
@@ -1531,108 +1623,106 @@
 
 unsigned rdinx (unsigned pt, unsigned inx)
 {
-if (pt == ATTR)
-   inportb (CRTC + 6);
-outportb (pt, inx);
-return inportb (pt + 1);
+  if (pt == ATTR)
+    inportb (CRTC + 6);
+  outportb (pt, inx);
+  return inportb (pt + 1);
 }
 
 
 void wrinx (int pt, unsigned inx, unsigned val)
 {
-if (pt == ATTR)
-   {
-   inportb (CRTC + 6);
-   outportb (pt, inx);
-   outportb (pt, val);
-   }
-else
-   {
-   outportb (pt, inx);
-   outportb (pt + 1, val);
-   }
+  if (pt == ATTR)
+  {
+    inportb (CRTC + 6);
+    outportb (pt, inx);
+    outportb (pt, val);
+  }
+  else
+  {
+    outportb (pt, inx);
+    outportb (pt + 1, val);
+  }
 }
 
 
 void modinx (unsigned pt, unsigned inx, unsigned mask, unsigned nwv)
 {
-unsigned temp;
+  unsigned temp;
 
-temp = (rdinx (pt, inx) & ~mask) + (nwv & mask);
-wrinx (pt, inx, temp);
+  temp = (rdinx (pt, inx) & ~mask) + (nwv & mask);
+  wrinx (pt, inx, temp);
 }
 
 
 void clrinx (unsigned pt, unsigned inx, unsigned val)
 {
-unsigned x;
+  unsigned x;
 
-x = rdinx (pt, inx);
-wrinx (pt, inx, x & ~val);
+  x = rdinx (pt, inx);
+  wrinx (pt, inx, x & ~val);
 }
 
 
 void SetHWCursorPos (unsigned x, unsigned y)
 {
-outport (SEQ, (x << 5) | 0x10);
-outport (SEQ, (y << 5) | 0x11);
+  outport (SEQ, (x << 5) | 0x10);
+  outport (SEQ, (y << 5) | 0x11);
 }
 
 
 void SetHWCursorCol (long fgcol, long bgcol)
 {
-modinx (SEQ, 0x12, 3, 2);
-outportb (0x3C8, 0xFF);
-outportb (0x3C9, LOBYTE (fgcol) >> 2);
-outportb (0x3C9, HIBYTE (bgcol) >> 2);
-outportb (0x3C8, 0);
-outportb (0x3C9, LOBYTE (bgcol) >> 2);
-outportb (0x3C9, HIBYTE (bgcol) >> 2);
-outportb (0x3C9, bgcol >> 18);
-modinx (SEQ, 0x12, 3, 1);
+  modinx (SEQ, 0x12, 3, 2);
+  outportb (0x3C8, 0xFF);
+  outportb (0x3C9, LOBYTE (fgcol) >> 2);
+  outportb (0x3C9, HIBYTE (bgcol) >> 2);
+  outportb (0x3C8, 0);
+  outportb (0x3C9, LOBYTE (bgcol) >> 2);
+  outportb (0x3C9, HIBYTE (bgcol) >> 2);
+  outportb (0x3C9, bgcol >> 18);
+  modinx (SEQ, 0x12, 3, 1);
 }
 
 
 void CopyHWCursorMap (unsigned bytes)
 {
-char    *curmapptr = 0xA000FF00L;
-unsigned lbank = (1024 / 64) - 1;
+  char    *curmapptr = 0xA000FF00L;
+  unsigned lbank = (1024 / 64) - 1;
 
-if ((rdinx (GRC, 0x0B) & 32)==0)
-   lbank = lbank << 2;
-wrinx (GRC, 9, lbank << 2);
-memmove (curmapptr, &mp, bytes);
+  if ((rdinx (GRC, 0x0B) & 32)==0)
+    lbank = lbank << 2;
+  wrinx (GRC, 9, lbank << 2);
+  memmove (curmapptr, &mp, bytes);
 }
 
 
 void SetHWCursorMap (char *map)
 {
-memmove (&mp, map, 128);
-memmove (&mp + 128, &mp, 128);
-CopyHWCursorMap (256);
-SetHWCursorCol (0xFF00000L, 0xFF);
-wrinx (SEQ, 0x13, 0x3F);
+  memmove (&mp, map, 128);
+  memmove (&mp + 128, &mp, 128);
+  CopyHWCursorMap (256);
+  SetHWCursorCol (0xFF00000L, 0xFF);
+  wrinx (SEQ, 0x13, 0x3F);
 }
 
-#endif /* Y_BGI && CIRRUS_PATCH */
+#endif  /* Y_BGI && CIRRUS_PATCH */
 
 
 #ifdef Y_DOS
 static int cooked_installuserdriver (const char far *__name,
                                     int huge (*detect)(void))
 {
-char savecwd[PATH_MAX+1];
-int gdriver;
+  char savecwd[PATH_MAX+1];
+  int gdriver;
 
-getcwd (savecwd, PATH_MAX);
-if (al_fchdir (install_dir))
-   fatal_error ("installuserdriver: chdir1 error (%s)", strerror (errno));
-gdriver = installuserdriver (__name, detect);
-if (al_fchdir (savecwd))
-   fatal_error ("installuserdriver: chdir2 error (%s)", strerror (errno));
-return gdriver;
+  getcwd (savecwd, PATH_MAX);
+  if (al_fchdir (install_dir))
+    fatal_error ("installuserdriver: chdir1 error (%s)", strerror (errno));
+  gdriver = installuserdriver (__name, detect);
+  if (al_fchdir (savecwd))
+    fatal_error ("installuserdriver: chdir2 error (%s)", strerror (errno));
+  return gdriver;
 }
 #endif
 
-/* end of file */
-
diff -uaNr yadex-1.5.2/src/gfx.h yadex-1.6.0/src/gfx.h
--- yadex-1.5.2/src/gfx.h	2000-08-16 00:28:20.000000000 +0200
+++ yadex-1.6.0/src/gfx.h	2000-11-07 13:15:14.000000000 +0100
@@ -14,8 +14,8 @@
    font, FONTW was 8 and FONTH was 10. DrawScreenText() is supposed
    to draw characters properly _centered_ within that space, taking
    into account the optional underscoring. */
-extern int FONTW;
-extern int FONTH;
+extern unsigned FONTW;
+extern unsigned FONTH;
 extern int font_xofs;
 extern int font_yofs;
 
@@ -88,7 +88,6 @@
 void ClearScreen (void);
 void update_display ();
 void force_window_not_pixmap ();
-void set_colour (acolour_t);
 void SetLineThickness (int thick);
 void SetDrawingMode (int _xor);
 void DrawMapCircle (int, int, int);
@@ -106,6 +105,7 @@
    int thickness, int raised);
 void DrawScreenText (int, int, const char *, ...);
 void DrawScreenString (int, int, const char *);
+void DrawScreenChar (int x, int y, char c);
 void DrawPointer (bool);
 void DrawScreenMeter (int, int, int, int, float);
 void DrawScreenLineLen (int x, int y, int width, int height);
@@ -118,6 +118,8 @@
 #ifdef PCOLOUR_NONE
 void set_pcolour (pcolour_t colour);
 #endif
+acolour_t get_colour ();
+void set_colour (acolour_t);
 void push_colour (acolour_t colour);
 void pop_colour (void);
 void draw_point (int x, int y);
diff -uaNr yadex-1.5.2/src/gfx2.cc yadex-1.6.0/src/gfx2.cc
--- yadex-1.5.2/src/gfx2.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/gfx2.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/gfx3.cc yadex-1.6.0/src/gfx3.cc
--- yadex-1.5.2/src/gfx3.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/gfx3.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/gotoobj.cc yadex-1.6.0/src/gotoobj.cc
--- yadex-1.5.2/src/gotoobj.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/gotoobj.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,9 @@
 #include "gfx.h"
 #include "gotoobj.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
+#include "x_hover.h"
 
 
 /*
@@ -70,7 +73,9 @@
  */
 inline int sector_under_pointer ()
 {
-   return GetCurObject (OBJ_SECTORS, MAPX (is.x), MAPY (is.y), 1);
+Objid o;
+GetCurObject (o, OBJ_SECTORS, MAPX (is.x), MAPY (is.y));
+return o.num;
 }
 
 
@@ -78,14 +83,14 @@
   centre the map around the object and zoom in if necessary
 */
 
-void GoToObject (int objtype, int objnum) /* SWAP! */
+void GoToObject (const Objid& objid) /* SWAP! */
 {
 int   xpos, ypos;
 int   xpos2, ypos2;
 int   sd1, sd2;
 float oldscale;
 
-GetObjectCoords (objtype, objnum, &xpos, &ypos);
+GetObjectCoords (objid.type, objid.num, &xpos, &ypos);
 focus_on_map_coords (xpos, ypos);
 oldscale = Scale;
 
@@ -96,7 +101,7 @@
 #if 0
 /* zoom in until the object can be selected */
 while (Scale < 8.0
-   && GetCurObject (objtype, MAPX (is.x), MAPY (is.y), 4) != objnum)
+   && GetCurObject (objid.type, MAPX (is.x), MAPY (is.y)) != objid.num)
    {
    if (Scale < 1.0)
       Scale = 1.0 / ((1.0 / Scale) - 1.0);
@@ -116,7 +121,7 @@
    most well-constituted sectors. It does not work so well for
    unclosed sectors, though (but it's partly GetCurObject()'s
    fault). */
-if (objtype == OBJ_SECTORS && sector_under_pointer () != objnum)
+if (objid.type == OBJ_SECTORS && sector_under_pointer () != objid.num)
    {
    /* restore the Scale */
    Scale = oldscale;
@@ -126,8 +131,8 @@
       sd1 = LineDefs[n].sidedef1;
       sd2 = LineDefs[n].sidedef2;
       ObjectsNeeded (OBJ_SIDEDEFS, 0);
-      if (sd1 >= 0 && SideDefs[sd1].sector == objnum
-	|| sd2 >= 0 && SideDefs[sd2].sector == objnum)
+      if (sd1 >= 0 && SideDefs[sd1].sector == objid.num
+	|| sd2 >= 0 && SideDefs[sd2].sector == objid.num)
 	 {
 	 GetObjectCoords (OBJ_LINEDEFS, n, &xpos2, &ypos2);
 	 int d = ComputeDist (abs (xpos - xpos2), abs (ypos - ypos2)) / 7;
@@ -136,7 +141,7 @@
 	 xpos = xpos2 + (xpos - xpos2) / d;
 	 ypos = ypos2 + (ypos - ypos2) / d;
 	 focus_on_map_coords (xpos, ypos);
-	 if (sector_under_pointer () == objnum)
+	 if (sector_under_pointer () == objid.num)
 	    break;
 	 }
       }
diff -uaNr yadex-1.5.2/src/gotoobj.h yadex-1.6.0/src/gotoobj.h
--- yadex-1.5.2/src/gotoobj.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/gotoobj.h	2000-11-07 00:47:39.000000000 +0100
@@ -4,6 +4,9 @@
  */
 
 
+class Objid;
+
+
 void CenterMapAroundCoords (int, int);
-void GoToObject (int objtype, int objnum); /* SWAP! */
+void GoToObject (const Objid& objid); /* SWAP! */
 
diff -uaNr yadex-1.5.2/src/help1.cc yadex-1.6.0/src/help1.cc
--- yadex-1.5.2/src/help1.cc	2000-04-15 17:41:47.000000000 +0200
+++ yadex-1.6.0/src/help1.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -107,7 +107,7 @@
 fprintf (fd, "** Yadex is work in progress. Subscribe to yadex-announce\n");
 fprintf (fd, "** or keep an eye on the web page.\n");
 fprintf (fd, "** To edit an existing level, type \"e \".\n");
-fprintf (fd, "** To create a new level, type \"c \".\n"
+fprintf (fd, "** To create a new level, type \"c\".\n"
                 "\n");
 #endif
 }
diff -uaNr yadex-1.5.2/src/help2.cc yadex-1.6.0/src/help2.cc
--- yadex-1.5.2/src/help2.cc	2000-04-23 15:02:02.000000000 +0200
+++ yadex-1.6.0/src/help2.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,6 +28,7 @@
 
 
 #include "yadex.h"
+#include "credits.h"
 #include "gfx.h"
 #include "help1.h"  // what()
 #include "help2.h"
@@ -38,7 +39,7 @@
  */
 
 static const char *help_text[] =
-  {
+{
   "             Keyboard :",
   "Esc/q Quit                      Pgup  Scroll up",
   "                                Pgdn  Scroll down",
@@ -76,42 +77,42 @@
   "  [Ctrl] is pressed).",
   "- Wheel or buttons 4 and 5: zoom in and out",
   NULL
-  };
+};
 
 void DisplayHelp () /* SWAP! */
 {
-int x0;
-int y0;
-int width;
-int height;
-size_t maxlen = 0;
-int lines = 4;
-
-for (const char **str = help_text; *str; str++)
-   {
-   size_t len = strlen (*str);
-   maxlen = y_max (maxlen, len);
-   lines++;
-   }
-width  = (maxlen + 4) * FONTW + 2 * BOX_BORDER;
-height = lines * FONTH + 2 * BOX_BORDER;
-x0 = (ScrMaxX + 1 - width) / 2;
-y0 = (ScrMaxY + 1 - height) / 2;
-HideMousePointer ();
-/* put in the instructions */
-DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
-set_colour (LIGHTCYAN);
-DrawScreenText (x0 + BOX_BORDER + (width - 5 * FONTW) / 2,
-                y0 + BOX_BORDER + FONTH / 2,
-                "Yadex");
-set_colour (WINFG);
-DrawScreenText (x0 + BOX_BORDER + 2 * FONTW, y0 + BOX_BORDER + FONTH, "");
-for (const char **str = help_text; *str; str++)
-   DrawScreenText (-1, -1, *str);
-set_colour (YELLOW);
-DrawScreenText (-1, -1, "Press any key to return to the editor...");
-get_key_or_click ();
-ShowMousePointer ();
+  int x0;
+  int y0;
+  int width;
+  int height;
+  size_t maxlen = 0;
+  int lines = 4;
+
+  for (const char **str = help_text; *str; str++)
+  {
+    size_t len = strlen (*str);
+    maxlen = y_max (maxlen, len);
+    lines++;
+  }
+  width  = (maxlen + 4) * FONTW + 2 * BOX_BORDER;
+  height = lines * FONTH + 2 * BOX_BORDER;
+  x0 = (ScrMaxX + 1 - width) / 2;
+  y0 = (ScrMaxY + 1 - height) / 2;
+  HideMousePointer ();
+  /* put in the instructions */
+  DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
+  set_colour (LIGHTCYAN);
+  DrawScreenText (x0 + BOX_BORDER + (width - 5 * FONTW) / 2,
+		  y0 + BOX_BORDER + FONTH / 2,
+		  "Yadex");
+  set_colour (WINFG);
+  DrawScreenText (x0 + BOX_BORDER + 2 * FONTW, y0 + BOX_BORDER + FONTH, "");
+  for (const char **str = help_text; *str; str++)
+     DrawScreenText (-1, -1, *str);
+  set_colour (YELLOW);
+  DrawScreenText (-1, -1, "Press any key to return to the editor...");
+  get_key_or_click ();
+  ShowMousePointer ();
 }
 
 
@@ -121,49 +122,57 @@
  */
 void about_yadex ()
 {
-int width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + 42 * FONTW;
-int height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + 22 * FONTH;
-int x0 = (ScrMaxX + 1 - width) / 2;
-int y0 = (ScrMaxY + 1 - height) / 2;
-
-HideMousePointer ();
-DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
-push_colour (WINFG);
-push_colour (WINFG_HL);
-DrawScreenText (x0 + BOX_BORDER + WIDE_HSPACING,
-                y0 + BOX_BORDER + WIDE_VSPACING, what ());
-pop_colour ();
-DrawScreenText (-1, -1, "");
-DrawScreenText (-1, -1, "Copyright  1997-2000 Andr Majorel");
-DrawScreenText (-1, -1, "Yadex is derived from DEU 5.21 by");
-DrawScreenText (-1, -1, "Raphal Quinet and Brendon Wyber.");
-DrawScreenText (-1, -1, "");
-push_colour (WINFG_HL);
-DrawScreenText (-1, -1, "Home page :");
-pop_colour ();
-DrawScreenText (-1, -1, "http://www.teaser.fr/~amajorel/yadex/");
-DrawScreenText (-1, -1, "http://www.linuxgames.com/yadex/");
-DrawScreenText (-1, -1, "");
-push_colour (WINFG_HL);
-DrawScreenText (-1, -1, "Mailing lists :");
-pop_colour ();
-DrawScreenText (-1, -1, "yadex@middleearth.telefragged.com");
-DrawScreenText (-1, -1, "yadex-announce@middleearth.telefragged.com");
-DrawScreenText (-1, -1, "To subscribe, send mail with the");
-DrawScreenText (-1, -1, "subject \"subscribe \"");
-DrawScreenText (-1, -1, "to listar@middleearth.telefragged.com");
-DrawScreenText (-1, -1, "");
-push_colour (WINFG_HL);
-DrawScreenText (-1, -1, "Maintainer :");
-pop_colour ();
-DrawScreenText (-1, -1, "Andr Majorel ");
-DrawScreenText (-1, -1, "");
-DrawScreenText (-1, -1, "");
-set_colour (YELLOW);
-DrawScreenText (-1, -1, "Press any key to return to the editor...");
-pop_colour ();
-get_key_or_click ();
-ShowMousePointer ();
+  int widthc  = 57;
+  int heightc = 19;
+
+  for (const char *const *s = yadex_copyright; *s != 0; s++)
+  {
+    if (strlen (*s) > size_t (widthc))
+      widthc = strlen (*s);
+    heightc++;
+  }
+  int width   = 2 * BOX_BORDER + 2 * WIDE_HSPACING + widthc * FONTW;
+  int height  = 2 * BOX_BORDER + 2 * WIDE_VSPACING + heightc * FONTH;
+  int x0 = (ScrMaxX + 1 - width) / 2;
+  int y0 = (ScrMaxY + 1 - height) / 2;
+
+  HideMousePointer ();
+  DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
+  push_colour (WINFG);
+  push_colour (WINFG_HL);
+  DrawScreenText (x0 + BOX_BORDER + WIDE_HSPACING,
+		  y0 + BOX_BORDER + WIDE_VSPACING, what ());
+  pop_colour ();
+  DrawScreenText (-1, -1, "");
+  for (const char *const *s = yadex_copyright; *s != 0; s++)
+    DrawScreenText (-1, -1, *s);
+  DrawScreenText (-1, -1, "");
+  push_colour (WINFG_HL);
+  DrawScreenText (-1, -1, "Home page :");
+  pop_colour ();
+  DrawScreenText (-1, -1, "http://www.teaser.fr/~amajorel/yadex/");
+  DrawScreenText (-1, -1, "http://www.linuxgames.com/yadex/");
+  DrawScreenText (-1, -1, "");
+  push_colour (WINFG_HL);
+  DrawScreenText (-1, -1, "Mailing lists :");
+  pop_colour ();
+  DrawScreenText (-1, -1, "you-know-what@freelists.org");
+  DrawScreenText (-1, -1, "you-know-what-announce@freelists.org");
+  DrawScreenText (-1, -1, "To subscribe, send mail with the subject");
+  DrawScreenText (-1, -1, "\"subscribe \" to ecartis@freelists.org.");
+  DrawScreenText (-1, -1, "");
+  push_colour (WINFG_HL);
+  DrawScreenText (-1, -1, "Maintainer :");
+  pop_colour ();
+  DrawScreenText (-1, -1, "Andr Majorel (http://www.teaser.fr/~amajorel/)");
+  DrawScreenText (-1, -1, "Send all email to you-know-what@freelists.org, NOT to me.");
+  DrawScreenText (-1, -1, "");
+  DrawScreenText (-1, -1, "");
+  set_colour (YELLOW);
+  DrawScreenText (-1, -1, "Press any key to return to the editor...");
+  pop_colour ();
+  get_key_or_click ();
+  ShowMousePointer ();
 }
 
 
diff -uaNr yadex-1.5.2/src/highlt.cc yadex-1.6.0/src/highlt.cc
--- yadex-1.5.2/src/highlt.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/highlt.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -29,33 +29,33 @@
 
 #include "yadex.h"
 #include "highlt.h"
+#include "objects.h"
+#include "objid.h"
 
 
 highlight_c::highlight_c (void)
 {
-obj_no      = OBJ_NO_NONE;
-obj_no_disp = OBJ_NO_NONE;
+obj.nil ();
+obj_disp.nil ();
 }
 
 
 void highlight_c::draw (void)
 {
-if (! is_obj (obj_no_disp) && is_obj (obj_no))
+if (! obj_disp () && obj ())
    {
-   HighlightObject (obj_type, obj_no, YELLOW);
-   obj_no_disp   = obj_no;
-   obj_type_disp = obj_type;
+   HighlightObject (obj.type, obj.num, YELLOW);
+   obj_disp = obj;
    }
 }
 
 
 void highlight_c::undraw (void)
 {
-if (is_obj (obj_no_disp)
-   && (obj_no_disp != obj_no || obj_type_disp != obj_type))
+if (obj_disp () && ! (obj_disp == obj))
    {
-   HighlightObject (obj_type_disp, obj_no_disp, YELLOW);
-   obj_no_disp = OBJ_NO_NONE;
+   HighlightObject (obj_disp.type, obj_disp.num, YELLOW);
+   obj_disp.nil ();
    }
 }
 
diff -uaNr yadex-1.5.2/src/highlt.h yadex-1.6.0/src/highlt.h
--- yadex-1.5.2/src/highlt.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/highlt.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,38 +28,25 @@
 
 
 #include "edwidget.h"
+#include "objid.h"
 
 
 class highlight_c : public edwidget_c
    {
    public :
       highlight_c (void);
-      void set (int obj_type, int obj_no)
-	 {
-	 this->obj_type = obj_type;
-	 this->obj_no   = obj_no;
-	 }
+      void set (Objid& obj) { this->obj = obj; }
 
       /* Methods declared in edwidget */
-      void unset ()
-	 { obj_no = OBJ_NO_NONE; }
-
+      void unset () { obj.nil (); }
       void draw          ();
       void undraw        ();
-
-      int can_undraw ()
-         { return 1; }  // I have the ability to undraw myself.
-
-      int need_to_clear ()
-	 { return 0; }  // I know how to undraw myself.
-
-      void clear ()
-	 { obj_no_disp = OBJ_NO_NONE; }
+      int can_undraw () { return 1; }  // I have the ability to undraw myself.
+      int need_to_clear () { return 0; }  // I know how to undraw myself.
+      void clear () { obj_disp.nil (); }
 
    private :
-      int obj_no;	 /* The no. of the object we should highlight */
-      int obj_type;	 /* The type of the object we should highlight */
-      int obj_no_disp;	 /* The no. of the object that is really highlighted */
-      int obj_type_disp; /* The type of the object that is really highlighted */
+      Objid obj;	// The object we should highlight
+      Objid obj_disp;	// The object that is really highlighted
    };
 
diff -uaNr yadex-1.5.2/src/img.cc yadex-1.6.0/src/img.cc
--- yadex-1.5.2/src/img.cc	2000-08-11 00:35:47.000000000 +0200
+++ yadex-1.6.0/src/img.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,19 +28,22 @@
 
 
 #include "yadex.h"
-#include "gcolour2.h"  /* colour0 */
+#include "help1.h"
 #include "img.h"
+#include "wadfile.h"
+#include "wads.h"
 
 
 // Holds the private data members
 class Img_priv
 {
   public:
-    Img_priv () { buf = 0; width = 0; height = 0; }
+    Img_priv () { buf = 0; width = 0; height = 0; opaque = false; }
     ~Img_priv () { if (buf != 0) delete[] buf; }
     img_pixel_t *buf;
     img_dim_t    width;
     img_dim_t    height;
+    bool         opaque;
 };
 
 
@@ -60,10 +63,11 @@
  *
  *	The new image is set to the specified dimensions.
  */
-Img::Img (img_dim_t width, img_dim_t height)
+Img::Img (img_dim_t width, img_dim_t height, bool opaque)
 {
   p = new Img_priv;
   resize (width, height);
+  set_opaque (opaque);
 }
 
 
@@ -140,6 +144,15 @@
 
 
 /*
+ *	Img::set_opaque - set or clear the opaque flag
+ */
+void Img::set_opaque (bool opaque)
+{
+  p->opaque = opaque;
+}
+
+ 
+/*
  *	Img::resize - resize the image
  *
  *	If either dimension is zero, the image becomes a null
@@ -147,9 +160,7 @@
  */
 void Img::resize (img_dim_t width, img_dim_t height)
 {
-  // FIXME should check that the width and height are valid.
-  if (width == p->width && height == p->height
-    || width * height == p->width * p->height)
+  if (width == p->width && height == p->height)
     return;
 
   // Unallocate old buffer
@@ -175,3 +186,86 @@
 }
 
 
+/*
+ *	Img::save - save an image to file in packed PPM format
+ *
+ *	Return 0 on success, non-zero on failure
+ *
+ *	If an error occurs, errno is set to:
+ *	- ECHILD if PLAYPAL could not be loaded
+ *	- whatever fopen() or fclose() set it to
+ */
+int Img::save (const char *filename) const
+{
+  int rc = 0;
+  FILE *fp = 0;
+
+  // Load palette 0 from PLAYPAL
+  MDirPtr dir = FindMasterDir (MasterDir, "PLAYPAL");
+  if (dir == 0)
+  {
+    errno = ECHILD;
+    return 1;
+  }
+  unsigned char *pal = new unsigned char[768];
+  dir->wadfile->seek (dir->dir.start);
+  if (dir->wadfile->error ())
+  {
+    /*warn ("%s: can't seek to %lXh\n",
+	dir->wadfile->filename, (unsigned long) ftell (dir->wadfile->fp));
+    warn ("PLAYPAL: seek error\n");*/
+    rc = 1;
+    errno = ECHILD;
+    goto byebye;
+  }
+  dir->wadfile->read_bytes (pal, 768);
+  if (dir->wadfile->error ())
+  {
+    /*warn ("%s: read error", dir->wadfile->where ());
+    warn ("PLAYPAL: read error\n");*/
+    rc = 1;
+    errno = ECHILD;
+    goto byebye;
+  }
+
+  // Create PPM file
+  fp = fopen (filename, "wb");
+  if (fp == NULL)
+  {
+    rc = 1;
+    goto byebye;
+  }
+  fputs ("P6\n", fp);
+  fprintf (fp, "# %s\n", what ());
+  fprintf (fp, "%d %d 255\n", p->width, p->height);
+  {
+    const img_pixel_t *pix    = p->buf;
+    const img_pixel_t *pixmax = pix + (unsigned long) p->width * p->height;
+    for (; pix < pixmax; pix++)
+    {
+      if (*pix == IMG_TRANSP && ! p->opaque)
+      {
+	putc ( 0, fp);	// DeuTex convention, rgb:0/2f/2f
+	putc (47, fp);
+	putc (47, fp);
+      }
+      else
+      {
+	putc (pal[3 * *pix    ], fp);
+	putc (pal[3 * *pix + 1], fp);
+	putc (pal[3 * *pix + 2], fp);
+      }
+    }
+  }
+  if (ferror (fp))
+    rc = 1;
+
+byebye:
+  if (fp != 0)
+    if (fclose (fp))
+      rc = 1;
+  delete[] pal;
+  return rc;
+}
+
+
diff -uaNr yadex-1.5.2/src/img.h yadex-1.6.0/src/img.h
--- yadex-1.5.2/src/img.h	2000-08-11 00:46:48.000000000 +0200
+++ yadex-1.6.0/src/img.h	2001-10-11 11:05:45.000000000 +0200
@@ -23,18 +23,21 @@
 {
   public :
     Img ();
-    Img (img_dim_t width, img_dim_t height);
+    Img (img_dim_t width, img_dim_t height, bool opaque);
     ~Img ();
-    bool is_null () const;  // Is it a null image ?
-    img_dim_t width () const;  // Return the width
-    img_dim_t height () const;  // Return the height
-    const img_pixel_t *buf () const;  // Return pointer on buffer
-    img_pixel_t *wbuf ();  // Return pointer on buffer
-    // Set the width and height
-    void clear ();
-    void resize (img_dim_t width, img_dim_t height);
+    bool               is_null    () const;	// Is it a null image ?
+    img_dim_t          width      () const;	// Return the width
+    img_dim_t          height     () const;	// Return the height
+    const img_pixel_t *buf        () const;	// Return pointer on buffer
+    img_pixel_t       *wbuf       ();		// Return pointer on buffer
+    void               clear      ();
+    void               set_opaque (bool opaque);
+    void               resize     (img_dim_t width, img_dim_t height);
+    int                save       (const char *filename) const;
     
   private :
+    Img            (const Img&);	// Too lazy to implement it
+    Img& operator= (const Img&);	// Too lazy to implement it
     Img_priv *p;
 };
 
diff -uaNr yadex-1.5.2/src/imgscale.cc yadex-1.6.0/src/imgscale.cc
--- yadex-1.5.2/src/imgscale.cc	2000-07-09 14:56:47.000000000 +0200
+++ yadex-1.6.0/src/imgscale.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/imgspect.cc yadex-1.6.0/src/imgspect.cc
--- yadex-1.5.2/src/imgspect.cc	2000-08-10 23:34:49.000000000 +0200
+++ yadex-1.6.0/src/imgspect.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/infobar.cc yadex-1.6.0/src/infobar.cc
--- yadex-1.5.2/src/infobar.cc	2000-07-09 15:46:57.000000000 +0200
+++ yadex-1.6.0/src/infobar.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -41,6 +41,7 @@
 #include "yadex.h"
 #include "gfx.h"
 #include "infobar.h"
+#include "objid.h"
 
 
 const char infobar_c::FILE_NAME_UNSET[1] = { ' ' };  // A special pointer value 
diff -uaNr yadex-1.5.2/src/infobar.h yadex-1.6.0/src/infobar.h
--- yadex-1.5.2/src/infobar.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/infobar.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/input.cc yadex-1.6.0/src/input.cc
--- yadex-1.5.2/src/input.cc	2000-05-17 00:12:21.000000000 +0200
+++ yadex-1.6.0/src/input.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,8 +28,8 @@
 */
 
 
-#ifdef Y_X11
 #include "yadex.h"
+#ifdef Y_X11
 #include 	// nanosleep ()
 #include 
 #include   // XLookupString
@@ -84,15 +84,15 @@
  */
 void init_input_status ()
 {
-is.in_window = 0;
-is.width     = -1;
-is.height    = 0;
-is.butl      = 0;
-is.butm      = 0;
-is.butr      = 0;
-is.shift     = 0;
-is.ctrl      = 0;
-is.alt       = 0;
+is.in_window   = 0;
+is.width       = -1;
+is.height      = 0;
+is.butl        = 0;
+is.butm        = 0;
+is.butr        = 0;
+is.shift       = 0;
+is.ctrl        = 0;
+is.alt         = 0;
 is.scroll_lock = 0;
 }
 
@@ -104,7 +104,7 @@
 typedef struct
    {
    KeySym ks;
-   int    key;
+   inpev_t key;
    } key_info_t;
 static const key_info_t key_info[] =
    {
@@ -130,8 +130,12 @@
    { XK_Insert,		YK_INS,		},
    { XK_Left,		YK_LEFT,	},
    { XK_Linefeed,	YK_RETURN,	},
+#ifdef XK_Page_Down	/* HP-UX 10 doesn't have XK_Page_Down */
    { XK_Page_Down,	YK_PD,		},
+#endif
+#ifdef XK_Page_Up	/* HP-UX 10 doesn't have XK_Page_Up */
    { XK_Page_Up,	YK_PU,		},
+#endif
    { XK_Return,		YK_RETURN,	},
    { XK_Right,		YK_RIGHT,	},
    { XK_Tab,		YK_TAB,		},
@@ -213,8 +217,11 @@
       is.key       = YE_ENTER;
       is.time      = ev.xcrossing.time;
       is.in_window = 1;
-      is.x         = ev.xcrossing.x;
-      is.y         = ev.xcrossing.y;
+      // Sanity
+      if (ev.xcrossing.x < 0) nf_bug ("xcrossing.x < 0");  // Paranoia
+      if (ev.xcrossing.y < 0) nf_bug ("xcrossing.y < 0");  // Paranoia
+      is.x = ev.xcrossing.x;
+      is.y = ev.xcrossing.y;
       break;
    case LeaveNotify :
       is.key       = YE_LEAVE;
@@ -225,8 +232,10 @@
    case MotionNotify :
       is.key  = YE_MOTION;
       is.time = ev.xmotion.time;
-      is.x    = ev.xmotion.x;
-      is.y    = ev.xmotion.y;
+      if (ev.xmotion.x < 0) nf_bug ("xmotion.x < 0");  // Paranoia
+      if (ev.xmotion.y < 0) nf_bug ("xmotion.y < 0");  // Paranoia
+      is.x = ev.xmotion.x;
+      is.y = ev.xmotion.y;
 #ifdef DEBUG
       {
 	static bool first_time = true;
@@ -378,7 +387,7 @@
 #if 0
       if (ev.type == KeyPress)
 	 {
-	 printf ("key=%04Xh", is.key);
+	 printf ("key=%04hXh", is.key);
 	 if (is.key >= 0 && is.key <= UCHAR_MAX && isprint (is.key))
 	    printf (" (%c)", (char) is.key);
 	 putchar ('\n');
@@ -458,7 +467,7 @@
  */
 typedef struct
    {
-   int key;
+   inpev_t key;
    const char *string;
    } key_string_t;
 static const key_string_t key_string[] =
@@ -491,7 +500,7 @@
    { YK_UP,		"Up"		},
    };
 
-const char *key_to_string (int k)
+const char *key_to_string (inpev_t k)
 {
 static char buf[51];
 
@@ -503,12 +512,12 @@
       break;
 
 *buf = '\0';
-if (k & YK_CTRL || (n == nmax && k >= 0 && k <= 31))
+if (k & YK_CTRL || (n == nmax && k <= 31))
    {
    al_saps (buf, "Ctrl-", sizeof buf - 1);
    if (k & YK_CTRL)
       k ^= YK_CTRL;
-   if (k >= 0 && k <= 31)
+   if (k <= 31)
       k += 96;  // Heavy ASCII-ism : 01h (^A) -> 61h ("a")
    }
 if (k & YK_ALT)
@@ -523,7 +532,7 @@
    }
 
 if (n == nmax)
-   if (k >= 0 && k <= UCHAR_MAX && isprint (k))
+   if (k <= UCHAR_MAX && isprint (k))
       al_sapc (buf, k, sizeof buf - 1);
    else
       {
diff -uaNr yadex-1.5.2/src/input.h yadex-1.6.0/src/input.h
--- yadex-1.5.2/src/input.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/input.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,26 +28,27 @@
 */
 
 
+typedef unsigned short inpev_t;
 typedef struct
   {
-  /* Window events */
-  int  width;		/* New window width */
-  int  height;		/* New window height */
-  /* Mouse events */
-  char in_window;	/* <>0 iff mouse pointer is in window */
-  char butl;		/* <>0 iff left mouse button is depressed */
-  char butm;		/* <>0 iff middle mouse button is depressed */
-  char butr;		/* <>0 iff right mouse button is depressed */
-  int  x;		/* Mouse pointer position */
-  int  y;
-  /* Keyboard */
-  char shift;		/* <>0 iff either [Shift] is pressed */
-  char ctrl;		/* <>0 iff either [Ctrl] is pressed */
-  char alt;		/* <>0 iff either [Alt]/[Meta] is pressed */
-  char scroll_lock;	/* Always 0 for the moment */
-  /* General */
-  int  key;             /* Code of key just pressed (ASCII + YK_*) */
-  unsigned long time;	/* Date of event in ms (1) */
+  // Window events
+  int  width;		// New window width
+  int  height;		// New window height
+  // Mouse events
+  char in_window;	// <>0 iff mouse pointer is in window
+  char butl;		// <>0 iff left mouse button is depressed
+  char butm;		// <>0 iff middle mouse button is depressed
+  char butr;		// <>0 iff right mouse button is depressed
+  int x;		// Mouse pointer position
+  int y;
+  // Keyboard
+  char shift;		// <>0 iff either [Shift] is pressed
+  char ctrl;		// <>0 iff either [Ctrl] is pressed
+  char alt;		// <>0 iff either [Alt]/[Meta] is pressed
+  char scroll_lock;	// Always 0 for the moment
+  // General
+  inpev_t key;		// Code of last event (key, mouse, resize, expose...)
+  unsigned long time;	// Date of event in ms (1)
   } input_status_t;
 
 /* Notes:
@@ -55,59 +56,60 @@
     enter and leave.
 */
 
-/* Event and key codes */
-enum
-  {
-  YK_BACKSPACE	= '\b',
-  YK_TAB	= '\t',
-  YK_RETURN	= '\r',
-  YK_ESC	= 0x1b,
-  YK_DEL	= 0x7f,
-  YK_		= 256,
-  YK_BACKTAB,
-  YK_DOWN,
-  YK_END,
-  YK_F1,
-  YK_F2,
-  YK_F3,
-  YK_F4,
-  YK_F5,
-  YK_F6,
-  YK_F7,
-  YK_F8,
-  YK_F9,
-  YK_F10,
-  YK_HOME,
-  YK_INS,
-  YK_LEFT,
-  YK_PU,
-  YK_PD,
-  YK_RIGHT,
-  YK_UP,
-  YK__LAST,  // Marks the end of key events
-  // Those are not key numbers but window events
-  YE_RESIZE,
-  YE_EXPOSE,
-  // Those are not key numbers but mouse events
-  YE_BUTL_PRESS,
-  YE_BUTL_RELEASE,
-  YE_BUTM_PRESS,
-  YE_BUTM_RELEASE,
-  YE_BUTR_PRESS,
-  YE_BUTR_RELEASE,
-  YE_WHEEL_UP,		// Negative movement, normally bound to button 4
-  YE_WHEEL_DOWN,	// Positive movement, normally bound to button 5
-  YE_ENTER,
-  YE_LEAVE,
-  YE_MOTION,
-  // Those are not key numbers but application
-  //  events (i.e. generated internally)
-  YE_ZOOM_CHANGED,
-  // Those are ORed with the other key numbers :
-  YK_SHIFT	= 0x2000,
-  YK_CTRL	= 0X4000, 
-  YK_ALT	= 0x8000
-  };
+/* Events and key codes */
+const inpev_t YK_BACKSPACE	= '\b';
+const inpev_t YK_TAB		= '\t';
+const inpev_t YK_RETURN		= '\r';
+const inpev_t YK_ESC		= 0x1b;
+const inpev_t YK_DEL		= 0x7f;
+const inpev_t YK_		= 256;
+const inpev_t YK_BACKTAB	= 257;
+const inpev_t YK_DOWN		= 258;
+const inpev_t YK_END		= 259;
+const inpev_t YK_F1		= 260;
+const inpev_t YK_F2		= 261;
+const inpev_t YK_F3		= 262;
+const inpev_t YK_F4		= 263;
+const inpev_t YK_F5		= 264;
+const inpev_t YK_F6		= 265;
+const inpev_t YK_F7		= 266;
+const inpev_t YK_F8		= 267;
+const inpev_t YK_F9		= 268;
+const inpev_t YK_F10		= 269;
+const inpev_t YK_HOME		= 270;
+const inpev_t YK_INS		= 271;
+const inpev_t YK_LEFT		= 272;
+const inpev_t YK_PU		= 273;
+const inpev_t YK_PD		= 274;
+const inpev_t YK_RIGHT		= 275;
+const inpev_t YK_UP		= 276;
+const inpev_t YK__LAST		= 277;  // Marks the end of key events
+
+// Those are not key numbers but window events
+const inpev_t YE_RESIZE		= 278;
+const inpev_t YE_EXPOSE		= 279;
+
+// Those are not key numbers but mouse events
+const inpev_t YE_BUTL_PRESS	= 280;
+const inpev_t YE_BUTL_RELEASE	= 281;
+const inpev_t YE_BUTM_PRESS	= 282;
+const inpev_t YE_BUTM_RELEASE	= 283;
+const inpev_t YE_BUTR_PRESS	= 284;
+const inpev_t YE_BUTR_RELEASE	= 285;
+const inpev_t YE_WHEEL_UP	= 286;	// Negative, normally bound to button 4
+const inpev_t YE_WHEEL_DOWN	= 287;	// Positive, normally bound to button 5
+const inpev_t YE_ENTER		= 288;
+const inpev_t YE_LEAVE		= 289;
+const inpev_t YE_MOTION		= 290;
+
+// Those are not key numbers but application events
+// (i.e. generated internally)
+const inpev_t YE_ZOOM_CHANGED	= 291;
+
+// Those are ORed with the other key numbers :
+const inpev_t YK_SHIFT		= 0x2000;
+const inpev_t YK_CTRL		= 0X4000; 
+const inpev_t YK_ALT		= 0x8000;
 
 /* Defined in input.c -- see the comment there */
 extern input_status_t is;
@@ -126,6 +128,6 @@
 int  have_key ();
 int  get_key ();
 void get_key_or_click ();
-const char *key_to_string (int k);
+const char *key_to_string (inpev_t k);
 
 
diff -uaNr yadex-1.5.2/src/l_align.cc yadex-1.6.0/src/l_align.cc
--- yadex-1.5.2/src/l_align.cc	2000-05-13 00:09:18.000000000 +0200
+++ yadex-1.6.0/src/l_align.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -33,6 +33,7 @@
 #include "entry.h"
 #include "gfx.h"
 #include "levels.h"
+#include "objid.h"
 #include "oldmenus.h"
 #include "selectn.h"
 #include "textures.h"
@@ -172,17 +173,17 @@
 xoffset    = 0;
 useroffset = 0;
 
-switch (DisplayMenu (250, 110, "Aligning textures 'X' menu:",
+switch (vDisplayMenu (250, 110, "Aligning textures (X offset) :",
 
-	" Sidedef 1,  Check for identical textures.     ",
-	" Sidedef 1,  As above, but with inital offset. ",
-	" Sidedef 1,  No texture checking.              ",
-	" Sidedef 1,  As above, but with inital offset. ",
-
-	" Sidedef 2, Check for identical textures.     ",
-	" Sidedef 2, As above, but with inital offset. ",
-	" Sidedef 2, No texture checking.              ",
-	" Sidedef 2, As above, but with inital offset. ",
+	" Sidedef 1, Check for identical textures.     ", YK_, 0,
+	" Sidedef 1, As above, but with inital offset. ", YK_, 0,
+	" Sidedef 1, No texture checking.              ", YK_, 0,
+	" Sidedef 1, As above, but with inital offset. ", YK_, 0,
+
+	" Sidedef 2, Check for identical textures.     ", YK_, 0,
+	" Sidedef 2, As above, but with inital offset. ", YK_, 0,
+	" Sidedef 2, No texture checking.              ", YK_, 0,
+	" Sidedef 2, As above, but with inital offset. ", YK_, 0,
 	NULL))
   {
   case 1:       /* Sidedef 1 with checking for same textures   */
diff -uaNr yadex-1.5.2/src/l_centre.cc yadex-1.6.0/src/l_centre.cc
--- yadex-1.5.2/src/l_centre.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/l_centre.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/l_flags.cc yadex-1.6.0/src/l_flags.cc
--- yadex-1.5.2/src/l_flags.cc	2000-04-27 23:01:05.000000000 +0200
+++ yadex-1.6.0/src/l_flags.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -40,29 +40,29 @@
  */
 void frob_linedefs_flags (SelPtr list, int op, int operand)
 {
-SelPtr cur;
-i16 mask;
+  SelPtr cur;
+  i16 mask;
 
-if (op == YO_CLEAR || op == YO_SET || op == YO_TOGGLE)
-   mask = 1 << operand;
-else
-   mask = operand;
-
-for (cur = list; cur; cur = cur->next)
-   {
-   if (op == YO_CLEAR)
+  if (op == YO_CLEAR || op == YO_SET || op == YO_TOGGLE)
+    mask = 1 << operand;
+  else
+    mask = operand;
+
+  for (cur = list; cur; cur = cur->next)
+  {
+    if (op == YO_CLEAR)
       LineDefs[cur->objnum].flags &= ~mask;
-   else if (op == YO_SET)
+    else if (op == YO_SET)
       LineDefs[cur->objnum].flags |= mask;
-   else if (op == YO_TOGGLE)
+    else if (op == YO_TOGGLE)
       LineDefs[cur->objnum].flags ^= mask;
-   else
-      {
+    else
+    {
       nf_bug ("frob_linedef_flags: op=%02X", op);
       return;
-      }
-   }
-MadeChanges = 1;
+    }
+  }
+  MadeChanges = 1;
 }
 
 
diff -uaNr yadex-1.5.2/src/l_misc.cc yadex-1.6.0/src/l_misc.cc
--- yadex-1.5.2/src/l_misc.cc	2000-05-07 14:36:39.000000000 +0200
+++ yadex-1.6.0/src/l_misc.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -30,6 +30,8 @@
 
 #include "yadex.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "selectn.h"
 #include 
 
diff -uaNr yadex-1.5.2/src/l_prop.cc yadex-1.6.0/src/l_prop.cc
--- yadex-1.5.2/src/l_prop.cc	2000-04-29 22:37:12.000000000 +0200
+++ yadex-1.6.0/src/l_prop.cc	2003-03-28 13:37:32.000000000 +0100
@@ -13,7 +13,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -34,6 +34,9 @@
 #include "entry.h"
 #include "gfx.h"
 #include "levels.h"
+#include "menudata.h"
+#include "objects.h"
+#include "objid.h"
 #include "oldmenus.h"
 #include "game.h"
 #include "selectn.h"
@@ -41,224 +44,301 @@
 
 
 /*
+ *	Menu_data_ldt - Menu_data class for the linedef type
+ */
+class Menu_data_ldt : public Menu_data
+{
+  public :
+    Menu_data_ldt (al_llist_t *list);
+    virtual size_t nitems () const;
+    virtual const char *operator[] (size_t n) const;
+
+  private :
+    mutable char buf[100];
+    al_llist_t *list;
+};
+
+
+/*
+ *	Menu_data_ldt::Menu_data_ldt - ctor
+ */
+Menu_data_ldt::Menu_data_ldt (al_llist_t *list) : list (list)
+{
+  al_lrewind (this->list);
+}
+
+
+/*
+ *	Menu_data_ldt::nitems - return the number of items
+ */
+size_t Menu_data_ldt::nitems () const
+{
+  return al_lcount (list);
+}
+
+
+/*
+ *	Menu_data_ldt::operator[] - return the nth item
+ */
+const char *Menu_data_ldt::operator[] (size_t n) const
+{
+  if (al_lseek (list, n, SEEK_SET) != 0)
+  {
+    sprintf (buf, "BUG: al_lseek(%p, %lu): %s",
+      (void *) list, 
+      (unsigned long) n,
+      al_astrerror (al_aerrno));
+    return buf;
+  }
+  const ldtdef_t **pptr = (const ldtdef_t **) al_lptr (list);
+  if (pptr == NULL)
+    sprintf (buf, "BUG: al_lptr(%p): %s",
+      (void *) list,
+      al_astrerror (al_aerrno));
+  else
+    sprintf (buf, "%3d - %.70s", (*pptr)->number, (*pptr)->longdesc);
+  return buf;
+}
+
+
+/*
  *	Prototypes of private functions
  */
 static char *GetTaggedLineDefFlag (int linedefnum, int flagndx);
 static int InputLinedefType (int x0, int y0, int *number);
 static const char *PrintLdtgroup (void *ptr);
-static const char *PrintLdtdef (void *ptr);
 
 
 void LinedefProperties (int x0, int y0, SelPtr obj)
 {
-char  *menustr[8];
-char   texname[WAD_TEX_NAME + 1];
-int    n, val;
-SelPtr cur, sdlist;
-int objtype = OBJ_LINEDEFS;
-int    subwin_y0;
-int    subsubwin_y0;
-
-val = DisplayMenu (x0, y0, "Choose the object to edit:",
-   "Edit the linedef",
-   (LineDefs[obj->objnum].sidedef1 >= 0) ? "Edit the 1st sidedef"
-                                                       : "Add a 1st sidedef",
-   (LineDefs[obj->objnum].sidedef2 >= 0) ? "Edit the 2nd sidedef"
-                                                       : "Add a 2nd sidedef",
-   NULL);
-subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
-switch (val)
-   {
-   case 1:
+  char  *menustr[8];
+  char   texname[WAD_TEX_NAME + 1];
+  int    n, val;
+  SelPtr cur, sdlist;
+  int objtype = OBJ_LINEDEFS;
+  int    subwin_y0;
+  int    subsubwin_y0;
+
+  {
+    bool sd1 = LineDefs[obj->objnum].sidedef1 >= 0;
+    bool sd2 = LineDefs[obj->objnum].sidedef2 >= 0;
+    val = vDisplayMenu (x0, y0, "Choose the object to edit:",
+       "Edit the linedef",					YK_, 0,
+       sd1 ? "Edit the 1st sidedef" : "Add a 1st sidedef",	YK_, 0,
+       sd2 ? "Edit the 2nd sidedef" : "Add a 2nd sidedef",	YK_, 0,
+       NULL);
+  }
+  subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
+  switch (val)
+  {
+    case 1:
       for (n = 0; n < 8; n++)
-	 menustr[n] = (char *) GetMemory (60);
+	menustr[n] = (char *) GetMemory (60);
       sprintf (menustr[7], "Edit linedef #%d", obj->objnum);
       sprintf (menustr[0], "Change flags            (Current: %d)",
-         LineDefs[obj->objnum].flags);
+	LineDefs[obj->objnum].flags);
       sprintf (menustr[1], "Change type             (Current: %d)",
-         LineDefs[obj->objnum].type);
+	LineDefs[obj->objnum].type);
       sprintf (menustr[2], "Change sector tag       (Current: %d)",
-         LineDefs[obj->objnum].tag);
+	LineDefs[obj->objnum].tag);
       sprintf (menustr[3], "Change starting vertex  (Current: #%d)",
-         LineDefs[obj->objnum].start);
+	LineDefs[obj->objnum].start);
       sprintf (menustr[4], "Change ending vertex    (Current: #%d)",
-         LineDefs[obj->objnum].end);
+	LineDefs[obj->objnum].end);
       sprintf (menustr[5], "Change 1st sidedef ref. (Current: #%d)",
-         LineDefs[obj->objnum].sidedef1);
+	LineDefs[obj->objnum].sidedef1);
       sprintf (menustr[6], "Change 2nd sidedef ref. (Current: #%d)",
-         LineDefs[obj->objnum].sidedef2);
-      val = DisplayMenuArray (x0 + 42, subwin_y0, menustr[7], 7, NULL, menustr,
-         NULL, NULL, NULL);
+	LineDefs[obj->objnum].sidedef2);
+      val = vDisplayMenu (x0 + 42, subwin_y0, menustr[7],
+	menustr[0], YK_, 0,
+	menustr[1], YK_, 0,
+	menustr[2], YK_, 0,
+	menustr[3], YK_, 0,
+	menustr[4], YK_, 0,
+	menustr[5], YK_, 0,
+	menustr[6], YK_, 0,
+	NULL);
       for (n = 0; n < 8; n++)
-	 FreeMemory (menustr[n]);
+	FreeMemory (menustr[n]);
       subsubwin_y0 = subwin_y0 + BOX_BORDER + (2 + val) * FONTH;
       switch (val)
-	 {
-	 case 1:
-	    val = DisplayMenu (x0 + 84, subsubwin_y0, "Toggle the flags:",
-			       GetTaggedLineDefFlag (obj->objnum, 1),
-			       GetTaggedLineDefFlag (obj->objnum, 2),
-			       GetTaggedLineDefFlag (obj->objnum, 3),
-			       GetTaggedLineDefFlag (obj->objnum, 4),
-			       GetTaggedLineDefFlag (obj->objnum, 5),
-			       GetTaggedLineDefFlag (obj->objnum, 6),
-			       GetTaggedLineDefFlag (obj->objnum, 7),
-			       GetTaggedLineDefFlag (obj->objnum, 8),
-			       GetTaggedLineDefFlag (obj->objnum, 9),
-			       GetTaggedLineDefFlag (obj->objnum, 10),
-			       GetTaggedLineDefFlag (obj->objnum, 11),
-			       GetTaggedLineDefFlag (obj->objnum, 12),
-			       GetTaggedLineDefFlag (obj->objnum, 13),
-			       GetTaggedLineDefFlag (obj->objnum, 14),
-			       GetTaggedLineDefFlag (obj->objnum, 15),
-			       GetTaggedLineDefFlag (obj->objnum, 16),
-			       "(Enter a decimal value)",
-			       NULL);
-	    if (val >= 1 && val <= 16)
-	       {
-	       for (cur = obj; cur; cur = cur->next)
-		  LineDefs[cur->objnum].flags ^= 0x01 << (val - 1);
-	       MadeChanges = 1;
-	       }
-	    else if (val == 17)
-	       {
-	       val = InputIntegerValue (x0 + 126, subsubwin_y0 + 12 * FONTH,
-		  0, 65535, LineDefs[obj->objnum].flags);
-	       if (val != IIV_CANCEL)
-		  {
-		  for (cur = obj; cur; cur = cur->next)
-		     LineDefs[cur->objnum].flags = val;
-		  MadeChanges = 1;
-		  }
-	       }
-	    break;
-	 case 2:
-	    if (! InputLinedefType (x0, subsubwin_y0, &val))
-	       {
-	       for (cur = obj; cur; cur = cur->next)
-		  LineDefs[cur->objnum].type = val;
-	       MadeChanges = 1;
-	       }
-	    break;
-	 case 3:
-	    val = InputIntegerValue (x0 + 84, subsubwin_y0, -32768, 32767, LineDefs[obj->objnum].tag);
-	    if (val != IIV_CANCEL)  /* not Esc */
-	       {
-	       for (cur = obj; cur; cur = cur->next)
-		  LineDefs[cur->objnum].tag = val;
-	       MadeChanges = 1;
-	       }
-	    break;
-	 case 4:
-	    val = InputObjectXRef (x0 + 84, subsubwin_y0, OBJ_VERTICES, 0, LineDefs[obj->objnum].start);
-	    if (val >= 0)
-	       {
-	       for (cur = obj; cur; cur = cur->next)
-		  LineDefs[cur->objnum].start = val;
-	       MadeChanges = 1;
-	       MadeMapChanges = 1;
-	       }
-	    break;
-	 case 5:
-	    val = InputObjectXRef (x0 + 84, subsubwin_y0, OBJ_VERTICES, 0, LineDefs[obj->objnum].end);
-	    if (val >= 0)
-	       {
-	       for (cur = obj; cur; cur = cur->next)
-		  LineDefs[cur->objnum].end = val;
-	       MadeChanges = 1;
-	       MadeMapChanges = 1;
-	       }
-	    break;
-	 case 6:
-	    val = InputObjectXRef (x0 + 84, subsubwin_y0, OBJ_SIDEDEFS, 1, LineDefs[obj->objnum].sidedef1);
-	    if (val >= -1)
-	       {
-	       for (cur = obj; cur; cur = cur->next)
-		  LineDefs[cur->objnum].sidedef1 = val;
-	       MadeChanges = 1;
-	       MadeMapChanges = 1;
-	       }
-	    break;
-	 case 7:
-	    val = InputObjectXRef (x0 + 84, subsubwin_y0, OBJ_SIDEDEFS, 1, LineDefs[obj->objnum].sidedef2);
-	    if (val >= -1)
-	       {
-	       for (cur = obj; cur; cur = cur->next)
-		  LineDefs[cur->objnum].sidedef2 = val;
-	       MadeChanges = 1;
-	       MadeMapChanges = 1;
-	       }
-	    break;
-	 }
-      break;
+      {
+	case 1:
+	  val = vDisplayMenu (x0 + 84, subsubwin_y0, "Toggle the flags:",
+	    GetTaggedLineDefFlag (obj->objnum, 1),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 2),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 3),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 4),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 5),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 6),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 7),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 8),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 9),  YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 10), YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 11), YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 12), YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 13), YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 14), YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 15), YK_, 0,
+	    GetTaggedLineDefFlag (obj->objnum, 16), YK_, 0,
+	    "(Enter a decimal value)", YK_, 0,
+	    NULL);
+	  if (val >= 1 && val <= 16)
+	     {
+	     for (cur = obj; cur; cur = cur->next)
+		LineDefs[cur->objnum].flags ^= 0x01 << (val - 1);
+	     MadeChanges = 1;
+	     }
+	  else if (val == 17)
+	     {
+	     val = InputIntegerValue (x0 + 126, subsubwin_y0 + 12 * FONTH,
+		0, 65535, LineDefs[obj->objnum].flags);
+	     if (val != IIV_CANCEL)
+		{
+		for (cur = obj; cur; cur = cur->next)
+		   LineDefs[cur->objnum].flags = val;
+		MadeChanges = 1;
+		}
+	     }
+	  break;
+
+	case 2:
+	  if (! InputLinedefType (x0, subsubwin_y0, &val))
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].type = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 3:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    -32768, 32767, LineDefs[obj->objnum].tag);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].tag = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 4:
+	  val = InputObjectXRef (x0 + 84, subsubwin_y0,
+	    OBJ_VERTICES, 0, LineDefs[obj->objnum].start);
+	  if (val >= 0)
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].start = val;
+	    MadeChanges = 1;
+	    MadeMapChanges = 1;
+	  }
+	  break;
+
+	case 5:
+	  val = InputObjectXRef (x0 + 84, subsubwin_y0,
+	    OBJ_VERTICES, 0, LineDefs[obj->objnum].end);
+	  if (val >= 0)
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].end = val;
+	    MadeChanges = 1;
+	    MadeMapChanges = 1;
+	  }
+	  break;
+
+	case 6:
+	  val = InputObjectXRef (x0 + 84, subsubwin_y0,
+	    OBJ_SIDEDEFS, 1, LineDefs[obj->objnum].sidedef1);
+	  if (val >= -1)
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].sidedef1 = val;
+	    MadeChanges = 1;
+	    MadeMapChanges = 1;
+	  }
+	  break;
+
+	case 7:
+	  val = InputObjectXRef (x0 + 84, subsubwin_y0,
+	    OBJ_SIDEDEFS, 1, LineDefs[obj->objnum].sidedef2);
+	  if (val >= -1)
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].sidedef2 = val;
+	    MadeChanges = 1;
+	    MadeMapChanges = 1;
+	  }
+	  break;
+     }
+     break;
 
-   /* edit or add the first sidedef */
-   case 2:
+    // Edit or add the first sidedef
+    case 2:
       ObjectsNeeded (OBJ_LINEDEFS, OBJ_SIDEDEFS, 0);
       if (LineDefs[obj->objnum].sidedef1 >= 0)
-	 {
-	 /* build a new selection list with the first SideDefs */
-	 objtype = OBJ_SIDEDEFS;
-	 sdlist = 0;
-	 for (cur = obj; cur; cur = cur->next)
-	    if (LineDefs[cur->objnum].sidedef1 >= 0)
-	       SelectObject (&sdlist, LineDefs[cur->objnum].sidedef1);
-	 }
+      {
+	// Build a new selection list with the first sidedefs
+	objtype = OBJ_SIDEDEFS;
+	sdlist = 0;
+	for (cur = obj; cur; cur = cur->next)
+	  if (LineDefs[cur->objnum].sidedef1 >= 0)
+	    SelectObject (&sdlist, LineDefs[cur->objnum].sidedef1);
+      }
       else
-	 {
-	 /* add a new first sidedef */
-	 for (cur = obj; cur; cur = cur->next)
-	    if (LineDefs[cur->objnum].sidedef1 == -1)
-	       {
-	       InsertObject (OBJ_SIDEDEFS, -1, 0, 0);
-	       LineDefs[cur->objnum].sidedef1 = NumSideDefs - 1;
-	       }
-	 break;
-	 }
-      /* FALL THROUGH */
+      {
+	// Add a new first sidedef
+	for (cur = obj; cur; cur = cur->next)
+	  if (LineDefs[cur->objnum].sidedef1 == -1)
+	  {
+	    InsertObject (OBJ_SIDEDEFS, -1, 0, 0);
+	    LineDefs[cur->objnum].sidedef1 = NumSideDefs - 1;
+	  }
+	break;
+      }
+      // FALL THROUGH
 
-   /* edit or add the second sidedef */
-   case 3:
+    // Edit or add the second sidedef
+    case 3:
       if (objtype != OBJ_SIDEDEFS)
-	 {
-	 if (LineDefs[obj->objnum].sidedef2 >= 0)
+      {
+	if (LineDefs[obj->objnum].sidedef2 >= 0)
+	{
+	  // Build a new selection list with the second (or first) SideDefs
+	  objtype = OBJ_SIDEDEFS;
+	  sdlist = 0;
+	  for (cur = obj; cur; cur = cur->next)
+	    if (LineDefs[cur->objnum].sidedef2 >= 0)
+	      SelectObject (&sdlist, LineDefs[cur->objnum].sidedef2);
+	    else if (LineDefs[cur->objnum].sidedef1 >= 0)
+	      SelectObject (&sdlist, LineDefs[cur->objnum].sidedef1);
+	}
+	else
+	{
+	  // Add a new second (or first) sidedef
+	  for (cur = obj; cur; cur = cur->next)
+	    if (LineDefs[cur->objnum].sidedef1 == -1)
 	    {
-	    /* build a new selection list with the second (or first) SideDefs */
-	    objtype = OBJ_SIDEDEFS;
-	    sdlist = 0;
-	    for (cur = obj; cur; cur = cur->next)
-	       if (LineDefs[cur->objnum].sidedef2 >= 0)
-		  SelectObject (&sdlist, LineDefs[cur->objnum].sidedef2);
-	       else if (LineDefs[cur->objnum].sidedef1 >= 0)
-		  SelectObject (&sdlist, LineDefs[cur->objnum].sidedef1);
+	      InsertObject (OBJ_SIDEDEFS, -1, 0, 0);
+	      ObjectsNeeded (OBJ_LINEDEFS, 0);
+	      LineDefs[cur->objnum].sidedef1 = NumSideDefs - 1;
 	    }
-	 else
+	    else if (LineDefs[cur->objnum].sidedef2 == -1)
 	    {
-	    /* add a new second (or first) sidedef */
-	    for (cur = obj; cur; cur = cur->next)
-	       if (LineDefs[cur->objnum].sidedef1 == -1)
-		  {
-		  InsertObject (OBJ_SIDEDEFS, -1, 0, 0);
-		  ObjectsNeeded (OBJ_LINEDEFS, 0);
-		  LineDefs[cur->objnum].sidedef1 = NumSideDefs - 1;
-		  }
-	       else if (LineDefs[cur->objnum].sidedef2 == -1)
-		  {
-		  n = LineDefs[cur->objnum].sidedef1;
-		  InsertObject (OBJ_SIDEDEFS, -1, 0, 0);
-		  strncpy (SideDefs[NumSideDefs - 1].tex3, "-", WAD_TEX_NAME);
-		  strncpy (SideDefs[n].tex3, "-", WAD_TEX_NAME);
-		  ObjectsNeeded (OBJ_LINEDEFS, 0);
-		  LineDefs[cur->objnum].sidedef2 = NumSideDefs - 1;
-		  LineDefs[cur->objnum].flags ^= 4;  // Set the 2S bit
-		  LineDefs[cur->objnum].flags &= ~1;  // Clear the Im bit
-		  }
-	    break;
+	      n = LineDefs[cur->objnum].sidedef1;
+	      InsertObject (OBJ_SIDEDEFS, -1, 0, 0);
+	      strncpy (SideDefs[NumSideDefs - 1].tex3, "-", WAD_TEX_NAME);
+	      strncpy (SideDefs[n].tex3, "-", WAD_TEX_NAME);
+	      ObjectsNeeded (OBJ_LINEDEFS, 0);
+	      LineDefs[cur->objnum].sidedef2 = NumSideDefs - 1;
+	      LineDefs[cur->objnum].flags ^= 4;  // Set the 2S bit
+	      LineDefs[cur->objnum].flags &= ~1;  // Clear the Im bit
 	    }
-	 }
+	  break;
+	}
+      }
       ObjectsNeeded (OBJ_SIDEDEFS, 0);
       for (n = 0; n < 7; n++)
-	 menustr[n] = (char *) GetMemory (60);
+	menustr[n] = (char *) GetMemory (60);
       sprintf (menustr[6], "Edit sidedef #%d", sdlist->objnum);
       texname[WAD_TEX_NAME] = '\0';
       strncpy (texname, SideDefs[sdlist->objnum].tex3, WAD_TEX_NAME);
@@ -268,95 +348,108 @@
       strncpy (texname, SideDefs[sdlist->objnum].tex2, WAD_TEX_NAME);
       sprintf (menustr[2], "Change lower texture    (Current: %s)", texname);
       sprintf (menustr[3], "Change texture X offset (Current: %d)",
-         SideDefs[sdlist->objnum].xoff);
+	SideDefs[sdlist->objnum].xoff);
       sprintf (menustr[4], "Change texture Y offset (Current: %d)",
-         SideDefs[sdlist->objnum].yoff);
+	SideDefs[sdlist->objnum].yoff);
       sprintf (menustr[5], "Change sector ref.      (Current: #%d)",
-         SideDefs[sdlist->objnum].sector);
-      val = DisplayMenuArray (x0 + 42, subwin_y0,
-         menustr[6], 6, NULL, menustr, NULL, NULL, NULL);
+	SideDefs[sdlist->objnum].sector);
+      val = vDisplayMenu (x0 + 42, subwin_y0, menustr[6],
+	menustr[0], YK_, 0,
+	menustr[1], YK_, 0,
+	menustr[2], YK_, 0,
+	menustr[3], YK_, 0,
+	menustr[4], YK_, 0,
+	menustr[5], YK_, 0,
+	NULL);
       for (n = 0; n < 7; n++)
-	 FreeMemory (menustr[n]);
+	FreeMemory (menustr[n]);
       subsubwin_y0 = subwin_y0 + BOX_BORDER + (2 + val) * FONTH;
       switch (val)
-	 {
-	 case 1:
-	    strncpy (texname, SideDefs[sdlist->objnum].tex3, WAD_TEX_NAME);
-	    ObjectsNeeded (0);
-	    ChooseWallTexture (x0 + 84, subsubwin_y0 ,
-	       "Choose a wall texture", NumWTexture, WTexture, texname);
-	    ObjectsNeeded (OBJ_SIDEDEFS, 0);
-	    if (strlen (texname) > 0)
-	    {
-	       for (cur = sdlist; cur; cur = cur->next)
-		  if (cur->objnum >= 0)
-		     strncpy (SideDefs[cur->objnum].tex3, texname, WAD_TEX_NAME);
-	       MadeChanges = 1;
-	    }
-	    break;
-	 case 2:
-	    strncpy (texname, SideDefs[sdlist->objnum].tex1, WAD_TEX_NAME);
-	    ObjectsNeeded (0);
-	    ChooseWallTexture (x0 + 84, subsubwin_y0,
-	       "Choose a wall texture", NumWTexture, WTexture, texname);
-	    ObjectsNeeded (OBJ_SIDEDEFS, 0);
-	    if (strlen (texname) > 0)
-	    {
-	       for (cur = sdlist; cur; cur = cur->next)
-		  if (cur->objnum >= 0)
-		     strncpy (SideDefs[cur->objnum].tex1, texname, WAD_TEX_NAME);
-	       MadeChanges = 1;
-	    }
-	    break;
-	 case 3:
-	    strncpy (texname, SideDefs[sdlist->objnum].tex2, WAD_TEX_NAME);
-	    ObjectsNeeded (0);
-	    ChooseWallTexture (x0 + 84, subsubwin_y0,
-	       "Choose a wall texture", NumWTexture, WTexture, texname);
-	    ObjectsNeeded (OBJ_SIDEDEFS, 0);
-	    if (strlen (texname) > 0)
-	    {
-	       for (cur = sdlist; cur; cur = cur->next)
-		  if (cur->objnum >= 0)
-		     strncpy (SideDefs[cur->objnum].tex2, texname, WAD_TEX_NAME);
-	       MadeChanges = 1;
-	    }
-	    break;
-	 case 4:
-	    val = InputIntegerValue (x0 + 84, subsubwin_y0, -32768, 32767, SideDefs[sdlist->objnum].xoff);
-	    if (val != IIV_CANCEL)
-	    {
-	       for (cur = sdlist; cur; cur = cur->next)
-		  if (cur->objnum >= 0)
-		     SideDefs[cur->objnum].xoff = val;
-	       MadeChanges = 1;
-	    }
-	    break;
-	 case 5:
-	    val = InputIntegerValue (x0 + 84, subsubwin_y0, -32768, 32767, SideDefs[sdlist->objnum].yoff);
-	    if (val != IIV_CANCEL)
-	    {
-	       for (cur = sdlist; cur; cur = cur->next)
-		  if (cur->objnum >= 0)
-		     SideDefs[cur->objnum].yoff = val;
-	       MadeChanges = 1;
-	    }
-	    break;
-	 case 6:
-	    val = InputObjectXRef (x0 + 84, subsubwin_y0, OBJ_SECTORS, 0, SideDefs[sdlist->objnum].sector);
-	    if (val >= 0)
-	    {
-	       for (cur = sdlist; cur; cur = cur->next)
-		  if (cur->objnum >= 0)
-		     SideDefs[cur->objnum].sector = val;
-	       MadeChanges = 1;
-	    }
-	    break;
-	 }
+      {
+	case 1:
+	  strncpy (texname, SideDefs[sdlist->objnum].tex3, WAD_TEX_NAME);
+	  ObjectsNeeded (0);
+	  ChooseWallTexture (x0 + 84, subsubwin_y0 ,
+	    "Choose a wall texture", NumWTexture, WTexture, texname);
+	  ObjectsNeeded (OBJ_SIDEDEFS, 0);
+	  if (strlen (texname) > 0)
+	  {
+	    for (cur = sdlist; cur; cur = cur->next)
+	      if (cur->objnum >= 0)
+		strncpy (SideDefs[cur->objnum].tex3, texname, WAD_TEX_NAME);
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 2:
+	  strncpy (texname, SideDefs[sdlist->objnum].tex1, WAD_TEX_NAME);
+	  ObjectsNeeded (0);
+	  ChooseWallTexture (x0 + 84, subsubwin_y0,
+	     "Choose a wall texture", NumWTexture, WTexture, texname);
+	  ObjectsNeeded (OBJ_SIDEDEFS, 0);
+	  if (strlen (texname) > 0)
+	  {
+	    for (cur = sdlist; cur; cur = cur->next)
+	      if (cur->objnum >= 0)
+		strncpy (SideDefs[cur->objnum].tex1, texname, WAD_TEX_NAME);
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 3:
+	  strncpy (texname, SideDefs[sdlist->objnum].tex2, WAD_TEX_NAME);
+	  ObjectsNeeded (0);
+	  ChooseWallTexture (x0 + 84, subsubwin_y0,
+	    "Choose a wall texture", NumWTexture, WTexture, texname);
+	  ObjectsNeeded (OBJ_SIDEDEFS, 0);
+	  if (strlen (texname) > 0)
+	  {
+	    for (cur = sdlist; cur; cur = cur->next)
+	      if (cur->objnum >= 0)
+		strncpy (SideDefs[cur->objnum].tex2, texname, WAD_TEX_NAME);
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 4:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    -32768, 32767, SideDefs[sdlist->objnum].xoff);
+	  if (val != IIV_CANCEL)
+	  {
+	    for (cur = sdlist; cur; cur = cur->next)
+	      if (cur->objnum >= 0)
+		SideDefs[cur->objnum].xoff = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 5:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    -32768, 32767, SideDefs[sdlist->objnum].yoff);
+	  if (val != IIV_CANCEL)
+	  {
+	    for (cur = sdlist; cur; cur = cur->next)
+	      if (cur->objnum >= 0)
+		SideDefs[cur->objnum].yoff = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 6:
+	  val = InputObjectXRef (x0 + 84, subsubwin_y0,
+	    OBJ_SECTORS, 0, SideDefs[sdlist->objnum].sector);
+	  if (val >= 0)
+	  {
+	    for (cur = sdlist; cur; cur = cur->next)
+	      if (cur->objnum >= 0)
+		SideDefs[cur->objnum].sector = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+      }
       ForgetSelection (&sdlist);
       break;
-
-   }
+  }
 }
 
 
@@ -365,14 +458,14 @@
 
 static char *GetTaggedLineDefFlag (int linedefnum, int flagndx)
 {
-   static char ldstr[16][50];
+  static char ldstr[16][50];
 
-   if ((LineDefs[linedefnum].flags & (0x01 << (flagndx - 1))) != 0)
-      strcpy (ldstr[flagndx - 1], "* ");
-   else
-      strcpy (ldstr[flagndx - 1], "  ");
-   strcat (ldstr[flagndx - 1], GetLineDefFlagsLongName (0x01 << (flagndx - 1)));
-   return ldstr[flagndx - 1];
+  if ((LineDefs[linedefnum].flags & (0x01 << (flagndx - 1))) != 0)
+    strcpy (ldstr[flagndx - 1], "* ");
+  else
+    strcpy (ldstr[flagndx - 1], "  ");
+  strcat (ldstr[flagndx - 1], GetLineDefFlagsLongName (0x01 << (flagndx - 1)));
+  return ldstr[flagndx - 1];
 }
 
 
@@ -384,96 +477,73 @@
  */
 static int InputLinedefType (int x0, int y0, int *number)
 {
-int         r;
-int         ldtgno = 0;
-char        ldtg; 
-al_llist_t *list = 0;
+  int         r;
+  int         ldtgno = 0;
+  char        ldtg; 
+  al_llist_t *list = 0;
 
-for (;;)
+  for (;;)
   {
-  /*
-   * First let user select a ldtgroup
-   */
-  if (DisplayMenuList (x0+84, y0, "Select group", ldtgroup,
-   PrintLdtgroup, &ldtgno) < 0)
-    return 1;
-  if (al_lseek (ldtgroup, ldtgno, SEEK_SET))
-    fatal_error ("%s ILT1 (%s)", msg_unexpected, al_astrerror (al_aerrno));
-  ldtg = CUR_LDTGROUP->ldtgroup;
-
-  /*
-   * KLUDGE: Special ldtgroup LDT_FREE means "enter number"
-   * Don't look for this ldtgroup in the .ygd file : LoadGameDefs()
-   * creates it manually.
-   */
-  if (ldtg == LDT_FREE)
+    /* First let user select a ldtgroup */
+    if (DisplayMenuList (x0+84, y0, "Select group", ldtgroup,
+     PrintLdtgroup, &ldtgno) < 0)
+      return 1;
+    if (al_lseek (ldtgroup, ldtgno, SEEK_SET))
+      fatal_error ("%s ILT1 (%s)", msg_unexpected, al_astrerror (al_aerrno));
+    ldtg = CUR_LDTGROUP->ldtgroup;
+
+    /* KLUDGE: Special ldtgroup LDT_FREE means "enter number"
+       Don't look for this ldtgroup in the .ygd file :
+       LoadGameDefs() creates it manually. */
+    if (ldtg == LDT_FREE)
     {
-    /* FIXME should be unsigned ! should accept hex. */
-    *number = InputIntegerValue (x0+126, y0 + (3 + ldtgno) * FONTH,
-       -32768, 32767, 0);
-    if (*number != IIV_CANCEL)
-      break;
-    goto again;
+      // FIXME should be unsigned
+      *number = InputIntegerValue (x0+126, y0 + (3 + ldtgno) * FONTH,
+	 -32768, 32767, 0);
+      if (*number != IIV_CANCEL)
+	break;
+      goto again;
     }
-    
-  /*
-   * Then build a list of pointers on all ldt that have this
-   * ldtgroup and let user select one
-   */
-  list = al_lcreate (sizeof (void *));
-  for (al_lrewind (ldtdef); ! al_leol (ldtdef); al_lstep (ldtdef))
-    if (CUR_LDTDEF->ldtgroup == ldtg)
+      
+    /* Then build a list of pointers on all ldt that have this
+       ldtgroup and let user select one */
+    list = al_lcreate (sizeof (void *));
+    for (al_lrewind (ldtdef); ! al_leol (ldtdef); al_lstep (ldtdef))
+      if (CUR_LDTDEF->ldtgroup == ldtg)
       {
-      void *ptr = CUR_LDTDEF;
-      al_lwrite (list, &ptr);
+	void *ptr = CUR_LDTDEF;
+	al_lwrite (list, &ptr);
       }
-  r = DisplayMenuList
-   (x0+126, y0 + 2 * FONTH, "Select type", list, PrintLdtdef, NULL);
-  if (r < 0)
-    goto again;
-  if (al_lseek (list, r, SEEK_SET))
-    fatal_error ("%s ILT2 (%s)", msg_unexpected, al_astrerror (al_aerrno));
-  *number = (*((ldtdef_t **) al_lptr (list)))->number;
-  al_ldiscard (list);
-  break;
-
-  again :
-  ;
-  /* draw_map (OBJ_THINGS, 0, 0);  FIXME! */
+    {
+      Menu_data_ldt menudata (list);
+      r = DisplayMenuList
+       (x0+126, y0 + 2 * FONTH, "Select type", menudata, NULL);
+    }
+    if (r < 0)
+      goto again;
+    if (al_lseek (list, r, SEEK_SET))
+      fatal_error ("%s ILT2 (%s)", msg_unexpected, al_astrerror (al_aerrno));
+    *number = (*((ldtdef_t **) al_lptr (list)))->number;
+    al_ldiscard (list);
+    break;
+
+    again :
+    ;
+    /* draw_map (OBJ_THINGS, 0, 0);  FIXME! */
   }
 
-return 0;
+  return 0;
 }
 
 
-
-
 /*
  *	PrintLdtgroup
  *	Used by DisplayMenuList when called by InputLinedefType
  */
 static const char *PrintLdtgroup (void *ptr)
 {
-if (! ptr)
-  return "PrintLdtgroup: (null)";
-return ((ldtgroup_t *)ptr)->desc;
+  if (! ptr)
+    return "PrintLdtgroup: (null)";
+  return ((ldtgroup_t *)ptr)->desc;
 }
 
-
-/*
- *	PrintLdtdef
- *	Used by DisplayMenuList when called by InputLinedefType
- */
-static const char *PrintLdtdef (void *ptr)
-{
-static char buf[100];
-
-if (! ptr)
-  return "PrintLdtdef: (null)";
-sprintf (buf, "[%3d] %.70s",
- (*((ldtdef_t **)ptr))->number,
- (*((ldtdef_t **)ptr))->longdesc);
-return buf;
-}
-
-
diff -uaNr yadex-1.5.2/src/l_unlink.cc yadex-1.6.0/src/l_unlink.cc
--- yadex-1.5.2/src/l_unlink.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/l_unlink.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -30,6 +30,8 @@
 #include "yadex.h"
 #include "bitvec.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "selectn.h"
 
 
diff -uaNr yadex-1.5.2/src/l_vertices.cc yadex-1.6.0/src/l_vertices.cc
--- yadex-1.5.2/src/l_vertices.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/l_vertices.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/levels.cc yadex-1.6.0/src/levels.cc
--- yadex-1.5.2/src/levels.cc	2000-07-26 00:24:44.000000000 +0200
+++ yadex-1.6.0/src/levels.cc	2003-03-28 13:37:32.000000000 +0100
@@ -12,7 +12,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -34,8 +34,10 @@
 #include "dialog.h"
 #include "game.h"
 #include "levels.h"
+#include "objid.h"
 #include "wstructs.h"
 #include "things.h"
+#include "wadfile.h"
 #include "wads.h"
 #include "wads2.h"
 
@@ -146,7 +148,6 @@
 int rc = 0;
 MDirPtr dir;
 int OldNumVertices;
-int n;
 
 /* No objects are needed: they may be swapped after they have been read */
 ObjectsNeeded (0);
@@ -160,11 +161,16 @@
 /* Get the number of vertices */
 i32 v_offset = 42;
 i32 v_length = 42;
+{
+const char *lump_name = "BUG";
 if (yg_level_format == YGLF_ALPHA)  // Doom alpha
-   dir = FindMasterDir (Level, "POINTS");
+   lump_name = "POINTS";
+else
+   lump_name = "VERTEXES";
+dir = FindMasterDir (Level, lump_name);
+if (dir == 0)
+   OldNumVertices = 0;
 else
-   dir = FindMasterDir (Level, "VERTEXES");
-if (dir)
    {
    v_offset = dir->dir.start;
    v_length = dir->dir.size;
@@ -176,18 +182,20 @@
    OldNumVertices = (int) (v_length / WAD_VERTEX_BYTES);
    if ((i32) (OldNumVertices * WAD_VERTEX_BYTES) != v_length)
       warn ("the %s lump has a weird size."
-        " The wad might be corrupt.\n",
-	yg_level_format == YGLF_ALPHA ? "POINTS" : "VERTEXES");
+        " The wad might be corrupt.\n", lump_name);
    }
-else
-   OldNumVertices = 0;
+}
 
 // Read THINGS
+{
+const char *lump_name = "THINGS";
 verbmsg ("Reading %s things", levelname);
 i32 offset = 42;
 i32 length;
-dir = FindMasterDir (Level, "THINGS");
-if (dir)
+dir = FindMasterDir (Level, lump_name);
+if (dir == 0)
+   NumThings = 0;
+else
    {
    offset = dir->dir.start;
    length = dir->dir.size;
@@ -195,8 +203,8 @@
       {
       NumThings = (int) (length / WAD_HEXEN_THING_BYTES);
       if ((i32) (NumThings * WAD_HEXEN_THING_BYTES) != length)
-         warn ("the THINGS lump has a weird size."
-            " The wad might be corrupt.\n");
+         warn ("the %s lump has a weird size."
+            " The wad might be corrupt.\n", lump_name);
       }
    else                    // Doom/Heretic/Strife mode
       {
@@ -208,101 +216,144 @@
       size_t thing_size = yg_level_format == YGLF_ALPHA ? 12 : WAD_THING_BYTES;
       NumThings = (int) (length / thing_size);
       if ((i32) (NumThings * thing_size) != length)
-         warn ("the THINGS lump has a weird size."
-            " The wad might be corrupt.\n");
+         warn ("the %s lump has a weird size."
+            " The wad might be corrupt.\n", lump_name);
       }
    }
-else
-   NumThings = 0;
 things_angles++;
 things_types++;
 if (NumThings > 0)
    {
    Things = (TPtr) GetFarMemory ((unsigned long) NumThings
       * sizeof (struct Thing));
-   wad_seek (dir->wadfile, offset);
-   if (MainWad == Iwad4)  // Hexen mode
-      for (n = 0; n < NumThings; n++)
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (offset);
+   if (wf->error ())
+      {
+      err ("%s: seek error", lump_name);
+      rc = 1;
+      goto byebye;
+      }
+   if (MainWad == Iwad4)		// Hexen mode
+      for (long n = 0; n < NumThings; n++)
 	 {
          u8 dummy2[6];
-	 wad_read_i16   (dir->wadfile);				// Tid
-	 wad_read_i16   (dir->wadfile, &(Things[n].xpos ));
-	 wad_read_i16   (dir->wadfile, &(Things[n].ypos ));
-	 wad_read_i16   (dir->wadfile);				// Height
-	 wad_read_i16   (dir->wadfile, &(Things[n].angle));
-	 wad_read_i16   (dir->wadfile, &(Things[n].type ));
-	 wad_read_i16   (dir->wadfile, &(Things[n].when ));
-         wad_read_bytes (dir->wadfile, dummy2, sizeof dummy2);
-	 }
-   else                   // Doom/Heretic/Strife mode
-      for (n = 0; n < NumThings; n++)
-	 {
-	 wad_read_i16 (dir->wadfile, &(Things[n].xpos ));
-	 wad_read_i16 (dir->wadfile, &(Things[n].ypos ));
-	 wad_read_i16 (dir->wadfile, &(Things[n].angle));
-	 wad_read_i16 (dir->wadfile, &(Things[n].type ));
+	 wf->read_i16   ();					// Tid
+	 wf->read_i16   (&Things[n].xpos );
+	 wf->read_i16   (&Things[n].ypos );
+	 wf->read_i16   ();					// Height
+	 wf->read_i16   (&Things[n].angle);
+	 wf->read_i16   (&Things[n].type );
+	 wf->read_i16   (&Things[n].when );
+         wf->read_bytes (dummy2, sizeof dummy2);
+	 if (wf->error ())
+	    {
+	    err ("%s: error reading thing #%ld", lump_name, n);
+	    rc = 1;
+	    goto byebye;
+	    }
+	 }
+   else					// Doom/Heretic/Strife mode
+      for (long n = 0; n < NumThings; n++)
+	 {
+	 wf->read_i16 (&Things[n].xpos );
+	 wf->read_i16 (&Things[n].ypos );
+	 wf->read_i16 (&Things[n].angle);
+	 wf->read_i16 (&Things[n].type );
 	 if (yg_level_format == YGLF_ALPHA)
-	    wad_read_i16 (dir->wadfile);  // Alpha. Don't know what its for.
-	 wad_read_i16 (dir->wadfile, &(Things[n].when ));
+	    wf->read_i16 ();		// Alpha. Don't know what it's for.
+	 wf->read_i16 (&Things[n].when );
+	 if (wf->error ())
+	    {
+	    err ("%s: error reading thing #%ld", lump_name, n);
+	    rc = 1;
+	    goto byebye;
+	    }
 	 }
    }
+}
 
 // Read LINEDEFS
 if (yg_level_format != YGLF_ALPHA)
    {
+   const char *lump_name = "LINEDEFS";
    verbmsg (" linedefs");
-   dir = FindMasterDir (Level, "LINEDEFS");
-   if (dir)
+   dir = FindMasterDir (Level, lump_name);
+   if (dir == 0)
+      NumLineDefs = 0;
+   else
+      {
       if (MainWad == Iwad4)  // Hexen mode
 	 {
 	 NumLineDefs = (int) (dir->dir.size / WAD_HEXEN_LINEDEF_BYTES);
 	 if ((i32) (NumLineDefs * WAD_HEXEN_LINEDEF_BYTES) != dir->dir.size)
-	    warn ("the LINEDEFS lump has a weird size."
-	       " The wad might be corrupt.\n");
+	    warn ("the %s lump has a weird size."
+	       " The wad might be corrupt.\n", lump_name);
 	 }
       else                   // Doom/Heretic/Strife mode
 	 {
 	 NumLineDefs = (int) (dir->dir.size / WAD_LINEDEF_BYTES);
 	 if ((i32) (NumLineDefs * WAD_LINEDEF_BYTES) != dir->dir.size)
-	    warn ("the LINEDEFS lump has a weird size."
-	       " The wad might be corrupt.\n");
+	    warn ("the %s lump has a weird size."
+	       " The wad might be corrupt.\n", lump_name);
 	 }
-   else
-      NumLineDefs = 0;
+      }
    if (NumLineDefs > 0)
       {
       LineDefs = (LDPtr) GetFarMemory ((unsigned long) NumLineDefs
 	 * sizeof (struct LineDef));
-      wad_seek (dir->wadfile, dir->dir.start);
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+	 {
+	 err ("%s: seek error", lump_name);
+	 rc = 1;
+	 goto byebye;
+	 }
       if (MainWad == Iwad4)  // Hexen mode
-	 for (n = 0; n < NumLineDefs; n++)
+	 for (long n = 0; n < NumLineDefs; n++)
 	    {
 	    u8 dummy[6];
-	    wad_read_i16   (dir->wadfile, &(LineDefs[n].start   ));
-	    wad_read_i16   (dir->wadfile, &(LineDefs[n].end     ));
-	    wad_read_i16   (dir->wadfile, &(LineDefs[n].flags   ));
-	    wad_read_bytes (dir->wadfile, dummy, sizeof dummy);
-	    wad_read_i16   (dir->wadfile, &(LineDefs[n].sidedef1));
-	    wad_read_i16   (dir->wadfile, &(LineDefs[n].sidedef2));
+	    wf->read_i16   (&LineDefs[n].start);
+	    wf->read_i16   (&LineDefs[n].end);
+	    wf->read_i16   (&LineDefs[n].flags);
+	    wf->read_bytes (dummy, sizeof dummy);
+	    wf->read_i16   (&LineDefs[n].sidedef1);
+	    wf->read_i16   (&LineDefs[n].sidedef2);
 	    LineDefs[n].type = dummy[0];
+	    LineDefs[n].tag  = dummy[1];  // arg1 often contains a tag
+	    if (wf->error ())
+	       {
+	       err ("%s: error reading linedef #%ld", lump_name, n);
+	       rc = 1;
+	       goto byebye;
+	       }
 	    }
       else                   // Doom/Heretic/Strife mode
-	 for (n = 0; n < NumLineDefs; n++)
+	 for (long n = 0; n < NumLineDefs; n++)
 	    {
-	    wad_read_i16 (dir->wadfile, &(LineDefs[n].start   ));
-	    wad_read_i16 (dir->wadfile, &(LineDefs[n].end     ));
-	    wad_read_i16 (dir->wadfile, &(LineDefs[n].flags   ));
-	    wad_read_i16 (dir->wadfile, &(LineDefs[n].type    ));
-	    wad_read_i16 (dir->wadfile, &(LineDefs[n].tag     ));
-	    wad_read_i16 (dir->wadfile, &(LineDefs[n].sidedef1));
-	    wad_read_i16 (dir->wadfile, &(LineDefs[n].sidedef2));
+	    wf->read_i16 (&LineDefs[n].start);
+	    wf->read_i16 (&LineDefs[n].end);
+	    wf->read_i16 (&LineDefs[n].flags);
+	    wf->read_i16 (&LineDefs[n].type);
+	    wf->read_i16 (&LineDefs[n].tag);
+	    wf->read_i16 (&LineDefs[n].sidedef1);
+	    wf->read_i16 (&LineDefs[n].sidedef2);
+	    if (wf->error ())
+	       {
+	       err ("%s: error reading linedef #%ld", lump_name, n);
+	       rc = 1;
+	       goto byebye;
+	       }
 	    }
       }
    }
 
 // Read SIDEDEFS
+{
+const char *lump_name = "SIDEDEFS";
 verbmsg (" sidedefs");
-dir = FindMasterDir (Level, "SIDEDEFS");
+dir = FindMasterDir (Level, lump_name);
 if (dir)
    {
    NumSideDefs = (int) (dir->dir.size / WAD_SIDEDEF_BYTES);
@@ -316,27 +367,41 @@
    {
    SideDefs = (SDPtr) GetFarMemory ((unsigned long) NumSideDefs
       * sizeof (struct SideDef));
-   wad_seek (dir->wadfile, dir->dir.start);
-   for (n = 0; n < NumSideDefs; n++)
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (dir->dir.start);
+   if (wf->error ())
+      {
+      err ("%s: seek error", lump_name);
+      rc = 1;
+      goto byebye;
+      }
+   for (long n = 0; n < NumSideDefs; n++)
       {
-      wad_read_i16   (dir->wadfile, &(SideDefs[n].xoff));
-      wad_read_i16   (dir->wadfile, &(SideDefs[n].yoff));
-      wad_read_bytes (dir->wadfile, &(SideDefs[n].tex1), WAD_TEX_NAME);
-      wad_read_bytes (dir->wadfile, &(SideDefs[n].tex2), WAD_TEX_NAME);
-      wad_read_bytes (dir->wadfile, &(SideDefs[n].tex3), WAD_TEX_NAME);
-      wad_read_i16   (dir->wadfile, &(SideDefs[n].sector));
+      wf->read_i16   (&SideDefs[n].xoff);
+      wf->read_i16   (&SideDefs[n].yoff);
+      wf->read_bytes (&SideDefs[n].tex1, WAD_TEX_NAME);
+      wf->read_bytes (&SideDefs[n].tex2, WAD_TEX_NAME);
+      wf->read_bytes (&SideDefs[n].tex3, WAD_TEX_NAME);
+      wf->read_i16   (&SideDefs[n].sector);
+      if (wf->error ())
+	 {
+	 err ("%s: error reading sidedef #%ld", lump_name, n);
+	 rc = 1;
+	 goto byebye;
+	 }
       }
    }
+}
 
 /* Sanity checkings on linedefs: the 1st and 2nd vertices
    must exist. The 1st and 2nd sidedefs must exist or be
    set to -1. */
-for (n = 0; n < NumLineDefs; n++)
+for (long n = 0; n < NumLineDefs; n++)
    {
    if (LineDefs[n].sidedef1 != -1
       && outside (LineDefs[n].sidedef1, 0, NumSideDefs - 1))
       {
-      warn ("linedef %d has bad 1st sidedef number %d\n",
+      err ("linedef %ld has bad 1st sidedef number %d, giving up",
 	 n, LineDefs[n].sidedef1);
       rc = 1;
       goto byebye;
@@ -344,22 +409,22 @@
    if (LineDefs[n].sidedef2 != -1
       && outside (LineDefs[n].sidedef2, 0, NumSideDefs - 1))
       {
-      warn ("linedef %d has bad 2nd sidedef number %d\n",
+      err ("linedef %ld has bad 2nd sidedef number %d, giving up",
 	 n, LineDefs[n].sidedef2);
       rc = 1;
       goto byebye;
       }
    if (outside (LineDefs[n].start, 0, OldNumVertices -1))
       {
-      warn ("linedef %d has bad 1st vertex number %d\n",
-	 n, LineDefs[n].start);
+      err ("linedef %ld has bad 1st vertex number %d, giving up",
+        n, LineDefs[n].start);
       rc = 1;
       goto byebye;
       }
    if (outside (LineDefs[n].end, 0, OldNumVertices - 1))
       {
-      warn ("linedef %d has bad 2nd vertex number %d\n",
-	 n, LineDefs[n].end);
+      err ("linedef %ld has bad 2nd vertex number %d, giving up",
+        n, LineDefs[n].end);
       rc = 1;
       goto byebye;
       }
@@ -368,12 +433,14 @@
 // Read LINES (Doom alpha only)
 if (yg_level_format == YGLF_ALPHA)
    {
+   const char *lump_name = "LINES";
    verbmsg (" lines");
-   dir = FindMasterDir (Level, "LINES");
+   dir = FindMasterDir (Level, lump_name);
    if (dir)
       {
       if ((dir->dir.size - 4) % 36)
-	 warn ("the LINES lump has a weird size. The wad might be corrupt.\n");
+	 warn ("the %s lump has a weird size. The wad might be corrupt.\n",
+	    lump_name);
       const size_t nlines = dir->dir.size / 36;
       NumLineDefs = nlines;
       NumSideDefs = 2 * nlines;  // Worst case. We'll adjust later.
@@ -383,61 +450,105 @@
 	 * sizeof (struct SideDef));
       // Read TEXTURES
       if (yg_texture_format != YGTF_NAMELESS)
-      {
+	 {
+	 const char *lump_name = "TEXTURES";
+	 bool success = false;
 	 ntex = 0;
-	 MDirPtr d = FindMasterDir (MasterDir, "TEXTURES");
+	 i32 *offset_table = 0;
+	 MDirPtr d = FindMasterDir (MasterDir, lump_name);
 	 if (! d)
-	    warn ("TEXTURES lump not found. Will not be able to"
-		  " import texture names.\n");
-	 else
 	    {
-	    wad_seek (d->wadfile, d->dir.start);
-	    i32 num;
-	    wad_read_i32 (d->wadfile, &num);
-	    if (num < 0 || num > 32767)
-	       warn ("TEXTURES has bad name count. Ignoring TEXTURES.\n");
-	    else
+	    warn ("%s: lump not found in directory\n", lump_name);
+	    goto textures_done;
+	    }
+	 {
+	 const Wad_file *wf = d->wadfile;
+	 wf->seek (d->dir.start);
+	 if (wf->error ())
+	    {
+	    warn ("%s: seek error\n", lump_name);
+	    goto textures_done;
+	    }
+	 i32 num;
+	 wf->read_i32 (&num);
+	 if (wf->error ())
+	    {
+	    warn ("%s: error reading texture count\n", lump_name);
+	    }
+	 if (num < 0 || num > 32767)
+	    {
+	    warn ("%s: bad texture count, giving up\n", lump_name);
+	    goto textures_done;
+	    }
+	 ntex = num;
+	 offset_table = new i32[ntex];
+	 for (size_t n = 0; n < ntex; n++)
+	    {
+	    wf->read_i32 (offset_table + n);
+	    if (wf->error ())
 	       {
-	       ntex = num;
-	       i32 *offset_table = new i32[ntex];
-	       for (size_t n = 0; n < ntex; n++)
-		  wad_read_i32 (d->wadfile, offset_table + n);
-	       tex_list = (char *) GetMemory (ntex * WAD_TEX_NAME);
-	       for (size_t n = 0; n < ntex; n++)
-		  {
-		  wad_seek (d->wadfile, d->dir.start + offset_table[n]);
-		  wad_read_bytes (d->wadfile, tex_list + WAD_TEX_NAME * n,
-		      WAD_TEX_NAME);
-		  }
-	       delete[] offset_table;
+	       warn ("%s: error reading offsets table\n");
+	       goto textures_done;
 	       }
 	    }
+	 tex_list = (char *) GetMemory (ntex * WAD_TEX_NAME);
+	 for (size_t n = 0; n < ntex; n++)
+	    {
+	    const long offset = d->dir.start + offset_table[n];
+	    wf->seek (offset);
+	    if (wf->error ())
+	       {
+	       warn ("%s: seek error\n", lump_name);
+	       goto textures_done;
+	       }
+	    wf->read_bytes (tex_list + WAD_TEX_NAME * n, WAD_TEX_NAME);
+	    if (wf->error ())
+	       {
+	       warn ("%s: error reading texture names\n", lump_name);
+	       goto textures_done;
+	       }
+	    }
+	 success = true;
+	 }
 
-      }
+	 textures_done:
+	 if (offset_table != 0)
+	    delete[] offset_table;
+	 if (! success)
+	    warn ("%s: errors found, won't be able to import texture names\n",
+	       lump_name);
+	 }
 
-      wad_seek (dir->wadfile, dir->dir.start + 4);
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start + 4);
+      if (wf->error ())
+	 {
+	 err ("%s: seek error", lump_name);
+	 rc = 1;
+	 goto byebye;
+	 }
       size_t s = 0;
       for (size_t n = 0; n < nlines; n++)
 	 {
 	 LDPtr ld = LineDefs + n;
-	 ld->start   = wad_read_i16 (dir->wadfile);
-	 ld->end     = wad_read_i16 (dir->wadfile);
-	 ld->flags   = wad_read_i16 (dir->wadfile);
-	               wad_read_i16 (dir->wadfile);  // Unused ?
-	 ld->type    = wad_read_i16 (dir->wadfile);
-	 ld->tag     = wad_read_i16 (dir->wadfile);
-	               wad_read_i16 (dir->wadfile);  // Unused ?
-	 i16 sector1 = wad_read_i16 (dir->wadfile);
-	 i16 xofs1   = wad_read_i16 (dir->wadfile);
-	 i16 tex1m   = wad_read_i16 (dir->wadfile);
-	 i16 tex1u   = wad_read_i16 (dir->wadfile);
-	 i16 tex1l   = wad_read_i16 (dir->wadfile);
-	               wad_read_i16 (dir->wadfile);  // Unused ?
-	 i16 sector2 = wad_read_i16 (dir->wadfile);
-	 i16 xofs2   = wad_read_i16 (dir->wadfile);
-	 i16 tex2m   = wad_read_i16 (dir->wadfile);
-	 i16 tex2u   = wad_read_i16 (dir->wadfile);
-	 i16 tex2l   = wad_read_i16 (dir->wadfile);
+	 ld->start   = wf->read_i16 ();
+	 ld->end     = wf->read_i16 ();
+	 ld->flags   = wf->read_i16 ();
+	               wf->read_i16 ();  // Unused ?
+	 ld->type    = wf->read_i16 ();
+	 ld->tag     = wf->read_i16 ();
+	               wf->read_i16 ();  // Unused ?
+	 i16 sector1 = wf->read_i16 ();
+	 i16 xofs1   = wf->read_i16 ();
+	 i16 tex1m   = wf->read_i16 ();
+	 i16 tex1u   = wf->read_i16 ();
+	 i16 tex1l   = wf->read_i16 ();
+	               wf->read_i16 ();  // Unused ?
+	 i16 sector2 = wf->read_i16 ();
+	 i16 xofs2   = wf->read_i16 ();
+	 i16 tex2m   = wf->read_i16 ();
+	 i16 tex2u   = wf->read_i16 ();
+	 i16 tex2l   = wf->read_i16 ();
 	 if (sector1 >= 0)			// Create first sidedef
 	    {
 	    ld->sidedef1 = s;
@@ -466,13 +577,15 @@
 	    }
 	 else
 	    ld->sidedef2 = -1;
-	 if (dir->wadfile->error)
+	 if (wf->error ())
 	    {
-	    warn ("read error in %s\n", dir->wadfile->filename);
-	    break;
+	    err ("%s: error reading line #%d", lump_name, int (n));
+	    rc = 1;
+	    goto byebye;
 	    }
 	 }
-      if (NumSideDefs > s)  // Almost always true.
+      // (size_t) to silence GCC warning
+      if ((size_t) NumSideDefs > s)  // Almost always true.
          {
 	 NumSideDefs = s;
          SideDefs = (SDPtr) ResizeFarMemory (SideDefs,
@@ -502,7 +615,7 @@
 {
 verbmsg (" vertices");
 int last_used_vertex = -1;
-for (n = 0; n < NumLineDefs; n++)
+for (long n = 0; n < NumLineDefs; n++)
    {
    last_used_vertex = y_max (last_used_vertex, LineDefs[n].start);
    last_used_vertex = y_max (last_used_vertex, LineDefs[n].end);
@@ -511,13 +624,13 @@
 // This block is only here to warn me if (1) is false.
 {
   bitvec_c vertex_used (OldNumVertices);
-  for (int n = 0; n < NumLineDefs; n++)
+  for (long n = 0; n < NumLineDefs; n++)
      {
      vertex_used.set (LineDefs[n].start);
      vertex_used.set (LineDefs[n].end);
      }
   int unused = 0;
-  for (int n = 0; n <= last_used_vertex; n++)
+  for (long n = 0; n <= last_used_vertex; n++)
      {
      if (! vertex_used.get (n))
 	unused++;
@@ -555,52 +668,72 @@
 // Now load all the vertices except the unused ones at the end.
 if (NumVertices > 0)
    {
+   const char *lump_name = "BUG";
    Vertices = (VPtr) GetFarMemory ((unsigned long) NumVertices
       * sizeof (struct Vertex));
    if (yg_level_format == YGLF_ALPHA)  // Doom alpha
-      dir = FindMasterDir (Level, "POINTS");
+      lump_name = "POINTS";
    else
-      dir = FindMasterDir (Level, "VERTEXES");
-   if (dir)
+      lump_name = "VERTEXES";
+   dir = FindMasterDir (Level, lump_name);
+   if (dir == 0)
+      goto vertexes_done;		// FIXME isn't that fatal ?
+   {
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (v_offset);
+   if (wf->error ())
       {
-      wad_seek (dir->wadfile, v_offset);
-      MapMaxX = -32767;
-      MapMaxY = -32767;
-      MapMinX = 32767;
-      MapMinY = 32767;
-      for (n = 0; n < NumVertices; n++)
-	 {
-	 i16 val;
-	 wad_read_i16 (dir->wadfile, &val);
-	 if (val < MapMinX)
-	    MapMinX = val;
-	 if (val > MapMaxX)
-	    MapMaxX = val;
-	 Vertices[n].x = val;
-	 wad_read_i16 (dir->wadfile, &val);
-	 if (val < MapMinY)
-	    MapMinY = val;
-	 if (val > MapMaxY)
-	    MapMaxY = val;
-	 Vertices[n].y = val;
+      err ("%s: seek error", lump_name);
+      rc = 1;
+      goto byebye;
+      }
+   MapMaxX = -32767;
+   MapMaxY = -32767;
+   MapMinX = 32767;
+   MapMinY = 32767;
+   for (long n = 0; n < NumVertices; n++)
+      {
+      i16 val;
+      wf->read_i16 (&val);
+      if (val < MapMinX)
+	 MapMinX = val;
+      if (val > MapMaxX)
+	 MapMaxX = val;
+      Vertices[n].x = val;
+      wf->read_i16 (&val);
+      if (val < MapMinY)
+	 MapMinY = val;
+      if (val > MapMaxY)
+	 MapMaxY = val;
+      Vertices[n].y = val;
+      if (wf->error ())
+	 {
+	 err ("%s: error reading vertex #%ld", lump_name, n);
+	 rc = 1;
+	 goto byebye;
 	 }
       }
    }
+   vertexes_done:
+   ;
+   }
 }
 
 // Ignore SEGS, SSECTORS and NODES
 
 // Read SECTORS
+{
+const char *lump_name = "SECTORS";
 verbmsg (" sectors\n");
-dir = FindMasterDir (Level, "SECTORS");
+dir = FindMasterDir (Level, lump_name);
 if (yg_level_format != YGLF_ALPHA)
    {
    if (dir)
       {
       NumSectors = (int) (dir->dir.size / WAD_SECTOR_BYTES);
       if ((i32) (NumSectors * WAD_SECTOR_BYTES) != dir->dir.size)
-	 warn ("the SECTORS lump has a weird size."
-	   " The wad might be corrupt.\n");
+	 warn ("the %s lump has a weird size."
+	   " The wad might be corrupt.\n", lump_name);
       }
    else
       NumSectors = 0;
@@ -608,92 +741,181 @@
       {
       Sectors = (SPtr) GetFarMemory ((unsigned long) NumSectors
 	 * sizeof (struct Sector));
-      wad_seek (dir->wadfile, dir->dir.start);
-      for (n = 0; n < NumSectors; n++)
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
 	 {
-	 wad_read_i16   (dir->wadfile, &(Sectors[n].floorh ));
-	 wad_read_i16   (dir->wadfile, &(Sectors[n].ceilh  ));
-	 wad_read_bytes (dir->wadfile, &(Sectors[n].floort ), WAD_FLAT_NAME);
-	 wad_read_bytes (dir->wadfile, &(Sectors[n].ceilt  ), WAD_FLAT_NAME);
-	 wad_read_i16   (dir->wadfile, &(Sectors[n].light  ));
-	 wad_read_i16   (dir->wadfile, &(Sectors[n].special));
-	 wad_read_i16   (dir->wadfile, &(Sectors[n].tag    ));
+	 err ("%s: seek error", lump_name);
+	 rc = 1;
+	 goto byebye;
+	 }
+      for (long n = 0; n < NumSectors; n++)
+	 {
+	 wf->read_i16   (&Sectors[n].floorh);
+	 wf->read_i16   (&Sectors[n].ceilh);
+	 wf->read_bytes (&Sectors[n].floort, WAD_FLAT_NAME);
+	 wf->read_bytes (&Sectors[n].ceilt,  WAD_FLAT_NAME);
+	 wf->read_i16   (&Sectors[n].light);
+	 wf->read_i16   (&Sectors[n].special);
+	 wf->read_i16   (&Sectors[n].tag);
+	 if (wf->error ())
+	    {
+	    err ("%s: error reading sector #%ld", lump_name, n);
+	    rc = 1;
+	    goto byebye;
+	    }
 	 }
       }
    }
 else  // Doom alpha--a wholly different SECTORS format
    {
-   if (dir)
+   i32  *offset_table = 0;
+   i32   nsectors     = 0;
+   i32   nflatnames   = 0;
+   char *flatnames    = 0;
+   if (dir == 0)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      i32 nsectors;
-      i32 nflatnames = 0;
-      char *flatnames = 0;
-      wad_read_i32 (dir->wadfile, &nsectors);
-      NumSectors = nsectors;
-      Sectors = (SPtr) GetFarMemory ((unsigned long) NumSectors
-	 * sizeof (struct Sector));
-      i32 *offset_table = new i32[nsectors];
-      for (size_t n = 0; n < nsectors; n++)
-	 wad_read_i32 (dir->wadfile, offset_table + n);
-      // Load FLATNAME
+      warn ("%s: lump not found in directory\n", lump_name);  // FIXME fatal ?
+      goto sectors_alpha_done;
+      }
+   {
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (dir->dir.start);
+   if (wf->error ())
+      {
+      err ("%s: seek error", lump_name);
+      rc = 1;
+      goto byebye;
+      }
+   wf->read_i32 (&nsectors);
+   if (wf->error ())
+      {
+      err ("%s: error reading sector count", lump_name);
+      rc = 1;
+      goto byebye;
+      }
+   if (nsectors < 0)
+      {
+      warn ("Negative sector count. Clamping to 0.\n");
+      nsectors = 0;
+      }
+   NumSectors = nsectors;
+   Sectors = (SPtr) GetFarMemory ((unsigned long) NumSectors
+      * sizeof (struct Sector));
+   offset_table = new i32[nsectors];
+   for (size_t n = 0; n < (size_t) nsectors; n++)
+      wf->read_i32 (offset_table + n);
+   if (wf->error ())
+      {
+      err ("%s: error reading offsets table", lump_name);
+      rc = 1;
+      goto sectors_alpha_done;
+      }
+   // Load FLATNAME
+   {
+      const char *lump_name = "FLATNAME";
+      bool success = false;
+      MDirPtr dir2 = FindMasterDir (Level, lump_name);
+      if (dir2 == 0)
+	 {
+	 warn ("%s: lump not found in directory\n", lump_name);
+	 goto flatname_done;		// FIXME warn ?
+	 }
       {
-	 MDirPtr dir2 = FindMasterDir (Level, "FLATNAME");
-	 if (dir2)
+      const Wad_file *wf = dir2->wadfile;
+      wf->seek (dir2->dir.start);
+      if (wf->error ())
+	 {
+	 warn ("%s: seek error\n", lump_name);
+	 goto flatname_done;
+	 }
+      wf->read_i32 (&nflatnames);
+      if (wf->error ())
+	 {
+	 warn ("%s: error reading flat name count\n", lump_name);
+	 nflatnames = 0;
+	 goto flatname_done;
+	 }
+      if (nflatnames < 0 || nflatnames > 32767)
+	 {
+	 warn ("%s: bad flat name count, giving up\n", lump_name);
+	 nflatnames = 0;
+	 goto flatname_done;
+	 }
+      else
+	 {
+	 flatnames = new char[WAD_FLAT_NAME * nflatnames];
+	 wf->read_bytes (flatnames, WAD_FLAT_NAME * nflatnames);
+	 if (wf->error ())
 	    {
-	    wad_seek (dir2->wadfile, dir2->dir.start);
-	    wad_read_i32 (dir2->wadfile, &nflatnames);
-	    if (nflatnames < 0 || nflatnames > 32767)
-	       {
-	       warn ("FLATNAME has bad name count. Ignoring FLATNAME.\n");
-	       nflatnames = 0;
-	       }
-	    else
-	       {
-	       flatnames = new char[WAD_FLAT_NAME * nflatnames];
-	       wad_read_bytes (dir2->wadfile, flatnames,
-		   WAD_FLAT_NAME * nflatnames);
-	       }
+	    warn ("%s: error reading flat names\n", lump_name);
+	    nflatnames = 0;
+	    goto flatname_done;
 	    }
+	 success = true;
+	 }
       }
-      for (size_t n = 0; n < nsectors; n++)
+      flatname_done:
+      if (! success)
+	 warn ("%s: errors found, you'll have to do without flat names\n",
+	       lump_name);
+   }
+   for (size_t n = 0; n < (size_t) nsectors; n++)
+      {
+      wf->seek (dir->dir.start + offset_table[n]);
+      if (wf->error ())
 	 {
-	 wad_seek (dir->wadfile, dir->dir.start + offset_table[n]);
-	 i16 index;
-	 wad_read_i16 (dir->wadfile, &(Sectors[n].floorh));
-	 wad_read_i16 (dir->wadfile, &(Sectors[n].ceilh ));
-	 wad_read_i16 (dir->wadfile, &index);
-	 if (nflatnames && flatnames && index >= 0 && index < nflatnames)
-	    memcpy (Sectors[n].floort, flatnames + WAD_FLAT_NAME * index,
-		WAD_FLAT_NAME);
-	 else
-	    strcpy (Sectors[n].floort, "unknown");
-	 wad_read_i16 (dir->wadfile, &index);
-	 if (nflatnames && flatnames && index >= 0 && index < nflatnames)
-	    memcpy (Sectors[n].ceilt, flatnames + WAD_FLAT_NAME * index,
-		WAD_FLAT_NAME);
-	 else
-	    strcpy (Sectors[n].ceilt, "unknown");
-	 wad_read_i16 (dir->wadfile, &(Sectors[n].light  ));
-	 wad_read_i16 (dir->wadfile, &(Sectors[n].special));
-	 wad_read_i16 (dir->wadfile, &(Sectors[n].tag));
-	 // Don't know what the tail is for. Ignore it.
+	 err ("%s: seek error", lump_name);
+	 rc = 1;
+	 goto sectors_alpha_done;
+	 }
+      i16 index;
+      wf->read_i16 (&Sectors[n].floorh);
+      wf->read_i16 (&Sectors[n].ceilh );
+      wf->read_i16 (&index);
+      if (nflatnames && flatnames && index >= 0 && index < nflatnames)
+	 memcpy (Sectors[n].floort, flatnames + WAD_FLAT_NAME * index,
+	     WAD_FLAT_NAME);
+      else
+	 strcpy (Sectors[n].floort, "unknown");
+      wf->read_i16 (&index);
+      if (nflatnames && flatnames && index >= 0 && index < nflatnames)
+	 memcpy (Sectors[n].ceilt, flatnames + WAD_FLAT_NAME * index,
+	     WAD_FLAT_NAME);
+      else
+	 strcpy (Sectors[n].ceilt, "unknown");
+      wf->read_i16 (&Sectors[n].light);
+      wf->read_i16 (&Sectors[n].special);
+      wf->read_i16 (&Sectors[n].tag);
+      // Don't know what the tail is for. Ignore it.
+      if (wf->error ())
+	 {
+	 err ("%s: error reading sector #%ld", lump_name, long (n));
+	 rc = 1;
+	 goto sectors_alpha_done;
 	 }
-      delete[] offset_table;
-      if (flatnames)
-	 delete[] flatnames;
       }
    }
+   
+   sectors_alpha_done:
+   if (offset_table != 0)
+      delete[] offset_table;
+   if (flatnames != 0)
+      delete[] flatnames;
+   if (rc != 0)
+      goto byebye;
+   }
+}
 
 /* Sanity checking on sidedefs: the sector must exist. I don't
    make this a fatal error, though, because it's not exceptional
    to find wads with unused sidedefs with a sector# of -1. Well
    known ones include dyst3 (MAP06, MAP07, MAP08), mm (MAP16),
    mm2 (MAP13, MAP28) and requiem (MAP03, MAP08, ...). */
-for (n = 0; n < NumSideDefs; n++)
+for (long n = 0; n < NumSideDefs; n++)
    {
    if (outside (SideDefs[n].sector, 0, NumSectors - 1))
-      warn ("sidedef %d has bad sector number %d\n",
+      warn ("sidedef %ld has bad sector number %d\n",
 	 n, SideDefs[n].sector);
    }
 
@@ -706,6 +928,8 @@
 verbmsg ("  Map: (%d,%d)-(%d,%d)\n", MapMinX, MapMinY, MapMaxX, MapMaxY);
 
 byebye:
+if (rc != 0)
+   err ("%s: errors found, giving up", levelname);
 return rc;
 }
 
@@ -720,7 +944,7 @@
 /* forget the things */
 ObjectsNeeded (OBJ_THINGS, 0);
 NumThings = 0;
-if (Things)
+if (Things != 0)
    FreeFarMemory (Things);
 Things = 0;
 things_angles++;
@@ -729,28 +953,28 @@
 /* forget the vertices */
 ObjectsNeeded (OBJ_VERTICES, 0);
 NumVertices = 0;
-if (Vertices)
+if (Vertices != 0)
    FreeFarMemory (Vertices);
 Vertices = 0;
 
 /* forget the linedefs */
 ObjectsNeeded (OBJ_LINEDEFS, 0);
 NumLineDefs = 0;
-if (LineDefs)
+if (LineDefs != 0)
    FreeFarMemory (LineDefs);
 LineDefs = 0;
 
 /* forget the sidedefs */
 ObjectsNeeded (OBJ_SIDEDEFS, 0);
 NumSideDefs = 0;
-if (SideDefs)
+if (SideDefs != 0)
    FreeFarMemory (SideDefs);
 SideDefs = 0;
 
 /* forget the sectors */
 ObjectsNeeded (OBJ_SECTORS, 0);
 NumSectors = 0;
-if (Sectors)
+if (Sectors != 0)
    FreeFarMemory (Sectors);
 Sectors = 0;
 ObjectsNeeded (0);
@@ -782,8 +1006,6 @@
  *
  *	Returns 0 on success and non-zero on failure (see errno).
  */
-
-#ifdef NEW_SAVE_METHOD
 int SaveLevelData (const char *outfile, const char *level_name) /* SWAP! */
 {
 FILE   *file;
@@ -801,237 +1023,21 @@
    }
 if (! level_name || ! levelname2levelno (level_name))
    {
-   nf_bug ("SaveLevelData called with bad level_name.\n"
-       "Using \"E1M1\" instead.");
+   nf_bug ("SaveLevelData: bad level_name \"%s\", using \"E1M1\" instead.",
+       level_name);
    level_name = "E1M1";
    }
 DisplayMessage (-1, -1, "Saving data to \"%s\"...", outfile);
 LogMessage (": Saving data to \"%s\"...\n", outfile);
 if ((file = fopen (outfile, "wb")) == NULL)
-   fatal_error ("Unable to open file \"%s\"", outfile);
-
-// Write the pwad header
-WriteBytes (file, "PWAD", 4);		// Pwad file
-file_write_i32 (file, WAD_LL__);	// Number of entries = 11
-file_write_i32 (file, 0);		// Fix this up later
-if (Level)
-   dir = Level->next;
-else
-   dir = 0;  // Useless except to trap accidental dereferences
-
-// The label (EnMm or MAPnm)
-l = WAD_LL_LABEL;
-lump_offset[l] = ftell (file);	// By definition
-lump_size[l]   =  0;		// By definition
- 
-// Write the THINGS lump
-l = WAD_LL_THINGS;
-lump_offset[l] = ftell (file);
-ObjectsNeeded (OBJ_THINGS, 0);
-for (n = 0; n < NumThings; n++)
-   {
-   file_write_i16 (file, Things[n].xpos );
-   file_write_i16 (file, Things[n].ypos );
-   file_write_i16 (file, Things[n].angle);
-   file_write_i16 (file, Things[n].type );
-   file_write_i16 (file, Things[n].when );
-   }
-lump_size[l] = ftell (file) - lump_offset[l];
-if (Level)
-   dir = dir->next;
-
-// Write the LINEDEFS lump
-l = WAD_LL_LINEDEFS;
-lump_offset[WAD_LL_LINEDEFS] = ftell (file);
-ObjectsNeeded (OBJ_LINEDEFS, 0);
-for (n = 0; n < NumLineDefs; n++)
-   {
-   file_write_i16 (file, LineDefs[n].start   );
-   file_write_i16 (file, LineDefs[n].end     );
-   file_write_i16 (file, LineDefs[n].flags   );
-   file_write_i16 (file, LineDefs[n].type    );
-   file_write_i16 (file, LineDefs[n].tag     );
-   file_write_i16 (file, LineDefs[n].sidedef1);
-   file_write_i16 (file, LineDefs[n].sidedef2);
-   }
-lump_size[l] = ftell (file) - lump_offset[l];
-if (Level)
-   dir = dir->next;
-
-// Write the SIDEDEFS lump
-l = WAD_LL_SIDEDEFS;
-lump_offset[l] = ftell (file);
-ObjectsNeeded (OBJ_SIDEDEFS, 0);
-for (n = 0; n < NumSideDefs; n++)
    {
-   file_write_i16 (file, SideDefs[n].xoff);
-   file_write_i16 (file, SideDefs[n].yoff);
-   WriteBytes     (file, &(SideDefs[n].tex1), WAD_TEX_NAME);
-   WriteBytes     (file, &(SideDefs[n].tex2), WAD_TEX_NAME);
-   WriteBytes     (file, &(SideDefs[n].tex3), WAD_TEX_NAME);
-   file_write_i16 (file, SideDefs[n].sector);
-   }
-lump_size[l] = ftell (file) - lump_offset[l];
-if (Level)
-   dir = dir->next;
-
-// Write the VERTEXES lump
-l = WAD_LL_VERTEXES;
-lump_offset[WAD_LL_VERTEXES] = ftell (file);
-if (! Level || MadeMapChanges)
-   {
-   /* Write the vertices */
-   ObjectsNeeded (OBJ_VERTICES, 0);
-   for (n = 0; n < NumVertices; n++)
-      {
-      file_write_i16 (file, Vertices[n].x);
-      file_write_i16 (file, Vertices[n].y);
-      }
-   }
-else
-   {
-   /* Copy the vertices */
-   ObjectsNeeded (0);
-   wad_seek (dir->wadfile, dir->dir.start);
-   CopyBytes (file, dir->wadfile->fd, dir->dir.size);
-   }
-lump_size[l] = ftell (file) - lump_offset[l];
-if (Level)
-   dir = dir->next;
-
-// Write the SEGS, SSECTORS and NODES lumps
-for (n = 0; n < 3; n++)
-   {
-   if (n == 0)
-      l = WAD_LL_SEGS;
-   else if (n == 1)
-      l = WAD_LL_SSECTORS;
-   else if (n == 2)
-      l = WAD_LL_NODES;
-   lump_offset[l] = ftell (file);
-   if (Level && ! MadeMapChanges
-       && yg_level_format != YGLF_ALPHA)  // Doom alpha lacks those lumps
-      {
-      wad_seek (dir->wadfile, dir->dir.start);
-      CopyBytes (file, dir->wadfile->fd, dir->dir.size);
-      }
-   lump_size[l] = ftell (file) - lump_offset[l];
-   if (Level)
-      dir = dir->next;
-   }
-
-// Write the SECTORS lump
-l = WAD_LL_SECTORS;
-lump_offset[l] = ftell (file);
-ObjectsNeeded (OBJ_SECTORS, 0);
-for (n = 0; n < NumSectors; n++)
-   {
-   file_write_i16 (file, Sectors[n].floorh);
-   file_write_i16 (file, Sectors[n].ceilh );
-   WriteBytes     (file, Sectors[n].floort, WAD_FLAT_NAME);
-   WriteBytes     (file, Sectors[n].ceilt,  WAD_FLAT_NAME);
-   file_write_i16 (file, Sectors[n].light  );
-   file_write_i16 (file, Sectors[n].special);
-   file_write_i16 (file, Sectors[n].tag    );
-   }
-lump_size[l] = ftell (file) - lump_offset[l];
-if (Level)
-   dir = dir->next;
-
-// Write the REJECT lump
-l = WAD_LL_REJECT;
-lump_offset[l] = ftell (file);
-if (Level && ! MadeMapChanges
-    && yg_level_format != YGLF_ALPHA)  // Doom alpha lacks that lump
-   {
-   /* Copy the REJECT data */
-   ObjectsNeeded (0);
-   wad_seek (dir->wadfile, dir->dir.start);
-   CopyBytes (file, dir->wadfile->fd, dir->dir.size);
-   }
-lump_size[l] = ftell (file) - lump_offset[l];
-if (Level)
-   dir = dir->next;
-
-// Write the BLOCKMAP lump
-l = WAD_LL_BLOCKMAP;
-lump_offset[l] = ftell (file);
-if (Level && ! MadeMapChanges
-    && yg_level_format != YGLF_ALPHA)  // Doom alpha lacks that lump
-   {
-   ObjectsNeeded (0);
-   wad_seek (dir->wadfile, dir->dir.start);
-   CopyBytes (file, dir->wadfile->fd, dir->dir.size);
-   }
-lump_size[l] = ftell (file) - lump_offset[l];
-if (Level)
-   dir = dir->next;
-
-// Write the actual directory
-long dir_offset = ftell (file);
-for (int L = 0; L < (int) WAD_LL__; L++)
-   {
-   file_write_i32 (file, lump_offset[L]);
-   file_write_i32 (file, lump_size[L]);
-   if (L == (int) WAD_LL_LABEL)
-      file_write_name (file, level_name);
-   else
-      file_write_name (file, wad_level_lump[L].name);
-   }
-
-/* Fix up the directory start information */
-if (fseek (file, 8, SEEK_SET))
-   fatal_error ("error writing to file");
-file_write_i32 (file, dir_offset);
-
-/* Close the file */
-fclose (file);
-
-/* The file is now up to date */
-if (! Level || MadeMapChanges)
-   remind_to_build_nodes = 1;
-MadeChanges = 0;
-MadeMapChanges = 0;
-ObjectsNeeded (0);
-
-/* Update pointers in Master Directory */
-OpenPatchWad (outfile);
-
-/* This should free the old "*.bak" file */
-CloseUnusedWadFiles ();
-
-/* Update MapMinX, MapMinY, MapMaxX, MapMaxY */
-// Probably not necessary anymore -- AYM 1999-04-05
-ObjectsNeeded (OBJ_VERTICES, 0);
-update_level_bounds ();
-return 0;
-}
-#else
-int SaveLevelData (const char *outfile, const char *level_name) /* SWAP! */
-{
-FILE   *file;
-MDirPtr dir;
-int     n;
-long	lump_offset[WAD_LL__];
-size_t	lump_size[WAD_LL__];
-wad_level_lump_no_t l;
-
-if (yg_level_format == YGLF_HEXEN || ! strcmp (Game, "hexen"))
-   {
-   Notify (-1, -1, "I refuse to save. Hexen mode is still",
-                   "too badly broken. You would lose data.");
+   char buf1[81];
+   char buf2[81];
+   y_snprintf (buf1, sizeof buf1, "Can't open \"%.64s\"", outfile);
+   y_snprintf (buf2, sizeof buf1, "for writing (%.64s)",  strerror (errno));
+   Notify (-1, -1, buf1, buf2);
    return 1;
    }
-if (! level_name || ! levelname2levelno (level_name))
-   {
-   nf_bug ("SaveLevelData: bad level_name \"%s\", using \"E1M1\" instead.",
-       level_name);
-   level_name = "E1M1";
-   }
-DisplayMessage (-1, -1, "Saving data to \"%s\"...", outfile);
-LogMessage (": Saving data to \"%s\"...\n", outfile);
-if ((file = fopen (outfile, "wb")) == NULL)
-   fatal_error ("Unable to open file \"%s\"", outfile);
 
 /* Can we reuse the old nodes ? Not if this is a new level from
    scratch or if the structure of the level has changed. If the
@@ -1113,8 +1119,13 @@
    {
    /* Copy the vertices */
    ObjectsNeeded (0);
-   wad_seek (dir->wadfile, dir->dir.start);
-   CopyBytes (file, dir->wadfile->fd, dir->dir.size);
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (dir->dir.start);
+   if (wf->error ())
+      {
+      warn ("%s: seek error\n", wad_level_lump[l]);
+      }
+   copy_bytes (file, wf->fp, dir->dir.size);
    }
 else
    {
@@ -1142,8 +1153,13 @@
    lump_offset[l] = ftell (file);
    if (reuse_nodes)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      CopyBytes (file, dir->wadfile->fd, dir->dir.size);
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+	 {
+	 warn ("%s: seek error\n", wad_level_lump[l]);
+	 }
+      copy_bytes (file, wf->fp, dir->dir.size);
       }
    lump_size[l] = ftell (file) - lump_offset[l];
    if (Level)
@@ -1175,8 +1191,13 @@
    {
    /* Copy the REJECT data */
    ObjectsNeeded (0);
-   wad_seek (dir->wadfile, dir->dir.start);
-   CopyBytes (file, dir->wadfile->fd, dir->dir.size);
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (dir->dir.start);
+   if (wf->error ())
+      {
+      warn ("%s: seek error\n", wad_level_lump[l]);
+      }
+   copy_bytes (file, wf->fp, dir->dir.size);
    }
 lump_size[l] = ftell (file) - lump_offset[l];
 if (Level)
@@ -1188,8 +1209,13 @@
 if (reuse_nodes)
    {
    ObjectsNeeded (0);
-   wad_seek (dir->wadfile, dir->dir.start);
-   CopyBytes (file, dir->wadfile->fd, dir->dir.size);
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (dir->dir.start);
+   if (wf->error ())
+      {
+      warn ("%s: seek error\n", wad_level_lump[l]);
+      }
+   copy_bytes (file, wf->fp, dir->dir.size);
    }
 lump_size[l] = ftell (file) - lump_offset[l];
 if (Level)
@@ -1209,11 +1235,27 @@
 
 /* Fix up the directory start information */
 if (fseek (file, 8, SEEK_SET))
-   fatal_error ("error writing to file");
+   {
+   char buf1[81];
+   char buf2[81];
+   y_snprintf (buf1, sizeof buf1, "%.64s: seek error", outfile);
+   y_snprintf (buf2, sizeof buf2, "(%.64s)",           strerror (errno));
+   Notify (-1, -1, buf1, buf2);
+   fclose (file);
+   return 1;
+   }
 file_write_i32 (file, dir_offset);
 
 /* Close the file */
-fclose (file);
+if (fclose (file))
+   {
+   char buf1[81];
+   char buf2[81];
+   y_snprintf (buf1, sizeof buf1, "%.64s: write error", outfile);
+   y_snprintf (buf2, sizeof buf2, "(%.64s)",            strerror (errno));
+   Notify (-1, -1, buf1, buf2);
+   return 1;
+   }
 
 /* The file is now up to date */
 if (! Level || MadeMapChanges)
@@ -1234,7 +1276,6 @@
 update_level_bounds ();
 return 0;
 }
-#endif  /* NEW_SAVE_METHOD */
 
 
 /*
@@ -1267,7 +1308,6 @@
 void ReadWTextureNames ()
 {
 MDirPtr dir;
-i32 *offsets;
 int n;
 i32 val;
 
@@ -1277,73 +1317,139 @@
 if (yg_texture_lumps == YGTL_TEXTURES
  && yg_texture_format == YGTF_NAMELESS)
    {
-   dir = FindMasterDir (MasterDir, "TEXTURES");
-   if (dir != NULL)
+   const char *lump_name = "TEXTURES";
+   dir = FindMasterDir (MasterDir, lump_name);
+   if (dir == NULL)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &val);
-      NumWTexture = (int) val + 1;
-      WTexture = (char **) GetMemory ((long) NumWTexture * sizeof *WTexture);
-      WTexture[0] = (char *) GetMemory (WAD_TEX_NAME + 1);
-      strcpy (WTexture[0], "-");
-      if (WAD_TEX_NAME < 7) nf_bug ("WAD_TEX_NAME too small");  // Sanity
-      for (long n = 0; n < val; n++)
+      warn ("%s: lump not found in directory\n", lump_name);
+      goto textures04_done;
+      }
+   {
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (dir->dir.start);
+   if (wf->error ())
+      {
+      warn ("%s: seek error\n", lump_name);
+      goto textures04_done;
+      }
+   wf->read_i32 (&val);
+   if (wf->error ())
+      {
+      warn ("%s: error reading texture count\n", lump_name);
+      goto textures04_done;
+      }
+   NumWTexture = (int) val + 1;
+   WTexture = (char **) GetMemory ((long) NumWTexture * sizeof *WTexture);
+   WTexture[0] = (char *) GetMemory (WAD_TEX_NAME + 1);
+   strcpy (WTexture[0], "-");
+   if (WAD_TEX_NAME < 7) nf_bug ("WAD_TEX_NAME too small");  // Sanity
+   for (long n = 0; n < val; n++)
+      {
+      WTexture[n + 1] = (char *) GetMemory (WAD_TEX_NAME + 1);
+      if (n > 9999)
 	 {
-	 WTexture[n + 1] = (char *) GetMemory (WAD_TEX_NAME + 1);
-	 if (n > 9999)
-	    {
-	    warn ("more than 10,000 textures. Ignoring excess.\n");
-	    break;
-	    }
-	 sprintf (WTexture[n + 1], "TEX%04ld", n);
+	 warn ("more than 10,000 textures. Ignoring excess.\n");
+	 break;
 	 }
+      sprintf (WTexture[n + 1], "TEX%04ld", n);
       }
    }
+   textures04_done:
+   ;
+   }
 
 // Doom alpha 0.5 : only "TEXTURES"
 else if (yg_texture_lumps == YGTL_TEXTURES
       && (yg_texture_format == YGTF_NORMAL
 	  || yg_texture_format == YGTF_STRIFE11))
    {
-   dir = FindMasterDir (MasterDir, "TEXTURES");
-   if (dir != NULL)  // In theory it always exists, though
-      {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &val);
-      NumWTexture = (int) val + 1;
-      /* read in the offsets for texture1 names */
-      offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
-      wad_read_i32 (dir->wadfile, offsets + 1, NumWTexture - 1);
-      /* read in the actual names */
-      WTexture = (char **) GetMemory ((long) NumWTexture * sizeof (char *));
-      WTexture[0] = (char *) GetMemory (WAD_TEX_NAME + 1);
-      strcpy (WTexture[0], "-");
-      for (n = 1; n < NumWTexture; n++)
+   const char *lump_name = "TEXTURES";
+   i32 *offsets = 0;
+   dir = FindMasterDir (MasterDir, lump_name);
+   if (dir == NULL)  // In theory it always exists, though
+      {
+      warn ("%s: lump not found in directory\n", lump_name);
+      goto textures05_done;
+      }
+   {
+   const Wad_file *wf = dir->wadfile;
+   wf->seek (dir->dir.start);
+   if (wf->error ())
+      {
+      warn ("%s: seek error\n", lump_name);
+      goto textures05_done;
+      }
+   wf->read_i32 (&val);
+   if (wf->error ())
+      {
+      warn ("%s: error reading texture count\n", lump_name);
+      goto textures05_done;
+      }
+   NumWTexture = (int) val + 1;
+   /* read in the offsets for texture1 names */
+   offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
+   wf->read_i32 (offsets + 1, NumWTexture - 1);
+   if (wf->error ())
+      {
+      warn ("%s: error reading offsets table\n", lump_name);
+      goto textures05_done;
+      }
+   /* read in the actual names */
+   WTexture = (char **) GetMemory ((long) NumWTexture * sizeof (char *));
+   WTexture[0] = (char *) GetMemory (WAD_TEX_NAME + 1);
+   strcpy (WTexture[0], "-");
+   for (n = 1; n < NumWTexture; n++)
+      {
+      WTexture[n] = (char *) GetMemory (WAD_TEX_NAME + 1);
+      long offset = dir->dir.start + offsets[n];
+      wf->seek (offset);
+      if (wf->error ())
 	 {
-	 WTexture[n] = (char *) GetMemory (WAD_TEX_NAME + 1);
-	 wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	 wad_read_bytes (dir->wadfile, WTexture[n], WAD_TEX_NAME);
-	 WTexture[n][WAD_TEX_NAME] = '\0';
+	 warn ("%s: error seeking to  error\n", lump_name);
+	 goto textures05_done;		// FIXME cleanup
 	 }
-      FreeMemory (offsets);
+      wf->read_bytes (WTexture[n], WAD_TEX_NAME);
+      if (wf->error ())
+	 {
+	 warn ("%s: error reading texture names\n", lump_name);
+	 goto textures05_done;		// FIXME cleanup
+	 }
+      WTexture[n][WAD_TEX_NAME] = '\0';
       }
-   else
-      warn ("TEXTURES lump not found. Iwad might be corrupt.\n");
+   }
+   textures05_done:
+   if (offsets != 0)
+      FreeMemory (offsets);
    }
 // Other iwads : "TEXTURE1" and possibly "TEXTURE2"
 else if (yg_texture_lumps == YGTL_NORMAL
       && (yg_texture_format == YGTF_NORMAL
 	  || yg_texture_format == YGTF_STRIFE11))
    {
-   dir = FindMasterDir (MasterDir, "TEXTURE1");
+   const char *lump_name = "TEXTURE1";
+   i32 *offsets = 0;
+   dir = FindMasterDir (MasterDir, lump_name);
    if (dir != NULL)  // In theory it always exists, though
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &val);
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+	 {
+	 warn ("%s: seek error\n", lump_name);
+	 // FIXME
+	 }
+      wf->read_i32 (&val);
+      if (wf->error ())
+      {
+	// FIXME
+      }
       NumWTexture = (int) val + 1;
       /* read in the offsets for texture1 names */
       offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
-      wad_read_i32 (dir->wadfile, offsets + 1, NumWTexture - 1);
+      wf->read_i32 (offsets + 1, NumWTexture - 1);
+      {
+	// FIXME
+      }
       /* read in the actual names */
       WTexture = (char **) GetMemory ((long) NumWTexture * sizeof (char *));
       WTexture[0] = (char *) GetMemory (WAD_TEX_NAME + 1);
@@ -1351,8 +1457,17 @@
       for (n = 1; n < NumWTexture; n++)
 	 {
 	 WTexture[n] = (char *) GetMemory (WAD_TEX_NAME + 1);
-	 wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	 wad_read_bytes (dir->wadfile, WTexture[n], WAD_TEX_NAME);
+	 wf->seek (dir->dir.start + offsets[n]);
+	 if (wf->error ())
+	    {
+	    warn ("%s: seek error\n", lump_name);
+	    // FIXME
+	    }
+	 wf->read_bytes (WTexture[n], WAD_TEX_NAME);
+	 if (wf->error ())
+	    {
+	      // FIXME
+	    }
 	 WTexture[n][WAD_TEX_NAME] = '\0';
 	 }
       FreeMemory (offsets);
@@ -1361,19 +1476,40 @@
    dir = FindMasterDir (MasterDir, "TEXTURE2");
    if (dir)  /* Doom II has no TEXTURE2 */
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &val);
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+	 {
+	 warn ("%s: seek error\n", lump_name);
+	 // FIXME
+	 }
+      wf->read_i32 (&val);
+      if (wf->error ())
+      {
+	// FIXME
+      }
       /* read in the offsets for texture2 names */
       offsets = (i32 *) GetMemory ((long) val * 4);
-      wad_read_i32 (dir->wadfile, offsets, val);
+      wf->read_i32 (offsets, val);
+      if (wf->error ())
+      {
+	// FIXME
+      }
       /* read in the actual names */
       WTexture = (char **) ResizeMemory (WTexture,
 	 (NumWTexture + val) * sizeof (char *));
       for (n = 0; n < val; n++)
 	 {
 	 WTexture[NumWTexture + n] = (char *) GetMemory (WAD_TEX_NAME + 1);
-	 wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	 wad_read_bytes (dir->wadfile, WTexture[NumWTexture + n], WAD_TEX_NAME);
+	 wf->seek (dir->dir.start + offsets[n]);
+	 if (wf->error ())
+	    {
+	    warn ("%s: seek error\n", lump_name);
+	    // FIXME
+	    }
+	 wf->read_bytes (WTexture[NumWTexture + n], WAD_TEX_NAME);
+	 if (wf->error ())
+	   ; // FIXME
 	 WTexture[NumWTexture + n][WAD_TEX_NAME] = '\0';
 	 }
       NumWTexture += val;
@@ -1501,20 +1637,19 @@
 
 /* Eliminate all but the last duplicates of a flat. Suboptimal.
    Would be smarter to start by the end. */
-for (int n = 0; n < NumFTexture; n++)
+for (size_t n = 0; n < NumFTexture; n++)
    {
-   int m = n;
+   size_t m = n;
    while (m + 1 < NumFTexture
      && ! flat_list_entry_cmp (flat_list + n, flat_list + m + 1))
        m++;
    // m now contains the index of the last duplicate
    int nduplicates = m - n;
-   if (m > n)
+   if (nduplicates > 0)
       {
-      //printf ("Flat %.8s: %d duplicates\n", flat_list[n].name, m - n);//DEBUG
       memmove (flat_list + n, flat_list + m,
                                       (NumFTexture - m) * sizeof *flat_list);
-      NumFTexture -= m - n;
+      NumFTexture -= nduplicates;
       // Note that I'm too lazy to resize flat_list...
       }
    }
diff -uaNr yadex-1.5.2/src/levels.h yadex-1.6.0/src/levels.h
--- yadex-1.5.2/src/levels.h	2000-07-25 23:45:06.000000000 +0200
+++ yadex-1.6.0/src/levels.h	2001-10-13 16:57:33.000000000 +0200
@@ -35,9 +35,9 @@
 extern size_t NumFTexture;	/* number of floor/ceiling textures */
 typedef struct
 {
-  char   name[WAD_NAME + 1];	// Name of flat
-  WadPtr wadfile;		// Pointer on wad where flat comes from
-  i32    offset;		// Offset of flat in wad
+  char            name[WAD_NAME + 1];	// Name of flat
+  const Wad_file *wadfile;		// Pointer on wad where flat comes from
+  i32             offset;		// Offset of flat in wad
 } flat_list_entry_t;			// Length is implicit (always 4096)
 extern flat_list_entry_t *flat_list;	// List of all flats in the directory
 
diff -uaNr yadex-1.5.2/src/lists.cc yadex-1.6.0/src/lists.cc
--- yadex-1.5.2/src/lists.cc	2000-08-13 19:02:13.000000000 +0200
+++ yadex-1.6.0/src/lists.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,12 +31,7 @@
 #include "yadex.h"
 #include "gfx.h"
 #include "lists.h"
-
-
-#ifdef SHIFT_F1
-// FIXME move this somewhere else
-void SavePic (int x0, int y0, int width, int height, const char *name);
-#endif
+#include "wadfile.h"
 
 
 // FIXME Move this in a more public place
@@ -50,7 +45,7 @@
     *buf = '\0';
     return;
   }
-  y_filename (buf, len + 1, lump_loc.wad->filename);
+  y_filename (buf, len + 1, lump_loc.wad->pathname ());
   sprintf (buf + strlen (buf), "(%08lXh)",
     (unsigned long) lump_loc.ofs & 0xffffffff);
 }
@@ -76,7 +71,9 @@
   image to file" is displayed and shift-F1 does just that.
 */
 
+#ifdef DEBUG
 static bool disp_lump_loc = false;
+#endif
 
 void InputNameFromListWithFunc (
    int x0,
@@ -84,17 +81,15 @@
    const char *prompt,
    size_t listsize,
    const char *const *list,
-   int listdisp,
+   size_t listdisp,
    char *name,
    int width,
    int height,
    void (*hookfunc)(hookfunc_comm_t *),
    char flags_to_pass_to_callback)
 {
-#ifdef SHIFT_F1
 const char *msg1 = "Press Shift-F1 to";
 const char *msg2 = "save image to file";
-#endif
 int    key;
 size_t n;
 size_t win_height;
@@ -105,7 +100,9 @@
 size_t maxlen;
 int    xlist;
 bool   picture_size_drawn = false;
+#ifdef DEBUG
 bool   lump_loc_drawn = false;
+#endif
 bool   ok, firstkey;
 int    entry_out_x0;	/* Edge of name entry widget including border */
 int    entry_out_y0;
@@ -116,6 +113,18 @@
 int    entry_text_x1;
 int    entry_text_y1;
 
+// Sanity
+if (width < 0)
+{
+  nf_bug ("inflwf1");
+  width = 0;
+}
+if (height < 0)
+{
+  nf_bug ("inflwf2");
+  height = 0;
+}
+
 // Compute maxlen, the length of the longest item in the list
 maxlen = 1;
 for (n = 0; n < listsize; n++)
@@ -123,10 +132,11 @@
       maxlen = strlen (list[n]);
 for (n = strlen (name) + 1; n <= maxlen; n++)
    name[n] = '\0';
+char *namedisp = new char[maxlen + 1];
+memset (namedisp, '\xff', maxlen + 1);  // Always != from name
 
 // Compute the minimum width of the dialog box
 l0 = 12;
-#ifdef SHIFT_F1
 if (hookfunc != NULL)
    {
    if ((int) (strlen (msg1) + 2) > l0)  // (int) to prevent GCC warning
@@ -134,7 +144,6 @@
    if ((int) (strlen (msg2) + 2) > l0)  // (int) to prevent GCC warning
       l0 = strlen (msg2) + 2;
    }
-#endif
 xlist = 10 + l0 * FONTW;
 win_columns = l0 + maxlen;
 if ((int) (strlen (prompt)) > win_columns)  // (int) to prevent GCC warning
@@ -144,7 +153,8 @@
 y1 = 10 + 1;
 if (width > 0)
    win_width += 16 + width;
-win_height = y_max (height + 20, listdisp * FONTH + 10 + 28);
+// (int) to prevent GCC warning
+win_height = y_max (height + 20, (int) (listdisp * FONTH + 10 + 28));
 if (x0 < 0)
    x0 = (ScrMaxX - win_width) / 2;
 if (y0 < 0)
@@ -179,7 +189,6 @@
 set_colour (YELLOW);
 DrawScreenText (x0 + 10, y0 + 8, prompt);
 set_colour (WINFG);
-#ifdef SHIFT_F1
 if (hookfunc != NULL)
    {
    DrawScreenText (x0 + 10,
@@ -189,7 +198,6 @@
 		   y0 + win_height - BOX_BORDER - WIDE_VSPACING - FONTH,
 		   msg2);
    }
-#endif
 if (width > 0)
    DrawScreenBoxHollow (x1 - 1, y1 - 1, x2 + 1, y2 + 1, BLACK);
 firstkey = true;
@@ -200,11 +208,17 @@
 int disp_x1 = disp_x0 - 1;
 int disp_y1 = disp_y0 - 1;
 
+int maxpatches = 0;
+
 // The event loop
 for (;;)
    {
    hookfunc_comm_t c;
 
+   // Reset maxpatches every time when change texture
+   if (strcmp (name, namedisp) != 0)
+     maxpatches = 0;
+
    // Is "name" in the list ?
    for (n = 0; n < listsize; n++)
       if (y_stricmp (name, list[n]) <= 0)
@@ -215,7 +229,7 @@
 
    // Display the  next items in the list
    {
-   int l;				// Current line
+   size_t l;				// Current line
    int y = entry_out_y0;		// Y-coord of current line
    int xmin = x0 + xlist;
    int xmax = xmin + FONTW * maxlen - 1;
@@ -253,19 +267,20 @@
    if (hookfunc)
       {
       // Display the picture name
-      c.x0      = x1;
-      c.y0      = y1;
-      c.x1      = x2;
-      c.y1      = y2;
-      c.name    = name;
-      c.xofs    = 0;
-      c.yofs    = 0;
-      c.flags   = flags_to_pass_to_callback;
+      c.x0         = x1;
+      c.y0         = y1;
+      c.x1         = x2;
+      c.y1         = y2;
+      c.name       = name;
+      c.xofs       = 0;
+      c.yofs       = 0;
+      c.flags      = flags_to_pass_to_callback;
       const int BAD_VALUE = INT_MAX;
-      c.disp_x0 = BAD_VALUE;  // Catch faulty callbacks
-      c.disp_y0 = BAD_VALUE;  // Catch faulty callbacks
-      c.disp_x1 = BAD_VALUE;  // Catch faulty callbacks
-      c.disp_y1 = BAD_VALUE;  // Catch faulty callbacks
+      c.disp_x0    = BAD_VALUE;  // Catch faulty callbacks
+      c.disp_y0    = BAD_VALUE;  // Catch faulty callbacks
+      c.disp_x1    = BAD_VALUE;  // Catch faulty callbacks
+      c.disp_y1    = BAD_VALUE;  // Catch faulty callbacks
+      c.maxpatches = maxpatches;
       if (ok)
 	 {
 	 hookfunc (&c);
@@ -278,6 +293,7 @@
 	 c.disp_x1 = c.disp_x0 - 1;
 	 c.disp_y1 = c.disp_y0 - 1;
 	 }
+      strcpy (namedisp, name);
 
       // Display the (unclipped) size of the picture
       {
@@ -428,7 +444,7 @@
       }
    else if ((key == YK_PU || key == 2) && n > 0)	// [Pgup], ^B
       {
-      if ((int) n > listdisp)
+      if (n > listdisp)
 	 strcpy (name, list[n - listdisp]);
       else
 	 strcpy (name, list[0]);
@@ -485,21 +501,50 @@
 	 }
       strcpy (name, list[0]);
       }
+   else if (key == YK_TAB)				// [Tab]
+      strcpy (name, list[n]);
    else if (key == YK_F1 && c.flags & HOOK_LOC_VALID)	// [F1]: print location
       {
       printf ("%.8s: %s(%08lXh)\n",
-	 name, c.lump_loc.wad->filename, (unsigned long) c.lump_loc.ofs);
+	 name, c.lump_loc.wad->pathname (), (unsigned long) c.lump_loc.ofs);
       }
-#ifdef SHIFT_F1
    else if (key == YK_F1 + YK_SHIFT	// [Shift][F1] : dump image to file
     && hookfunc != NULL
     && (c.flags & HOOK_DRAWN))
       {
-      SavePic (c.x0, c.y0, c.width, c.height, c.name); // FIXME use the buffer!
+      const size_t size = strlen (name) + 4 + 1;
+      char *filename = new char[size];
+      al_scpslower (filename, name,   size - 1);
+      al_saps      (filename, ".ppm", size - 1);
+      if (c.img.save (filename) != 0)
+	 {
+	 if (errno == ECHILD)
+	    err ("Error loading PLAYPAL");
+	 else
+	    err ("%s: %s", filename, strerror (errno));
+	 }
+      else
+	 {
+	 printf ("Saved %s as %s\n", name, filename);
+	 }
+      delete[] filename;
+      }
+   else if (key == 1)					// ^A: more patches
+      {
+      if (maxpatches + 1 < c.npatches)
+	maxpatches++;
+      else
+	maxpatches = 0;
+      printf ("maxpatches %d\n", maxpatches);
+      }
+   else if (key == 24)					// ^X: less patches
+      {
+      if (maxpatches == 0)
+	maxpatches = c.npatches - 1;
+      else
+	maxpatches--;
+      printf ("maxpatches %d\n", maxpatches);
       }
-#endif
-   else if (key == YK_TAB)				// [Tab]
-      strcpy (name, list[n]);
    else if (ok && key == YK_RETURN)			// [Return]
       break; /* return "name" */
    else if (key == YK_ESC)				// [Esc]
@@ -512,6 +557,7 @@
 done_with_event:
    ;
    }
+delete[] namedisp;
 }
 
 
diff -uaNr yadex-1.5.2/src/lists.h yadex-1.6.0/src/lists.h
--- yadex-1.5.2/src/lists.h	2000-06-03 00:41:29.000000000 +0200
+++ yadex-1.6.0/src/lists.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -30,13 +30,14 @@
 #ifndef YH_LISTS  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
 #define YH_LISTS
 
+#include "img.h"
+
 
 /* AYM 19980112
 This is the format of the block that the callback function (*hookfunc)()
 and its caller InputNameFromListWithFunc() use to communicate. It
 includes the old hookfunc parameters (x0, y0, x1, y1, name) plus a
-couple of new parameters. The purpose of those new parameters is
-fourfold :
+couple of new parameters. The purpose of those new parameters is :
   1. Give the caller an easy way to know the actual size of the
      image (for shift-F1).
   2. Hence let the caller display the size (remember "yes you
@@ -45,6 +46,8 @@
      patches in current texture etc. Good tourist information :)
   4. Give the caller a way to know whether the image has been
      drawn (i.e. "ready for shift-F1 ?")
+  5. Give the caller something to call Img::save() on when user
+     presses [Shift][F1].
 Why did I create a structure instead of just adding parameters to the
 hookfunc ? Just for the sake of streamlining the prototype of
 InputNameFromListWithFunc() :)
@@ -52,26 +55,44 @@
 - "expected" means "set by caller, read by callee"
 - "returned" means "set by callee, read by caller"
 - "both"     means... both :-)
+
+img
+	The Img is part of the structure. The callee should not
+	make any assumptions regarding the contents and property
+	of img ; it should call resize() and set_opaque()
+	systematically. The callee should not clear the Img
+	before exiting, because the caller may need it for the
+	save-to-file function.
+
+	For that reason, the caller should put the whole image
+	in img, *not* clipped to the dimensions of the screen
+	area on which it will be displayed. Unfortunately, that
+	is currently (2000-10-31) not possible because of
+	limitations in the Sticker class.
+
+	The caller may do whatever it pleases with img.
 */
 typedef struct
-   {
-   int x0;           // [expected] Top left corner of where to draw image
-   int y0;
-   int x1;           // [expected] Bottom right corner
-   int y1;
-   int disp_x0;      // [returned] Top left corner and bottom right corner
-   int disp_y0;      // of area that was drawn on by callee. This is so that
-   int disp_x1;      // the caller knows what needs to be cleared...
-   int disp_y1;
-   int xofs;         // [expected] Top left corner of image in buffer
-   int yofs;
-   const char *name; // [expected] Name of image to display
-   int flags;        // [both] Flags
-   int width;        // [returned] Width of image before clipping
-   int height;       // [returned] Height of image before clipping
-   int npatches;     // [returned] Textures only : number of patches
-   Lump_loc lump_loc;// [returned] Location of lump that was just displayed
-   } hookfunc_comm_t;
+{
+  int x0;           // [expected] Top left corner of where to draw image
+  int y0;
+  int x1;           // [expected] Bottom right corner
+  int y1;
+  int disp_x0;      // [returned] Top left corner and bottom right corner
+  int disp_y0;      // of area that was drawn on by callee. This is so that
+  int disp_x1;      // the caller knows what needs to be cleared...
+  int disp_y1;
+  int xofs;         // [expected] Top left corner of image in buffer
+  int yofs;
+  const char *name; // [expected] Name of image to display
+  int flags;        // [both]     Flags
+  Img img;          // [returned] Image buffer (clipped !)
+  int width;        // [returned] Width of image before clipping
+  int height;       // [returned] Height of image before clipping
+  int npatches;     // [returned] Textures only : number of patches
+  int maxpatches;   // [expected] Textures: if !0 only render that many patches
+  Lump_loc lump_loc;// [returned] Location of lump that was just displayed
+} hookfunc_comm_t;
 const int HOOK_DRAWN      = 1 << 0;	// Image is completely drawn
 const int HOOK_SIZE_VALID = 1 << 1;	// width and height are valid
 const int HOOK_DISP_SIZE  = 1 << 2;	// Caller should display "widthxheight"
@@ -83,11 +104,11 @@
 
 
 void InputNameFromListWithFunc (int, int, const char *, size_t,
-   const char *const *, int, char *, int, int,
-   void (*hookfunc)(hookfunc_comm_t *),
-   char flags_to_pass_to_callback = 0);
+  const char *const *, size_t, char *, int, int,
+  void (*hookfunc)(hookfunc_comm_t *),
+  char flags_to_pass_to_callback = 0);
 void InputNameFromList (int, int, const char *, size_t, const char *const *,
-   char *);
+  char *);
 
 
 #endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/locate.cc yadex-1.6.0/src/locate.cc
--- yadex-1.5.2/src/locate.cc	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/locate.cc	2003-03-25 05:55:16.000000000 +0100
@@ -0,0 +1,183 @@
+/*
+ *	locate.cc - Locate class
+ *	AYM 2003-03-24
+ */
+
+/*
+This file is copyright Andr Majorel 2003.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of version 2 of the GNU General Public License as published by the
+Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#include "yadex.h"
+
+#include 
+#include 
+
+#include "locate.h"
+#include "macro.h"
+#include "trace.h"
+
+
+/*
+ *	Locate::Locate - ctor
+ *
+ *	- search_path points to a NULL-terminated array of C
+ *	  strings (char *) constituting the search path. The
+ *	  paths may contains the following macros, which will be
+ *	  expanded on the fly :
+ *	  %i  the installation directory (DOS only)
+ *	  %v  the version of Yadex
+ *	  ~   $HOME
+ *
+ *	- name is the basename of the file to locate. It may
+ *	  include slashes. If it's absolute, the search path
+ *	  won't be used.
+ *
+ *	- backwards is the direction in which the search path is
+ *	  walked. true is front-to-back, false is back-to-front.
+ */
+Locate::Locate (const char *const *search_path, const char *name, bool backw)
+{
+  this->search_path = search_path;
+  this->name        = name;
+  this->backwards   = backw;
+  absolute          = is_absolute (name);
+  count             = 0;
+  rewind ();
+}
+
+
+/*
+ *	Locate::rewind - rewind the cursor
+ *
+ *	Calling this method will cause the next call to
+ *	get_next() to return the first match, as if get_next()
+ *	had never been called.
+ */
+void Locate::rewind ()
+{
+  count = 0;
+
+  if (backwards)
+  {
+    // Advance to the end of the list
+    for (cursor = search_path; *cursor != NULL; cursor++)
+      ;
+  }
+  else
+  {
+    cursor = search_path;
+  }
+}
+
+
+/*
+ *	Locate::get_next - return the next match
+ *
+ *	Returns a pointer to the pathname of the next match, or
+ *	a null pointer if there are no more matches left. The
+ *	returned pointer is valid until get_next() is called
+ *	again or the Locate object is destroyed.
+ */
+const char *Locate::get_next ()
+{
+  if (absolute)
+  {
+    if (count != 0)			// Result has exactly one element
+      return NULL;
+    count++;
+    if (strlen (name) > sizeof pathname - 1)
+    {
+      warn ("%s: file name too long\n", name);
+      return NULL;
+    }
+    strcpy (pathname, name);
+    return pathname;
+  }
+
+  const char *home = getenv ("HOME");
+
+  // Walk the list
+  for (;;)
+  {
+    // Make dirname point to the current path in the search path
+    const char *dirname;
+
+    if (backwards)
+    {
+      if (cursor == search_path)
+	break;
+      cursor--;
+      dirname = *cursor;
+    }
+    else
+    {
+      if (*cursor == NULL)
+	break;
+      dirname = *cursor;
+      cursor++;
+    }
+
+    // Expand the macros in the path into the result buffer
+    int r = macro_expand (pathname, sizeof pathname - 1, dirname,
+      "%i", install_dir,
+      "%v", yadex_version,
+      "~",  home,
+      (const char *) 0);
+    if (r != 0)
+    {
+      trace ("locate", "%s: Could not expand macro #%d", dirname, r);
+      continue;
+    }
+
+    // Append the basename
+    if (strlen (pathname) > 0 && pathname[strlen (pathname)] - 1 != '/')
+    {
+      if (strlen (pathname) + 2 >= sizeof pathname)
+      {
+	warn ("%s: file name too long, skipping\n", dirname);
+	continue;
+      }
+      strcat (pathname, "/");
+    }
+    if (strlen (pathname) + strlen (name) + 1 >= sizeof pathname)
+    {
+      warn ("%s: file name too long, skipping\n", dirname);
+      continue;
+    }
+    strcat (pathname, name);
+
+    // Look for a file of that name.
+    struct stat s;
+    r = stat (pathname, &s);
+    if (r == 0 && ! S_ISDIR (s.st_mode))
+    {
+      trace ("locate", "%s: %s: hit", name, pathname);
+      return pathname;
+    }
+    else if (r == 0 && S_ISDIR (s.st_mode))
+    {
+      errno = EISDIR;
+    }
+    else if (r != 0 && errno != ENOENT)
+    {
+      warn ("%s: %s\n", pathname, strerror (errno));
+    }
+    trace ("locate", "%s: %s: miss (%s)", name, pathname, strerror (errno));
+  }
+
+  return NULL;
+}
+
diff -uaNr yadex-1.5.2/src/locate.h yadex-1.6.0/src/locate.h
--- yadex-1.5.2/src/locate.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/locate.h	2003-03-25 05:55:27.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ *	locate.h - Locate class
+ *	AYM 2003-03-24
+ */
+
+/*
+This file is copyright Andr Majorel 2003.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of version 2 of the GNU General Public License as published by the
+Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#ifndef YH_LOCATE  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_LOCATE
+
+
+class Locate
+{
+  public :
+    Locate (const char *const *search_path, const char *name, bool backwards);
+    void rewind ();
+    const char *get_next ();
+
+  private :
+    const char *const *search_path;
+    const char        *name;
+    bool               absolute;
+    bool               backwards;
+    const char *const *cursor;
+    bool               count;
+    char               pathname[1025];
+};
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/lumpdir.cc yadex-1.6.0/src/lumpdir.cc
--- yadex-1.5.2/src/lumpdir.cc	2000-06-05 23:42:18.000000000 +0200
+++ yadex-1.6.0/src/lumpdir.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -33,7 +33,7 @@
 #include "lumpdir.h"
 #include "wadname.h"
 #include "wadnamec.h"
-#include "wads.h"
+#include "wadfile.h"
 
 
 
@@ -148,7 +148,7 @@
       if (! dir)
       {
 	warn ("%.128s: no matching %s for %.*s\n",
-	    start_label->wadfile->filename,
+	    start_label->wadfile->pathname (),
 	    end_label,
 	    (int) WAD_NAME, start_label->dir.name);
 	break;
@@ -159,7 +159,7 @@
       {
 	if (dir->dir.size != 0)
 	  warn ("%.128s: label %.*s has non-zero size %ld\n",
-	      dir->wadfile->filename,
+	      dir->wadfile->pathname (),
 	      (int) WAD_NAME, dir->dir.name,
 	      (long) dir->dir.size);
 	dir = dir->next;
@@ -176,7 +176,7 @@
 	    && (! y_strnicmp (dir->dir.name + 3, "START", WAD_NAME - 3)
 		|| ! y_strnicmp (dir->dir.name + 3, "END", WAD_NAME - 3))))
 	  warn ("%.128s: unexpected label \"%.*s\" in %s group\n",
-	      dir->wadfile->filename,
+	      dir->wadfile->pathname (),
 	      (int) WAD_NAME, dir->dir.name,
 	      start_label->dir.name);
 	continue;
diff -uaNr yadex-1.5.2/src/lumpdir.h yadex-1.6.0/src/lumpdir.h
--- yadex-1.5.2/src/lumpdir.h	2001-06-21 15:52:05.000000000 +0200
+++ yadex-1.6.0/src/lumpdir.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/macro.cc yadex-1.6.0/src/macro.cc
--- yadex-1.5.2/src/macro.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/macro.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -85,9 +85,16 @@
   // This is awful, but who cares ?
   while (*fmt)
   {
-    va_list l = list;
+    va_list l;
     const char *macro_name = 0;
     const char *macro_value = 0;
+
+#ifdef __va_copy
+    __va_copy(l, list);
+#else
+    l = list;
+#endif
+
     while (macro_name = va_arg (l, const char *))
     {
       macro_value = va_arg (l, const char *);
@@ -96,7 +103,7 @@
       if (len1 >= len2 && ! memcmp (fmt, macro_name, len2))
 	break;
     }
-    if (macro_name)
+    if (macro_name != 0)
     {
       macro_no++;
       if (macro_value == 0)
@@ -118,3 +125,140 @@
 }
 
 
+/*
+ *	macro_expand - expand macro references in a string
+ *
+ *	Copies the NUL-terminated string in  into the
+ *	buffer , replacing certain strings by other
+ *	strings.  must be at least ( + 1) characters
+ *	long.
+ *
+ *	The macro definitions are obtained by scanning the
+ *	iterator range  through . The
+ *	only constraints on these iterators are that they must
+ *	be input iterators and iterator->name and
+ *	iterator->value must be defined and point to
+ *	NUL-terminated strings.
+ *
+ *	Matching is case-sensitive. If several names would
+ *	match, the first one is used.  For example,
+ *
+ *	  struct macdef
+ *	  {
+ *	    const char *name;
+ *	    const char *value;
+ *	    macdef (const char *name, const char *value) :
+ *	      name (name), value (value);
+ *	  };
+ *	  std::list macdefs;
+ *	  macdefs.push_back (macdef ("%b", "1"));
+ *	  macdefs.push_back (macdef ("%bc", "2"));
+ *	  macro_expand (buf, 99, "a%bcd", macdefs.begin (), macdefs.end ());
+ *
+ *	puts "a1cd" in buf, not "a2d".
+ *
+ *	If the value of a macro to expand is a null pointer, the
+ *	macro expands to an empty string.
+ *
+ *	If  expands to more than  characters, only
+ *	the first  characters of the expansion are stored
+ *	in . After the function returns,  is
+ *	guaranteed to be NUL-terminated.
+ *
+ *	Return 0 if successful, non-zero if one of the macros
+ *	could not be expanded (value was a null pointer). In
+ *	that case, the actual number returned is the number of
+ *	the first macro that could not be expanded, starting
+ *	from 1.
+ */
+template 
+int macro_expand (char *buf, size_t size, const char *fmt,
+  const_iterator macdef_begin, const_iterator macdef_end)
+{
+  int rc = 0;
+  int macro_no = 0;
+
+  *buf = '\0';
+  size_t fmt_len = strlen (fmt);
+  while (*fmt != '\0')
+  {
+    const char *macro_name     = 0;
+    const char *macro_value    = 0;
+    size_t      macro_name_len = 0;
+    bool        match          = false;
+    for (const_iterator i = macdef_begin; i != macdef_end; ++i)
+    {
+      macro_name     = i->name;
+      macro_value    = i->value;
+      macro_name_len = strlen (macro_name);
+      if (macro_name_len <= fmt_len
+	  && memcmp (fmt, macro_name, macro_name_len) == 0)
+      {
+	match = true;
+	break;
+      }
+    }
+    if (match)
+    {
+      macro_no++;
+      if (macro_value == 0)
+      {
+	if (rc == 0)
+	  rc = macro_no;
+      }
+      else
+        al_saps (buf, macro_value, size);
+      fmt     += macro_name_len;
+      fmt_len -= macro_name_len;
+    }
+    else
+    {
+      al_sapc (buf, *fmt, size);
+      fmt++;
+      fmt_len--;
+    }
+  }
+  return rc;
+}
+
+
+#ifdef TEST
+/*
+  make CXXFLAGS='-DTEST -DY_UNIX -DY_X11'
+    LDFLAGS=../obj/0/atclib/al_saps.o\ ../obj/0/atclib/al_sapc.o
+    macro
+*/
+
+#include 
+#include 
+
+
+struct macdef
+{
+  const char *name;
+  const char *value;
+  macdef (const char *name, const char *value) :
+    name (name), value (value) { }
+};
+
+
+void dump (const macdef& m)
+{
+  fprintf (stderr, "%s=%s\n", m.name, m.value);
+}
+
+
+int main ()
+{
+  char buf[100];
+  std::list macdefs;
+  macdefs.push_back (macdef ("%b", "1"));
+  macdefs.push_back (macdef ("%bc", "2"));
+  std::for_each (macdefs.begin (), macdefs.end (), dump);
+  macro_expand (buf, sizeof buf - 1, "a%bcd", macdefs.begin (), macdefs.end ());
+  puts (buf);
+  return 0;
+}
+
+
+#endif
diff -uaNr yadex-1.5.2/src/macro.h yadex-1.6.0/src/macro.h
--- yadex-1.5.2/src/macro.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/macro.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,7 +28,15 @@
 */
 
 
+typedef struct
+{
+  const char *name;
+  const char *value;
+} macdef_t;
+
+
 int macro_expand (char *buf, size_t size, const char *fmt, ...);
+int macro_expand (char *buf, size_t size, const char *fmt, const macdef_t *def);
 int vmacro_expand (char *buf, size_t size, const char *fmt, va_list list);
 
 
diff -uaNr yadex-1.5.2/src/memory.cc yadex-1.6.0/src/memory.cc
--- yadex-1.5.2/src/memory.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/memory.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/menu.cc yadex-1.6.0/src/menu.cc
--- yadex-1.5.2/src/menu.cc	2000-12-13 00:24:35.000000000 +0100
+++ yadex-1.6.0/src/menu.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -40,381 +40,713 @@
 #include "events.h"
 #include "gfx.h"
 #include "menu.h"
+#include "menudata.h"
 
 
-/* First subscript : 0 = normal, 1 = grayed out
+extern const char *MI_SEPARATION = "";
+
+const unsigned char MIF_MACTIVE = 0x03;
+const unsigned char MIF_MTICK = 0x0c;
+const unsigned char MIF_SEPAR = 0x10;
+
+const short VSPACE = 2;				// Pixels between items
+
+
+/* 
+ *	Menu_item - a menu item class
+ */
+class Menu_item
+{
+  public :
+    Menu_item ()
+    {
+      flags          = MIF_NTICK | MIF_NACTIVE;
+      tilde_key      = YK_;
+      shortcut_key   = YK_;
+      str            = 0;
+    }
+
+    unsigned char flags;	// Logical-or of MIF_?ACTIVE MIF_?TICK MIF_SEPAR
+    inpev_t       tilde_key;
+    inpev_t       shortcut_key;
+    short         y;		// Top of item, relative to ly0. If there is a
+				// separation, it is above y.
+    const char    *str;
+    union
+    {
+      bool s;			// Static
+      bool *v;			// Pointer to variable
+      struct
+      {
+	micb_t f;		// Pointer to callback function
+	micbarg_t a;		// Argument
+      } f;
+    }
+    tick;
+    union
+    {
+      bool s;			// Static
+      bool *v;			// Pointer to variable
+      struct
+      {
+	micb_t f;		// Pointer to callback function
+	micbarg_t a;		// Argument
+      } f;
+    }
+    active;
+};
+
+
+/*
+ *	Menu_priv - Menu's private data
+ */
+class Menu_priv
+{
+  public :
+
+    Menu_priv ()
+    {
+      flags         = 0;
+      title         = 0;
+      title_len     = 0;
+      items_ks_len  = 0;
+      items_len     = 0;
+      items.clear ();
+      user_ox0      = -1;
+      user_oy0      = -1;
+      ox0           = -1;
+      oy0           = -1;
+      need_geom     = true;
+      visible       = false;
+      visible_disp  = false;
+      line          = 0;
+      line_disp     = UINT_MAX;
+      item_height   = FONTH + VSPACE;
+    }
+
+    void vinit (Menu& m, const char *title, va_list argp);
+    void cook ();
+    void draw ();
+    void draw_one_line (size_t line, bool highlighted);
+    void geom ();
+    int process_event (const input_status_t *is);
+
+    // Menu data
+    unsigned char flags;	// MF_MENUDATA
+				//          The strings come from a Menu_data.
+				// MF_POPUP Used as popup (not pull-down) menu
+				//          If set, the title is shown and
+				//          button releases are treated
+				//          differently.
+				// MF_TICK  At least one item can be ticked
+				//          (has the MIF_[SVF]TICK flag).
+				// MF_SHORTCUT  At least one item has a key
+				//          shortcut key.
+				// MF_NUMS  Force the use of standard
+				//          shortcuts [0-9a-zA-Z] even if
+				//          index/key shortcuts exist.
+    const char *title;		// NULL if no title
+    size_t     title_len;	// Length of  (or 0 if none)
+    size_t     items_ks_len;	// Length of the longest item counting key sc.
+    size_t     items_len;	// Length of the longest item not counting k.s.
+    const Menu_data *menudata;
+    std::vector<Menu_item> items;
+
+    // Geometry as the user would like it to be
+    int    user_ox0;		// Top left corner. < 0 means centered.
+    int    user_oy0;		// Top left corner. < 0 means centered.
+
+    // Geometry as it should be
+    int    ix0, iy0, ix1, iy1;	// Corners of inner edge of window
+    int    ox0, oy0, ox1, oy1;	// Corners of outer edge of window
+    int    width;		// Overall width of window
+    int    height;		// Overall height of window
+    int    ty0;			// Y-pos of title
+    int    ly0;			// Y-pos of first item
+
+    // Geometry as it is displayed
+    int    ox0_disp;
+    int    oy0_disp;
+    int    width_disp;
+    int    height_disp;
+
+    // Status
+    bool   need_geom;		// Need to call geom() again
+    bool   visible;		// Should the menu be visible ?
+    bool   visible_disp;	// Is it really visible ?
+    size_t line;		// Which line should be highlighted ?
+    size_t line_disp;		// Which line is actually highlighted ?
+    inpev_t _last_shortcut_key;	// Shortcut key for last selected item.
+
+    // Misc
+    unsigned short item_height;
+};
+
+
+/* First subscript :  0 = normal, 1 = greyed out
    Second subscript : 0 = normal, 1 = highlighted */
 const colour_pair_t menu_colour[2][2] =
+{
   {
-  { { WINBG,    WINFG        },    // Normal entry
-    { WINBG_HL, WINFG_HL     } },  // Normal entry, highlighted
-  { { WINBG,    WINFG_DIM    },    // Grayed out entry
-    { WINBG_HL, WINFG_DIM_HL } }   // Grayed out entry, highlighted
-  };
-
-
-/*
- *	init
- *	Parse the parameters and initialize the menu.
- *	This is the "canonical" ctor for menu_c but it's
- *	impractical to use so it's private. You want to
- *	use one of the 3 other named ctors below instead.
- */
-void menu_c::init (
-   const char *title,			// Title of window (or NULL)
-   int numitems,			// < 0 if in list mode
-   int *ticked,				// Always NULL in list mode
-   void *data,				// List or array of strings
-   const char *(*getstr) (void *),	// Only in list mode
-   const i8 *shortcut_index,		// Always NULL in list mode
-   const int *shortcut_key,		// Always NULL in list mode
-   int *grayed_out,			// Always NULL in list mode
-   int delete_after_use)		// like the class member
-{
-memset (this, 0, sizeof *this);
-
-if (numitems < 0)
-   {
-   use_list = 1;
-   list = (al_llist_t *) data;
-   this->numitems = al_lcount (list);
-   if (getstr == NULL)	/* Sanity */
-      fatal_error ("NULL getstr");
-   }
-else
-   {
-   use_list = 0;
-   menustr = (char **) data;
-   this->numitems = numitems;
-   }
-
-title_len = title ? strlen (title) : 0;
-
-// Compute items_len, items_ks_len and prepare the cooked index shortcuts
-items_len = 0;
-items_ks_len = 0;
-if (use_list)
-   {
-   int line;
-   for (al_lrewind (list), line = 0;
-        ! al_leol (list);
-        al_lstep (list), line++)
-      {
-      const char *str = (*getstr) (al_lptr (list));
-      size_t len = strlen (str);
-      len += 4;  /* List menus always have "(1)" ... "(Z)" shortcuts */
-      if (len > items_len)
-         {
-	 items_len = len;
-	 items_ks_len = len;
-         }
-      cooked_index_shortcuts[line] = -1;
-      if (shortcut_index != NULL
-          && shortcut_index[line] >= 0
-          && shortcut_index[line] < (int) strlen (str))
-         cooked_index_shortcuts[line] =
-            tolower (str[shortcut_index[line]]);
-      }
-   this->numitems = line;
-   }
-else
-   {
-   this->numitems = numitems;
-   for (int line = 0; line < numitems; line++)
-      {
-      size_t len = (ticked != NULL ? 2 : 0)
-                 + (shortcut_index == NULL ? 4 : 0)
-                 + strlen (menustr[line]);
-      size_t len_ks = len
-                 + ((shortcut_key != NULL && shortcut_key[line] != -1)
-                   ? strlen (key_to_string (shortcut_key[line])) + 2 : 0);
-      if (len > items_len)
-         items_len = len;
-      if (len_ks > items_ks_len)
-         items_ks_len = len_ks;
-      cooked_index_shortcuts[line] = -1;
-      if (shortcut_index != NULL
-          && shortcut_index[line] >= 0
-          && shortcut_index[line] < (int) strlen (menustr[line]))
-         cooked_index_shortcuts[line]
-            = tolower (menustr[line][shortcut_index[line]]);
-      }
-   }
-
-this->ticked           = ticked;
-this->getstr           = getstr;
-this->shortcut_index   = shortcut_index;
-this->shortcut_key     = shortcut_key;
-this->grayed_out       = grayed_out;
-this->delete_after_use = delete_after_use;
-set_title (title);
-
-popup         = 0;
-force_numbers = 0;
-visible       = 0;
-visible_disp  = 0;
-line_disp     = -1;
-line          = 0;
-user_ox0      = -1;
-user_oy0      = -1;
-ox0           = -1;
-oy0           = -1;
-need_geom     = 1;
-}
-
-
-/*
- *	set_title
- *	Set the title of the menu (it's ignored unless the
- *	menu is set in popup mode).
- *	Bug: changing the title does not take effect until
- *	the next display from scratch.
- */
-void menu_c::set_title (const char *title)
-{
-this->title = title;
-size_t title_len = title ? strlen (title) : 0;
-
-// If the length of the title has changed,
-// force geom() to be called again.
-if (title_len != this->title_len)
-   need_geom = 1;
-
-this->title_len = title_len;
-}
+    { WINBG,    WINFG        },    // Normal entry
+    { WINBG_HL, WINFG_HL     }     // Normal entry, highlighted
+  },
+  {
+    { WINBG,    WINFG_DIM    },    // Greyed out entry
+    { WINBG_HL, WINFG_DIM_HL }     // Greyed out entry, highlighted
+  }
+};
+
+const unsigned char MF_POPUP    = 0x01;
+const unsigned char MF_TICK     = 0x02;
+const unsigned char MF_TILDE    = 0x04;
+const unsigned char MF_SHORTCUT = 0x08;
+const unsigned char MF_NUMS     = 0x10;
+const unsigned char MF_MENUDATA = 0x20;
 
 
 /*
- *	Ctor from arguments in variable number.
+ *	Menu::Menu - ctor from arguments in variable number
  *
- *	Another ctor for menu_c, suited to the creation of pull
+ *	Another ctor for Menu, suited to the creation of pull
  *	down menus.
  *
- *	Expects the title of the menu followed by repeats of :
- *	  const char   *menustr
- *	  int          shortcut_index
- *	  int          shortcut_key
- *	  menu_flags_t flags
- *	  [int         ticked]  <-- Only if (flags & MEN_TICK)
- *	Pass a NULL pointer after the last repeat.
- */
-menu_c::menu_c (const char *title, ...)
-{
-va_list	args;
-int	num;
-int	*ticked         = new int [36];
-char	**menustr       = new char* [36];
-i8	*shortcut_index = new i8  [36];
-int	*shortcut_key   = new int [36];
-int	*grayed_out     = new int [36];
-int	has_tick = 0;
-
-/* put the va_args in the menustr table and the two strings */
-num = 0;
-va_start (args, title);
-while ((num < 36) && ((menustr[num] = va_arg (args, char *)) != NULL))
-   {
-   menu_flags_t flags;
-   shortcut_index[num] = va_arg (args, int);
-   shortcut_key  [num] = va_arg (args, int);
-   flags = (menu_flags_t) va_arg (args, int);
-   if (flags & MEN_TICK)
-      {
-      has_tick = 1;
-      ticked[num] = va_arg (args, int);
-      }
-   else
-      ticked[num] = 0;
-   grayed_out[num] = !! (flags & MEN_GRAY);
-   num++;
-   }
-va_end (args);
-
-/* display the menu */
-init (
-   title,
-   num,
-   has_tick ? ticked : 0,	// 0 = NULL
-   menustr,
-   0,				// getstr() function pointer
-   shortcut_index,
-   shortcut_key,
-   grayed_out,
-   1);				// delete_after_use
+ *	Expects the title of the menu followed by repeats of
+ *	either of the following sets of arguments, in any order :
+ *
+ *	1) Menu item
+ *
+ *	  A menu item is made of 3 or more arguments :
+ *
+ *	    const char *
+ *			A NUL-terminated string that will be
+ *			used to display the item. The first
+ *			occurrence of a tilde ("~") in the
+ *			string indicates that the following
+ *			character will be used as a local
+ *			shortcut for this item.
+ *
+ *			That string must remain valid and should
+ *			not change during the lifetime of the
+ *			Menu object.
+ *
+ *	    inpev_t	The global shortcut key associated to
+ *			this item. That key will be displayed on
+ *			the right of the menu.
+ *
+ *	    <option> ...
+ *			Zero or more options.
+ *
+ *	    (unsigned char) 0
+ *			The end of the item.
+ *
+ *	  Where <option> is any of the following pairs of
+ *	  arguments :
+ *
+ *	    (unsigned char) MIF_STICK
+ *	    bool ticked
+ *			Indicates that this item can be ticked.
+ *			If <ticked> is true, the item will be
+ *			initially ticked. To change the state of
+ *			the item, call set_ticked().
+ *
+ *	    (unsigned char) MIF_VTICK
+ *	    bool *ticked
+ *			Indicates that this item can be ticked.
+ *			The argument is a pointer to a boolean
+ *			variable. Whenever this item is
+ *			displayed, the variable is read and the
+ *			item is shown as ticked or unticked
+ *			depending on whether the function
+ *			returned true or false.
+ *
+ *	    (unsigned char) MIF_FTICK
+ *	    boolcb_t ticked
+ *	    void *arg
+ *			Indicates that this item can be ticked.
+ *			The argument is a pointer to a function
+ *			taking only one argument (<arg>) and
+ *			returning bool.  Whenever this item is
+ *			displayed, the function is called and
+ *			the item is shown as ticked or unticked
+ *			depending on whether the function
+ *			returned true or false.
+ *
+ *	    (unsigned char) MIF_SACTIVE
+ *	    bool active
+ *			Indicates that this item can be greyed
+ *			out. If <active> is false the item
+ *			will be initially greyed out. To change
+ *			the state of the item, call
+ *			set_active().
+ *
+ *	    (unsigned char) MIF_VACTIVE
+ *	    bool *active
+ *			Indicates that this item can be greyed
+ *			out. The argument is a pointer to a
+ *			boolean variable. Whenever this item is
+ *			displayed, the variable is read and the
+ *			item is shown as greyed out or not
+ *			depending on whether the function
+ *			returned false or true.
+ *
+ *	    (unsigned char) MIF_FACTIVE
+ *	    boolcb_t active
+ *			Indicates that this item can be greyed
+ *			out. The argument is a pointer to a
+ *			function taking only one argument
+ *			(<arg>) and returning bool. Whenever
+ *			this item is displayed, the function is
+ *			called and the item is shown as greyed
+ *			out or not depending on whether the
+ *			function returned false or true.
+ *
+ *	2) Separation
+ *
+ *	  A separation is made of exactly 1 argument :
+ *
+ *	    (const char *) MI_SEPARATION
+ *
+ *	Pass a NULL pointer after the last group of arguments.
+ *
+ *	For a given item, the options MIF_STICK, MIF_VTICK and
+ *	MIF_FTICK are mutually exclusive. For a given item, the
+ *	options MIF_SACTIVE, MIF_VACTIVE and MIF_FACTIVE are
+ *	mutually exclusive.
+ *
+ *	A MI_SEPARATION argument at the end of the list (i.e.
+ *	not followed by an item) is ignored.
+ *
+ *	The ticked and greyed out states can change at any time
+ *	but will not be reflected until the menu is redrawn from
+ *	scratch.
+ */
+Menu::Menu (const char *title, ...)
+{
+  priv = new Menu_priv;
+  va_list argp;
+  va_start (argp, title);
+  priv->vinit (*this, title, argp);
+  va_end (argp);
+  priv->cook ();
 }
 
 
 /*
- *	Ctor from arrays
+ *	Menu::Menu - ctor from an argument list
  *
- *	Another ctor for menu_c, suited to the creation of the
- *	menu from an array.
+ *	This is the same thing as Menu::Menu (const char
+ *	*title, ...) except that it expects a pointer on the
+ *	list of arguments.
  */
-menu_c::menu_c (
-   const char   *title,
-   int          numitems,
-   int		*ticked,
-   char         **menustr,
-   const i8     *shortcut_index,
-   const int    *shortcut_key,
-   int		*grayed_out)
-{
-init (
-   title,		// title
-   numitems,		// numitems
-   ticked,		// ticked
-   menustr,		// data
-   NULL,		// getstr
-   shortcut_index,	// shortcut_index
-   shortcut_key,	// shortcut_key
-   grayed_out,		// grayed_out
-   0);			// don't delete after use
+Menu::Menu (const char *title, va_list argp)
+{
+  priv = new Menu_priv;
+  priv->vinit (*this, title, argp);
+  priv->cook ();
 }
 
 
 /*
- *	Ctor from a list
+ *	Menu::Menu - ctor from a list
  *
- *	Another ctor for menu_c, suited to the creation of the
+ *	Another ctor for Menu, suited to the creation of the
  *	menu from a list.
  */
-menu_c::menu_c (
+Menu::Menu (
    const char   *title,
    al_llist_t   *list,
    const char   *(*getstr) (void *))
 {
-init (
-   title,	// title
-   -1,		// numitems
-   0,		// ticked
-   list,	// data
-   getstr,	// getstr
-   0,		// shortcut_index
-   0,		// shortcut_key
-   0,		// grayed_out
-   0);		// don't delete after use
+  priv = new Menu_priv;
+  set_title (title);
+  size_t nitems = y_min (al_lcount (list), 100);
+  priv->items.resize (nitems);
+  size_t line;
+  for (al_lrewind (list), line = 0;
+       ! al_leol (list) && line < nitems;
+       al_lstep (list), line++)
+    priv->items[line].str = getstr (al_lptr (list));
+  priv->cook ();
+}
+
+
+/*
+ *	Menu::Menu - ctor from a Menu_data
+ */
+Menu::Menu (const char *title, const Menu_data& menudata)
+{
+  priv = new Menu_priv;
+  priv->menudata = &menudata;
+  priv->flags |= MF_MENUDATA;
+  set_title (title);
+  size_t nitems = menudata.nitems ();
+  priv->items.resize (nitems);
+  priv->cook ();
+}
+
+
+/*
+ *	Menu::~Menu - dtor
+ */
+Menu::~Menu ()
+{
+  delete priv;
+}
+
+
+/*
+ *	Menu_priv::vinit - initialize the menu from an argument list
+ */
+void Menu_priv::vinit (Menu& m, const char *title, va_list argp)
+{
+  bool tick = false;
+
+  m.set_title (title);
+
+  while (items.size () < 100)
+  {
+    Menu_item i;
+
+    const char *str = va_arg (argp, const char *);
+    while (str == MI_SEPARATION)
+    {
+      i.flags |= MIF_SEPAR;
+      str = va_arg (argp, const char *);
+    }
+    if (str == 0)
+      break;
+
+    i.str            = str;
+    i.shortcut_key   = (inpev_t) va_arg (argp, int);
+    unsigned char flag;
+    while ((flag = (unsigned char) va_arg (argp, int)) != 0)
+    {
+      if (flag == MIF_SACTIVE)
+      {
+	i.flags  = (i.flags & ~MIF_MACTIVE) | MIF_SACTIVE;
+	i.active.s = (bool) va_arg (argp, int);
+      }
+      else if (flag == MIF_VACTIVE)
+      {
+	i.flags  = (i.flags & ~MIF_MACTIVE) | MIF_VACTIVE;
+	i.active.v = va_arg (argp, bool *);
+      }
+      else if (flag == MIF_FACTIVE)
+      {
+	i.flags  = (i.flags & ~MIF_MACTIVE) | MIF_FACTIVE;
+	i.active.f.f = va_arg (argp, micb_t);
+	i.active.f.a = va_arg (argp, micbarg_t);
+      }
+      else if (flag == MIF_STICK)
+      {
+	tick = true;
+	i.flags  = (i.flags & ~MIF_MTICK) | MIF_STICK;
+	i.tick.s = (bool) va_arg (argp, int);
+      }
+      else if (flag == MIF_VTICK)
+      {
+	tick = true;
+	i.flags  = (i.flags & ~MIF_MTICK) | MIF_VTICK;
+	i.tick.v = va_arg (argp, bool *);
+      }
+      else if (flag == MIF_FTICK)
+      {
+	tick = true;
+	i.flags  = (i.flags & ~MIF_MTICK) | MIF_FTICK;
+	i.tick.f.f = va_arg (argp, micb_t);
+	i.tick.f.a = va_arg (argp, micbarg_t);
+      }
+      else if (flag != 0)
+      {
+	nf_bug ("Menu::ctor: flag %d", (int) flag);
+      }
+    }
+    items.push_back (i);
+  }
+
+  if (tick)
+    flags |= MF_TICK;
 }
 
 
 /*
- *	~menu_c
+ *	Menu_priv::cook - parse the menu item strings
+ *
+ *	Compute items_len, items_ks_len and prepare the cooked
+ *	tilde shortcuts.
  */
-menu_c::~menu_c ()
+void Menu_priv::cook ()
 {
-if (delete_after_use)
-   {
-   if (menustr)
-      delete[] menustr;
-   if (menustr)
-      delete[] ticked;
-   if (menustr)
-      delete[] shortcut_index;
-   if (menustr)
-      delete[] shortcut_key;
-   if (menustr)
-      delete[] grayed_out;
-   }
+  items_len    = 0;
+  items_ks_len = 0;
+  short y      = 0;
+
+  for (size_t line = 0; line < items.size (); line++)
+  {
+    Menu_item& i = items[line];
+    if (i.shortcut_key != YK_)
+      flags |= MF_SHORTCUT;
+    if ((i.flags & MIF_MTICK) != MIF_NTICK)
+      flags |= MF_TICK;
+    if (i.flags & MIF_SEPAR)
+      y += 2 * (NARROW_VSPACING + NARROW_BORDER);
+    i.y = y;
+    y += item_height;
+    size_t len = 0;
+    i.tilde_key = YK_;
+    const char *str = (flags & MF_MENUDATA) ? (*menudata)[line] : i.str;
+    for (const char *p = str; *p != '\0'; p++)
+      if (p[0] == '~' && p[1] != '\0' && i.tilde_key == YK_)
+      {
+	i.tilde_key = tolower (p[1]);
+	flags |= MF_TILDE;
+      }
+      else
+	len++;
+    size_t len_ks = len;
+    if (i.shortcut_key != YK_)
+      len_ks += strlen (key_to_string (i.shortcut_key)) + 2;
+    if (len > items_len)
+      items_len = len;
+    if (len_ks > items_ks_len)
+      items_ks_len = len_ks;
+  }
+
+  if (flags & MF_TICK)
+  {
+    items_len    += 2;		// Tick mark
+    items_ks_len += 2;
+  }
+  if (flags & MF_SHORTCUT)
+  {
+    items_len    += 4;		// Space between strings and shortcut
+    items_ks_len += 4;
+  }
+  if (! (flags & MF_TILDE) && ! (flags & MF_SHORTCUT))
+    flags |= MF_NUMS;
+  if (flags & MF_NUMS)
+  {
+    items_len    += 4;		// [1-9a-zA-Z] prefix
+    items_ks_len += 4;
+  }
 }
 
 
 /*
- *	set_coords
- *	Position or reposition the menu window.
+ *	Menu::set_title - set the title
+ *
+ *	Set the title of the menu (it's ignored unless the menu
+ *	is set in popup mode).
+ *
+ *	Bug: changing the title does not take effect until the
+ *	next display from scratch.
+ */
+void Menu::set_title (const char *title)
+{
+  priv->title = title;
+  size_t title_len = title ? strlen (title) : 0;
+
+  /* If the length of the title has changed,
+     force geom() to be called again. */
+  if (title_len != priv->title_len)
+    priv->need_geom = true;
+
+  priv->title_len = title_len;
+}
+
+
+/*
+ *	Menu::set_coords - position or reposition the menu window.
+ *
  *	(<x0>,<y0>) is the top left corner.
  *	If <x0> is < 0, the window is horizontally centred.
  *	If <y0> is < 0, the window is vertically centred.
  */
-void menu_c::set_coords (int x0, int y0)
+void Menu::set_coords (int x0, int y0)
+{
+  if (x0 != priv->ox0 || y0 != priv->oy0)
+    priv->need_geom = true;  // Force geom() to be called
+
+  priv->user_ox0 = x0;
+  priv->user_oy0 = y0;
+}
+
+
+/*
+ *	Menu::set_item_no - set the current line
+ *
+ *	The current line number is set to <item_no>. The first
+ *	line bears number 0.
+ */
+void Menu::set_item_no (int item_no)
 {
-if (x0 != ox0 || y0 != oy0)
-   need_geom = 1;  // Force geom() to be called
+  priv->line = item_no;
+}
 
-user_ox0 = x0;
-user_oy0 = y0;
+
+/*
+ *	Menu::set_popup - set the popup flag
+ *
+ *	If <popup> is true, the popup flag is set. If <popup> is
+ *	false, the popup flag is cleared.
+ */
+void Menu::set_popup (bool popup)
+{
+  if (popup != !! (priv->flags & MF_POPUP))
+    priv->need_geom = true;  // Force geom() to be called
+  if (popup)
+    priv->flags |= MF_POPUP;
+  else
+    priv->flags &= ~MF_POPUP;
+}
+
+
+/*
+ *	Menu::set_force_numbers - set the force_numbers flags
+ *
+ *	If <force_numbers> is true, the force_numbers flag is
+ *	set. If <force_numbers> is false, the force_numbers flag
+ *	is cleared.
+ *
+ *	The effect of the <force_numbers> flag is to disable key
+ *	shortcuts and tilde shortcuts and to add automatic
+ *	numbering of items ([1-9a-zA-Z]).
+ *
+ *	If none of the items has a tilde or key shortcut,
+ *	<force_numbers> is automatically set. Otherwise, is it
+ *	off by default.
+ */
+void Menu::set_force_numbers (bool force_numbers)
+{
+  if (force_numbers != !! (priv->flags & MF_NUMS))
+    priv->need_geom = true;  // Force geom() to be called.
+  if (force_numbers)
+    priv->flags |= MF_NUMS;
+  else
+    priv->flags &= ~MF_NUMS;
 }
 
 
 /*
- *	set_ticked
- *	Tick or untick menu item <item_no>.
- *	If the menu has no "ticked/unticked" property,
- *	does nothing.
+ *	Menu::set_visible - set the visible flag
+ *
+ *	If <visible> is true, the visible flag is set. If
+ *	<visible> is false, the visible flag is cleared.
  */
-void menu_c::set_ticked (int item_no, int ticked)
+void Menu::set_visible (bool visible)
 {
-if (item_no < 0 || item_no >= numitems)
-   fatal_error ("item_no out of range");
-if (this->ticked)
-   this->ticked[item_no] = ticked;
+  priv->visible = visible;
 }
 
 
 /*
- *	set_grayed_out
- *	Gray-out or ungray-out menu item <item_no>.
- *	If the menu has no "grayed-out" property,
- *	does nothing.
+ *	Menu::set_ticked - tick or untick a menu item
+ *
+ *	If <ticked> is true, item number <item_no> is ticked. If
+ *	<ticked> is false, item number <item_no> is unticked.
+ *	If the menu item was not created with the MIF_STICK
+ *	option, emit a warning and return without doing
+ *	anything.
  */
-void menu_c::set_grayed_out (int item_no, int grayed_out)
+void Menu::set_ticked (size_t item_no, bool ticked)
 {
-if (item_no < 0 || item_no >= numitems)
-   fatal_error ("item_no out of range");
-if (this->grayed_out)
-   this->grayed_out[item_no] = grayed_out;
+  if (item_no >= priv->items.size ())
+  {
+    nf_bug ("Menu::set_ticked: item_no %lu", (unsigned long) item_no);
+    return;
+  }
+  Menu_item& i = priv->items[item_no];
+  if ((i.flags & MIF_MTICK) != MIF_STICK)
+  {
+    nf_bug ("Menu::set_ticked: flags %02X", i.flags);
+    return;
+  }
+  i.tick.s = ticked;
 }
 
 
 /*
- *	geom
- *	Recalculate the screen coordinates etc.
+ *	Menu::set_active - grey-out or ungrey-out a menu
+ *
+ *	If <active> is false, item number <item_no> becomes
+ *	greyed out. If <active> is true, item number <item_no>
+ *	ceases to be greyed out. If the item was not created
+ *	with with the MIF_SACTIVE option, emit a warning and
+ *	return without doing anything.
  */
-void menu_c::geom ()
+void Menu::set_active (size_t item_no, bool active)
 {
-size_t width_chars = 0;
-if (title && popup)
-   width_chars = y_max (width_chars, title_len);
-if (force_numbers)
-   width_chars = y_max (width_chars, items_len + 4);
-else
-   width_chars = y_max (width_chars, items_ks_len);
-int title_height = title && popup ? (int) (1.5 * FONTH) : 0;
+  if (item_no >= priv->items.size ())
+  {
+    nf_bug ("Menu::set_active: item_no %lu", (unsigned long) item_no);
+    return;
+  }
+  Menu_item& i = priv->items[item_no];
+  if ((i.flags & MIF_MACTIVE) != MIF_SACTIVE)
+  {
+    nf_bug ("Menu::set_active: flags %02Xh", i.flags);
+    return;
+  }
+  i.active.s = active;
+}
 
-width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + width_chars * FONTW;
-height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + numitems * FONTH + title_height;
 
-if (user_ox0 < 0)
-   ox0 = (ScrMaxX - width) / 2;
-else
-   ox0 = user_ox0;
-ix0 = ox0 + BOX_BORDER;
-ix1 = ix0 + 2 * WIDE_HSPACING + width_chars * FONTW - 1;
-ox1 = ix1 + BOX_BORDER;
-if (ox1 > ScrMaxX)
-   {
-   int overlap = ox1 - ScrMaxX;
-   ox0 -= overlap;
-   ix0 -= overlap;
-   ix1 -= overlap;
-   ox1 -= overlap;
-   }
+/*
+ *	Menu_priv::geom - recalculate the screen coordinates etc.
+ */
+void Menu_priv::geom ()
+{
+  size_t width_chars = 0;
+  if (title && (flags & MF_POPUP))
+    width_chars = y_max (width_chars, title_len);
+  if (flags & MF_NUMS)
+    width_chars = y_max (width_chars, items_len + 4);
+  else
+    width_chars = y_max (width_chars, items_ks_len);
+  int title_height = title && (flags & MF_POPUP) ? (int) (1.5 * FONTH) : 0;
+
+  width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + width_chars * FONTW;
+  height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + title_height
+					      + items.back().y
+					      + item_height;
+
+  if (user_ox0 < 0)
+    ox0 = (ScrMaxX - width) / 2;
+  else
+    ox0 = user_ox0;
+  ix0 = ox0 + BOX_BORDER;
+  ix1 = ix0 + 2 * WIDE_HSPACING + width_chars * FONTW - 1;
+  ox1 = ix1 + BOX_BORDER;
+  if (ox1 > ScrMaxX)
+  {
+    int overlap = ox1 - ScrMaxX;
+    ox0 -= overlap;
+    ix0 -= overlap;
+    ix1 -= overlap;
+    ox1 -= overlap;
+  }
+
+  if (user_oy0 < 0)
+    oy0 = (ScrMaxY - height) / 2;
+  else
+    oy0 = user_oy0;
+  iy0 = oy0 + BOX_BORDER;
+  ty0 = iy0 + FONTH / 2;				// Title of menu
+  ly0 = ty0 + title_height;				// First item of menu
 
-if (user_oy0 < 0)
-   oy0 = (ScrMaxY - height) / 2;
-else
-   oy0 = user_oy0;
-iy0 = oy0 + BOX_BORDER;
-ty0 = iy0 + FONTH / 2;				// Title of menu
-ly0 = ty0 + title_height;			// First item of menu
-iy1 = ly0 + numitems * FONTH + FONTH / 2 - 1;
-oy1 = iy1 + BOX_BORDER;
+  oy1 = oy0 + height - 1;
+  iy1 = oy1 - BOX_BORDER;
 
-need_geom = 0;
+  need_geom = false;
 }
 
 
 /*
- *	process_event
+ *	Menu::process_event - process an input event
+ *
  *	Process event in *<is>.
+ *
  *	Return one of the following :
  *	- MEN_CANCEL: user pressed [Esc] or clicked outside
  *	  the menu. The caller should delete the menu.
@@ -423,342 +755,517 @@
  *	- MEN_OTHER: we understood the event and processed it.
  *	- the number of the item that was validated.
  */
-int menu_c::process_event (const input_status_t *is)
+int Menu::process_event (const input_status_t *is)
+{
+  return priv->process_event (is);
+}
+
+
+int Menu_priv::process_event (const input_status_t *is)
 {
-const char *item_str;
-int mouse_line;
-char status;
-
-/* What's the text of the current option ? */
-if (use_list)
-   {
-   al_lseek (list, line, SEEK_SET);
-   item_str = (*getstr) (al_lptr (list));
-   }
-else
-   item_str = menustr[line];
-
-if (is->x < ix0 || is->x > ix1 || is->y < ly0)
-   mouse_line = -1;
-else
-   {
-   mouse_line = (is->y - ly0) / FONTH;
-   if (mouse_line >= numitems)
-      mouse_line = -1;
-   }
-
-status = 'i';
-
-// Clicking left button on an item: validate it.
-if (is->key == YE_BUTL_PRESS && mouse_line >= 0)
-   {
-   line = mouse_line;  // Useless ?
-   status = 'v';
-   }
-
-// Moving over the box sets current line.
-else if (is->key == YE_MOTION && mouse_line >= 0)
-   {
-   line = mouse_line;
-   status = 'o';
-   }
-
-// Releasing the button while standing on an item:
-// has different effects depending on whether we're
-// in pull-down or pop-up mode.
-//
-// In pull-down mode, the button was normally last
-// pressed on the menu bar or on an item of this menu.
-// So the current item is selected upon button release.
-//
-// In pop-up mode, if the button was pressed, it was
-// most likely to exit a submenu (cf. the "thing type"
-// menu) so we ignore the event.
-else if (is->key == YE_BUTL_RELEASE && mouse_line >= 0 && ! popup)
-   status = 'v';
-
-// [Enter], [Return]: accept selection
-else if (is->key == YK_RETURN)
-   status = 'v';
-
-// [Esc]: cancel
-else if (is->key == YK_ESC)
-   status = 'c';
-
-// [Up]: select previous line
-else if (is->key == YK_UP)
-   {
-   if (line > 0)
-     line--;
-   else
-     line = numitems - 1;
-   status = 'o';
-   }
-
-// [Down]: select next line
-else if (is->key == YK_DOWN)
-   {
-   if (line < numitems - 1)
-     line++;
-   else
-     line = 0;
-   status = 'o';
-   }
-
-// [Home]: select first line
-else if (is->key == YK_HOME)
-   {
-   line = 0;
-   status = 'o';
-   }
-
-// [End]: select last line
-else if (is->key == YK_END)
-   {
-   line = numitems - 1;
-   status = 'o';
-   }
-
-// [Pgup]: select line - 5
-else if (is->key == YK_PU)
-   {
-   if (line >= 5)
+  size_t mouse_line;
+  char status;
+
+  if ((int) is->x < ix0 || (int) is->x > ix1 || (int) is->y < ly0)
+    mouse_line = items.size ();
+  else
+  {
+    for (mouse_line = 0; mouse_line < items.size (); mouse_line++)
+      if ((int) is->y >= ly0 + items[mouse_line].y
+	&& (int) is->y < ly0 + items[mouse_line].y + item_height)
+	break;
+  }
+
+  status = 'i';
+
+  // Clicking left button on an item: validate it.
+  if (is->key == YE_BUTL_PRESS && mouse_line < items.size ())
+  {
+    line = mouse_line;  // Useless ?
+    status = 'v';
+  }
+
+  // Moving over the box sets current line.
+  else if (is->key == YE_MOTION && mouse_line < items.size ())
+  {
+    line = mouse_line;
+    status = 'o';
+  }
+
+  /* Releasing the button while standing on an item: has a
+     different effect depending on whether we're in pull-down or
+     pop-up mode.
+
+     In pull-down mode, the button was normally last pressed on
+     the menu bar or on an item of this menu. So the current
+     item is selected upon button release.
+
+     In pop-up mode, if the button was pressed, it was most
+     likely to exit a submenu (cf. the "thing type" menu) so we
+     ignore the event. */
+  else if (is->key == YE_BUTL_RELEASE
+	&& mouse_line < items.size ()
+	&& ! (flags & MF_POPUP))
+    status = 'v';
+
+  // [Enter], [Return]: accept selection
+  else if (is->key == YK_RETURN)
+    status = 'v';
+
+  // [Esc]: cancel
+  else if (is->key == YK_ESC)
+    status = 'c';
+
+  // [Up]: select previous line
+  else if (is->key == YK_UP)
+  {
+    if (line > 0)
+      line--;
+    else
+      line = items.size () - 1;
+    status = 'o';
+  }
+
+  // [Down]: select next line
+  else if (is->key == YK_DOWN)
+  {
+    if (line < items.size () - 1)
+      line++;
+    else
+      line = 0;
+    status = 'o';
+  }
+
+  // [Home]: select first line
+  else if (is->key == YK_HOME)
+  {
+    line = 0;
+    status = 'o';
+  }
+
+  // [End]: select last line
+  else if (is->key == YK_END)
+  {
+    line = items.size () - 1;
+    status = 'o';
+  }
+
+  // [Pgup]: select line - 5
+  else if (is->key == YK_PU)
+  {
+    if (line >= 5)
       line -= 5;
-   else
+    else
       line = 0;
-   status = 'o';
-   }
+    status = 'o';
+  }
 
-// [Pgdn]: select line + 5
-else if (is->key == YK_PD)
-   {
-   if (line < numitems - 5)
+  // [Pgdn]: select line + 5
+  else if (is->key == YK_PD)
+  {
+    if (line + 5 < items.size ())
       line += 5;
-   else
-      line = numitems - 1;
-   status = 'o';
-   }
-
-// [a]-[z], [A]-[Z], [0]-[9]: select corresponding item
-else if ((shortcut_index == NULL || force_numbers)
-	 && is->key >= '1' && is->key <= '9' && is->key - '1' < numitems)
-   {
-   line = is->key - '1';
-   status = 'o';
-   send_event (YK_RETURN);
-   }
-else if ((shortcut_index == NULL || force_numbers)
-	 && is->key >= 'A' && is->key <= 'Z' && is->key - 'A' + 9 < numitems)
-   {
-   line = is->key - 'A' + 9;
-   status = 'o';
-   send_event (YK_RETURN);
-   }
-else if ((shortcut_index == NULL || force_numbers)
-	 && is->key >= 'a' && is->key <= 'z' && is->key - 'a' + 9 < numitems)
-   {
-   line = is->key - 'a' + 9;
-   status = 'o';
-   send_event (YK_RETURN);
-   }
-
-// A shortcut ?
-else
-   {
-   // First, check the list of index shortcuts
-   // (only if is->key is a regular key)
-   if (shortcut_index != NULL
-      && ! force_numbers
-      && is->key == (unsigned char) is->key)
-      {
-      for (int n = 0; n < numitems; n++)
-	 if (cooked_index_shortcuts[n] != -1
-	     && cooked_index_shortcuts[n] == tolower (is->key))
-	    {
-	    line = n;
-	    status = 'o';
-            send_event (YK_RETURN);
-	    break;
-	    }
-      }
-
-   // If no index shortcut matched, check the list of
-   // shortcut keys. It's important to do the index
-   // shortcuts before so that you can override a shortcut
-   // key (normally global) with an index shortcut (normally
-   // local).
-   if (status == 'i' && shortcut_key != NULL && ! force_numbers)
-      {
-      for (int n = 0; n < numitems; n++)
-	 if (is->key == shortcut_key[n])
-	    {
-	    line = n;
-	    status = 'o';
-            send_event (YK_RETURN);
-	    break;
-	    }
-      }
-   }
-
-// See last_shortcut_key()
-if (status == 'v')
-   _last_shortcut_key = shortcut_key ? shortcut_key[line] : 0;
-
-// Return the item# if validated,
-// MEN_CANCEL if cancelled,
-// MEN_OTHER or MEN_INVALID if neither.
-if (status == 'v')
-   return line;
-else if (status == 'c')
-   return MEN_CANCEL;
-else if (status == 'o')
-   return MEN_OTHER;
-else if (status == 'i')
-   return MEN_INVALID;
-else
-   {
-   fatal_error ("m::pe: bad status %02X", status);  // Can't happen
-   return 0;  // To please the compiler
-   }
+    else
+      line = items.size () - 1;
+    status = 'o';
+  }
+
+  // [1]-[9]: select items 0 through 8
+  else if ((flags & MF_NUMS)
+    && is->key < YK_
+    && within (dectoi (is->key), 1, items.size ()))
+  {
+    line = dectoi (is->key) - 1;
+    status = 'o';
+    send_event (YK_RETURN);
+  }
+
+  // [a]-[z]: select items 9 through 34
+  else if ((flags & MF_NUMS)
+    && is->key < YK_
+    && islower (is->key)
+    && within (b36toi (is->key), 10, items.size ()))
+  {
+    line = b36toi (is->key) - 1;
+    status = 'o';
+    send_event (YK_RETURN);
+  }
+
+  // [A]-[Z]: select items 35 through 60
+  else if ((flags & MF_NUMS)
+    && is->key < YK_
+    && isupper (is->key)
+    && within (b36toi (is->key) + 26, 36, items.size ()))
+  {
+    line = b36toi (is->key) + 25;
+    status = 'o';
+    send_event (YK_RETURN);
+  }
+
+  // A shortcut ?
+  else
+  {
+    /* First, check the list of tilde shortcuts
+       (only if is->key is a regular key) */
+    if ((flags & MF_TILDE)
+        && ! (flags & MF_NUMS)
+        && is->key == (unsigned char) is->key)
+    {
+      for (size_t n = 0; n < items.size (); n++)
+	if (items[n].tilde_key != YK_
+	    && items[n].tilde_key == tolower (is->key))
+	{
+	  line = n;
+	  status = 'o';
+	  send_event (YK_RETURN);
+	  break;
+	}
+    }
+    /* If no tilde shortcut matched, check the list of shortcut
+       keys. It's important to do the tilde shortcuts first so
+       that you can override a shortcut key (normally global)
+       with a tilde shortcut (normally local). */
+    if (status == 'i' && (flags & MF_SHORTCUT) && ! (flags & MF_NUMS))
+    {
+      for (size_t n = 0; n < items.size (); n++)
+	if (items[n].shortcut_key != YK_
+	    && items[n].shortcut_key == is->key)
+	{
+	  line = n;
+	  status = 'o';
+	  send_event (YK_RETURN);
+	  break;
+	}
+    }
+  }
+
+  // See last_shortcut_key()
+  if (status == 'v')
+    _last_shortcut_key = (flags & MF_SHORTCUT) ? items[line].shortcut_key : 0;
+
+  /* Return
+     - the item# if validated,
+     - MEN_CANCEL if cancelled,
+     - MEN_OTHER or MEN_INVALID if neither. */
+  if (status == 'v')
+    return (int) line;
+  else if (status == 'c')
+    return MEN_CANCEL;
+  else if (status == 'o')
+    return MEN_OTHER;
+  else if (status == 'i')
+    return MEN_INVALID;
+  else
+  {
+    // Can't happen
+    fatal_error ("Menu::process_event: bad status %02Xh", status);
+    return 0;  // To please the compiler
+  }
 }
 
 
 /*
- *	last_shortcut_key
+ *	Menu::last_shortcut_key - shortcut key for last selected item
+ *
  *	Return the code of the shortcut key for the last
- *	selected item. This function shouldn't exist :
- *	it's just there because it helps editloop.cc. When
- *	real key bindings are implemented in editloop.cc,
+ *	selected item. This function shouldn't exist : it's just
+ *	there because it helps editloop.cc. When real key
+ *	bindings are implemented in editloop.cc,
  *	get_shortcut_key() should disappear.
  */
-int menu_c::last_shortcut_key ()
+inpev_t Menu::last_shortcut_key ()
 {
-return _last_shortcut_key;
+  return priv->_last_shortcut_key;
 }
 
 
 /*
- *	draw
- *	If necessary, redraw everything from scratch.
- *	Else, if <line> has changed, refresh the highlighted line.
+ *	Menu::draw - display the menu
+ *
+ *	If necessary, redraw everything from scratch. Else, if
+ *	<line> has changed, refresh the highlighted line.
  */
-void menu_c::draw ()
+void Menu::draw ()
 {
-int from_scratch = 0;
+  priv->draw ();
+}
+
 
-if (need_geom)
-   geom ();
+void Menu_priv::draw ()
+{
+  bool from_scratch = false;
 
-// Do we need to redraw everything from scratch ?
-if (visible && ! visible_disp
-   || ox0 != ox0_disp
-   || oy0 != oy0_disp
-   || width != width_disp
-   || height != height_disp)
-   from_scratch = 1;
+  if (need_geom)
+    geom ();
 
-// Display the static part of the menu
-if (from_scratch)
-   {
-   int l;  // Line number
+  // Do we need to redraw everything from scratch ?
+  if (visible && ! visible_disp
+    || ox0    != ox0_disp
+    || oy0    != oy0_disp
+    || width  != width_disp
+    || height != height_disp)
+    from_scratch = true;
 
-   HideMousePointer ();
-   DrawScreenBox3D (ox0, oy0, ox1, oy1);
-   set_colour (YELLOW);
-   if (popup && title != NULL)
+  // Display the static part of the menu
+  if (from_scratch)
+  {
+    HideMousePointer ();
+    DrawScreenBox3D (ox0, oy0, ox1, oy1);
+    set_colour (YELLOW);
+    if ((flags & MF_POPUP) && title != 0)
       DrawScreenString (ix0 + WIDE_HSPACING, ty0, title);
-   ShowMousePointer ();
+    ShowMousePointer ();
 
-   for (use_list ?   al_lrewind (list) : 0,            l = 0;
-	use_list ? ! al_leol    (list) : l < numitems;
-	use_list ?   al_lstep   (list) : 0,            l++)
-      {
+    for (size_t l = 0; l < items.size (); l++)
+    {
       set_colour (WINFG);
-      draw_one_line (l, 0);
+      draw_one_line (l, false);
+    }
+    visible_disp = true;
+    ox0_disp     = ox0;
+    oy0_disp     = oy0;
+    width_disp   = width;
+    height_disp  = height;
+  }
+
+  // Display the "highlight" bar
+  if (from_scratch || line != line_disp)
+  {
+    if (line_disp < items.size ())
+      draw_one_line (line_disp, false);
+    if (line < items.size ())
+      draw_one_line (line, true);
+    line_disp = line;
+  }
+}
+
+
+/*
+ *	Menu::draw_one_line - display just one line of a menu
+ *
+ *  	<line> is the number of the option to draw (0 = first
+ *  	option). <highlighted> tells whether the option should
+ *  	be drawn highlighted.
+ */
+void Menu_priv::draw_one_line (size_t line, bool highlighted)
+{
+  const Menu_item& i = items[line];
+  int x      = ix0 + FONTW;
+  int y      = ly0 + i.y;
+  int text_y = y + VSPACE / 2;
+
+  HideMousePointer ();
+
+  // Separation ?
+  if (i.flags & MIF_SEPAR)
+  {
+    push_colour (WINBG_DARK);
+    short groove_y = y - NARROW_VSPACING - 2 * NARROW_BORDER;
+    DrawScreenLine (ix0, groove_y, ix1, groove_y);
+    set_colour (WINBG_LIGHT);
+    DrawScreenLine (ix0, groove_y + 1, ix1, groove_y + 1);
+    pop_colour ();
+  }
+
+  // Greyed out ?
+  bool active = true;
+  switch (i.flags & MIF_MACTIVE)
+  {
+    case MIF_NACTIVE:
+      active = true;
+      break;
+
+    case MIF_SACTIVE:
+      active = i.active.s;
+      break;
+
+    case MIF_VACTIVE:
+      active = *i.active.v;
+      break;
+
+    case MIF_FACTIVE:
+      active = i.active.f.f (i.active.f.a);
+      break;
+
+    default:
+      nf_bug ("Menu::draw_one_line: active %02Xh", i.flags);
+      break;
+  }
+  set_colour (menu_colour[! active][highlighted].bg);
+  DrawScreenBox (ix0, y, ix1, y + item_height - 1);
+  set_colour (menu_colour[! active][highlighted].fg);
+
+  // Tick mark if any
+  if (flags & MF_TICK)
+  {
+    bool have_tick = false;
+    bool ticked    = false;
+    switch (i.flags & MIF_MTICK)
+    {
+      case MIF_NTICK:
+        have_tick = false;
+        break;
+
+      case MIF_STICK:
+	have_tick = true;
+        ticked    = i.tick.s;
+        break;
+
+      case MIF_VTICK:
+        have_tick = true;
+        ticked    = *i.tick.v;
+        break;
+
+      case MIF_FTICK:
+        have_tick = true;
+        ticked    = i.tick.f.f (i.tick.f.a);
+        break;
+
+      default:
+        nf_bug ("Menu::draw_one_line: tick %02Xh", i.flags);
+        break;
+    }
+    if (have_tick)
+    {
+      if (ticked)
+      {
+	unsigned hside = FONTW * 4 / 5;
+	unsigned vside = FONTH * 4 / 5;
+	int x0 = x + (FONTW - hside) / 2;
+	int y0 = y + (FONTH - vside) / 2;
+	DrawScreenLine (x0, y0 + vside / 2, x0 + hside / 2, y0 + vside - 1);
+	DrawScreenLine (x0 + hside / 2, y0 + vside - 1, x0 + hside - 1, y0);
+      }
+      else
+      {
+	unsigned margin = FONTW / 5;
+	DrawScreenLine (x + margin,             y + FONTH / 2,
+			x + FONTW - 1 - margin, y + FONTH / 2);
+      }
+    }
+    x += 2 * FONTW;
+  }
+
+  // Automatic keys if any
+  if (flags & MF_NUMS)
+  {
+    char c = '\0';
+    if (line <= 8)
+      c = '1' + line;
+    else if (line >= 9 && line < 9 + 26)
+      c = 'a' + line - 9;
+    else if (line >= 9 + 26 && line < 9 + 26 + 26)
+      c = 'A' + line - (9 + 26);
+    if (c != '\0')
+    {
+      push_colour (highlighted ? WINLABEL_HL : WINLABEL);
+      DrawScreenString (x, text_y, "[ ]");
+      pop_colour ();
+      DrawScreenChar (x + FONTW, text_y,         c);
+      DrawScreenChar (x + FONTW, text_y + FONTU, '_');
+    }
+    x += 4 * FONTW;
+  }
+
+  // Text
+  int tilde_index = -1;
+  {
+    const char *str = (flags & MF_MENUDATA) ? (*menudata)[line] : i.str;
+    char *buf = new char[strlen (str) + 1]; 
+    char *d   = buf;
+    for (const char *s = str; *s != '\0'; s++)
+    {
+      if (*s == '~' && tilde_index < 0)
+      {
+	tilde_index = s - str;
+	continue;
       }
-   visible_disp = 1;
-   ox0_disp     = ox0;
-   oy0_disp     = oy0;
-   width_disp   = width;
-   height_disp  = height;
-   }
-
-// Display the "highlight" bar
-if (from_scratch || line != line_disp)
-   {
-   if (line_disp >= 0 && line_disp < numitems)
-      {
-      if (use_list)
-	 {
-	 if (al_lseek (list, line_disp, SEEK_SET))
-	    fatal_error ("%s line_disp=%d (%s)",
-	       msg_unexpected, line_disp, al_astrerror (al_aerrno));
-	 }
-      draw_one_line (line_disp, 0);
-      }
-   if (line >= 0 && line < numitems)
-      {
-      if (use_list)
-	 {
-	 if (al_lseek (list, line, SEEK_SET))
-	    fatal_error ("%s line=%d (%s)",
-	       msg_unexpected, line, al_astrerror (al_aerrno));
-	 if (line == 0)
-	    al_lrewind (list);
-	 }
-      draw_one_line (line, 1);
-      }
-   line_disp = line;
-   }
-}
-
-
-/*
- *	draw_one_line
- *	Display just one line of a menu.
- *
- *  	<line> is the number of the option to draw (0 = first option).
- *	<highlighted> tells whether the option should be drawn highlighted.
- *	
- *	If <shortcut_index> is NULL, options are numbered
- *	(the string "(#)" is prepended to each line).
- */
-void menu_c::draw_one_line (int line, int highlighted)
-{
-int y = ly0 + FONTH * line;
-int x = ix0 + FONTW;
-const char *text = use_list ? (*getstr) (al_lptr (list)) : menustr[line];
-i8  shortcut_index = this->shortcut_index ? this->shortcut_index[line] : -1;
-int shortcut_key   = this->shortcut_key   ? this->shortcut_key  [line] : -1;
-int grayed_out     = this->grayed_out     ? this->grayed_out    [line] : 0;
-
-highlighted = !! highlighted;  // Force to [0..1]
-grayed_out  = !! grayed_out;   // Force to [0..1]
-
-HideMousePointer ();
-set_colour (menu_colour[grayed_out][highlighted].bg);
-DrawScreenBox (ix0, y, ix1, y + FONTH - 1);
-set_colour (menu_colour[grayed_out][highlighted].fg);
-if (ticked)
-   {
-   DrawScreenString (x, y, ticked[line] ? "*" : " ");
-   x += 2 * FONTW;
-   }
-if (force_numbers || ! this->shortcut_index)
-   {
-   DrawScreenText (x, y, "(%c)", al_adigits[line + 1]);
-   DrawScreenString (x + FONTW, y + FONTU, "_");
-   x += 4 * FONTW;
-   }
-DrawScreenString (x, y, text);
-if (! force_numbers && shortcut_index >= 0)
-   DrawScreenString (x + shortcut_index * FONTW, y + FONTU, "_");
-if (! force_numbers && shortcut_key != -1)
-   {
-   const char *string = key_to_string (shortcut_key);
-   DrawScreenString (ix1 + 1 - FONTW - strlen (string) * FONTW, y, string);
-   }
-ShowMousePointer ();
+      *d++ = *s;
+    }
+    *d = '\0';
+    DrawScreenString (x, text_y, buf);
+    delete[] buf;
+  }
+
+  // Underscore the tilde shortcut if any
+  if (! (flags & MF_NUMS) && tilde_index >= 0)
+    DrawScreenString (x + tilde_index * FONTW, text_y + FONTU, "_");
+
+  // Shortcut key if any
+  if (! (flags & MF_NUMS) && i.shortcut_key != YK_)
+  {
+    const char *s = key_to_string (i.shortcut_key);
+    DrawScreenString (ix1 + 1 - FONTW - strlen (s) * FONTW, text_y, s);
+  }
+  ShowMousePointer ();
 }
 
 
+/*
+ *	WIDGET METHODS
+ */
+
+
+void Menu::undraw ()
+{
+  ;  // I can't undraw myself
+}
+
+
+int Menu::can_undraw ()
+{
+  return 0;  // I can't undraw myself
+}
+
+
+int Menu::need_to_clear ()
+{
+  return ! priv->visible && priv->visible_disp || priv->need_geom;
+}
+
+
+void Menu::clear ()
+{
+  priv->visible_disp = false;
+}
+
+
+int Menu::req_width ()
+{
+  if (priv->need_geom)
+    priv->geom ();
+  return priv->width;
+}
+
+
+int Menu::req_height ()
+{
+  if (priv->need_geom)
+    priv->geom ();
+  return priv->height;
+}
+
+
+int Menu::get_x0 ()
+{
+  return priv->ox0_disp;
+}
+
+
+int Menu::get_y0 ()
+{
+  return priv->oy0_disp;
+}
+
+
+int Menu::get_x1 ()
+{
+  return priv->ox0_disp + priv->width_disp - 1;
+}
+
+
+int Menu::get_y1 ()
+{
+  return priv->oy0_disp + priv->height_disp - 1;
+}
+
diff -uaNr yadex-1.5.2/src/menu.h yadex-1.6.0/src/menu.h
--- yadex-1.5.2/src/menu.h	2000-05-07 16:55:08.000000000 +0200
+++ yadex-1.6.0/src/menu.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -27,208 +27,95 @@
 */
 
 
-#ifndef YH_MENUS  /* Prevent multiple inclusion */
-#define YH_MENUS  /* Prevent multiple inclusion */
+#ifndef YH_MENUS  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_MENUS
+
+
+#include <stdarg.h>
+#include <vector>
+#include "edwidget.h"
 
 
 typedef struct 
-  {
+{
   acolour_t bg;
   acolour_t fg;
-  } colour_pair_t;
+} colour_pair_t;
 
-/* First subscript : 0 = normal, 1 = grayed out
+/* First subscript :  0 = normal, 1 = greyed out
    Second subscript : 0 = normal, 1 = highlighted */
 extern const colour_pair_t menu_colour[2][2];
 
-typedef enum
-  {
-  MEN_GRAY = 0x01,  /* This menu item is grayed out */
-  MEN_TICK = 0x02   /* This menu item can be "ticked", boolean expr follows */
-  } menu_flags_t;
+const unsigned char MIF_NACTIVE = 0;
+const unsigned char MIF_SACTIVE = 1;
+const unsigned char MIF_VACTIVE = 2;
+const unsigned char MIF_FACTIVE = 3;
+
+const unsigned char MIF_NTICK = 0 << 2;
+const unsigned char MIF_STICK = 1 << 2;
+const unsigned char MIF_VTICK = 2 << 2;
+const unsigned char MIF_FTICK = 3 << 2;
+
+extern const char *MI_SEPARATION;
+
+typedef void *micbarg_t;		// Argument of callback function
+typedef bool (*micb_t) (micbarg_t);	// Pointer to callback function
 
 // Values returned by process_event()
 const int MEN_CANCEL  = -1;  // Exit by [Esc]. Caller should destroy the menu.
 const int MEN_OTHER   = -2;  // Got other event and processed it.
 const int MEN_INVALID = -3;  // Got invalid event. Caller should process it.
 
-#include "edwidget.h"
-
-
-class menu_c : public edwidget_c
-{
-	public :
-
-/*
- *	Ctors
- */
-menu_c () { memset (this, 0, sizeof *this); }
-
-menu_c (const char *title, ...);
 
-menu_c (
-   const char   *title,
-   al_llist_t   *list,
-   const char   *(*getstr) (void *));
-
-menu_c (
-   const char	*title,
-   int		numitems,
-   int		*ticked,
-   char         **menustr,
-   const i8	*shortcut_index,
-   const int	*shortcut_key,
-   int		*grayed_out);
+class Menu_data;
+class Menu_priv;
 
-/*
- *	Dtors
- */
-~menu_c ();
-
-/*
- *	Configuration
- */
-// Set the coordinates of the outer top left corner of
-// the window. If <x> is < 0, the window will be centred
-// horizontally. If <y> is < 0, the window will be centred
-// vertically. By default, the window is put at the centre
-// of the screen.
-void set_coords (int x, int y);
-
-// Set the title of the menu. The title is shown only if
-// the menu is used in popup mode. By default there is
-// no title.
-void set_title (const char *title);
-
-// Set the current item (the first item having number 0).
-// By default the current item is set to 0 after creation.
-void set_item_no (int item_no) { line = item_no; }
-
-// Set (or clear) the popup flag.
-// If the <popup> flag is set, the title of the menu is shown,
-// and button releases are treated differently.
-// By default, the popup flag is not set.
-void set_popup (int popup)
-   {
-   if (!! popup != !! this->popup)
-      need_geom = 1;  // Force geom() to be called
-   this->popup = popup;
-   }
-
-// Set (or clear) the force_numbers flags.
-// If the <force_numbers> flag is set,
-// - shortcut keys and shortcut by index are neither shown
-//   nor recognized,
-// - the items are numbered [0-9A-Z] and can be selected by
-//   pressing the corresponding key.
-void set_force_numbers (int force_numbers)
-   {
-   if (!! force_numbers != !! this->force_numbers)
-      need_geom = 1;  // Force geom() to be called.
-   this->force_numbers = force_numbers;
-   }
-
-// Whether the widget should be visible.
-void set_visible (int visible) { this->visible = visible; }
-
-// Tick or untick a menu item.
-void set_ticked (int item_no, int ticked);
-
-// Gray-out or ungray-out a menu item.
-void set_grayed_out (int item_no, int grayed_out);
 
 /*
- *	Event processing
+ *	Menu - a menu class
  */
-int process_event (const input_status_t *is);
-int last_shortcut_key ();
-
-
-/*
- *	Widget functions
- */
-void draw ();
-void undraw () { }  // I can't undraw myself
-int can_undraw () { return 0; }  // I can't undraw myself
-
-int need_to_clear ()
-   {
-   return ! visible && visible_disp || need_geom;
-   }
-
-void clear () { visible_disp = 0; }
-int req_width () { if (need_geom) geom (); return width; }
-int req_height () { if (need_geom) geom ();  return height; }
-int get_x0 () { return ox0_disp; }
-int get_y0 () { return oy0_disp; }
-int get_x1 () { return ox0_disp + width_disp - 1; }
-int get_y1 () { return oy0_disp + height_disp - 1; }
-
-	private :
-
-void init (
-   const char *title,			// Title of window (or NULL)
-   int numitems,			// < 0 if in list mode
-   int *ticked,				// Always NULL in list mode
-   void *data,				// List or array of strings
-   const char *(*getstr)(void *),	// Only in list mode
-   const i8 *shortcut_index,		// Always NULL in list mode
-   const int *shortcut_key,		// Always NULL in list mode
-   int *grayed_out,			// Always NULL in list mode
-   int delete_after_use);
-
-void draw_one_line (int line, int highlighted);
-void geom ();
-
-// Menu data
-const char *title;		// The title (or NULL if none)
-size_t     title_len;		// Length of the title (or 0 if none)
-int        use_list;		// Do the items come from a list ?
-al_llist_t *list;		// The list they come from (or NULL)
-const char *(*getstr) (void *);	// Only in list mode
-int        numitems;		// The number of items
-const char *const *menustr;	// The array they come from (or NULL)
-size_t     items_ks_len;	// Length of the longest item counting key sc.
-size_t     items_len;		// Length of the longest item not counting k.s.
-int        *ticked;
-const i8   *shortcut_index;
-const int  *shortcut_key;
-int        *grayed_out;
-i8         delete_after_use;	// Should delete menustr, t, sc_i, sc_k and g_o
-int        cooked_index_shortcuts[36];
-i8         popup;		// Used as popup (not pull-down) menu.
-				// If set, the title is shown and button
-				// releases are treated differently.
-i8         force_numbers;	// Force the use of standard shortcuts [0-9A-Z]
-				// even if index/key shortcuts exist.
-
-// Geometry as the user would like it to be
-int    user_ox0;		// Top left corner. < 0 means centered.
-int    user_oy0;		// Top left corner. < 0 means centered.
-
-// Geometry as it should be
-int    ix0, iy0, ix1, iy1;	// Corners of inner edge of window
-int    ox0, oy0, ox1, oy1;	// Corners of outer edge of window
-int    width;			// Overall width of window
-int    height;			// Overall height of window
-int    ty0;			// Y-pos of title
-int    ly0;			// Y-pos of first item
-
-// Geometry as it is displayed
-int    ox0_disp;
-int    oy0_disp;
-int    width_disp;
-int    height_disp;
-
-// Status
-i8     need_geom;		// Need to call geom() again
-i8     visible;			// Should the menu be visible ?
-i8     visible_disp;		// Is it really visible ?
-i8     line;			// Which line should be highlighted ?
-i8     line_disp;		// Which line is actually highlighted ?
-int    _last_shortcut_key;	// Shortcut key for last selected item.
+class Menu : public edwidget_c
+{
+  public :
+    // Ctors
+    Menu (const char *title, ...);
+    Menu (const char *title, va_list argp);
+    Menu (const char *title, al_llist_t *list, const char *(*getstr)(void *));
+    Menu (const char *title, const Menu_data& menudata);
+    ~Menu ();
+
+    // Configuration
+    void set_coords (int x, int y);
+    void set_title (const char *title);
+    void set_item_no (int item_no);
+    void set_popup (bool popup);
+    void set_force_numbers (bool force_numbers);
+    void set_visible (bool visible);
+    void set_ticked (size_t item_no, bool ticked);
+    void set_active (size_t item_no, bool active);
+
+    // Event processing
+    int process_event (const input_status_t *is);
+    inpev_t last_shortcut_key ();
+
+    // Widget functions
+    void draw ();
+    void undraw ();
+    int can_undraw ();
+    int need_to_clear ();
+    void clear ();
+    int req_width ();
+    int req_height ();
+    int get_x0 ();
+    int get_y0 ();
+    int get_x1 ();
+    int get_y1 ();
+
+  private :
+    Menu (const Menu&);			// Too lazy to implement it
+    Menu& operator= (const Menu&);	// Too lazy to implement it
+    Menu_priv *priv;
 };
 
 
-#endif  /* Prevent multiple inclusion */
-
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/menubar.cc yadex-1.6.0/src/menubar.cc
--- yadex-1.5.2/src/menubar.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/menubar.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -117,7 +117,7 @@
  *	Returns the number of the newly created item.
  */
 int menubar_c::add_item (const char *text, int shortcut_index,
-   int right_aligned, menu_c *menu)
+   int right_aligned, Menu *menu)
 {
 if (nitems >= MAX_ITEMS)
    fatal_error ("Too many items on menu bar");
@@ -137,7 +137,7 @@
  *	set_menu
  *	Change the menu for an existing menu bar item.
  */
-void menubar_c::set_menu (int number, menu_c *menu)
+void menubar_c::set_menu (int number, Menu *menu)
 {
 if (number >= nitems)
    fatal_error ("set_menu: bad mbi#");
@@ -153,7 +153,7 @@
  *	get_menu
  *	Return a pointer on the menu for an existing menu bar item.
  */
-menu_c *menubar_c::get_menu (int number)
+Menu *menubar_c::get_menu (int number)
 {
 if (number >= nitems)
    fatal_error ("set_menu: bad mbi#");
diff -uaNr yadex-1.5.2/src/menubar.h yadex-1.6.0/src/menubar.h
--- yadex-1.5.2/src/menubar.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/menubar.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -42,7 +42,7 @@
 
 
 #include "edwidget.h"
-class menu_c;
+class Menu;
 
 
 static const int MAX_ITEMS = 10;
@@ -54,9 +54,9 @@
       menubar_c ();
 
       int add_item (const char *text, int shortcut_index, int right_aligned,
-         menu_c *menu);
-      void set_menu (int number, menu_c *menu);
-      menu_c *get_menu (int number);
+         Menu *menu);
+      void set_menu (int number, Menu *menu);
+      Menu *get_menu (int number);
       void compute_menubar_coords (int scrx0, int scrx1, int scry0, int scry1);
       void highlight (int number);
       void pull_down (int number);
@@ -105,7 +105,7 @@
       const char *item_text[MAX_ITEMS];	// Definition of items
       int item_shortcut_index[MAX_ITEMS];
       int item_right_aligned[MAX_ITEMS];
-      menu_c *item_menu[MAX_ITEMS];
+      Menu *item_menu[MAX_ITEMS];
        
       int stale_x0_x1;         		// Should item_x? be recalculated ?
       int item_x0[MAX_ITEMS];		// Left edge of items, includ. spacing
@@ -117,8 +117,8 @@
       int highlighted_no_disp;		// # of the item that is actually h.l.
       int pulled_down_no;		// # of menu that should be p.d.
       int pulled_down_no_disp;		// # of menu that is actually p.d.
-      menu_c *pulled_down_menu;		// Menu that should be p.d.
-      menu_c *pulled_down_menu_disp;	// Menu that is actually p.d.
+      Menu *pulled_down_menu;		// Menu that should be p.d.
+      Menu *pulled_down_menu_disp;	// Menu that is actually p.d.
    };
 
 
diff -uaNr yadex-1.5.2/src/menudata.h yadex-1.6.0/src/menudata.h
--- yadex-1.5.2/src/menudata.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/menudata.h	2002-05-09 13:03:02.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ *	menudata.h - Menu_data abstract base class
+ *	AYM 2002-05-09
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphal Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright  1997-2002 Andr Majorel and others.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#ifndef YH_MENUDATA  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_MENUDATA
+
+
+class Menu_data
+{
+  public :
+    virtual size_t nitems () const = 0;
+    virtual const char *operator[] (size_t n) const = 0;
+};
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/mkpalette.cc yadex-1.6.0/src/mkpalette.cc
--- yadex-1.5.2/src/mkpalette.cc	2000-05-06 23:52:16.000000000 +0200
+++ yadex-1.6.0/src/mkpalette.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,6 +32,7 @@
 #include "mkpalette.h"
 #include "gfx.h"
 #include "rgb.h"
+#include "wadfile.h"
 #include "wads.h"
 
 
@@ -43,41 +44,55 @@
  */
 int make_gimp_palette (int playpalnum, const char *filename)
 {
-MDirPtr dir;
-u8	*dpal;
-FILE	*output_fd;
-
-dir = FindMasterDir (MasterDir, "PLAYPAL");
-if (dir == NULL)
-   {
-   warn ("PLAYPAL lump not found.\n");
-   return 1;
-   }
-
-int playpal_count = dir->dir.size / (3 * DOOM_COLOURS);
-if (playpalnum < 0 || playpalnum >= playpal_count)
-   {
-   warn ("playpalnum %d out of range (0-%d). Using #0 instead.\n",
+  int     rc        = 0;
+  MDirPtr dir;
+  u8	 *dpal      = 0;
+  FILE	 *output_fp = 0;
+
+  const char *lump_name = "PLAYPAL";
+  dir = FindMasterDir (MasterDir, lump_name);
+  if (dir == 0)
+  {
+    warn ("%s: lump not found\n",lump_name);
+    return 1;
+  }
+
+  int playpal_count = dir->dir.size / (3 * DOOM_COLOURS);
+  if (playpalnum < 0 || playpalnum >= playpal_count)
+  {
+    warn ("playpalnum %d out of range (0-%d), using #0 instead\n",
       playpalnum, playpal_count - 1);
-   playpalnum = 0;
-   }
+    playpalnum = 0;
+  }
 
-output_fd = fopen (filename, "w");
-if (output_fd == NULL)
-   {
-   warn ("can't open \"%s\" (%s)\n", filename, strerror (errno));
-   warn ("giving up.\n");
-   return 1;
-   }
-fprintf (output_fd,
-   "GIMP Palette\n"
-   "# Generated by Yadex %s\n", yadex_version);
-
-dpal = (u8 *) GetFarMemory (3 * DOOM_COLOURS);
-wad_seek (dir->wadfile, dir->dir.start + (long) playpalnum * 3 * DOOM_COLOURS);
-wad_read_bytes (dir->wadfile, dpal, 3 * DOOM_COLOURS);
-for (size_t n = 0; n < DOOM_COLOURS; n++)
-   fprintf (output_fd, "%3d %3d %3d  Index = %d (%02Xh)   RGB = %d, %d, %d\n",
+  output_fp = fopen (filename, "w");
+  if (output_fp == 0)
+  {
+    warn ("%s: %s\n", filename, strerror (errno));
+    return 1;
+  }
+  fprintf (output_fp,
+     "GIMP Palette\n"
+     "# Generated by Yadex %s\n", yadex_version);
+
+  dpal = (u8 *) GetFarMemory (3 * DOOM_COLOURS);
+  const Wad_file *wf = dir->wadfile;
+  wf->seek (dir->dir.start + (long) playpalnum * 3 * DOOM_COLOURS);
+  if (wf->error ())
+  {
+    err ("%s: seek error", lump_name);
+    rc = 1;
+    goto byebye;
+  }
+  wf->read_bytes (dpal, 3 * DOOM_COLOURS);
+  if (wf->error ())
+  {
+    err ("%s: read error", lump_name);
+    rc = 1;
+    goto byebye;
+  }
+  for (size_t n = 0; n < DOOM_COLOURS; n++)
+    fprintf (output_fp, "%3d %3d %3d  Index = %d (%02Xh)   RGB = %d, %d, %d\n",
       dpal[3 * n],
       dpal[3 * n + 1],
       dpal[3 * n + 2],
@@ -86,12 +101,14 @@
       dpal[3 * n],
       dpal[3 * n + 1],
       dpal[3 * n + 2]);
-FreeFarMemory (dpal);
 
-if (fclose (output_fd))
-   return 1;
-else
-   return 0;
+  byebye:
+  if (dpal != 0)
+    FreeFarMemory (dpal);
+  if (output_fp != 0)
+    if (fclose (output_fp))
+      return 1;
+  return rc;
 }
 
 
@@ -101,78 +118,93 @@
  *	colours in the palette.
  *	Return 0 on success, non-zero on failure.
  */
-
 int make_palette_ppm (int playpalnum, const char *filename)
 {
-MDirPtr dir;
-u8	*dpal;
-FILE	*output_fd;
-
-dir = FindMasterDir (MasterDir, "PLAYPAL");
-if (dir == NULL)
-   {
-   warn ("PLAYPAL lump not found.\n");
-   return 1;
-   }
-
-int playpal_count = dir->dir.size / (3 * DOOM_COLOURS);
-if (playpalnum < 0 || playpalnum >= playpal_count)
-   {
-   warn ("playpalnum %d out of range (0-%d). Using #0 instead.\n",
+  int     rc        = 0;
+  MDirPtr dir;
+  u8	 *dpal      = 0;
+  FILE	 *output_fp = 0;
+
+  const char *lump_name = "PLAYPAL";
+  dir = FindMasterDir (MasterDir, lump_name);
+  if (dir == 0)
+  {
+    warn ("%s: lump not found\n", lump_name);
+    return 1;
+  }
+
+  int playpal_count = dir->dir.size / (3 * DOOM_COLOURS);
+  if (playpalnum < 0 || playpalnum >= playpal_count)
+  {
+    warn ("playpalnum %d out of range (0-%d), using #0 instead\n",
       playpalnum, playpal_count - 1);
-   playpalnum = 0;
-   }
+    playpalnum = 0;
+  }
 
-output_fd = fopen (filename, "wb");
-if (output_fd == NULL)
-   {
-   warn ("can't open \"%s\" (%s)\n", filename, strerror (errno));
-   warn ("giving up.\n");
-   return 1;
-   }
-
-const int width = 128;
-const int height = 128;
-const int columns = 16;
-
-fputs ("P6", output_fd);
-fnewline (output_fd);
-fprintf (output_fd, "# Generated by Yadex %s", yadex_version);
-fnewline (output_fd);
-fprintf (output_fd, "%d %d", width, height);
-fnewline (output_fd);
-fputs ("255\n", output_fd);  // Always \n (must be a single character)
-
-int rect_w = width / columns;
-int rect_h = height / (DOOM_COLOURS / columns);
-
-dpal = (u8 *) GetFarMemory (3 * DOOM_COLOURS);
-wad_seek (dir->wadfile, dir->dir.start + (long) playpalnum * 3 * DOOM_COLOURS);
-wad_read_bytes (dir->wadfile, dpal, 3 * DOOM_COLOURS);
-for (size_t n = 0; n < DOOM_COLOURS; n += columns)
-   for (int subrow = 0; subrow < rect_h; subrow++)
+  output_fp = fopen (filename, "wb");
+  if (output_fp == 0)
+  {
+    warn ("%s: %s\n", filename, strerror (errno));
+    return 1;
+  }
+
+  const int width = 128;
+  const int height = 128;
+  const int columns = 16;
+
+  fputs ("P6", output_fp);
+  fnewline (output_fp);
+  fprintf (output_fp, "# Generated by Yadex %s", yadex_version);
+  fnewline (output_fp);
+  fprintf (output_fp, "%d %d", width, height);
+  fnewline (output_fp);
+  fputs ("255\n", output_fp);  // Always \n (must be a single character)
+
+  int rect_w = width / columns;
+  int rect_h = height / (DOOM_COLOURS / columns);
+
+  dpal = (u8 *) GetFarMemory (3 * DOOM_COLOURS);
+  const Wad_file *wf = dir->wadfile;
+  wf->seek (dir->dir.start + (long) playpalnum * 3 * DOOM_COLOURS);
+  if (wf->error ())
+  {
+    err ("%s: seek error", lump_name);
+    rc = 1;
+    goto byebye;
+  }
+  wf->read_bytes (dpal, 3 * DOOM_COLOURS);
+  if (wf->error ())
+  {
+    err ("%s: read error", lump_name);
+    rc = 1;
+    goto byebye;
+  }
+  for (size_t n = 0; n < DOOM_COLOURS; n += columns)
+    for (int subrow = 0; subrow < rect_h; subrow++)
       for (int c = 0; c < columns; c++)
-         for (int subcol = 0; subcol < rect_w; subcol++)
-	    {
-	    if (subrow == 0 && subcol == 0)
-	       {
-	       putc (0, output_fd);
-	       putc (0, output_fd);
-	       putc (0, output_fd);
-	       }
-	    else
-	       {
-	       putc (dpal[3 * (n + c)],     output_fd);
-	       putc (dpal[3 * (n + c) + 1], output_fd);
-	       putc (dpal[3 * (n + c) + 2], output_fd);
-	       }
-	    }
-FreeFarMemory (dpal);
-
-if (fclose (output_fd))
-   return 1;
-else
-   return 0;
+	for (int subcol = 0; subcol < rect_w; subcol++)
+	{
+	  if (subrow == 0 && subcol == 0)
+	  {
+	    putc (0, output_fp);
+	    putc (0, output_fp);
+	    putc (0, output_fp);
+	  }
+	  else
+	  {
+	    putc (dpal[3 * (n + c)],     output_fp);
+	    putc (dpal[3 * (n + c) + 1], output_fp);
+	    putc (dpal[3 * (n + c) + 2], output_fp);
+	  }
+	}
+
+  byebye:
+  if (dpal != 0)
+    FreeFarMemory (dpal);
+  if (output_fp != 0)
+    if (fclose (output_fp))
+      return 1;
+  return rc;
 }
 
 
@@ -183,60 +215,76 @@
 
 int make_palette_ppm_2 (int playpalnum, const char *filename)
 {
-MDirPtr dir;
-u8	*dpal;
-FILE	*output_fd;
-
-dir = FindMasterDir (MasterDir, "PLAYPAL");
-if (dir == NULL)
-   {
-   warn ("PLAYPAL lump not found.\n");
-   return 1;
-   }
-
-int playpal_count = dir->dir.size / (3 * DOOM_COLOURS);
-if (playpalnum < 0 || playpalnum >= playpal_count)
-   {
-   warn ("playpalnum %d out of range (0-%d). Using #0 instead.\n",
+  int     rc        = 0;
+  MDirPtr dir;
+  u8	 *dpal      = 0;
+  FILE	 *output_fp = 0;
+
+  const char *lump_name = "PLAYPAL";
+  dir = FindMasterDir (MasterDir, lump_name);
+  if (dir == 0)
+  {
+    warn ("%s: lump not found", lump_name);
+    return 1;
+  }
+
+  int playpal_count = dir->dir.size / (3 * DOOM_COLOURS);
+  if (playpalnum < 0 || playpalnum >= playpal_count)
+  {
+    warn ("playpalnum %d out of range (0-%d), using #0 instead",
       playpalnum, playpal_count - 1);
-   playpalnum = 0;
-   }
+    playpalnum = 0;
+  }
 
-output_fd = fopen (filename, "wb");
-if (output_fd == NULL)
-   {
-   warn ("can't open \"%s\" (%s)\n", filename, strerror (errno));
-   warn ("giving up.\n");
-   return 1;
-   }
-
-const int width = DOOM_COLOURS;
-const int height = DOOM_COLOURS;
-
-fputs ("P6", output_fd);
-fnewline (output_fd);
-fprintf (output_fd, "# Generated by Yadex %s", yadex_version);
-fnewline (output_fd);
-fprintf (output_fd, "%d %d", width, height);
-fnewline (output_fd);
-fputs ("255\n", output_fd);  // Always \n (must be a single character)
-
-dpal = (u8 *) GetFarMemory (3 * DOOM_COLOURS);
-wad_seek (dir->wadfile, dir->dir.start + (long) playpalnum * 3 * DOOM_COLOURS);
-wad_read_bytes (dir->wadfile, dpal, 3 * DOOM_COLOURS);
-for (int l = 0; l < height; l++)
-   for (int c = 0; c < width; c++)
-      {
-      putc (dpal[3 * ((c + l) % DOOM_COLOURS)    ], output_fd);
-      putc (dpal[3 * ((c + l) % DOOM_COLOURS) + 1], output_fd);
-      putc (dpal[3 * ((c + l) % DOOM_COLOURS) + 2], output_fd);
-      }
-FreeFarMemory (dpal);
-
-if (fclose (output_fd))
-   return 1;
-else
-   return 0;
+  output_fp = fopen (filename, "wb");
+  if (output_fp == 0)
+  {
+    warn ("%s: %s\n", filename, strerror (errno));
+    return 1;
+  }
+
+  const int width = DOOM_COLOURS;
+  const int height = DOOM_COLOURS;
+
+  fputs ("P6", output_fp);
+  fnewline (output_fp);
+  fprintf (output_fp, "# Generated by Yadex %s", yadex_version);
+  fnewline (output_fp);
+  fprintf (output_fp, "%d %d", width, height);
+  fnewline (output_fp);
+  fputs ("255\n", output_fp);  // Always \n (must be a single character)
+
+  dpal = (u8 *) GetFarMemory (3 * DOOM_COLOURS);
+  const Wad_file *wf = dir->wadfile;
+  wf->seek (dir->dir.start + (long) playpalnum * 3 * DOOM_COLOURS);
+  if (wf->error ())
+  {
+    err ("%s: seek error", lump_name);
+    rc = 1;
+    goto byebye;
+  }
+  wf->read_bytes (dpal, 3 * DOOM_COLOURS);
+  if (wf->error ())
+  {
+    err ("%s: read error", lump_name);
+    rc = 1;
+    goto byebye;
+  }
+  for (int l = 0; l < height; l++)
+    for (int c = 0; c < width; c++)
+    {
+      putc (dpal[3 * ((c + l) % DOOM_COLOURS)    ], output_fp);
+      putc (dpal[3 * ((c + l) % DOOM_COLOURS) + 1], output_fp);
+      putc (dpal[3 * ((c + l) % DOOM_COLOURS) + 2], output_fp);
+    }
+
+  byebye:
+  if (dpal != 0)
+    FreeFarMemory (dpal);
+  if (output_fp != 0)
+    if (fclose (output_fp))
+      return 1;
+  return rc;
 }
 
 
diff -uaNr yadex-1.5.2/src/modpopup.h yadex-1.6.0/src/modpopup.h
--- yadex-1.5.2/src/modpopup.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/modpopup.h	2003-03-28 13:37:32.000000000 +0100
@@ -1,7 +1,7 @@
 /*
  *	modpopup.h
  *	The modpopup_c class: a modal popup menu widget.
- *	Basically a wrapper for the menu_c class.
+ *	Basically a wrapper for the Menu class.
  *	AYM 1998-12-16
  */
 
@@ -12,7 +12,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -35,88 +35,88 @@
 
 class modpopup_c : public edwidget_c
 {
-public :
+  public :
 
-/*
- *	EditorLoop() side methods
- */
-modpopup_c ()
-{
-menu = 0;
-menu_disp = 0;
-}
-
-void set (menu_c *menu, int force_numbers)
-{
-if (menu_disp)
-   menu_disp->set_visible (0);
-this->menu = menu;
-menu->set_popup         (1);
-menu->set_force_numbers (force_numbers);
-menu->set_coords        (-1, -1);
-menu->set_item_no       (0);
-menu->set_visible       (1);
-}
-
-void unset ()
-{
-if (menu_disp)
-   menu_disp->set_visible (0);
-menu = 0;
-}
-
-menu_c *get ()
-{
-return menu;
-}
-
-/*
- *	edisplay_c side methods
- */
-void draw ()
-{
-if (menu)
-   {
-   menu->draw ();
-   menu_disp = menu;
-   }
-}
-
-void undraw ()
-{
-if (menu_disp)
-   {
-   menu_disp->undraw ();
-   //menu_disp = 0;
-   }
-}
-
-int can_undraw ()
-{
-if (menu_disp)
-   return menu_disp->can_undraw ();
-else
-   return 1;
-}
-
-int need_to_clear ()
-{
-if (menu_disp)
-   return menu_disp->need_to_clear ();
-else
-   return 0;
-}
-
-void clear ()
-{
-if (menu_disp)
-   menu_disp->clear ();
-}
+    /*
+     *	EditorLoop() side methods
+     */
+    modpopup_c ()
+    {
+      menu = 0;
+      menu_disp = 0;
+    }
+
+    void set (Menu *menu, int force_numbers)
+    {
+      if (menu_disp)
+	menu_disp->set_visible (0);
+      this->menu = menu;
+      menu->set_popup         (1);
+      menu->set_force_numbers (force_numbers);
+      menu->set_coords        (-1, -1);
+      menu->set_item_no       (0);
+      menu->set_visible       (1);
+    }
+
+    void unset ()
+    {
+      if (menu_disp)
+	menu_disp->set_visible (0);
+      menu = 0;
+    }
+
+    Menu *get ()
+    {
+      return menu;
+    }
+
+    /*
+     *	edisplay_c side methods
+     */
+    void draw ()
+    {
+      if (menu)
+      {
+	menu->draw ();
+	menu_disp = menu;
+      }
+    }
+
+    void undraw ()
+    {
+      if (menu_disp)
+	{
+	  menu_disp->undraw ();
+	  //menu_disp = 0;
+	}
+    }
+
+    int can_undraw ()
+    {
+      if (menu_disp)
+	return menu_disp->can_undraw ();
+      else
+	return 1;
+    }
+
+    int need_to_clear ()
+    {
+      if (menu_disp)
+	return menu_disp->need_to_clear ();
+      else
+	return 0;
+    }
+
+    void clear ()
+    {
+      if (menu_disp)
+	menu_disp->clear ();
+    }
 
+  private :
 
-private :
-menu_c *menu;
-menu_c *menu_disp;
+    Menu *menu;
+    Menu *menu_disp;
 };
 
 
diff -uaNr yadex-1.5.2/src/mouse.cc yadex-1.6.0/src/mouse.cc
--- yadex-1.5.2/src/mouse.cc	2000-05-07 14:37:58.000000000 +0200
+++ yadex-1.6.0/src/mouse.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/names.cc yadex-1.6.0/src/names.cc
--- yadex-1.5.2/src/names.cc	2000-07-23 20:26:13.000000000 +0200
+++ yadex-1.6.0/src/names.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -29,6 +29,7 @@
 
 #include "yadex.h"
 #include "game.h"
+#include "objid.h"
 
 
 /*
@@ -38,16 +39,16 @@
 {
 switch (objtype)
    {
-   case OBJ_THINGS:   return "Thing";
-   case OBJ_LINEDEFS: return "Linedef";
-   case OBJ_SIDEDEFS: return "Sidedef";
-   case OBJ_VERTICES: return "Vertex";
-   case OBJ_SEGS:     return "Segment";
-   case OBJ_SSECTORS: return "SSector";
-   case OBJ_NODES:    return "Node";
-   case OBJ_SECTORS:  return "Sector";
-   case OBJ_REJECT:   return "Reject";
-   case OBJ_BLOCKMAP: return "Blockmap";
+   case OBJ_THINGS:   return "thing";
+   case OBJ_LINEDEFS: return "linedef";
+   case OBJ_SIDEDEFS: return "sidedef";
+   case OBJ_VERTICES: return "vertex";
+   case OBJ_SEGS:     return "segment";
+   case OBJ_SSECTORS: return "ssector";
+   case OBJ_NODES:    return "node";
+   case OBJ_SECTORS:  return "sector";
+   case OBJ_REJECT:   return "reject";
+   case OBJ_BLOCKMAP: return "blockmap";
    }
 return "< Bug! >";
 }
diff -uaNr yadex-1.5.2/src/nop.cc yadex-1.6.0/src/nop.cc
--- yadex-1.5.2/src/nop.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/nop.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/objects.cc yadex-1.6.0/src/objects.cc
--- yadex-1.5.2/src/objects.cc	2000-08-15 03:14:08.000000000 +0200
+++ yadex-1.6.0/src/objects.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -29,10 +29,12 @@
 
 
 #include "yadex.h"
-#include <math.h>
+#include "drawmap.h"
 #include "gfx.h"
 #include "l_vertices.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "s_vertices.h"
 #include "selectn.h"
 #include "things.h"
@@ -41,7 +43,6 @@
 /*
    highlight the selected objects
 */
-
 void HighlightSelection (int objtype, SelPtr list) /* SWAP! */
 {
 SelPtr cur;
@@ -55,7 +56,7 @@
 
 
 /*
-   get the number of objets of a given type minus one
+   get the number of objects of a given type minus one
 */
 obj_no_t GetMaxObjectNum (int objtype)
 {
@@ -77,238 +78,8 @@
 
 
 /*
- *	GetCurObject
- *
- *	This function returns the number of the object under the
- *	pointer. Formally, it returns "the number of the object that
- *	is closest to (x,y) and within <radius> of that point".
- *
- *	It's optimized for speed because it is called very often (every
- *	time the pointer moves). There's nothing very complicated here
- *	except getting the current sector and linedef. But see the
- *	comments below.
- *
- *	If <objtype> is OBJ_SECTORS, <radius> is unused.
- */
-int GetCurObject (int objtype, int x, int y, int radius) /* SWAP! */
-{
-int n, m, curx;
-int xmin = x - radius;
-int xmax = x + radius;
-int ymin = y - radius;
-int ymax = y + radius;
-int best_match = -1;
-int shortest_dist = INT_MAX;
-int dist;
-
-radius = abs (radius);  // Fool proof
-
-switch (objtype)
-   {
-   case OBJ_THINGS:
-      {
-      int max_radius = get_max_thing_radius () * thing_fudge / 100;
-      xmin = x - max_radius;
-      xmax = x + max_radius;
-      ymin = y - max_radius;
-      ymax = y + max_radius;
-      }
-      ObjectsNeeded (OBJ_THINGS, 0);
-      for (n = 0; n < NumThings; n++)
-	 {
-	 // Filter out things that are farther than <max_radius> units away.
-	 if (Things[n].xpos < xmin
-	  || Things[n].xpos > xmax
-	  || Things[n].ypos < ymin
-	  || Things[n].ypos > ymax)
-	    continue;
-
-         // So how far is that thing exactly ?
-#ifdef ROUND_THINGS
-	 dist = (int) hypot (x - Things[n].xpos, y - Things[n].ypos);
-	 if (dist < shortest_dist
-          && dist <= get_thing_radius (Things[n].type) * thing_fudge / 100)
-	    {
-	    best_match = n;
-	    shortest_dist = dist;
-	    }
-#else
-         {
-         int thing_radius =
-            get_thing_radius (Things[n].type) * thing_fudge / 100;
-         if (x >= Things[n].xpos - thing_radius
-          && x <= Things[n].xpos + thing_radius
-          && y >= Things[n].ypos - thing_radius
-          && y <= Things[n].ypos + thing_radius)
-            {
-	    dist = (int) hypot (x - Things[n].xpos, y - Things[n].ypos);
-	    if (dist < shortest_dist)
-	       {
-	       best_match = n;
-	       shortest_dist = dist;
-	       }
-            }
-         }
-#endif
-	 }
-      break;
-
-   case OBJ_VERTICES:
-      ObjectsNeeded (OBJ_VERTICES, 0);
-      for (n = 0; n < NumVertices; n++)
-	 {
-	 /* Filter out objects that are farther than <radius> units away. */
-	 if (Vertices[n].x < xmin
-	  || Vertices[n].x > xmax
-	  || Vertices[n].y < ymin
-	  || Vertices[n].y > ymax)
-	    continue;
-	 dist = (int) hypot (x - Vertices[n].x, y - Vertices[n].y);
-	 if (dist < shortest_dist && dist <= radius)
-	    {
-	    best_match = n;
-	    shortest_dist = dist;
-	    }
-	 }
-      break;
-
-   case OBJ_LINEDEFS:
-      {
-      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
-      for (n = 0; n < NumLineDefs; n++)
-	 {
-	 int x0 = Vertices[LineDefs[n].start].x;
-	 int y0 = Vertices[LineDefs[n].start].y;
-	 int x1 = Vertices[LineDefs[n].end].x;
-	 int y1 = Vertices[LineDefs[n].end].y;
-	 int dx;
-	 int dy;
-
-	 /* Skip all lines of which all points are more than <radius>
-	    units away from (x,y). In a typical level, this test will
-	    filter out all the linedefs but a handful. */
-	 if (x0 < xmin && x1 < xmin
-	  || x0 > xmax && x1 > xmax
-	  || y0 < ymin && y1 < ymin
-	  || y0 > ymax && y1 > ymax)
-	    continue;
-
-	 /* AYM 1998-06-29
-	    This is where it gets ugly. We're trying to calculate the
-	    distance between the pointer (x,y) and the linedef. Doing that
-	    rigorously involves doing an orthogonal projection. I use
-	    something simpler (for me).
-
-	    If the pointer is not within the ends of the linedef, I calculate
-	    the distance between the pointer and the closest end.
-
-	    If the pointer is within the ends of the linedef, I calculate
-	    what the ordinate would be for a point of the linedef that had
-	    the same abscissa as the pointer. Then I calculate the difference
-	    between that and the actual ordinate of the pointer and I call
-	    that the distance. It's a gross approximation but, in practice,
-	    it gives quite satisfactory results. Of course, for lines where
-	    dy > dx, the abscissa is y and the ordinate is x. */
-	 dx = x1 - x0;
-	 dy = y1 - y0;
-	 /* The linedef is rather horizontal */
-	 if (abs (dx) > abs (dy))
-	    {
-	    /* Are we to the left of the leftmost end or to the right of the
-	       rightmost end or between the two ? */
-	    if (x < (dx > 0 ? x0 : x1))
-	       dist = (int) hypot (x - (dx > 0 ? x0 : x1),
-                                   y - (dx > 0 ? y0 : y1));
-	    else if (x > (dx > 0 ? x1 : x0))
-	       dist = (int) hypot (x - (dx > 0 ? x1 : x0),
-                                   y - (dx > 0 ? y1 : y0));
-	    else
-	       dist = abs ((int) (y0 + ((double) dy)/dx * (x - x0) - y));
-	    }
-	 /* The linedef is rather vertical */
-	 else
-	    {
-	    /* Are we above the high end or below the low end or in between ? */
-	    if (y < (dy > 0 ? y0 : y1))
-	       dist = (int) hypot (x - (dy > 0 ? x0 : x1),
-                                   y - (dy > 0 ? y0 : y1));
-	    else if (y > (dy > 0 ? y1 : y0))
-	       dist = (int) hypot (x - (dy > 0 ? x1 : x0),
-                                   y - (dy > 0 ? y1 : y0));
-	    else
-	       dist = abs ((int) (x0 + ((double) dx)/dy * (y - y0) - x));
-	    }
-	 if (dist < shortest_dist && dist <= radius)
-	    {
-	    best_match = n;
-	    shortest_dist = dist;
-	    }
-	 }
-      break;
-      }
-   case OBJ_SECTORS:
-      /* hack, hack...  I look for the first LineDef crossing
-	 an horizontal half-line drawn from the cursor */
-      /* AYM 1998-06-29
-	 RQ & BW have been very smart here. Their method works remarkably
-	 well for normal sectors. However, self-referencing sectors are
-	 frequently unclosed. If your SRS has only horizontal linedefs, this
-	 methods fails miserably. I suppose that the solution would be to look
-	 for intersections in BOTH directions and pick the closest. Remind me
-	 to look into it one of these days :-). */
-      /* AYM 1999-03-18
-         Initializing curx to 32767 instead of MapMaxX + 1. Fixes the old
-	 DEU bug where sometimes you couldn't select a newly created sector
-	 to the west of the level until you saved. (MapMaxX got out of date
-	 and SaveLevelData() refreshed it.) */
-      ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
-      curx = 32767;  // Oh yes, one more hard-coded constant!
-      for (n = 0; n < NumLineDefs; n++)
-	 if ((Vertices[LineDefs[n].start].y > y)
-	  != (Vertices[LineDefs[n].end].y > y))
-	    {
-	    int lx0 = Vertices[LineDefs[n].start].x;
-	    int ly0 = Vertices[LineDefs[n].start].y;
-	    int lx1 = Vertices[LineDefs[n].end].x;
-	    int ly1 = Vertices[LineDefs[n].end].y;
-	    m = lx0 + (int) ((long) (y - ly0) * (long) (lx1 - lx0)
-					      / (long) (ly1 - ly0));
-	    if (m >= x && m < curx)
-	       {
-	       curx = m;
-	       best_match = n;
-	       }
-	    }
-      /* now look if this linedef has a sidedef bound to one sector */
-      if (best_match >= 0)
-	 {
-	 if (Vertices[LineDefs[best_match].start].y
-	   > Vertices[LineDefs[best_match].end].y)
-	    best_match = LineDefs[best_match].sidedef1;
-	 else
-	    best_match = LineDefs[best_match].sidedef2;
-	 if (best_match >= 0)
-	    {
-	    ObjectsNeeded (OBJ_SIDEDEFS, 0);
-	    best_match = SideDefs[best_match].sector;
-	    }
-	 else
-	    best_match = -1;
-	 }
-      else
-	 best_match = -1;
-      break;
-   }
-
-return best_match;
-}
-
-
-
-/*
    highlight the selected object
 */
-
 void HighlightObject (int objtype, int objnum, int colour) /* SWAP! */
 {
 int  n, m;
@@ -332,6 +103,7 @@
       DrawMapArrow (Things[objnum].xpos, Things[objnum].ypos,
 		    Things[objnum].angle * 182);
       break;
+
    case OBJ_LINEDEFS:
       ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
       n = (Vertices[LineDefs[objnum].start].x
@@ -355,10 +127,11 @@
 	 }
       SetLineThickness (0);
       break;
+
    case OBJ_VERTICES:
       ObjectsNeeded (OBJ_VERTICES, 0);
       {
-      int r = (int) (2 * OBJSIZE * y_min (Scale, 1));
+      int r = vertex_radius (Scale) * 3 / 2;
       int scrx0 = SCREENX (Vertices[objnum].x) - r;
       int scrx9 = SCREENX (Vertices[objnum].x) + r;
       int scry0 = SCREENY (Vertices[objnum].y) - r;
@@ -369,18 +142,30 @@
       DrawScreenLine (scrx0, scry9, scrx0, scry0);
       }
       break;
+
    case OBJ_SECTORS:
+      {
       ObjectsNeeded (OBJ_LINEDEFS, OBJ_SIDEDEFS, OBJ_VERTICES, 0);
       SetLineThickness (1);
+      const int mapx0 = MAPX (0);
+      const int mapy0 = MAPY (ScrMaxY);
+      const int mapx1 = MAPX (ScrMaxX);
+      const int mapy1 = MAPY (0);
       for (n = 0; n < NumLineDefs; n++)
 	 if (LineDefs[n].sidedef1 != -1
 	     && SideDefs[LineDefs[n].sidedef1].sector == objnum
 	  || LineDefs[n].sidedef2 != -1
 	     && SideDefs[LineDefs[n].sidedef2].sector == objnum)
-	    DrawMapLine (Vertices[LineDefs[n].start].x,
-			 Vertices[LineDefs[n].start].y,
-			 Vertices[LineDefs[n].end].x,
-			 Vertices[LineDefs[n].end].y);
+	 {
+	    const struct Vertex *v1 = Vertices + LineDefs[n].start;
+	    const struct Vertex *v2 = Vertices + LineDefs[n].end;
+	    if (v1->x < mapx0 && v2->x < mapx0
+	     || v1->x > mapx1 && v2->x > mapx1
+	     || v1->y < mapy0 && v2->y < mapy0
+	     || v1->y > mapy1 && v2->y > mapy1)
+	       continue;  // Off-screen
+	    DrawMapLine (v1->x, v1->y, v2->x, v2->y);
+	 }
       if (colour != LIGHTRED && Sectors[objnum].tag > 0)
 	 {
 	 for (m = 0; m < NumLineDefs; m++)
@@ -388,6 +173,7 @@
 	       HighlightObject (OBJ_LINEDEFS, m, LIGHTRED);
 	 }
       SetLineThickness (0);
+      }
       break;
    }
 /* restore normal write mode */
@@ -399,14 +185,13 @@
 /*
    delete an object
 */
-
-void DeleteObject (int objtype, int objnum) /* SWAP! */
+void DeleteObject (const Objid& obj) /* SWAP! */
 {
 SelPtr list;
 
 list = 0;
-SelectObject (&list, objnum);
-DeleteObjects (objtype, &list);
+SelectObject (&list, obj.num);
+DeleteObjects (obj.type, &list);
 }
 
 
@@ -414,7 +199,6 @@
 /*
    delete a group of objects (*recursive*)
 */
-
 void DeleteObjects (int objtype, SelPtr *list) /* SWAP! */
 {
 int    n, objnum;
@@ -476,7 +260,7 @@
 	 for (n = 0; n < NumLineDefs; n++)
 	    {
 	    if (LineDefs[n].start == objnum || LineDefs[n].end == objnum)
-	       DeleteObject (OBJ_LINEDEFS, n--);
+	       DeleteObject (Objid (OBJ_LINEDEFS, n--));
 	    else
 	       {
 	       if (LineDefs[n].start >= objnum)
@@ -510,10 +294,10 @@
 
    case OBJ_LINEDEFS:
       /* In DEU, deleting a linedef was not considered to be a
-      map change. Deleting a _sidedef_ was. In Yadex, sidedefs
-      are not automatically deleted when the linedef is
-      because some sidedefs are shared by more than one
-      linedef. So we need to set MadeMapChanges here. */
+	 map change. Deleting a _sidedef_ was. In Yadex,
+	 sidedefs are not automatically deleted when the linedef
+	 is because some sidedefs are shared by more than one
+	 linedef. So we need to set MadeMapChanges here. */
       if (*list)
          MadeMapChanges = 1;
       /* AYM 19980203 I've removed the deletion of sidedefs
@@ -611,7 +395,7 @@
 	ObjectsNeeded (OBJ_SIDEDEFS, 0);
 	for (n = 0; n < NumSideDefs; n++)
 	   if (SideDefs[n].sector == objnum)
-	      DeleteObject (OBJ_SIDEDEFS, n--);
+	      DeleteObject (Objid (OBJ_SIDEDEFS, n--));
 	   else if (SideDefs[n].sector >= objnum)
 	      SideDefs[n].sector--;
 	/* delete the sector */
@@ -656,7 +440,8 @@
  *	The object is inserted at the exact coordinates given.
  *	No snapping to grid is done.
  */
-void InsertObject (int objtype, int copyfrom, int xpos, int ypos) /* SWAP! */
+void InsertObject (obj_type_t objtype, obj_no_t copyfrom, int xpos, int ypos)
+								/* SWAP! */
 {
 int last;
 
@@ -803,7 +588,6 @@
 /*
    check if a (part of a) LineDef is inside a given block
 */
-
 bool IsLineDefInside (int ldnum, int x0, int y0, int x1, int y1) /* SWAP - needs Vertices & LineDefs */
 {
 int lx0 = Vertices[LineDefs[ldnum].start].x;
@@ -850,7 +634,6 @@
    get the sector number of the sidedef opposite to this sidedef
    (returns -1 if it cannot be found)
 */
-
 int GetOppositeSector (int ld1, bool firstside) /* SWAP! */
 {
 int x0, y0, dx0, dy0;
@@ -1017,7 +800,6 @@
 /*
    copy a group of objects to a new position
 */
-
 void CopyObjects (int objtype, SelPtr obj) /* SWAP! */
 {
 int        n, m;
@@ -1252,6 +1034,7 @@
       refy = newy;
       MadeChanges = 1;
       break;
+
    case OBJ_VERTICES:
       for (cur = obj; cur; cur = cur->next)
 	 {
@@ -1263,11 +1046,13 @@
       MadeChanges = 1;
       MadeMapChanges = 1;
       break;
+
    case OBJ_LINEDEFS:
       vertices = list_vertices_of_linedefs (obj);
       MoveObjectsToCoords (OBJ_VERTICES, vertices, newx, newy, grid);
       ForgetSelection (&vertices);
       break;
+
    case OBJ_SECTORS:
       ObjectsNeeded (OBJ_LINEDEFS, OBJ_SIDEDEFS, 0);
       vertices = list_vertices_of_sectors (obj);
@@ -1283,7 +1068,6 @@
 /*
    get the coordinates (approx.) of an object
 */
-
 void GetObjectCoords (int objtype, int objnum, int *xpos, int *ypos) /* SWAP! */
 {
 int  n, v1, v2, sd1, sd2;
@@ -1292,16 +1076,39 @@
 switch (objtype)
    {
    case OBJ_THINGS:
+      if (! is_thing (objnum))		// Can't happen
+	 {
+	 nf_bug ("GetObjectCoords: bad thing# %d", objnum);
+	 *xpos = 0;
+	 *ypos = 0;
+	 return;
+	 }
       ObjectsNeeded (OBJ_THINGS, 0);
       *xpos = Things[objnum].xpos;
       *ypos = Things[objnum].ypos;
       break;
+
    case OBJ_VERTICES:
+      if (! is_vertex (objnum))		// Can't happen
+	 {
+	 nf_bug ("GetObjectCoords: bad vertex# %d", objnum);
+	 *xpos = 0;
+	 *ypos = 0;
+	 return;
+	 }
       ObjectsNeeded (OBJ_VERTICES, 0);
       *xpos = Vertices[objnum].x;
       *ypos = Vertices[objnum].y;
       break;
+
    case OBJ_LINEDEFS:
+      if (! is_linedef (objnum))	// Can't happen
+	 {
+	 nf_bug ("GetObjectCoords: bad linedef# %d", objnum);
+	 *xpos = 0;
+	 *ypos = 0;
+	 return;
+	 }
       ObjectsNeeded (OBJ_LINEDEFS, 0);
       v1 = LineDefs[objnum].start;
       v2 = LineDefs[objnum].end;
@@ -1309,7 +1116,15 @@
       *xpos = (Vertices[v1].x + Vertices[v2].x) / 2;
       *ypos = (Vertices[v1].y + Vertices[v2].y) / 2;
       break;
+
    case OBJ_SIDEDEFS:
+      if (! is_sidedef (objnum))	// Can't happen
+	 {
+	 nf_bug ("GetObjectCoords: bad sidedef# %d", objnum);
+	 *xpos = 0;
+	 *ypos = 0;
+	 return;
+	 }
       ObjectsNeeded (OBJ_LINEDEFS, 0);
       for (n = 0; n < NumLineDefs; n++)
 	 if (LineDefs[n].sidedef1 == objnum || LineDefs[n].sidedef2 == objnum)
@@ -1323,7 +1138,16 @@
 	    }
       *xpos = (MapMinX + MapMaxX) / 2;
       *ypos = (MapMinY + MapMaxY) / 2;
+      // FIXME is the fall through intentional ? -- AYM 2000-11-08
+
    case OBJ_SECTORS:
+      if (! is_sector (objnum))		// Can't happen
+	 {
+	 nf_bug ("GetObjectCoords: bad sector# %d", objnum);
+	 *xpos = 0;
+	 *ypos = 0;
+	 return;
+	 }
       accx = 0L;
       accy = 0L;
       num = 0L;
@@ -1359,6 +1183,11 @@
 	 *ypos = (MapMinY + MapMaxY) / 2;
 	 }
       break;
+
+   default:
+      nf_bug ("GetObjectCoords: bad objtype %d", objtype);  // Can't happen
+      *xpos = 0;
+      *ypos = 0;
    }
 }
 
@@ -1367,7 +1196,6 @@
 /*
    find a free tag number
 */
-
 int FindFreeTag () /* SWAP! */
 {
 int  tag, n;
diff -uaNr yadex-1.5.2/src/objects.h yadex-1.6.0/src/objects.h
--- yadex-1.5.2/src/objects.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/objects.h	2000-11-07 13:04:03.000000000 +0100
@@ -0,0 +1,30 @@
+/*
+ *	objects.h
+ *	AYM 2000-11-06
+ */
+
+
+#ifndef YH_OBJECTS  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_OBJECTS
+
+
+#include "objid.h"
+
+
+void	HighlightSelection (int, SelPtr);
+obj_no_t GetMaxObjectNum (int);
+void	GetCurObject (Objid& o, int objtype, int x, int y);
+void	SelectObjectsInBox (SelPtr *list, int, int, int, int, int);
+void	HighlightObject (int, int, int);
+void	DeleteObject (const Objid&);
+void	DeleteObjects (int, SelPtr *);
+void	InsertObject (obj_type_t, obj_no_t, int, int);
+bool	IsLineDefInside (int, int, int, int, int);
+int	GetOppositeSector (int, bool);
+void	CopyObjects (int, SelPtr);
+bool	MoveObjectsToCoords (int, SelPtr, int, int, int);
+void	GetObjectCoords (int, int, int *, int *);
+int	FindFreeTag (void);
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/objid.h yadex-1.6.0/src/objid.h
--- yadex-1.5.2/src/objid.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/objid.h	2001-04-05 15:53:05.000000000 +0200
@@ -0,0 +1,83 @@
+/*
+ *	objid.h - object identity class
+ *	AYM 2000-11-06
+ */
+
+
+/*
+This file is part of Atclib.
+
+Atclib is Copyright  1995-1999 Andr Majorel.
+
+This library is free software; you can redistribute it and/or modify it under
+the terms of the GNU Library General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option) any
+later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
+details.
+
+You should have received a copy of the GNU Library General Public License
+along with this library; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#ifndef YH_OBJID  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_OBJID
+
+
+// FIXME turn those #defines to consts
+// FIXME there is an ambiguity in this class. Does canvas count
+// as an object or not ? The issue could use some thought.
+
+// Object types
+#define OBJ_NONE	0
+#define OBJ_THINGS	1
+#define OBJ_LINEDEFS	2
+#define OBJ_SIDEDEFS	3
+#define OBJ_VERTICES	4
+#define OBJ_SEGS	5
+#define OBJ_SSECTORS	6
+#define OBJ_NODES	7
+#define OBJ_SECTORS	8
+#define OBJ_REJECT	9
+#define OBJ_BLOCKMAP	10
+#define OBJ_ANY		11
+
+// Special object numbers
+typedef i16  obj_no_t;
+typedef char obj_type_t;
+#define OBJ_NO_NONE    -1
+#define OBJ_NO_CANVAS  -2
+#define is_obj(n)      ((n) >= 0)
+#define is_linedef(n)  ((n) >= 0 && (n) < NumLineDefs)
+#define is_sector(n)   ((n) >= 0 && (n) < NumSectors )
+#define is_sidedef(n)  ((n) >= 0 && (n) < NumSideDefs)
+#define is_thing(n)    ((n) >= 0 && (n) < NumThings  )
+#define is_vertex(n)   ((n) >= 0 && (n) < NumVertices)
+
+class Objid
+{
+  public :
+    Objid () { num = -1; type = OBJ_NONE; }
+    Objid (obj_type_t t, obj_no_t n) { type = t; num = n; }
+    bool operator== (const Objid& other) const
+    {
+      return other.type == type && other.num == num;
+    }
+    bool _is_linedef () const { return type == OBJ_LINEDEFS && num >= 0; }
+    bool _is_sector  () const { return type == OBJ_SECTORS  && num >= 0; }
+    bool _is_thing   () const { return type == OBJ_THINGS   && num >= 0; }
+    bool _is_vertex  () const { return type == OBJ_VERTICES && num >= 0; }
+    bool is_nil     () const { return num <  0 || type == OBJ_NONE; }
+    bool operator() () const { return num >= 0 && type != OBJ_NONE; } 
+    void nil () { num = -1; type = OBJ_NONE; }
+    obj_type_t type;
+    obj_no_t   num;
+};
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/objinfo.cc yadex-1.6.0/src/objinfo.cc
--- yadex-1.5.2/src/objinfo.cc	2001-06-21 15:52:59.000000000 +0200
+++ yadex-1.6.0/src/objinfo.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -39,6 +39,7 @@
 #include "img.h"
 #include "imgspect.h"
 #include "levels.h"
+#include "objid.h"
 #include "objinfo.h"
 #include "pic2img.h"
 #include "sticker.h"
@@ -62,6 +63,7 @@
       memcpy (this->tex, &tex, sizeof this->tex);
       this->height = height;
     }
+
     bool operator< (const Extraf& other) const
     {
       if (height < other.height)
@@ -70,6 +72,7 @@
 	return true;
       return false;
     }
+
     wad_z_t height;	// To sort by increasing floor height
     obj_no_t sector;	// Sector# (for heights, flats and light level)
     wad_tex_name_t tex;	// Texture (middle tex of first sidedef)
@@ -81,7 +84,7 @@
 
 objinfo_c::objinfo_c ()
 {
-  for (int n = 0; n < MAX_BOXES; n++)
+  for (size_t n = 0; n < MAX_BOXES; n++)
     box_disp[n] = false;
   obj_no      = OBJ_NO_NONE;
   obj_no_disp = OBJ_NO_NONE;
@@ -92,7 +95,7 @@
 
 void objinfo_c::draw ()
 {
-  int  tag, n;
+  int  n;
   int  sd1 = OBJ_NO_NONE;
   int  sd2 = OBJ_NO_NONE;
   int  s1 = OBJ_NO_NONE;
@@ -151,23 +154,23 @@
       const bool invalid_type = ! is_thing_type (Things[obj_no].type);
       set_colour (WINFG);
       DrawScreenText (-1, iy0 + (int) (1.5 * FONTH), 0);
-      DrawScreenText (-1, -1, "Coords: (%d, %d)",
+      DrawScreenText (-1, -1, "\1Coords:\2 (%d, %d)",
 	Things[obj_no].xpos, Things[obj_no].ypos);
-      DrawScreenString (-1, -1, "Type:   ");
+      DrawScreenString (-1, -1, "\1Type:   ");
       if (invalid_type)
 	push_colour (CLR_ERROR);
       DrawScreenText (-2, -2, "%d", Things[obj_no].type);
       if (invalid_type)
 	pop_colour ();
-      DrawScreenString (-1, -1, "Desc:   ");
+      DrawScreenString (-1, -1, "\1Desc:   ");
       if (invalid_type)
 	push_colour (CLR_ERROR);
       DrawScreenText (-2, -2, "%.19s", get_thing_name (Things[obj_no].type));
       if (invalid_type)
 	pop_colour ();
-      DrawScreenText (-1, -1, "Angle:  %s",
+      DrawScreenText (-1, -1, "\1Angle:\2  %s",
 	GetAngleName (Things[obj_no].angle));
-      DrawScreenText (-1, -1, "Flags:  %s",
+      DrawScreenText (-1, -1, "\1Flags:\2  %s",
 	GetWhenName (Things[obj_no].when));
 
       // Show the corresponding sprite
@@ -198,7 +201,7 @@
 	else
 	{
 	  Lump_loc loc;
-	  Img img (sprite_width, sprite_height);
+	  Img img (sprite_width, sprite_height, false);
 	  Sticker sticker;
 	  wad_res.sprites.loc_by_root (sprite_root, loc);
 	  if (loc.wad == 0
@@ -228,212 +231,224 @@
 	}
       }
     }
-       break;
+    break;
 
     case OBJ_LINEDEFS:
-       width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + 29 * FONTW;
-       height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (8.5 * FONTH);
-       x0 = 0;
-       y0 = out_y1 - height + 1;
-       ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
-       iy0 = y0 + BOX_BORDER + WIDE_VSPACING;
-       // Ignore box_disp -- always redraw the whole box
-       DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
-       if (obj_no >= 0)
-       {
-	 set_colour (YELLOW);
-	 DrawScreenText (ix0, iy0, "Linedef #%d", obj_no);
-	 set_colour (WINFG);
-	 DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
-			 "Flags:    %.19s",
-			 GetLineDefFlagsName (LineDefs[obj_no].flags));
-	 DrawScreenText (-1, -1, "Type: %3d %.19s",
-			 LineDefs[obj_no].type,
-			 GetLineDefTypeName (LineDefs[obj_no].type));
-	 sd1 = LineDefs[obj_no].sidedef1;
-	 sd2 = LineDefs[obj_no].sidedef2;
-	 tag = LineDefs[obj_no].tag;
-	 s1 = LineDefs[obj_no].start;
-	 s2 = LineDefs[obj_no].end;
-	 ObjectsNeeded (OBJ_SIDEDEFS, OBJ_SECTORS, 0);
-	 if (tag > 0)
-	 {
-	   for (n = 0; n < NumSectors; n++)
-	     if (Sectors[n].tag == tag)
-	       break;
-	 }
-	 else
-	   n = NumSectors;
-	 if (n < NumSectors)
-	   DrawScreenText (-1, -1, "Tag:      %d (#%d)", tag, n);
-	 else
-	   DrawScreenText (-1, -1, "Tag:      %d (none)", tag);
-	 DrawScreenText (-1, -1, "Vertices: (#%d, #%d)", s1, s2);
-	 ObjectsNeeded (OBJ_VERTICES, 0);
-	 n = ComputeDist (Vertices[s2].x - Vertices[s1].x,
-			  Vertices[s2].y - Vertices[s1].y);
-	 DrawScreenText (-1, -1, "Length:   %d", n);
-	 DrawScreenText (-1, -1, "1st sd:   #%d", sd1);
-	 DrawScreenText (-1, -1, "2nd sd:   #%d", sd2);
-	 if (sd1 >= 0)
-	   s1 = SideDefs[sd1].sector;
-	 else
-	   s1 = -1;
-	 if (sd2 >= 0)
-	   s2 = SideDefs[sd2].sector;
-	 else
-	   s2 = -1;
-       }
-       else
-       {
-	 const char *message = "(no linedef selected)";
-	 set_colour (WINFG_DIM);
-	 DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
-	   y0 + (height - FONTH) / 2, message);
-       }
+      width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + 29 * FONTW;
+      height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (8.5 * FONTH);
+      x0 = 0;
+      y0 = out_y1 - height + 1;
+      ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
+      iy0 = y0 + BOX_BORDER + WIDE_VSPACING;
+      // Ignore box_disp -- always redraw the whole box
+      DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
+      if (obj_no >= 0)
+      {
+	set_colour (YELLOW);
+	DrawScreenText (ix0, iy0, "Linedef #%d", obj_no);
+	set_colour (WINFG);
+	DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
+			"\1Flags:\2    %.19s",
+			GetLineDefFlagsName (LineDefs[obj_no].flags));
+	DrawScreenText (-1, -1, "\1Type:\2 %3d %.19s",
+			LineDefs[obj_no].type,
+			GetLineDefTypeName (LineDefs[obj_no].type));
+	ObjectsNeeded (OBJ_SIDEDEFS, OBJ_SECTORS, 0);
+	{
+	  int tag           = LineDefs[obj_no].tag;
+	  int first_sector  = NumSectors;
+	  int second_sector = NumSectors;
+	  if (tag != 0)
+	  {
+	    for (int n = 0; n < NumSectors; n++)
+	      if (Sectors[n].tag == tag)
+	      {
+		if (first_sector >= NumSectors)
+		  first_sector = n;
+		else
+		{
+		  second_sector = n;
+		  break;
+		}
+	      }
+	  }
+	  if (first_sector < NumSectors && second_sector < NumSectors)
+	    DrawScreenText (-1, -1, "\1Tag:\2      %d (#%d+)", tag, first_sector);
+	  else if (first_sector < NumSectors)
+	    DrawScreenText (-1, -1, "\1Tag:\2      %d (#%d)", tag, first_sector);
+	  else
+	    DrawScreenText (-1, -1, "\1Tag:\2      %d (none)", tag);
+	}
+	s1 = LineDefs[obj_no].start;
+	s2 = LineDefs[obj_no].end;
+	DrawScreenText (-1, -1, "\1Vertices:\2 (#%d, #%d)", s1, s2);
+	ObjectsNeeded (OBJ_VERTICES, 0);
+	n = ComputeDist (Vertices[s2].x - Vertices[s1].x,
+			 Vertices[s2].y - Vertices[s1].y);
+	DrawScreenText (-1, -1, "\1Length:\2   %d", n);
+	sd1 = LineDefs[obj_no].sidedef1;
+	sd2 = LineDefs[obj_no].sidedef2;
+	DrawScreenText (-1, -1, "\1" "1st sd:\2   #%d", sd1);
+	DrawScreenText (-1, -1, "\1" "2nd sd:\2   #%d", sd2);
+	if (sd1 >= 0)
+	  s1 = SideDefs[sd1].sector;
+	else
+	  s1 = -1;
+	if (sd2 >= 0)
+	  s2 = SideDefs[sd2].sector;
+	else
+	  s2 = -1;
+      }
+      else
+      {
+	const char *message = "(no linedef selected)";
+	set_colour (WINFG_DIM);
+	DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
+	  y0 + (height - FONTH) / 2, message);
+      }
 
-       x0 += width;
-       width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + 16 * FONTW;
-       ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
-       y0 = out_y1 - height + 1;
-       // Ignore box_disp -- always redraw the whole box
-       DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
-       if (obj_no >= 0 && sd1 >= 0)
-       {
-	 set_colour (YELLOW);
-	 DrawScreenText (ix0, iy0, "Sidedef1 #%d", sd1);
-
-	 if (s1 >= 0 && s2 >= 0 && Sectors[s1].ceilh > Sectors[s2].ceilh
-	   && ! (is_sky (Sectors[s1].ceilt) && is_sky (Sectors[s2].ceilt)))
-	 {
-	   if (SideDefs[sd1].tex1[0] == '-' && SideDefs[sd1].tex1[1] == '\0')
-	     set_colour (CLR_ERROR);
-	   else
-	     set_colour (WINFG);
-	 }
-	 else
-	   set_colour (WINFG_DIM);
-	 DrawScreenText (-1, iy0 + (int) (1.5 * FONTH), "Upper:  %.*s",
-	     WAD_TEX_NAME, SideDefs[sd1].tex1);
-
-	 if (sd2 < 0
-	   && SideDefs[sd1].tex3[0] == '-' && SideDefs[sd1].tex3[1] == '\0')
-	   set_colour (CLR_ERROR);
-	 else
-	   set_colour (WINFG);
-	 DrawScreenText (-1, -1,
-	   "Middle: %.*s", WAD_TEX_NAME, SideDefs[sd1].tex3);
-
-	 if (s1 >= 0 && s2 >= 0 && Sectors[s1].floorh < Sectors[s2].floorh
-	   && ! (is_sky (Sectors[s1].floort) && is_sky (Sectors[s2].floort)))
-	 {
-	   if (SideDefs[sd1].tex2[0] == '-' && SideDefs[sd1].tex2[1] == '\0')
-	     set_colour (CLR_ERROR);
-	   else
-	     set_colour (WINFG);
-	 }
-	 else
-	   set_colour (WINFG_DIM);
-	 DrawScreenText (-1, -1, "Lower:  %.*s",
-	   WAD_TEX_NAME, SideDefs[sd1].tex2);
-
-	 set_colour (WINFG);
-	 DrawScreenText (-1, -1, "X-ofs:  %d", SideDefs[sd1].xoff);
-	 DrawScreenText (-1, -1, "Y-ofs:  %d", SideDefs[sd1].yoff);
-	 DrawScreenText (-1, -1, "Sector: #%d", s1);
-       }
-       else
-       {
-	 const char *message = "(no 1st sidedef)";
-	 set_colour (CLR_ERROR);
-	 DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
-	   y0 + (height - FONTH) / 2, message);
-       }
-       x0 += width;
-       ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
-       y0 = out_y1 - height + 1;
-       // Ignore box_disp -- always redraw the whole box
-       DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
-       if (obj_no >= 0 && sd2 >= 0)
-       {
-	 set_colour (YELLOW);
-	 DrawScreenText (ix0, iy0, "Sidedef2 #%d", sd2);
-	 set_colour (WINFG);
-	 const char *tex_name;
-
-	 tex_name = SideDefs[sd2].tex1;  // Upper texture
-	 if (s1 >= 0 && s2 >= 0 && Sectors[s2].ceilh > Sectors[s1].ceilh
-	   && ! (is_sky (Sectors[s1].ceilt) && is_sky (Sectors[s2].ceilt)))
-	 {
-	   if (tex_name[0] == '-' && tex_name[1] == '\0')
-	     set_colour (CLR_ERROR);
-	   else
-	     set_colour (WINFG);
-	 }
-	 else
-	   set_colour (WINFG_DIM);
-	 DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
-	   "Upper:  %.*s", WAD_TEX_NAME, tex_name);
-
-	 tex_name = SideDefs[sd2].tex3;  // Middle texture
-	 set_colour (WINFG);
-	 DrawScreenText (-1, -1,
-	   "Middle: %.*s", WAD_TEX_NAME, tex_name);
-
-	 tex_name = SideDefs[sd2].tex2;  // Lower texture
-	 if (s1 >= 0 && s2 >= 0 && Sectors[s2].floorh < Sectors[s1].floorh
-	   && ! (is_sky (Sectors[s1].floort) && is_sky (Sectors[s2].floort)))
-	 {
-	   if (tex_name[0] == '-' && tex_name[1] == '\0')
-	     set_colour (CLR_ERROR);
-	   else
-	     set_colour (WINFG);
-	 }
-	 else
-	   set_colour (WINFG_DIM);
-	 DrawScreenText (-1, -1, "Lower:  %.*s", WAD_TEX_NAME, tex_name);
-
-	 set_colour (WINFG);
-	 DrawScreenText (-1, -1, "X-ofs:  %d", SideDefs[sd2].xoff);
-	 DrawScreenText (-1, -1, "Y-ofs:  %d", SideDefs[sd2].yoff);
-	 DrawScreenText (-1, -1, "Sector: #%d", s2);
-       }
-       else
-       {
-	 const char *message = "(no 2nd sidedef)";
-	 // If the "2" flag is set, there must be a second sidedef
-	 if (LineDefs[obj_no].flags & 0x04)  // FIXME hard-coded
-	   set_colour (CLR_ERROR);
-	 else
-	   set_colour (WINFG_DIM);
-	 DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
-	   y0 + (height - FONTH) / 2, message);
-       }
-       break;
+      x0 += width;
+      width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + 16 * FONTW;
+      ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
+      y0 = out_y1 - height + 1;
+      // Ignore box_disp -- always redraw the whole box
+      DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
+      if (obj_no >= 0 && sd1 >= 0)
+      {
+	set_colour (YELLOW);
+	DrawScreenText (ix0, iy0, "Sidedef1 #%d", sd1);
+
+	if (s1 >= 0 && s2 >= 0 && Sectors[s1].ceilh > Sectors[s2].ceilh
+	  && ! (is_sky (Sectors[s1].ceilt) && is_sky (Sectors[s2].ceilt)))
+	{
+	  if (SideDefs[sd1].tex1[0] == '-' && SideDefs[sd1].tex1[1] == '\0')
+	    set_colour (CLR_ERROR);
+	  else
+	    set_colour (WINFG);
+	}
+	else
+	  set_colour (WINFG_DIM);
+	DrawScreenText (-1, iy0 + (int) (1.5 * FONTH), "\1Upper:\2  %.*s",
+	    WAD_TEX_NAME, SideDefs[sd1].tex1);
+
+	if (sd2 < 0
+	  && SideDefs[sd1].tex3[0] == '-' && SideDefs[sd1].tex3[1] == '\0')
+	  set_colour (CLR_ERROR);
+	else
+	  set_colour (WINFG);
+	DrawScreenText (-1, -1,
+	  "\1Middle:\2 %.*s", WAD_TEX_NAME, SideDefs[sd1].tex3);
+
+	if (s1 >= 0 && s2 >= 0 && Sectors[s1].floorh < Sectors[s2].floorh
+	  && ! (is_sky (Sectors[s1].floort) && is_sky (Sectors[s2].floort)))
+	{
+	  if (SideDefs[sd1].tex2[0] == '-' && SideDefs[sd1].tex2[1] == '\0')
+	    set_colour (CLR_ERROR);
+	  else
+	    set_colour (WINFG);
+	}
+	else
+	  set_colour (WINFG_DIM);
+	DrawScreenText (-1, -1, "\1Lower:\2  %.*s",
+	  WAD_TEX_NAME, SideDefs[sd1].tex2);
+
+	set_colour (WINFG);
+	DrawScreenText (-1, -1, "\1X-ofs:\2  %d", SideDefs[sd1].xoff);
+	DrawScreenText (-1, -1, "\1Y-ofs:\2  %d", SideDefs[sd1].yoff);
+	DrawScreenText (-1, -1, "\1Sector:\2 #%d", s1);
+      }
+      else
+      {
+	const char *message = "(no 1st sidedef)";
+	set_colour (CLR_ERROR);
+	DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
+	  y0 + (height - FONTH) / 2, message);
+      }
+      x0 += width;
+      ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
+      y0 = out_y1 - height + 1;
+      // Ignore box_disp -- always redraw the whole box
+      DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
+      if (obj_no >= 0 && sd2 >= 0)
+      {
+	set_colour (YELLOW);
+	DrawScreenText (ix0, iy0, "Sidedef2 #%d", sd2);
+	set_colour (WINFG);
+	const char *tex_name;
+
+	tex_name = SideDefs[sd2].tex1;  // Upper texture
+	if (s1 >= 0 && s2 >= 0 && Sectors[s2].ceilh > Sectors[s1].ceilh
+	  && ! (is_sky (Sectors[s1].ceilt) && is_sky (Sectors[s2].ceilt)))
+	{
+	  if (tex_name[0] == '-' && tex_name[1] == '\0')
+	    set_colour (CLR_ERROR);
+	  else
+	    set_colour (WINFG);
+	}
+	else
+	  set_colour (WINFG_DIM);
+	DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
+	  "\1Upper:\2  %.*s", WAD_TEX_NAME, tex_name);
+
+	tex_name = SideDefs[sd2].tex3;  // Middle texture
+	set_colour (WINFG);
+	DrawScreenText (-1, -1,
+	  "\1Middle:\2 %.*s", WAD_TEX_NAME, tex_name);
+
+	tex_name = SideDefs[sd2].tex2;  // Lower texture
+	if (s1 >= 0 && s2 >= 0 && Sectors[s2].floorh < Sectors[s1].floorh
+	  && ! (is_sky (Sectors[s1].floort) && is_sky (Sectors[s2].floort)))
+	{
+	  if (tex_name[0] == '-' && tex_name[1] == '\0')
+	    set_colour (CLR_ERROR);
+	  else
+	    set_colour (WINFG);
+	}
+	else
+	  set_colour (WINFG_DIM);
+	DrawScreenText (-1, -1, "\1Lower:\2  %.*s", WAD_TEX_NAME, tex_name);
+
+	set_colour (WINFG);
+	DrawScreenText (-1, -1, "\1X-ofs:\2  %d", SideDefs[sd2].xoff);
+	DrawScreenText (-1, -1, "\1Y-ofs:\2  %d", SideDefs[sd2].yoff);
+	DrawScreenText (-1, -1, "\1Sector:\2 #%d", s2);
+      }
+      else
+      {
+	const char *message = "(no 2nd sidedef)";
+	// If the "2" flag is set, there must be a second sidedef
+	if (LineDefs[obj_no].flags & 0x04)  // FIXME hard-coded
+	  set_colour (CLR_ERROR);
+	else
+	  set_colour (WINFG_DIM);
+	DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
+	  y0 + (height - FONTH) / 2, message);
+      }
+      break;
 
     case OBJ_VERTICES:
-       width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + 29 * FONTW;
-       height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (2.5 * FONTH);
-       x0 = 0;
-       y0 = out_y1 - height + 1;
-       ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
-       iy0 = y0 + BOX_BORDER + WIDE_VSPACING;
-       // Ignore box_disp -- always redraw the whole box
-       DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
-       if (obj_no < 0)
-       {
-	 const char *message = "(no vertex selected)";
-	 set_colour (WINFG_DIM);
-	 DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
-	   y0 + (height - FONTH) / 2, message);
-	 break;
-       }
-       set_colour (YELLOW);
-       DrawScreenText (ix0, iy0, "Vertex #%d", obj_no);
-       set_colour (WINFG);
-       DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
-	 "Coordinates: (%d, %d)", Vertices[obj_no].x, Vertices[obj_no].y);
-       break;
+      width  = 2 * BOX_BORDER + 2 * WIDE_HSPACING + 29 * FONTW;
+      height = 2 * BOX_BORDER + 2 * WIDE_VSPACING + (int) (2.5 * FONTH);
+      x0 = 0;
+      y0 = out_y1 - height + 1;
+      ix0 = x0 + BOX_BORDER + WIDE_HSPACING;
+      iy0 = y0 + BOX_BORDER + WIDE_VSPACING;
+      // Ignore box_disp -- always redraw the whole box
+      DrawScreenBox3D (x0, y0, x0 + width - 1, y0 + height - 1);
+      if (obj_no < 0)
+      {
+	const char *message = "(no vertex selected)";
+	set_colour (WINFG_DIM);
+	DrawScreenText (x0 + (width - FONTW * strlen (message)) / 2,
+	  y0 + (height - FONTH) / 2, message);
+	break;
+      }
+      set_colour (YELLOW);
+      DrawScreenText (ix0, iy0, "Vertex #%d", obj_no);
+      set_colour (WINFG);
+      DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
+	"\1Coordinates:\2 (%d, %d)", Vertices[obj_no].x, Vertices[obj_no].y);
+      break;
 
     case OBJ_SECTORS:
     {
@@ -451,7 +466,7 @@
 	     + BOX_BORDER;
       height = 2 * BOX_BORDER
 	     + 2 * WIDE_VSPACING
-	     + y_max ((int) (9.5 * FONTH),
+	     + y_max ((unsigned) (9.5 * FONTH),
 		    WIDE_HSPACING + 4 * HOLLOW_BORDER + 2 * DOOM_FLAT_HEIGHT);
       x0 = 0;
       y0 = out_y1 - height + 1;
@@ -484,39 +499,56 @@
       if (prev_sector >= 0 && prev_sector != obj_no)
       {
 	DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
-	  "Floor:    %d (%+d)",
+	  "\1Floor:\2    %d (%+d)",
 	  sec->floorh, sec->floorh - prev_floorh);
-	DrawScreenText (-1, -1, "Ceiling:  %d (%+d)",
+	DrawScreenText (-1, -1, "\1Ceiling:\2  %d (%+d)",
 	  sec->ceilh, sec->ceilh - prev_ceilh);
       }
       else
       {
 	DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
-	  "Floor:    %d",   sec->floorh);
-        DrawScreenText (-1, -1, "Ceiling:  %d",  sec->ceilh);
+	  "\1Floor:\2    %d",   sec->floorh);
+        DrawScreenText (-1, -1, "\1Ceiling:\2  %d",  sec->ceilh);
       }
-      DrawScreenText (-1, -1, "Headroom: %d",   sec->ceilh - sec->floorh);
-      DrawScreenText (-1, -1, "Floor:    %.*s", WAD_FLAT_NAME, sec->floort);
-      DrawScreenText (-1, -1, "Ceiling:  %.*s", WAD_FLAT_NAME, sec->ceilt);
-      DrawScreenText (-1, -1, "Light:    %d",   sec->light);
-      DrawScreenText (-1, -1, "Type: %3d %.14s",
+      DrawScreenText (-1, -1, "\1Headroom:\2 %d",   sec->ceilh - sec->floorh);
+      DrawScreenText (-1, -1, "\1Floor:\2    %.*s", WAD_FLAT_NAME, sec->floort);
+      DrawScreenText (-1, -1, "\1Ceiling:\2  %.*s", WAD_FLAT_NAME, sec->ceilt);
+      DrawScreenText (-1, -1, "\1Light:\2    %d",   sec->light);
+      DrawScreenText (-1, -1, "\1Type:\2 %3d %.14s",
 	sec->special, GetSectorTypeName (sec->special));
-      tag = sec->tag;
-      ObjectsNeeded (OBJ_LINEDEFS, 0);
-      if (tag == 0)
-	 n = NumLineDefs;
-      else
-	 for (n = 0; n < NumLineDefs; n++)
+      {
+	int tag       = sec->tag;
+	int first_ld  = NumLineDefs;
+	int second_ld = NumLineDefs;
+
+	ObjectsNeeded (OBJ_LINEDEFS, 0);
+	if (tag != 0)
+	{
+	  for (n = 0; n < NumLineDefs; n++)
 	    if (LineDefs[n].tag == tag)
-	       break;
-      if (n < NumLineDefs)
-	 DrawScreenText (-1, -1, "Tag:      %d (#%d)", tag, n);
-      else if (tag == 99 || tag == 999)
-	 DrawScreenText (-1, -1, "Tag:      %d (stairs?)", tag);
-      else if (tag == 666)
-	 DrawScreenText (-1, -1, "Tag:      %d (lower@end)", tag);
-      else
-	 DrawScreenText (-1, -1, "Tag:      %d (none)", tag);
+	    {
+	      if (first_ld >= NumLineDefs)
+		first_ld = n;
+	      else
+	      {
+		second_ld = n;
+		break;
+	      }
+	    }
+	}
+	if (first_ld < NumLineDefs && second_ld < NumLineDefs)
+	   DrawScreenText (-1, -1, "\1Tag:\2      %d (#%d+)", tag, first_ld);
+	else if (first_ld < NumLineDefs)
+	   DrawScreenText (-1, -1, "\1Tag:\2      %d (#%d)", tag, first_ld);
+	else if (tag == 99 || tag == 999)
+	   DrawScreenText (-1, -1, "\1Tag:\2      %d (stairs?)", tag);
+	else if (tag == 666)
+	   DrawScreenText (-1, -1, "\1Tag:\2      %d (lower@end)", tag);
+	else if (tag == 667)
+	   DrawScreenText (-1, -1, "\1Tag:\2      %d (raise@end)", tag);
+	else
+	   DrawScreenText (-1, -1, "\1Tag:\2      %d (none)", tag);
+      }
       {
 	hookfunc_comm_t block;
 
@@ -549,13 +581,13 @@
 			   + WIDE_HSPACING
 			   + BOX_BORDER;
 	std::vector<Extraf> v;
-	get_extrafloors (v, tag);
-	int e;
+	get_extrafloors (v, sec->tag);
+	size_t e;
 	for (e = 0; e < v.size () && e + 1 < MAX_BOXES; e++, x0 += width2)
 	{
-	  const Extraf *i = &(v[e]);
-	  obj_no_t dsecno = i->sector;
-	  bool thick = (*i->tex != '\0');
+	  const Extraf& i = v[e];
+	  obj_no_t dsecno = i.sector;
+	  bool thick = (*i.tex != '\0');
 	  const struct Sector *dsec = Sectors + dsecno;
 	  x1 = x0 + width2 - 1;
 	  y1 = y0 + height - 1;
@@ -585,24 +617,23 @@
 	  if (thick)
 	  {
 	    DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
-				    "Bottom: %d",   dsec->floorh);
-	    DrawScreenText (-1, -1, "Top:    %d",   dsec->ceilh);
-	    DrawScreenText (-1, -1, "Thick:  %d",   dsec->ceilh - dsec->floorh);
-	    DrawScreenText (-1, -1, "Bottom: %.*s", WAD_FLAT_NAME,dsec->floort);
-	    DrawScreenText (-1, -1, "Top:    %.*s", WAD_FLAT_NAME, dsec->ceilt);
+				    "\1Bottom:\2 %d",   dsec->floorh);
+	    DrawScreenText (-1, -1, "\1Top:\2    %d",   dsec->ceilh);
+	    DrawScreenText (-1, -1, "\1Thick:\2  %d",   dsec->ceilh - dsec->floorh);
+	    DrawScreenText (-1, -1, "\1Bottom:\2 %.*s", WAD_FLAT_NAME,dsec->floort);
+	    DrawScreenText (-1, -1, "\1Top:\2    %.*s", WAD_FLAT_NAME, dsec->ceilt);
 	  }
 	  else
 	  {
 	    DrawScreenText (-1, iy0 + (int) (1.5 * FONTH),
-				    "Height: %d",   dsec->floorh);
-	    DrawScreenText (-1, -1, "Flat:   %.*s", WAD_FLAT_NAME,dsec->floort);
+				    "\1Height:\2 %d",   dsec->floorh);
+	    DrawScreenText (-1, -1, "\1Flat:\2   %.*s", WAD_FLAT_NAME,dsec->floort);
 	  }
-	  DrawScreenText (-1, -1, "Shadow: %d",   dsec->light);
-	  DrawScreenText (-1, -1, "Type:   %d",   dsec->special);
-	  tag = dsec->tag;
+	  DrawScreenText (-1, -1, "\1Shadow:\2 %d",   dsec->light);
+	  DrawScreenText (-1, -1, "\1Type:\2   %d",   dsec->special);
 	  ObjectsNeeded (OBJ_LINEDEFS, 0);
 	  if (thick)
-	    DrawScreenText (-1, -1, "Side:   %.*s", WAD_TEX_NAME, i->tex);
+	    DrawScreenText (-1, -1, "\1Side:\2   %.*s", WAD_TEX_NAME, i.tex);
 	  {
 	    hookfunc_comm_t block;
 
diff -uaNr yadex-1.5.2/src/objinfo.h yadex-1.6.0/src/objinfo.h
--- yadex-1.5.2/src/objinfo.h	2000-08-17 00:45:58.000000000 +0200
+++ yadex-1.6.0/src/objinfo.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -60,13 +60,13 @@
 
       void clear ()
       {
-	for (int n = 0; n < MAX_BOXES; n++)
+	for (size_t n = 0; n < MAX_BOXES; n++)
 	  box_disp[n] = false;
 	obj_no_disp = OBJ_NO_NONE;
       }
 
    private :
-      static const int MAX_BOXES = 10;
+      static const size_t MAX_BOXES = 10;
       bool box_disp[MAX_BOXES];	// Is the box already drawn ?
       int obj_no;        // The no. of the object we should display info about
       int obj_type;      // The type of the object we should display info about
diff -uaNr yadex-1.5.2/src/oldmenus.cc yadex-1.6.0/src/oldmenus.cc
--- yadex-1.5.2/src/oldmenus.cc	2000-05-07 16:54:26.000000000 +0200
+++ yadex-1.6.0/src/oldmenus.cc	2003-03-28 13:37:32.000000000 +0100
@@ -16,7 +16,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -41,139 +41,127 @@
 #include "oldmenus.h"
 
 
-static int loop (menu_c *menu, int x, int y, int item_no);
+static int loop (Menu *menu, int x, int y, int item_no);
 
 
 /*
- *	DisplayMenu
- *	Display and execute a popup menu
- *	defined with variable arguments.
+ *	vDisplayMenu - create a menu from variable arguments and call loop()
+ *
+ *	Display and execute a popup menu defined with variable
+ *	arguments.
+ *
+ *	Return the same thing as Menu::process_event().
  */
-int DisplayMenu (int x0, int y0, const char *menutitle, ...)
+int vDisplayMenu (int x0, int y0, const char *title, ...)
 {
-va_list args;
-int     num;
-char   *menustr[36];
-
-/* put the va_args in the menustr table */
-num = 0;
-va_start (args, menutitle);
-while ((num < 36) && ((menustr[num] = va_arg (args, char *)) != NULL))
-   num++;
-va_end (args);
+  va_list args;
 
-/* display the menu */
-return DisplayMenuArray (x0, y0, menutitle, num, NULL, menustr, NULL, NULL, NULL);
+  va_start (args, title);
+  Menu menu (title, args);
+  va_end (args);
+  int r = loop (&menu, x0, y0, 0);
+  return r + 1;
 }
 
 
 /*
- *	DisplayMenuArray
+ *	DisplayMenuList - create a menu from a list and call loop()
+ *
+ *	Display and execute a menu contained in a list. Each
+ *	menu item string is obtained by calling (*getstr)() with
+ *	a pointer on the list item.
+ *
+ *	Return the number of the selected item (0-based) or -1
+ *	if exited by [Esc].
  *
- *	Display and execute a menu.
- *	Return the number of the selected item (1-based)
- *	or 0 if exited by [Esc].
  *	This function is deprecated.
  */
-int DisplayMenuArray (
-   int		x0,
-   int		y0,
-   const char	*menutitle,
-   int		numitems,
-   int		*ticked,
-   char		**menustr,		/* Strings to display */
-   const i8	*shortcut_index,
-   const int	*shortcut_key,
-   int		*grayed_out)
+int DisplayMenuList (
+  int		x0,
+  int		y0,
+  const char	*menutitle,
+  al_llist_t	*list,
+  const char	*(*getstr)(void *),
+  int		*item_no)
 {
-menu_c *menu = new menu_c (
-   menutitle,
-   numitems,
-   ticked,
-   menustr,
-   shortcut_index,
-   shortcut_key,
-   grayed_out);
-int r = loop (menu, x0, y0, 0);
-delete menu;
-return r + 1;
+  Menu menu (menutitle, list, getstr);
+  int r = loop (&menu, x0, y0, item_no ? *item_no : 0);
+  if (item_no && r >= 0)
+    *item_no = r;
+  return r;
 }
 
 
 /*
- *	DisplayMenuList
- *	Display and execute a menu contained in a list. Each menu item
- *	string is obtained by calling (*getstr)() with a pointer on
- *	the list item.
- *	Return the number of the selected item (0-based)
- *	or -1 if exited by [Esc].
+ *	DisplayMenuList - create a menu from a Menu_data and call loop()
+ *
+ *	Display and execute a menu contained in a Menu_data.
+ *
+ *	Return the number of the selected item (0-based) or -1
+ *	if exited by [Esc].
+ *
  *	This function is deprecated.
  */
 int DisplayMenuList (
-   int		x0,
-   int		y0,
-   const char	*menutitle,
-   al_llist_t	*list,
-   const char	*(*getstr)(void *),
-   int		*item_no)
+  int		x0,
+  int		y0,
+  const char	*menutitle,
+  Menu_data&    menudata,
+  int		*item_no)
 {
-menu_c *menu = new menu_c (menutitle, list, getstr);
-int r = loop (menu, x0, y0, item_no ? *item_no : 0);
-if (item_no && r >= 0)
-   *item_no = r;
-delete menu;
-return r;
+  Menu menu (menutitle, menudata);
+  int r = loop (&menu, x0, y0, item_no ? *item_no : 0);
+  if (item_no && r >= 0)
+    *item_no = r;
+  return r;
 }
 
 
 /*
- *	loop
- *	Display and execute and menu.
- *	Return the number of the selected item (0-based)
- *	or -1 if exited by [Esc].
+ *	loop - display and execute a menu
+ *
+ *	Return the number of the selected item (0-based) or -1
+ *	if exited by [Esc].
  *
  *	This function is nothing more than a quick and dirty
  *	hack, provided as a stopgap until the widget stack is
  *	implemented and the code uses it. 
  */
-static int loop (menu_c *menu, int x, int y, int item_no)
+static int loop (Menu *menu, int x, int y, int item_no)
 {
-menu->set_popup         (1);
-menu->set_force_numbers (1);
-menu->set_coords        (x, y);
-menu->set_visible       (1);
-menu->set_item_no       (item_no);
-for (;;)
-   {
-   menu->draw ();
-   if (has_event ())
-      {
+  menu->set_popup         (true);
+  menu->set_force_numbers (true);
+  menu->set_coords        (x, y);
+  menu->set_visible       (true);
+  menu->set_item_no       (item_no);
+  for (;;)
+  {
+    menu->draw ();
+    if (has_event ())
+    {
       is.key = get_event ();
       // If we had called get_input_status(), XNextEvent()
       // would have been called and we wouldn't have to do that.
       XFlush (dpy);
-      }
-   else
+    }
+    else
       get_input_status ();
-   if (is.key == YE_EXPOSE)
+    if (is.key == YE_EXPOSE)
       menu->clear ();  // Force menu to redraw itself from scratch
-   else if (is.key == YE_BUTL_PRESS
-      && (is.x < menu->get_x0 ()
-         || is.x > menu->get_x1 ()
-         || is.y < menu->get_y0 ()
-         || is.y > menu->get_y1 ()))
+    else if (is.key == YE_BUTL_PRESS
+      && ((int) is.x < menu->get_x0 ()
+	 || (int) is.x > menu->get_x1 ()
+	 || (int) is.y < menu->get_y0 ()
+	 || (int) is.y > menu->get_y1 ()))
       return -1;
-   else
-      {
+    else
+    {
       int r = menu->process_event (&is);
       if (r == MEN_CANCEL)
-         return -1;
+	 return -1;
       else if (r >= 0)
-         return r;
-      }
-   }
+	 return r;
+    }
+  }
 }
 
-
-
-
diff -uaNr yadex-1.5.2/src/oldmenus.h yadex-1.6.0/src/oldmenus.h
--- yadex-1.5.2/src/oldmenus.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/oldmenus.h	2002-05-09 12:36:30.000000000 +0200
@@ -4,7 +4,14 @@
  */
 
 
-int DisplayMenu (int, int, const char *, ...);
+#ifndef YH_OLDMENUS  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_OLDMENUS
+
+
+class Menu_data;
+
+
+int vDisplayMenu (int, int, const char *, ...);
 
 int DisplayMenuList (
    int		x0,
@@ -14,15 +21,12 @@
    const char	*(*getstr)(void *),
    int		*item_no);
 
-int DisplayMenuArray (
-   int		x0,
-   int		y0,
-   const char	*title,
-   int		numitems,
-   int		*ticked,
-   char		**menustr,
-   const i8	*shortcut_index,
-   const int	*shortcut_key,
-   int		*grayed_out);
+int DisplayMenuList (
+  int		x0,
+  int		y0,
+  const char	*menutitle,
+  Menu_data&    menudata,
+  int		*item_no);
 
 
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/palview.cc yadex-1.6.0/src/palview.cc
--- yadex-1.5.2/src/palview.cc	2000-05-13 00:58:14.000000000 +0200
+++ yadex-1.6.0/src/palview.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -35,6 +35,7 @@
 #include "gfx.h"
 #include "palview.h"
 #include "rgb.h"
+#include "wadfile.h"
 #include "wads.h"
 #include "ytime.h"
 
@@ -63,59 +64,77 @@
 // Load the PLAYPAL lump
 do
 {
-  MDirPtr dir = FindMasterDir (MasterDir, "PLAYPAL");
+  playpal = new rgb_c[DOOM_COLOURS];
+  for (size_t n = 0; n < DOOM_COLOURS; n++)
+    playpal[n].set (0, 0, 0);
+  const char *lump_name = "PLAYPAL";
+  MDirPtr dir = FindMasterDir (MasterDir, lump_name);
   if (dir == NULL)
   {
-    warn ("PLAYPAL lump not found.\n");
-    playpal = new rgb_c[DOOM_COLOURS];
-    for (size_t n = 0; n < DOOM_COLOURS; n++)
-      playpal[n].set (0, 0, 0);
+    warn ("%s: lump not found\n", lump_name);
     break;
   }
+  const Wad_file *wf = dir->wadfile;
   if (dir->dir.size % (3 * DOOM_COLOURS) != 0)
   {
-    warn ("PLAYPAL has weird size (%ld, not mult of %d). Ignoring tail.\n",
-      (long) dir->dir.size, (int) (DOOM_COLOURS * 3));
+    warn ("%s has weird size (%ld, not mult of %d), ignoring tail\n",
+      lump_name, (long) dir->dir.size, (int) (DOOM_COLOURS * 3));
+  }
+  wf->seek (dir->dir.start);
+  if (wf->error ())
+  {
+    warn ("%s: seek error\n", lump_name);
+    break;
   }
-  wad_seek (dir->wadfile, dir->dir.start);
   playpal = new rgb_c[DOOM_COLOURS];
   for (size_t n = 0; n < DOOM_COLOURS; n++)
   {
     char buf[3];
-    wad_read_bytes (dir->wadfile, buf, sizeof buf);
+    wf->read_bytes (buf, sizeof buf);
     playpal[n].set (buf[0], buf[1], buf[2]);
   }
+  if (wf->error ())
+    warn ("%s: read error\n", lump_name);
 }
 while (0);
 
 // Load the COLORMAP lump
 do
 {
-  MDirPtr dir = FindMasterDir (MasterDir, "COLORMAP");
+  const char *lump_name = "COLORMAP";
+  MDirPtr dir = FindMasterDir (MasterDir, lump_name);
   if (dir == NULL)
   {
-    warn ("COLORMAP lump not found.\n");
+    warn ("%s: lump not found\n", lump_name);
     break;
   }
+  const Wad_file *wf = dir->wadfile;
   nmaps = dir->dir.size / DOOM_COLOURS;
   if ((long) DOOM_COLOURS * nmaps != dir->dir.size)
   {
-    warn ("COLORMAP has weird size (%ld, not mult of %d). Ignoring tail.\n",
-      (long) dir->dir.size, (int) DOOM_COLOURS);
+    warn ("%s: has weird size (%ld, not mult of %d), ignoring tail\n",
+      lump_name, (long) dir->dir.size, (int) DOOM_COLOURS);
   }
   if (nmaps > 200)
   {
-    warn ("COLORMAP has too many (%d) entries. Keeping only 200 first.\n",
-	nmaps);
+    warn ("%s has too many (%d) entries, keeping only 200 first\n",
+	lump_name, nmaps);
     nmaps = 200;
   }
-  wad_seek (dir->wadfile, dir->dir.start);
+  wf->seek (dir->dir.start);
+  if (wf->error ())
+  {
+    warn ("%s: seek error\n", lump_name);
+    break;
+  }
   colormap = new colormap_entry_t *[nmaps];
   for (int n = 0; n < nmaps; n++)
   {
     colormap[n] = new colormap_entry_t;
-    wad_read_bytes (dir->wadfile, colormap[n]->c, sizeof colormap[n]->c);
+    wf->read_bytes (colormap[n]->c, sizeof colormap[n]->c);
   }
+  if (wf->error ())
+    warn ("%s: read error\n", lump_name);
 }
 while (0);
 
diff -uaNr yadex-1.5.2/src/patchdir.cc yadex-1.6.0/src/patchdir.cc
--- yadex-1.5.2/src/patchdir.cc	2000-04-29 02:57:39.000000000 +0200
+++ yadex-1.6.0/src/patchdir.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -30,6 +30,7 @@
 
 #include "yadex.h"
 #include "patchdir.h"
+#include "wadfile.h"
 #include "wads.h"
 
 
@@ -82,54 +83,77 @@
 
   /* First load PNAMES so that we known in which order we should
      put the patches in the array. */
-  do
   {
-    MDirPtr dir;
-    i32 npatches_head = -42;
-    i32 npatches_body = -42;
-
-    dir = FindMasterDir (master_dir, "PNAMES");
-    if (dir == 0)
-    {
-      warn ("No PNAMES lump. Won't be able to render textures\n");
-      break;
-    }
-    i32 pnames_body_size = dir->dir.size - 4;
-    if (pnames_body_size < 0)
-    {
-      warn ("Bad PNAMES (negative size %ld)\n", (long) dir->dir.size);
-      warn ("Won't be able to render textures\n");
-      break;
-    }
-    if (pnames_body_size % 8)
-    {
-      warn ("PNAMES lump has weird size %ld. Discarding last %d bytes\n",
-	  (long) dir->dir.size, (int) (pnames_body_size % 8));
-    }
-    npatches_body = pnames_body_size / 8;
-    wad_seek (dir->wadfile, dir->dir.start);
-    wad_read_i32 (dir->wadfile, &npatches_head);
-    if (npatches_head > 0 && npatches_head < npatches_body)
-      npnames = npatches_head;
-    else
-      npnames = npatches_body;
-    if (npatches_head != npatches_body)
+    bool success = false;
+    const char *lump_name = "PNAMES";
+    do
     {
-      warn ("Disagreement on number of entries in PNAMES: header says %ld,\n",
-	  (long) npatches_head);
-      warn ("lump size suggests %ld. Going for %lu\n",
-	  (long) npatches_body, (unsigned long) npnames);
-    }
-    if (npnames > 32767)
-    {
-      warn ("PNAMES too big (%lu patches). Keeping only first 32767\n",
-	  (unsigned long) npnames);
-      npnames = 32767;
+      MDirPtr dir;
+      i32 npatches_head = -42;
+      i32 npatches_body = -42;
+
+      dir = FindMasterDir (master_dir, lump_name);
+      if (dir == 0)
+      {
+	warn ("No %s lump, won't be able to render textures\n", lump_name);
+	break;
+      }
+      i32 pnames_body_size = dir->dir.size - 4;
+      if (pnames_body_size < 0)
+      {
+	warn ("Bad %s (negative size %ld), won't be able to render textures\n",
+	    lump_name, (long) dir->dir.size);
+	break;
+      }
+      if (pnames_body_size % 8)
+      {
+	warn ("%s lump has weird size %ld, discarding last %d bytes\n",
+	    (long) dir->dir.size, (int) (pnames_body_size % 8));
+      }
+      npatches_body = pnames_body_size / 8;
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+      {
+	warn ("%s: seek error\n", lump_name);
+	break;
+      }
+      wf->read_i32 (&npatches_head);
+      if (wf->error ())
+      {
+	warn ("%s: error reading header\n", lump_name);
+	break;
+      }
+      if (npatches_head > 0 && npatches_head < npatches_body)
+	npnames = npatches_head;
+      else
+	npnames = npatches_body;
+      if (npatches_head != npatches_body)
+      {
+	warn("%s: header says %ld patches, lump size suggests %ld,"
+	    " going for %lu\n",
+	    lump_name, long (npatches_head), long (npatches_body),
+	    (unsigned long) npnames);
+      }
+      if (npnames > 32767)
+      {
+	warn ("%s: too big (%lu patches), keeping only first 32767\n",
+	    lump_name, (unsigned long) npnames);
+	npnames = 32767;
+      }
+      pnames = (char *) GetMemory (npnames * WAD_PIC_NAME);
+      wf->read_bytes (pnames, npnames * WAD_PIC_NAME);
+      if (wf->error ())
+      {
+	warn ("%s: error reading names\n", lump_name);
+	break;
+      }
+      success = true;
     }
-    pnames = (char *) GetMemory (npnames * WAD_PIC_NAME);
-    wad_read_bytes (dir->wadfile, pnames, npnames * WAD_PIC_NAME);
+    while (0);
+    if (! success)
+      warn ("%s: errors found, won't be able to render textures\n", lump_name);
   }
-  while (0);
 
   /* Get list of patches in the master directory. Everything
      that is between P_START/P_END or PP_START/PP_END and that
@@ -154,7 +178,7 @@
 	if (! dir)
 	{
 	  warn ("%.128s: no matching %s for %.*s\n",
-	      start_label->wadfile->filename,
+	      start_label->wadfile->pathname (),
 	      end_label,
 	      (int) WAD_NAME, start_label->dir.name);
 	  break;
@@ -163,7 +187,7 @@
 	{
 	  if (dir->dir.size != 0)
 	    warn ("%.128s: label %.*s has non-zero size %ld\n",
-		dir->wadfile->filename,
+		dir->wadfile->pathname (),
 		(int) WAD_NAME, dir->dir.name,
 		(long) dir->dir.size);
 	  dir = dir->next;
@@ -180,7 +204,7 @@
 	      && (! y_strnicmp (dir->dir.name + 3, "START", WAD_NAME - 3)
 		  || ! y_strnicmp (dir->dir.name + 3, "END", WAD_NAME - 3))))
 	    warn ("%.128s: unexpected label \"%.*s\" among patches.\n",
-		dir->wadfile->filename, (int) WAD_NAME, dir->dir.name);
+		dir->wadfile->pathname (), (int) WAD_NAME, dir->dir.name);
 	  continue;
 	}
 	//printf ("%-9.8s ", dir->dir.name); fflush (stdout);  // DEBUG
diff -uaNr yadex-1.5.2/src/patchdir.h yadex-1.6.0/src/patchdir.h
--- yadex-1.5.2/src/patchdir.h	2001-06-21 15:52:11.000000000 +0200
+++ yadex-1.6.0/src/patchdir.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/pic2img.cc yadex-1.6.0/src/pic2img.cc
--- yadex-1.5.2/src/pic2img.cc	2000-08-10 23:45:18.000000000 +0200
+++ yadex-1.6.0/src/pic2img.cc	2003-03-28 13:37:32.000000000 +0100
@@ -12,7 +12,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,6 +32,7 @@
 #include "yadex.h"
 #include "gcolour2.h"  /* colour0 */
 #include "pic2img.h"
+#include "wadfile.h"
 #include "wads.h"
 
 
@@ -46,30 +47,34 @@
 /*
  *	LoadPicture - read a picture from a wad file into an Img object
  *
- *	LoadPicture() does not allocate the buffer itself. The buffer
- *	and the picture don't have to have the same dimensions. Thanks
- *	to this, it can also be used to compose textures : you allocate
- *	a single buffer for the whole texture and then you call
- *	LoadPicture() on it once for each patch. LoadPicture() takes
- *	care of all the necessary clipping.
+ *	If img->is_null() is false, LoadPicture() does not allocate the
+ *	buffer itself. The buffer and the picture don't have to have the
+ *	same dimensions. Thanks to this, it can also be used to compose
+ *	textures : you allocate a single buffer for the whole texture
+ *	and then you call LoadPicture() on it once for each patch.
+ *	LoadPicture() takes care of all the necessary clipping.
+ *
+ *	If img->is_null() is true, LoadPicture() sets the size of img
+ *	to match that of the picture. This is useful in display_pic().
  *
  *	Return 0 on success, non-zero on failure.
  *
  *	If pic_x_offset == INT_MIN, the picture is centred horizontally.
  *	If pic_y_offset == INT_MIN, the picture is centred vertically.
  */
+
 int LoadPicture (
-   Img& img,		/* Game image to load picture into */
-   const char *picname,		/* Picture lump name */
-   const Lump_loc& picloc,	/* Picture lump location */
-   int pic_x_offset,		/* Coordinates of top left corner of picture */
-   int pic_y_offset, 		/* relative to top left corner of buffer. */
-   int *pic_width,		/* To return the size of the picture */
-   int *pic_height)		/* (can be NULL) */
+   Img& img,			// Game image to load picture into
+   const char *picname,		// Picture lump name
+   const Lump_loc& picloc,	// Picture lump location
+   int pic_x_offset,		// Coordinates of top left corner of picture
+   int pic_y_offset, 		// relative to top left corner of buffer
+   int *pic_width,		// To return the size of the picture
+   int *pic_height)		// (can be NULL)
 {
 MDirPtr	dir;
-i16	_pic_width;
-i16	_pic_height;
+i16	pic_width_;
+i16	pic_height_;
 i16	pic_intrinsic_x_ofs;
 i16	pic_intrinsic_y_ofs;
 u8	*ColumnData;
@@ -107,45 +112,39 @@
    }
 
 // Read the picture header
-if (wad_seek2 (dir->wadfile, dir->dir.start))
+dir->wadfile->seek (dir->dir.start);
+if (dir->wadfile->error ())
    {
-   warn ("picture %.*s: can't seek to %s(%08lXh). Giving up.\n",
-         WAD_PIC_NAME, picname,
-	 dir->wadfile->filename,
-	 (unsigned long) dir->dir.start);
+   warn ("picture %.*s: can't seek to header, giving up\n",
+         WAD_PIC_NAME, picname);
    return 1;
    }
-bool dummy_bytes  = dir->wadfile->pic_format == YGPF_NORMAL;
-bool long_header  = dir->wadfile->pic_format != YGPF_ALPHA;
-bool long_offsets = dir->wadfile->pic_format == YGPF_NORMAL;
+bool dummy_bytes  = dir->wadfile->pic_format () == YGPF_NORMAL;
+bool long_header  = dir->wadfile->pic_format () != YGPF_ALPHA;
+bool long_offsets = dir->wadfile->pic_format () == YGPF_NORMAL;
 if (long_header)
    {
-   dir->wadfile->error = false;
-   wad_read_i16 (dir->wadfile, &_pic_width         );
-   wad_read_i16 (dir->wadfile, &_pic_height        );
-   wad_read_i16 (dir->wadfile, &pic_intrinsic_x_ofs);  // Read but ignored
-   wad_read_i16 (dir->wadfile, &pic_intrinsic_y_ofs);  // Read but ignored
-   if (dir->wadfile->error)
-      {
-      warn ("picture %.*s: read error in header at %s(%08Xlh). Giving up.\n",
-	    WAD_PIC_NAME, picname,
-	    dir->wadfile->filename,
-	    (unsigned long) dir->dir.start);
+   dir->wadfile->read_i16 (&pic_width_);
+   dir->wadfile->read_i16 (&pic_height_);
+   dir->wadfile->read_i16 (&pic_intrinsic_x_ofs);  // Read but ignored
+   dir->wadfile->read_i16 (&pic_intrinsic_y_ofs);  // Read but ignored
+   if (dir->wadfile->error ())
+      {
+      warn ("picture %.*s: read error in header, giving up\n",
+	    WAD_PIC_NAME, picname);
       return 1;
       }
    }
 else
    {
-   _pic_width          = getc (dir->wadfile->fd);
-   _pic_height         = getc (dir->wadfile->fd);
-   pic_intrinsic_x_ofs = getc (dir->wadfile->fd);  // Read but ignored
-   pic_intrinsic_y_ofs = getc (dir->wadfile->fd);  // Read but ignored
-   if (feof (dir->wadfile->fd))
-      {
-      warn ("picture %.*s: read error in header at %s(%08lXh). Giving up.\n",
-	    WAD_PIC_NAME, picname,
-	    dir->wadfile->filename,
-	    (unsigned long) dir->dir.start);
+   pic_width_          = dir->wadfile->read_u8 ();
+   pic_height_         = dir->wadfile->read_u8 ();
+   pic_intrinsic_x_ofs = dir->wadfile->read_u8 ();  // Read but ignored
+   pic_intrinsic_y_ofs = dir->wadfile->read_u8 ();  // Read but ignored
+   if (dir->wadfile->error ())
+      {
+      warn ("picture %.*s: read error in header, giving up\n",
+	    WAD_PIC_NAME, picname);
       return 1;
       }
    }
@@ -154,32 +153,34 @@
 if (img.is_null ())
    {
    // Sanity checks
-   if (_pic_width  < 1 || _pic_height < 1)
+   if (pic_width_  < 1 || pic_height_ < 1)
       {
-      warn ("picture %.*s: delirious dimensions %dx%d. Giving up.\n",
-	    WAD_PIC_NAME, picname, (int) _pic_width, (int) _pic_height);
+      warn ("picture %.*s: delirious dimensions %dx%d, giving up\n",
+	    WAD_PIC_NAME, picname, (int) pic_width_, (int) pic_height_);
       }
-   if (_pic_width > 1024)
+   const int pic_width_max = 4096;
+   if (pic_width_ > pic_width_max)
       {
-      warn ("picture %.*s: too wide (%d). Clipping to 1024.\n",
-	    WAD_PIC_NAME, picname, (int) _pic_width);
-      _pic_width = 1024;
+      warn ("picture %.*s: too wide (%d), clipping to %d\n",
+	    WAD_PIC_NAME, picname, (int) pic_width_, pic_width_max);
+      pic_width_ = pic_width_max;
       }
-   if (_pic_height > 1024)
+   const int pic_height_max = 4096;
+   if (pic_height_ > pic_height_max)
       {
-      warn ("picture %.*s: too high (%d). Clipping to 1024.\n",
-	    WAD_PIC_NAME, picname, (int) _pic_height);
-      _pic_height = 1024;
+      warn ("picture %.*s: too high (%d), clipping to %d\n",
+	    WAD_PIC_NAME, picname, (int) pic_height_, pic_height_max);
+      pic_height_ = pic_height_max;
       }
-   img.resize (_pic_width, _pic_height);
+   img.resize (pic_width_, pic_height_);
    }
 int img_width = img.width ();
 
 // Centre the picture.
 if (pic_x_offset == INT_MIN)
-   pic_x_offset = (img_width - _pic_width) / 2;
+   pic_x_offset = (img_width - pic_width_) / 2;
 if (pic_y_offset == INT_MIN)
-   pic_y_offset = (img.height () - _pic_height) / 2;
+   pic_y_offset = (img.height () - pic_height_) / 2;
 
 /* AYM 19971202: 17 kB is large enough for 128x128 patches. */
 #define TEX_COLUMNBUFFERSIZE ((long) 17 * 1024)
@@ -190,66 +191,62 @@
 #define TEX_COLUMNSIZE  1300
 
 ColumnData    = (u8 *) GetMemory (TEX_COLUMNBUFFERSIZE);
-/* FIXME DOS and _pic_width > 16000 */
-NeededOffsets = (i32 *) GetMemory ((long) _pic_width * 4);
+/* FIXME DOS and pic_width_ > 16000 */
+NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * 4);
 
-dir->wadfile->error = false;
 if (long_offsets)
-   wad_read_i32 (dir->wadfile, NeededOffsets, _pic_width);
+   dir->wadfile->read_i32 (NeededOffsets, pic_width_);
 else
-   for (int n = 0; n < _pic_width; n++)
+   for (int n = 0; n < pic_width_; n++)
       {
       i16 ofs;
-      wad_read_i16 (dir->wadfile, &ofs);
+      dir->wadfile->read_i16 (&ofs);
       NeededOffsets[n] = ofs;
       }
-if (dir->wadfile->error)
+if (dir->wadfile->error ())
    {
-   warn ("picture %.*s: read error in ofstbl at %s(%08lXh). Giving up.\n",
-	 WAD_PIC_NAME, picname,
-	 dir->wadfile->filename,
-	 (unsigned long) ftell (dir->wadfile->fd));
+   warn ("picture %.*s: read error in offset table, giving up\n",
+	 WAD_PIC_NAME, picname);
    FreeMemory (ColumnData);
    FreeMemory (NeededOffsets);
    return 1;
    }
 
-/* Read first column data, and subsequent column data */
-if (long_offsets && NeededOffsets[0] != 8 + (long) _pic_width * 4
-|| !long_offsets && NeededOffsets[0] != 4 + (long) _pic_width * 2)
-   {
-   int r = wad_seek2 (dir->wadfile, dir->dir.start + NeededOffsets[0]);
-   if (r)
-      {
-      warn ("picture %.*s: can't seek to %s(%08lXh). Giving up.\n",
-         WAD_PIC_NAME, picname,
-	 dir->wadfile->filename,
-	 (unsigned long) dir->dir.start + NeededOffsets[0]);
+// Read first column data, and subsequent column data
+if (long_offsets && NeededOffsets[0] != 8 + (long) pic_width_ * 4
+|| !long_offsets && NeededOffsets[0] != 4 + (long) pic_width_ * 2)
+   {
+   dir->wadfile->seek (dir->dir.start + NeededOffsets[0]);
+   if (dir->wadfile->error ())
+      {
+      warn ("picture %.*s: can't seek to header, giving up\n",
+         WAD_PIC_NAME, picname);
       FreeMemory (ColumnData);
       FreeMemory (NeededOffsets);
       return 1;
       }
    }
-ActualBufLen = wad_read_vbytes (dir->wadfile, ColumnData, TEX_COLUMNBUFFERSIZE);
+ActualBufLen = dir->wadfile->read_vbytes (ColumnData, TEX_COLUMNBUFFERSIZE);
+// FIXME should catch I/O errors
 
-/* Clip the picture horizontally and vertically. */
+// Clip the picture horizontally and vertically
 pic_x0 = - pic_x_offset;
 if (pic_x0 < 0)
   pic_x0 = 0;
 
 pic_x1 = img_width - pic_x_offset - 1;
-if (pic_x1 >= _pic_width)
-  pic_x1 = _pic_width - 1;
+if (pic_x1 >= pic_width_)
+  pic_x1 = pic_width_ - 1;
 
 pic_y0 = - pic_y_offset;
 if (pic_y0 < 0)
   pic_y0 = 0;
 
 pic_y1 = img.height () - pic_y_offset - 1;
-if (pic_y1 >= _pic_height)
-  pic_y1 = _pic_height - 1;
+if (pic_y1 >= pic_height_)
+  pic_y1 = pic_height_ - 1;
 
-/* For each (non clipped) column of the picture... */
+// For each (non clipped) column of the picture...
 for (pic_x = pic_x0,
    buf = img.wbuf () + al_amax (pic_x_offset, 0) + img_width * pic_y_offset;
    pic_x <= pic_x1;
@@ -265,53 +262,52 @@
    else
       {
       Column = (u8 *) GetFarMemory (TEX_COLUMNSIZE);
-      if (wad_seek2 (dir->wadfile, dir->dir.start + CurrentOffset))
+      dir->wadfile->seek (dir->dir.start + CurrentOffset);
+      if (dir->wadfile->error ())
          {
 	 int too_many = add_msg (_MT_BADOFS, (short) pic_x);
 	 FreeFarMemory (Column);
-	 if (too_many)  // This picture has too many errors. Give up.
+	 if (too_many)		// This picture has too many errors. Give up.
 	    goto pic_end;
-	 continue;  // Give up on this column
+	 continue;			// Give up on this column
          }
-      wad_read_vbytes (dir->wadfile, Column, TEX_COLUMNSIZE);
+      dir->wadfile->read_vbytes (Column, TEX_COLUMNSIZE);
+      // FIXME should catch I/O errors
       }
    filedata = Column;
 
-   /* we now have the needed column data, one way or another, so write it */
-
+   // We now have the needed column data, one way or another, so write it
+ 
    // For each post of the column...
    {
    register u8 *post;
    for (post = filedata; *post != 0xff;)
       {
-      int post_y_offset;/* Y-offset of top of post to origin of buffer */
-      int post_height;	/* Height of post */
-      int post_pic_y0;	/* Start and end of non-clipped part of post, */
-      int post_pic_y1;	/* relative to top of picture */
-      int post_y0;	/* Start and end of non-clipped part of post, */
-      int post_y1;	/* relative to top of post */
+      int post_y_offset;	// Y-offset of top of post to origin of buffer
+      int post_height;		// Height of post
+      int post_pic_y0;		// Start and end of non-clipped part of post,
+      int post_pic_y1;		// relative to top of picture
+      int post_y0;		// Start and end of non-clipped part of post,
+      int post_y1;		// relative to top of post
 
       if (post - filedata > TEX_COLUMNSIZE)
          {
 	 int too_many = add_msg (_MT_TOOLONG, (short) pic_x);
-	 if (too_many)  // This picture has too many errors. Give up.
+	 if (too_many)		// This picture has too many errors. Give up.
 	    {
 	    if (! ColumnInMemory)
 	       FreeFarMemory (Column);
 	    goto pic_end;
 	    }
-	 break;  // Give up on this column
+	 break;				// Give up on this column
 	 }
 
       post_y_offset = *post++;
       post_height = *post++;
-      //printf ("x=%d yofs=%d height=%d\n", (int) pic_x, (int)
-      //  post_y_offset, (int) post_height);
       if (dummy_bytes)
-         post++;  // Skip that dummy byte
+         post++;			// Skip that dummy byte
 
-      /* Clip the post vertically. */
-      post_pic_y0 = post_y_offset;
+      post_pic_y0 = post_y_offset;	// Clip the post vertically
       if (post_pic_y0 < pic_y0)
 	 post_pic_y0 = pic_y0;
       
@@ -322,8 +318,8 @@
       post_y0 = post_pic_y0 - post_y_offset;
       post_y1 = post_pic_y1 - post_y_offset;
 
-      /* "Paste" the post onto the buffer */
-      {
+
+      {					// "Paste" the post onto the buffer
       register img_pixel_t *b;
       register const u8 *p          = post + post_y0;
                const u8 *const pmax = post + post_y1;
@@ -347,7 +343,7 @@
 
       post += post_height;
       if (dummy_bytes)
-         post++;  // Skip the trailing dummy byte
+         post++;			// Skip the trailing dummy byte
       }  // Post loop
    }
 
@@ -366,9 +362,9 @@
 c->flags |= HOOK_DRAWN;
 #endif
 if (pic_width)
-   *pic_width  = _pic_width;
+   *pic_width  = pic_width_;
 if (pic_height)
-   *pic_height = _pic_height;
+   *pic_height = pic_height_;
 return 0;
 }
 
diff -uaNr yadex-1.5.2/src/prefer.cc yadex-1.6.0/src/prefer.cc
--- yadex-1.5.2/src/prefer.cc	2000-04-29 22:38:08.000000000 +0200
+++ yadex-1.6.0/src/prefer.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -75,7 +75,16 @@
    default_ceiling_height);
 sprintf (menustr[7], "Change default light level     (Current: %d)",
    default_light_level);
-val = DisplayMenuArray (x0, y0, menustr[8], 8, NULL, menustr, NULL, NULL, NULL);
+val = vDisplayMenu (x0, y0, menustr[8],
+  menustr[0], YK_, 0,
+  menustr[1], YK_, 0,
+  menustr[2], YK_, 0,
+  menustr[3], YK_, 0,
+  menustr[4], YK_, 0,
+  menustr[5], YK_, 0,
+  menustr[6], YK_, 0,
+  menustr[7], YK_, 0,
+  NULL);
 for (n = 0; n < 9; n++)
    FreeMemory (menustr[n]);
 int subwin_x0 = x0 + BOX_BORDER + WIDE_HSPACING;
diff -uaNr yadex-1.5.2/src/record.h yadex-1.6.0/src/record.h
--- yadex-1.5.2/src/record.h	2000-05-17 23:00:01.000000000 +0200
+++ yadex-1.6.0/src/record.h	2001-10-11 11:08:29.000000000 +0200
@@ -13,6 +13,7 @@
   public :
     read ();
     write ();
+
   private :
     class priv;
     priv *p;
diff -uaNr yadex-1.5.2/src/rgb.h yadex-1.6.0/src/rgb.h
--- yadex-1.5.2/src/rgb.h	2000-08-11 00:20:51.000000000 +0200
+++ yadex-1.6.0/src/rgb.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/rgbbmp.h yadex-1.6.0/src/rgbbmp.h
--- yadex-1.5.2/src/rgbbmp.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/rgbbmp.h	2003-03-28 13:37:32.000000000 +0100
@@ -16,7 +16,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/s_centre.cc yadex-1.6.0/src/s_centre.cc
--- yadex-1.5.2/src/s_centre.cc	2000-05-05 00:17:27.000000000 +0200
+++ yadex-1.6.0/src/s_centre.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/s_centre.h yadex-1.6.0/src/s_centre.h
--- yadex-1.5.2/src/s_centre.h	2000-05-04 04:23:01.000000000 +0200
+++ yadex-1.6.0/src/s_centre.h	2000-11-06 23:37:48.000000000 +0100
@@ -4,6 +4,9 @@
  */
 
 
+#include "objid.h"
+
+
 void centre_of_sector (obj_no_t s, int *x, int *y);
 void centre_of_sectors (SelPtr list, int *x, int *y);
 
diff -uaNr yadex-1.5.2/src/s_door.cc yadex-1.6.0/src/s_door.cc
--- yadex-1.5.2/src/s_door.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/s_door.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,7 @@
 #include "yadex.h"
 #include "dialog.h"
 #include "levels.h"
+#include "objid.h"
 #include "selectn.h"
 
 
diff -uaNr yadex-1.5.2/src/s_lift.cc yadex-1.6.0/src/s_lift.cc
--- yadex-1.5.2/src/s_lift.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/s_lift.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,8 @@
 #include "yadex.h"
 #include "dialog.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "selectn.h"
 
 
diff -uaNr yadex-1.5.2/src/s_linedefs.cc yadex-1.6.0/src/s_linedefs.cc
--- yadex-1.5.2/src/s_linedefs.cc	2000-05-04 04:33:26.000000000 +0200
+++ yadex-1.6.0/src/s_linedefs.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -30,6 +30,8 @@
 #include "yadex.h"
 #include "bitvec.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "s_linedefs.h"
 #include "selectn.h"
 
diff -uaNr yadex-1.5.2/src/s_merge.cc yadex-1.6.0/src/s_merge.cc
--- yadex-1.5.2/src/s_merge.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/s_merge.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,8 @@
 #include "yadex.h"
 #include "dialog.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "selectn.h"
 
 
diff -uaNr yadex-1.5.2/src/s_misc.cc yadex-1.6.0/src/s_misc.cc
--- yadex-1.5.2/src/s_misc.cc	2000-08-27 22:33:51.000000000 +0200
+++ yadex-1.6.0/src/s_misc.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,6 +32,7 @@
 #include "entry.h"
 #include "gfx.h"
 #include "levels.h"
+#include "objid.h"
 #include "selectn.h"
 
 
diff -uaNr yadex-1.5.2/src/s_prop.cc yadex-1.6.0/src/s_prop.cc
--- yadex-1.5.2/src/s_prop.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/s_prop.cc	2003-03-28 13:37:32.000000000 +0100
@@ -13,7 +13,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -36,175 +36,227 @@
 #include "game.h"
 #include "gfx.h"
 #include "levels.h"
+#include "menudata.h"
+#include "objid.h"
 #include "oldmenus.h"
 #include "selectn.h"
 
 
+class Menu_data_st : public Menu_data
+{
+  public :
+    Menu_data_st (al_llist_t *list);
+    virtual size_t nitems () const;
+    virtual const char *operator[] (size_t n) const;
+
+  private :
+    mutable char buf[100];
+    al_llist_t *list;
+};
+
+
 /*
- *	Prototypes of private functions
+ *	Menu_data_st::Menu_data_st - ctor
  */
-static const char *PrintSt (void *ptr);
+Menu_data_st::Menu_data_st (al_llist_t *list) : list (list)
+{
+  al_lrewind (this->list);
+}
 
 
 /*
- *	SectorProperties
- *	Sector properties "dialog"
+ *	Menu_data_st::nitems - return the number of items
  */
-void SectorProperties (int x0, int y0, SelPtr obj)
+size_t Menu_data_st::nitems () const
 {
-char  *menustr[30];
-char   texname[WAD_FLAT_NAME + 1];
-int    n, val;
-SelPtr cur;
-int    subwin_y0;
-
-for (n = 0; n < 8; n++)
-   menustr[n] = (char *) GetMemory (60);
-sprintf (menustr[7], "Edit sector #%d", obj->objnum);
-sprintf (menustr[0], "Change floor height     (Current: %d)",
-	Sectors[obj->objnum].floorh);
-sprintf (menustr[1], "Change ceiling height   (Current: %d)",
-	Sectors[obj->objnum].ceilh);
-sprintf (menustr[2], "Change floor texture    (Current: %.*s)",
-	(int) WAD_FLAT_NAME, Sectors[obj->objnum].floort);
-sprintf (menustr[3], "Change ceiling texture  (Current: %.*s)",
-	(int) WAD_FLAT_NAME, Sectors[obj->objnum].ceilt);
-sprintf (menustr[4], "Change light level      (Current: %d)",
-	Sectors[obj->objnum].light);
-sprintf (menustr[5], "Change type             (Current: %d)",
-	Sectors[obj->objnum].special);
-sprintf (menustr[6], "Change linedef tag      (Current: %d)",
-	Sectors[obj->objnum].tag);
-val = DisplayMenuArray (x0, y0, menustr[7], 7, NULL, menustr, NULL, NULL, NULL);
-for (n = 0; n < 8; n++)
-   FreeMemory (menustr[n]);
-subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
-switch (val)
-{
-case 1:
-   val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
-      Sectors[obj->objnum].floorh);
-   if (val != IIV_CANCEL)
-      {
-      for (cur = obj; cur; cur = cur->next)
-	 Sectors[cur->objnum].floorh = val;
-      MadeChanges = 1;
-      }
-   break;
-case 2:
-   val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
-      Sectors[obj->objnum].ceilh);
-   if (val != IIV_CANCEL)
-      {
-      for (cur = obj; cur; cur = cur->next)
-	 Sectors[cur->objnum].ceilh = val;
-      MadeChanges = 1;
-      }
-   break;
-case 3:
-   {
-   *texname = '\0';
-   strncat (texname, Sectors[obj->objnum].floort, WAD_FLAT_NAME);
-   ObjectsNeeded (0);
-   char **flat_names =
-      (char **) GetMemory (NumFTexture * sizeof *flat_names);
-   for (size_t n = 0; n < NumFTexture; n++)
-      flat_names[n] = flat_list[n].name;
-   ChooseFloorTexture (x0 + 42, subwin_y0, "Choose a floor texture",
-     NumFTexture, flat_names, texname);
-   FreeMemory (flat_names);
-   ObjectsNeeded (OBJ_SECTORS, 0);
-   if (strlen (texname) > 0)
-      {
-      for (cur = obj; cur; cur = cur->next)
-	 strncpy (Sectors[cur->objnum].floort, texname, WAD_FLAT_NAME);
-      MadeChanges = 1;
-      }
-   break;
-   }
-case 4:
-   {
-   *texname = '\0';
-   strncat (texname, Sectors[obj->objnum].ceilt, WAD_FLAT_NAME);
-   ObjectsNeeded (0);
-   char **flat_names =
-      (char **) GetMemory (NumFTexture * sizeof *flat_names);
-   for (size_t n = 0; n < NumFTexture; n++)
-      flat_names[n] = flat_list[n].name;
-   ChooseFloorTexture (x0 + 42, subwin_y0, "Choose a ceiling texture",
-     NumFTexture, flat_names, texname);
-   FreeMemory (flat_names);
-   ObjectsNeeded (OBJ_SECTORS, 0);
-   if (strlen (texname) > 0)
-      {
-      for (cur = obj; cur; cur = cur->next)
-	 strncpy (Sectors[cur->objnum].ceilt, texname, WAD_FLAT_NAME);
-      MadeChanges = 1;
-      }
-   break;
-   }
-case 5:
-   val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
-     Sectors[obj->objnum].light);
-   if (val != IIV_CANCEL)
-      {
-      for (cur = obj; cur; cur = cur->next)
-	 Sectors[cur->objnum].light = val;
-      MadeChanges = 1;
-      }
-   break;
-case 6:
-   val = 0;
-   if (DisplayMenuList (x0+42, subwin_y0, "Select type", stdef, PrintSt,
-    &val) < 0)
-     break;
-   /* KLUDGE last element of stdef means "enter value" */
-   if (val == al_lcount (stdef) - 1)
-     {
-     val = InputIntegerValue (x0 + 84,
-        subwin_y0 + BOX_BORDER + (3 + val) * FONTH,
-        -32768, 32767, 0);
-     if (val == IIV_CANCEL)  /* Esc */
-       break;
-     }
-   else
-     {
-     if (al_lseek (stdef, val, SEEK_SET))
-       fatal_error ("%s SP1 (%s)\n", msg_unexpected, al_astrerror (al_aerrno));
-     val = CUR_STDEF->number;
-     }
-   for (cur = obj; cur; cur = cur->next)
-     Sectors[cur->objnum].special = val;
-   MadeChanges = 1;
-   break;
-case 7:
-   val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
-     Sectors[obj->objnum].tag);
-   if (val != IIV_CANCEL)
-      {
-      for (cur = obj; cur; cur = cur->next)
-	 Sectors[cur->objnum].tag = val;
-      MadeChanges = 1;
-      }
-   break;
+  return al_lcount (list);
 }
+
+
+/*
+ *	Menu_data_st::operator[] - return the nth item
+ */
+const char *Menu_data_st::operator[] (size_t n) const
+{
+  if (al_lseek (list, n, SEEK_SET) != 0)
+  {
+    sprintf (buf, "BUG: al_lseek(%p, %lu): %s",
+      (void *) list, 
+      (unsigned long) n,
+      al_astrerror (al_aerrno));
+    return buf;
+  }
+  const stdef_t *ptr = (const stdef_t *) al_lptr (list);
+  if (ptr == NULL)
+    sprintf (buf, "BUG: al_lptr(%p): %s",
+      (void *) list,
+      al_astrerror (al_aerrno));
+  else
+    sprintf (buf, "%2d - %.70s", ptr->number, ptr->longdesc);
+  return buf;
 }
 
 
 /*
- *	PrintSt
- *	Used by DisplayMenuList when called by InputSectorType
+ *	SectorProperties
+ *	Sector properties "dialog"
  */
-static const char *PrintSt (void *ptr)
+void SectorProperties (int x0, int y0, SelPtr obj)
 {
-static char buf[100];
+  char  *menustr[30];
+  char   texname[WAD_FLAT_NAME + 1];
+  int    n, val;
+  SelPtr cur;
+  int    subwin_y0;
+
+  for (n = 0; n < 8; n++)
+    menustr[n] = (char *) GetMemory (60);
+  sprintf (menustr[7], "Edit sector #%d", obj->objnum);
+  sprintf (menustr[0], "Change floor height     (Current: %d)",
+	  Sectors[obj->objnum].floorh);
+  sprintf (menustr[1], "Change ceiling height   (Current: %d)",
+	  Sectors[obj->objnum].ceilh);
+  sprintf (menustr[2], "Change floor texture    (Current: %.*s)",
+	  (int) WAD_FLAT_NAME, Sectors[obj->objnum].floort);
+  sprintf (menustr[3], "Change ceiling texture  (Current: %.*s)",
+	  (int) WAD_FLAT_NAME, Sectors[obj->objnum].ceilt);
+  sprintf (menustr[4], "Change light level      (Current: %d)",
+	  Sectors[obj->objnum].light);
+  sprintf (menustr[5], "Change type             (Current: %d)",
+	  Sectors[obj->objnum].special);
+  sprintf (menustr[6], "Change linedef tag      (Current: %d)",
+	  Sectors[obj->objnum].tag);
+  val = vDisplayMenu (x0, y0, menustr[7],
+    menustr[0], YK_, 0,
+    menustr[1], YK_, 0,
+    menustr[2], YK_, 0,
+    menustr[3], YK_, 0,
+    menustr[4], YK_, 0,
+    menustr[5], YK_, 0,
+    menustr[6], YK_, 0,
+    NULL);
+  for (n = 0; n < 8; n++)
+    FreeMemory (menustr[n]);
+  subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
+  switch (val)
+  {
+    case 1:
+      val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
+	Sectors[obj->objnum].floorh);
+      if (val != IIV_CANCEL)
+      {
+	for (cur = obj; cur; cur = cur->next)
+	  Sectors[cur->objnum].floorh = val;
+	MadeChanges = 1;
+      }
+      break;
+
+    case 2:
+      val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
+	Sectors[obj->objnum].ceilh);
+      if (val != IIV_CANCEL)
+      {
+	for (cur = obj; cur; cur = cur->next)
+	  Sectors[cur->objnum].ceilh = val;
+	MadeChanges = 1;
+      }
+      break;
+
+    case 3:
+      {
+	*texname = '\0';
+	strncat (texname, Sectors[obj->objnum].floort, WAD_FLAT_NAME);
+	ObjectsNeeded (0);
+	char **flat_names =
+	  (char **) GetMemory (NumFTexture * sizeof *flat_names);
+	for (size_t n = 0; n < NumFTexture; n++)
+	  flat_names[n] = flat_list[n].name;
+	ChooseFloorTexture (x0 + 42, subwin_y0, "Choose a floor texture",
+	  NumFTexture, flat_names, texname);
+	FreeMemory (flat_names);
+	ObjectsNeeded (OBJ_SECTORS, 0);
+	if (strlen (texname) > 0)
+	{
+	  for (cur = obj; cur; cur = cur->next)
+	    strncpy (Sectors[cur->objnum].floort, texname, WAD_FLAT_NAME);
+	  MadeChanges = 1;
+	}
+	break;
+      }
+
+    case 4:
+      {
+      *texname = '\0';
+      strncat (texname, Sectors[obj->objnum].ceilt, WAD_FLAT_NAME);
+      ObjectsNeeded (0);
+      char **flat_names =
+	(char **) GetMemory (NumFTexture * sizeof *flat_names);
+      for (size_t n = 0; n < NumFTexture; n++)
+	flat_names[n] = flat_list[n].name;
+      ChooseFloorTexture (x0 + 42, subwin_y0, "Choose a ceiling texture",
+	NumFTexture, flat_names, texname);
+      FreeMemory (flat_names);
+      ObjectsNeeded (OBJ_SECTORS, 0);
+      if (strlen (texname) > 0)
+      {
+	for (cur = obj; cur; cur = cur->next)
+	  strncpy (Sectors[cur->objnum].ceilt, texname, WAD_FLAT_NAME);
+	MadeChanges = 1;
+      }
+      break;
+      }
 
-if (ptr == NULL)
-  return "PrintSt: (null)";
-sprintf (buf, "[%2d] %.70s",
- ((stdef_t *)ptr)->number,
- ((stdef_t *)ptr)->longdesc);
-return buf;
+    case 5:
+      val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+	Sectors[obj->objnum].light);
+      if (val != IIV_CANCEL)
+      {
+	for (cur = obj; cur; cur = cur->next)
+	  Sectors[cur->objnum].light = val;
+	MadeChanges = 1;
+      }
+      break;
+
+    case 6:
+      {
+	val = 0;
+	Menu_data_st menudata (stdef);
+	if (DisplayMenuList (x0 + 42, subwin_y0, "Select type", menudata, &val)
+	  < 0)
+	  break;
+	// KLUDGE last element of stdef means "enter value"
+	if (val == al_lcount (stdef) - 1)
+	{
+	  val = InputIntegerValue (x0 + 84,
+	    subwin_y0 + BOX_BORDER + (3 + val) * FONTH,
+	    -32768, 32767, 0);
+	  if (val == IIV_CANCEL)  // [Esc]
+	    break;
+	}
+	else
+	{
+	  if (al_lseek (stdef, val, SEEK_SET))
+	    fatal_error ("%s SP1 (%s)\n",
+	      msg_unexpected, al_astrerror (al_aerrno));
+	  val = CUR_STDEF->number;
+	}
+	for (cur = obj; cur; cur = cur->next)
+	  Sectors[cur->objnum].special = val;
+	MadeChanges = 1;
+	break;
+      }
+
+    case 7:
+      val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
+	Sectors[obj->objnum].tag);
+      if (val != IIV_CANCEL)
+      {
+	for (cur = obj; cur; cur = cur->next)
+	  Sectors[cur->objnum].tag = val;
+	MadeChanges = 1;
+      }
+      break;
+  }
 }
 
 
diff -uaNr yadex-1.5.2/src/s_slice.cc yadex-1.6.0/src/s_slice.cc
--- yadex-1.5.2/src/s_slice.cc	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/s_slice.cc	2003-03-28 13:37:32.000000000 +0100
@@ -0,0 +1,307 @@
+/*
+ *	s_slice.cc
+ *	Cut a slice out of a sector
+ *	AYM 2001-09-11
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphal Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#include "yadex.h"
+#include <map>
+#include "dialog.h"
+#include "levels.h"
+#include "objects.h"
+#include "objid.h"
+#include "s_slice.h"
+
+
+class Secref			// Reference to a sector
+{
+  public :
+    Secref () : linedef1 ('\0'), linedef2 ('\0') { }
+    char linedef1;
+    char linedef2;
+};
+
+
+/*
+ *	sector_slice - cut a slice out of a sector
+ */
+void sector_slice (obj_no_t linedef1, obj_no_t linedef2)
+{
+  /* We have between 0 and 4 sidedefs. We need to make sure that
+     there are exactly 2 that face the same sector and that they
+     belong to different linedefs.
+
+     If a linedef has more than one sidedef that faces the same
+     sector, we can't decide which one faces the other linedef.
+     Well, we can but it's hard for a dummy like me.
+
+     The problem is the same if the linedefs have two sectors in
+     common. Consider the following setup :
+		____________________________________
+	       |                                    |
+	       |              sector 0              |
+	       |      ________________________      |
+	       |     |                        |     |
+	       |     |        sector 1        |     |
+	       |     |      ____________      |     |
+	       |     |     |            |     |     |
+	       |     |     |  sector 0  |-L1  |-L2  |
+	       |     |     |____________|     |     |
+	       |     |                        |     |
+	       |     |                        |     |
+	       |     |________________________|     |
+	       |                                    |
+	       |                                    |
+	       |____________________________________|
+
+     How do you decide to which vertex of L2 should the start
+     vertex of L1 be linked ? */
+
+  if (! is_linedef (linedef1))		// Paranoia
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf,
+	"First argument is not a valid linedef number");
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+
+  if (! is_linedef (linedef2))		// Paranoia
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf,
+	"Second argument is not a valid linedef number");
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+
+  if (linedef1 == linedef2)
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf, "Both arguments are the same linedef");
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+
+  obj_no_t l1start = LineDefs[linedef1].start;
+  obj_no_t l1end   = LineDefs[linedef1].end;
+  obj_no_t l2start = LineDefs[linedef2].start;
+  obj_no_t l2end   = LineDefs[linedef2].end;
+
+  if (l1start == l2start && l1end == l2end
+    || l1start == l2end && l1end == l2start)
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf, "Linedefs %d and %d are superimposed",
+        int (linedef1), int (linedef2));
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+
+  obj_no_t l1sdr = LineDefs[linedef1].sidedef1;
+  obj_no_t l1sdl = LineDefs[linedef1].sidedef2;
+  obj_no_t l2sdr = LineDefs[linedef2].sidedef1;
+  obj_no_t l2sdl = LineDefs[linedef2].sidedef2;
+
+  obj_no_t l1sr = is_sidedef (l1sdr) ? SideDefs[l1sdr].sector : OBJ_NO_NONE;
+  obj_no_t l1sl = is_sidedef (l1sdl) ? SideDefs[l1sdl].sector : OBJ_NO_NONE;
+  obj_no_t l2sr = is_sidedef (l2sdr) ? SideDefs[l2sdr].sector : OBJ_NO_NONE;
+  obj_no_t l2sl = is_sidedef (l2sdl) ? SideDefs[l2sdl].sector : OBJ_NO_NONE;
+
+  if (is_sector (l1sr) && is_sector (l1sl) && l1sr == l1sl)
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf, "Linedef %d has both sides in the same sector",
+	int (linedef1));
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+
+  if (is_sector (l2sr) && is_sector (l2sl) && l2sr == l2sl)
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf, "Linedef %d has both sides in the same sector",
+	int (linedef2));
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+
+  // Verify that the linedefs have exactly one sector in common
+  typedef std::map<obj_no_t, Secref> secref_list_t;
+  secref_list_t secref;
+  if (is_sector (l1sr))
+    secref[l1sr].linedef1 = 'r';
+  if (is_sector (l1sl))
+    secref[l1sl].linedef1 = 'l';
+  if (is_sector (l2sr))
+    secref[l2sr].linedef2 = 'r';
+  if (is_sector (l2sl))
+    secref[l2sl].linedef2 = 'l';
+  obj_no_t sector;
+  int count = 0;
+  for (secref_list_t::iterator i = secref.begin (); i != secref.end (); i++)
+  {
+    if (i->second.linedef1 != '\0' && i->second.linedef2 != '\0')
+    {
+      sector = i->first;
+      count++;
+    }
+  }
+  if (count < 1)
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf,
+	"Linedefs %d and %d don't face the same sector",
+	int (linedef1), int (linedef2));
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+  if (count > 1)
+  {
+    char buf[100];
+    y_snprintf (buf, sizeof buf,
+	"Linedefs %d and %d have more than one sector in common",
+	int (linedef1), int (linedef2));
+    Notify (-1, -1, buf, 0);
+    return;
+  }
+
+  // Insert new sector between linedefs
+  obj_no_t la0, la1;		// Start and end of the first linedef (the
+				// one that goes from linedef1 to linedef2)
+  obj_no_t lb0, lb1;		// Start and end of the second linedef (the
+				// one that goes from linedef2 to linedef1)
+  char side = secref[sector].linedef1;
+  if (side == 'r')
+  {
+    la0 = l1end;
+    lb1 = l1start;
+  }
+  else if (side == 'l')
+  {
+    la0 = l1start;
+    lb1 = l1end;
+  }
+  else					// Can't happen
+  {
+    nf_bug ("sector %d: linedef1 = %02Xh", int (sector), side);
+    return;
+  }
+
+  side = secref[sector].linedef2;
+  if (side == 'r')
+  {
+    la1 = l2start;
+    lb0 = l2end;
+  }
+  else if (side == 'l')
+  {
+    la1 = l2end;
+    lb0 = l2start;
+  }
+  else					// Can't happen
+  {
+    nf_bug ("sector %d: linedef2 = %02Xh", int (sector), side);
+    return;
+  }
+
+  // Verify that there's no linedef already between linedef1 and linedef2
+  {
+    for (int n = 0; n < NumLineDefs; n++)
+    {
+      if (n == linedef1 || n == linedef2)
+	continue;
+      if (LineDefs[n].start == la0 && LineDefs[n].end == la1
+       || LineDefs[n].start == la1 && LineDefs[n].end == la0
+       || LineDefs[n].start == lb0 && LineDefs[n].end == lb1
+       || LineDefs[n].start == lb1 && LineDefs[n].end == lb0)
+      {
+	char buf[100];
+	y_snprintf (buf, sizeof buf,
+	    "A linedef already exists between linedefs %d and %d (linedef %d)",
+	    int (linedef1), int (linedef2), int (n));
+	Notify (-1, -1, buf, 0);
+	return;
+      }
+    }
+  }
+  
+  // Create new sector
+  InsertObject (OBJ_SECTORS, sector, 0, 0);
+
+  // Create new linedef from linedef1 to linedef2
+  if (la0 != la1)
+  {
+    InsertObject (OBJ_LINEDEFS, -1, 0, 0);
+    LineDefs[NumLineDefs - 1].start = la0;
+    LineDefs[NumLineDefs - 1].end   = la1;
+    LineDefs[NumLineDefs - 1].flags = 4;
+    InsertObject (OBJ_SIDEDEFS, -1, 0, 0);		// Right sidedef
+    SideDefs[NumSideDefs - 1].sector = NumSectors - 1;	// Redundant
+    strncpy (SideDefs[NumSideDefs - 1].tex3, "-", 8);
+    LineDefs[NumLineDefs - 1].sidedef1 = NumSideDefs - 1;
+    InsertObject (OBJ_SIDEDEFS, -1, 0, 0);		// Left sidedef
+    SideDefs[NumSideDefs - 1].sector = sector;
+    strncpy (SideDefs[NumSideDefs - 1].tex3, "-", 8);
+    LineDefs[NumLineDefs - 1].sidedef2 = NumSideDefs - 1;
+  }
+
+  // Create new linedef from linedef2 to linedef1
+  if (lb0 != lb1)
+  {
+    InsertObject (OBJ_LINEDEFS, -1, 0, 0);
+    LineDefs[NumLineDefs - 1].start = lb0;
+    LineDefs[NumLineDefs - 1].end   = lb1;
+    LineDefs[NumLineDefs - 1].flags = 4;
+    InsertObject (OBJ_SIDEDEFS, -1, 0, 0);		// Right sidedef
+    SideDefs[NumSideDefs - 1].sector = NumSectors - 1;	// Redundant
+    strncpy (SideDefs[NumSideDefs - 1].tex3, "-", 8);
+    LineDefs[NumLineDefs - 1].sidedef1 = NumSideDefs - 1;
+    InsertObject (OBJ_SIDEDEFS, -1, 0, 0);		// Left sidedef
+    SideDefs[NumSideDefs - 1].sector = sector;
+    strncpy (SideDefs[NumSideDefs - 1].tex3, "-", 8);
+    LineDefs[NumLineDefs - 1].sidedef2 = NumSideDefs - 1;
+  }
+
+  // Adjust sector references for linedef1
+  side = secref[sector].linedef1;
+  if (side == 'r')
+    SideDefs[LineDefs[linedef1].sidedef1].sector = NumSectors - 1;
+  else if (side == 'l')
+    SideDefs[LineDefs[linedef1].sidedef2].sector = NumSectors - 1;
+
+  // Adjust sector references for linedef2
+  side = secref[sector].linedef2;
+  if (side == 'r')
+    SideDefs[LineDefs[linedef2].sidedef1].sector = NumSectors - 1;
+  else if (side == 'l')
+    SideDefs[LineDefs[linedef2].sidedef2].sector = NumSectors - 1;
+
+  MadeChanges = 1;
+  MadeMapChanges = 1;
+}
+
diff -uaNr yadex-1.5.2/src/s_slice.h yadex-1.6.0/src/s_slice.h
--- yadex-1.5.2/src/s_slice.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/s_slice.h	2001-09-14 00:25:30.000000000 +0200
@@ -0,0 +1,14 @@
+/*
+ *	s_slice.h
+ *	AYM 2001-09-13
+ */
+
+
+#ifndef YH_S_SLICE  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_S_SLICE
+
+
+void sector_slice (obj_no_t linedef1, obj_no_t linedef2);
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/s_split.cc yadex-1.6.0/src/s_split.cc
--- yadex-1.5.2/src/s_split.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/s_split.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,8 +31,11 @@
 #include "yadex.h"
 #include "dialog.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "s_linedefs.h"
 #include "selectn.h"
+#include "x_hover.h"
 
 
 /*
@@ -49,10 +52,11 @@
    if the sector contains subsectors. I should ask Jim (Flynn),
    he did something about that in DETH. */
 /* Check if there is a sector between the two vertices (in the middle) */
-s = GetCurObject (OBJ_SECTORS,
-                  (Vertices[vertex1].x + Vertices[vertex2].x) / 2,
-                  (Vertices[vertex1].y + Vertices[vertex2].y) / 2,
-                  0);
+Objid o;
+GetCurObject (o, OBJ_SECTORS,
+	      (Vertices[vertex1].x + Vertices[vertex2].x) / 2,
+	      (Vertices[vertex1].y + Vertices[vertex2].y) / 2);
+s = o.num;
 if (s < 0)
    {
    Beep ();
@@ -77,6 +81,7 @@
 curv = vertex1;
 while (curv != vertex2)
    {
+   printf ("%d\n", curv);
    int n;
    for (n = 0; n < nlinedefs; n++)
       {
diff -uaNr yadex-1.5.2/src/s_swapf.cc yadex-1.6.0/src/s_swapf.cc
--- yadex-1.5.2/src/s_swapf.cc	2000-08-12 16:32:20.000000000 +0200
+++ yadex-1.6.0/src/s_swapf.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/s_vertices.cc yadex-1.6.0/src/s_vertices.cc
--- yadex-1.5.2/src/s_vertices.cc	2000-05-04 04:18:14.000000000 +0200
+++ yadex-1.6.0/src/s_vertices.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,7 @@
 #include "bitvec.h"
 #include "l_vertices.h"
 #include "levels.h"
+#include "objid.h"
 #include "s_linedefs.h"
 #include "s_vertices.h"
 
@@ -42,10 +43,10 @@
  */
 bitvec_c *bv_vertices_of_sector (obj_no_t s)
 {
-bitvec_c *linedefs = linedefs_of_sector (s);
-bitvec_c *vertices = bv_vertices_of_linedefs (linedefs);
-delete linedefs;
-return vertices;
+  bitvec_c *linedefs = linedefs_of_sector (s);
+  bitvec_c *vertices = bv_vertices_of_linedefs (linedefs);
+  delete linedefs;
+  return vertices;
 }
 
 
@@ -56,13 +57,13 @@
  */
 bitvec_c *bv_vertices_of_sectors (SelPtr list)
 {
-bitvec_c *linedefs;  // Linedefs used by the sectors
-bitvec_c *vertices;  // Vertices used by the linedefs
+  bitvec_c *linedefs;  // Linedefs used by the sectors
+  bitvec_c *vertices;  // Vertices used by the linedefs
 
-linedefs = linedefs_of_sectors (list);
-vertices = bv_vertices_of_linedefs (linedefs);
-delete linedefs;
-return vertices;
+  linedefs = linedefs_of_sectors (list);
+  vertices = bv_vertices_of_linedefs (linedefs);
+  delete linedefs;
+  return vertices;
 }
 
 
@@ -73,18 +74,18 @@
  */
 SelPtr list_vertices_of_sectors (SelPtr list)
 {
-bitvec_c *vertices_bitvec;
-SelPtr vertices_list = 0;
-size_t n;
-
-vertices_bitvec = bv_vertices_of_sectors (list);
-for (n = 0; n < vertices_bitvec->nelements (); n++)
-   {
-   if (vertices_bitvec->get (n))
+  bitvec_c *vertices_bitvec;
+  SelPtr vertices_list = 0;
+  size_t n;
+
+  vertices_bitvec = bv_vertices_of_sectors (list);
+  for (n = 0; n < vertices_bitvec->nelements (); n++)
+  {
+    if (vertices_bitvec->get (n))
       SelectObject (&vertices_list, n);
-   }
-delete vertices_bitvec;
-return vertices_list;
+  }
+  delete vertices_bitvec;
+  return vertices_list;
 }
 
 
diff -uaNr yadex-1.5.2/src/sanity.cc yadex-1.6.0/src/sanity.cc
--- yadex-1.5.2/src/sanity.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/sanity.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -35,57 +35,63 @@
 
 /*
  *	check_types
+ *
  *	Sanity checks about the sizes and properties of certain types.
  *	Useful when porting.
  */
 
-#define assert_size(type,size)\
-  do {\
-  if (sizeof (type) != size)\
-    fatal_error ("sizeof " #type " is %d (should be " #size ")",\
-      (int) sizeof (type));\
-  } while (0)
+#define assert_size(type,size)						\
+  do									\
+  {									\
+    if (sizeof (type) != size)						\
+      fatal_error ("sizeof " #type " is %d (should be " #size ")",	\
+	(int) sizeof (type));						\
+  }									\
+  while (0)
    
-#define assert_wrap(type,high,low)\
-  do {\
-  type n = high;\
-  if (++n != low)\
-    fatal_error ("Type " #type " wraps around to %lu (should be " #low ")",\
-      (unsigned long) n);\
-  } while (0)
+#define assert_wrap(type,high,low)					\
+  do									\
+  {									\
+    type n = high;							\
+    if (++n != low)							\
+      fatal_error ("Type " #type " wraps around to %lu (should be " #low ")",\
+	(unsigned long) n);						\
+  }									\
+  while (0)
 
 void check_types ()
 {
-assert_size (u8,  1);
-assert_size (i8,  1);
-assert_size (u16, 2);
-assert_size (i16, 2);
-assert_size (u32, 4);
-assert_size (i32, 4);
-assert_size (struct LineDef, 14);
-assert_size (struct Sector,  26);
-assert_size (struct SideDef, 30);
-assert_size (struct Thing,   10);
-assert_size (struct Vertex,   4);
-assert_wrap (u8,         255,           0);
-assert_wrap (i8,         127,        -128);
-assert_wrap (u16,      65535,           0);
-assert_wrap (i16,      32767,      -32768);
-assert_wrap (u32, 4294967295,           0);
-assert_wrap (i32, 2147483647, -2147483648);
+  assert_size (u8,  1);
+  assert_size (i8,  1);
+  assert_size (u16, 2);
+  assert_size (i16, 2);
+  assert_size (u32, 4);
+  assert_size (i32, 4);
+  assert_size (struct LineDef, 14);
+  assert_size (struct Sector,  26);
+  assert_size (struct SideDef, 30);
+  assert_size (struct Thing,   10);
+  assert_size (struct Vertex,   4);
+  assert_wrap (u8,          255,           0);
+  assert_wrap (i8,          127,        -128);
+  assert_wrap (u16,       65535,           0);
+  assert_wrap (i16,       32767,      -32768);
+  assert_wrap (u32, 4294967295u,           0);
+  assert_wrap (i32,  2147483647, -2147483648);
 }
 
 
 /*
  *	check_charset
+ *
  *	If this test fails on your platform, send me a postcard
  *	from your galaxy.
  */
 void check_charset ()
 {
-  // Always false, unless your platform uses a
-  // character set even worse than EBCDIC (yet
-  // unseen).
+  /* Always false, unless your platform uses a
+     character set even worse than EBCDIC (yet
+     unseen). */
   if (   '0' + 1 != '1'
       || '1' + 1 != '2'
       || '2' + 1 != '3'
diff -uaNr yadex-1.5.2/src/savepic.cc yadex-1.6.0/src/savepic.cc
--- yadex-1.5.2/src/savepic.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/savepic.cc	1970-01-01 01:00:00.000000000 +0100
@@ -1,103 +0,0 @@
-/*
- *	savepic.cc
- *	This module contains the function SavePic() which is called
- *	whenever you press shift-F1 in the image viewers. It is only a
- *	wrapper for the gifsave library.
- *	AYM 1998-02-12
- */
-
-
-/*
-This file is part of Yadex.
-
-Yadex incorporates code from DEU 5.21 that was put in the public domain in
-1994 by Raphal Quinet and Brendon Wyber.
-
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-
-#include "yadex.h"
-#if defined Y_UNIX
-#elif defined Y_DOS
-#include <gifsave.h>
-#endif
-
-
-#define PLAYPALNUM  0  /* palette no. to use when saving */
-
-#ifdef Y_DOS
-static int GetPixel (int x, int y);
-#endif
-
-
-void SavePic (int x0, int y0, int width, int height, const char *name)
-#if defined Y_UNIX
-{
-return;  /* FIXME */
-}
-#elif defined Y_DOS
-{
-int n;
-int r;
-MDirPtr             dir;
-unsigned char huge *dpal;
-al_fspec_t filename;
-
-strcpy (filename, name);
-strlwr (filename);
-
-/* Replace illegal file name characters by "_" */
-#if defined Y_DOS
-while (filename[n = strcspn (filename, "\"[\\]/*?.<>|+=:;^")])
-  filename[n] = '_';
-#elif defined Y_UNIX
-while (filename[n = strcspn (filename, "/")])
-  filename[n] = '_';
-#endif
-
-strcat (filename, ".gif");
-r = GIF_Create (filename, width, height, 256, 8);
-if (r != GIF_OK)
-  LogMessage ("GIF_Create error %d\n", r);
-if (PLAYPALNUM < 0 || PLAYPALNUM > 13)
-  return;
-dir = FindMasterDir (MasterDir, "PLAYPAL");
-if (dir)
-  {
-  dpal = GetFarMemory (768);
-  wad_seek (dir->wadfile, dir->dir.start + 3 * DOOM_COLOURS * PLAYPALNUM);
-  wad_read_bytes (dir->wadfile, dpal, 3 * DOOM_COLOURS);
-  for (n = 0; n < 256; n++)
-    GIF_SetColor (n, dpal[3*n], dpal[3*n+1], dpal[3*n+2]);
-  FreeFarMemory (dpal);
-  }
-r = GIF_CompressImage (x0, y0, width, height, GetPixel);
-if (r != GIF_OK)
-  LogMessage ("GIF_CompressImage error %d\n", r);
-r = GIF_Close ();
-LogMessage ("GIF_Close returned %d\n", r);
-}
-#endif
-
-
-#ifdef Y_DOS
-static int GetPixel (int x, int y)
-{
-return getpixel (x, y);
-}
-#endif
-
diff -uaNr yadex-1.5.2/src/scrnshot.cc yadex-1.6.0/src/scrnshot.cc
--- yadex-1.5.2/src/scrnshot.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/scrnshot.cc	2003-03-28 13:37:32.000000000 +0100
@@ -13,7 +13,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -45,72 +45,72 @@
 void ScreenShot (void)
 #if defined Y_UNIX
 {
-return;  /* FIXME */
+  return;  // FIXME
 }
 #elif defined Y_DOS
 {
-int n;
-int r;
-int ShotWidth, ShotHeight;
-
-ShotWidth = ScrMaxX+1;
-ShotHeight = ScrMaxY+1-17-12;
-
-LogMessage ("Writing screen shot to file yadex.gif\n");
-r = GIF_Create ("yadex.gif", ShotWidth, ShotHeight, 16, 3);
-if (r != GIF_OK)
-  LogMessage ("GIF_Create error %d\n", r);
-GIF_SetColor ( 0, 0, 0, 0);  /* BLACK */
-GIF_SetColor ( 1, 0, 0, 4);  /* BLUE */
-GIF_SetColor ( 2, 0, 4, 0);  /* GREEN */
-GIF_SetColor ( 3, 0, 4, 4);  /* CYAN */
-GIF_SetColor ( 4, 4, 0, 0);  /* RED */
-GIF_SetColor ( 5, 4, 0, 4);  /* MAGENTA */
-GIF_SetColor ( 6, 4, 3, 0);  /* BROWN */
-GIF_SetColor ( 7, 4, 4, 4);  /* LIGHTGRAY */
-GIF_SetColor ( 8, 2, 2, 2);  /* DARKGRAY */
-GIF_SetColor ( 9, 0, 0, 7);  /* LIGHTBLUE */
-GIF_SetColor (10, 0, 7, 0);  /* LIGHTGREEN */
-GIF_SetColor (11, 0, 7, 7);  /* LIGHTCYAN */
-GIF_SetColor (12, 7, 0, 0);  /* LIGHTRED */
-GIF_SetColor (13, 7, 0, 7);  /* LIGHTMAGENTA */
-GIF_SetColor (14, 7, 7, 0);  /* YELLOW */
-GIF_SetColor (15, 7, 7, 7);  /* WHITE */
-r = GIF_CompressImage (0, 17, ShotWidth, ShotHeight, ShotGetPixel);
-if (r != GIF_OK)
-  LogMessage ("GIF_CompressImage error %d\n", r);
-r = GIF_Close ();
-LogMessage ("GIF_Close returned %d\n", r);
+  int n;
+  int r;
+  int ShotWidth, ShotHeight;
+
+  ShotWidth = ScrMaxX+1;
+  ShotHeight = ScrMaxY+1-17-12;
+
+  LogMessage ("Writing screen shot to file yadex.gif\n");
+  r = GIF_Create ("yadex.gif", ShotWidth, ShotHeight, 16, 3);
+  if (r != GIF_OK)
+    LogMessage ("GIF_Create error %d\n", r);
+  GIF_SetColor ( 0, 0, 0, 0);  // BLACK
+  GIF_SetColor ( 1, 0, 0, 4);  // BLUE
+  GIF_SetColor ( 2, 0, 4, 0);  // GREEN
+  GIF_SetColor ( 3, 0, 4, 4);  // CYAN
+  GIF_SetColor ( 4, 4, 0, 0);  // RED
+  GIF_SetColor ( 5, 4, 0, 4);  // MAGENTA
+  GIF_SetColor ( 6, 4, 3, 0);  // BROWN
+  GIF_SetColor ( 7, 4, 4, 4);  // LIGHTGREY
+  GIF_SetColor ( 8, 2, 2, 2);  // DARKGREY
+  GIF_SetColor ( 9, 0, 0, 7);  // LIGHTBLUE
+  GIF_SetColor (10, 0, 7, 0);  // LIGHTGREEN
+  GIF_SetColor (11, 0, 7, 7);  // LIGHTCYAN
+  GIF_SetColor (12, 7, 0, 0);  // LIGHTRED
+  GIF_SetColor (13, 7, 0, 7);  // LIGHTMAGENTA
+  GIF_SetColor (14, 7, 7, 0);  // YELLOW
+  GIF_SetColor (15, 7, 7, 7);  // WHITE
+  r = GIF_CompressImage (0, 17, ShotWidth, ShotHeight, ShotGetPixel);
+  if (r != GIF_OK)
+    LogMessage ("GIF_CompressImage error %d\n", r);
+  r = GIF_Close ();
+  LogMessage ("GIF_Close returned %d\n", r);
 }
 
 
 static const char ColourCode[256] =
-  {
-  0, 0, 0, 0,15, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,  7, 0, 0, 0, 0, 0, 0, 0,
-  8, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
- 10, 0, 0, 0, 0, 0, 2, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-  6, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
- 12, 0, 0, 0, 0, 0, 0, 4,  0, 0, 0, 0, 0, 0, 3, 0,
-
-  0,11, 0, 0, 0, 9, 0, 0,  0, 0, 1, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0,14,  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,  0, 0,13, 0, 0, 5, 0, 0
-  };
+{
+   0, 0, 0, 0,15, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0,  7, 0, 0, 0, 0, 0, 0, 0,
+   8, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+  10, 0, 0, 0, 0, 0, 2, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+   6, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+  12, 0, 0, 0, 0, 0, 0, 4,  0, 0, 0, 0, 0, 0, 3, 0,
+
+   0,11, 0, 0, 0, 9, 0, 0,  0, 0, 1, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0,14,  0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0,  0, 0,13, 0, 0, 5, 0, 0
+};
 
 static int ShotGetPixel (int x, int y)
 {
-/* FIXME: I assume we're in 256 colours */
-return ColourCode[getpixel (x, y)];
+  // FIXME: I assume we're in 256 colours
+  return ColourCode[getpixel (x, y)];
 }
 #endif
 
diff -uaNr yadex-1.5.2/src/selbox.cc yadex-1.6.0/src/selbox.cc
--- yadex-1.5.2/src/selbox.cc	2000-05-12 23:53:45.000000000 +0200
+++ yadex-1.6.0/src/selbox.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -41,84 +41,84 @@
 
 selbox_c::selbox_c (void)
 {
-flags = 0;
+  flags = 0;
 }
 
 
 void selbox_c::set_1st_corner (int x, int y)
 {
-x1 = x;
-y1 = y;
-flags |= flags_1st_corner_set;
+  x1 = x;
+  y1 = y;
+  flags |= flags_1st_corner_set;
 }
 
 
 void selbox_c::set_2nd_corner (int x, int y)
 {
-x2 = x;
-y2 = y;
-flags |= flags_2nd_corner_set;
+  x2 = x;
+  y2 = y;
+  flags |= flags_2nd_corner_set;
 }
 
 
 void selbox_c::get_corners (int *x1, int *y1, int *x2, int *y2)
 {
-if (x1 != NULL)
-   *x1 = this->x1;
-if (y1 != NULL)
-   *y1 = this->y1;
-if (x2 != NULL)
-   *x2 = this->x2;
-if (y2 != NULL)
-   *y2 = this->y2;
+  if (x1 != NULL)
+    *x1 = this->x1;
+  if (y1 != NULL)
+    *y1 = this->y1;
+  if (x2 != NULL)
+    *x2 = this->x2;
+  if (y2 != NULL)
+    *y2 = this->y2;
 }
 
 
 void selbox_c::unset_corners (void)
 {
-flags &= ~ (flags_1st_corner_set | flags_2nd_corner_set);
+  flags &= ~ (flags_1st_corner_set | flags_2nd_corner_set);
 }
 
 
 void selbox_c::draw (void)
 {
-if ((flags & flags_1st_corner_set) && (flags & flags_2nd_corner_set))
-   {
-   set_colour (CYAN);
-   SetDrawingMode (1);
-   DrawMapLine (x1, y1, x1, y2);
-   DrawMapLine (x1, y2, x2, y2);
-   DrawMapLine (x2, y2, x2, y1);
-   DrawMapLine (x2, y1, x1, y1);
-   SetDrawingMode (0);
-   /* Those are needed by undraw() */
-   x1_disp = x1;
-   y1_disp = y1;
-   x2_disp = x2;
-   y2_disp = y2;
-   flags |= flags_displayed;
-   }
+  if ((flags & flags_1st_corner_set) && (flags & flags_2nd_corner_set))
+  {
+    set_colour (CYAN);
+    SetDrawingMode (1);
+    DrawMapLine (x1, y1, x1, y2);
+    DrawMapLine (x1, y2, x2, y2);
+    DrawMapLine (x2, y2, x2, y1);
+    DrawMapLine (x2, y1, x1, y1);
+    SetDrawingMode (0);
+    /* Those are needed by undraw() */
+    x1_disp = x1;
+    y1_disp = y1;
+    x2_disp = x2;
+    y2_disp = y2;
+    flags |= flags_displayed;
+  }
 }
 
 
 void selbox_c::undraw (void)
 {
-if (flags & flags_displayed)
-   {
-   set_colour (CYAN);
-   SetDrawingMode (1);
-   DrawMapLine (x1_disp, y1_disp, x1_disp, y2_disp);
-   DrawMapLine (x1_disp, y2_disp, x2_disp, y2_disp);
-   DrawMapLine (x2_disp, y2_disp, x2_disp, y1_disp);
-   DrawMapLine (x2_disp, y1_disp, x1_disp, y1_disp);
-   SetDrawingMode (0);
-   flags &= ~ flags_displayed;
-   }
+  if (flags & flags_displayed)
+  {
+    set_colour (CYAN);
+    SetDrawingMode (1);
+    DrawMapLine (x1_disp, y1_disp, x1_disp, y2_disp);
+    DrawMapLine (x1_disp, y2_disp, x2_disp, y2_disp);
+    DrawMapLine (x2_disp, y2_disp, x2_disp, y1_disp);
+    DrawMapLine (x2_disp, y1_disp, x1_disp, y1_disp);
+    SetDrawingMode (0);
+    flags &= ~ flags_displayed;
+  }
 }
 
 
 void selbox_c::clear (void)
 {
-flags &= ~ flags_displayed;
+  flags &= ~ flags_displayed;
 }
 
diff -uaNr yadex-1.5.2/src/selbox.h yadex-1.6.0/src/selbox.h
--- yadex-1.5.2/src/selbox.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/selbox.h	2003-02-12 17:16:40.000000000 +0100
@@ -10,36 +10,39 @@
 
 
 class selbox_c : public edwidget_c
-   {
-   public :
-      /* Methods used by edit_t */
-      selbox_c            ();
-      void set_1st_corner (int x, int y);
-      void set_2nd_corner (int x, int y);
-      void get_corners    (int *x1, int *y1, int *x2, int *y2);
-      void unset_corners  ();
-      /* Methods declared in edwidget_c */
-      void unset         ();
-      void draw          ();
-      void undraw        ();
-
-      int can_undraw ()
-         { return 1; }  // I have the ability to undraw myself
-
-      int need_to_clear ()
-         { return 0; }  // I know how to undraw myself.
-
-      void clear         ();
-   private :
-      int x1;		/* Coordinates of the first corner */
-      int y1;
-      int x2;		/* Coordinates of the second corner */
-      int y2;
-      int x1_disp;	/* x1 and y1 as they were last time draw() was called */
-      int y1_disp;
-      int x2_disp;	/* x2 and y2 as they were last time draw() was called */
-      int y2_disp;
-      int flags;
-   };
+{
+  public :
+
+    /* Methods used by edit_t */
+    selbox_c            ();
+    void set_1st_corner (int x, int y);
+    void set_2nd_corner (int x, int y);
+    void get_corners    (int *x1, int *y1, int *x2, int *y2);
+    void unset_corners  ();
+    /* Methods declared in edwidget_c */
+    void unset         ();
+    void draw          ();
+    void undraw        ();
+
+    int can_undraw ()
+      { return 1; }  // I have the ability to undraw myself
+
+    int need_to_clear ()
+      { return 0; }  // I know how to undraw myself.
+
+    void clear         ();
+
+  private :
+
+    int x1;		/* Coordinates of the first corner */
+    int y1;
+    int x2;		/* Coordinates of the second corner */
+    int y2;
+    int x1_disp;	/* x1 and y1 as they were last time draw() was called */
+    int y1_disp;
+    int x2_disp;	/* x2 and y2 as they were last time draw() was called */
+    int y2_disp;
+    int flags;
+};
 
 
diff -uaNr yadex-1.5.2/src/selectn.cc yadex-1.6.0/src/selectn.cc
--- yadex-1.5.2/src/selectn.cc	2000-05-07 14:40:00.000000000 +0200
+++ yadex-1.6.0/src/selectn.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -30,61 +30,67 @@
 
 #include "yadex.h"
 #include "bitvec.h"
+#include "objid.h"
 #include "selectn.h"
 
 
 /*
-   test if an object is in the selection list
-*/
-
+ *	IsSelected - test if an object is in a selection list
+ *
+ *	FIXME change the identifier
+ *	FIXME slow
+ */
 bool IsSelected (SelPtr list, int objnum)
 {
-SelPtr cur;
+  SelPtr cur;
 
-for (cur = list; cur; cur = cur->next)
-   if (cur->objnum == objnum)
+  for (cur = list; cur; cur = cur->next)
+    if (cur->objnum == objnum)
       return true;
-return false;
+  return false;
 }
 
 
 /*
- *	DumpSelection
- *	List the contents of the selection
+ *	DumpSelection -	list the contents of a selection
+ *
+ *	FIXME change the identifier
  */
 void DumpSelection (SelPtr list)
 {
-int n;
-SelPtr cur;
+  int n;
+  SelPtr cur;
 
-printf ("Selection:");
-for (n = 0, cur = list; cur; cur = cur->next, n++)
-   printf (" %d", cur->objnum);
-printf ("  (%d)\n", n);
+  printf ("Selection:");
+  for (n = 0, cur = list; cur; cur = cur->next, n++)
+    printf (" %d", cur->objnum);
+  printf ("  (%d)\n", n);
 }
 
 
 /*
- *	SelectObject
- *	add an object to the selection list
+ *	SelectObject - add an object to a selection list
+ *
+ *	FIXME change the identifier
  */
 void SelectObject (SelPtr *list, int objnum)
 {
-SelPtr cur;
+  SelPtr cur;
 
-if (! is_obj (objnum))
-   fatal_error ("BUG: SelectObject called with %d", objnum);
-cur = (SelPtr) GetMemory (sizeof (struct SelectionList));
-cur->next = *list;
-cur->objnum = objnum;
-*list = cur;
+  if (! is_obj (objnum))
+    fatal_error ("BUG: SelectObject called with %d", objnum);
+  cur = (SelPtr) GetMemory (sizeof (struct SelectionList));
+  cur->next = *list;
+  cur->objnum = objnum;
+  *list = cur;
 }
 
 
 /*
- *	select_unselect_obj
- *	If the object is not in the selection list, add it.
- *	If it already is, remove it.
+ *	select_unselect_obj - add or remove an object from a selection list
+ *
+ *	If the object is not in the selection list, add it.  If
+ *	it already is, remove it.
  */
 void select_unselect_obj (SelPtr *list, int objnum)
 {
@@ -92,117 +98,118 @@
 SelPtr prev;
 
 if (! is_obj (objnum))
-   fatal_error ("s/u_obj called with %d", objnum);
+  fatal_error ("s/u_obj called with %d", objnum);
 for (prev = NULL, cur = *list; cur != NULL; prev = cur, cur = cur->next)
-   // Already selected: unselect it.
-   if (cur->objnum == objnum)
-      {
-      if (prev != NULL)
-         prev->next = cur->next;
-      else
-         *list = cur->next;
-      FreeMemory (cur);
-      if (prev != NULL)
-         cur = prev->next;
-      else
-         cur = (SelPtr) NULL;
-      return;
-      }
-
-// Not selected: select it.
-cur = (SelPtr) GetMemory (sizeof (struct SelectionList));
-cur->next = *list;
-cur->objnum = objnum;
-*list = cur;
+  // Already selected: unselect it.
+  if (cur->objnum == objnum)
+  {
+    if (prev != NULL)
+      prev->next = cur->next;
+    else
+      *list = cur->next;
+    FreeMemory (cur);
+    if (prev != NULL)
+      cur = prev->next;
+    else
+      cur = (SelPtr) NULL;
+    return;
+  }
+
+  // Not selected: select it.
+  cur = (SelPtr) GetMemory (sizeof (struct SelectionList));
+  cur->next = *list;
+  cur->objnum = objnum;
+  *list = cur;
 }
 
 
 /*
-   remove an object from the selection list
-*/
-
+ *	UnSelectObject - remove an object from a selection list
+ *
+ *	FIXME change the identifier
+ */
 void UnSelectObject (SelPtr *list, int objnum)
 {
-SelPtr cur, prev;
+  SelPtr cur, prev;
 
-if (! is_obj (objnum))
-   fatal_error ("BUG: UnSelectObject called with %d", objnum);
-prev = 0;
-cur = *list;
-while (cur)
-   {
-   if (cur->objnum == objnum)
-      {
+  if (! is_obj (objnum))
+    fatal_error ("BUG: UnSelectObject called with %d", objnum);
+  prev = 0;
+  cur = *list;
+  while (cur)
+  {
+    if (cur->objnum == objnum)
+    {
       if (prev)
-	 prev->next = cur->next;
+	prev->next = cur->next;
       else
-	 *list = cur->next;
+	*list = cur->next;
       FreeMemory (cur);
       if (prev)
-	 cur = prev->next;
+	cur = prev->next;
       else
-	 cur = 0;
-      }
-   else
-      {
+	cur = 0;
+    }
+    else
+    {
       prev = cur;
       cur = cur->next;
-      }
-   }
+    }
+  }
 }
 
 
 /*
-   forget the selection list
-*/
-
+ *	ForgetSelection - clear a selection list
+ *
+ *	FIXME change the identifier
+ */
 void ForgetSelection (SelPtr *list)
 {
-SelPtr cur, prev;
+  SelPtr cur, prev;
 
-cur = *list;
-while (cur)
-   {
-   prev = cur;
-   cur = cur->next;
-   FreeMemory (prev);
-   }
-*list = 0;
+  cur = *list;
+  while (cur)
+  {
+    prev = cur;
+    cur = cur->next;
+    FreeMemory (prev);
+  }
+  *list = 0;
 }
 
 
 /*
- *	list_to_bitvec
- *	Make a bit vector of <bitvec_size> elements from a list.
- *	It's up to the caller to delete the new bit vector after use.
+ *	list_to_bitvec - make a bit vector from a list
+ *
+ *	The bit vector has <bitvec_size> elements. It's up to
+ *	the caller to delete the new bit vector after use.
  */
 bitvec_c *list_to_bitvec (SelPtr list, size_t bitvec_size)
 {
-SelPtr cur;
-bitvec_c *bitvec;
+  SelPtr cur;
+  bitvec_c *bitvec;
 
-bitvec = new bitvec_c (bitvec_size);
-for (cur = list; cur; cur = cur->next)
-   bitvec->set (cur->objnum);
-return bitvec;
+  bitvec = new bitvec_c (bitvec_size);
+  for (cur = list; cur; cur = cur->next)
+    bitvec->set (cur->objnum);
+  return bitvec;
 }
 
 
 /*
- *	bitvec_to_list
- *	Make a list from a bitvec object. The items are inserted
- *	in the list from first to last (i.e. item N in the bitvec
- *	is inserted before item N+1).
+ *	bitvec_to_list - make a list from a bitvec object
+ *
+ *	The items are inserted in the list from first to last
+ *	(i.e. item N in the bitvec is inserted before item N+1).
  *	It's up to the caller to delete the new list after use.
  */
 SelPtr bitvec_to_list (const bitvec_c &b)
 {
-SelPtr list = 0;
-for (size_t n = 0; n < b.nelements (); n++)
-   if (b.get (n))
+  SelPtr list = 0;
+  for (size_t n = 0; n < b.nelements (); n++)
+    if (b.get (n))
       SelectObject (&list, n);
-return list;
+  return list;
 }
 
-
-
diff -uaNr yadex-1.5.2/src/selectn.h yadex-1.6.0/src/selectn.h
--- yadex-1.5.2/src/selectn.h	2000-05-07 14:44:58.000000000 +0200
+++ yadex-1.6.0/src/selectn.h	2001-12-17 14:39:39.000000000 +0100
@@ -5,19 +5,20 @@
  */
 
 
-#ifndef YH_SELECTN
+#ifndef YH_SELECTN  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
 #define YH_SELECTN
 
+
 class bitvec_c;
 
 
-/* The selection list is used when more than one object is selected. */
+// The selection list is used when more than one object is selected.
 typedef struct SelectionList *SelPtr;
 struct SelectionList
-   {
-   SelPtr next;			/* next in list */
-   int objnum;			/* object number */
-   };
+{
+  SelPtr next;				// Next in list
+  int objnum;				// Object number
+};
 
 bool IsSelected (SelPtr, int);
 void DumpSelection (SelPtr list);
@@ -28,5 +29,5 @@
 bitvec_c *list_to_bitvec (SelPtr list, size_t bitvec_size);
 SelPtr bitvec_to_list (const bitvec_c &b);
 
-#endif
 
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/selpath.cc yadex-1.6.0/src/selpath.cc
--- yadex-1.5.2/src/selpath.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/selpath.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,7 @@
 #include "yadex.h"
 #include "bitvec.h"
 #include "levels.h"
+#include "objid.h"
 #include "selectn.h"
 #include "wstructs.h"
 
diff -uaNr yadex-1.5.2/src/selrect.cc yadex-1.6.0/src/selrect.cc
--- yadex-1.5.2/src/selrect.cc	2000-06-20 00:28:35.000000000 +0200
+++ yadex-1.6.0/src/selrect.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -29,6 +29,7 @@
 
 #include "yadex.h"
 #include "levels.h"
+#include "objid.h"
 #include "selectn.h"
 #include "wstructs.h"
 
diff -uaNr yadex-1.5.2/src/serialnum.cc yadex-1.6.0/src/serialnum.cc
--- yadex-1.5.2/src/serialnum.cc	2000-04-12 03:32:00.000000000 +0200
+++ yadex-1.6.0/src/serialnum.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/serialnum.h yadex-1.6.0/src/serialnum.h
--- yadex-1.5.2/src/serialnum.h	2000-04-12 03:32:34.000000000 +0200
+++ yadex-1.6.0/src/serialnum.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/spot.h yadex-1.6.0/src/spot.h
--- yadex-1.5.2/src/spot.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/spot.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -33,56 +33,57 @@
 
 class spot_c : public edwidget_c
 {
-public :
-/*
- *	Specific to this class
- */
-spot_c () { visible = 0; visible_disp = 0; }
-void set (int x, int y) { this->x = x; this->y = y; visible = 1; }
-
-/*
- *	Inherited from edwidget_c
- */
-void unset () { visible = 0; }
-
-void draw ()
-   {
-   if (visible && (! visible_disp || x_disp != x || y_disp != y))
+  public :
+
+    /*
+     *	Specific to this class
+     */
+    spot_c () { visible = 0; visible_disp = 0; }
+    void set (int x, int y) { this->x = x; this->y = y; visible = 1; }
+
+    /*
+     *	Inherited from edwidget_c
+     */
+    void unset () { visible = 0; }
+
+    void draw ()
+    {
+      if (visible && (! visible_disp || x_disp != x || y_disp != y))
       {
-      SetDrawingMode (1);
-      push_colour (LIGHTGREEN);
-      draw_map_point (x, y);
-      pop_colour ();
-      SetDrawingMode (0);
-      visible_disp = 1;
-      x_disp = x;
-      y_disp = y;
+	SetDrawingMode (1);
+	push_colour (LIGHTGREEN);
+	draw_map_point (x, y);
+	pop_colour ();
+	SetDrawingMode (0);
+	visible_disp = 1;
+	x_disp = x;
+	y_disp = y;
       }
-   }
+    }
 
-void undraw ()
-   {
-   if (visible_disp)
+    void undraw ()
+    {
+      if (visible_disp)
       {
-      SetDrawingMode (1);
-      push_colour (LIGHTGREEN);
-      draw_map_point (x_disp, y_disp);
-      pop_colour ();
-      SetDrawingMode (0);
-      visible_disp = 0;
+	SetDrawingMode (1);
+	push_colour (LIGHTGREEN);
+	draw_map_point (x_disp, y_disp);
+	pop_colour ();
+	SetDrawingMode (0);
+	visible_disp = 0;
       }
-   }
+    }
 
-int can_undraw () { return 1; }
-int need_to_clear () { return 0; }
-void clear () { visible_disp = 0; }
-
-private :
-int visible;
-int visible_disp;
-int x;
-int y;
-int x_disp;
-int y_disp;
+    int can_undraw () { return 1; }
+    int need_to_clear () { return 0; }
+    void clear () { visible_disp = 0; }
+
+  private :
+    int visible;
+    int visible_disp;
+    int x;
+    int y;
+    int x_disp;
+    int y_disp;
 };
 
diff -uaNr yadex-1.5.2/src/spritdir.cc yadex-1.6.0/src/spritdir.cc
--- yadex-1.5.2/src/spritdir.cc	2000-07-10 01:04:18.000000000 +0200
+++ yadex-1.6.0/src/spritdir.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/spritdir.h yadex-1.6.0/src/spritdir.h
--- yadex-1.5.2/src/spritdir.h	2000-06-01 22:40:46.000000000 +0200
+++ yadex-1.6.0/src/spritdir.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/sticker.cc yadex-1.6.0/src/sticker.cc
--- yadex-1.5.2/src/sticker.cc	2000-08-13 18:36:00.000000000 +0200
+++ yadex-1.6.0/src/sticker.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -314,7 +314,7 @@
   u8 *buf = (u8 *) GetMemory ((unsigned long) bytes_per_line * height);
   if (! buf)
   {
-    report_error ("Not enough memory to display %dx%d image", width, height);
+    err ("Not enough memory to display %dx%d image", width, height);
     return 0;
   }
 
@@ -475,7 +475,7 @@
     (char *) buf, width, height, 8, bytes_per_line);
   if (ximage == 0)
   {
-    report_error ("XCreateImage() returned NULL");
+    err ("XCreateImage() returned NULL");
     FreeMemory (buf);
   }
   else
@@ -516,7 +516,7 @@
   u8 *buf = (u8 *) GetMemory ((unsigned long) bytes_per_line * height);
   if (! buf)
   {
-    report_error ("Not enough memory to display %dx%d image", width, height);
+    err ("Not enough memory to display %dx%d image", width, height);
     return 0;
   }
 
@@ -603,7 +603,7 @@
     (char *) buf, width, height, bitmap_pad, bytes_per_line);
   if (ximage == 0)
   {
-    report_error ("XCreateImage() returned NULL");
+    err ("XCreateImage() returned NULL");
     FreeMemory (buf);
     return 0;
   }
diff -uaNr yadex-1.5.2/src/sticker.h yadex-1.6.0/src/sticker.h
--- yadex-1.5.2/src/sticker.h	2000-08-13 18:37:45.000000000 +0200
+++ yadex-1.6.0/src/sticker.h	2001-10-11 11:07:17.000000000 +0200
@@ -18,7 +18,10 @@
     void clear ();
     void load (const Img& img, bool opaque);
     void draw (Drawable drw, char grav, int x, int y);
+
   private :
+    Sticker (const Sticker&);			// Too lazy to implement it
+    Sticker& operator= (const Sticker&);	// Too lazy to implement it
     Sticker_priv *priv;
 };
 
diff -uaNr yadex-1.5.2/src/swapmem.cc yadex-1.6.0/src/swapmem.cc
--- yadex-1.5.2/src/swapmem.cc	2000-05-07 14:41:00.000000000 +0200
+++ yadex-1.6.0/src/swapmem.cc	2003-03-28 13:37:32.000000000 +0100
@@ -44,7 +44,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -63,6 +63,7 @@
 
 #include "yadex.h"
 #include "levels.h"
+#include "objid.h"
 #ifdef SWAP_TO_XMS
 #include "xms.h"
 typedef XMSHandle SwapHandle;	/* XMS handle */
@@ -183,23 +184,25 @@
 #else
 FILE      *file;
 char huge *data;
-char      *tmp;
 
-/* get a new (unique) file name */
-tmp = tempnam (NULL, "{DEU}");
-if (tmp == NULL)
+// get a new (unique) file name
+const char *basename = "yadexswpXXXXXX";  // 14 characters
+const char *dir      = getenv ("TMPDIR");
+if (dir == 0 || strlen (dir) + 1 + strlen (basename) >= sizeof (SwapHandle))
+   dir = "/tmp";
+y_snprintf (handle, sizeof (SwapHandle), "%s/%s", dir, basename);
+if (mkstemp (handle) == -1)
 {
 #ifdef DEBUG
    LogMessage ("\nFree memory before crash: %lu bytes.", farcoreleft ());
-#endif /* DEBUG */
-   fatal_error ("cannot create a temporary file name (out of memory)");
+#endif
+   fatal_error ("cannot create a temporary file from \"%s\" (%s)",
+      handle, strerror (errno));
 }
-strcpy (handle, tmp);
-free (tmp);
 #ifdef DEBUG
 LogMessage ("swapping out %lu bytes to %s\n", size, handle);
 #endif /* DEBUG */
-/* write the data to the temporary file */
+// write the data to the temporary file
 data = (char huge *) ptr;
 file = fopen (handle, "wb");
 if (file == NULL)
@@ -207,7 +210,8 @@
 #ifdef DEBUG
    LogMessage ("\nFree memory before crash: %lu bytes.", farcoreleft ());
 #endif /* DEBUG */
-   fatal_error ("error creating temporary file \"%s\"", handle);
+   fatal_error ("error creating temporary file \"%s\" (%s)",
+      handle, strerror (errno));
 }
 while (size > 0x8000)
 {
@@ -218,7 +222,9 @@
 }
 if (fwrite (data, 1, size, file) != size)
    fatal_error ("error writing to temporary file \"%s\"", handle);
-fclose (file);
+if (fclose (file))
+   fatal_error ("error writing to temporary file \"%s\" (%s)",
+      handle, strerror (errno));
 #endif /* !SWAP_TO_XMS */
 /* free the data block (in lower RAM) */
 FreeFarMemory (ptr);
diff -uaNr yadex-1.5.2/src/t_centre.cc yadex-1.6.0/src/t_centre.cc
--- yadex-1.5.2/src/t_centre.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/t_centre.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/t_flags.cc yadex-1.6.0/src/t_flags.cc
--- yadex-1.5.2/src/t_flags.cc	2000-04-21 23:47:29.000000000 +0200
+++ yadex-1.6.0/src/t_flags.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -34,35 +34,36 @@
 
 
 /*
- *	frob_things_flags
+ *	frob_things_flags - set/reset/toggle things flags
+ *
  *	For all the things in <list>, apply the operator <op>
  *	with the operand <operand> on the flags field.
  */
 void frob_things_flags (SelPtr list, int op, int operand)
 {
-SelPtr cur;
-i16 mask;
+  SelPtr cur;
+  i16 mask;
 
-if (op == YO_CLEAR || op == YO_SET || op == YO_TOGGLE)
-   mask = 1 << operand;
-else
-   mask = operand;
-
-for (cur = list; cur; cur = cur->next)
-   {
-   if (op == YO_CLEAR)
+  if (op == YO_CLEAR || op == YO_SET || op == YO_TOGGLE)
+    mask = 1 << operand;
+  else
+    mask = operand;
+
+  for (cur = list; cur; cur = cur->next)
+  {
+    if (op == YO_CLEAR)
       Things[cur->objnum].when &= ~mask;
-   else if (op == YO_SET)
+    else if (op == YO_SET)
       Things[cur->objnum].when |= mask;
-   else if (op == YO_TOGGLE)
+    else if (op == YO_TOGGLE)
       Things[cur->objnum].when ^= mask;
-   else
-      {
+    else
+    {
       nf_bug ("frob_things_flags: op=%02X", op);
       return;
-      }
-   }
-MadeChanges = 1;
+    }
+  }
+  MadeChanges = 1;
 }
 
 
diff -uaNr yadex-1.5.2/src/t_flags.h yadex-1.6.0/src/t_flags.h
--- yadex-1.5.2/src/t_flags.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/t_flags.h	2001-12-17 14:42:48.000000000 +0100
@@ -6,4 +6,3 @@
 
 void frob_things_flags (SelPtr list, int op, int operand);
 
-
diff -uaNr yadex-1.5.2/src/t_prop.cc yadex-1.6.0/src/t_prop.cc
--- yadex-1.5.2/src/t_prop.cc	2000-07-25 00:46:49.000000000 +0200
+++ yadex-1.6.0/src/t_prop.cc	2003-03-28 13:37:32.000000000 +0100
@@ -13,7 +13,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -73,7 +73,13 @@
          Things[obj->objnum].xpos);
 sprintf (menustr[4], "Change Y position    (Current: %d)",
          Things[obj->objnum].ypos);
-val = DisplayMenuArray (x0, y0, menustr[5], 5, NULL, menustr, NULL, NULL, NULL);
+val = vDisplayMenu (x0, y0, menustr[5],
+   menustr[0], YK_, 0,
+   menustr[1], YK_, 0,
+   menustr[2], YK_, 0,
+   menustr[3], YK_, 0,
+   menustr[4], YK_, 0,
+   NULL);
 for (n = 0; n < 6; n++)
    FreeMemory (menustr[n]);
 subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
@@ -90,15 +96,15 @@
      break;
 
   case 2:
-     switch (DisplayMenu (x0 + 42, subwin_y0, "Select angle",
-			  "North",
-			  "NorthEast",
-			  "East",
-			  "SouthEast",
-			  "South",
-			  "SouthWest",
-			  "West",
-			  "NorthWest",
+     switch (vDisplayMenu (x0 + 42, subwin_y0, "Select angle",
+			  "North",	YK_, 0,
+			  "NorthEast",	YK_, 0,
+			  "East",	YK_, 0,
+			  "SouthEast",	YK_, 0,
+			  "South",	YK_, 0,
+			  "SouthWest",	YK_, 0,
+			  "West",	YK_, 0,
+			  "NorthWest",	YK_, 0,
 			  NULL))
 	{
 	case 1:
@@ -107,42 +113,49 @@
 	   things_angles++;
 	   MadeChanges = 1;
 	   break;
+
 	case 2:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].angle = 45;
 	   things_angles++;
 	   MadeChanges = 1;
 	   break;
+
 	case 3:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].angle = 0;
 	   things_angles++;
 	   MadeChanges = 1;
 	   break;
+
 	case 4:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].angle = 315;
 	   things_angles++;
 	   MadeChanges = 1;
 	   break;
+
 	case 5:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].angle = 270;
 	   things_angles++;
 	   MadeChanges = 1;
 	   break;
+
 	case 6:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].angle = 225;
 	   things_angles++;
 	   MadeChanges = 1;
 	   break;
+
 	case 7:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].angle = 180;
 	   things_angles++;
 	   MadeChanges = 1;
 	   break;
+
 	case 8:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].angle = 135;
@@ -153,17 +166,17 @@
      break;
 
   case 3:
-     val = DisplayMenu (x0 + 42, subwin_y0, "Choose the difficulty level(s)",
-			"D12          (Easy only)",
-			"D3           (Medium only)",
-			"D12, D3      (Easy and Medium)",
-			"D45          (Hard only)",
-			"D12, D45     (Easy and Hard)",
-			"D3, D45      (Medium and Hard)",
-			"D12, D3, D45 (Easy, Medium, Hard)",
-			"Toggle \"Deaf/Ambush\" bit",
-			"Toggle \"Multi-player only\" bit",
-			"(Enter a decimal value)",
+     val = vDisplayMenu (x0 + 42, subwin_y0, "Choose the difficulty level(s)",
+			"D12          (Easy only)",		YK_, 0,
+			"D3           (Medium only)",		YK_, 0,
+			"D12, D3      (Easy and Medium)",	YK_, 0,
+			"D45          (Hard only)",		YK_, 0,
+			"D12, D45     (Easy and Hard)",		YK_, 0,
+			"D3, D45      (Medium and Hard)",	YK_, 0,
+			"D12, D3, D45 (Easy, Medium, Hard)",	YK_, 0,
+			"Toggle \"Deaf/Ambush\" bit",		YK_, 0,
+			"Toggle \"Multi-player only\" bit",	YK_, 0,
+			"(Enter number)",			YK_, 0,
 			NULL);
      switch (val)
 	{
@@ -178,19 +191,22 @@
 	      Things[cur->objnum].when = (Things[cur->objnum].when & 0x18) | val;
 	   MadeChanges = 1;
 	   break;
+
 	case 8:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].when ^= 0x08;
 	   MadeChanges = 1;
 	   break;
+
 	case 9:
 	   for (cur = obj; cur; cur = cur->next)
 	      Things[cur->objnum].when ^= 0x10;
 	   MadeChanges = 1;
 	   break;
+
 	case 10:
 	   val = InputIntegerValue (x0 + 84,
-              subwin_y0 + BOX_BORDER + (3 + val) * FONTH, 1, 31,
+              subwin_y0 + BOX_BORDER + (3 + val) * FONTH, 0, 65535,
 	      Things[obj->objnum].when);
 	   if (val != IIV_CANCEL)
 	      {
diff -uaNr yadex-1.5.2/src/t_spin.cc yadex-1.6.0/src/t_spin.cc
--- yadex-1.5.2/src/t_spin.cc	2000-07-25 01:42:20.000000000 +0200
+++ yadex-1.6.0/src/t_spin.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -34,25 +34,24 @@
 
 
 /*
-   Spin things (AYM 1997-06-17)
-*/
-
-void spin_things (SelPtr obj, int degrees) /* SWAP! */
+ *	spin_thing - change the angle of things
+ */
+void spin_things (SelPtr obj, int degrees)
 {
-SelPtr cur;
+  SelPtr cur;
 
-if (! obj)
-   return;
-for (cur = obj; cur; cur = cur->next)
-   {
-   Things[cur->objnum].angle += degrees;
-   while (Things[cur->objnum].angle >= 360)  /* No we can't use % */
+  if (! obj)
+    return;
+  for (cur = obj; cur; cur = cur->next)
+  {
+    Things[cur->objnum].angle += degrees;
+    while (Things[cur->objnum].angle >= 360)	// No we can't use %
       Things[cur->objnum].angle -= 360;
-   while (Things[cur->objnum].angle < 0)  /* (negatives...) */
+    while (Things[cur->objnum].angle < 0)	// (negatives...)
       Things[cur->objnum].angle += 360;
-   }
-things_angles++;
-MadeChanges = 1;
+  }
+  things_angles++;
+  MadeChanges = 1;
 }
 
 
diff -uaNr yadex-1.5.2/src/textures.cc yadex-1.6.0/src/textures.cc
--- yadex-1.5.2/src/textures.cc	2000-08-13 18:47:08.000000000 +0200
+++ yadex-1.6.0/src/textures.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -40,6 +40,7 @@
 #include "pic2img.h"
 #include "sticker.h"
 #include "textures.h"
+#include "wadfile.h"
 #include "wads.h"
 #include "wstructs.h"
 
@@ -50,13 +51,13 @@
 */
 void DisplayWallTexture (hookfunc_comm_t *c)
 {
-MDirPtr  dir = 0;	/* main directory pointer to the TEXTURE* entries */
-i32     *offsets;	/* array of offsets to texture names */
-int      n;		/* general counter */
-i16      width, height;	/* size of the texture */
-i16      npatches;	/* number of wall patches used to build this texture */
-i32      numtex;	/* number of texture names in TEXTURE* list */
-i32      texofs;	/* offset in the wad file to the texture data */
+MDirPtr  dir = 0;	// Main directory pointer to the TEXTURE* entries
+i32     *offsets;	// Array of offsets to texture names
+int      n;		// General counter
+i16      width, height;	// Size of the texture
+i16      npatches;	// Number of patches in the textures
+i32      numtex;	// number of texture names in TEXTURE* list
+i32      texofs;	// Offset in the wad file to the texture data
 char     tname[WAD_TEX_NAME + 1];	/* texture name */
 char     picname[WAD_PIC_NAME + 1];	/* wall patch name */
 bool     have_dummy_bytes;
@@ -96,19 +97,31 @@
 
 #ifndef Y_X11
 if (have_key ())
-   return; /* speedup */
+   return;				// Speedup
 #endif
 
-/* offset for texture we want. */
+// Offset for texture we want
 texofs = 0;
 // Doom alpha 0.4 : "TEXTURES", no names
 if (yg_texture_lumps == YGTL_TEXTURES && yg_texture_format == YGTF_NAMELESS)
    {
-   dir = FindMasterDir (MasterDir, "TEXTURES");
+   const char *lump_name = "TEXTURES";
+   dir = FindMasterDir (MasterDir, lump_name);
    if (dir != NULL)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &numtex);
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+	 {
+	 warn ("%s: can't seek to lump\n", lump_name);
+	 goto alpha04_done;
+	 }
+      wf->read_i32 (&numtex);
+      if (wf->error ())
+	 {
+	 warn ("%s: error reading texture count\n", lump_name);
+	 goto alpha04_done;
+	 }
       if (WAD_TEX_NAME < 7) nf_bug ("WAD_TEX_NAME too small");  // Sanity
       if (! y_strnicmp (c->name, "TEX", 3)
 	    && isdigit (c->name[3])
@@ -121,33 +134,74 @@
 	 if (sscanf (c->name + 3, "%4ld", &num) == 1
 	       && num >= 0 && num < numtex)
 	    {
-	    wad_seek (dir->wadfile, dir->dir.start + 4 + 4 * num);
-	    wad_read_i32 (dir->wadfile, &texofs);
+	    wf->seek (dir->dir.start + 4 + 4 * num);
+	    if (wf->error ())
+	       {
+	       // FIXME print name of offending texture (or #)
+	       warn ("%s: can't seek to offsets table entry\n", lump_name);
+	       goto alpha04_done;
+	       }
+	    wf->read_i32 (&texofs);
+	    if (wf->error ())
+	       {
+	       warn ("%s: error reading texture offset\n", lump_name);
+	       goto alpha04_done;
+	       }
 	    texofs += dir->dir.start;
 	    }
 	 }
       }
+   alpha04_done:
+   ;
    }
 // Doom alpha 0.5 : only "TEXTURES"
 else if (yg_texture_lumps == YGTL_TEXTURES
    && (yg_texture_format == YGTF_NORMAL || yg_texture_format == YGTF_STRIFE11))
    {
-   // Is it in TEXTURES ?
-   dir = FindMasterDir (MasterDir, "TEXTURES");
+   const char *lump_name = "TEXTURES";
+   dir = FindMasterDir (MasterDir, lump_name);
    if (dir != NULL)  // (Theoretically, it should always exist)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &numtex);
-      /* read in the offsets for texture1 names and info. */
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+	 {
+	 warn ("%s: can't seek to lump\n", lump_name);
+	 goto textures_done;
+	 }
+      wf->read_i32 (&numtex);
+      if (wf->error ())
+	 {
+	 warn ("%s: error reading texture count\n", lump_name);
+	 goto textures_done;
+	 }
+      // Read in the offsets for texture1 names and info
       offsets = (i32 *) GetMemory ((long) numtex * 4);
-      wad_read_i32 (dir->wadfile, offsets, numtex);
-      for (n = 0; n < numtex && !texofs; n++)
+      wf->read_i32 (offsets, numtex);
+      if (wf->error ())
+	 {
+	 warn ("%s: error reading offsets table\n", lump_name);
+	 goto textures_done;
+	 }
+      for (long n = 0; n < numtex && !texofs; n++)
 	 {
-	 wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	 wad_read_bytes (dir->wadfile, &tname, WAD_TEX_NAME);
+	 wf->seek (dir->dir.start + offsets[n]);
+	 if (wf->error ())
+	    {
+	    warn ("%s: error seeking to definition of texture #%ld\n",
+	      lump_name, n);
+	    break;
+	    }
+	 wf->read_bytes (&tname, WAD_TEX_NAME);
+	 if (wf->error ())
+	    {
+	    warn ("%s: error reading name of texture #%ld\n", lump_name, n);
+	    break;
+	    }
 	 if (!y_strnicmp (tname, c->name, WAD_TEX_NAME))
 	    texofs = dir->dir.start + offsets[n];
 	 }
+      textures_done:
       FreeMemory (offsets);
       }
    }
@@ -156,68 +210,133 @@
    && (yg_texture_format == YGTF_NORMAL || yg_texture_format == YGTF_STRIFE11))
    {
    // Is it in TEXTURE1 ?
-   dir = FindMasterDir (MasterDir, "TEXTURE1");
+   {
+   const char *lump_name = "TEXTURE1";
+   dir = FindMasterDir (MasterDir, lump_name);
    if (dir != NULL)  // (Theoretically, it should always exist)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &numtex);
-      /* read in the offsets for texture1 names and info. */
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+	 {
+	 warn ("%s: can't seek to lump\n", lump_name);
+	 goto texture1_done;
+	 }
+      wf->read_i32 (&numtex);
+      if (wf->error ())
+	 {
+	 warn ("%s: error reading texture count\n", lump_name);
+	 goto texture1_done;
+	 }
+      // Read in the offsets for texture1 names and info
       offsets = (i32 *) GetMemory ((long) numtex * 4);
-      wad_read_i32 (dir->wadfile, offsets, numtex);
-      for (n = 0; n < numtex && !texofs; n++)
+      wf->read_i32 (offsets, numtex);
+      if (wf->error ())
+	 {
+	 warn ("%s: error reading offsets table\n", lump_name);
+	 goto texture1_done;
+	 }
+      for (long n = 0; n < numtex && !texofs; n++)
 	 {
-	 wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	 wad_read_bytes (dir->wadfile, &tname, WAD_TEX_NAME);
+	 wf->seek (dir->dir.start + offsets[n]);
+	 if (wf->error ())
+	    {
+	    warn ("%s: error seeking to definition of texture #%ld\n",
+	      lump_name, n);
+	    break;
+	    }
+	 wf->read_bytes (&tname, WAD_TEX_NAME);
+	 if (wf->error ())
+	    {
+	    warn ("%s: error reading name of texture #%ld\n", lump_name, n);
+	    break;
+	    }
 	 if (!y_strnicmp (tname, c->name, WAD_TEX_NAME))
 	    texofs = dir->dir.start + offsets[n];
 	 }
+      texture1_done:
       FreeMemory (offsets);
       }
+   }
    // Well, then is it in TEXTURE2 ?
    if (texofs == 0)
       {
-      dir = FindMasterDir (MasterDir, "TEXTURE2");
+      const char *lump_name = "TEXTURE2";
+      dir = FindMasterDir (MasterDir, lump_name);
       if (dir != NULL)  // Doom II has no TEXTURE2
 	 {
-	 wad_seek (dir->wadfile, dir->dir.start);
-	 wad_read_i32 (dir->wadfile, &numtex);
-	 /* read in the offsets for texture2 names */
+	 const Wad_file * wf = dir->wadfile;
+	 wf->seek (dir->dir.start);
+	 if (wf->error ())
+	    {
+	    warn ("%s: can't seek to lump\n", lump_name);
+	    goto texture2_done;
+	    }
+	 wf->read_i32 (&numtex);
+	 if (wf->error ())
+	    {
+	    warn ("%s: error reading texture count\n", lump_name);
+	    goto texture2_done;
+	    }
+	 // Read in the offsets for TEXTURE2 names
 	 offsets = (i32 *) GetMemory ((long) numtex * 4);
-	 wad_read_i32 (dir->wadfile, offsets, numtex);
-	 for (n = 0; n < numtex && !texofs; n++)
+	 wf->read_i32 (offsets, numtex);
+	 if (wf->error ())
+	    {
+	    warn ("%s: error reading offsets table\n", lump_name);
+	    goto texture2_done;
+	    }
+	 for (long n = 0; n < numtex && !texofs; n++)
 	    {
-	    wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	    wad_read_bytes (dir->wadfile, &tname, WAD_TEX_NAME);
+	    wf->seek (dir->dir.start + offsets[n]);
+	    if (wf->error ())
+	       {
+	       warn ("%s: error seeking to definition of texture #%ld\n",
+		 lump_name, n);
+	       break;
+	       }
+	    wf->read_bytes (&tname, WAD_TEX_NAME);
+	    if (wf->error ())
+	       {
+	       warn ("%s: error reading name of texture #%ld\n", lump_name, n);
+	       break;
+	       }
 	    if (!y_strnicmp (tname, c->name, WAD_TEX_NAME))
 	       texofs = dir->dir.start + offsets[n];
 	    }
+	 texture2_done:
 	 FreeMemory (offsets);
 	 }
       }
    }
 else
    nf_bug ("Invalid texture_format/texture_lumps combination.");
+search_done:
 
-/* texture name not found */
+// Texture name not found
 if (texofs == 0)
    return;
 
-/* read the info for this texture */
+// Read the info for this texture
 i32 header_ofs;
 if (yg_texture_format == YGTF_NAMELESS)
    header_ofs = texofs;
 else
    header_ofs = texofs + WAD_TEX_NAME;
-wad_seek (dir->wadfile, header_ofs + 4);
-wad_read_i16 (dir->wadfile, &width);
-wad_read_i16 (dir->wadfile, &height);
+dir->wadfile->seek     (header_ofs + 4);
+// FIXME
+dir->wadfile->read_i16 (&width);
+// FIXME
+dir->wadfile->read_i16 (&height);
+// FIXME
 if (have_dummy_bytes)
    {
    i16 dummy;
-   wad_read_i16 (dir->wadfile, &dummy);
-   wad_read_i16 (dir->wadfile, &dummy);
+   dir->wadfile->read_i16 (&dummy);
+   dir->wadfile->read_i16 (&dummy);
    }
-wad_read_i16 (dir->wadfile, &npatches);
+dir->wadfile->read_i16 (&npatches);
+// FIXME
 
 c->width    = width;
 c->height   = height;
@@ -231,35 +350,40 @@
 
 #ifndef Y_X11
 if (have_key ())
-   return; /* speedup */
+   return;				// Speedup
 #endif
 
 #ifdef Y_BGI
-/* not really necessary, except when xofs or yofs < 0 */
+// Not really necessary, except when xofs or yofs < 0
 setviewport (c->x0, c->y0, c->x1, c->y1, 1);
 #endif  /* FIXME ! */
 
-/* Compose the texture */
-Img texbuf (width, height);
+// Compose the texture
+c->img.resize (width, height);
+c->img.set_opaque (false);
 
 /* Paste onto the buffer all the patches that the texture is
-   made of. */
-for (n = 0; n < npatches; n++)
+   made of. Unless c->npatches is non-zero, in which case we
+   paste only the first maxpatches ones. */
+int maxpatches = npatches;
+if (c->maxpatches != 0 && c->maxpatches <= npatches)
+   maxpatches = c->maxpatches;
+for (n = 0; n < maxpatches; n++)
    {
    hookfunc_comm_t subc;
-   i16 xofs, yofs;	// offset in texture space for the patch
-   i16 pnameind;	// index of patch in PNAMES
+   i16 xofs, yofs;	// Offset in texture space for the patch
+   i16 pnameind;	// Index of patch in PNAMES
 
-   wad_seek (dir->wadfile, header_ofs + header_size + (long) n * item_size);
-   wad_read_i16 (dir->wadfile, &xofs);
-   wad_read_i16 (dir->wadfile, &yofs);
-   wad_read_i16 (dir->wadfile, &pnameind);
+   dir->wadfile->seek (header_ofs + header_size + (long) n * item_size);
+   dir->wadfile->read_i16 (&xofs);
+   dir->wadfile->read_i16 (&yofs);
+   dir->wadfile->read_i16 (&pnameind);
    if (have_dummy_bytes)
       {
       i16 stepdir;
       i16 colormap;
-      wad_read_i16 (dir->wadfile, &stepdir);   // Always 1, unused.
-      wad_read_i16 (dir->wadfile, &colormap);  // Always 0, unused.
+      dir->wadfile->read_i16 (&stepdir);   // Always 1, unused.
+      dir->wadfile->read_i16 (&colormap);  // Always 0, unused.
       }
 
    /* AYM 1998-08-08: Yes, that's weird but that's what Doom
@@ -289,10 +413,10 @@
 #endif
    }
 
-   /* coords changed because of the "setviewport" */
 #ifdef Y_BGI
    /* AYM 1998-07-11
       Is it normal to set x0 and y0 to potentially negative values ? */
+   // coords changed because of the "setviewport"
    subc.x0 = xofs;
    subc.y0 = yofs;
    subc.x1 = c->x1 - c->x0;
@@ -305,13 +429,13 @@
 #endif
    subc.name = picname;
 
-   if (LoadPicture (texbuf, picname, loc, xofs, yofs, 0, 0))
+   if (LoadPicture (c->img, picname, loc, xofs, yofs, 0, 0))
       warn ("texture \"%.*s\": patch \"%.*s\" not found.\n",
 	  WAD_TEX_NAME, tname, WAD_PIC_NAME, picname);
    }
 
-/* Display the texture */
-Sticker sticker (texbuf, true);  // Use opaque because it's faster
+// Display the texture
+Sticker sticker (c->img, true);		// Use opaque because it's faster
 sticker.draw (drw, 't', c->x0, c->y0);
 c->flags |= HOOK_DRAWN;
 c->disp_x0 = c->x0 + c->xofs;
@@ -319,8 +443,8 @@
 c->disp_x1 = c->disp_x0 + width - 1;
 c->disp_y1 = c->disp_y0 + height - 1;
 
-/* restore the normal viewport */
 #ifdef Y_BGI
+// Restore the normal viewport
 setviewport (0, 0, ScrMaxX, ScrMaxY, 1);
 #endif  /* FIXME ! */
 }
@@ -331,24 +455,23 @@
 */
 void GetWallTextureSize (i16 *width, i16 *height, const char *texname)
 {
-MDirPtr  dir = 0;	/* pointer in main directory to texname */
-i32    *offsets;	/* array of offsets to texture names */
-int      n;		/* general counter */
-i32      numtex;	/* number of texture names in TEXTURE* list */
-i32      texofs;	/* offset in doom.wad for the texture data */
-char     tname[WAD_TEX_NAME + 1];  /* texture name */
+MDirPtr  dir = 0;			// Pointer in main directory to texname
+i32    *offsets;			// Array of offsets to texture names
+int      n;				// General counter
+i32      numtex;			// Number of texture names in TEXTURE*
+i32      texofs;			// Offset in wad for the texture data
+char     tname[WAD_TEX_NAME + 1];	// Texture name
 
-/* offset for texture we want. */
+// Offset for texture we want
 texofs = 0;
-// search for texname in TEXTURE1 (or TEXTURES)
-
+// Search for texname in TEXTURE1 (or TEXTURES)
 if (yg_texture_lumps == YGTL_TEXTURES && yg_texture_format == YGTF_NAMELESS)
    {
    dir = FindMasterDir (MasterDir, "TEXTURES");
    if (dir != NULL)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &numtex);
+      dir->wadfile->seek (dir->dir.start);
+      dir->wadfile->read_i32 (&numtex);
       if (WAD_TEX_NAME < 7) nf_bug ("WAD_TEX_NAME too small");  // Sanity
       if (! y_strnicmp (texname, "TEX", 3)
 	    && isdigit (texname[3])
@@ -361,8 +484,8 @@
 	 if (sscanf (texname + 3, "%4ld", &num) == 1
 	       && num >= 0 && num < numtex)
 	    {
-	    wad_seek (dir->wadfile, dir->dir.start + 4 + 4 * num);
-	    wad_read_i32 (dir->wadfile, &texofs);
+	    dir->wadfile->seek (dir->dir.start + 4 + 4 * num);
+	    dir->wadfile->read_i32 (&texofs);
 	    }
 	 }
       }
@@ -381,15 +504,15 @@
       }
    if (dir != NULL)
       {
-      wad_seek (dir->wadfile, dir->dir.start);
-      wad_read_i32 (dir->wadfile, &numtex);
-      /* read in the offsets for texture1 names and info. */
+      dir->wadfile->seek (dir->dir.start);
+      dir->wadfile->read_i32 (&numtex);
+      // Read in the offsets for texture1 names and info
       offsets = (i32 *) GetMemory ((long) numtex * 4);
-      wad_read_i32 (dir->wadfile, offsets, numtex);
+      dir->wadfile->read_i32 (offsets, numtex);
       for (n = 0; n < numtex && !texofs; n++)
 	 {
-	 wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	 wad_read_bytes (dir->wadfile, &tname, WAD_TEX_NAME);
+	 dir->wadfile->seek (dir->dir.start + offsets[n]);
+	 dir->wadfile->read_bytes (&tname, WAD_TEX_NAME);
 	 if (!y_strnicmp (tname, texname, WAD_TEX_NAME))
 	    texofs = dir->dir.start + offsets[n];
 	 }
@@ -401,15 +524,15 @@
       dir = FindMasterDir (MasterDir, "TEXTURE2");
       if (dir != NULL)  // Doom II has no TEXTURE2
 	 {
-	 wad_seek (dir->wadfile, dir->dir.start);
-	 wad_read_i32 (dir->wadfile, &numtex);
-	 /* read in the offsets for texture2 names */
+	 dir->wadfile->seek (dir->dir.start);
+	 dir->wadfile->read_i32 (&numtex);
+	 // Read in the offsets for texture2 names
 	 offsets = (i32 *) GetMemory ((long) numtex * 4);
-	 wad_read_i32 (dir->wadfile, offsets);
+	 dir->wadfile->read_i32 (offsets);
 	 for (n = 0; n < numtex && !texofs; n++)
 	    {
-	    wad_seek (dir->wadfile, dir->dir.start + offsets[n]);
-	    wad_read_bytes (dir->wadfile, &tname, WAD_TEX_NAME);
+	    dir->wadfile->seek (dir->dir.start + offsets[n]);
+	    dir->wadfile->read_bytes (&tname, WAD_TEX_NAME);
 	    if (!y_strnicmp (tname, texname, WAD_TEX_NAME))
 	       texofs = dir->dir.start + offsets[n];
 	    }
@@ -422,17 +545,17 @@
 
 if (texofs != 0)
    {
-   /* read the info for this texture */
+   // Read the info for this texture
    if (yg_texture_format == YGTF_NAMELESS)
-      wad_seek (dir->wadfile, texofs + 4L);
+      dir->wadfile->seek (texofs + 4L);
    else
-      wad_seek (dir->wadfile, texofs + 12L);
-   wad_read_i16 (dir->wadfile, width);
-   wad_read_i16 (dir->wadfile, height);
+      dir->wadfile->seek (texofs + 12L);
+   dir->wadfile->read_i16 (width);
+   dir->wadfile->read_i16 (height);
    }
 else
    {
-   /* texture data not found */
+   // Texture data not found
    *width  = -1;
    *height = -1;
    }
diff -uaNr yadex-1.5.2/src/things.cc yadex-1.6.0/src/things.cc
--- yadex-1.5.2/src/things.cc	2000-07-13 23:54:14.000000000 +0200
+++ yadex-1.6.0/src/things.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/trace.cc yadex-1.6.0/src/trace.cc
--- yadex-1.5.2/src/trace.cc	2000-02-09 23:41:39.000000000 +0100
+++ yadex-1.6.0/src/trace.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -35,10 +35,11 @@
 // FIXME stopgap
 void trace (const char *domain, const char *fmt, ...)
 {
-  (void) domain;
   if (verbose)
   {
     va_list args;
+
+    fprintf (stdout, "%s: ", domain);
     va_start (args, fmt);
     vprintf (fmt, args);
     va_end (args);
diff -uaNr yadex-1.5.2/src/trace.h yadex-1.6.0/src/trace.h
--- yadex-1.5.2/src/trace.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/trace.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/v_centre.cc yadex-1.6.0/src/v_centre.cc
--- yadex-1.5.2/src/v_centre.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/v_centre.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/v_merge.cc yadex-1.6.0/src/v_merge.cc
--- yadex-1.5.2/src/v_merge.cc	2000-06-28 02:45:46.000000000 +0200
+++ yadex-1.6.0/src/v_merge.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,8 @@
 #include "yadex.h"
 #include "dialog.h"
 #include "levels.h"
+#include "objects.h"
+#include "objid.h"
 #include "selectn.h"
 
 
@@ -46,10 +48,10 @@
 
 
 /*
-   delete a Vertex and join the two LineDefs
+   delete a vertex and join the two linedefs
 */
 
-void DeleteVerticesJoinLineDefs (SelPtr obj) /* SWAP! */
+void DeleteVerticesJoinLineDefs (SelPtr obj)
 {
 int    lstart, lend, l;
 SelPtr cur;
@@ -89,8 +91,8 @@
       continue;
       }
    LineDefs[lend].end = LineDefs[lstart].end;
-   DeleteObject (OBJ_LINEDEFS, lstart);
-   DeleteObject (OBJ_VERTICES, cur->objnum);
+   DeleteObject (Objid (OBJ_LINEDEFS, lstart));
+   DeleteObject (Objid (OBJ_VERTICES, cur->objnum));
    MadeChanges = 1;
    MadeMapChanges = 1;
    }
@@ -102,7 +104,7 @@
    merge several vertices into one
 */
 
-void MergeVertices (SelPtr *list) /* SWAP! */
+void MergeVertices (SelPtr *list)
 {
 int    v, l;
 
@@ -115,12 +117,12 @@
    Notify (-1, -1, "You must select at least two vertices", NULL);
    return;
    }
-/* change the LineDefs starts & ends */
+/* change the linedefs starts & ends */
 for (l = 0; l < NumLineDefs; l++)
    {
    if (IsSelected (*list, LineDefs[l].start))
       {
-      /* don't change a LineDef that has both ends on the same spot */
+      /* don't change a linedef that has both ends on the same spot */
       if (!IsSelected (*list, LineDefs[l].end) && LineDefs[l].end != v)
 	 LineDefs[l].start = v;
       }
@@ -131,7 +133,7 @@
 	 LineDefs[l].end = v;
       }
    }
-/* delete the Vertices (and some LineDefs too) */
+/* delete the vertices (and some linedefs too) */
 DeleteObjects (OBJ_VERTICES, list);
 MadeChanges = 1;
 MadeMapChanges = 1;
@@ -149,7 +151,7 @@
    Returns a non-zero value if the screen needs to be redrawn.
 */
 
-bool AutoMergeVertices (SelPtr *list, int obj_type, char operation) /* SWAP! */
+bool AutoMergeVertices (SelPtr *list, int obj_type, char operation)
 {
 SelPtr ref, cur;
 bool   redraw;
@@ -170,7 +172,6 @@
 
 ObjectsNeeded (OBJ_VERTICES, 0);
 redraw = false;
-//redraw = 1;
 mergedone = false;
 isldend = false;
 
@@ -179,13 +180,13 @@
 else
    confirm_flag = YC_ASK_ONCE;
 
-/* first, check if two (or more) Vertices should be merged */
+/* first, check if two (or more) vertices should be merged */
 ref = *list;
 while (ref)
    {
    refv = ref->objnum;
    ref = ref->next;
-   /* check if there is a Vertex at the same position (same X and Y) */
+   /* check if there is a vertex at the same position (same X and Y) */
    for (v = 0; v < NumVertices; v++)
       if (v != refv
          && Vertices[refv].x == Vertices[v].x
@@ -212,9 +213,9 @@
 		  cur->objnum = cur->objnum - 1;
 	    if (v > refv)
 	       v--;
-	    /* the old Vertex has been deleted */
+	    /* the old vertex has been deleted */
 	    UnSelectObject (list, refv);
-	    /* select the new Vertex instead */
+	    /* select the new vertex instead */
 	    if (!IsSelected (*list, v))
 	       SelectObject (list, v);
 	    break;
@@ -224,7 +225,7 @@
          }
    }
 
-/* Now, check if one or more Vertices are on a LineDef */
+/* Now, check if one or more vertices are on a linedef */
 //DisplayMessage  (-1, -1, "Checking vertices on a linedef");
 
 // Distance in map units that is equivalent to 4 pixels
@@ -240,13 +241,13 @@
    refv = ref->objnum;
    ref = ref->next;
    oldnumld = NumLineDefs;
-   /* check if this Vertex is on a LineDef */
+   /* check if this vertex is on a linedef */
    for (ld = 0; ld < oldnumld; ld++)
       {
       ObjectsNeeded (OBJ_VERTICES, OBJ_LINEDEFS, 0);
       if (LineDefs[ld].start == refv || LineDefs[ld].end == refv)
          {
-	 /* one Vertex had a LineDef bound to it -- check it later */
+	 /* one vertex had a linedef bound to it -- check it later */
 	 isldend = true;
          }
       else if (IsLineDefInside (ld, Vertices[refv].x - tolerance,
@@ -261,7 +262,7 @@
             buf,
             "Do you want to split the linedef there?"))
 	    {
-	    /* split the LineDef */
+	    /* split the linedef */
 	    mergedone = true;
 	    InsertObject (OBJ_LINEDEFS, ld, 0, 0);
 	    LineDefs[ld].end = refv;
@@ -293,7 +294,7 @@
 if (! isldend || ! mergedone)
    return redraw;
 
-/* finally, test if two LineDefs are between the same pair of Vertices */
+/* finally, test if two linedefs are between the same pair of vertices */
 /* AYM 1997-07-17
    Here I put a new algorithm. The original one led to a very large
    number of tests (N*(N-1)/2 where N is number of linedefs). For
@@ -343,7 +344,7 @@
       {
       LDPtr ldo = LineDefs + ld1;
       LDPtr ldn = LineDefs + ld2;
-      /* Test if the LineDefs have the same orientation */
+      /* Test if the linedefs have the same orientation */
       if (ldn->start == ldo->end)
 	 flipped = true;
       else
@@ -361,12 +362,12 @@
 	 if (flipped)
 	    {
 	    ldn->sidedef1 = ldo->sidedef2;
-	    ldo->sidedef2 = -1;
+	    ldo->sidedef2 = OBJ_NO_NONE;
 	    }
 	 else
 	    {
 	    ldn->sidedef1 = ldo->sidedef1;
-	    ldo->sidedef1 = -1;
+	    ldo->sidedef1 = OBJ_NO_NONE;
 	    }
 	 }
       if (ldn->sidedef2 < 0)
@@ -374,17 +375,17 @@
 	 if (flipped)
 	    {
 	    ldn->sidedef2 = ldo->sidedef1;
-	    ldo->sidedef1 = -1;
+	    ldo->sidedef1 = OBJ_NO_NONE;
 	    }
 	 else
 	    {
 	    ldn->sidedef2 = ldo->sidedef2;
-	    ldo->sidedef2 = -1;
+	    ldo->sidedef2 = OBJ_NO_NONE;
 	    }
          }
       if (ldn->sidedef1 >= 0 && ldn->sidedef2 >= 0 && (ldn->flags & 0x04) == 0)
 	 ldn->flags = 0x04;
-      DeleteObject (OBJ_LINEDEFS, ld1);
+      DeleteObject (Objid (OBJ_LINEDEFS, ld1));
       }
    }
 
diff -uaNr yadex-1.5.2/src/v_polyg.cc yadex-1.6.0/src/v_polyg.cc
--- yadex-1.5.2/src/v_polyg.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/v_polyg.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,6 +28,8 @@
 
 
 #include "yadex.h"
+#include "objects.h"
+#include "objid.h"
 #include <math.h>
 
 
diff -uaNr yadex-1.5.2/src/vectext.cc yadex-1.6.0/src/vectext.cc
--- yadex-1.5.2/src/vectext.cc	2000-07-15 00:37:32.000000000 +0200
+++ yadex-1.6.0/src/vectext.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/verbmsg.cc yadex-1.6.0/src/verbmsg.cc
--- yadex-1.5.2/src/verbmsg.cc	2000-01-10 14:40:11.000000000 +0100
+++ yadex-1.6.0/src/verbmsg.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/version.cc yadex-1.6.0/src/version.cc
--- yadex-1.5.2/src/version.cc	2001-06-30 23:34:40.000000000 +0200
+++ yadex-1.6.0/src/version.cc	2003-04-01 02:35:32.000000000 +0200
@@ -1,2 +1,4 @@
-extern const char *const yadex_source_date = "2001-06-30";
-extern const char *const yadex_version = "1.5.2";
+// DO NOT EDIT -- generated from VERSION
+
+extern const char *const yadex_source_date = "2003-04-01";
+extern const char *const yadex_version = "1.6.0";
diff -uaNr yadex-1.5.2/src/wadfile.cc yadex-1.6.0/src/wadfile.cc
--- yadex-1.5.2/src/wadfile.cc	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/wadfile.cc	2003-03-28 13:37:32.000000000 +0100
@@ -0,0 +1,125 @@
+/*
+ *	wadfile.cc - Wad_file class
+ *	AYM 2001-09-18
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphal Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.and others.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#include "yadex.h"
+#include "wadfile.h"
+
+
+/*
+ *	Wad_file::~Wad_file - dtor
+ */
+Wad_file::~Wad_file ()
+{
+  if (directory != 0)
+  {
+    FreeMemory (directory);
+    directory = 0;			// Catch bugs
+  }
+  if (fp != 0)
+  {
+    fclose (fp);
+    fp = 0;				// Catch bugs
+  }
+  if (filename != 0)
+  {
+    FreeMemory (filename);
+    filename = 0;			// Catch bugs
+  }
+}
+
+
+/*
+ *	Wad_file::where - return file(offset) string
+ *
+ *	Return pointer to a per-Wad_file buffer.
+ */
+const char *Wad_file::where () const
+{
+  const unsigned long offset       = ftell (fp);
+  const size_t        offset_len   =  + 3;
+  const size_t        name_len_max = sizeof where_ - 1 - offset_len;
+
+  if (name_len_max >= strlen (filename)) 
+    sprintf (where_, "%s(%lXh)", filename, offset);
+  else
+  {
+    const char  *ellipsis = "...";
+    const size_t total    = name_len_max - strlen (ellipsis);
+    const size_t left     = total / 2;
+    const size_t right    = total - left;
+    sprintf (where_, "%*s%s%*s(%lXh)",
+	left, filename,
+	ellipsis,
+	right, filename + total,
+	offset);
+  }
+
+  return where_;
+}
+
+
+/*
+ *	Wad_file::read_vbytes - read bytes from a wad file
+ *
+ *	Read up to <count> bytes and store them into buffer
+ *	<buf>. <count> is _not_ limited to size_t. If an I/O
+ *	error occurs, set the error flag. EOF is not considered
+ *	an error.
+ *
+ *	Return the number of bytes read.
+ */
+long Wad_file::read_vbytes (void *buf, long count) const
+{
+  long bytes_read_total;
+  size_t bytes_read;
+  size_t bytes_to_read;
+
+  bytes_read_total = 0;
+  bytes_to_read    = 0x8000;
+  while (count > 0)
+  {
+    if (count <= 0x8000)
+      bytes_to_read = (size_t) count;
+    bytes_read = fread (buf, 1, bytes_to_read, fp);
+    bytes_read_total += bytes_read;
+    if (bytes_read != bytes_to_read)
+      break;
+    buf = (char *) buf + bytes_read;
+    count -= bytes_read;
+  }
+  if (ferror (fp))
+  {
+    if (! error_)
+      err ("%s: read error", where ());
+    error_ = true;
+  }
+  return bytes_read_total;
+}
+
+
diff -uaNr yadex-1.5.2/src/wadfile.h yadex-1.6.0/src/wadfile.h
--- yadex-1.5.2/src/wadfile.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/wadfile.h	2003-03-28 13:37:32.000000000 +0100
@@ -0,0 +1,349 @@
+/*
+ *	wadfile.h - Wad_file class
+ *	AYM 2001-09-18
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphal Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.and others.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#ifndef YH_WADFILE  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_WADFILE
+
+
+/*
+ *	Wad_file - wad file open for reading
+ *
+ *	The Wad_file class is a simple wad file object. It
+ *	provides functions to read the usual data formats (byte,
+ *	16-bit signed integer, 32-bit signed integer) portably.
+ *
+ *	Errors are reported not by overloading the return
+ *	value but by setting an internal flag that can be read
+ *	with the error() function, a bit like stdio's feof() and
+ *	ferror(). Calling error() has the side effect of
+ *	clearing the error flag and calling clearerr() on the
+ *	underlying FILE. This is the only way to reset the error
+ *	flag. Thus, you don't have to check the error status
+ *	after every operation. You can call seek() and read_*()
+ *	any number of times before calling error() : the class
+ *	guarantees that if any one of the operations failed,
+ *	error() returns true.
+ *
+ *	Yadex has a policy of reporting I/O errors, mentioning
+ *	the name of the file and the offset at which the error
+ *	occurred. This policy is enforced by the Wad_file class.
+ *	To avoid flooding, no message is printed if the error
+ *	flag was already set before the error occurred. This
+ *	gives you some control on how verbose the error
+ *	reporting is ; if you want a message for every error,
+ *	all you have to do is to check error() after every
+ *	operation. It's probably best to report only the first
+ *	error, though.
+ *
+ *	If for some reason you need to disable the error
+ *	messages, add a bool quiet parameter with a default
+ *	value of false to the functions that can fail.
+ *
+ *	It's probably a good idea to call error() after every
+ *	seek(), before attempting to read. Although seek()
+ *	rarely fails under Unix, MS-DOS refuses to seek() past
+ *	EOF, if I recall correctly.
+ *
+ *	The interface is somewhat crufty. Some functions take a
+ *	pointer, others take a reference. Some take an optional
+ *	count parameter, some take a mandatory count parameter,
+ *	and some have no count parameter at all. Needs cleanup.
+ *
+ *	This class has many public data members, and no proper
+ *	constructor. That's because it evolved from a C struct.
+ *
+ *	Another problem is the lack of errno detail. That is
+ *	partly stdio's fault.
+ *
+ *	const: for the moment, const means that you can read
+ *	from but not change the attributes, close, reopen, etc.
+ */
+class Wad_file
+{
+  /* Ugly but better than making the data members public. FIXME
+     Many of these are friend just because they use fp for
+     reading. */
+  friend char     *GetWadFileName     (const char *);
+  friend int       SaveLevelData      (const char *, const char *);
+  friend int       OpenMainWad        (const char *);
+  friend int       OpenPatchWad       (const char *);
+  friend Wad_file *BasicWadOpen       (const char *, ygpf_t);
+  friend void      BuildNewMainWad    (const char *, bool);
+  friend void      SaveDirectoryEntry (FILE *, const char *);
+  friend void      SaveEntryToRawFile (FILE *, const char *);
+  friend void      ListFileDirectory  (FILE *, const Wad_file *);
+
+  public :
+    Wad_file () :
+      filename (0),
+      pic_format_ (YGPF_NORMAL),
+      fp (0),
+      dirsize (0),
+      dirstart (0),
+      directory (0),
+      error_ (false)
+    {
+      strcpy (type, "BUG");
+      strcpy (where_, "DEADBEEF");
+    }
+    ~Wad_file ();
+    const char *pathname    () const;
+    ygpf_t      pic_format  () const;
+    bool        error       () const;
+    const char *where       () const;
+    void        seek        (long offset) const;
+    u8          read_u8     () const;
+    void        read_u8     (u8& buf) const;
+    i16         read_i16    () const;
+    void        read_i16    (i16 *buf) const;
+    void        read_i32    (i32 *buf, long count = 1) const;
+    void        read_bytes  (void *buf, long count) const;
+    long        read_vbytes (void *buf, long count) const;
+    const char *what        () const;
+
+  private :
+    char *filename;			// Name of the wad file
+    ygpf_t pic_format_;			// Picture format (usually PF_NORMAL)
+    FILE *fp;				// C file stream information
+    char type[4];			// Type of wad file ("IWAD" or "PWAD")
+    i32  dirsize;			// Entries in directory
+    i32  dirstart;			// Offset to start of directory
+    DirPtr directory;			// Array of directory information
+    mutable bool error_;		// I/O error occur since last error()
+    mutable char where_[101];		// Static workspace for where()
+
+    Wad_file (const Wad_file& rhs);		// Deliberately not implemented
+    Wad_file& operator= (const Wad_file& rhs);	// Deliberately not implemented
+};
+
+
+/*
+ *	Wad_file::pathname - return the pathname of the file
+ */
+inline const char *Wad_file::pathname () const
+{
+  return filename;
+}
+
+
+/*
+ *	Wad_file::pic_format - return the pic_format of the wad
+ */
+inline ygpf_t Wad_file::pic_format () const
+{
+  return pic_format_;
+}
+
+
+/*
+ *	Wad_file::error - tell whether any errors occurred
+ *
+ *	Reset the error indicator and call clearerr() on the
+ *	underlying stdio stream. Thus calling Wad_file::error()
+ *	again immediately after always returns false. Calling
+ *	this function is the only way to clear the error flag of
+ *	a Wad_file.
+ *
+ *	So short that it's a good candidate for inlining.
+ *
+ *	Return true if an error occurred, false otherwise.
+ */
+inline bool Wad_file::error () const
+{
+  if (! error_)
+    return false;
+
+  clearerr (fp);
+  error_ = false;
+  return true;
+}
+
+
+/*
+ *	Wad_file::seek - move the file pointer
+ *
+ *	If an error occurs, set the error flag.
+ */
+inline void Wad_file::seek (long offset) const
+{
+  if (fseek (fp, offset, 0) != 0)
+  {
+    if (! error_)
+      err ("%s: can't seek to %lXh", filename, offset);
+    error_ = true;
+  }
+}
+
+
+/*
+ *	Wad_file::read_u8 - read a byte
+ *
+ *	If an error occurs, set the error flag and the return
+ *	value is undefined.
+ */
+inline u8 Wad_file::read_u8 () const
+{
+  u8 v = u8 (getc (fp));
+
+  if (feof (fp) || ferror (fp))
+  {
+    if (! error_)
+      err ("%s: read error", where ());
+    error_ = true;
+  }
+  return v;
+}
+
+
+/*
+ *	Wad_file::read_u8 - read a byte
+ *
+ *	If an error occurs, set the error flag and the contents
+ *	of buf is undefined.
+ */
+inline void Wad_file::read_u8 (u8& buf) const
+{
+  buf = getc (fp);
+
+  if (feof (fp) || ferror (fp))
+  {
+    if (! error_)
+      err ("%s: read error", where ());
+    error_ = true;
+  }
+}
+
+
+/*
+ *	Wad_file::read_i16 - read a little-endian 16-bit signed integer
+ *
+ *	If an error occurs, set the error flag and the return
+ *	value is undefined.
+ */
+inline i16 Wad_file::read_i16 () const
+{
+  const size_t nbytes = 2;
+  u8 buf[nbytes];
+
+  if (fread (buf, 1, nbytes, fp) != nbytes)
+  {
+    if (! error_)
+      err ("%s: read error", where ());
+    error_ = true;
+    return EOF;  // Whatever
+  }
+  return buf[0] | buf[1] << 8;
+}
+
+
+/*
+ *	Wad_file::read_i16 - read a little-endian 16-bit signed integer
+ *
+ *	The value read is stored in *buf. If an error occurs,
+ *	set the error flag and the contents of *buf is undefined.
+ */
+inline void Wad_file::read_i16 (i16 *buf) const
+{
+  *buf = getc (fp) | (getc (fp) << 8);
+
+  if (feof (fp) || ferror (fp))
+  {
+    if (! error_)
+      err ("%s: read error", where ());
+    error_ = true;
+  }
+}
+
+
+/*
+ *	Wad_file::read_i32 - read little-endian 32-bit signed integers
+ *
+ *	Read <count> little-endian 32-bit signed integers from
+ *	wad file <wadfile> into *buf. If an error occurs, set
+ *	error_ and the contents of *buf is undefined.
+ */
+inline void Wad_file::read_i32 (i32 *buf, long count) const
+{
+  while (count-- > 0)
+  {
+    *buf++ =    getc (fp)
+       | (      getc (fp) << 8)
+       | ((i32) getc (fp) << 16)
+       | ((i32) getc (fp) << 24);
+  }
+
+  if (feof (fp) || ferror (fp))
+  {
+    if (! error_)
+      err ("%s: read error", where ());
+    error_ = true;
+  }
+}
+
+
+/*
+ *	Wad_file::read_bytes - read bytes from a wad file
+ *
+ *	Read <count> bytes and store them into buffer <buf>.
+ *	<count> is _not_ limited to size_t. If an I/O error
+ *	occurs or EOF is reached before the requested number of
+ *	bytes is read, set the error flag.
+ */
+inline void Wad_file::read_bytes (void *buf, long count) const
+{
+  long bytes_read;
+
+  bytes_read = read_vbytes (buf, count);
+  if (bytes_read != count)
+  {
+    if (! error_)
+      err ("%s: read error", where ());
+    error_ = true;
+  }
+}
+
+
+/*
+ *	Wad_file::what - what a wad contains
+ *
+ *	Written for the sake of the "w" command. Return the
+ *	name of the first lump in the wad, which gives an idea
+ *	of what it contains. The string is *not* NUL-terminated.
+ */
+inline const char *Wad_file::what () const
+{
+  if (directory == 0)
+    return "(nodir)";
+  if (dirsize < 1)
+    return "(empty)";
+  return directory[0].name;
+}
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/wadlist.cc yadex-1.6.0/src/wadlist.cc
--- yadex-1.5.2/src/wadlist.cc	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/wadlist.cc	2003-03-28 13:37:32.000000000 +0100
@@ -0,0 +1,182 @@
+/*
+ *	wadlist.cc - Wad_list class
+ *	AYM 2001-09-23
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphal Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.and others.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#include "yadex.h"
+#include "wadfile.h"
+#include "wadlist.h"
+#include <list>
+#include <boost/smart_ptr.hpp>
+
+
+Wad_list wad_list;			// One global instance
+
+
+typedef std::list<boost::shared_ptr<Wad_file> > list_t;
+
+
+class Wad_list_priv
+{
+  public :
+    Wad_list_priv ();
+    list_t list;
+    mutable list_t::iterator iter;	// Current element
+    mutable bool rewound;		// If true, next get() will return head
+};
+
+
+Wad_list_priv::Wad_list_priv ()
+{
+  rewound = true;
+}
+
+
+/*
+ *	Wad_list::Wad_list - default ctor
+ */
+Wad_list::Wad_list ()
+{
+  priv = new Wad_list_priv;
+}
+
+
+/*
+ *	Wad_list::~Wad_list - dtor
+ */
+Wad_list::~Wad_list ()
+{
+  delete priv;
+  priv = 0;				// Catch bugs
+}
+
+
+/*
+ *	Wad_list::rewind - arrange so that the next get() will return head
+ */
+void Wad_list::rewind () const
+{
+  priv->rewound = true;
+}
+
+
+/*
+ *	Wad_list::get - retrieve the next wad from the list
+ *
+ *	If get() was not called since the last call to rewind(),
+ *	the first wad is returned. Otherwise, the wad returned
+ *	is the one that follows the one returned by the previous
+ *	call to get().
+ *
+ *	Return false if already at the end of the list, true
+ *	otherwise.
+ */
+bool Wad_list::get (Wad_file *& wf)
+{
+  if (priv->rewound)
+  {
+    priv->iter = priv->list.begin ();
+    priv->rewound = false;
+  }
+  else
+    ++priv->iter;
+
+  if (priv->iter == priv->list.end ())
+  {
+    wf = 0;
+    return false;
+  }
+
+  wf = priv->iter->get ();
+  return true;
+}
+
+
+bool Wad_list::get (const Wad_file *& wf) const
+{
+  if (priv->rewound)
+  {
+    priv->iter = priv->list.begin ();
+    priv->rewound = false;
+  }
+  else
+    ++priv->iter;
+
+  if (priv->iter == priv->list.end ())
+    return false;
+
+  wf = priv->iter->get ();
+  return true;
+}
+
+
+/*
+ *	Wad_list::insert - insert a new wad at the pointer
+ */
+void Wad_list::insert (Wad_file *wf)
+{
+  priv->list.insert (priv->iter, boost::shared_ptr<Wad_file> (wf));
+}
+
+
+/*
+ *	Wad_list::del - delete from the list the wad under the pointer
+ *
+ *	If get() was not called since the last call to rewind(),
+ *	the first wad is deleted. Otherwise, the wad deleted is
+ *	the one returned by the last call to get().
+ *
+ *	After a call to del(), a call to get will return the wad
+ *	the followed the one that was deleted.
+ *
+ *	If already at the end of the list, nf_bug() is called.
+ */
+void Wad_list::del ()
+{
+  list_t::iterator i;
+
+  if (priv->rewound)
+  {
+    i = priv->list.begin ();
+  }
+  else
+  {
+    i = priv->iter;
+  }
+  if (i == priv->list.end ())
+  {
+    nf_bug ("Wad_list::del: attempt to delete last item");
+    return;
+  }
+  priv->iter = priv->list.erase (i);
+  if (priv->iter == priv->list.begin ())
+  {
+    priv->iter = 0;			// Catch bugs
+    priv->rewound = true;
+  }
+}
+
diff -uaNr yadex-1.5.2/src/wadlist.h yadex-1.6.0/src/wadlist.h
--- yadex-1.5.2/src/wadlist.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/wadlist.h	2003-03-28 13:37:32.000000000 +0100
@@ -0,0 +1,83 @@
+/*
+ *	wadlist.h - Wad_list class
+ *	AYM 2001-09-23
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphal Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.and others.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#ifndef YH_WADLIST  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_WADLIST
+
+
+/*
+ *	Wad_list - list of open wads
+ *
+ *	The Wad_list class is designed to hold the list of open
+ *	wads. It will probably have only one (global) instance.
+ *	Here is how it's supposed to be used :
+ *
+ *	  extern Wad_list wl;
+ *	  Wad_file *wf;
+ *
+ *	  // Is foo.wad in our list ?
+ *	  for (wl.rewind (); wl.get (wf);)
+ *	    if (strcmp (wf->filename, "foo.wad") == 0)
+ *	    {
+ *	      puts ("Got it !");
+ *	      break;
+ *	    }
+ *
+ *	  // Remove from the list all wads beginning with a "z"
+ *	  for (wl.rewind (); wl.get (wf);)
+ *	    if (*wf->filename == 'z')
+ *	      wl.del ();
+ */
+
+
+class Wad_list_priv;
+
+
+class Wad_list
+{
+  public :
+    Wad_list    ();
+    ~Wad_list   ();
+    void rewind () const;
+    bool get    (const Wad_file *& wf) const;
+    bool get    (Wad_file *& wf);
+    void insert (Wad_file *);
+    void del    ();
+
+  private :
+    Wad_list (const Wad_list&);			// Too lazy to implement it
+    Wad_list& operator= (const Wad_list&);	// Too lazy to implement it
+    Wad_list_priv *priv;
+};
+
+
+extern Wad_list wad_list;		// One global instance
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/wadname.h yadex-1.6.0/src/wadname.h
--- yadex-1.5.2/src/wadname.h	2000-06-03 00:04:14.000000000 +0200
+++ yadex-1.6.0/src/wadname.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/wadnamec.cc yadex-1.6.0/src/wadnamec.cc
--- yadex-1.5.2/src/wadnamec.cc	2000-06-06 00:38:29.000000000 +0200
+++ yadex-1.6.0/src/wadnamec.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/wadres.cc yadex-1.6.0/src/wadres.cc
--- yadex-1.5.2/src/wadres.cc	2000-06-03 00:13:22.000000000 +0200
+++ yadex-1.6.0/src/wadres.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/wadres.h yadex-1.6.0/src/wadres.h
--- yadex-1.5.2/src/wadres.h	2000-06-02 23:55:08.000000000 +0200
+++ yadex-1.6.0/src/wadres.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/wads.cc yadex-1.6.0/src/wads.cc
--- yadex-1.5.2/src/wads.cc	2000-05-06 23:58:13.000000000 +0200
+++ yadex-1.6.0/src/wads.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -33,124 +33,114 @@
 #include "wads.h"
 
 
-/* global variables */
-WadPtr WadFileList = NULL;	// Linked list of wad files
-MDirPtr MasterDir = NULL;	// The master directory
-Serial_num master_dir_serial;	// The revision# thereof
+MDirPtr MasterDir = NULL;		// The master directory
+Serial_num master_dir_serial;		// The revision# thereof
 
 
 /*
- *	file_read_i16
- *	Read <count> little-endian 16-bit signed integers from
- *	file <fp>.
+ *	file_read_i16 - read little-endian 16-bit signed integers from a file
  *
  *	Return 0 on success, non-zero on failure.
  */
 int file_read_i16 (FILE *fp, i16 *buf, long count)
 {
-while (count-- > 0)
-   *buf = getc (fp) | (getc (fp) << 8);
-return feof (fp) || ferror (fp);
+  while (count-- > 0)
+    *buf = getc (fp) | (getc (fp) << 8);
+  return feof (fp) || ferror (fp);
 }
 
 
 /*
- *	file_read_i32
- *	Read <count> little-endian 32-bit signed integers from
- *	file <fp>.
+ *	file_read_i32 - read little-endian 32-bit signed integers from a file
  *
  *	Return 0 on success, non-zero on failure.
  */
 int file_read_i32 (FILE *fp, i32 *buf, long count)
 {
-while (count-- > 0)
-   {
-   *buf++ =    getc (fp)
+  while (count-- > 0)
+  {
+    *buf++ =    getc (fp)
       | (      getc (fp) << 8)
       | ((i32) getc (fp) << 16)
       | ((i32) getc (fp) << 24);
-   }
-return feof (fp) || ferror (fp);
+  }
+  return feof (fp) || ferror (fp);
 }
 
 
 /*
- *	file_read_vbytes
- *	Read up to <count> bytes from file <fp>.
+ *	file_read_vbytes - read bytes from file
  *
  *	Return the number of bytes read.
  */
 long file_read_vbytes (FILE *fp, void *buf, long count)
 {
-long bytes_read_total;
-size_t bytes_read;
-size_t bytes_to_read;
-
-bytes_read_total = 0;
-bytes_to_read    = 0x8000;
-while (count > 0)
-   {
-   if (count <= 0x8000)
+  long bytes_read_total;
+  size_t bytes_read;
+  size_t bytes_to_read;
+
+  bytes_read_total = 0;
+  bytes_to_read    = 0x8000;
+  while (count > 0)
+  {
+    if (count <= 0x8000)
       bytes_to_read = (size_t) count;
-   bytes_read = fread (buf, 1, bytes_to_read, fp);
-   bytes_read_total += bytes_read;
-   if (bytes_read != bytes_to_read)
+    bytes_read = fread (buf, 1, bytes_to_read, fp);
+    bytes_read_total += bytes_read;
+    if (bytes_read != bytes_to_read)
       break;
-   buf = (char *) buf + bytes_read;
-   count -= bytes_read;
-   }
-return bytes_read_total;
+    buf = (char *) buf + bytes_read;
+    count -= bytes_read;
+  }
+  return bytes_read_total;
 }
 
 
 /*
- *	file_read_bytes
- *	Read <count> bytes from file <fp>.
+ *	file_read_bytes - read bytes from a file
  *
  *	Return 0 on success, non-zero on failure.
  */
 int file_read_bytes (FILE *fp, void *buf, long count)
 {
-return file_read_vbytes (fp, buf, count) != count;
+  return file_read_vbytes (fp, buf, count) != count;
 }
 
 
 /*
- *	file_write_i16
- *	Write a little-endian 16-bit signed integer
- *	to file <fd>.
+ *	file_write_i16 - write a little-endian 16-bit signed integer to a file
+ *
  *	Does no error checking.
  */
 void file_write_i16 (FILE *fd, i16 buf)
 {
-putc (       buf & 0xff, fd);
-putc ((buf >> 8) & 0xff, fd);
+  putc (       buf & 0xff, fd);
+  putc ((buf >> 8) & 0xff, fd);
 }
 
 
 /*
- *	file_write_i32
- *	Write <count> little-endian 32-bit signed integers
- *	to file <fd>.
+ *	file_write_i32 - write little-endian 32-bit signed integers to a file
+ *
  *	Does no error checking.
  */
 void file_write_i32 (FILE *fd, i32 buf, long count)
 {
-// It would probably be more efficient
-// to swap bytes in-core and write
-// the whole i32 at once.
-while (count-- > 0)
-   {
-   putc (        buf & 0xff, fd);
-   putc ((buf >>  8) & 0xff, fd);
-   putc ((buf >> 16) & 0xff, fd);
-   putc ((buf >> 24) & 0xff, fd);
-   }
+  /* It would probably be more efficient to swap bytes in-core
+     and write the whole i32 at once. */
+  while (count-- > 0)
+  {
+    putc (        buf & 0xff, fd);
+    putc ((buf >>  8) & 0xff, fd);
+    putc ((buf >> 16) & 0xff, fd);
+    putc ((buf >> 24) & 0xff, fd);
+  }
 }
 
 
 /*
- *	file_write_name
+ *	file_write_name - write directory entry name to file
+ *
  *	Write to file <fd> the directory entry name contained in
  *	<name>. The string written in the file is exactly the
  *	same as the string contained in <name> except that :
@@ -167,149 +157,13 @@
  */
 void file_write_name (FILE *fd, const char *name)
 {
-const unsigned char *const p0 = (const unsigned char *) name;
-const unsigned char *p = p0;  // "unsigned" for toupper()'s sake
-for (; p - p0 < (ptrdiff_t) WAD_NAME && *p; p++)
-   putc (toupper (*p), fd);
-for (; p - p0 < (ptrdiff_t) WAD_NAME; p++)
-   putc ('\0', fd);
-}
-
-
-/*
- *	wad_seek
- *	Go to position <offset> of wad file.
- *	If a seek error occurs, calls fatal_error().
- */
-void wad_seek (WadPtr wadfile, long offset)
-{
-if (fseek (wadfile->fd, offset, 0))
-   fatal_error ("%s: can't seek to %lXh", wadfile->filename, offset);
-}
-
-
-/*
- *	wad_seek2
- *	Like wad_seek() but simply returns non-zero on error.
- */
-int wad_seek2 (WadPtr wadfile, long offset)
-{
-if (fseek (wadfile->fd, offset, 0))
-   return 1;
-return 0;
-}
-
-
-/*
- *	wad_read_i16
- *	Read a little-endian 16-bit signed integer
- *	from wad file <wadfile>.
- *	If a read error occurs, sets wadfile->error.
- */
-i16 wad_read_i16 (WadPtr wadfile)
-{
-const size_t nbytes = 2;
-u8 buf[nbytes];
-if (fread (buf, 1, nbytes, wadfile->fd) != nbytes)
-   {
-   if (! wadfile->error)
-      {
-      //wadfile->err_ofs = ftell (wadfile->fd);
-      wadfile->error = true;
-      }
-   return EOF;  // Whatever
-   }
-return buf[0] | buf[1] << 8;
-}
-
-
-/*
- *	wad_read_i16
- *	Same thing as above but the value read is not
- *	returned but stored in *buf.
- *	If a read error occurs, calls fatal_error().
- */
-void wad_read_i16 (WadPtr wadfile, i16 *buf)
-{
-*buf = getc (wadfile->fd) | (getc (wadfile->fd) << 8);
-
-if (feof (wadfile->fd) || ferror (wadfile->fd))
-   wadfile->error = true;
-   //fatal_error ("%s(%lXh): read error or unexpected EOF",
-   //   wadfile->filename, ftell (wadfile->fd));
-}
-
-
-/*
- *	wad_read_i32
- *	Read <count> little-endian 32-bit signed integers
- *	from wad file <wadfile>.
- *	If a read error occurs, calls fatal_error().
- */
-void wad_read_i32 (WadPtr wadfile, i32 *buf, long count)
-{
-while (count-- > 0)
-   {
-   *buf++ =    getc (wadfile->fd)
-      | (      getc (wadfile->fd) << 8)
-      | ((i32) getc (wadfile->fd) << 16)
-      | ((i32) getc (wadfile->fd) << 24);
-   }
+  const unsigned char *const p0 = (const unsigned char *) name;
+  const unsigned char *p = p0;  // "unsigned" for toupper()'s sake
 
-if (feof (wadfile->fd) || ferror (wadfile->fd))
-   wadfile->error = true;
-   //fatal_error ("%s(%lXh): read error or unexpected EOF",
-   //   wadfile->filename, ftell (wadfile->fd));
-}
-
-
-/*
- *	wad_read_bytes
- *	Read <count> bytes from wad file <wadfile> and store
- *	them into buffer <buf>. <count> is _not_ limited to
- *	size_t. If a read error occurs, calls fatal_error().
- */
-void wad_read_bytes (WadPtr wadfile, void *buf, long count)
-{
-long ofs = ftell (wadfile->fd);
-long bytes_read;
-
-bytes_read = wad_read_vbytes (wadfile, buf, count);
-if (bytes_read != count)
-   fatal_error ("%s(%lXh): tried to read %ld B, got only %ld",
-      wadfile->filename, ofs, count, bytes_read);
-}
-
-
-/*
- *	wad_read_vbytes
- *	Read up to <count> bytes from wad file <wadfile> and
- *	store them into buffer <buf>. <count> is _not_ limited
- *	to size_t. Unlike wad_read_bytes2(), keeps quiet even if
- *	a read error occurs.
- *
- *	Returns the number of bytes read.
- */
-long wad_read_vbytes (WadPtr wadfile, void *buf, long count)
-{
-long bytes_read_total;
-size_t bytes_read;
-size_t bytes_to_read;
-
-bytes_read_total = 0;
-bytes_to_read    = 0x8000;
-while (count > 0)
-   {
-   if (count <= 0x8000)
-      bytes_to_read = (size_t) count;
-   bytes_read = fread (buf, 1, bytes_to_read, wadfile->fd);
-   bytes_read_total += bytes_read;
-   if (bytes_read != bytes_to_read)
-      break;
-   buf = (char *) buf + bytes_read;
-   count -= bytes_read;
-   }
-return bytes_read_total;
+  for (; p - p0 < (ptrdiff_t) WAD_NAME && *p; p++)
+    putc (toupper (*p), fd);
+  for (; p - p0 < (ptrdiff_t) WAD_NAME; p++)
+    putc ('\0', fd);
 }
 
 
@@ -319,13 +173,13 @@
 
 MDirPtr FindMasterDir (MDirPtr from, const char *name)
 {
-while (from)
-   {
-   if (! y_strnicmp (from->dir.name, name, WAD_NAME))
+  while (from)
+  {
+    if (! y_strnicmp (from->dir.name, name, WAD_NAME))
       break;
-   from = from->next;
-   }
-return from;
+    from = from->next;
+  }
+  return from;
 }
 
 
@@ -334,14 +188,14 @@
  */
 MDirPtr FindMasterDir (MDirPtr from, const char *name1, const char *name2)
 {
-while (from)
-   {
-   if (! y_strnicmp (from->dir.name, name1, WAD_NAME)
-	 || ! y_strnicmp (from->dir.name, name2, WAD_NAME))
+  while (from)
+    {
+    if (! y_strnicmp (from->dir.name, name1, WAD_NAME)
+     || ! y_strnicmp (from->dir.name, name2, WAD_NAME))
       break;
-   from = from->next;
-   }
-return from;
+    from = from->next;
+    }
+  return from;
 }
 
 
@@ -351,50 +205,66 @@
 
 void WriteBytes (FILE *file, const void *buf, long size)
 {
-if (! Registered)
-   return;
-while (size > 0x8000)
-   {
-   if (fwrite (buf, 1, 0x8000, file) != 0x8000)
+  if (! Registered)
+    return;
+  while (size > 0x8000)
+  {
+    if (fwrite (buf, 1, 0x8000, file) != 0x8000)
       fatal_error ("error writing to file");
-   buf = (const char *) buf + 0x8000;
-   size -= 0x8000;
-   }
-if (fwrite (buf, 1, size, file) != (size_t) size)
-   fatal_error ("error writing to file");
+    buf = (const char *) buf + 0x8000;
+    size -= 0x8000;
+  }
+  if (fwrite (buf, 1, size, file) != (size_t) size)
+    fatal_error ("error writing to file");
 }
 
 
-
 /*
-   copy bytes from a binary file to another with error checking
-   FIXME it's silly to allocate such a large buffer on memory
-   constrained systems. The function should be able to fall back
-   on a smaller buffer.
-*/
-
-void CopyBytes (FILE *dest, FILE *source, long size)
-{
-void *data;
-
-if (! Registered)
-   return;
-data = GetFarMemory (0x8000 + 2);
-while (size > 0x8000)
-   {
-   if (fread (data, 1, 0x8000, source) != 0x8000)
-      fatal_error ("error reading from file");
-   if (fwrite (data, 1, 0x8000, dest) != 0x8000)
-      fatal_error ("error writing to file");
-   size -= 0x8000;
-   }
-if (fread (data, 1, size, source) != (size_t) size)
-   fatal_error ("error reading from file");
-if (fwrite (data, 1, size, dest) != (size_t) size)
-   fatal_error ("error writing to file");
-FreeFarMemory (data);
+ *	copy_bytes - copy bytes from a binary file to another
+ *
+ *	FIXME it's silly to allocate such a large buffer on
+ *	memory constrained systems. The function should be able
+ *	to fall back on a smaller buffer.
+ *
+ *	Return 0 on success, 1 if there was a read error on
+ *	source file, 2 if there was a write error on destination
+ *	file.
+ */
+int copy_bytes (FILE *dest, FILE *source, long size)
+{
+  int          rc      = 0;
+  void        *data    = 0;
+  const size_t chunksz = 0x8000;
+
+  data = GetFarMemory (chunksz + 2);
+  while (size > chunksz)
+  {
+    if (fread (data, 1, chunksz, source) != chunksz)
+    {
+      rc = 1;
+      goto byebye;
+    }
+    if (fwrite (data, 1, chunksz, dest) != chunksz)
+    {
+      rc = 2;
+      goto byebye;
+    }
+    size -= chunksz;
+  }
+  if (fread (data, 1, size, source) != (size_t) size)
+  {
+    rc = 1;
+    goto byebye;
+  }
+  if (fwrite (data, 1, size, dest) != (size_t) size)
+  {
+    rc = 2;
+    goto byebye;
+  }
+
+byebye:
+  if (data != 0)
+    FreeFarMemory (data);
+  return rc;
 }
 
-
-
-/* end of file */
diff -uaNr yadex-1.5.2/src/wads.h yadex-1.6.0/src/wads.h
--- yadex-1.5.2/src/wads.h	2000-05-06 23:26:06.000000000 +0200
+++ yadex-1.6.0/src/wads.h	2001-09-22 21:10:13.000000000 +0200
@@ -16,15 +16,16 @@
 void file_write_i32   (FILE *,  i32 buf, long count = 1);
 void file_write_name  (FILE *, const char *name);
 void WriteBytes       (FILE *, const void *, long);
-void CopyBytes        (FILE *, FILE *, long);
+int  copy_bytes       (FILE *dest, FILE *source, long size);
 
+#if 0
 void wad_seek        (WadPtr, long offset);
-int  wad_seek2       (WadPtr, long offset);
 void wad_read_bytes  (WadPtr, void *buf, long count);
 long wad_read_vbytes (WadPtr, void *buf, long count);
  i16 wad_read_i16    (WadPtr);
 void wad_read_i16    (WadPtr,  i16 *buf);
 void wad_read_i32    (WadPtr,  i32 *buf, long count = 1);
+#endif
 
 
 #if 0
diff -uaNr yadex-1.5.2/src/wads2.cc yadex-1.6.0/src/wads2.cc
--- yadex-1.5.2/src/wads2.cc	2000-05-07 14:47:11.000000000 +0200
+++ yadex-1.6.0/src/wads2.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,8 @@
 #include "yadex.h"
 #include "game.h"	/* yg_picture_format */
 #include "serialnum.h"
+#include "wadfile.h"
+#include "wadlist.h"
 #include "wads.h"
 #include "wads2.h"
 
@@ -51,24 +53,24 @@
 {
 MDirPtr lastp, newp;
 long n;
-WadPtr wad;
+Wad_file *wf;
 
 /* open the wad file */
 printf ("Loading iwad: %s...\n", filename);
-wad = BasicWadOpen (filename, yg_picture_format);
-if (! wad)
+wf = BasicWadOpen (filename, yg_picture_format);
+if (wf == 0)
    return 1;
-if (strncmp (wad->type, "IWAD", 4))
+if (strncmp (wf->type, "IWAD", 4))
    warn ("%.128s: is a pwad, not an iwad. Will use it anyway.\n", filename);
 
 /* create the master directory */
 lastp = NULL;
-for (n = 0; n < wad->dirsize; n++)
+for (n = 0; n < wf->dirsize; n++)
    {
    newp = (MDirPtr) GetMemory (sizeof (struct MasterDirectory));
    newp->next = NULL;
-   newp->wadfile = wad;
-   memcpy (&(newp->dir), &(wad->directory[n]), sizeof (struct Directory));
+   newp->wadfile = wf;
+   memcpy (&(newp->dir), &(wf->directory[n]), sizeof (struct Directory));
    if (MasterDir)
       lastp->next = newp;
    else
@@ -109,7 +111,7 @@
  */
 int OpenPatchWad (const char *filename)
 {
-WadPtr wad;
+Wad_file * wad;
 MDirPtr mdir = 0;
 long n;
 char entryname[WAD_NAME + 1];
@@ -327,7 +329,7 @@
       {
       int prev = n > 0           ? levelname2rank (level_list[n - 1]) : INT_MIN;
       int cur  =                   levelname2rank (level_list[n    ]);
-      int next = n < nlevels - 1 ? levelname2rank (level_list[n + 1]) : INT_MAX;
+      int next = n + 1 < nlevels ? levelname2rank (level_list[n + 1]) : INT_MAX;
       if (cur != prev + 1 || cur != next - 1)
          {
          if (cur == prev + 1)
@@ -361,26 +363,15 @@
  */
 void CloseWadFiles ()
 {
-WadPtr curw, nextw;
 MDirPtr curd, nextd;
 
-/* close the wad files */
-curw = WadFileList;
-WadFileList = NULL;
-while (curw)
-   {
-   nextw = curw->next;
-   if (curw->fd != NULL)
-      fclose (curw->fd);
-   if (curw->directory != NULL)
-      FreeMemory (curw->directory);
-   if (curw->filename != NULL)
-      FreeMemory (curw->filename);
-   FreeMemory (curw);
-   curw = nextw;
-   }
+// Close the wad files
+Wad_file *wf;
+wad_list.rewind ();
+while (wad_list.get (wf))
+   wad_list.del ();
 
-/* delete the master directory */
+// Delete the master directory
 curd = MasterDir;
 MasterDir = NULL;
 while (curd)
@@ -398,32 +389,16 @@
  */
 void CloseUnusedWadFiles ()
 {
-WadPtr curw, prevw;
-MDirPtr mdir;
-
-prevw = NULL;
-curw = WadFileList;
-while (curw)
-   {
-   /* check if the wad file is used by a directory entry */
-   mdir = MasterDir;
-   while (mdir && mdir->wadfile != curw)
+Wad_file *wf;
+wad_list.rewind ();
+while (wad_list.get (wf))
+   {
+   // Check if the wad file is used by a directory entry
+   MDirPtr mdir = MasterDir;
+   while (mdir && mdir->wadfile != wf)
       mdir = mdir->next;
-   if (mdir)
-      prevw = curw;
-   else
-      {
-      /* if this wad file is never used, close it */
-      if (prevw)
-	 prevw->next = curw->next;
-      else
-	 WadFileList = curw->next;
-      fclose (curw->fd);
-      FreeMemory (curw->directory);
-      FreeMemory (curw->filename);
-      FreeMemory (curw);
-      }
-   curw = prevw->next;
+   if (mdir == 0)
+      wad_list.del ();
    }
 }
 
@@ -436,120 +411,91 @@
  *
  *	Return a null pointer on error.
  */
-WadPtr BasicWadOpen (const char *filename, ygpf_t pic_format)
+Wad_file *BasicWadOpen (const char *filename, ygpf_t pic_format)
 {
-bool e;  // Error flag
+bool fail = false;
 
-// Look for the wad in the wad list.
-bool new_wad = true;
-WadPtr curw  = 0;
-WadPtr prevw = WadFileList;
-if (prevw)
-   {
-   curw = prevw->next;
-   while (curw && fncmp (filename, curw->filename))
-      {
-      prevw = curw;
-      curw = prevw->next;
-      }
-   if (curw != 0)
-      new_wad = false;
-   }
+/* If this wad is already open, close it first (it's not always
+   possible to open the same file twice). Also position the
+   wad_list pointer on the old wad (or at the end of the list if
+   this is a new wad) so that the reopening a wad doesn't change
+   it's relative position in the list.
+   
+   FIXME if reopening fails, we're left in the cold. I'm not
+   sure how to avoid that, though. */
+{
+   Wad_file *dummy;
+   wad_list.rewind ();
+   while (wad_list.get (dummy))
+      if (fncmp (filename, dummy->filename) == 0)
+	 {
+	 wad_list.del ();
+	 break;
+	 }
+}
 
-// Doesn't exist. Create a new WadFileInfo structure for it.
-if (new_wad)
-   {
-   curw = (WadPtr) GetMemory (sizeof (struct WadFileInfo));
-   curw->error      = false;
-   curw->pic_format = pic_format;
-   curw->next       = 0;	// NULL
-   curw->directory  = 0;	// NULL
-   curw->filename   = (char *) GetMemory (strlen (filename) + 1);
-   strcpy (curw->filename, filename);
-   }
+// Create a new Wad_file
+Wad_file *wf = new Wad_file;
+wf->pic_format_ = pic_format;
+wf->directory   = 0;
+wf->filename    = (char *) GetMemory (strlen (filename) + 1);
+strcpy (wf->filename, filename);
 
 // Open the wad and read its header.
-FILE *new_fd = fopen (filename, "rb");
-if (new_fd == NULL)
+wf->fp = fopen (filename, "rb");
+if (wf->fp == 0)
    {
-   printf ("%.128s: can't open (%s)\n", filename, strerror (errno));
-   if (new_wad)
-      {
-      FreeMemory (curw->filename);
-      FreeMemory (curw);
-      }
-   return 0;
+   printf ("%.128s: %s\n", filename, strerror (errno));
+   fail = true;
+   goto byebye;
    }
-e  = file_read_bytes (new_fd, curw->type, 4);
-e |= file_read_i32   (new_fd, &curw->dirsize);
-e |= file_read_i32   (new_fd, &curw->dirstart);
-if (e || strncmp (curw->type, "IWAD", 4) && strncmp (curw->type, "PWAD", 4))
+{
+bool e = file_read_bytes (wf->fp, wf->type, 4);
+e     |= file_read_i32   (wf->fp, &wf->dirsize);
+e     |= file_read_i32   (wf->fp, &wf->dirstart);
+if (e || memcmp (wf->type, "IWAD", 4) != 0 && memcmp (wf->type, "PWAD", 4) != 0)
    {
    printf ("%.128s: not a wad (bad header)\n", filename);
-   fclose (new_fd);
-   if (new_wad)
-      {
-      FreeMemory (curw->filename);
-      FreeMemory (curw);
-      }
-   return 0;
+   fail = true;
+   goto byebye;
    }
+}
 verbmsg ("  Type %.4s, directory has %ld entries at offset %08lXh\n",
-   curw->type, (long) curw->dirsize, (long) curw->dirstart);
+   wf->type, (long) wf->dirsize, (long) wf->dirstart);
 
 // Load the directory of the wad
-curw->directory = (DirPtr) GetMemory ((long) sizeof (struct Directory)
-   * curw->dirsize);
-e = fseek (new_fd, curw->dirstart, SEEK_SET);
-if (e)
+wf->directory = (DirPtr) GetMemory ((long) sizeof (struct Directory)
+   * wf->dirsize);
+if (fseek (wf->fp, wf->dirstart, SEEK_SET) != 0)
    {
    printf ("%.128s: can't seek to directory at %08lXh\n",
-      filename, curw->dirstart);
-   fclose (new_fd);
-   if (new_wad)
-      {
-      FreeMemory (curw->filename);
-      FreeMemory (curw);
-      }
-   return 0;
-   }
-DirPtr d = curw->directory;
-for (i32 n = 0; n < curw->dirsize; n++)
-   {
-   e  = file_read_i32   (new_fd, &d->start);
-   e |= file_read_i32   (new_fd, &d->size );
-   e |= file_read_bytes (new_fd, d->name, WAD_NAME);
+      filename, wf->dirstart);
+   fail = true;
+   goto byebye;
+   }
+for (i32 n = 0; n < wf->dirsize; n++)
+   {
+   bool e  = file_read_i32   (wf->fp, &wf->directory[n].start);
+   e      |= file_read_i32   (wf->fp, &wf->directory[n].size);
+   e      |= file_read_bytes (wf->fp, wf->directory[n].name, WAD_NAME);
    if (e)
       {
       printf ("%.128s: read error on directory entry %ld\n", filename, (long)n);
-      fclose (new_fd);
-      if (new_wad)
-	 {
-	 FreeMemory (curw->filename);
-	 FreeMemory (curw);
-	 }
-      return 0;
+      fail = true;
+      goto byebye;
       }
-   d++;
    }
 
-// Successfully opened. Append the WadFileInfo struct to WadFileList.
-if (new_wad)
-   {
-   if (prevw == NULL)
-      WadFileList = curw;
-   else
-      prevw->next = curw;
-   }
-if (! new_wad)
-   {
-   if (curw->fd == 0)
-      nf_bug ("BasicWadOpen: null old fp");
-   else
-      fclose (curw->fd);
-   }
-curw->fd = new_fd;
-return curw;
+// Insert the new wad in the list
+wad_list.insert (wf);
+
+byebye:
+if (fail)
+  {
+  delete wf;
+  return 0;
+  }
+return wf;
 }
 
 
@@ -572,7 +518,8 @@
    {
    strncpy (dataname, dir->dir.name, WAD_NAME);
    fprintf (file, "%-*s  %-50s  %6ld  x%08lx\n",
-    WAD_NAME, dataname, dir->wadfile->filename, dir->dir.size, dir->dir.start);
+    WAD_NAME, dataname, dir->wadfile->pathname (),
+    dir->dir.size, dir->dir.start);
    if (file == stdout && lines++ > screen_lines - 4)
       {
       lines = 0;
@@ -592,7 +539,7 @@
 /*
  *	ListFileDirectory - list the directory of a wad
  */
-void ListFileDirectory (FILE *file, WadPtr wad)
+void ListFileDirectory (FILE *file, const Wad_file *wad)
 {
 char dataname[WAD_NAME + 1];
 char key;
@@ -602,7 +549,7 @@
 dataname[WAD_NAME] = '\0';
 fprintf (file, "Wad File Directory\n");
 fprintf (file, "==================\n\n");
-fprintf (file, "Wad File: %s\n\n", wad->filename);
+fprintf (file, "Wad File: %s\n\n", wad->pathname ());
 fprintf (file, "NAME____  SIZE__  START____  END______\n");
 for (n = 0; n < wad->dirsize; n++)
    {
@@ -666,14 +613,20 @@
 file_write_i32 (file, 0xdeadbeef);      /* put true value in later */
 
 /* output the directory data chunks */
+const Wad_file *iwad = 0;	// FIXME unreliable way of knowing the iwad
+wad_list.rewind ();		// got to look into this
+wad_list.get (iwad);
 for (cur = MasterDir; cur; cur = cur->next)
    {
-   if (patchonly && cur->wadfile == WadFileList)
+   if (patchonly && cur->wadfile == iwad)
       continue;
    size = cur->dir.size;
    counter += size;
-   wad_seek (cur->wadfile, cur->dir.start);
-   CopyBytes (file, cur->wadfile->fd, size);
+   cur->wadfile->seek (cur->dir.start);
+   if (cur->wadfile->error ())
+      ;  // FIXME
+   if (copy_bytes (file, cur->wadfile->fp, size) != 0)
+      ;  // FIXME
    printf ("Size: %luK\r", counter / 1024);
    }
 
@@ -683,7 +636,7 @@
 dirnum = 0;
 for (cur = MasterDir; cur; cur = cur->next)
    {
-   if (patchonly && cur->wadfile == WadFileList)
+   if (patchonly && cur->wadfile == iwad)
       continue;
    if (dirnum % 100 == 0)
       printf ("Outputting directory %04ld...\r", dirnum);
@@ -716,7 +669,6 @@
  */
 void DumpDirectoryEntry (FILE *file, const char *entryname)
 {
-MDirPtr entry;
 char dataname[WAD_NAME + 1];
 char key;
 int lines = 5;
@@ -724,69 +676,70 @@
 unsigned char buf[16];
 const int bytes_per_line = 16;
 
-entry = MasterDir;
-while (entry)
+for (MDirPtr entry = MasterDir; entry != 0; entry = entry->next)
    {
-   if (!y_strnicmp (entry->dir.name, entryname, WAD_NAME))
-      {
-      strncpy (dataname, entry->dir.name, WAD_NAME);
-      dataname[WAD_NAME] = '\0';
-      fprintf (file, "Contents of entry %s (size = %ld bytes):\n", dataname, entry->dir.size);
-      wad_seek (entry->wadfile, entry->dir.start);
-      for (n = 0; n < entry->dir.size;)
-	 {
-	 int i;
-	 fprintf (file, "%04lX: ", n);
+   if (y_strnicmp (entry->dir.name, entryname, WAD_NAME) != 0)
+      continue;
+   strncpy (dataname, entry->dir.name, WAD_NAME);
+   dataname[WAD_NAME] = '\0';
+   fprintf (file, "Contents of entry %s (size = %ld bytes):\n",
+      dataname, entry->dir.size);
+   const Wad_file *wf = entry->wadfile;
+   wf->seek (entry->dir.start);
+   for (n = 0; n < entry->dir.size;)
+      {
+      int i;
+      fprintf (file, "%04lX: ", n);
+
+      // Nb of bytes to read for this line
+      long bytes_to_read = entry->dir.size - n;
+      if (bytes_to_read > bytes_per_line)
+	 bytes_to_read = bytes_per_line;
+      long nbytes = wf->read_vbytes (buf, bytes_to_read);
+      if (wf->error ())
+	 break;
+      n += nbytes;
 
-         // Nb of bytes to read for this line
-	 long bytes_to_read = entry->dir.size - n;
-	 if (bytes_to_read > bytes_per_line)
-	    bytes_to_read = bytes_per_line;
-	 long nbytes = wad_read_vbytes (entry->wadfile, buf, bytes_to_read);
-	 n += nbytes;
-
-	 for (i = 0; i < nbytes; i++)
-	    fprintf (file, " %02X", buf[i]);
-	 for (; i < bytes_per_line; i++)
-	    fputs ("   ", file);
-	 fprintf (file, "   ");
+      for (i = 0; i < nbytes; i++)
+	 fprintf (file, " %02X", buf[i]);
+      for (; i < bytes_per_line; i++)
+	 fputs ("   ", file);
+      fprintf (file, "   ");
 
-	 for (i = 0; i < nbytes; i++)
-	    {
-	    if (buf[i] >= 0x20
-               && buf[i] != 0x7f
+      for (i = 0; i < nbytes; i++)
+	 {
+	 if (buf[i] >= 0x20
+	    && buf[i] != 0x7f
 #ifdef Y_UNIX
-               && ! (buf[i] >= 0x80 && buf[i] <= 0xa0)  // ISO 8859-1
+	    && ! (buf[i] >= 0x80 && buf[i] <= 0xa0)  // ISO 8859-1
 #endif
-               )
-	       putc (buf[i], file);
-	    else
-	       putc ('.', file);
-	    }
-	 putc ('\n', file);
+	    )
+	    putc (buf[i], file);
+	 else
+	    putc ('.', file);
+	 }
+      putc ('\n', file);
 
-	 if (file == stdout && lines++ > screen_lines - 4)
+      if (file == stdout && lines++ > screen_lines - 4)
+	 {
+	 lines = 0;
+	 printf ("[%d%% - Q + Return to abort,"
+	     " S + Return to skip this entry,"
+	     " Return to continue]", (int) (n * 100 / entry->dir.size));
+	 key = getchar ();
+	 printf ("\r%68s\r", "");
+	 if (key == 'S' || key == 's')
 	    {
-	    lines = 0;
-	    printf ("[%d%% - Q + Return to abort,"
-		" S + Return to skip this entry,"
-		" Return to continue]", (int) (n * 100 / entry->dir.size));
-	    key = getchar ();
-	    printf ("\r%68s\r", "");
-	    if (key == 'S' || key == 's')
-               {
-               getchar ();  // Read the '\n'
-	       break;
-               }
-	    if (key == 'Q' || key == 'q')
-               {
-               getchar ();  // Read the '\n'
-	       return;
-               }
+	    getchar ();  // Read the '\n'
+	    break;
+	    }
+	 if (key == 'Q' || key == 'q')
+	    {
+	    getchar ();  // Read the '\n'
+	    return;
 	    }
 	 }
       }
-   entry = entry->next;
    }
 if (! n)
    {
@@ -822,8 +775,23 @@
    file_write_name (file, entry->dir.name);	// Name of first entry
 
    // Write the lump data
-   wad_seek (entry->wadfile, entry->dir.start);
-   CopyBytes (file, entry->wadfile->fd, entry->dir.size);
+   entry->wadfile->seek (entry->dir.start);
+   if (entry->wadfile->error ())
+      {
+      err ("%s: seek error", entryname);
+      return;
+      }
+   int r = copy_bytes (file, entry->wadfile->fp, entry->dir.size);
+   if (r != 0)
+      {
+      if (r == 1)
+	err ("%s: error reading from source wad", entryname);
+      else if (r == 2)
+	err ("%s: error writing to destination wad", entryname);
+      else
+	nf_bug ("%s: copy_bytes() returned %d", entryname, r);
+      return;
+      }
    }
 else
    {
@@ -849,8 +817,23 @@
    {
    verbmsg ("Writing %ld bytes starting from offset %lX...\n",
       (long) entry->dir.size, (unsigned long) entry->dir.start);
-   wad_seek (entry->wadfile, entry->dir.start);
-   CopyBytes (file, entry->wadfile->fd, entry->dir.size);
+   entry->wadfile->seek (entry->dir.start);
+   if (entry->wadfile->error ())
+      {
+      err ("%s: seek error", entryname);
+      return;
+      }
+   int r = copy_bytes (file, entry->wadfile->fp, entry->dir.size);
+   if (r != 0)
+      {
+      if (r == 1)
+	err ("%s: error reading from source wad", entryname);
+      else if (r == 2)
+	err ("%s: error writing to destination file", entryname);
+      else
+	nf_bug ("%s: copy_bytes() returned %d", entryname, r);
+      return;
+      }
    }
 else
    {
@@ -892,7 +875,17 @@
 file_write_name (file, name8);		// Name of first entry
 
 // Write the lump data
-CopyBytes (file, raw, size);
+int r = copy_bytes (file, raw, size);
+if (r != 0)
+   {
+   if (r == 1)
+     err ("%s: error reading from source file", entryname);
+   else if (r == 2)
+     err ("%s: error writing to destination wad", entryname);
+   else
+     nf_bug ("%s: copy_bytes() returned %d", entryname, r);
+   return;
+   }
 }
 
 
diff -uaNr yadex-1.5.2/src/wads2.h yadex-1.6.0/src/wads2.h
--- yadex-1.5.2/src/wads2.h	2000-05-07 14:45:01.000000000 +0200
+++ yadex-1.6.0/src/wads2.h	2001-10-13 17:04:12.000000000 +0200
@@ -9,13 +9,16 @@
 #define YH_WADS2
 
 
+class Wad_file;
+
+
 int OpenMainWad (const char *);
 int OpenPatchWad (const char *);
 void CloseWadFiles (void);
 void CloseUnusedWadFiles (void);
-WadPtr BasicWadOpen (const char *, ygpf_t pic_format);
+Wad_file *BasicWadOpen (const char *, ygpf_t pic_format);
 void ListMasterDirectory (FILE *);
-void ListFileDirectory (FILE *, WadPtr);
+void ListFileDirectory (FILE *, const Wad_file *);
 void BuildNewMainWad (const char *, bool);
 void DumpDirectoryEntry (FILE *, const char *);
 void SaveDirectoryEntry (FILE *, const char *);
diff -uaNr yadex-1.5.2/src/warn.cc yadex-1.6.0/src/warn.cc
--- yadex-1.5.2/src/warn.cc	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/warn.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -41,15 +41,15 @@
  */
 void warn (const char *fmt, ...)
 {
-static bool start_of_line = true;
-va_list args;
+  static bool start_of_line = true;
+  va_list args;
 
-if (start_of_line)
-  fputs ("Warning: ", stdout);
-va_start (args, fmt);
-vprintf (fmt, args);
-size_t len = strlen (fmt);
-start_of_line = len > 0 && fmt[len - 1] == '\n';
+  if (start_of_line)
+    fputs ("Warning: ", stdout);
+  va_start (args, fmt);
+  vprintf (fmt, args);
+  size_t len = strlen (fmt);
+  start_of_line = len > 0 && fmt[len - 1] == '\n';
 }
 
 
diff -uaNr yadex-1.5.2/src/windim.cc yadex-1.6.0/src/windim.cc
--- yadex-1.5.2/src/windim.cc	2000-06-01 00:35:54.000000000 +0200
+++ yadex-1.6.0/src/windim.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/windim.h yadex-1.6.0/src/windim.h
--- yadex-1.5.2/src/windim.h	2000-05-30 00:59:44.000000000 +0200
+++ yadex-1.6.0/src/windim.h	2001-10-11 11:08:08.000000000 +0200
@@ -20,7 +20,10 @@
      int set (const char *string);
      int pixels (int ref_pixels);
      void string (char *buf, size_t buf_size);
+
    private:
+     Win_dim (const Win_dim&);			// Too lazy to implement it
+     Win_dim& operator= (const Win_dim&);	// Too lazy to implement it
      struct Win_dim_priv* p;
 };
 
diff -uaNr yadex-1.5.2/src/wstructs.h yadex-1.6.0/src/wstructs.h
--- yadex-1.5.2/src/wstructs.h	2000-04-14 00:15:56.000000000 +0200
+++ yadex-1.6.0/src/wstructs.h	2003-03-28 13:37:32.000000000 +0100
@@ -14,7 +14,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -43,11 +43,11 @@
 typedef char wad_name_t[WAD_NAME];
 typedef struct Directory huge *DirPtr;
 struct Directory
-   {
-   i32        start;			// Offset to start of data
-   i32        size;			// Byte size of data
-   wad_name_t name;			// Name of data block
-   };
+{
+  i32        start;			// Offset to start of data
+  i32        size;			// Byte size of data
+  wad_name_t name;			// Name of data block
+};
 
 
 // Textures
@@ -83,29 +83,29 @@
 typedef i16 wad_tangle_t;
 typedef i16 wad_tflags_t;
 struct Thing
-   {
-   wad_coord_t      xpos;		// FIXME rename to "x"
-   wad_coord_t      ypos;		// FIXME rename to "y"
-   wad_tangle_t     angle;
-   wad_ttype_t      type;
-   wad_tflags_t     when;		// FIXME rename to "flags"
-   };
+{
+  wad_coord_t      xpos;		// FIXME rename to "x"
+  wad_coord_t      ypos;		// FIXME rename to "y"
+  wad_tangle_t     angle;
+  wad_ttype_t      type;
+  wad_tflags_t     when;		// FIXME rename to "flags"
+};
 typedef struct
-   {
-   i16              tid;
-   wad_coord_t      x;
-   wad_coord_t      y;
-   wad_z_t          height;
-   wad_tangle_t     angle;
-   wad_ttype_t      type;
-   i16              options;
-   u8               special;
-   u8               arg1;
-   u8               arg2;
-   u8               arg3;
-   u8               arg4;
-   u8               arg5;
-   } wad_hexen_thing_t;
+{
+  i16              tid;
+  wad_coord_t      x;
+  wad_coord_t      y;
+  wad_z_t          height;
+  wad_tangle_t     angle;
+  wad_ttype_t      type;
+  i16              options;
+  u8               special;
+  u8               arg1;
+  u8               arg2;
+  u8               arg3;
+  u8               arg4;
+  u8               arg5;
+} wad_hexen_thing_t;
 typedef struct Thing huge *TPtr;
 
 
@@ -115,43 +115,43 @@
 typedef i16 wad_ldflags_t;
 typedef i16 wad_ldtype_t;
 struct LineDef
-   {
-   wad_vn_t      start;			// # of start vertex
-   wad_vn_t      end;			// # of end vertex
-   wad_ldflags_t flags;
-   wad_ldtype_t  type;
-   wad_tag_t     tag;
-   wad_sdn_t     sidedef1;		// # of first (right) sidedef
-   wad_sdn_t     sidedef2;		// # of second (left) sidedef or 0xffff
-   };
+{
+  wad_vn_t      start;			// # of start vertex
+  wad_vn_t      end;			// # of end vertex
+  wad_ldflags_t flags;
+  wad_ldtype_t  type;
+  wad_tag_t     tag;
+  wad_sdn_t     sidedef1;		// # of first (right) sidedef
+  wad_sdn_t     sidedef2;		// # of second (left) sidedef or 0xffff
+};
 typedef struct
-   {
-   wad_vn_t      start;
-   wad_vn_t      end;
-   wad_ldflags_t flags;
-   u8            type;
-   u8            arg1;
-   u8            arg2;
-   u8            arg3;
-   u8            arg4;
-   u8            arg5;
-   wad_sdn_t     sidedef1;
-   wad_sdn_t     sidedef2;
-   } wad_hexen_linedef_t;
+{
+  wad_vn_t      start;
+  wad_vn_t      end;
+  wad_ldflags_t flags;
+  u8            type;
+  u8            arg1;
+  u8            arg2;
+  u8            arg3;
+  u8            arg4;
+  u8            arg5;
+  wad_sdn_t     sidedef1;
+  wad_sdn_t     sidedef2;
+} wad_hexen_linedef_t;
 typedef struct LineDef huge *LDPtr;
 
 
 // Sidedefs
 const size_t WAD_SIDEDEF_BYTES = 30;	// Size in the wad file
 struct SideDef
-   {
-   wad_coord_t    xoff;			// FIXME rename to "xofs"
-   wad_coord_t    yoff;			// FIXME rename to "yofs"
-   wad_tex_name_t tex1;			// Name of upper texture
-   wad_tex_name_t tex2;			// Name of lower texture
-   wad_tex_name_t tex3;			// Name of middle texture
-   wad_sn_t       sector;		// # of adjacent sector
-   };
+{
+  wad_coord_t    xoff;			// FIXME rename to "xofs"
+  wad_coord_t    yoff;			// FIXME rename to "yofs"
+  wad_tex_name_t tex1;			// Name of upper texture
+  wad_tex_name_t tex2;			// Name of lower texture
+  wad_tex_name_t tex3;			// Name of middle texture
+  wad_sn_t       sector;		// # of adjacent sector
+};
 // (it's the same for Hexen)
 typedef struct SideDef huge *SDPtr;
 
@@ -159,10 +159,10 @@
 // Vertices
 const size_t WAD_VERTEX_BYTES = 4;	// Size in the wad file
 struct Vertex
-   {
-   wad_coord_t x;
-   wad_coord_t y;
-   };
+{
+  wad_coord_t x;
+  wad_coord_t y;
+};
 // (it's the same for Hexen)
 typedef struct Vertex huge *VPtr;
 
@@ -171,57 +171,57 @@
 const size_t WAD_SECTOR_BYTES = 26;	// Size in the wad file
 typedef i16 wad_stype_t;
 struct Sector
-   {
-   wad_z_t         floorh;		// Floor height
-   wad_z_t         ceilh;		// Ceiling height
-   wad_flat_name_t floort;		// Name of floor texture
-   wad_flat_name_t ceilt;		// Name of ceiling texture
-   i16             light;		// Light level (0-255)
-   wad_stype_t     special;		// FIXME rename to "type"
-   wad_tag_t       tag;
-   };
+{
+  wad_z_t         floorh;		// Floor height
+  wad_z_t         ceilh;		// Ceiling height
+  wad_flat_name_t floort;		// Name of floor texture
+  wad_flat_name_t ceilt;		// Name of ceiling texture
+  i16             light;		// Light level (0-255)
+  wad_stype_t     special;		// FIXME rename to "type"
+  wad_tag_t       tag;
+};
 typedef struct Sector huge *SPtr;
 
 
 // The 11 lumps that constitute a Doom/Heretic/Strife level
 typedef enum
-   {
-   WAD_LL_LABEL,
-   WAD_LL_THINGS,
-   WAD_LL_LINEDEFS,
-   WAD_LL_SIDEDEFS,
-   WAD_LL_VERTEXES,
-   WAD_LL_SEGS,
-   WAD_LL_SSECTORS,
-   WAD_LL_NODES,
-   WAD_LL_SECTORS,
-   WAD_LL_REJECT,
-   WAD_LL_BLOCKMAP,
-   			// Hexen has a BEHAVIOR lump here
-   WAD_LL__
-   } wad_level_lump_no_t;
+{
+  WAD_LL_LABEL,
+  WAD_LL_THINGS,
+  WAD_LL_LINEDEFS,
+  WAD_LL_SIDEDEFS,
+  WAD_LL_VERTEXES,
+  WAD_LL_SEGS,
+  WAD_LL_SSECTORS,
+  WAD_LL_NODES,
+  WAD_LL_SECTORS,
+  WAD_LL_REJECT,
+  WAD_LL_BLOCKMAP,
+		      // Hexen has a BEHAVIOR lump here
+  WAD_LL__
+} wad_level_lump_no_t;
 
 typedef struct
-   {
-   const char *const name;
-   size_t item_size;
-   } wad_level_lump_def_t;
+{
+  const char *const name;
+  size_t item_size;
+} wad_level_lump_def_t;
 
 const wad_level_lump_def_t wad_level_lump[WAD_LL__] =
-   {
-   { 0,          0                 },  // Label -- no fixed name
-   { "THINGS",   WAD_THING_BYTES   },
-   { "LINEDEFS", WAD_LINEDEF_BYTES },
-   { "SIDEDEFS", WAD_SIDEDEF_BYTES },
-   { "VERTEXES", WAD_VERTEX_BYTES  },
-   { "SEGS",     0                 },
-   { "SSECTORS", 0                 },
-   { "NODES",    0                 },
-   { "SECTORS",  WAD_SECTOR_BYTES  },
-   { "REJECT",   0                 },
-   { "BLOCKMAP", 0                 }
-   					// Hexen has a BEHAVIOR lump here
-   };
+{
+  { 0,          0                 },  // Label -- no fixed name
+  { "THINGS",   WAD_THING_BYTES   },
+  { "LINEDEFS", WAD_LINEDEF_BYTES },
+  { "SIDEDEFS", WAD_SIDEDEF_BYTES },
+  { "VERTEXES", WAD_VERTEX_BYTES  },
+  { "SEGS",     0                 },
+  { "SSECTORS", 0                 },
+  { "NODES",    0                 },
+  { "SECTORS",  WAD_SECTOR_BYTES  },
+  { "REJECT",   0                 },
+  { "BLOCKMAP", 0                 }
+				      // Hexen has a BEHAVIOR lump here
+};
 
 
 #endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/x11.cc yadex-1.6.0/src/x11.cc
--- yadex-1.5.2/src/x11.cc	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/x11.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -28,10 +28,8 @@
 */
 
 
-#ifdef Y_X11  /* DO NOT ADD ANYTHING BEFORE THIS LINE */
-
-
 #include "yadex.h"
+#ifdef Y_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include "gfx.h"
diff -uaNr yadex-1.5.2/src/x_centre.cc yadex-1.6.0/src/x_centre.cc
--- yadex-1.5.2/src/x_centre.cc	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/x_centre.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -44,22 +44,22 @@
  */
 void centre_of_objects (int obj_type, SelPtr list, int *x, int *y)
 {
-switch (obj_type)
-   {
-   case OBJ_LINEDEFS:
+  switch (obj_type)
+  {
+    case OBJ_LINEDEFS:
       centre_of_linedefs (list, x, y);
       break;
-   case OBJ_SECTORS:
+    case OBJ_SECTORS:
       centre_of_sectors (list, x, y);
       break;
-   case OBJ_THINGS:
+    case OBJ_THINGS:
       centre_of_things (list, x, y);
       break;
-   case OBJ_VERTICES:
+    case OBJ_VERTICES:
       centre_of_vertices (list, x, y);
       break;
-   default:
+    default:
       fatal_error ("coo: bad obj_type %d", obj_type);
-   }
+  }
 }
 
diff -uaNr yadex-1.5.2/src/x_exchng.cc yadex-1.6.0/src/x_exchng.cc
--- yadex-1.5.2/src/x_exchng.cc	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/x_exchng.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -31,6 +31,7 @@
 #include "yadex.h"
 #include "levels.h"
 #include "selectn.h"
+#include "objid.h"
 #include "x_exchng.h"
 
 
diff -uaNr yadex-1.5.2/src/x_hover.cc yadex-1.6.0/src/x_hover.cc
--- yadex-1.5.2/src/x_hover.cc	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/x_hover.cc	2003-03-28 13:37:32.000000000 +0100
@@ -0,0 +1,404 @@
+/*
+ *	x_hover.cc
+ *	AYM 2000-11-08
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphal Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+
+#include "yadex.h"
+#include <math.h>
+#include <vector>
+#include <algorithm>
+#include "drawmap.h"
+#include "levels.h"
+#include "objid.h"
+#include "x_hover.h"
+
+
+class Close_obj
+{
+  public :
+    Close_obj () { nil (); }
+    void nil ()
+    {
+      obj.nil ();
+      distance = ULONG_MAX;
+      radius   = INT_MAX;
+      inside   = false;
+    }
+    bool operator< (const Close_obj& other) const
+    {
+      if (inside && ! other.inside)
+	return true;
+      if (! inside && other.inside)
+	return false;
+
+      // Small objects should "mask" large objects
+      if (radius < other.radius)
+	return true;
+      if (radius > other.radius)
+	return false;
+
+      if (distance < other.distance)
+	return true;
+      if (distance > other.distance)
+	return false;
+
+      return radius < other.radius;
+    }
+    Objid  obj;
+    double distance;
+    bool   inside;
+    int    radius;
+};
+
+
+static const Close_obj& get_cur_linedef (int x, int y);
+static const Close_obj& get_cur_sector  (int x, int y);
+static const Close_obj& get_cur_thing   (int x, int y);
+static const Close_obj& get_cur_vertex  (int x, int y);
+
+
+/*
+ *	GetCurObject - determine which object is under the pointer
+ * 
+ *	Set <o> to point to the object under the pointer (map
+ *	coordinates (<x>, <y>). If several objects are close
+ *	enough to the pointer, the smallest object is chosen.
+ */
+void GetCurObject (Objid& o, int objtype, int x, int y)
+{
+switch (objtype)
+   {
+   case OBJ_THINGS:
+     {
+       o = get_cur_thing (x, y).obj;
+       return;
+     }
+
+   case OBJ_VERTICES:
+     {
+       o = get_cur_vertex (x, y).obj;
+       return;
+     }
+
+   case OBJ_LINEDEFS:
+     {
+       o = get_cur_linedef (x, y).obj;
+       return;
+     }
+
+   case OBJ_SECTORS:
+     {
+       o = get_cur_sector (x, y).obj;
+       return;
+     }
+
+   case OBJ_ANY:
+     {
+       std::vector<Close_obj> v;
+       v.push_back (get_cur_linedef (x, y));
+       v.push_back (get_cur_thing   (x, y));
+       v.push_back (get_cur_vertex  (x, y));
+       sort (v.begin (), v.end ());
+       if (v[0].obj ())
+       {
+	 o = v[0].obj;
+	 return;
+       }
+       o = get_cur_sector (x, y).obj;
+       return;
+     }
+
+   default:
+     nf_bug ("GetCurObject: objtype %d", (int) objtype);
+     o.nil ();
+     return;
+   }
+}
+
+
+/*
+ *	get_cur_linedef - determine which linedef is under the pointer
+ */
+static const Close_obj& get_cur_linedef (int x, int y)
+{
+  static Close_obj object;
+  const int screenslack = 15;			// Slack in pixels
+  double mapslack = fabs (screenslack / Scale);	// Slack in map units
+  int xmin = (int) (x - mapslack + 0.5);
+  int xmax = (int) (x + mapslack + 0.5);
+  int ymin = (int) (y - mapslack + 0.5);
+  int ymax = (int) (y + mapslack + 0.5);
+  ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
+  object.nil ();
+  for (int n = 0; n < NumLineDefs; n++)
+  {
+    int x0 = Vertices[LineDefs[n].start].x;
+    int y0 = Vertices[LineDefs[n].start].y;
+    int x1 = Vertices[LineDefs[n].end].x;
+    int y1 = Vertices[LineDefs[n].end].y;
+    int dx;
+    int dy;
+
+    /* Skip all lines of which all points are more than <mapslack>
+       units away from (x,y). In a typical level, this test will
+       filter out all the linedefs but a handful. */
+    if (x0 < xmin && x1 < xmin
+     || x0 > xmax && x1 > xmax
+     || y0 < ymin && y1 < ymin
+     || y0 > ymax && y1 > ymax)
+      continue;
+
+    /* This is where it gets ugly. We're trying to calculate the
+       distance between the pointer (x,y) and the linedef. Doing that
+       rigorously involves doing an orthogonal projection. I use
+       something simpler (for me).
+
+       If the pointer is not within the ends of the linedef, I calculate
+       the distance between the pointer and the closest end.
+
+       If the pointer is within the ends of the linedef, I calculate
+       what the ordinate would be for a point of the linedef that had
+       the same abscissa as the pointer. Then I calculate the difference
+       between that and the actual ordinate of the pointer and I call
+       that the distance. It's a gross approximation but, in practice,
+       it gives quite satisfactory results. Of course, for lines where
+       dy > dx, the abscissa is y and the ordinate is x.
+       -- AYM 1998-06-29 */
+    dx = x1 - x0;
+    dy = y1 - y0;
+    double dist = ULONG_MAX;
+    // The linedef is rather horizontal
+    if (abs (dx) > abs (dy))
+    {
+      /* Are we to the left of the leftmost end or to the right of the
+	 rightmost end or between the two ? */
+      if (x < (dx > 0 ? x0 : x1))
+	dist = hypot (x - (dx > 0 ? x0 : x1),
+		      y - (dx > 0 ? y0 : y1));
+      else if (x > (dx > 0 ? x1 : x0))
+	dist = hypot (x - (dx > 0 ? x1 : x0),
+		      y - (dx > 0 ? y1 : y0));
+      else
+	dist = fabs (y0 + ((double) dy)/dx * (x - x0) - y);
+    }
+    // The linedef is rather vertical
+    else
+    {
+      /* Are we above the high end or below the low end or in between ? */
+      if (y < (dy > 0 ? y0 : y1))
+	dist = hypot (x - (dy > 0 ? x0 : x1),
+		      y - (dy > 0 ? y0 : y1));
+      else if (y > (dy > 0 ? y1 : y0))
+	dist = hypot (x - (dy > 0 ? x1 : x0),
+		      y - (dy > 0 ? y1 : y0));
+      else
+	dist = fabs (x0 + ((double) dx)/dy * (y - y0) - x);
+    }
+    if (dist < object.distance && dist <= mapslack)
+    {
+      object.obj.type = OBJ_LINEDEFS;
+      object.obj.num  = n;
+      object.distance = dist;
+      object.radius   = (int) (hypot (dx, dy) / 2);
+      object.inside   = dist < 2 * Scale;
+    }
+  }
+  return object;
+}
+
+/*
+ *	get_cur_sector - determine which sector is under the pointer
+ */
+static const Close_obj& get_cur_sector (int x, int y)
+{
+  /* hack, hack...  I look for the first LineDef crossing
+     an horizontal half-line drawn from the cursor */
+
+  /* RQ & BW have been very smart here. Their method works remarkably
+     well for normal sectors. However, self-referencing sectors are
+     frequently unclosed. If your SRS has only horizontal linedefs, this
+     method fails miserably. I suppose that the solution would be to look
+     for intersections in BOTH directions and pick the closest. Remind me
+     to look into it one of these days :-). -- AYM 1998-06-29 */
+
+  /* Initializing curx to 32767 instead of MapMaxX + 1. Fixes the old
+     DEU bug where sometimes you couldn't select a newly created sector
+     to the west of the level until you saved. (MapMaxX got out of date
+     and SaveLevelData() refreshed it.) -- AYM 1999-03-18 */
+  static Close_obj object;
+  int best_match = -1;
+  int curx = 32767;  // Oh yes, one more hard-coded constant!
+  ObjectsNeeded (OBJ_LINEDEFS, OBJ_VERTICES, 0);
+  for (int n = 0; n < NumLineDefs; n++)
+    if ((Vertices[LineDefs[n].start].y > y)
+     != (Vertices[LineDefs[n].end].y > y))
+    {
+      int lx0 = Vertices[LineDefs[n].start].x;
+      int ly0 = Vertices[LineDefs[n].start].y;
+      int lx1 = Vertices[LineDefs[n].end].x;
+      int ly1 = Vertices[LineDefs[n].end].y;
+      int m = lx0 + (int) ((long) (y - ly0) * (long) (lx1 - lx0)
+					    / (long) (ly1 - ly0));
+      if (m >= x && m < curx)
+      {
+	curx = m;
+	best_match = n;
+      }
+    }
+
+  // Now look if this linedef has a sidedef bound to one sector
+  object.nil ();
+  if (best_match >= 0)
+  {
+    if (Vertices[LineDefs[best_match].start].y
+      > Vertices[LineDefs[best_match].end].y)
+      best_match = LineDefs[best_match].sidedef1;
+    else
+      best_match = LineDefs[best_match].sidedef2;
+    if (best_match >= 0)
+    {
+      ObjectsNeeded (OBJ_SIDEDEFS, 0);
+      object.obj.type = OBJ_SECTORS;
+      object.obj.num  = SideDefs[best_match].sector;
+      object.distance = 0;	// Not meaningful for sectors
+      object.radius   = 1;	// Not meaningful for sectors
+      object.inside   = true;	// Not meaningful for sectors
+    }
+    else
+      ;
+  }
+  else
+    ;
+  return object;
+}
+
+
+/*
+ *	get_cur_thing - determine which thing is under the pointer
+ */
+static const Close_obj& get_cur_thing (int x, int y)
+{
+  static Close_obj closest;
+  const int screenslack = 15;			// Slack in pixels
+  double mapslack = fabs (screenslack / Scale);	// Slack in map units
+  int max_radius = (int) (get_max_thing_radius () + mapslack);
+  int xmin = x - max_radius;
+  int xmax = x + max_radius;
+  int ymin = y - max_radius;
+  int ymax = y + max_radius;
+
+  ObjectsNeeded (OBJ_THINGS, 0);
+  closest.nil ();
+  for (int n = 0; n < NumThings; n++)
+  {
+    // Filter out things that are farther than <max_radius> units away.
+    if (Things[n].xpos < xmin
+     || Things[n].xpos > xmax
+     || Things[n].ypos < ymin
+     || Things[n].ypos > ymax)
+       continue;
+
+    // So how far is that thing exactly ?
+#ifdef ROUND_THINGS
+    double dist = hypot (x - Things[n].xpos, y - Things[n].ypos);
+    if (dist < closest.distance
+     && dist <= get_thing_radius (Things[n].type) + mapslack)
+    {
+      closest.obj.type = OBJ_THINGS;
+      closest.obj.num  = n;
+      closest.distance = dist;
+      closest.radius   = get_thing_radius (Things[n].type);
+      closest.inside   = dist < closest.radius;
+    }
+#else
+    {
+      int thing_radius = (int) (get_thing_radius (Things[n].type) + mapslack);
+      if (x > Things[n].xpos - thing_radius
+       && x < Things[n].xpos + thing_radius
+       && y > Things[n].ypos - thing_radius
+       && y < Things[n].ypos + thing_radius)
+      {
+	Close_obj current;
+	current.obj.type = OBJ_THINGS;
+	current.obj.num  = n;
+	current.distance = hypot (x - Things[n].xpos, y - Things[n].ypos);
+	current.radius   = get_thing_radius (Things[n].type);
+	current.inside   = x > Things[n].xpos - current.radius
+			&& x < Things[n].xpos + current.radius
+			&& y > Things[n].ypos - current.radius
+			&& y < Things[n].ypos + current.radius;
+	if (current < closest)
+	  closest = current;
+      }
+    }
+#endif
+  }
+  return closest;
+}
+
+
+/*
+ *	get_cur_vertex - determine which vertex is under the pointer
+ */
+static const Close_obj& get_cur_vertex (int x, int y)
+{
+  static Close_obj object;
+  const int screenradius = vertex_radius (Scale);	// Radius in pixels
+  const int screenslack  = screenradius + 15;		// Slack in pixels
+  double    mapslack     = fabs (screenslack / Scale);	// Slack in map units
+  const int mapradius    = (int) (screenradius / Scale);// Radius in map units
+  int xmin = (int) (x - mapslack + 0.5);
+  int xmax = (int) (x + mapslack + 0.5);
+  int ymin = (int) (y - mapslack + 0.5);
+  int ymax = (int) (y + mapslack + 0.5);
+
+  ObjectsNeeded (OBJ_VERTICES, 0);
+  object.nil ();
+  for (int n = 0; n < NumVertices; n++)
+  {
+    /* Filter out objects that are farther than <radius> units away. */
+    if (Vertices[n].x < xmin
+     || Vertices[n].x > xmax
+     || Vertices[n].y < ymin
+     || Vertices[n].y > ymax)
+       continue;
+    double dist = hypot (x - Vertices[n].x, y - Vertices[n].y);
+    if (dist < object.distance && dist <= mapslack)
+    {
+      object.obj.type = OBJ_VERTICES;
+      object.obj.num  = n;
+      object.distance = dist;
+      object.radius   = mapradius;
+      object.inside   = x > Vertices[n].x - mapradius
+		     && x < Vertices[n].x + mapradius
+		     && y > Vertices[n].y - mapradius
+		     && y < Vertices[n].y + mapradius;
+    }
+  }
+  return object;
+}
+
diff -uaNr yadex-1.5.2/src/x_hover.h yadex-1.6.0/src/x_hover.h
--- yadex-1.5.2/src/x_hover.h	1970-01-01 01:00:00.000000000 +0100
+++ yadex-1.6.0/src/x_hover.h	2000-11-08 16:22:59.000000000 +0100
@@ -0,0 +1,17 @@
+/*
+ *	x_hover.h
+ *	AYM 2000-11-08
+ */
+
+
+#ifndef YH_X_HOVER  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_X_HOVER
+
+
+class Objid;
+
+
+void GetCurObject (Objid& o, int objtype, int x, int y);
+
+
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/src/x_mirror.cc yadex-1.6.0/src/x_mirror.cc
--- yadex-1.5.2/src/x_mirror.cc	2000-07-24 23:26:35.000000000 +0200
+++ yadex-1.6.0/src/x_mirror.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,6 +32,7 @@
 #include "bitvec.h"
 #include "l_vertices.h"
 #include "levels.h"
+#include "objid.h"
 #include "s_vertices.h"
 #include "selectn.h"
 #include "t_centre.h"
diff -uaNr yadex-1.5.2/src/x_rotate.cc yadex-1.6.0/src/x_rotate.cc
--- yadex-1.5.2/src/x_rotate.cc	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/x_rotate.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,6 +32,7 @@
 #include <math.h>
 #include "l_vertices.h"
 #include "levels.h"
+#include "objid.h"
 #include "s_vertices.h"
 #include "selectn.h"
 #include "t_centre.h"
@@ -46,12 +47,12 @@
 #if 0
 inline void RotateAndScaleCoords (int *x, int *y, double angle, double scale)
 {
-double r, theta;
+  double r, theta;
 
-r = hypot ((double) *x, (double) *y);
-theta = atan2 ((double) *y, (double) *x);
-*x = (int) (r * scale * cos (theta + angle) + 0.5);
-*y = (int) (r * scale * sin (theta + angle) + 0.5);
+  r = hypot ((double) *x, (double) *y);
+  theta = atan2 ((double) *y, (double) *x);
+  *x = (int) (r * scale * cos (theta + angle) + 0.5);
+  *y = (int) (r * scale * sin (theta + angle) + 0.5);
 }
 #endif
 
@@ -62,17 +63,17 @@
 
 void RotateAndScaleObjects (int objtype, SelPtr obj, double angle, double scale) /* SWAP! */
 {
-int    dx, dy;
-int    centerx, centery;
-SelPtr cur, vertices;
-
-if (obj == NULL)
-   return;
-ObjectsNeeded (objtype, 0);
-
-switch (objtype)
-   {
-   case OBJ_THINGS:
+  int    dx, dy;
+  int    centerx, centery;
+  SelPtr cur, vertices;
+
+  if (obj == NULL)
+    return;
+  ObjectsNeeded (objtype, 0);
+
+  switch (objtype)
+  {
+    case OBJ_THINGS:
       centre_of_things (obj, ¢erx, ¢ery);
       for (cur = obj; cur; cur = cur->next)
 	 {
@@ -84,7 +85,8 @@
 	 }
       MadeChanges = 1;
       break;
-   case OBJ_VERTICES:
+
+    case OBJ_VERTICES:
       centre_of_vertices (obj, ¢erx, ¢ery);
       for (cur = obj; cur; cur = cur->next)
 	 {
@@ -97,18 +99,20 @@
       MadeChanges = 1;
       MadeMapChanges = 1;
       break;
-   case OBJ_LINEDEFS:
+
+    case OBJ_LINEDEFS:
       vertices = list_vertices_of_linedefs (obj);
       RotateAndScaleObjects (OBJ_VERTICES, vertices, angle, scale);
       ForgetSelection (&vertices);
       break;
-   case OBJ_SECTORS:
+
+    case OBJ_SECTORS:
       ObjectsNeeded (OBJ_LINEDEFS, OBJ_SIDEDEFS, 0);
       vertices = list_vertices_of_sectors (obj);
       RotateAndScaleObjects (OBJ_VERTICES, vertices, angle, scale);
       ForgetSelection (&vertices);
       break;
-   }
+  }
 }
 
 
diff -uaNr yadex-1.5.2/src/x_rotate.h yadex-1.6.0/src/x_rotate.h
--- yadex-1.5.2/src/x_rotate.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/x_rotate.h	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,12 +32,12 @@
 
 inline void RotateAndScaleCoords (int *x, int *y, double angle, double scale)
 {
-double r, theta;
+  double r, theta;
 
-r = hypot ((double) *x, (double) *y);
-theta = atan2 ((double) *y, (double) *x);
-*x = (int) (r * scale * cos (theta + angle) + 0.5);
-*y = (int) (r * scale * sin (theta + angle) + 0.5);
+  r = hypot ((double) *x, (double) *y);
+  theta = atan2 ((double) *y, (double) *x);
+  *x = (int) (r * scale * cos (theta + angle) + 0.5);
+  *y = (int) (r * scale * sin (theta + angle) + 0.5);
 }
 
 void RotateAndScaleObjects (int, SelPtr, double, double);
diff -uaNr yadex-1.5.2/src/xref.cc yadex-1.6.0/src/xref.cc
--- yadex-1.5.2/src/xref.cc	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/xref.cc	2003-03-28 13:37:32.000000000 +0100
@@ -12,7 +12,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -96,3 +96,38 @@
 }
 
 
+/*
+ *	A stopgap to please IvL
+ */
+void list_tagged_sectors (int tag)
+{
+  printf ("tag %d:", tag);
+  int count = 0;
+
+  for (int n = 0; n < NumSectors; n++)
+    if (Sectors[n].tag == tag)
+    {
+      printf (" %d", n);
+      count++;
+    }
+  printf (" (total %d)\n", count);
+}
+
+
+/*
+ *	A stopgap to please IvL
+ */
+void list_tagged_linedefs (int tag)
+{
+  printf ("tag %d:", tag);
+  int count = 0;
+
+  for (int n = 0; n < NumLineDefs; n++)
+    if (LineDefs[n].tag == tag)
+    {
+      printf (" %d", n);
+      count++;
+    }
+  printf (" (total %d)\n", count);
+}
+
diff -uaNr yadex-1.5.2/src/xref.h yadex-1.6.0/src/xref.h
--- yadex-1.5.2/src/xref.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/xref.h	2000-11-01 17:48:09.000000000 +0100
@@ -10,5 +10,7 @@
 void secret_sectors ();
 void unknown_linedef_type (SelPtr *list);
 void bad_sector_number (SelPtr *list);
+void list_tagged_sectors (int tag);
+void list_tagged_linedefs (int tag);
 
 
diff -uaNr yadex-1.5.2/src/yadex.cc yadex-1.6.0/src/yadex.cc
--- yadex-1.5.2/src/yadex.cc	2000-08-27 22:29:31.000000000 +0200
+++ yadex-1.6.0/src/yadex.cc	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -50,6 +50,8 @@
 #include "sanity.h"
 #include "textures.h"
 #include "x11.h"
+#include "wadfile.h"
+#include "wadlist.h"
 #include "wadname.h"
 #include "wadres.h"
 #include "wads2.h"
@@ -83,10 +85,10 @@
 Wad_res     wad_res (&MasterDir);
 
 // Set from command line and/or config file
-int       autoscroll			= 0;
-int       autoscroll_amp		= 10;
-int       autoscroll_edge		= 30;
-const char *config_file;
+bool      autoscroll			= 0;
+unsigned long autoscroll_amp		= 10;
+unsigned long autoscroll_edge		= 30;
+const char *config_file                 = NULL;
 int       copy_linedef_reuse_sidedefs	= 0;
 int       cpu_big_endian		= 0;
 bool      Debug				= false;
@@ -109,8 +111,11 @@
 bool      InfoShown			= true;
 int       zoom_default			= 0;  // 0 means fit
 int       zoom_step			= 0;  // 0 means sqrt(2)
+int       digit_zoom_base               = 100;
+int       digit_zoom_step               = 0;  // 0 means sqrt(2)
 confirm_t insert_vertex_split_linedef	= YC_ASK_ONCE;
 confirm_t insert_vertex_merge_vertices	= YC_ASK_ONCE;
+bool      blindly_swap_sidedefs         = false;
 const char *Iwad1			= NULL;
 const char *Iwad2			= NULL;
 const char *Iwad3			= NULL;
@@ -129,15 +134,13 @@
 char **   PatchWads			= NULL;
 bool      Quiet				= false;
 bool      Quieter			= false;
-int       scroll_less			= 10;
-int       scroll_more			= 90;
+unsigned long scroll_less		= 10;
+unsigned long scroll_more		= 90;
 bool      Select0			= false;
 int       show_help			= 0;
 int       sprite_scale                  = 100;
 bool      SwapButtons			= false;
-int       thing_fudge			= 400;
 int       verbose			= 0;
-int       vertex_fudge			= 200;
 int       welcome_message		= 1;
 const char *bench			= 0;
 
@@ -162,6 +165,8 @@
 static void MainLoop ();
 static void print_error_message (const char *fmt, va_list args);
 static void add_base_colours ();
+static const Wad_file *wad_by_name (const char *pathname);
+static bool wad_already_loaded (const char *pathname);
 
 
 /*
@@ -185,16 +190,20 @@
 
 // First detect manually --help and --version
 // because parse_command_line_options() cannot.
-if (argc == 2 && ! strcmp (argv[1], "--help"))
+if (argc == 2 && strcmp (argv[1], "--help") == 0)
    {
    print_usage (stdout);
+   if (fflush (stdout) != 0)
+     fatal_error ("stdout: %s", strerror (errno));
    exit (0);
    }
-if (argc == 2 && ! strcmp (argv[1], "--version"))
+if (argc == 2 && strcmp (argv[1], "--version") == 0)
    {
    puts (what ());
    puts (config_file_magic);
    puts (ygd_file_magic);
+   if (fflush (stdout) != 0)
+     fatal_error ("stdout: %s", strerror (errno));
    exit (0);
    }
 
@@ -210,140 +219,139 @@
    exit (1);
    }
 
-printf ("%s\n"
-   "This program is derived from DEU 5.21"
-   " by Raphal Quinet and Brendon Wyber.\n", what ());
+printf ("%s\n", what ());
 
 // Where am I installed ? (the config file might be there)
 #if defined Y_DOS
 install_dir = spec_path (argv[0]);
-#elif defined Y_UNIX
-install_dir = getenv ("YADEX_DIR");
 #endif
 
 // The config file provides some values.
-r = parse_config_file (config_file);
-if (! r)
+if (config_file != NULL)
+  r = parse_config_file_user (config_file);
+else
+  r = parse_config_file_default ();
+if (r == 0)
    {
    // Environment variables can override them.
    r = parse_environment_vars ();
-   if (! r)
+   if (r == 0)
       {
       // And the command line argument can override both.
       r = parse_command_line_options (argc - 1, argv + 1, 2);
       }
    }
-if (r)
+if (r != 0)
    {
    syntax_error :
    fprintf (stderr, "Try \"yadex --help\" or \"man yadex\".\n");
    exit (1);
    }
 
-if (Game != NULL && ! strcmp (Game, "doom"))
+if (Game != NULL && strcmp (Game, "doom") == 0)
    {
    if (Iwad1 == NULL)
       {
-      report_error ("You have to tell me where doom.wad is.");
+      err ("You have to tell me where doom.wad is.");
       fprintf (stderr,
          "Use \"-i1 <file>\" or put \"iwad1=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad1;
    }
-else if (Game != NULL && ! strcmp (Game, "doom2"))
+else if (Game != NULL && strcmp (Game, "doom2") == 0)
    {
    if (Iwad2 == NULL)
       {
-      report_error ("You have to tell me where doom2.wad is.");
+      err ("You have to tell me where doom2.wad is.");
       fprintf (stderr,
          "Use \"-i2 <file>\" or put \"iwad2=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad2;
    }
-else if (Game != NULL && ! strcmp (Game, "heretic"))
+else if (Game != NULL && strcmp (Game, "heretic") == 0)
    {
    if (Iwad3 == NULL)
       {
-      report_error ("You have to tell me where heretic.wad is.");
+      err ("You have to tell me where heretic.wad is.");
       fprintf (stderr,
          "Use \"-i3 <file>\" or put \"iwad3=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad3;
    }
-else if (Game != NULL && ! strcmp (Game, "hexen"))
+else if (Game != NULL && strcmp (Game, "hexen") == 0)
    {
    if (Iwad4 == NULL)
       {
-      report_error ("You have to tell me where hexen.wad is.");
+      err ("You have to tell me where hexen.wad is.");
       fprintf (stderr,
          "Use \"-i4 <file>\" or put \"iwad4=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad4;
    }
-else if (Game != NULL && ! strcmp (Game, "strife"))
+else if (Game != NULL && strcmp (Game, "strife") == 0)
    {
    if (Iwad5 == NULL)
       {
-      report_error ("You have to tell me where strife1.wad is.");
+      err ("You have to tell me where strife1.wad is.");
       fprintf (stderr,
          "Use \"-i5 <file>\" or put \"iwad5=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad5;
    }
-else if (Game != NULL && ! strcmp (Game, "doom02"))
+else if (Game != NULL && strcmp (Game, "doom02") == 0)
    {
    if (Iwad6 == NULL)
       {
-      report_error ("You have to tell me where the Doom alpha 0.2 iwad is.");
+      err ("You have to tell me where the Doom alpha 0.2 iwad is.");
       fprintf (stderr,
          "Use \"-i6 <file>\" or put \"iwad6=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad6;
    }
-else if (Game != NULL && ! strcmp (Game, "doom04"))
+else if (Game != NULL && strcmp (Game, "doom04") == 0)
    {
    if (Iwad7 == NULL)
       {
-      report_error ("You have to tell me where the Doom alpha 0.4 iwad is.");
+      err ("You have to tell me where the Doom alpha 0.4 iwad is.");
       fprintf (stderr,
          "Use \"-i7 <file>\" or put \"iwad7=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad7;
    }
-else if (Game != NULL && ! strcmp (Game, "doom05"))
+else if (Game != NULL && strcmp (Game, "doom05") == 0)
    {
    if (Iwad8 == NULL)
       {
-      report_error ("You have to tell me where the Doom alpha 0.5 iwad is.");
+      err ("You have to tell me where the Doom alpha 0.5 iwad is.");
       fprintf (stderr,
          "Use \"-i8 <file>\" or put \"iwad8=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad8;
    }
-else if (Game != NULL && ! strcmp (Game, "doompr"))
+else if (Game != NULL && strcmp (Game, "doompr") == 0)
    {
    if (Iwad9 == NULL)
       {
-      report_error ("You have to tell me where the Doom press release iwad is.");
+      err ("You have to tell me where the Doom press release iwad is.");
       fprintf (stderr,
          "Use \"-i9 <file>\" or put \"iwad9=<file>\" in yadex.cfg.\n");
       exit (1);
       }
    MainWad = Iwad9;
    }
-else if (Game != NULL && ! strcmp (Game, "strife10"))
+else if (Game != NULL && strcmp (Game, "strife10") == 0)
    {
    if (Iwad10 == NULL)
       {
-      report_error ("You have to tell me where strife1.wad is.");
+      err ("You have to tell me where strife1.wad is.");
       fprintf (stderr,
          "Use \"-i10 <file>\" or put \"iwad10=<file>\" in yadex.cfg.\n");
       exit (1);
@@ -353,9 +361,9 @@
 else
    {
    if (Game == NULL)
-      report_error ("You didn't say for which game you want to edit.");
+      err ("You didn't say for which game you want to edit.");
    else
-      report_error ("Unknown game \"%s\"", Game);
+      err ("Unknown game \"%s\"", Game);
    fprintf (stderr,
   "Use \"-g <game>\" on the command line or put \"game=<game>\" in yadex.cfg\n"
   "where <game> is one of \"doom\", \"doom02\", \"doom04\", \"doom05\","
@@ -410,13 +418,13 @@
    if (welcome_message)
       print_welcome (stdout);
 
-   if (! strcmp (Game, "hexen"))
+   if (strcmp (Game, "hexen") == 0)
       printf (
    "WARNING: Hexen mode is experimental. Don't expect to be able to do any\n"
    "real Hexen editing with it. You can edit levels but you can't save them.\n"
    "And there might be other bugs... BE CAREFUL !\n\n");
 
-   if (! strcmp (Game, "strife"))
+   if (strcmp (Game, "strife") == 0)
       printf (
    "WARNING: Strife mode is experimental. Many thing types, linedef types,\n"
    "etc. are missing or wrong. And be careful, there might be bugs.\n\n");
@@ -547,10 +555,10 @@
 
 
 /*
- *	report_error
- *	Print an error message but does not terminate the program.
+ *	err
+ *	Print an error message but do not terminate the program.
  */
-void report_error (const char *fmt, ...)
+void err (const char *fmt, ...)
 {
 va_list args;
 
@@ -566,13 +574,13 @@
 static void print_error_message (const char *fmt, va_list args)
 {
 fflush (stdout);
-fputs ("Yadex: Error: ", stderr);
+fputs ("Error: ", stderr);
 vfprintf (stderr, fmt, args);
 fputc ('\n', stderr);
 fflush (stderr);
 if (Debug && logfile != NULL)
    {
-   fputs ("Yadex: Error: ", logfile);
+   fputs ("Error: ", logfile);
    vfprintf (logfile, fmt, args);
    fputc ('\n', logfile);
    fflush (logfile);
@@ -600,12 +608,12 @@
    fflush (stdout);
    if (repeats)
       {
-      fprintf (stderr, "Yadex: Bug: Previous message repeated %d times\n",
+      fprintf (stderr, "Bug: Previous message repeated %d times\n",
 	    repeats);
       repeats = 0;
       }
 
-   fprintf (stderr, "Yadex: Bug: %s\n", msg);
+   fprintf (stderr, "Bug: %s\n", msg);
    fflush (stderr);
    if (first_time)
       {
@@ -620,7 +628,7 @@
    if (repeats == 10)
       {
       fflush (stdout);
-      fprintf (stderr, "Yadex: Bug: Previous message repeated %d times\n",
+      fprintf (stderr, "Bug: Previous message repeated %d times\n",
 	    repeats);
       fflush (stderr);
       repeats = 0;
@@ -666,7 +674,6 @@
 char input[120];
 char *com, *out;
 FILE *file, *raw;
-WadPtr wad;
 
 for (;;)
    {
@@ -690,7 +697,9 @@
       printf ("Please enter a command or ? for help.\n");
 
    /* user inputting for help */
-   else if (!strcmp (com, "?") || !strcmp (com, "h") || !strcmp (com, "help"))
+   else if (strcmp (com, "?") == 0
+	 || strcmp (com, "h") == 0
+	 || strcmp (com, "help") == 0)
       {
       printf ("? | h | help                      --"
               " display this text\n");
@@ -744,18 +753,19 @@
       }
 
    /* user asked for list of open wad files */
-   else if (!strcmp (com, "wads") || !strcmp (com, "w"))
+   else if (strcmp (com, "wads") == 0 || strcmp (com, "w") == 0)
       {
-      printf ("%-40s  Iwad\n", WadFileList->filename);
-      for (wad = WadFileList->next; wad; wad = wad->next)
-	 {
+      const Wad_file *wf;
+      wad_list.rewind ();
+      if (wad_list.get (wf))
+	 printf ("%-40s  Iwad\n", wf->pathname ());
+      while (wad_list.get (wf))
 	 printf ("%-40s  Pwad (%.*s)\n",
-	  wad->filename, (int) WAD_NAME, wad->directory[0].name);
-	 }
+	    wf->pathname (), (int) WAD_NAME, wf->what ());
       }
 
    /* user asked to quit */
-   else if (!strcmp (com, "quit") || !strcmp (com, "q"))
+   else if (strcmp (com, "quit") == 0 || strcmp (com, "q") == 0)
       {
       if (! Registered)
 	 printf ("Remember to register your copy of the game !\n");
@@ -763,10 +773,11 @@
       }
 
    /* user asked to edit a level */
-   else if (!strcmp (com, "edit") || !strcmp (com, "e")
-         || !strcmp (com, "create") || !strcmp (com, "c"))
+   else if (strcmp (com, "edit") == 0 || strcmp (com, "e") == 0
+         || strcmp (com, "create") == 0 || strcmp (com, "c") == 0)
       {
-      const int newlevel = ! strcmp (com, "create") || ! strcmp (com, "c");
+      const int newlevel = strcmp (com, "create") == 0
+			|| strcmp (com, "c") == 0;
       char *level_name = 0;
       com = strtok (NULL, " ");
       if (com == 0)
@@ -816,7 +827,7 @@
       }
 
    /* user asked to build a new main wad file */
-   else if (!strcmp (com, "build") || !strcmp (com, "b"))
+   else if (strcmp (com, "build") == 0 || strcmp (com, "b") == 0)
       {
       com = strtok (NULL, " ");
       if (com == NULL)
@@ -824,21 +835,20 @@
 	 printf ("Wad file name argument missing.\n");
 	 continue;
 	 }
-      for (wad = WadFileList; wad; wad = wad->next)
-	 if (!fncmp (com, wad->filename))
-	    break;
-      if (wad)
+      if (wad_already_loaded (com))
 	 {
-	 printf ("File \"%s\" is opened and cannot be overwritten.\n", com);
+	 printf ("%s: in use, close it first\n", com);
 	 continue;
 	 }
       BuildNewMainWad (com, 0);
       }
 
    /* user asked to build a compound patch wad file */
-   else if (!strcmp (com, "group") || !strcmp (com, "g"))
+   else if (strcmp (com, "group") == 0 || strcmp (com, "g") == 0)
       {
-      if (WadFileList->next == NULL || WadFileList->next->next == NULL)
+      wad_list.rewind ();
+      const Wad_file *wf;
+      if (! wad_list.get (wf) || ! wad_list.get (wf))
 	 {
 	 printf ("You need at least two open wad files "
 	   "if you want to group them.\n");
@@ -850,19 +860,16 @@
 	 printf ("Wad file name argument missing.\n");
 	 continue;
 	 }
-      for (wad = WadFileList; wad; wad = wad->next)
-	 if (!fncmp (com, wad->filename))
-	    break;
-      if (wad)
+      if (wad_already_loaded (com))
 	 {
-	 printf ("File \"%s\" is opened and cannot be overwritten.\n", com);
+	 printf ("%s: in use, close it first\n", com);
 	 continue;
 	 }
       BuildNewMainWad (com, 1);
       }
 
    /* user ask for a listing of a wad file */
-   else if (!strcmp (com, "list") || !strcmp (com, "l"))
+   else if (strcmp (com, "list") == 0 || strcmp (com, "l") == 0)
       {
       com = strtok (NULL, " ");
       if (com == NULL)
@@ -870,38 +877,36 @@
 	 printf ("Wad file name argument missing.\n");
 	 continue;
 	 }
-      for (wad = WadFileList; wad; wad = wad->next)
-	 if (!fncmp (com, wad->filename))
-	    break;
-      if (wad == NULL)
+      const Wad_file *wf = wad_by_name (com);
+      if (wf == 0)
 	 {
-	 printf ("Wad file \"%s\" is not open.\n", com);
+	 printf ("%s: not open\n", com);
 	 continue;
 	 }
       out = strtok (NULL, " ");
       if (out)
 	 {
 	 printf ("Outputting directory of \"%s\" to \"%s\".\n",
-	   wad->filename, out);
-	 if ((file = fopen (out, "wt")) == NULL)
+	   wf->pathname (), out);
+	 if ((file = fopen (out, "w")) == NULL)
 	    fatal_error ("error opening output file \"%s\"", com);
 	 fprintf (file, "%s\n", what ());
-	 ListFileDirectory (file, wad);
+	 ListFileDirectory (file, wf);
 	 fprintf (file, "\nEnd of file.\n");
 	 fclose (file);
 	 }
       else
-	 ListFileDirectory (stdout, wad);
+	 ListFileDirectory (stdout, wf);
       }
 
    /* user asked for the list of the master directory */
-   else if (!strcmp (com, "master") || !strcmp (com, "m"))
+   else if (strcmp (com, "master") == 0 || strcmp (com, "m") == 0)
       {
       out = strtok (NULL, " ");
       if (out)
 	 {
 	 printf ("Outputting master directory to \"%s\".\n", out);
-	 if ((file = fopen (out, "wt")) == NULL)
+	 if ((file = fopen (out, "w")) == NULL)
 	    fatal_error ("error opening output file \"%s\"", com);
 	 fprintf (file, "%s\n", what ());
 	 ListMasterDirectory (file);
@@ -913,7 +918,7 @@
       }
 
    // make_gimp_palette
-   else if (! strcmp (com, "make_gimp_palette"))
+   else if (strcmp (com, "make_gimp_palette") == 0)
       {
       out = strtok (NULL, " ");
       if (out == NULL)
@@ -925,7 +930,7 @@
       }
 
    // make_palette_ppm
-   else if (! strcmp (com, "make_palette_ppm"))
+   else if (strcmp (com, "make_palette_ppm") == 0)
       {
       out = strtok (NULL, "");
       if (out == NULL)
@@ -937,7 +942,7 @@
       }
 
    // make_palette_ppm
-   else if (! strcmp (com, "mp2"))
+   else if (strcmp (com, "mp2") == 0)
       {
       out = strtok (NULL, "");
       if (out == NULL)
@@ -949,13 +954,13 @@
       }
 
    /* user asked to list all options and their values */
-   else if (! strcmp (com, "set"))
+   else if (strcmp (com, "set") == 0)
       {
       dump_parameters (stdout);
       }
 
    /* user asked to read a new patch wad file */
-   else if (!strcmp (com, "read") || !strcmp (com, "r"))
+   else if (strcmp (com, "read") == 0 || strcmp (com, "r") == 0)
       {
       com = strtok (NULL, " ");
       if (com == NULL)
@@ -973,7 +978,7 @@
       }
 
    /* user asked to dump the contents of a wad file */
-   else if (!strcmp (com, "dump") || !strcmp (com, "d"))
+   else if (strcmp (com, "dump") == 0 || strcmp (com, "d") == 0)
       {
       com = strtok (NULL, " ");
       if (com == NULL)
@@ -985,7 +990,7 @@
       if (out)
 	 {
 	 printf ("Outputting directory entry data to \"%s\".\n", out);
-	 if ((file = fopen (out, "wt")) == NULL)
+	 if ((file = fopen (out, "w")) == NULL)
 	    fatal_error ("error opening output file \"%s\"", com);
 	 fprintf (file, "%s\n", what ());
 	 DumpDirectoryEntry (file, com);
@@ -997,7 +1002,7 @@
       }
 
    // "v"/"view" - view the sprites
-   else if (!strcmp (com, "view") || !strcmp (com, "v"))
+   else if (strcmp (com, "view") == 0 || strcmp (com, "v") == 0)
       {
       if (InitGfx ())
 	 goto v_end;
@@ -1027,7 +1032,7 @@
       }
 
    // "viewflat" - view the flats
-   else if (! strcmp (com, "viewflat"))
+   else if (strcmp (com, "viewflat") == 0)
       {
       if (InitGfx ())
 	goto viewflat_end;
@@ -1057,7 +1062,7 @@
       }
 
    // "viewpal" - view the palette (PLAYPAL and COLORMAP)
-   else if (! strcmp (com, "viewpal"))
+   else if (strcmp (com, "viewpal") == 0)
       {
       if (InitGfx ())
 	goto viewpal_end;
@@ -1075,7 +1080,7 @@
       }
    
    // "viewpat" - view the patches
-   else if (! strcmp (com, "viewpat"))
+   else if (strcmp (com, "viewpat") == 0)
       {
       if (InitGfx ())
 	goto viewpat_end;
@@ -1102,7 +1107,7 @@
       }
 
    // "viewtex" - view the textures
-   else if (! strcmp (com, "viewtex"))
+   else if (strcmp (com, "viewtex") == 0)
       {
       if (InitGfx ())
 	goto viewtex_end;
@@ -1128,7 +1133,7 @@
       }
 
    /* user asked to save an object to a separate pwad file */
-   else if (!strcmp (com, "save") || !strcmp (com, "s"))
+   else if (strcmp (com, "save") == 0 || strcmp (com, "s") == 0)
       {
       com = strtok (NULL, " ");
       if (com == NULL)
@@ -1147,13 +1152,9 @@
 	 printf ("Wad file name argument missing.\n");
 	 continue;
 	 }
-      for (wad = WadFileList; wad; wad = wad->next)
-	 if (!fncmp (out, wad->filename))
-	    break;
-      if (wad)
+      if (wad_already_loaded (com))
 	 {
-	 printf ("This wad file is already in use. "
-	    "You may not overwrite it.\n");
+	 printf ("%s: in use, close it first\n", com);
 	 continue;
 	 }
       printf ("Saving directory entry data to \"%s\".\n", out);
@@ -1164,7 +1165,7 @@
       }
 
    /* user asked to encapsulate a raw file in a pwad file */
-   else if (!strcmp (com, "insert") || !strcmp (com, "i"))
+   else if (strcmp (com, "insert") == 0 || strcmp (com, "i") == 0)
       {
       com = strtok (NULL, " ");
       if (com == NULL)
@@ -1188,13 +1189,9 @@
       /* kluge */
       strcpy (input, out);
       strcat (input, ".wad");
-      for (wad = WadFileList; wad; wad = wad->next)
-	 if (!fncmp (input, wad->filename))
-	    break;
-      if (wad)
+      if (wad_already_loaded (input))
 	 {
-	 printf ("This wad file is already in use (%s). "
-	    "You may not overwrite it.\n", input);
+	 printf ("%s: in use, close it first\n", input);
 	 continue;
 	 }
       printf ("Including new object %s in \"%s\".\n", out, input);
@@ -1206,9 +1203,9 @@
       }
 
    /* user asked to extract an object to a raw binary file */
-   else if (!strcmp (com, "xtract")
-	 || !strcmp (com, "extract")
-	 || !strcmp (com, "x"))
+   else if (strcmp (com, "xtract") == 0
+	 || strcmp (com, "extract") == 0
+	 || strcmp (com, "x") == 0)
       {
       com = strtok (NULL, " ");
       if (com == NULL)
@@ -1227,12 +1224,11 @@
 	 printf ("Raw file name argument missing.\n");
 	 continue;
 	 }
-      for (wad = WadFileList; wad; wad = wad->next)
-	 if (!fncmp (out, wad->filename))
-	    break;
-      if (wad)
+      if (wad_already_loaded (com))
 	 {
-	 printf ("You may not overwrite an opened wad file with raw data.\n");
+	 printf ("%s: in use, close it first\n", com);
+	 printf ("Besides do you really want to overwrite a wad file with"
+		 " raw data ?\n");
 	 continue;
 	 }
       printf ("Saving directory entry data to \"%s\".\n", out);
@@ -1263,7 +1259,14 @@
    // The first 16 are the standard IRGB VGA colours.
    // FIXME they're to be removed and replaced by
    // "logical" colours.
-   if (n < 16)
+#ifdef WHITE_BACKGROUND
+   if (n == 0)
+      irgb2rgb (15, &c);
+   else if (n == 15)
+      irgb2rgb (0, &c);
+   else
+#endif
+      if (n < 16)
       irgb2rgb (n, &c);
 
    // Then there are the colours used to draw the
@@ -1271,53 +1274,65 @@
    // the things are parametrized in the .ygd ; they
    // are added by load_game().
    // FIXME they should not be hard-coded, of course !
-   else if (n == WINBG)
-      c.set (0x2a, 0x24, 0x18);  // 0x80, 0x70, 0x60
-   else if (n == WINBG_LIGHT)
- //     c.set (0x50, 0x46, 0x40);  //0xc0 //0xa8 //0x80
-      c.set (0x48, 0x42, 0x3c);  //0xc0 //0xa8 //0x80
-   else if (n == WINBG_DARK)
-      c.set (0x20, 0x1b, 0x12);  //0x40 //0x38 //0x30
-   else if (n == WINFG)
-      c.set (0xa0, 0xa0, 0xa0);
-   else if (n == WINFG_DIM)
-      c.set (0x48, 0x48, 0x48);
-   else if (n == WINBG_HL)
-      c.set (0x58, 0x50, 0x48);
-   else if (n == WINFG_HL)
-      c.set (0xd0, 0xd0, 0xd0);
-   else if (n == WINFG_DIM_HL)
-      c.set (0x70, 0x70, 0x70);
-   else if (n == GRID1)
-      c.set (0, 0, 0xc0);
-   else if (n == GRID2H)
-      c.set (0, 0, 0x30);
-   else if (n == GRID2V)
-      c.set (0, 0, 0x40);
-   else if (n == GRID3H)
-      c.set (0, 0, 0x50);
-   else if (n == GRID3V)
-      c.set (0, 0, 0x70);
-   else if (n == GRID4H)
-      c.set (0, 0, 0x80);
-   else if (n == GRID4V)
-      c.set (0, 0, 0xc0);
-   else if (n == WINFGLABEL)  // Text in window, a bit dimmer
-      c.set (0x88, 0x88, 0x88);
-   else if (n == LINEDEF_NO)
-      c.set (0x40, 0xd0, 0xf0);
-   else if (n == SECTOR_NO)
-      c.set (0x40, 0xd0, 0xf0);
-   else if (n == THING_NO)
-      c.set (0x40, 0xd0, 0xf0);
-   else if (n == VERTEX_NO)
-      c.set (0x40, 0xd0, 0xf0);
-   else if (n == CLR_ERROR)
-      c.set (0xff, 0, 0);
-   else if (n == THING_REM)
-      c.set (0x40, 0x40, 0x40);
-   else
-      fatal_error ("Wrong acn %d", n);
+
+   /* WINBG* is for window backgrounds. Use the _HL variant is
+      for highlighted parts of windows (E.G. the current line in
+      a menu). _LIGHT and _DARK are for window borders and
+      grooves. There is no _HL flavour of these because I didn't
+      feel the need. */
+   else if (n == WINBG)			c.set (0x2a, 0x24, 0x18);
+   else if (n == WINBG_LIGHT)		c.set (0x48, 0x42, 0x3c);
+   else if (n == WINBG_DARK)		c.set (0x20, 0x1b, 0x12);
+   else if (n == WINBG_HL)		c.set (0x58, 0x50, 0x48);
+
+   /* WINFG* is for regular text. _DIM is for greyed out text
+      (for disabled options or text that is not applicable). */
+   else if (n == WINFG)			c.set (0xa0, 0xa0, 0xa0);
+   else if (n == WINFG_HL)		c.set (0xd0, 0xd0, 0xd0);
+   else if (n == WINFG_DIM)		c.set (0x48, 0x48, 0x48);
+   else if (n == WINFG_DIM_HL)		c.set (0x70, 0x70, 0x70);
+
+   /* WINLABEL is for text of lesser importance. For example,
+      the brackets around key binding are displayed in WINLABEL,
+      while what's between them is displayed in WINFG. The
+      difference with WINFG is not very noticeable but it does
+      improve readability. The static text in the object info
+      windows should be displayed in WINLABEL. */
+   else if (n == WINLABEL)		c.set (0x78, 0x78, 0x78);
+   else if (n == WINLABEL_HL)		c.set (0xa0, 0xa0, 0xa0);
+   else if (n == WINLABEL_DIM)		c.set (0x38, 0x38, 0x38);
+   else if (n == WINLABEL_DIM_HL)	c.set (0x50, 0x50, 0x50);
+
+#ifdef WHITE_BACKGROUND
+   else if (n == GRID1)			c.set (0x80, 0x80, 0xff);
+   else if (n == GRID2H)		c.set (0xf0, 0xf0, 0xff);
+   else if (n == GRID2V)		c.set (0xf0, 0xf0, 0xff);
+   else if (n == GRID3H)		c.set (0xd0, 0xd0, 0xff);
+   else if (n == GRID3V)		c.set (0xd0, 0xd0, 0xff);
+   else if (n == GRID4H)		c.set (0xb0, 0xb0, 0xff);
+   else if (n == GRID4V)		c.set (0xb0, 0xb0, 0xff);
+#else
+   else if (n == GRID1)			c.set (0, 0, 0xc0);
+   else if (n == GRID2H)		c.set (0, 0, 0x30);
+   else if (n == GRID2V)		c.set (0, 0, 0x40);
+   else if (n == GRID3H)		c.set (0, 0, 0x50);
+   else if (n == GRID3V)		c.set (0, 0, 0x70);
+   else if (n == GRID4H)		c.set (0, 0, 0x80);
+   else if (n == GRID4V)		c.set (0, 0, 0xc0);
+#endif
+
+   else if (n == LINEDEF_NO)		c.set (0x40, 0xd0, 0xf0);
+   else if (n == SECTOR_NO)		c.set (0x40, 0xd0, 0xf0);
+   else if (n == THING_NO)		c.set (0x40, 0xd0, 0xf0);
+   else if (n == VERTEX_NO)		c.set (0x40, 0xd0, 0xf0);
+   else if (n == CLR_ERROR)		c.set (0xff, 0,    0);
+   else if (n == THING_REM)		c.set (0x40, 0x40, 0x40);
+
+   else if (n == SECTOR_TAG)		c.set (0x00, 0xff, 0x00);
+   else if (n == SECTOR_TAGTYPE)	c.set (0x00, 0xe0, 0xe0);
+   else if (n == SECTOR_TYPE)		c.set (0x00, 0x80, 0xff);
+
+   else					fatal_error ("Wrong acn %d", n);
 
    acolour_t acn = add_app_colour (c);
    if (acn != n)
@@ -1326,3 +1341,20 @@
 }
 
 
+static const Wad_file *wad_by_name (const char *pathname)
+{
+  const Wad_file *wf;
+
+  for (wad_list.rewind (); wad_list.get (wf);)
+    if (fncmp (pathname, wf->pathname ()) == 0)
+      return wf;
+  return 0;
+}
+
+
+static bool wad_already_loaded (const char *pathname)
+{
+  return wad_by_name (pathname) != 0;
+}
+
+
diff -uaNr yadex-1.5.2/src/yadex.h yadex-1.6.0/src/yadex.h
--- yadex-1.5.2/src/yadex.h	2000-08-15 23:22:40.000000000 +0200
+++ yadex-1.6.0/src/yadex.h	2003-03-28 13:37:32.000000000 +0100
@@ -11,7 +11,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -32,6 +32,9 @@
 #define YH_YADEX
 
 
+#include "config.h"
+
+
 // Sanity checks
 #if ! (defined Y_BGI ^ defined Y_X11)
 #error "You must #define either Y_BGI or Y_X11"
@@ -166,19 +169,7 @@
 /* The wad file pointer structure is used for holding the information
    on the wad files in a linked list.
    The first wad file is the main wad file. The rest are patches. */
-typedef struct WadFileInfo huge *WadPtr;
-struct WadFileInfo
-   {
-   WadPtr next;			// Next file in linked list
-   char *filename;		// Name of the wad file
-   FILE *fd;			// C file stream information
-   bool error;			// Read or write error occurred
-   char type[4];		// Type of wad file ("IWAD" or "PWAD")
-   i32  dirsize;		// Directory size of wad
-   i32  dirstart;		// Offset to start of directory
-   DirPtr directory;		// Array of directory information
-   ygpf_t pic_format;		// Picture format (usually PF_NORMAL)
-   };
+class Wad_file;
 
 /* The master directory structure is used to build a complete directory
    of all the data blocks from all the various wad files. */
@@ -186,7 +177,7 @@
 struct MasterDirectory
    {
    MDirPtr next;		// Next in list
-   WadPtr wadfile;		// File of origin
+   const Wad_file *wadfile;	// File of origin
    struct Directory dir;	// Directory data
    };
 
@@ -195,10 +186,10 @@
 struct Lump_loc
    {
    Lump_loc () { wad = 0; }
-   Lump_loc (WadPtr w, i32 o, i32 l) { wad = w; ofs = o; len = l; }
+   Lump_loc (const Wad_file *w, i32 o, i32 l) { wad = w; ofs = o; len = l; }
    bool operator == (const Lump_loc& other) const
      { return wad == other.wad && ofs == other.ofs && len == other.len; }
-   WadPtr wad;
+   const Wad_file *wad;
    i32 ofs;
    i32 len;
    };
@@ -222,49 +213,59 @@
 /* The 16 VGA colours that DEU used to use.
    For the BGI version, those macros are defined in graphics.h
    FIXME: all references to these in the code should be removed. */
-const acolour_t BLACK        = 0;
-const acolour_t BLUE         = 1;
-const acolour_t GREEN        = 2;
-const acolour_t CYAN         = 3;
-const acolour_t RED          = 4;
-const acolour_t MAGENTA      = 5;
-const acolour_t BROWN        = 6;
-const acolour_t LIGHTGRAY    = 7;
-const acolour_t DARKGRAY     = 8;
-const acolour_t LIGHTBLUE    = 9;
-const acolour_t LIGHTGREEN   = 10;
-const acolour_t LIGHTCYAN    = 11;
-const acolour_t LIGHTRED     = 12;
-const acolour_t LIGHTMAGENTA = 13;
-const acolour_t YELLOW       = 14;
-const acolour_t WHITE        = 15;
+const acolour_t BLACK           = 0;
+const acolour_t BLUE            = 1;
+const acolour_t GREEN           = 2;
+const acolour_t CYAN            = 3;
+const acolour_t RED             = 4;
+const acolour_t MAGENTA         = 5;
+const acolour_t BROWN           = 6;
+const acolour_t LIGHTGREY       = 7;
+const acolour_t DARKGREY        = 8;
+const acolour_t LIGHTBLUE       = 9;
+const acolour_t LIGHTGREEN      = 10;
+const acolour_t LIGHTCYAN       = 11;
+const acolour_t LIGHTRED        = 12;
+const acolour_t LIGHTMAGENTA    = 13;
+const acolour_t YELLOW          = 14;
+const acolour_t WHITE           = 15;
 #endif
 
 // True logical colours
-const acolour_t WINBG        = 16;
-const acolour_t WINBG_LIGHT  = 17;
-const acolour_t WINBG_DARK   = 18;
-const acolour_t WINFG        = 19;
-const acolour_t WINFG_DIM    = 20;
-const acolour_t WINBG_HL     = 21;
-const acolour_t WINFG_HL     = 22;
-const acolour_t WINFG_DIM_HL = 23;
-const acolour_t GRID1        = 24;
-const acolour_t GRID2H       = 25;
-const acolour_t GRID2V       = 26;
-const acolour_t GRID3H       = 27;
-const acolour_t GRID3V       = 28;
-const acolour_t GRID4H       = 29;
-const acolour_t GRID4V       = 30;
-const acolour_t WINFGLABEL   = 31;
-const acolour_t LINEDEF_NO   = 32;
-const acolour_t SECTOR_NO    = 33;
-const acolour_t THING_NO     = 34;
-const acolour_t VERTEX_NO    = 35;
-const acolour_t CLR_ERROR    = 36;
-const acolour_t THING_REM    = 37;	// Things when not in things mode
+const acolour_t WINBG           = 16;
+const acolour_t WINBG_LIGHT     = 17;
+const acolour_t WINBG_DARK      = 18;
+const acolour_t WINBG_HL        = 19;
+
+const acolour_t WINFG           = 20;
+const acolour_t WINFG_HL        = 21;
+const acolour_t WINFG_DIM       = 22;
+const acolour_t WINFG_DIM_HL    = 23;
+
+const acolour_t WINLABEL        = 24;
+const acolour_t WINLABEL_HL     = 25;
+const acolour_t WINLABEL_DIM    = 26;
+const acolour_t WINLABEL_DIM_HL = 27;
+
+const acolour_t GRID1           = 28;
+const acolour_t GRID2H          = 29;
+const acolour_t GRID2V          = 30;
+const acolour_t GRID3H          = 31;
+const acolour_t GRID3V          = 32;
+const acolour_t GRID4H          = 33;
+const acolour_t GRID4V          = 34;
+const acolour_t LINEDEF_NO      = 35;
+const acolour_t SECTOR_NO       = 36;
+const acolour_t THING_NO        = 37;
+const acolour_t VERTEX_NO       = 38;
+const acolour_t CLR_ERROR       = 39;
+const acolour_t THING_REM       = 40;	// Things when not in things mode
+
+const acolour_t SECTOR_TAG      = 41;
+const acolour_t SECTOR_TAGTYPE  = 42;
+const acolour_t SECTOR_TYPE     = 43;
 
-const acolour_t NCOLOURS     = 38;
+const acolour_t NCOLOURS        = 44;
 
 
 /*
@@ -298,6 +299,7 @@
 const int YO_TOGGLE = 't';  // Argument = bit#
 const int YO_XOR    = 'x';  // Argument = mask
 
+
 /*
  *	Even more stuff ("the macros and constants")
  */
@@ -307,42 +309,13 @@
 extern const char *const msg_nomem;       // "Not enough memory"
 
 // Convert screen/window coordinates to map coordinates
-#define MAPX(x)		(OrigX + (int) (((x) - ScrCenterX) / Scale))
-#define MAPY(y)		(OrigY + (int) ((ScrCenterY - (y)) / Scale))
+#define MAPX(x)		(OrigX + (int) (((int) (x) - ScrCenterX) / Scale))
+#define MAPY(y)		(OrigY + (int) ((ScrCenterY - (int) (y)) / Scale))
 
 // Convert map coordinates to screen/window coordinates
 #define SCREENX(x)	(ScrCenterX + (int) (((x) - OrigX) * Scale))
 #define SCREENY(y)	(ScrCenterY + (int) ((OrigY - (y)) * Scale))
 
-// Object types
-#define OBJ_NONE	0
-#define OBJ_THINGS	1
-#define OBJ_LINEDEFS	2
-#define OBJ_SIDEDEFS	3
-#define OBJ_VERTICES	4
-#define OBJ_SEGS	5
-#define OBJ_SSECTORS	6
-#define OBJ_NODES	7
-#define OBJ_SECTORS	8
-#define OBJ_REJECT	9
-#define OBJ_BLOCKMAP	10
-
-// Special object numbers */
-typedef i16 obj_no_t;
-#define OBJ_NO_NONE    -1
-#define OBJ_NO_CANVAS  -2
-#define is_obj(n)      ((n) >= 0)
-#define is_linedef(n)  ((n) >= 0 && (n) < NumLineDefs)
-#define is_sector(n)   ((n) >= 0 && (n) < NumSectors )
-#define is_sidedef(n)  ((n) >= 0 && (n) < NumSideDefs)
-#define is_thing(n)    ((n) >= 0 && (n) < NumThings  )
-#define is_vertex(n)   ((n) >= 0 && (n) < NumVertices)
-
-// Half the size of an object (Thing or Vertex) in map coords
-#define OBJSIZE		7
-// AYM 19980216: to avoid magnifying vertices too much when zooming in
-#define VERTEXSIZE (Scale > 1 ? OBJSIZE/Scale+0.5 : OBJSIZE)
-
 // AYM 19980213: InputIntegerValue() uses this to mean that Esc was pressed
 #define IIV_CANCEL  INT_MIN
 
@@ -371,9 +344,9 @@
 
 // Defined in yadex.c and set from
 // command line and/or config file
-extern int   autoscroll;	// Autoscrolling enabled.
-extern int   autoscroll_amp;	// Amplitude in percents of screen/window size.
-extern int   autoscroll_edge;	// Max. dist. in pixels to edge.
+extern bool  autoscroll;	// Autoscrolling enabled.
+extern unsigned long autoscroll_amp;// Amplitude in percents of screen/window size.
+extern unsigned long autoscroll_edge; // Max. dist. in pixels to edge.
 extern const char *config_file;	// Name of the configuration file
 extern int   copy_linedef_reuse_sidedefs;
 extern int   cpu_big_endian;	// Am I running on a big-endian CPU ?
@@ -396,8 +369,11 @@
 extern int   idle_sleep_ms;	// Time to sleep after empty XPending()
 extern int   zoom_default;	// Initial zoom factor for map
 extern int   zoom_step;		// Step between zoom factors in percent
+extern int   digit_zoom_base;	// Zoom factor of `1' key, in percent
+extern int   digit_zoom_step;	// Step between digit keys, in percent 
 extern confirm_t insert_vertex_merge_vertices;
 extern confirm_t insert_vertex_split_linedef;
+extern bool  blindly_swap_sidedefs;
 extern const char *Iwad1;	// Name of the Doom iwad
 extern const char *Iwad2;	// Name of the Doom II iwad
 extern const char *Iwad3;	// Name of the Heretic iwad
@@ -416,17 +392,13 @@
 extern char **PatchWads;	// List of pwad files
 extern bool  Quiet;		// Don't beep when an object is selected
 extern bool  Quieter;		// Don't beep, even on error
-extern int   scroll_less;	// %s of screenful to scroll by
-extern int   scroll_more;	// %s of screenful to scroll by
+extern unsigned long scroll_less;// %s of screenful to scroll by
+extern unsigned long scroll_more;// %s of screenful to scroll by
 extern bool  Select0;		// Autom. select obj. 0 when switching modes
 extern int   show_help;		// Print usage message and exit.
 extern int   sprite_scale;	// Relative scale used to display sprites
 extern bool  SwapButtons;	// Swap right and middle mouse buttons
-extern int   thing_fudge;	// How near to a thing you need to be to
-				// highlight it, in percents of its radius.
 extern int   verbose;		// Verbose mode
-extern int   vertex_fudge;	// How near to a vertex you need to be to
-				// highlight it, in percents of its radius.
 extern int   welcome_message;	// Print the welcome message on startup.
 extern const char *bench;	// Benchmark to run
 
@@ -436,7 +408,6 @@
 extern float Scale;		// Scale to draw map 20 to 1
 
 // Defined in wads.cc
-extern WadPtr    WadFileList;	// List of wad files
 extern MDirPtr   MasterDir;	// The master directory
 class Serial_num;
 extern Serial_num master_dir_serial;	// The revision# thereof
@@ -461,20 +432,20 @@
  *	room for improvement on that matter...
  */
 
-/* checks.cc (previously in editobj.cc) */
+// checks.cc (previously in editobj.cc)
 void CheckLevel (int, int, int pulldown); /* SWAP! */
 bool CheckStartingPos (void); /* SWAP! */
 
-/* colour1.cc */
+// colour1.cc
 int getcolour (const char *s, rgb_c *rgb);
 
-/* colour2.cc */
+// colour2.cc
 int rgb2irgb (int r, int g, int b);
 
-/* colour3.cc */
+// colour3.cc
 void irgb2rgb (int c, rgb_c *rgb);
 
-/* editobj.cc */
+// editobj.cc
 int InputObjectNumber (int, int, int, int);
 int InputObjectXRef (int, int, int, bool, int);
 bool Input2VertexNumbers (int, int, const char *, int *, int *);
@@ -482,35 +453,35 @@
 void InsertStandardObject (int, int, int choice); /* SWAP! */
 void MiscOperations (int, SelPtr *, int choice); /* SWAP! */
 
-/* game.cc */
+// game.cc
 void InitGameDefs (void);
 void LoadGameDefs (const char *game);
 void FreeGameDefs (void);
 
-/* geom.cc */
+// geom.cc
 unsigned ComputeAngle (int, int);
 unsigned ComputeDist (int, int);
 
-/* input.cc */
+// input.cc
 #include "input.h"
 
-/* l_align.cc (previously in objects.cc) */
+// l_align.cc (previously in objects.cc)
 void AlignTexturesY (SelPtr *); /* SWAP! */
 void AlignTexturesX (SelPtr *); /* SWAP! */
 
-/* l_misc.cc (previously in objects.cc) */
+// l_misc.cc (previously in objects.cc)
 void FlipLineDefs (SelPtr, bool); /* SWAP! */
 void SplitLineDefs (SelPtr); /* SWAP! */
 void MakeRectangularNook (SelPtr obj, int width, int depth, int convex); /* SWAP! */
 void SetLinedefLength (SelPtr obj, int length, int move_2nd_vertex);
 
-/* l_prop.cc (previously in editobj.cc) */
+// l_prop.cc (previously in editobj.cc)
 void LinedefProperties (int x0, int y0, SelPtr obj);
 
-/* l_unlink.cc */
+// l_unlink.cc
 void unlink_sidedef (SelPtr linedefs, int side1, int side2);
 
-/* levels.cc */
+// levels.cc
 int ReadLevelData (const char *); /* SWAP! */
 void ForgetLevelData (void); /* SWAP! */
 int SaveLevelData (const char *, const char *level_name); /* SWAP! */
@@ -520,7 +491,7 @@
 void ReadFTextureNames (void);
 void ForgetWTextureNames (void);
 
-/* mouse.cc (this module is entirely DOS-specific) */
+// mouse.cc (this module is entirely DOS-specific)
 #if defined Y_BGI
 void CheckMouseDriver (void);
 void ShowMousePointer (void);
@@ -540,7 +511,7 @@
 #define ResetMouseLimits nop
 #endif
 
-/* names.cc */
+// names.cc
 const char *GetObjectTypeName (int);
 const char *GetEditModeName (int);
 const char *GetLineDefTypeName (int);
@@ -550,85 +521,74 @@
 const char *GetSectorTypeName (int);
 const char *GetSectorTypeLongName (int);
 
-/* nop.cc */
+// nop.cc
 void nop (...);
 
-/* objects.cc */
-void HighlightSelection (int, SelPtr); /* SWAP! */
-obj_no_t GetMaxObjectNum (int);
-int GetCurObject (int objtype, int x, int y, int radius); /* SWAP! */
-void SelectObjectsInBox (SelPtr *list, int, int, int, int, int); /* SWAP! */
-void HighlightObject (int, int, int); /* SWAP! */
-void DeleteObject (int, int); /* SWAP! */
-void DeleteObjects (int, SelPtr *); /* SWAP! */
-void InsertObject (int, int, int, int); /* SWAP! */
-bool IsLineDefInside (int, int, int, int, int); /* SWAP - needs Vertices & LineDefs */
-int GetOppositeSector (int, bool); /* SWAP! */
-void CopyObjects (int, SelPtr); /* SWAP! */
-bool MoveObjectsToCoords (int, SelPtr, int, int, int); /* SWAP! */
-void GetObjectCoords (int, int, int *, int *); /* SWAP! */
-int FindFreeTag (void); /* SWAP! */
-
-/* s_door.cc (previously in objects.cc) */
+// s_door.cc (previously in objects.cc)
 void MakeDoorFromSector (int); /* SWAP! */
 
-/* s_lift.cc (previously in objects.cc) */
+// s_lift.cc (previously in objects.cc)
 void MakeLiftFromSector (int); /* SWAP! */
 
-/* s_merge.cc (previously in objects.cc) */
+// s_merge.cc (previously in objects.cc)
 void MergeSectors (SelPtr *); /* SWAP! */
 void DeleteLineDefsJoinSectors (SelPtr *); /* SWAP! */
 
-/* s_misc.cc (previously in objects.cc) */
+// s_misc.cc (previously in objects.cc)
 void DistributeSectorFloors (SelPtr); /* SWAP! */
 void DistributeSectorCeilings (SelPtr); /* SWAP! */
 void RaiseOrLowerSectors (SelPtr obj);
 void BrightenOrDarkenSectors (SelPtr obj);
 
-/* s_prop.cc (previously in editobj.cc) */
+// s_prop.cc (previously in editobj.cc)
 void SectorProperties (int x0, int y0, SelPtr obj);
 
-/* s_split.cc (previously in objects.cc) */
+// s_split.cc (previously in objects.cc)
 void SplitSector (int, int); /* SWAP! */
 void SplitLineDefsAndSector (int, int); /* SWAP! */
 
-/* swapmem.cc */
+// swapmem.cc
 void InitSwap (void);
 void FreeSomeMemory (void);
 void ObjectsNeeded (int, ...);
 
-/* scrnshot.cc */
+// scrnshot.cc
 void ScreenShot (void);
 
-/* selrect.cc */
-/* t_prop.c (previously in editobj.c) */
+// selrect.cc
+// t_prop.c (previously in editobj.c)
 void ThingProperties (int x0, int y0, SelPtr obj);
 
-/* v_merge.cc */
+// v_merge.cc
 void DeleteVerticesJoinLineDefs (SelPtr ); /* SWAP! */
 void MergeVertices (SelPtr *); /* SWAP! */
 bool AutoMergeVertices (SelPtr *, int obj_type, char operation); /* SWAP! */
 
-/* v_polyg.cc */
+// v_polyg.cc
 void InsertPolygonVertices (int, int, int, int);
 
-/* verbmsg.cc */
+// verbmsg.cc
 void verbmsg (const char *fmt, ...);
 
-/* version.cc */
+// version.cc
 extern const char *const yadex_version;
 extern const char *const yadex_source_date;
 
-/* wads.cc */
+// prefix.cc
+extern const char *const yadex_etc_version;
+extern const char *const yadex_etc_common;
+extern const char *const yadex_ygd_version;
+extern const char *const yadex_ygd_common;
+
+// wads.cc
 MDirPtr FindMasterDir (MDirPtr, const char *);
 MDirPtr FindMasterDir (MDirPtr, const char *, const char *);
 int entryname_cmp (const char *entry1, const char *entry2);
 
-/* warning.cc */
+// warning.cc
 void warn (const char *fmt, ...);
 
-/* yadex.cc */
-int main (int, char *[]);
+// yadex.cc
 void Beep (void);
 void PlaySound (int, int);
 void LogMessage (const char *, ...);
diff -uaNr yadex-1.5.2/src/yerror.h yadex-1.6.0/src/yerror.h
--- yadex-1.5.2/src/yerror.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/yerror.h	2000-12-06 00:53:06.000000000 +0100
@@ -5,7 +5,7 @@
 
 
 void fatal_error (const char *fmt, ...);
-void report_error (const char *fmt, ...);
+void err (const char *fmt, ...);
 void nf_bug (const char *fmt, ...);
 
 
diff -uaNr yadex-1.5.2/src/ytime.cc yadex-1.6.0/src/ytime.cc
--- yadex-1.5.2/src/ytime.cc	2000-01-14 22:51:18.000000000 +0100
+++ yadex-1.6.0/src/ytime.cc	2003-03-28 13:37:32.000000000 +0100
@@ -10,7 +10,7 @@
 Yadex incorporates code from DEU 5.21 that was put in the public domain in
 1994 by Raphal Quinet and Brendon Wyber.
 
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
+The rest of Yadex is Copyright  1997-2003 Andr Majorel and others.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
diff -uaNr yadex-1.5.2/src/ytime.h yadex-1.6.0/src/ytime.h
--- yadex-1.5.2/src/ytime.h	2000-01-10 14:40:12.000000000 +0100
+++ yadex-1.6.0/src/ytime.h	2000-11-07 13:00:59.000000000 +0100
@@ -4,34 +4,11 @@
  */
 
 
-/*
-This file is part of Yadex.
-
-Yadex incorporates code from DEU 5.21 that was put in the public domain in
-1994 by Raphal Quinet and Brendon Wyber.
-
-The rest of Yadex is Copyright  1997-2000 Andr Majorel.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-
-#ifndef YH_YTIME  /* Prevent multiple inclusion */
-#define YH_YTIME  /* Prevent multiple inclusion */
+#ifndef YH_YTIME  /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_YTIME
 
 
 unsigned long y_milliseconds ();
 
 
-#endif  /* Prevent multiple inclusion */
+#endif  /* DO NOT ADD ANYTHING AFTER THIS LINE */
diff -uaNr yadex-1.5.2/yadex.cfg yadex-1.6.0/yadex.cfg
--- yadex-1.5.2/yadex.cfg	2000-08-26 22:20:26.000000000 +0200
+++ yadex-1.6.0/yadex.cfg	2003-03-30 15:08:13.000000000 +0200
@@ -1,4 +1,4 @@
-# Yadex configuration file version 3
+# Yadex configuration file version 4
 # ^ Don't modify the line above, it's there for something.
 
 
@@ -71,12 +71,17 @@
 # If you insert a new vertex on top of an existing vertex,
 # should we merge the two vertices ? Default is "ask_once".
 
-  insert_vertex_merge_vertices = yes
+  #insert_vertex_merge_vertices = yes
 
 # If you insert a new vertex on top of an existing linedef,
 # should we split the linedef there ? Default is "ask_once".
 
-  insert_vertex_split_linedef = yes
+  #insert_vertex_split_linedef = yes
+
+# Blindly swap the sidedefs on a linedef, i.e. without any
+# warning prompt. Default is false.
+
+  #blindly_swap_sidedefs = false
 
 # Is the infobar shown ? On by default.
 
@@ -88,13 +93,6 @@
 
   #select0 = false
 
-# How near you need to be to an object to be able to highlight
-# it, in percents of its radius. Default is 400% for things and
-# 200% for vertices.
-
-  #thing_fudge  = 400
-  #vertex_fudge = 200
-
 # Bounds of grid step.
 
   #grid_max        = 128
@@ -128,6 +126,27 @@
 
   #zoom_step = 0
 
+# Value to which [1] sets the zoom factor, in percent.
+
+  #digit_zoom_base = 100
+
+# Ratio between successive zoom factors for digit keys, in
+# percent.
+#
+#   [1] sets the zoom factor to digit_zoom_base
+#   [2] sets the zoom factor to digit_zoom_base * digit_zoom_step
+#   [3] sets the zoom factor to digit_zoom_step * digit_zoom_step ** 2
+#   ...
+#   [0] sets the zoom factor to digit_zoom_step * digit_zoom_step ** 9
+#
+# In other words, if this parameter is positive (negative), the
+# zoom factor increases (decreases) across the keyboard. The
+# special value 0 sets the ratio to the inverse of the square
+# root of two, which is about the same thing as setting it to
+# -29. It's the default.
+
+  #digit_zoom_step = 0
+ 
 
 #
 #	Graphic output options
@@ -180,7 +199,8 @@
   #font = 9x15bold
   #font = 10x20
   #font = 12x24
-  font = lucidasanstypewriter-12
+  #font = lucidasanstypewriter-12
+  font = -b&h-lucidatypewriter-medium-r-normal-sans-12-120-75-75-m-70-iso8859-1
   #font = lucidasanstypewriter-14
   #font = -schumacher-clean-medium-r-normal--13-130-75-75-c-80-iso8859-1
   #font = -schumacher-clean-medium-r-normal--14-140-75-75-c-80-iso8859-1
@@ -259,6 +279,7 @@
 
   #verbose = false
 
-welcome_message = true
+# Be helpful to new users. On by default.
 
+  #welcome_message = true
 
diff -uaNr yadex-1.5.2/yadex.dep yadex-1.6.0/yadex.dep
--- yadex-1.5.2/yadex.dep	2001-06-30 23:34:40.000000000 +0200
+++ yadex-1.6.0/yadex.dep	2003-04-01 02:30:36.000000000 +0200
@@ -1,824 +1,1022 @@
-obj/0/acolours.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/acolours.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/acolours.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/acolours.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/acolours.o: src/input.h src/acolours.h src/colour.h src/gfx.h src/rgb.h
-dobj/0/acolours.o: src/input.h src/acolours.h src/colour.h src/gfx.h src/rgb.h
-obj/0/aym.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/aym.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
+obj/0/acolours.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/acolours.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/acolours.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/acolours.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/acolours.o: src/wstructs.h src/input.h src/acolours.h src/colour.h
+dobj/0/acolours.o: src/wstructs.h src/input.h src/acolours.h src/colour.h
+obj/0/acolours.o: src/gfx.h src/rgb.h
+dobj/0/acolours.o: src/gfx.h src/rgb.h
+obj/0/aym.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
+dobj/0/aym.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
 obj/0/aym.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 dobj/0/aym.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 obj/0/aym.o: src/game.h src/rgb.h
 dobj/0/aym.o: src/game.h src/rgb.h
-obj/0/bench.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/bench.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/bench.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/bench.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/bench.o: src/gfx.h src/img.h src/pic2img.h src/wadres.h src/spritdir.h
-dobj/0/bench.o: src/gfx.h src/img.h src/pic2img.h src/wadres.h src/spritdir.h
-obj/0/bench.o: src/lumpdir.h
-dobj/0/bench.o: src/lumpdir.h
-obj/0/bitvec.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/bitvec.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/bitvec.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/bitvec.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/cfgfile.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/cfgfile.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/cfgfile.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/cfgfile.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/cfgfile.o: src/input.h src/cfgfile.h src/gfx.h src/help1.h src/levels.h
-dobj/0/cfgfile.o: src/input.h src/cfgfile.h src/gfx.h src/help1.h src/levels.h
-obj/0/cfgfile.o: src/things.h src/macro.h src/trace.h
-dobj/0/cfgfile.o: src/things.h src/macro.h src/trace.h
-obj/0/checks.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/checks.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/checks.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/checks.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/checks.o: src/checks.h src/dialog.h src/gamesky.h src/wadname.h src/gfx.h
-dobj/0/checks.o: src/checks.h src/dialog.h src/gamesky.h src/wadname.h src/gfx.h
-obj/0/checks.o: src/gotoobj.h src/levels.h src/things.h src/oldmenus.h
-dobj/0/checks.o: src/gotoobj.h src/levels.h src/things.h src/oldmenus.h
-obj/0/checks.o: src/selectn.h
-dobj/0/checks.o: src/selectn.h
-obj/0/colour1.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/colour1.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/colour1.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/colour1.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/colour1.o: src/input.h src/rgb.h
-dobj/0/colour1.o: src/input.h src/rgb.h
-obj/0/colour2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/colour2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/colour2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/colour2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/colour2.o: src/input.h
-dobj/0/colour2.o: src/input.h
-obj/0/colour3.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/colour3.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/colour3.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/colour3.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/colour3.o: src/input.h src/rgb.h
-dobj/0/colour3.o: src/input.h src/rgb.h
-obj/0/colour4.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/colour4.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/colour4.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/colour4.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/colour4.o: src/input.h src/colour.h src/gfx.h src/rgb.h src/x11.h
-dobj/0/colour4.o: src/input.h src/colour.h src/gfx.h src/rgb.h src/x11.h
+obj/0/bench.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/bench.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/bench.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/bench.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/bench.o: src/input.h src/gfx.h src/img.h src/pic2img.h src/wadres.h
+dobj/0/bench.o: src/input.h src/gfx.h src/img.h src/pic2img.h src/wadres.h
+obj/0/bench.o: src/spritdir.h src/lumpdir.h
+dobj/0/bench.o: src/spritdir.h src/lumpdir.h
+obj/0/bitvec.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/bitvec.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/bitvec.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/bitvec.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/bitvec.o: src/wstructs.h src/input.h
+dobj/0/bitvec.o: src/wstructs.h src/input.h
+obj/0/cfgfile.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/cfgfile.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/cfgfile.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/cfgfile.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/cfgfile.o: src/wstructs.h src/input.h src/cfgfile.h src/gfx.h src/help1.h
+dobj/0/cfgfile.o: src/wstructs.h src/input.h src/cfgfile.h src/gfx.h src/help1.h
+obj/0/cfgfile.o: src/levels.h src/things.h src/locate.h src/trace.h
+dobj/0/cfgfile.o: src/levels.h src/things.h src/locate.h src/trace.h
+obj/0/checks.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/checks.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/checks.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/checks.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/checks.o: src/wstructs.h src/input.h src/checks.h src/dialog.h
+dobj/0/checks.o: src/wstructs.h src/input.h src/checks.h src/dialog.h
+obj/0/checks.o: src/gamesky.h src/wadname.h src/gfx.h src/gotoobj.h
+dobj/0/checks.o: src/gamesky.h src/wadname.h src/gfx.h src/gotoobj.h
+obj/0/checks.o: src/levels.h src/things.h src/objects.h src/objid.h
+dobj/0/checks.o: src/levels.h src/things.h src/objects.h src/objid.h
+obj/0/checks.o: src/oldmenus.h src/selectn.h
+dobj/0/checks.o: src/oldmenus.h src/selectn.h
+obj/0/colour1.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/colour1.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/colour1.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/colour1.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/colour1.o: src/wstructs.h src/input.h src/rgb.h
+dobj/0/colour1.o: src/wstructs.h src/input.h src/rgb.h
+obj/0/colour2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/colour2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/colour2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/colour2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/colour2.o: src/wstructs.h src/input.h
+dobj/0/colour2.o: src/wstructs.h src/input.h
+obj/0/colour3.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/colour3.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/colour3.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/colour3.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/colour3.o: src/wstructs.h src/input.h src/rgb.h
+dobj/0/colour3.o: src/wstructs.h src/input.h src/rgb.h
+obj/0/colour4.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/colour4.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/colour4.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/colour4.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/colour4.o: src/wstructs.h src/input.h src/colour.h src/gfx.h src/rgb.h
+dobj/0/colour4.o: src/wstructs.h src/input.h src/colour.h src/gfx.h src/rgb.h
+obj/0/colour4.o: src/x11.h
+dobj/0/colour4.o: src/x11.h
 obj/0/dependcy.o: src/dependcy.h src/serialnum.h
 dobj/0/dependcy.o: src/dependcy.h src/serialnum.h
-obj/0/dialog.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/dialog.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/dialog.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/dialog.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/dialog.o: src/dialog.h src/gfx.h
-dobj/0/dialog.o: src/dialog.h src/gfx.h
-obj/0/disppic.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/disppic.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/disppic.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/disppic.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/disppic.o: src/input.h src/gfx.h src/imgspect.h src/lists.h
-dobj/0/disppic.o: src/input.h src/gfx.h src/imgspect.h src/lists.h
-obj/0/disppic.o: src/patchdir.h src/pic2img.h src/img.h src/sticker.h
-dobj/0/disppic.o: src/patchdir.h src/pic2img.h src/img.h src/sticker.h
-obj/0/disppic.o: src/wadres.h src/spritdir.h src/lumpdir.h
-dobj/0/disppic.o: src/wadres.h src/spritdir.h src/lumpdir.h
-obj/0/drawmap.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/drawmap.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/drawmap.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/drawmap.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/drawmap.o: src/input.h src/_edit.h src/disppic.h src/lists.h
-dobj/0/drawmap.o: src/input.h src/_edit.h src/disppic.h src/lists.h
-obj/0/drawmap.o: src/drawmap.h src/game.h src/rgb.h src/gfx.h src/imgscale.h
-dobj/0/drawmap.o: src/drawmap.h src/game.h src/rgb.h src/gfx.h src/imgscale.h
-obj/0/drawmap.o: src/imgspect.h src/levels.h src/things.h src/pic2img.h
-dobj/0/drawmap.o: src/imgspect.h src/levels.h src/things.h src/pic2img.h
-obj/0/drawmap.o: src/img.h src/s_centre.h src/sticker.h src/vectext.h
-dobj/0/drawmap.o: src/img.h src/s_centre.h src/sticker.h src/vectext.h
-obj/0/drawmap.o: src/wadres.h src/spritdir.h src/lumpdir.h
-dobj/0/drawmap.o: src/wadres.h src/spritdir.h src/lumpdir.h
-obj/0/edisplay.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/edisplay.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/edisplay.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/edisplay.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/edisplay.o: src/input.h src/_edit.h src/drawmap.h src/edisplay.h
-dobj/0/edisplay.o: src/input.h src/_edit.h src/drawmap.h src/edisplay.h
-obj/0/edisplay.o: src/editobj.h src/gfx.h src/highlt.h src/edwidget.h
-dobj/0/edisplay.o: src/editobj.h src/gfx.h src/highlt.h src/edwidget.h
-obj/0/edisplay.o: src/infobar.h src/levels.h src/things.h src/menu.h
-dobj/0/edisplay.o: src/infobar.h src/levels.h src/things.h src/menu.h
-obj/0/edisplay.o: src/menubar.h src/modpopup.h src/objinfo.h src/selbox.h
-dobj/0/edisplay.o: src/menubar.h src/modpopup.h src/objinfo.h src/selbox.h
-obj/0/edisplay.o: src/spot.h
-dobj/0/edisplay.o: src/spot.h
-obj/0/editgrid.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/editgrid.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/editgrid.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/editgrid.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/editgrid.o: src/input.h src/_edit.h src/editgrid.h
-dobj/0/editgrid.o: src/input.h src/_edit.h src/editgrid.h
-obj/0/editlev.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/editlev.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/editlev.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/editlev.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/editlev.o: src/input.h src/editlev.h src/editloop.h src/events.h
-dobj/0/editlev.o: src/input.h src/editlev.h src/editloop.h src/events.h
-obj/0/editlev.o: src/game.h src/rgb.h src/gfx.h src/levels.h src/things.h
-dobj/0/editlev.o: src/game.h src/rgb.h src/gfx.h src/levels.h src/things.h
-obj/0/editlev.o: src/patchdir.h
-dobj/0/editlev.o: src/patchdir.h
-obj/0/editloop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/editloop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/editloop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/editloop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/editloop.o: src/input.h src/_edit.h src/checks.h src/dialog.h
-dobj/0/editloop.o: src/input.h src/_edit.h src/checks.h src/dialog.h
-obj/0/editloop.o: src/drawmap.h src/edisplay.h src/editgrid.h src/editloop.h
-dobj/0/editloop.o: src/drawmap.h src/edisplay.h src/editgrid.h src/editloop.h
-obj/0/editloop.o: src/editobj.h src/editsave.h src/editzoom.h src/entry.h
-dobj/0/editloop.o: src/editobj.h src/editsave.h src/editzoom.h src/entry.h
-obj/0/editloop.o: src/entry2.h src/events.h src/gfx.h src/gfx2.h src/gfx3.h
-dobj/0/editloop.o: src/entry2.h src/events.h src/gfx.h src/gfx2.h src/gfx3.h
-obj/0/editloop.o: src/rgbbmp.h src/gotoobj.h src/help2.h src/l_flags.h
-dobj/0/editloop.o: src/rgbbmp.h src/gotoobj.h src/help2.h src/l_flags.h
-obj/0/editloop.o: src/levels.h src/things.h src/lists.h src/menubar.h
-dobj/0/editloop.o: src/levels.h src/things.h src/lists.h src/menubar.h
-obj/0/editloop.o: src/edwidget.h src/menu.h src/modpopup.h src/palview.h
-dobj/0/editloop.o: src/edwidget.h src/menu.h src/modpopup.h src/palview.h
-obj/0/editloop.o: src/prefer.h src/selbox.h src/selectn.h src/selpath.h
-dobj/0/editloop.o: src/prefer.h src/selbox.h src/selectn.h src/selpath.h
+obj/0/dialog.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/dialog.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/dialog.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/dialog.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/dialog.o: src/wstructs.h src/input.h src/dialog.h src/gfx.h
+dobj/0/dialog.o: src/wstructs.h src/input.h src/dialog.h src/gfx.h
+obj/0/disppic.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/disppic.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/disppic.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/disppic.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/disppic.o: src/wstructs.h src/input.h src/gfx.h src/imgspect.h
+dobj/0/disppic.o: src/wstructs.h src/input.h src/gfx.h src/imgspect.h
+obj/0/disppic.o: src/lists.h src/img.h src/patchdir.h src/pic2img.h
+dobj/0/disppic.o: src/lists.h src/img.h src/patchdir.h src/pic2img.h
+obj/0/disppic.o: src/sticker.h src/wadres.h src/spritdir.h src/lumpdir.h
+dobj/0/disppic.o: src/sticker.h src/wadres.h src/spritdir.h src/lumpdir.h
+obj/0/drawmap.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/drawmap.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/drawmap.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/drawmap.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/drawmap.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+dobj/0/drawmap.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+obj/0/drawmap.o: src/disppic.h src/lists.h src/img.h src/drawmap.h src/game.h
+dobj/0/drawmap.o: src/disppic.h src/lists.h src/img.h src/drawmap.h src/game.h
+obj/0/drawmap.o: src/rgb.h src/gfx.h src/imgscale.h src/imgspect.h src/levels.h
+dobj/0/drawmap.o: src/rgb.h src/gfx.h src/imgscale.h src/imgspect.h src/levels.h
+obj/0/drawmap.o: src/things.h src/pic2img.h src/s_centre.h src/sticker.h
+dobj/0/drawmap.o: src/things.h src/pic2img.h src/s_centre.h src/sticker.h
+obj/0/drawmap.o: src/vectext.h src/wadres.h src/spritdir.h src/lumpdir.h
+dobj/0/drawmap.o: src/vectext.h src/wadres.h src/spritdir.h src/lumpdir.h
+obj/0/edisplay.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/edisplay.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/edisplay.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/edisplay.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/edisplay.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+dobj/0/edisplay.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+obj/0/edisplay.o: src/drawmap.h src/edisplay.h src/editobj.h src/gfx.h
+dobj/0/edisplay.o: src/drawmap.h src/edisplay.h src/editobj.h src/gfx.h
+obj/0/edisplay.o: src/highlt.h src/edwidget.h src/infobar.h src/levels.h
+dobj/0/edisplay.o: src/highlt.h src/edwidget.h src/infobar.h src/levels.h
+obj/0/edisplay.o: src/things.h src/menu.h src/menubar.h src/modpopup.h
+dobj/0/edisplay.o: src/things.h src/menu.h src/menubar.h src/modpopup.h
+obj/0/edisplay.o: src/objects.h src/objinfo.h src/selbox.h src/spot.h
+dobj/0/edisplay.o: src/objects.h src/objinfo.h src/selbox.h src/spot.h
+obj/0/edisplay.o: src/wadfile.h
+dobj/0/edisplay.o: src/wadfile.h
+obj/0/editgrid.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/editgrid.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/editgrid.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/editgrid.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/editgrid.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+dobj/0/editgrid.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+obj/0/editgrid.o: src/editgrid.h
+dobj/0/editgrid.o: src/editgrid.h
+obj/0/editlev.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/editlev.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/editlev.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/editlev.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/editlev.o: src/wstructs.h src/input.h src/editlev.h src/editloop.h
+dobj/0/editlev.o: src/wstructs.h src/input.h src/editlev.h src/editloop.h
+obj/0/editlev.o: src/events.h src/game.h src/rgb.h src/gfx.h src/levels.h
+dobj/0/editlev.o: src/events.h src/game.h src/rgb.h src/gfx.h src/levels.h
+obj/0/editlev.o: src/things.h src/patchdir.h src/wadfile.h
+dobj/0/editlev.o: src/things.h src/patchdir.h src/wadfile.h
+obj/0/editloop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/editloop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/editloop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/editloop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/editloop.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+dobj/0/editloop.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+obj/0/editloop.o: src/checks.h src/dialog.h src/drawmap.h src/edisplay.h
+dobj/0/editloop.o: src/checks.h src/dialog.h src/drawmap.h src/edisplay.h
+obj/0/editloop.o: src/editgrid.h src/editloop.h src/editobj.h src/editsave.h
+dobj/0/editloop.o: src/editgrid.h src/editloop.h src/editobj.h src/editsave.h
+obj/0/editloop.o: src/editzoom.h src/entry.h src/entry2.h src/events.h
+dobj/0/editloop.o: src/editzoom.h src/entry.h src/entry2.h src/events.h
+obj/0/editloop.o: src/gfx.h src/gfx2.h src/gfx3.h src/rgbbmp.h src/gotoobj.h
+dobj/0/editloop.o: src/gfx.h src/gfx2.h src/gfx3.h src/rgbbmp.h src/gotoobj.h
+obj/0/editloop.o: src/help2.h src/l_flags.h src/levels.h src/things.h
+dobj/0/editloop.o: src/help2.h src/l_flags.h src/levels.h src/things.h
+obj/0/editloop.o: src/lists.h src/img.h src/menubar.h src/edwidget.h src/menu.h
+dobj/0/editloop.o: src/lists.h src/img.h src/menubar.h src/edwidget.h src/menu.h
+obj/0/editloop.o: src/modpopup.h src/objects.h src/palview.h src/prefer.h
+dobj/0/editloop.o: src/modpopup.h src/objects.h src/palview.h src/prefer.h
+obj/0/editloop.o: src/s_slice.h src/selbox.h src/selectn.h src/selpath.h
+dobj/0/editloop.o: src/s_slice.h src/selbox.h src/selectn.h src/selpath.h
 obj/0/editloop.o: src/spot.h src/t_flags.h src/t_spin.h src/x_centre.h
 dobj/0/editloop.o: src/spot.h src/t_flags.h src/t_spin.h src/x_centre.h
-obj/0/editloop.o: src/x_exchng.h src/xref.h
-dobj/0/editloop.o: src/x_exchng.h src/xref.h
-obj/0/editobj.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/editobj.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/editobj.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/editobj.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/editobj.o: src/input.h src/_edit.h src/dialog.h src/editobj.h src/entry.h
-dobj/0/editobj.o: src/input.h src/_edit.h src/dialog.h src/editobj.h src/entry.h
-obj/0/editobj.o: src/flats.h src/lists.h src/game.h src/rgb.h src/gfx.h
-dobj/0/editobj.o: src/flats.h src/lists.h src/game.h src/rgb.h src/gfx.h
-obj/0/editobj.o: src/levels.h src/things.h src/oldmenus.h src/s_swapf.h
-dobj/0/editobj.o: src/levels.h src/things.h src/oldmenus.h src/s_swapf.h
-obj/0/editobj.o: src/selectn.h src/t_spin.h src/x_mirror.h src/x_rotate.h
-dobj/0/editobj.o: src/selectn.h src/t_spin.h src/x_mirror.h src/x_rotate.h
-obj/0/editsave.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/editsave.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/editsave.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/editsave.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/editsave.o: src/input.h src/editsave.h src/entry.h src/game.h src/rgb.h
-dobj/0/editsave.o: src/input.h src/editsave.h src/entry.h src/game.h src/rgb.h
-obj/0/editsave.o: src/levels.h src/things.h
-dobj/0/editsave.o: src/levels.h src/things.h
-obj/0/endian.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/endian.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/endian.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/endian.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/endian.o: src/endian.h
-dobj/0/endian.o: src/endian.h
-obj/0/editzoom.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/editzoom.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/editzoom.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/editzoom.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/editzoom.o: src/input.h src/_edit.h src/editzoom.h src/events.h src/gfx.h
-dobj/0/editzoom.o: src/input.h src/_edit.h src/editzoom.h src/events.h src/gfx.h
-obj/0/entry.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/entry.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/entry.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/entry.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/entry.o: src/entry.h src/gfx.h
-dobj/0/entry.o: src/entry.h src/gfx.h
-obj/0/entry2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/entry2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/entry2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/entry2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/entry2.o: src/entry2.h src/gfx.h
-dobj/0/entry2.o: src/entry2.h src/gfx.h
-obj/0/events.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/events.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/events.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/events.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/events.o: src/events.h
-dobj/0/events.o: src/events.h
-obj/0/flats.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/flats.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/flats.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/flats.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/flats.o: src/flats.h src/lists.h src/gfx.h src/img.h src/levels.h
-dobj/0/flats.o: src/flats.h src/lists.h src/gfx.h src/img.h src/levels.h
-obj/0/flats.o: src/things.h src/sticker.h src/wads.h
-dobj/0/flats.o: src/things.h src/sticker.h src/wads.h
-obj/0/game.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/game.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/game.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/game.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/game.o: src/acolours.h src/colour.h src/game.h src/rgb.h src/gamesky.h
-dobj/0/game.o: src/acolours.h src/colour.h src/game.h src/rgb.h src/gamesky.h
-obj/0/game.o: src/wadname.h src/macro.h src/things.h src/trace.h
-dobj/0/game.o: src/wadname.h src/macro.h src/things.h src/trace.h
-obj/0/gcolour1.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/gcolour1.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/gcolour1.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/gcolour1.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/gcolour1.o: src/input.h src/gcolour1.h src/colour.h src/gcolour2.h
-dobj/0/gcolour1.o: src/input.h src/gcolour1.h src/colour.h src/gcolour2.h
-obj/0/gcolour1.o: src/gfx.h src/rgb.h src/wads.h
-dobj/0/gcolour1.o: src/gfx.h src/rgb.h src/wads.h
-obj/0/gcolour2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/gcolour2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/gcolour2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/gcolour2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/gcolour2.o: src/input.h src/colour.h src/gcolour2.h
-dobj/0/gcolour2.o: src/input.h src/colour.h src/gcolour2.h
-obj/0/gcolour3.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/gcolour3.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/gcolour3.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/gcolour3.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/gcolour3.o: src/input.h src/colour.h src/gcolour3.h
-dobj/0/gcolour3.o: src/input.h src/colour.h src/gcolour3.h
-obj/0/geom.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/geom.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/geom.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/geom.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/gfx.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/gfx.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
+obj/0/editloop.o: src/x_exchng.h src/x_hover.h src/xref.h
+dobj/0/editloop.o: src/x_exchng.h src/x_hover.h src/xref.h
+obj/0/editobj.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/editobj.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/editobj.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/editobj.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/editobj.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+dobj/0/editobj.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+obj/0/editobj.o: src/dialog.h src/editobj.h src/entry.h src/flats.h src/lists.h
+dobj/0/editobj.o: src/dialog.h src/editobj.h src/entry.h src/flats.h src/lists.h
+obj/0/editobj.o: src/img.h src/game.h src/rgb.h src/gfx.h src/levels.h
+dobj/0/editobj.o: src/img.h src/game.h src/rgb.h src/gfx.h src/levels.h
+obj/0/editobj.o: src/things.h src/objects.h src/oldmenus.h src/s_slice.h
+dobj/0/editobj.o: src/things.h src/objects.h src/oldmenus.h src/s_slice.h
+obj/0/editobj.o: src/s_swapf.h src/selectn.h src/t_spin.h src/x_mirror.h
+dobj/0/editobj.o: src/s_swapf.h src/selectn.h src/t_spin.h src/x_mirror.h
+obj/0/editobj.o: src/x_rotate.h
+dobj/0/editobj.o: src/x_rotate.h
+obj/0/editsave.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/editsave.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/editsave.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/editsave.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/editsave.o: src/wstructs.h src/input.h src/dialog.h src/editsave.h
+dobj/0/editsave.o: src/wstructs.h src/input.h src/dialog.h src/editsave.h
+obj/0/editsave.o: src/entry.h src/game.h src/rgb.h src/levels.h src/things.h
+dobj/0/editsave.o: src/entry.h src/game.h src/rgb.h src/levels.h src/things.h
+obj/0/editsave.o: src/wadfile.h src/wadlist.h
+dobj/0/editsave.o: src/wadfile.h src/wadlist.h
+obj/0/endian.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/endian.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/endian.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/endian.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/endian.o: src/wstructs.h src/input.h src/endian.h
+dobj/0/endian.o: src/wstructs.h src/input.h src/endian.h
+obj/0/editzoom.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/editzoom.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/editzoom.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/editzoom.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/editzoom.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+dobj/0/editzoom.o: src/wstructs.h src/input.h src/_edit.h src/objid.h
+obj/0/editzoom.o: src/editzoom.h src/events.h src/gfx.h
+dobj/0/editzoom.o: src/editzoom.h src/events.h src/gfx.h
+obj/0/entry.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/entry.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/entry.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/entry.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/entry.o: src/input.h src/entry.h src/gfx.h
+dobj/0/entry.o: src/input.h src/entry.h src/gfx.h
+obj/0/entry2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/entry2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/entry2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/entry2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/entry2.o: src/wstructs.h src/input.h src/entry2.h src/gfx.h
+dobj/0/entry2.o: src/wstructs.h src/input.h src/entry2.h src/gfx.h
+obj/0/events.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/events.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/events.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/events.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/events.o: src/wstructs.h src/input.h src/events.h
+dobj/0/events.o: src/wstructs.h src/input.h src/events.h
+obj/0/flats.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/flats.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/flats.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/flats.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/flats.o: src/input.h src/flats.h src/lists.h src/img.h src/gfx.h
+dobj/0/flats.o: src/input.h src/flats.h src/lists.h src/img.h src/gfx.h
+obj/0/flats.o: src/levels.h src/things.h src/sticker.h src/wadfile.h src/wads.h
+dobj/0/flats.o: src/levels.h src/things.h src/sticker.h src/wadfile.h src/wads.h
+obj/0/game.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/game.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/game.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/game.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/game.o: src/input.h src/acolours.h src/colour.h src/game.h src/rgb.h
+dobj/0/game.o: src/input.h src/acolours.h src/colour.h src/game.h src/rgb.h
+obj/0/game.o: src/gamesky.h src/wadname.h src/locate.h src/things.h src/trace.h
+dobj/0/game.o: src/gamesky.h src/wadname.h src/locate.h src/things.h src/trace.h
+obj/0/gcolour1.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/gcolour1.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/gcolour1.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/gcolour1.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/gcolour1.o: src/wstructs.h src/input.h src/gcolour1.h src/colour.h
+dobj/0/gcolour1.o: src/wstructs.h src/input.h src/gcolour1.h src/colour.h
+obj/0/gcolour1.o: src/gcolour2.h src/gfx.h src/img.h src/rgb.h src/wadfile.h
+dobj/0/gcolour1.o: src/gcolour2.h src/gfx.h src/img.h src/rgb.h src/wadfile.h
+obj/0/gcolour1.o: src/wads.h
+dobj/0/gcolour1.o: src/wads.h
+obj/0/gcolour2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/gcolour2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/gcolour2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/gcolour2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/gcolour2.o: src/wstructs.h src/input.h src/colour.h src/gcolour2.h
+dobj/0/gcolour2.o: src/wstructs.h src/input.h src/colour.h src/gcolour2.h
+obj/0/gcolour3.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/gcolour3.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/gcolour3.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/gcolour3.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/gcolour3.o: src/wstructs.h src/input.h src/colour.h src/gcolour3.h
+dobj/0/gcolour3.o: src/wstructs.h src/input.h src/colour.h src/gcolour3.h
+obj/0/geom.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/geom.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/geom.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/geom.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/geom.o: src/input.h
+dobj/0/geom.o: src/input.h
+obj/0/gfx.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
+dobj/0/gfx.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
 obj/0/gfx.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 dobj/0/gfx.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 obj/0/gfx.o: src/acolours.h src/colour.h src/gcolour1.h src/gcolour2.h
 dobj/0/gfx.o: src/acolours.h src/colour.h src/gcolour1.h src/gcolour2.h
 obj/0/gfx.o: src/gcolour3.h src/gfx.h src/levels.h src/things.h src/x11.h
 dobj/0/gfx.o: src/gcolour3.h src/gfx.h src/levels.h src/things.h src/x11.h
-obj/0/gfx2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/gfx2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/gfx2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/gfx2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/gfx2.o: src/colour.h src/gcolour2.h src/gfx.h src/rgb.h
-dobj/0/gfx2.o: src/colour.h src/gcolour2.h src/gfx.h src/rgb.h
-obj/0/gfx3.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/gfx3.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/gfx3.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/gfx3.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/gfx3.o: src/colour.h src/gfx.h src/gfx3.h src/rgbbmp.h
-dobj/0/gfx3.o: src/colour.h src/gfx.h src/gfx3.h src/rgbbmp.h
-obj/0/gotoobj.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/gotoobj.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/gotoobj.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/gotoobj.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/gotoobj.o: src/input.h src/gfx.h src/gotoobj.h src/levels.h src/things.h
-dobj/0/gotoobj.o: src/input.h src/gfx.h src/gotoobj.h src/levels.h src/things.h
-obj/0/help1.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/help1.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/help1.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/help1.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/help1.o: src/cfgfile.h src/help1.h
-dobj/0/help1.o: src/cfgfile.h src/help1.h
-obj/0/help2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/help2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/help2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/help2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/help2.o: src/gfx.h src/help1.h src/help2.h
-dobj/0/help2.o: src/gfx.h src/help1.h src/help2.h
-obj/0/highlt.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/highlt.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/highlt.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/highlt.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/highlt.o: src/highlt.h src/edwidget.h
-dobj/0/highlt.o: src/highlt.h src/edwidget.h
-obj/0/img.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/img.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
+obj/0/gfx2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/gfx2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/gfx2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/gfx2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/gfx2.o: src/input.h src/colour.h src/gcolour2.h src/gfx.h src/rgb.h
+dobj/0/gfx2.o: src/input.h src/colour.h src/gcolour2.h src/gfx.h src/rgb.h
+obj/0/gfx3.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/gfx3.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/gfx3.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/gfx3.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/gfx3.o: src/input.h src/colour.h src/gfx.h src/gfx3.h src/rgbbmp.h
+dobj/0/gfx3.o: src/input.h src/colour.h src/gfx.h src/gfx3.h src/rgbbmp.h
+obj/0/gotoobj.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/gotoobj.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/gotoobj.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/gotoobj.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/gotoobj.o: src/wstructs.h src/input.h src/gfx.h src/gotoobj.h
+dobj/0/gotoobj.o: src/wstructs.h src/input.h src/gfx.h src/gotoobj.h
+obj/0/gotoobj.o: src/levels.h src/things.h src/objects.h src/objid.h
+dobj/0/gotoobj.o: src/levels.h src/things.h src/objects.h src/objid.h
+obj/0/gotoobj.o: src/x_hover.h
+dobj/0/gotoobj.o: src/x_hover.h
+obj/0/help1.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/help1.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/help1.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/help1.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/help1.o: src/input.h src/cfgfile.h src/help1.h
+dobj/0/help1.o: src/input.h src/cfgfile.h src/help1.h
+obj/0/help2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/help2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/help2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/help2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/help2.o: src/input.h src/credits.h src/gfx.h src/help1.h src/help2.h
+dobj/0/help2.o: src/input.h src/credits.h src/gfx.h src/help1.h src/help2.h
+obj/0/highlt.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/highlt.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/highlt.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/highlt.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/highlt.o: src/wstructs.h src/input.h src/highlt.h src/edwidget.h
+dobj/0/highlt.o: src/wstructs.h src/input.h src/highlt.h src/edwidget.h
+obj/0/highlt.o: src/objid.h src/objects.h
+dobj/0/highlt.o: src/objid.h src/objects.h
+obj/0/img.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
+dobj/0/img.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
 obj/0/img.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 dobj/0/img.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/img.o: src/gcolour2.h src/colour.h src/img.h
-dobj/0/img.o: src/gcolour2.h src/colour.h src/img.h
-obj/0/imgscale.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/imgscale.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/imgscale.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/imgscale.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/imgscale.o: src/input.h src/img.h
-dobj/0/imgscale.o: src/input.h src/img.h
-obj/0/imgspect.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/imgspect.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/imgspect.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/imgspect.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/imgspect.o: src/input.h src/img.h src/imgspect.h
-dobj/0/imgspect.o: src/input.h src/img.h src/imgspect.h
-obj/0/infobar.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/infobar.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/infobar.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/infobar.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/infobar.o: src/input.h src/gfx.h src/infobar.h src/edwidget.h
-dobj/0/infobar.o: src/input.h src/gfx.h src/infobar.h src/edwidget.h
-obj/0/input.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/input.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/input.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/input.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/input.o: src/gfx.h
-dobj/0/input.o: src/gfx.h
-obj/0/l_align.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/l_align.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/l_align.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/l_align.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/l_align.o: src/input.h src/dialog.h src/entry.h src/gfx.h src/levels.h
-dobj/0/l_align.o: src/input.h src/dialog.h src/entry.h src/gfx.h src/levels.h
-obj/0/l_align.o: src/things.h src/oldmenus.h src/selectn.h src/textures.h
-dobj/0/l_align.o: src/things.h src/oldmenus.h src/selectn.h src/textures.h
-obj/0/l_align.o: src/lists.h
-dobj/0/l_align.o: src/lists.h
-obj/0/l_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/l_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/l_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/l_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/l_centre.o: src/input.h src/l_centre.h src/l_vertices.h src/selectn.h
-dobj/0/l_centre.o: src/input.h src/l_centre.h src/l_vertices.h src/selectn.h
-obj/0/l_centre.o: src/levels.h src/things.h
-dobj/0/l_centre.o: src/levels.h src/things.h
-obj/0/l_flags.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/l_flags.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/l_flags.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/l_flags.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/l_flags.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/l_flags.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/l_misc.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/l_misc.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/l_misc.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/l_misc.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/l_misc.o: src/levels.h src/things.h src/selectn.h
-dobj/0/l_misc.o: src/levels.h src/things.h src/selectn.h
-obj/0/l_prop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/l_prop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/l_prop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/l_prop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/l_prop.o: src/entry.h src/gfx.h src/levels.h src/things.h src/oldmenus.h
-dobj/0/l_prop.o: src/entry.h src/gfx.h src/levels.h src/things.h src/oldmenus.h
-obj/0/l_prop.o: src/game.h src/rgb.h src/selectn.h src/textures.h src/lists.h
-dobj/0/l_prop.o: src/game.h src/rgb.h src/selectn.h src/textures.h src/lists.h
-obj/0/l_unlink.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/l_unlink.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/l_unlink.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/l_unlink.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/l_unlink.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/l_unlink.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/l_vertices.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/l_vertices.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/l_vertices.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/l_vertices.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/l_vertices.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-dobj/0/l_vertices.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-obj/0/l_vertices.o: src/things.h
-dobj/0/l_vertices.o: src/things.h
-obj/0/levels.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/levels.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/levels.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/levels.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/levels.o: src/dialog.h src/game.h src/rgb.h src/levels.h src/things.h
-dobj/0/levels.o: src/dialog.h src/game.h src/rgb.h src/levels.h src/things.h
-obj/0/levels.o: src/wads.h src/wads2.h
-dobj/0/levels.o: src/wads.h src/wads2.h
-obj/0/lists.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/lists.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/lists.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/lists.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/lists.o: src/gfx.h src/lists.h
-dobj/0/lists.o: src/gfx.h src/lists.h
-obj/0/lumpdir.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/lumpdir.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/lumpdir.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/lumpdir.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/lumpdir.o: src/input.h src/dependcy.h src/lumpdir.h src/wadname.h
-dobj/0/lumpdir.o: src/input.h src/dependcy.h src/lumpdir.h src/wadname.h
-obj/0/lumpdir.o: src/wadnamec.h src/wads.h
-dobj/0/lumpdir.o: src/wadnamec.h src/wads.h
-obj/0/macro.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/macro.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/macro.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/macro.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/macro.o: src/macro.h
-dobj/0/macro.o: src/macro.h
-obj/0/memory.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/memory.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/memory.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/memory.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/menubar.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/menubar.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/menubar.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/menubar.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/menubar.o: src/input.h src/gfx.h src/menubar.h src/edwidget.h src/menu.h
-dobj/0/menubar.o: src/input.h src/gfx.h src/menubar.h src/edwidget.h src/menu.h
-obj/0/menu.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/menu.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/menu.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/menu.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/menu.o: src/events.h src/gfx.h src/menu.h src/edwidget.h
-dobj/0/menu.o: src/events.h src/gfx.h src/menu.h src/edwidget.h
-obj/0/mkpalette.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/mkpalette.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/mkpalette.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/mkpalette.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/mkpalette.o: src/input.h src/mkpalette.h src/gfx.h src/rgb.h src/wads.h
-dobj/0/mkpalette.o: src/input.h src/mkpalette.h src/gfx.h src/rgb.h src/wads.h
-obj/0/mouse.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/mouse.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/mouse.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/mouse.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/names.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/names.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/names.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/names.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/names.o: src/game.h src/rgb.h
-dobj/0/names.o: src/game.h src/rgb.h
-obj/0/nop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/nop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
+obj/0/img.o: src/help1.h src/img.h src/wadfile.h src/wads.h
+dobj/0/img.o: src/help1.h src/img.h src/wadfile.h src/wads.h
+obj/0/imgscale.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/imgscale.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/imgscale.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/imgscale.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/imgscale.o: src/wstructs.h src/input.h src/img.h
+dobj/0/imgscale.o: src/wstructs.h src/input.h src/img.h
+obj/0/imgspect.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/imgspect.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/imgspect.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/imgspect.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/imgspect.o: src/wstructs.h src/input.h src/img.h src/imgspect.h
+dobj/0/imgspect.o: src/wstructs.h src/input.h src/img.h src/imgspect.h
+obj/0/infobar.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/infobar.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/infobar.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/infobar.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/infobar.o: src/wstructs.h src/input.h src/gfx.h src/infobar.h
+dobj/0/infobar.o: src/wstructs.h src/input.h src/gfx.h src/infobar.h
+obj/0/infobar.o: src/edwidget.h src/objid.h
+dobj/0/infobar.o: src/edwidget.h src/objid.h
+obj/0/input.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/input.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/input.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/input.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/input.o: src/input.h src/gfx.h
+dobj/0/input.o: src/input.h src/gfx.h
+obj/0/l_align.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/l_align.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/l_align.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/l_align.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/l_align.o: src/wstructs.h src/input.h src/dialog.h src/entry.h src/gfx.h
+dobj/0/l_align.o: src/wstructs.h src/input.h src/dialog.h src/entry.h src/gfx.h
+obj/0/l_align.o: src/levels.h src/things.h src/objid.h src/oldmenus.h
+dobj/0/l_align.o: src/levels.h src/things.h src/objid.h src/oldmenus.h
+obj/0/l_align.o: src/selectn.h src/textures.h src/lists.h src/img.h
+dobj/0/l_align.o: src/selectn.h src/textures.h src/lists.h src/img.h
+obj/0/l_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/l_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/l_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/l_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/l_centre.o: src/wstructs.h src/input.h src/l_centre.h src/l_vertices.h
+dobj/0/l_centre.o: src/wstructs.h src/input.h src/l_centre.h src/l_vertices.h
+obj/0/l_centre.o: src/selectn.h src/levels.h src/things.h
+dobj/0/l_centre.o: src/selectn.h src/levels.h src/things.h
+obj/0/l_flags.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/l_flags.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/l_flags.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/l_flags.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/l_flags.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/l_flags.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/l_flags.o: src/selectn.h
+dobj/0/l_flags.o: src/selectn.h
+obj/0/l_misc.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/l_misc.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/l_misc.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/l_misc.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/l_misc.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/l_misc.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/l_misc.o: src/objects.h src/objid.h src/selectn.h
+dobj/0/l_misc.o: src/objects.h src/objid.h src/selectn.h
+obj/0/l_prop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/l_prop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/l_prop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/l_prop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/l_prop.o: src/wstructs.h src/input.h src/entry.h src/gfx.h src/levels.h
+dobj/0/l_prop.o: src/wstructs.h src/input.h src/entry.h src/gfx.h src/levels.h
+obj/0/l_prop.o: src/things.h src/menudata.h src/objects.h src/objid.h
+dobj/0/l_prop.o: src/things.h src/menudata.h src/objects.h src/objid.h
+obj/0/l_prop.o: src/oldmenus.h src/game.h src/rgb.h src/selectn.h
+dobj/0/l_prop.o: src/oldmenus.h src/game.h src/rgb.h src/selectn.h
+obj/0/l_prop.o: src/textures.h src/lists.h src/img.h
+dobj/0/l_prop.o: src/textures.h src/lists.h src/img.h
+obj/0/l_unlink.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/l_unlink.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/l_unlink.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/l_unlink.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/l_unlink.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/l_unlink.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/l_unlink.o: src/objects.h src/objid.h src/selectn.h
+dobj/0/l_unlink.o: src/objects.h src/objid.h src/selectn.h
+obj/0/l_vertices.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/l_vertices.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/l_vertices.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/l_vertices.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/l_vertices.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+dobj/0/l_vertices.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+obj/0/l_vertices.o: src/levels.h src/things.h
+dobj/0/l_vertices.o: src/levels.h src/things.h
+obj/0/levels.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/levels.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/levels.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/levels.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/levels.o: src/wstructs.h src/input.h src/dialog.h src/game.h src/rgb.h
+dobj/0/levels.o: src/wstructs.h src/input.h src/dialog.h src/game.h src/rgb.h
+obj/0/levels.o: src/levels.h src/things.h src/objid.h src/wadfile.h src/wads.h
+dobj/0/levels.o: src/levels.h src/things.h src/objid.h src/wadfile.h src/wads.h
+obj/0/levels.o: src/wads2.h
+dobj/0/levels.o: src/wads2.h
+obj/0/lists.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/lists.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/lists.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/lists.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/lists.o: src/input.h src/gfx.h src/lists.h src/img.h src/wadfile.h
+dobj/0/lists.o: src/input.h src/gfx.h src/lists.h src/img.h src/wadfile.h
+obj/0/locate.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/locate.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/locate.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/locate.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/locate.o: src/wstructs.h src/input.h src/locate.h src/macro.h src/trace.h
+dobj/0/locate.o: src/wstructs.h src/input.h src/locate.h src/macro.h src/trace.h
+obj/0/lumpdir.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/lumpdir.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/lumpdir.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/lumpdir.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/lumpdir.o: src/wstructs.h src/input.h src/dependcy.h src/lumpdir.h
+dobj/0/lumpdir.o: src/wstructs.h src/input.h src/dependcy.h src/lumpdir.h
+obj/0/lumpdir.o: src/wadname.h src/wadnamec.h src/wadfile.h
+dobj/0/lumpdir.o: src/wadname.h src/wadnamec.h src/wadfile.h
+obj/0/macro.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/macro.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/macro.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/macro.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/macro.o: src/input.h src/macro.h
+dobj/0/macro.o: src/input.h src/macro.h
+obj/0/memory.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/memory.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/memory.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/memory.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/memory.o: src/wstructs.h src/input.h
+dobj/0/memory.o: src/wstructs.h src/input.h
+obj/0/menubar.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/menubar.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/menubar.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/menubar.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/menubar.o: src/wstructs.h src/input.h src/gfx.h src/menubar.h
+dobj/0/menubar.o: src/wstructs.h src/input.h src/gfx.h src/menubar.h
+obj/0/menubar.o: src/edwidget.h src/menu.h
+dobj/0/menubar.o: src/edwidget.h src/menu.h
+obj/0/menu.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/menu.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/menu.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/menu.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/menu.o: src/input.h src/events.h src/gfx.h src/menu.h src/edwidget.h
+dobj/0/menu.o: src/input.h src/events.h src/gfx.h src/menu.h src/edwidget.h
+obj/0/menu.o: src/menudata.h
+dobj/0/menu.o: src/menudata.h
+obj/0/mkpalette.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/mkpalette.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/mkpalette.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/mkpalette.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/mkpalette.o: src/wstructs.h src/input.h src/mkpalette.h src/gfx.h
+dobj/0/mkpalette.o: src/wstructs.h src/input.h src/mkpalette.h src/gfx.h
+obj/0/mkpalette.o: src/rgb.h src/wadfile.h src/wads.h
+dobj/0/mkpalette.o: src/rgb.h src/wadfile.h src/wads.h
+obj/0/mouse.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/mouse.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/mouse.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/mouse.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/mouse.o: src/input.h
+dobj/0/mouse.o: src/input.h
+obj/0/names.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/names.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/names.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/names.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/names.o: src/input.h src/game.h src/rgb.h src/objid.h
+dobj/0/names.o: src/input.h src/game.h src/rgb.h src/objid.h
+obj/0/nop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
+dobj/0/nop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
 obj/0/nop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 dobj/0/nop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/objects.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/objects.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/objects.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/objects.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/objects.o: src/input.h src/gfx.h src/l_vertices.h src/selectn.h
-dobj/0/objects.o: src/input.h src/gfx.h src/l_vertices.h src/selectn.h
-obj/0/objects.o: src/levels.h src/things.h src/s_vertices.h
-dobj/0/objects.o: src/levels.h src/things.h src/s_vertices.h
-obj/0/objinfo.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/objinfo.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/objinfo.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/objinfo.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/objinfo.o: src/input.h src/disppic.h src/lists.h src/flats.h src/game.h
-dobj/0/objinfo.o: src/input.h src/disppic.h src/lists.h src/flats.h src/game.h
-obj/0/objinfo.o: src/rgb.h src/gamesky.h src/wadname.h src/gfx.h src/img.h
-dobj/0/objinfo.o: src/rgb.h src/gamesky.h src/wadname.h src/gfx.h src/img.h
-obj/0/objinfo.o: src/imgspect.h src/levels.h src/things.h src/objinfo.h
-dobj/0/objinfo.o: src/imgspect.h src/levels.h src/things.h src/objinfo.h
-obj/0/objinfo.o: src/edwidget.h src/pic2img.h src/sticker.h src/wadres.h
-dobj/0/objinfo.o: src/edwidget.h src/pic2img.h src/sticker.h src/wadres.h
-obj/0/objinfo.o: src/spritdir.h src/lumpdir.h
-dobj/0/objinfo.o: src/spritdir.h src/lumpdir.h
-obj/0/oldmenus.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/oldmenus.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/oldmenus.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/oldmenus.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/oldmenus.o: src/input.h src/events.h src/gfx.h src/menu.h src/edwidget.h
-dobj/0/oldmenus.o: src/input.h src/events.h src/gfx.h src/menu.h src/edwidget.h
-obj/0/oldmenus.o: src/oldmenus.h
-dobj/0/oldmenus.o: src/oldmenus.h
-obj/0/palview.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/palview.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/palview.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/palview.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/palview.o: src/input.h src/colour.h src/gcolour2.h src/gfx.h
-dobj/0/palview.o: src/input.h src/colour.h src/gcolour2.h src/gfx.h
-obj/0/palview.o: src/palview.h src/rgb.h src/wads.h src/ytime.h
-dobj/0/palview.o: src/palview.h src/rgb.h src/wads.h src/ytime.h
-obj/0/patchdir.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/patchdir.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/patchdir.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/patchdir.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/patchdir.o: src/input.h src/patchdir.h src/wads.h
-dobj/0/patchdir.o: src/input.h src/patchdir.h src/wads.h
-obj/0/pic2img.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/pic2img.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/pic2img.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/pic2img.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/pic2img.o: src/input.h src/gcolour2.h src/colour.h src/pic2img.h
-dobj/0/pic2img.o: src/input.h src/gcolour2.h src/colour.h src/pic2img.h
-obj/0/pic2img.o: src/img.h src/wads.h
-dobj/0/pic2img.o: src/img.h src/wads.h
-obj/0/prefer.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/prefer.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/prefer.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/prefer.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/prefer.o: src/entry.h src/flats.h src/lists.h src/gfx.h src/levels.h
-dobj/0/prefer.o: src/entry.h src/flats.h src/lists.h src/gfx.h src/levels.h
-obj/0/prefer.o: src/things.h src/oldmenus.h src/prefer.h src/textures.h
-dobj/0/prefer.o: src/things.h src/oldmenus.h src/prefer.h src/textures.h
-obj/0/s_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/s_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/s_centre.o: src/input.h src/levels.h src/things.h src/s_centre.h
-dobj/0/s_centre.o: src/input.h src/levels.h src/things.h src/s_centre.h
-obj/0/s_centre.o: src/s_vertices.h src/selectn.h
-dobj/0/s_centre.o: src/s_vertices.h src/selectn.h
-obj/0/s_door.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_door.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_door.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/s_door.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/s_door.o: src/dialog.h src/levels.h src/things.h src/selectn.h
-dobj/0/s_door.o: src/dialog.h src/levels.h src/things.h src/selectn.h
-obj/0/s_lift.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_lift.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_lift.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/s_lift.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/s_lift.o: src/dialog.h src/levels.h src/things.h src/selectn.h
-dobj/0/s_lift.o: src/dialog.h src/levels.h src/things.h src/selectn.h
-obj/0/s_linedefs.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_linedefs.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_linedefs.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/s_linedefs.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/s_linedefs.o: src/input.h src/levels.h src/things.h src/s_linedefs.h
-dobj/0/s_linedefs.o: src/input.h src/levels.h src/things.h src/s_linedefs.h
-obj/0/s_linedefs.o: src/selectn.h
-dobj/0/s_linedefs.o: src/selectn.h
-obj/0/s_merge.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_merge.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_merge.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/s_merge.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/s_merge.o: src/input.h src/dialog.h src/levels.h src/things.h
-dobj/0/s_merge.o: src/input.h src/dialog.h src/levels.h src/things.h
-obj/0/s_merge.o: src/selectn.h
-dobj/0/s_merge.o: src/selectn.h
-obj/0/s_misc.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_misc.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_misc.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/s_misc.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/s_misc.o: src/entry.h src/gfx.h src/levels.h src/things.h src/selectn.h
-dobj/0/s_misc.o: src/entry.h src/gfx.h src/levels.h src/things.h src/selectn.h
-obj/0/s_prop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_prop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_prop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/s_prop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/s_prop.o: src/entry.h src/flats.h src/lists.h src/game.h src/rgb.h
-dobj/0/s_prop.o: src/entry.h src/flats.h src/lists.h src/game.h src/rgb.h
-obj/0/s_prop.o: src/gfx.h src/levels.h src/things.h src/oldmenus.h
-dobj/0/s_prop.o: src/gfx.h src/levels.h src/things.h src/oldmenus.h
+obj/0/objects.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/objects.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/objects.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/objects.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/objects.o: src/wstructs.h src/input.h src/drawmap.h src/_edit.h
+dobj/0/objects.o: src/wstructs.h src/input.h src/drawmap.h src/_edit.h
+obj/0/objects.o: src/objid.h src/gfx.h src/l_vertices.h src/selectn.h
+dobj/0/objects.o: src/objid.h src/gfx.h src/l_vertices.h src/selectn.h
+obj/0/objects.o: src/levels.h src/things.h src/objects.h src/s_vertices.h
+dobj/0/objects.o: src/levels.h src/things.h src/objects.h src/s_vertices.h
+obj/0/objinfo.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/objinfo.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/objinfo.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/objinfo.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/objinfo.o: src/wstructs.h src/input.h src/disppic.h src/lists.h src/img.h
+dobj/0/objinfo.o: src/wstructs.h src/input.h src/disppic.h src/lists.h src/img.h
+obj/0/objinfo.o: src/flats.h src/game.h src/rgb.h src/gamesky.h src/wadname.h
+dobj/0/objinfo.o: src/flats.h src/game.h src/rgb.h src/gamesky.h src/wadname.h
+obj/0/objinfo.o: src/gfx.h src/imgspect.h src/levels.h src/things.h src/objid.h
+dobj/0/objinfo.o: src/gfx.h src/imgspect.h src/levels.h src/things.h src/objid.h
+obj/0/objinfo.o: src/objinfo.h src/edwidget.h src/pic2img.h src/sticker.h
+dobj/0/objinfo.o: src/objinfo.h src/edwidget.h src/pic2img.h src/sticker.h
+obj/0/objinfo.o: src/wadres.h src/spritdir.h src/lumpdir.h
+dobj/0/objinfo.o: src/wadres.h src/spritdir.h src/lumpdir.h
+obj/0/oldmenus.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/oldmenus.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/oldmenus.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/oldmenus.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/oldmenus.o: src/wstructs.h src/input.h src/events.h src/gfx.h src/menu.h
+dobj/0/oldmenus.o: src/wstructs.h src/input.h src/events.h src/gfx.h src/menu.h
+obj/0/oldmenus.o: src/edwidget.h src/oldmenus.h
+dobj/0/oldmenus.o: src/edwidget.h src/oldmenus.h
+obj/0/palview.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/palview.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/palview.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/palview.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/palview.o: src/wstructs.h src/input.h src/colour.h src/gcolour2.h
+dobj/0/palview.o: src/wstructs.h src/input.h src/colour.h src/gcolour2.h
+obj/0/palview.o: src/gfx.h src/palview.h src/rgb.h src/wadfile.h src/wads.h
+dobj/0/palview.o: src/gfx.h src/palview.h src/rgb.h src/wadfile.h src/wads.h
+obj/0/palview.o: src/ytime.h
+dobj/0/palview.o: src/ytime.h
+obj/0/patchdir.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/patchdir.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/patchdir.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/patchdir.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/patchdir.o: src/wstructs.h src/input.h src/patchdir.h src/wadfile.h
+dobj/0/patchdir.o: src/wstructs.h src/input.h src/patchdir.h src/wadfile.h
+obj/0/patchdir.o: src/wads.h
+dobj/0/patchdir.o: src/wads.h
+obj/0/pic2img.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/pic2img.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/pic2img.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/pic2img.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/pic2img.o: src/wstructs.h src/input.h src/gcolour2.h src/colour.h
+dobj/0/pic2img.o: src/wstructs.h src/input.h src/gcolour2.h src/colour.h
+obj/0/pic2img.o: src/pic2img.h src/img.h src/wadfile.h src/wads.h
+dobj/0/pic2img.o: src/pic2img.h src/img.h src/wadfile.h src/wads.h
+obj/0/prefer.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/prefer.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/prefer.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/prefer.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/prefer.o: src/wstructs.h src/input.h src/entry.h src/flats.h src/lists.h
+dobj/0/prefer.o: src/wstructs.h src/input.h src/entry.h src/flats.h src/lists.h
+obj/0/prefer.o: src/img.h src/gfx.h src/levels.h src/things.h src/oldmenus.h
+dobj/0/prefer.o: src/img.h src/gfx.h src/levels.h src/things.h src/oldmenus.h
+obj/0/prefer.o: src/prefer.h src/textures.h
+dobj/0/prefer.o: src/prefer.h src/textures.h
+obj/0/s_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_centre.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/s_centre.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/s_centre.o: src/s_centre.h src/objid.h src/s_vertices.h src/selectn.h
+dobj/0/s_centre.o: src/s_centre.h src/objid.h src/s_vertices.h src/selectn.h
+obj/0/s_door.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_door.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_door.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_door.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_door.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+dobj/0/s_door.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+obj/0/s_door.o: src/things.h src/objid.h src/selectn.h
+dobj/0/s_door.o: src/things.h src/objid.h src/selectn.h
+obj/0/s_lift.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_lift.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_lift.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_lift.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_lift.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+dobj/0/s_lift.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+obj/0/s_lift.o: src/things.h src/objects.h src/objid.h src/selectn.h
+dobj/0/s_lift.o: src/things.h src/objects.h src/objid.h src/selectn.h
+obj/0/s_linedefs.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_linedefs.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_linedefs.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_linedefs.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_linedefs.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/s_linedefs.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/s_linedefs.o: src/objects.h src/objid.h src/s_linedefs.h src/selectn.h
+dobj/0/s_linedefs.o: src/objects.h src/objid.h src/s_linedefs.h src/selectn.h
+obj/0/s_merge.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_merge.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_merge.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_merge.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_merge.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+dobj/0/s_merge.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+obj/0/s_merge.o: src/things.h src/objects.h src/objid.h src/selectn.h
+dobj/0/s_merge.o: src/things.h src/objects.h src/objid.h src/selectn.h
+obj/0/s_misc.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_misc.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_misc.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_misc.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_misc.o: src/wstructs.h src/input.h src/entry.h src/gfx.h src/levels.h
+dobj/0/s_misc.o: src/wstructs.h src/input.h src/entry.h src/gfx.h src/levels.h
+obj/0/s_misc.o: src/things.h src/objid.h src/selectn.h
+dobj/0/s_misc.o: src/things.h src/objid.h src/selectn.h
+obj/0/s_prop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_prop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_prop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_prop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_prop.o: src/wstructs.h src/input.h src/entry.h src/flats.h src/lists.h
+dobj/0/s_prop.o: src/wstructs.h src/input.h src/entry.h src/flats.h src/lists.h
+obj/0/s_prop.o: src/img.h src/game.h src/rgb.h src/gfx.h src/levels.h
+dobj/0/s_prop.o: src/img.h src/game.h src/rgb.h src/gfx.h src/levels.h
+obj/0/s_prop.o: src/things.h src/menudata.h src/objid.h src/oldmenus.h
+dobj/0/s_prop.o: src/things.h src/menudata.h src/objid.h src/oldmenus.h
 obj/0/s_prop.o: src/selectn.h
 dobj/0/s_prop.o: src/selectn.h
-obj/0/s_split.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_split.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_split.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/s_split.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/s_split.o: src/input.h src/dialog.h src/levels.h src/things.h
-dobj/0/s_split.o: src/input.h src/dialog.h src/levels.h src/things.h
-obj/0/s_split.o: src/s_linedefs.h src/selectn.h
-dobj/0/s_split.o: src/s_linedefs.h src/selectn.h
-obj/0/s_swapf.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_swapf.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_swapf.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/s_swapf.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/s_swapf.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/s_swapf.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/s_vertices.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/s_vertices.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/s_vertices.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/s_vertices.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/s_vertices.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-dobj/0/s_vertices.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-obj/0/s_vertices.o: src/things.h src/s_linedefs.h src/s_vertices.h
-dobj/0/s_vertices.o: src/things.h src/s_linedefs.h src/s_vertices.h
-obj/0/sanity.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/sanity.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/sanity.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/sanity.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/sanity.o: src/sanity.h
-dobj/0/sanity.o: src/sanity.h
-obj/0/savepic.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/savepic.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/savepic.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/savepic.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/savepic.o: src/input.h
-dobj/0/savepic.o: src/input.h
-obj/0/scrnshot.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/scrnshot.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/scrnshot.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/scrnshot.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/scrnshot.o: src/input.h
-dobj/0/scrnshot.o: src/input.h
-obj/0/selbox.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/selbox.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/selbox.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/selbox.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/selbox.o: src/gfx.h src/selbox.h src/edwidget.h
-dobj/0/selbox.o: src/gfx.h src/selbox.h src/edwidget.h
-obj/0/selectn.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/selectn.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/selectn.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/selectn.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/selectn.o: src/input.h src/selectn.h
-dobj/0/selectn.o: src/input.h src/selectn.h
-obj/0/selpath.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/selpath.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/selpath.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/selpath.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/selpath.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/selpath.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/selrect.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/selrect.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/selrect.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/selrect.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/selrect.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/selrect.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/serialnum.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/serialnum.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/serialnum.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/serialnum.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/serialnum.o: src/input.h src/serialnum.h
-dobj/0/serialnum.o: src/input.h src/serialnum.h
-obj/0/spritdir.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/spritdir.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/spritdir.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/spritdir.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/spritdir.o: src/input.h src/dependcy.h src/lumpdir.h src/spritdir.h
-dobj/0/spritdir.o: src/input.h src/dependcy.h src/lumpdir.h src/spritdir.h
-obj/0/spritdir.o: src/wadname.h src/wadnamec.h
-dobj/0/spritdir.o: src/wadname.h src/wadnamec.h
-obj/0/sticker.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/sticker.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/sticker.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/sticker.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/sticker.o: src/input.h src/gcolour2.h src/colour.h src/gcolour3.h
-dobj/0/sticker.o: src/input.h src/gcolour2.h src/colour.h src/gcolour3.h
-obj/0/sticker.o: src/gfx.h src/img.h src/sticker.h
-dobj/0/sticker.o: src/gfx.h src/img.h src/sticker.h
-obj/0/swapmem.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/swapmem.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/swapmem.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/swapmem.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/swapmem.o: src/input.h src/levels.h src/things.h
-dobj/0/swapmem.o: src/input.h src/levels.h src/things.h
-obj/0/t_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/t_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/t_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/t_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/t_centre.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/t_centre.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/t_centre.o: src/t_centre.h
-dobj/0/t_centre.o: src/t_centre.h
-obj/0/t_flags.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/t_flags.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/t_flags.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/t_flags.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/t_flags.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/t_flags.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/t_prop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/t_prop.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/t_prop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/t_prop.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/t_prop.o: src/entry.h src/game.h src/rgb.h src/gfx.h src/levels.h
-dobj/0/t_prop.o: src/entry.h src/game.h src/rgb.h src/gfx.h src/levels.h
-obj/0/t_prop.o: src/things.h src/oldmenus.h src/selectn.h
-dobj/0/t_prop.o: src/things.h src/oldmenus.h src/selectn.h
-obj/0/t_spin.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/t_spin.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/t_spin.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/t_spin.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/t_spin.o: src/levels.h src/things.h src/selectn.h src/t_spin.h
-dobj/0/t_spin.o: src/levels.h src/things.h src/selectn.h src/t_spin.h
-obj/0/textures.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/textures.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/textures.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/textures.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/textures.o: src/input.h src/dialog.h src/game.h src/rgb.h src/gfx.h
-dobj/0/textures.o: src/input.h src/dialog.h src/game.h src/rgb.h src/gfx.h
-obj/0/textures.o: src/lists.h src/patchdir.h src/pic2img.h src/img.h
-dobj/0/textures.o: src/lists.h src/patchdir.h src/pic2img.h src/img.h
-obj/0/textures.o: src/sticker.h src/textures.h src/wads.h
-dobj/0/textures.o: src/sticker.h src/textures.h src/wads.h
-obj/0/things.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/things.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/things.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/things.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/things.o: src/game.h src/rgb.h src/things.h
-dobj/0/things.o: src/game.h src/rgb.h src/things.h
-obj/0/trace.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/trace.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/trace.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/trace.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/trace.o: src/trace.h
-dobj/0/trace.o: src/trace.h
-obj/0/v_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/v_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/v_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/v_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/v_centre.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/v_centre.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/v_centre.o: src/v_centre.h
-dobj/0/v_centre.o: src/v_centre.h
-obj/0/v_merge.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/v_merge.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/v_merge.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/v_merge.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/v_merge.o: src/input.h src/dialog.h src/levels.h src/things.h
-dobj/0/v_merge.o: src/input.h src/dialog.h src/levels.h src/things.h
-obj/0/v_merge.o: src/selectn.h
-dobj/0/v_merge.o: src/selectn.h
-obj/0/v_polyg.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/v_polyg.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/v_polyg.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/v_polyg.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/v_polyg.o: src/input.h
-dobj/0/v_polyg.o: src/input.h
-obj/0/vectext.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/vectext.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/vectext.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/vectext.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/vectext.o: src/input.h src/gfx.h src/vectext.h
-dobj/0/vectext.o: src/input.h src/gfx.h src/vectext.h
-obj/0/verbmsg.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/verbmsg.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/verbmsg.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/verbmsg.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/verbmsg.o: src/input.h
-dobj/0/verbmsg.o: src/input.h
-obj/0/wadnamec.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/wadnamec.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/wadnamec.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/wadnamec.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/wadnamec.o: src/input.h src/wadnamec.h
-dobj/0/wadnamec.o: src/input.h src/wadnamec.h
-obj/0/wadres.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/wadres.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/wadres.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/wadres.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/wadres.o: src/wadres.h src/spritdir.h src/lumpdir.h
-dobj/0/wadres.o: src/wadres.h src/spritdir.h src/lumpdir.h
-obj/0/wads.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/wads.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/wads.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/wads.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/wads.o: src/serialnum.h src/wads.h
-dobj/0/wads.o: src/serialnum.h src/wads.h
-obj/0/wads2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/wads2.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/wads2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/wads2.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/wads2.o: src/game.h src/rgb.h src/serialnum.h src/wads.h src/wads2.h
-dobj/0/wads2.o: src/game.h src/rgb.h src/serialnum.h src/wads.h src/wads2.h
-obj/0/warn.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/warn.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/warn.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/warn.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/windim.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/windim.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/windim.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/windim.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/x_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/x_centre.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/x_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/x_centre.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/x_centre.o: src/input.h src/l_centre.h src/levels.h src/things.h
-dobj/0/x_centre.o: src/input.h src/l_centre.h src/levels.h src/things.h
-obj/0/x_centre.o: src/s_centre.h src/t_centre.h src/v_centre.h src/x_centre.h
-dobj/0/x_centre.o: src/s_centre.h src/t_centre.h src/v_centre.h src/x_centre.h
-obj/0/x_exchng.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/x_exchng.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/x_exchng.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/x_exchng.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/x_exchng.o: src/input.h src/levels.h src/things.h src/selectn.h
-dobj/0/x_exchng.o: src/input.h src/levels.h src/things.h src/selectn.h
-obj/0/x_exchng.o: src/x_exchng.h
-dobj/0/x_exchng.o: src/x_exchng.h
-obj/0/x_mirror.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/x_mirror.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/x_mirror.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/x_mirror.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/x_mirror.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-dobj/0/x_mirror.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-obj/0/x_mirror.o: src/things.h src/s_vertices.h src/t_centre.h src/v_centre.h
-dobj/0/x_mirror.o: src/things.h src/s_vertices.h src/t_centre.h src/v_centre.h
-obj/0/x_mirror.o: src/x_mirror.h
-dobj/0/x_mirror.o: src/x_mirror.h
-obj/0/x_rotate.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/x_rotate.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/x_rotate.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-dobj/0/x_rotate.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h
-obj/0/x_rotate.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-dobj/0/x_rotate.o: src/input.h src/l_vertices.h src/selectn.h src/levels.h
-obj/0/x_rotate.o: src/things.h src/s_vertices.h src/t_centre.h src/v_centre.h
-dobj/0/x_rotate.o: src/things.h src/s_vertices.h src/t_centre.h src/v_centre.h
-obj/0/x_rotate.o: src/x_rotate.h
-dobj/0/x_rotate.o: src/x_rotate.h
-obj/0/x11.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/x11.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
+obj/0/s_slice.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_slice.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_slice.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_slice.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_slice.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+dobj/0/s_slice.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+obj/0/s_slice.o: src/things.h src/objects.h src/objid.h src/s_slice.h
+dobj/0/s_slice.o: src/things.h src/objects.h src/objid.h src/s_slice.h
+obj/0/s_split.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_split.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_split.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_split.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_split.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+dobj/0/s_split.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+obj/0/s_split.o: src/things.h src/objects.h src/objid.h src/s_linedefs.h
+dobj/0/s_split.o: src/things.h src/objects.h src/objid.h src/s_linedefs.h
+obj/0/s_split.o: src/selectn.h src/x_hover.h
+dobj/0/s_split.o: src/selectn.h src/x_hover.h
+obj/0/s_swapf.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_swapf.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_swapf.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_swapf.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_swapf.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/s_swapf.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/s_swapf.o: src/selectn.h
+dobj/0/s_swapf.o: src/selectn.h
+obj/0/s_vertices.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/s_vertices.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/s_vertices.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/s_vertices.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/s_vertices.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+dobj/0/s_vertices.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+obj/0/s_vertices.o: src/levels.h src/things.h src/objid.h src/s_linedefs.h
+dobj/0/s_vertices.o: src/levels.h src/things.h src/objid.h src/s_linedefs.h
+obj/0/s_vertices.o: src/s_vertices.h
+dobj/0/s_vertices.o: src/s_vertices.h
+obj/0/sanity.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/sanity.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/sanity.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/sanity.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/sanity.o: src/wstructs.h src/input.h src/sanity.h
+dobj/0/sanity.o: src/wstructs.h src/input.h src/sanity.h
+obj/0/scrnshot.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/scrnshot.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/scrnshot.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/scrnshot.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/scrnshot.o: src/wstructs.h src/input.h
+dobj/0/scrnshot.o: src/wstructs.h src/input.h
+obj/0/selbox.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/selbox.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/selbox.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/selbox.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/selbox.o: src/wstructs.h src/input.h src/gfx.h src/selbox.h
+dobj/0/selbox.o: src/wstructs.h src/input.h src/gfx.h src/selbox.h
+obj/0/selbox.o: src/edwidget.h
+dobj/0/selbox.o: src/edwidget.h
+obj/0/selectn.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/selectn.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/selectn.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/selectn.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/selectn.o: src/wstructs.h src/input.h src/objid.h src/selectn.h
+dobj/0/selectn.o: src/wstructs.h src/input.h src/objid.h src/selectn.h
+obj/0/selpath.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/selpath.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/selpath.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/selpath.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/selpath.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/selpath.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/selpath.o: src/objid.h src/selectn.h
+dobj/0/selpath.o: src/objid.h src/selectn.h
+obj/0/selrect.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/selrect.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/selrect.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/selrect.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/selrect.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/selrect.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/selrect.o: src/objid.h src/selectn.h
+dobj/0/selrect.o: src/objid.h src/selectn.h
+obj/0/serialnum.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/serialnum.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/serialnum.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/serialnum.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/serialnum.o: src/wstructs.h src/input.h src/serialnum.h
+dobj/0/serialnum.o: src/wstructs.h src/input.h src/serialnum.h
+obj/0/spritdir.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/spritdir.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/spritdir.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/spritdir.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/spritdir.o: src/wstructs.h src/input.h src/dependcy.h src/lumpdir.h
+dobj/0/spritdir.o: src/wstructs.h src/input.h src/dependcy.h src/lumpdir.h
+obj/0/spritdir.o: src/spritdir.h src/wadname.h src/wadnamec.h
+dobj/0/spritdir.o: src/spritdir.h src/wadname.h src/wadnamec.h
+obj/0/sticker.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/sticker.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/sticker.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/sticker.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/sticker.o: src/wstructs.h src/input.h src/gcolour2.h src/colour.h
+dobj/0/sticker.o: src/wstructs.h src/input.h src/gcolour2.h src/colour.h
+obj/0/sticker.o: src/gcolour3.h src/gfx.h src/img.h src/sticker.h
+dobj/0/sticker.o: src/gcolour3.h src/gfx.h src/img.h src/sticker.h
+obj/0/swapmem.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/swapmem.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/swapmem.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/swapmem.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/swapmem.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/swapmem.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/swapmem.o: src/objid.h
+dobj/0/swapmem.o: src/objid.h
+obj/0/t_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/t_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/t_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/t_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/t_centre.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/t_centre.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/t_centre.o: src/selectn.h src/t_centre.h
+dobj/0/t_centre.o: src/selectn.h src/t_centre.h
+obj/0/t_flags.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/t_flags.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/t_flags.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/t_flags.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/t_flags.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/t_flags.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/t_flags.o: src/selectn.h
+dobj/0/t_flags.o: src/selectn.h
+obj/0/t_prop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/t_prop.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/t_prop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/t_prop.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/t_prop.o: src/wstructs.h src/input.h src/entry.h src/game.h src/rgb.h
+dobj/0/t_prop.o: src/wstructs.h src/input.h src/entry.h src/game.h src/rgb.h
+obj/0/t_prop.o: src/gfx.h src/levels.h src/things.h src/oldmenus.h
+dobj/0/t_prop.o: src/gfx.h src/levels.h src/things.h src/oldmenus.h
+obj/0/t_prop.o: src/selectn.h
+dobj/0/t_prop.o: src/selectn.h
+obj/0/t_spin.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/t_spin.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/t_spin.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/t_spin.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/t_spin.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/t_spin.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/t_spin.o: src/selectn.h src/t_spin.h
+dobj/0/t_spin.o: src/selectn.h src/t_spin.h
+obj/0/textures.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/textures.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/textures.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/textures.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/textures.o: src/wstructs.h src/input.h src/dialog.h src/game.h src/rgb.h
+dobj/0/textures.o: src/wstructs.h src/input.h src/dialog.h src/game.h src/rgb.h
+obj/0/textures.o: src/gfx.h src/lists.h src/img.h src/patchdir.h src/pic2img.h
+dobj/0/textures.o: src/gfx.h src/lists.h src/img.h src/patchdir.h src/pic2img.h
+obj/0/textures.o: src/sticker.h src/textures.h src/wadfile.h src/wads.h
+dobj/0/textures.o: src/sticker.h src/textures.h src/wadfile.h src/wads.h
+obj/0/things.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/things.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/things.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/things.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/things.o: src/wstructs.h src/input.h src/game.h src/rgb.h src/things.h
+dobj/0/things.o: src/wstructs.h src/input.h src/game.h src/rgb.h src/things.h
+obj/0/trace.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/trace.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/trace.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/trace.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/trace.o: src/input.h src/trace.h
+dobj/0/trace.o: src/input.h src/trace.h
+obj/0/v_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/v_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/v_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/v_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/v_centre.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/v_centre.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/v_centre.o: src/selectn.h src/v_centre.h
+dobj/0/v_centre.o: src/selectn.h src/v_centre.h
+obj/0/v_merge.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/v_merge.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/v_merge.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/v_merge.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/v_merge.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+dobj/0/v_merge.o: src/wstructs.h src/input.h src/dialog.h src/levels.h
+obj/0/v_merge.o: src/things.h src/objects.h src/objid.h src/selectn.h
+dobj/0/v_merge.o: src/things.h src/objects.h src/objid.h src/selectn.h
+obj/0/v_polyg.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/v_polyg.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/v_polyg.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/v_polyg.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/v_polyg.o: src/wstructs.h src/input.h src/objects.h src/objid.h
+dobj/0/v_polyg.o: src/wstructs.h src/input.h src/objects.h src/objid.h
+obj/0/vectext.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/vectext.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/vectext.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/vectext.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/vectext.o: src/wstructs.h src/input.h src/gfx.h src/vectext.h
+dobj/0/vectext.o: src/wstructs.h src/input.h src/gfx.h src/vectext.h
+obj/0/verbmsg.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/verbmsg.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/verbmsg.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/verbmsg.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/verbmsg.o: src/wstructs.h src/input.h
+dobj/0/verbmsg.o: src/wstructs.h src/input.h
+obj/0/wadfile.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/wadfile.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/wadfile.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/wadfile.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/wadfile.o: src/wstructs.h src/input.h src/wadfile.h
+dobj/0/wadfile.o: src/wstructs.h src/input.h src/wadfile.h
+obj/0/wadlist.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/wadlist.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/wadlist.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/wadlist.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/wadlist.o: src/wstructs.h src/input.h src/wadfile.h src/wadlist.h
+dobj/0/wadlist.o: src/wstructs.h src/input.h src/wadfile.h src/wadlist.h
+obj/0/wadnamec.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/wadnamec.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/wadnamec.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/wadnamec.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/wadnamec.o: src/wstructs.h src/input.h src/wadnamec.h
+dobj/0/wadnamec.o: src/wstructs.h src/input.h src/wadnamec.h
+obj/0/wadres.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/wadres.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/wadres.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/wadres.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/wadres.o: src/wstructs.h src/input.h src/wadres.h src/spritdir.h
+dobj/0/wadres.o: src/wstructs.h src/input.h src/wadres.h src/spritdir.h
+obj/0/wadres.o: src/lumpdir.h
+dobj/0/wadres.o: src/lumpdir.h
+obj/0/wads.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/wads.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/wads.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/wads.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/wads.o: src/input.h src/serialnum.h src/wads.h
+dobj/0/wads.o: src/input.h src/serialnum.h src/wads.h
+obj/0/wads2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/wads2.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/wads2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/wads2.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/wads2.o: src/input.h src/game.h src/rgb.h src/serialnum.h src/wadfile.h
+dobj/0/wads2.o: src/input.h src/game.h src/rgb.h src/serialnum.h src/wadfile.h
+obj/0/wads2.o: src/wadlist.h src/wads.h src/wads2.h
+dobj/0/wads2.o: src/wadlist.h src/wads.h src/wads2.h
+obj/0/warn.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/warn.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/warn.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/warn.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/warn.o: src/input.h
+dobj/0/warn.o: src/input.h
+obj/0/windim.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/windim.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/windim.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/windim.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/windim.o: src/wstructs.h src/input.h
+dobj/0/windim.o: src/wstructs.h src/input.h
+obj/0/x_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/x_centre.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/x_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/x_centre.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/x_centre.o: src/wstructs.h src/input.h src/l_centre.h src/levels.h
+dobj/0/x_centre.o: src/wstructs.h src/input.h src/l_centre.h src/levels.h
+obj/0/x_centre.o: src/things.h src/s_centre.h src/objid.h src/t_centre.h
+dobj/0/x_centre.o: src/things.h src/s_centre.h src/objid.h src/t_centre.h
+obj/0/x_centre.o: src/v_centre.h src/x_centre.h
+dobj/0/x_centre.o: src/v_centre.h src/x_centre.h
+obj/0/x_exchng.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/x_exchng.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/x_exchng.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/x_exchng.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/x_exchng.o: src/wstructs.h src/input.h src/levels.h src/things.h
+dobj/0/x_exchng.o: src/wstructs.h src/input.h src/levels.h src/things.h
+obj/0/x_exchng.o: src/selectn.h src/objid.h src/x_exchng.h
+dobj/0/x_exchng.o: src/selectn.h src/objid.h src/x_exchng.h
+obj/0/x_hover.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/x_hover.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/x_hover.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/x_hover.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/x_hover.o: src/wstructs.h src/input.h src/drawmap.h src/_edit.h
+dobj/0/x_hover.o: src/wstructs.h src/input.h src/drawmap.h src/_edit.h
+obj/0/x_hover.o: src/objid.h src/levels.h src/things.h src/x_hover.h
+dobj/0/x_hover.o: src/objid.h src/levels.h src/things.h src/x_hover.h
+obj/0/x_mirror.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/x_mirror.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/x_mirror.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/x_mirror.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/x_mirror.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+dobj/0/x_mirror.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+obj/0/x_mirror.o: src/levels.h src/things.h src/objid.h src/s_vertices.h
+dobj/0/x_mirror.o: src/levels.h src/things.h src/objid.h src/s_vertices.h
+obj/0/x_mirror.o: src/t_centre.h src/v_centre.h src/x_mirror.h
+dobj/0/x_mirror.o: src/t_centre.h src/v_centre.h src/x_mirror.h
+obj/0/x_rotate.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/x_rotate.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/x_rotate.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+dobj/0/x_rotate.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h
+obj/0/x_rotate.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+dobj/0/x_rotate.o: src/wstructs.h src/input.h src/l_vertices.h src/selectn.h
+obj/0/x_rotate.o: src/levels.h src/things.h src/objid.h src/s_vertices.h
+dobj/0/x_rotate.o: src/levels.h src/things.h src/objid.h src/s_vertices.h
+obj/0/x_rotate.o: src/t_centre.h src/v_centre.h src/x_rotate.h
+dobj/0/x_rotate.o: src/t_centre.h src/v_centre.h src/x_rotate.h
+obj/0/x11.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
+dobj/0/x11.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
 obj/0/x11.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 dobj/0/x11.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 obj/0/x11.o: src/gfx.h src/x11.h
 dobj/0/x11.o: src/gfx.h src/x11.h
-obj/0/xref.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/xref.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/xref.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/xref.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/xref.o: src/levels.h src/things.h src/selectn.h
-dobj/0/xref.o: src/levels.h src/things.h src/selectn.h
-obj/0/yadex.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/yadex.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
+obj/0/xref.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/xref.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/xref.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/xref.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/xref.o: src/input.h src/levels.h src/things.h src/selectn.h
+dobj/0/xref.o: src/input.h src/levels.h src/things.h src/selectn.h
+obj/0/yadex.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/yadex.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/yadex.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/yadex.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/yadex.o: src/input.h src/acolours.h src/colour.h src/bench.h
+dobj/0/yadex.o: src/input.h src/acolours.h src/colour.h src/bench.h
+obj/0/yadex.o: src/cfgfile.h src/disppic.h src/lists.h src/img.h src/editlev.h
+dobj/0/yadex.o: src/cfgfile.h src/disppic.h src/lists.h src/img.h src/editlev.h
+obj/0/yadex.o: src/endian.h src/flats.h src/game.h src/rgb.h src/gfx.h
+dobj/0/yadex.o: src/endian.h src/flats.h src/game.h src/rgb.h src/gfx.h
+obj/0/yadex.o: src/gfx2.h src/help1.h src/levels.h src/things.h src/mkpalette.h
+dobj/0/yadex.o: src/gfx2.h src/help1.h src/levels.h src/things.h src/mkpalette.h
+obj/0/yadex.o: src/palview.h src/patchdir.h src/sanity.h src/textures.h
+dobj/0/yadex.o: src/palview.h src/patchdir.h src/sanity.h src/textures.h
+obj/0/yadex.o: src/x11.h src/wadfile.h src/wadlist.h src/wadname.h src/wadres.h
+dobj/0/yadex.o: src/x11.h src/wadfile.h src/wadlist.h src/wadname.h src/wadres.h
+obj/0/yadex.o: src/spritdir.h src/lumpdir.h src/wads2.h
+dobj/0/yadex.o: src/spritdir.h src/lumpdir.h src/wads2.h
+obj/0/ytime.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+dobj/0/ytime.o: src/yadex.h src/config.h atclib/atclib.h src/bitvec.h
+obj/0/ytime.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+dobj/0/ytime.o: src/yerror.h src/ymemory.h src/aym.h src/windim.h src/wstructs.h
+obj/0/ytime.o: src/input.h src/ytime.h
+dobj/0/ytime.o: src/input.h src/ytime.h
+obj/0/_edit.o: src/objid.h
+dobj/0/_edit.o: src/objid.h
+obj/0/acolours.o: src/colour.h
+dobj/0/acolours.o: src/colour.h
+obj/0/bitvec.o: src/yerror.h src/ymemory.h
+dobj/0/bitvec.o: src/yerror.h src/ymemory.h
+obj/0/disppic.o: src/lists.h src/img.h
+dobj/0/disppic.o: src/lists.h src/img.h
+obj/0/drawmap.o: src/_edit.h src/objid.h
+dobj/0/drawmap.o: src/_edit.h src/objid.h
+obj/0/flats.o: src/lists.h src/img.h
+dobj/0/flats.o: src/lists.h src/img.h
+obj/0/game.o: src/rgb.h
+dobj/0/game.o: src/rgb.h
+obj/0/gamesky.o: src/wadname.h src/wstructs.h
+dobj/0/gamesky.o: src/wadname.h src/wstructs.h
+obj/0/gcolour1.o: src/colour.h
+dobj/0/gcolour1.o: src/colour.h
+obj/0/gcolour2.o: src/colour.h
+dobj/0/gcolour2.o: src/colour.h
+obj/0/gcolour3.o: src/colour.h
+dobj/0/gcolour3.o: src/colour.h
+obj/0/gfx3.o: src/rgbbmp.h
+dobj/0/gfx3.o: src/rgbbmp.h
+obj/0/highlt.o: src/edwidget.h src/objid.h
+dobj/0/highlt.o: src/edwidget.h src/objid.h
+obj/0/infobar.o: src/edwidget.h
+dobj/0/infobar.o: src/edwidget.h
+obj/0/l_vertices.o: src/selectn.h
+dobj/0/l_vertices.o: src/selectn.h
+obj/0/levels.o: src/wstructs.h src/things.h
+dobj/0/levels.o: src/wstructs.h src/things.h
+obj/0/lists.o: src/img.h
+dobj/0/lists.o: src/img.h
+obj/0/menu.o: src/edwidget.h
+dobj/0/menu.o: src/edwidget.h
+obj/0/menubar.o: src/edwidget.h
+dobj/0/menubar.o: src/edwidget.h
+obj/0/modpopup.o: src/edwidget.h src/menu.h
+dobj/0/modpopup.o: src/edwidget.h src/menu.h
+obj/0/objects.o: src/objid.h
+dobj/0/objects.o: src/objid.h
+obj/0/objinfo.o: src/edwidget.h
+dobj/0/objinfo.o: src/edwidget.h
+obj/0/pic2img.o: src/img.h
+dobj/0/pic2img.o: src/img.h
+obj/0/s_centre.o: src/objid.h
+dobj/0/s_centre.o: src/objid.h
+obj/0/s_vertices.o: src/selectn.h
+dobj/0/s_vertices.o: src/selectn.h
+obj/0/selbox.o: src/edwidget.h
+dobj/0/selbox.o: src/edwidget.h
+obj/0/spot.o: src/edwidget.h src/gfx.h
+dobj/0/spot.o: src/edwidget.h src/gfx.h
+obj/0/spritdir.o: src/lumpdir.h
+dobj/0/spritdir.o: src/lumpdir.h
+obj/0/textures.o: src/lists.h src/img.h
+dobj/0/textures.o: src/lists.h src/img.h
+obj/0/things.o: src/wstructs.h
+dobj/0/things.o: src/wstructs.h
+obj/0/wadname.o: src/wstructs.h
+dobj/0/wadname.o: src/wstructs.h
+obj/0/wadres.o: src/spritdir.h src/lumpdir.h
+dobj/0/wadres.o: src/spritdir.h src/lumpdir.h
+obj/0/yadex.o: src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
+dobj/0/yadex.o: src/config.h atclib/atclib.h src/bitvec.h src/yerror.h
 obj/0/yadex.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
 dobj/0/yadex.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/yadex.o: src/acolours.h src/colour.h src/bench.h src/cfgfile.h
-dobj/0/yadex.o: src/acolours.h src/colour.h src/bench.h src/cfgfile.h
-obj/0/yadex.o: src/disppic.h src/lists.h src/editlev.h src/endian.h src/flats.h
-dobj/0/yadex.o: src/disppic.h src/lists.h src/editlev.h src/endian.h src/flats.h
-obj/0/yadex.o: src/game.h src/rgb.h src/gfx.h src/gfx2.h src/help1.h
-dobj/0/yadex.o: src/game.h src/rgb.h src/gfx.h src/gfx2.h src/help1.h
-obj/0/yadex.o: src/levels.h src/things.h src/mkpalette.h src/palview.h
-dobj/0/yadex.o: src/levels.h src/things.h src/mkpalette.h src/palview.h
-obj/0/yadex.o: src/patchdir.h src/sanity.h src/textures.h src/x11.h
-dobj/0/yadex.o: src/patchdir.h src/sanity.h src/textures.h src/x11.h
-obj/0/yadex.o: src/wadname.h src/wadres.h src/spritdir.h src/lumpdir.h
-dobj/0/yadex.o: src/wadname.h src/wadres.h src/spritdir.h src/lumpdir.h
-obj/0/yadex.o: src/wads2.h
-dobj/0/yadex.o: src/wads2.h
-obj/0/ytime.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-dobj/0/ytime.o: src/yadex.h atclib/atclib.h src/bitvec.h src/yerror.h
-obj/0/ytime.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-dobj/0/ytime.o: src/ymemory.h src/aym.h src/windim.h src/wstructs.h src/input.h
-obj/0/ytime.o: src/ytime.h
-dobj/0/ytime.o: src/ytime.h
diff -uaNr yadex-1.5.2/ygd/doom.ygd yadex-1.6.0/ygd/doom.ygd
--- yadex-1.5.2/ygd/doom.ygd	2000-08-24 23:05:33.000000000 +0200
+++ yadex-1.6.0/ygd/doom.ygd	2002-05-10 09:01:14.000000000 +0200
@@ -7,6 +7,7 @@
 #
 
 # EDGE stuff courtesy of Andrew Apted. Mistakes courtesy of AYM.
+# Boom stuff courtesy of Andrew Apted, 2000-09-20.
 
 level_format    doom
 level_name      e1m1
@@ -26,6 +27,7 @@
 ldtgroup b "Door (blue key)"
 ldtgroup D "Door (turbo)"
 ldtgroup l "Lift"
+ldtgroup v "Elevator"
 ldtgroup F "Floor (raise)"
 ldtgroup f "Floor (lower)"
 ldtgroup c "Ceiling"
@@ -34,7 +36,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 ldtgroup A "Animated"
 ldtgroup E "Extrafloor"
 ldtgroup x "Misc."
@@ -78,8 +80,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -123,14 +125,18 @@
 ldt  75 d "WR Close door"    "WR  Close door"
 ldt  76 d "WR Close for 30s" "WR  Close door for 30 seconds"
 ldt  77 C "WR& Crush FF"     "WR& Start fast crushing, fast hurt"
-#ldt 78 x "-- Unimplemented" "--  Unimplemented"
+
+ldt  78 x "SR Floor -- NXP"  "SR  Floor transfer (NXP) [Boom]"
+
 ldt  79 L "WR Light to 0"    "WR  Light level goes to 0"
 ldt  80 L "WR Light to HE"   "WR  Light level goes to HE"
 ldt  81 L "WR Light to 255"  "WR  Light level goes to 255"
 ldt  82 f "WR Floor dn LEF"  "WR  Lower floor to LEF"
 ldt  83 f "WR Floor dn HEF"  "WR  Lower floor to HEF"
 ldt  84 f "WR F. dn LEF NX)" "WR  Lower floor to LEF (NXP)"
-#ldt 85 x "-- Unimplemented" "--  Unimplemented"
+
+ldt  85 A "-- Scroll right"  "--  Scrolling wall, right [Boom]"
+
 ldt  86 d "WR Open door (O)" "WR  Open  door (stays open)"
 ldt  87 m "WR& Start moving" "WR& Start moving floor"
 ldt  88 l "WR Lower lift"    "WR  Lower lift"
@@ -141,7 +147,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -150,13 +156,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -188,6 +194,135 @@
 ldt 140 F "S1 Floor up 512"  "S1  Raise floor by 512, medium speed [v1.6]"
 ldt 141 C "W1& Crush SS sil" "W1& Start slow crushing, slow hurt, silent [v1.6]"
 
+ldt 142 F "W1 Floor up 512"  "W1  Raise floor by 512 [Boom]"
+ldt 143 l "W1& F. up 24 TX"  "W1& Raise floor by 24 (TX) [Boom]"
+ldt 144 l "W1& F. up 32 TX"  "W1& Raise floor by 32 (TX) [Boom]"
+ldt 145 c "W1 Ceil dn floor" "W1  Lower ceiling to floor [Boom]"
+ldt 146 x "W1 Donut"         "W1  Lower floor, raise NE floor (NXP) [Boom]"
+ldt 147 F "WR Floor up 512"  "WR  Raise floor by 512 [Boom]"
+ldt 148 l "WR& F. up 24 TX"  "WR& Raise floor by 24 (TX) [Boom]"
+ldt 149 l "WR& F. up 32 TX"  "WR& Raise floor by 32 (TX) [Boom]"
+ldt 150 C "WR& Crush SS sil" "WR& Start slow crushing, silent [Boom]"
+ldt 151 c "WR Ceil up HEC"   "WR  Raise ceiling to HEC [Boom]"
+ldt 152 c "WR Ceil dn floor" "WR  Lower ceiling to floor [Boom]"
+ldt 153 x "W1 Floor -- TXP"  "W1  Floor transfer (TXP) [Boom]"
+ldt 154 x "WR Floor -- TXP"  "WR  Floor transfer (TXP) [Boom]"
+ldt 155 x "WR Donut"         "WR  Lower floor, raise NE floor (NXP) [Boom]"
+ldt 156 L "WR Start blink"   "WR  Start blinking lights [Boom]"
+ldt 157 L "WR Light to LE"   "WR  Light level goes to LE [Boom]"
+ldt 158 F "S1 Floor up SLT"  "S1  Raise floor by ShortestLowerTex [Boom]"
+ldt 159 f "S1 F. dn LEF NX"  "S1  Lower floor to LEF (NXP) [Boom]"
+ldt 160 F "S1 F. up 24 TXP"  "S1  Raise floor by 24 (TXP) [Boom]"
+ldt 161 F "S1 Floor up 24"   "S1  Raise floor by 24 [Boom]"
+ldt 162 m "S1 Start moving"  "S1  Start moving floor [Boom]"
+ldt 163 m "S1 Stop moving f" "S1  Stop  moving floor [Boom]"
+ldt 164 C "S1 Crush FF"      "S1  Start fast crushing [Boom]"
+ldt 165 C "S1& Crush SS sil" "S1& Start slow crushing, silent [Boom]"
+ldt 166 c "S1 Ceil up HEC"   "S1  Raise ceiling to HEC [Boom]"
+ldt 167 c "S1 Ceil dn flr+8" "S1  Lower ceiling to floor + 8 [Boom]"
+ldt 168 C "S1& Stop crush"   "S1& Stop  crushing [Boom]"
+ldt 169 L "S1 Light to HE"   "S1  Light level goes to HE [Boom]"
+ldt 170 L "S1 Light to 0"    "S1  Light level goes to 0 [Boom]"
+ldt 171 L "S1 Light to 255"  "S1  Light level goes to 255 [Boom]"
+ldt 172 L "S1 Start blink"   "S1  Start blinking lights [Boom]"
+ldt 173 L "S1 Light to LE"   "S1  Light level goes to LE [Boom]"
+ldt 174 t "S1 Teleport"      "S1  Teleport to another sector [Boom]"
+ldt 175 d "S1 Close for 30s" "S1  Close door for 30 seconds [Boom]"
+ldt 176 F "SR Floor up SLT"  "SR  Raise floor by ShortestLowerTex [Boom]"
+ldt 177 f "SR F. dn LEF NX"  "SR  Lower floor to LEF (NXP) [Boom]"
+ldt 178 F "SR Floor up 512"  "SR  Raise floor by 512 [Boom]"
+ldt 179 F "SR F. up 24 TXP"  "SR  Raise floor by 24 (TXP) [Boom]"
+ldt 180 F "SR Floor up 24"   "SR  Raise floor by 24 [Boom]"
+ldt 181 m "SR Start moving"  "SR  Start moving floor [Boom]"
+ldt 182 m "SR Stop moving f" "SR  Stop  moving floor [Boom]"
+ldt 183 C "SR Crush FF"      "SR  Start fast crushing [Boom]"
+ldt 184 C "SR& Crush SS"     "SR& Start slow crushing [Boom]"
+ldt 185 C "SR& Crush SS sil" "SR& Start slow crushing, silent [Boom]"
+ldt 186 c "SR Ceil up HEC"   "SR  Raise ceiling to HEC [Boom]"
+ldt 187 c "SR Ceil dn flr+8" "SR  Lower ceiling to floor + 8 [Boom]"
+ldt 188 C "SR& Stop crush"   "SR& Stop  crushing [Boom]"
+ldt 189 x "S1 Floor -- TXP"  "S1  Floor transfer (TXP) [Boom]"
+ldt 190 x "SR Floor -- TXP"  "SR  Floor transfer (TXP) [Boom]"
+ldt 191 x "SR Donut"         "SR  Lower floor, raise NE floor (NXP) [Boom]"
+ldt 192 L "SR Light to HE"   "SR  Light level goes to HE [Boom]"
+ldt 193 L "SR Start blink"   "SR  Start blinking lights [Boom]"
+ldt 194 L "SR Light to LE"   "SR  Light level goes to LE [Boom]"
+ldt 195 t "SR Teleport"      "SR  Teleport to another sector [Boom]"
+ldt 196 d "SR Close for 30s" "SR  Close door for 30 seconds [Boom]"
+ldt 197 e "G- End level"     "G-  End level, go to next level [Boom]"
+ldt 198 e "G- End level"     "G-  End level, go to secret level [Boom]"
+ldt 199 c "W1 Ceil dn LEC"   "W1  Lower ceiling to LEC [Boom]"
+ldt 200 c "W1 Ceil dn HEF"   "W1  Lower ceiling to HEF [Boom]"
+ldt 201 c "WR Ceil dn LEC"   "WR  Lower ceiling to LEC [Boom]"
+ldt 202 c "WR Ceil dn HEF"   "WR  Lower ceiling to HEF [Boom]"
+ldt 203 c "S1 Ceil dn LEC"   "S1  Lower ceiling to LEC [Boom]"
+ldt 204 c "S1 Ceil dn HEF"   "S1  Lower ceiling to HEF [Boom]"
+ldt 205 c "SR Ceil dn LEC"   "SR  Lower ceiling to LEC [Boom]"
+ldt 206 c "SR Ceil dn HEF"   "SR  Lower ceiling to HEF [Boom]"
+ldt 207 t "W1 Teleport pres" "W1  Teleport preserving dir [Boom]"
+ldt 208 t "WR Teleport pres" "WR  Teleport preserving dir [Boom]"
+ldt 209 t "S1 Teleport pres" "S1  Teleport preserving dir [Boom]"
+ldt 210 t "SR Teleport pres" "SR  Teleport preserving dir [Boom]"
+ldt 211 m "SR Floor toggle"  "SR  Floor toggle to ceil [Boom]"
+ldt 212 m "WR Floor toggle"  "WR  Floor toggle to ceil [Boom]"
+ldt 213 L "-- Xfer F. light" "--  Transfer floor lighting [Boom]"
+ldt 214 A "-- Scrl C. accel" "--  Scroll ceiling with accel [Boom]"
+ldt 215 A "-- Scrl F. accel" "--  Scroll floor with accel [Boom]"
+ldt 216 A "-- Push F. accel" "--  Push objects with accel [Boom]"
+ldt 217 A "-- Sc/Pu F. accl" "--  Scroll & push with accel [Boom]"
+ldt 218 A "-- Scrl wall acc" "--  Scroll wall with accel [Boom]"
+ldt 219 f "W1 F. dn nlEF"    "W1  Lower floor to nlEF [Boom]"
+ldt 220 f "WR F. dn nlEF"    "WR  Lower floor to nlEF [Boom]"
+ldt 221 f "S1 F. dn nlEF"    "S1  Lower floor to nlEF [Boom]"
+ldt 222 f "SR F. dn nlEF"    "SR  Lower floor to nlEF [Boom]"
+ldt 223 x "-- Friction"      "--  Set friction in tagged sectors [Boom]"
+ldt 224 x "-- Wind force"    "--  Set wind in tagged sectors [Boom]"
+ldt 225 x "-- Current force" "--  Set current in tagged sectors [Boom]"
+ldt 226 x "-- Point force"   "--  Set point force in sectors [Boom]"
+ldt 227 v "W1 Elevator nhEF" "W1  Raise elevator to nhEF [Boom]"
+ldt 228 v "WR Elevator nhEF" "WR  Raise elevator to nhEF [Boom]"
+ldt 229 v "S1 Elevator nhEF" "S1  Raise elevator to nhEF [Boom]"
+ldt 230 v "SR Elevator nhEF" "SR  Raise elevator to nhEF [Boom]"
+ldt 231 v "W1 Elevator nlEF" "W1  Lower elevator to nlEF [Boom]"
+ldt 232 v "WR Elevator nlEF" "WR  Lower elevator to nlEF [Boom]"
+ldt 233 v "S1 Elevator nlEF" "S1  Lower elevator to nlEF [Boom]"
+ldt 234 v "SR Elevator nlEF" "SR  Lower elevator to nlEF [Boom]"
+ldt 235 v "W1 Elevator curr" "W1  Move elevator to Current [Boom]"
+ldt 236 v "WR Elevator curr" "WR  Move elevator to Current [Boom]"
+ldt 237 v "S1 Elevator curr" "S1  Move elevator to Current [Boom]"
+ldt 238 v "SR Elevator curr" "SR  Move elevator to Current [Boom]"
+ldt 239 x "W1 Floor -- NXP"  "W1  Floor transfer (NXP) [Boom]"
+ldt 240 x "WR Floor -- NXP"  "WR  Floor transfer (NXP) [Boom]"
+ldt 241 x "S1 Floor -- NXP"  "S1  Floor transfer (NXP) [Boom]"
+ldt 242 x "-- Deep water"    "--  Deep water effect [Boom]"
+ldt 243 t "W1 Telept line"   "W1  Teleport to tagged line [Boom]"
+ldt 244 t "WR Telept line"   "WR  Teleport to tagged line [Boom]"
+ldt 245 A "-- Scrl C. disp"  "--  Scroll ceiling by displacement [Boom]"
+ldt 246 A "-- Scrl F. disp"  "--  Scroll floor by displacement [Boom]"
+ldt 247 A "-- Push F. disp"  "--  Push objects by displacement [Boom]"
+ldt 248 A "-- Sc/Pu F. disp" "--  Scroll & push by displacement [Boom]"
+ldt 249 A "-- Scrl wall dis" "--  Scroll wall by displacement [Boom]"
+ldt 250 A "-- Scroll ceil"   "--  Scroll tagged ceiling [Boom]"
+ldt 251 A "-- Scroll floor"  "--  Scroll tagged floor [Boom]"
+ldt 252 A "-- Push on floor" "--  Push objects on tagged floor [Boom]"
+ldt 253 A "-- Scroll,push f" "--  Scroll & push tagged floor [Boom]"
+ldt 254 A "-- Scrl wal with" "--  Scroll tagged wall with F/C [Boom]"
+ldt 255 A "-- Scrl wal side" "--  Scroll wall using sidedef [Boom]"
+ldt 256 s "WR Raise stairs"  "WR  Raise stairs (several sectors) [Boom]"
+ldt 257 s "WR RaiseStairs16" "WR  Raise stairs (step=16), crush [Boom]"
+ldt 258 s "SR Raise stairs"  "SR  Raise stairs (several sectors) [Boom]"
+ldt 259 s "SR RaiseStairs16" "SR  Raise stairs (step=16), crush [Boom]"
+ldt 260 A "-- Translucency"  "--  Make tagged lines translucent [Boom]"
+ldt 261 L "-- Xfer C. light" "--  Transfer ceiling lighting [Boom]"
+ldt 262 t "W1 Telept line R" "W1  Teleport to line, reverse [Boom]"
+ldt 263 t "WR Telept line R" "WR  Teleport to line, reverse [Boom]"
+ldt 264 t "W1 Tpt line mons" "W1  Teleport monsters to line [Boom]"
+ldt 265 t "WR Tpt line mons" "WR  Teleport monsters to line [Boom]"
+ldt 266 t "W1 Tpt L. mons R" "W1  Teleport monsters to line, rev [Boom]"
+ldt 267 t "WR Tpt L. mons R" "WR  Teleport monsters to line, rev [Boom]"
+ldt 268 t "W1 Teleport mons" "W1  Teleport monsters only [Boom]"
+ldt 269 t "WR Teleport mons" "WR  Teleport monsters only [Boom]"
+
 ldt 271 x "-- Xfer sky"      "--  Xfer straight upper to sky tex. [MBF]"
 ldt 272 x "-- Xfer mir. sky" "--  Xfer mirrored upper to sky tex. [MBF]"
 
@@ -284,10 +419,10 @@
 thing   20 c -  20 "Dead imp"			TROOM
 thing   21 c -  16 "Dead demon"			SARGN
 thing   22 c -  16 "Dead cacodemon"		HEADL
-thing   23 c -  16 "Dead lost soul"
+thing   23 c -  16 "Dead lost soul"		SKULK
 
 thing 2035 d -  10 "Barrel"			BAR1
-thing 7011 d -  10 "Unstable barrel [EDGE]"	BEXP
+thing 7011 d -  10 "Unstable barrel [EDGE]"	BEXP	# FIXME cut off
 thing   48 d -  16 "Technical column"		ELEC
 thing   30 d -  16 "Tall green pillar"		COL1
 thing   32 d -  16 "Tall red pillar"		COL3
@@ -316,7 +451,7 @@
 thing   59 g -  16 "Hanging arms out"		GOR2
 thing   53 g -  16 "Hanging leg O"		GOR5
 thing   62 g -  16 "Hanging leg"		GOR5
-thing   51 g -  16 "Hanging one-legged O"	GOR3
+thing   51 g -  16 "Hanging one-legged O"	GOR3	# FIXME cut off
 thing   61 g -  16 "Hanging one-legged"		GOR3
 thing   52 g -  16 "Hanging torso O"		GOR4
 thing   60 g -  16 "Hanging torso"		GOR4
@@ -362,7 +497,7 @@
 thing    2 p -  16 "Player 2 start"		PLAY
 thing    3 p -  16 "Player 3 start"		PLAY
 thing    4 p -  16 "Player 4 start"		PLAY
-thing  888 p -  16 "Dog [MBF]"
+thing  888 p -  12 "Dog [MBF]"
 thing   11 p -  16 "Deathmatch start"		PLAYF1
 thing   14 p -  16 "Teleport exit"		TFOG
 
diff -uaNr yadex-1.5.2/ygd/doom02.ygd yadex-1.6.0/ygd/doom02.ygd
--- yadex-1.5.2/ygd/doom02.ygd	2000-06-22 03:32:17.000000000 +0200
+++ yadex-1.6.0/ygd/doom02.ygd	2002-05-10 09:01:18.000000000 +0200
@@ -34,7 +34,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 ldtgroup x "Misc."
 
 #
@@ -76,8 +76,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -139,7 +139,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -148,13 +148,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -261,7 +261,7 @@
 thing   20 c -  20 "Dead imp"			TROOM
 thing   21 c -  16 "Dead demon"			SARGN
 thing   22 c -  16 "Dead cacodemon"		HEADL
-thing   23 c -  16 "Dead lost soul"
+thing   23 c -  16 "Dead lost soul"		SKULK
 
 thing 2035 d -  10 "Barrel"			BAR1
 thing   48 d -  16 "Technical column"		ELEC
@@ -291,7 +291,7 @@
 thing   59 g -  16 "Hanging arms out"		GOR2
 thing   53 g -  16 "Hanging leg O"		GOR5
 thing   62 g -  16 "Hanging leg"		GOR5
-thing   51 g -  16 "Hanging one-legged O"	GOR3
+thing   51 g -  16 "Hanging one-legged O"	GOR3	# FIXME cut off
 thing   61 g -  16 "Hanging one-legged"		GOR3
 thing   52 g -  16 "Hanging torso O"		GOR4
 thing   60 g -  16 "Hanging torso"		GOR4
@@ -336,7 +336,7 @@
 thing    2 p -  16 "Player 2 start"		PLAY
 thing    3 p -  16 "Player 3 start"		PLAY
 thing    4 p -  16 "Player 4 start"		PLAY
-thing  888 p -  16 "Dog [MBF]"
+thing  888 p -  12 "Dog [MBF]"
 thing   11 p -  16 "Deathmatch start"		PLAYF1
 thing   14 p -  16 "Teleport exit"		TFOG
 
diff -uaNr yadex-1.5.2/ygd/doom04.ygd yadex-1.6.0/ygd/doom04.ygd
--- yadex-1.5.2/ygd/doom04.ygd	2000-06-22 03:32:21.000000000 +0200
+++ yadex-1.6.0/ygd/doom04.ygd	2002-05-10 09:01:21.000000000 +0200
@@ -35,7 +35,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 ldtgroup x "Misc."
 
 #
@@ -77,8 +77,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -140,7 +140,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -149,13 +149,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -263,7 +263,7 @@
 thing   20 c -  20 "Dead imp"			TROOM
 thing   21 c -  16 "Dead demon"			SARGN
 thing   22 c -  16 "Dead cacodemon"		HEADL
-thing   23 c -  16 "Dead lost soul"
+thing   23 c -  16 "Dead lost soul"		SKULK
 
 #thing 2021 d -  16 "Unknown [Alpha]"
 thing 2027 d -  10 "Bronze barrel [Alpha]"	GBAR
@@ -301,7 +301,7 @@
 thing   59 g -  16 "Hanging arms out"		GOR2
 thing   53 g -  16 "Hanging leg O"		GOR5
 thing   62 g -  16 "Hanging leg"		GOR5
-thing   51 g -  16 "Hanging one-legged O"	GOR3
+thing   51 g -  16 "Hanging one-legged O"	GOR3	# FIXME cut off
 thing   61 g -  16 "Hanging one-legged"		GOR3
 thing   52 g -  16 "Hanging torso O"		GOR4
 thing   60 g -  16 "Hanging torso"		GOR4
@@ -346,7 +346,7 @@
 thing    2 p -  16 "Player 2 start"		PLAY
 thing    3 p -  16 "Player 3 start"		PLAY
 thing    4 p -  16 "Player 4 start"		PLAY
-thing  888 p -  16 "Dog [MBF]"
+thing  888 p -  12 "Dog [MBF]"
 thing   11 p -  16 "Deathmatch start"		PLAYF1
 thing   14 p -  16 "Teleport exit"		TFOG
 
diff -uaNr yadex-1.5.2/ygd/doom05.ygd yadex-1.6.0/ygd/doom05.ygd
--- yadex-1.5.2/ygd/doom05.ygd	2000-06-22 03:31:07.000000000 +0200
+++ yadex-1.6.0/ygd/doom05.ygd	2002-05-10 09:01:24.000000000 +0200
@@ -35,7 +35,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 ldtgroup x "Misc."
 
 #
@@ -77,8 +77,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -140,7 +140,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -149,13 +149,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -272,7 +272,7 @@
 thing   20 c -  20 "Dead imp"			TROOM
 thing   21 c -  16 "Dead demon"			SARGN
 thing   22 c -  16 "Dead cacodemon"		HEADL
-thing   23 c -  16 "Dead lost soul"
+thing   23 c -  16 "Dead lost soul"		SKULK
 
 thing 2035 d -  10 "Barrel"			BAR1
 thing   48 d -  16 "Technical column"		ELEC
@@ -302,7 +302,7 @@
 thing   59 g -  16 "Hanging arms out"		GOR2
 thing   53 g -  16 "Hanging leg O"		GOR5
 thing   62 g -  16 "Hanging leg"		GOR5
-thing   51 g -  16 "Hanging one-legged O"	GOR3
+thing   51 g -  16 "Hanging one-legged O"	GOR3	# FIXME cut off
 thing   61 g -  16 "Hanging one-legged"		GOR3
 thing   52 g -  16 "Hanging torso O"		GOR4
 thing   60 g -  16 "Hanging torso"		GOR4
@@ -347,7 +347,7 @@
 thing    2 p -  16 "Player 2 start"		PLAY
 thing    3 p -  16 "Player 3 start"		PLAY
 thing    4 p -  16 "Player 4 start"		PLAY
-thing  888 p -  16 "Dog [MBF]"
+thing  888 p -  12 "Dog [MBF]"
 thing   11 p -  16 "Deathmatch start"		PLAYF1
 thing   14 p -  16 "Teleport exit"		TFOG
 
diff -uaNr yadex-1.5.2/ygd/doom2.ygd yadex-1.6.0/ygd/doom2.ygd
--- yadex-1.5.2/ygd/doom2.ygd	2000-08-24 23:05:38.000000000 +0200
+++ yadex-1.6.0/ygd/doom2.ygd	2002-05-10 09:03:29.000000000 +0200
@@ -7,6 +7,7 @@
 #
 
 # EDGE stuff courtesy of Andrew Apted. Mistakes courtesy of AYM.
+# Boom stuff courtesy of Andrew Apted, 2000-09-20.
 
 level_format    doom
 level_name      map01
@@ -26,6 +27,7 @@
 ldtgroup b "Door (blue key)"
 ldtgroup D "Door (turbo)"
 ldtgroup l "Lift"
+ldtgroup v "Elevator"
 ldtgroup F "Floor (raise)"
 ldtgroup f "Floor (lower)"
 ldtgroup c "Ceiling"
@@ -34,7 +36,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 ldtgroup A "Animated"
 ldtgroup E "Extrafloor"
 ldtgroup x "Misc."
@@ -78,8 +80,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -123,14 +125,18 @@
 ldt  75 d "WR Close door"    "WR  Close door"
 ldt  76 d "WR Close for 30s" "WR  Close door for 30 seconds"
 ldt  77 C "WR& Crush FF"     "WR& Start fast crushing, fast hurt"
-#ldt 78 x "-- Unimplemented" "--  Unimplemented"
+
+ldt  78 x "SR Floor -- NXP"  "SR  Floor transfer (NXP) [Boom]"
+
 ldt  79 L "WR Light to 0"    "WR  Light level goes to 0"
 ldt  80 L "WR Light to HE"   "WR  Light level goes to HE"
 ldt  81 L "WR Light to 255"  "WR  Light level goes to 255"
 ldt  82 f "WR Floor dn LEF"  "WR  Lower floor to LEF"
 ldt  83 f "WR Floor dn HEF"  "WR  Lower floor to HEF"
 ldt  84 f "WR F. dn LEF NX)" "WR  Lower floor to LEF (NXP)"
-#ldt 85 x "-- Unimplemented" "--  Unimplemented"
+
+ldt  85 A "-- Scroll right"  "--  Scrolling wall, right [Boom]"
+
 ldt  86 d "WR Open door (O)" "WR  Open  door (stays open)"
 ldt  87 m "WR& Start moving" "WR& Start moving floor"
 ldt  88 l "WR Lower lift"    "WR  Lower lift"
@@ -141,7 +147,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -150,13 +156,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -188,9 +194,151 @@
 ldt 140 F "S1 Floor up 512"  "S1  Raise floor by 512, medium speed [v1.6]"
 ldt 141 C "W1& Crush SS sil" "W1& Start slow crushing, slow hurt, silent [v1.6]"
 
+ldt 142 F "W1 Floor up 512"  "W1  Raise floor by 512 [Boom]"
+ldt 143 l "W1& F. up 24 TX"  "W1& Raise floor by 24 (TX) [Boom]"
+ldt 144 l "W1& F. up 32 TX"  "W1& Raise floor by 32 (TX) [Boom]"
+ldt 145 c "W1 Ceil dn floor" "W1  Lower ceiling to floor [Boom]"
+ldt 146 x "W1 Donut"         "W1  Lower floor, raise NE floor (NXP) [Boom]"
+ldt 147 F "WR Floor up 512"  "WR  Raise floor by 512 [Boom]"
+ldt 148 l "WR& F. up 24 TX"  "WR& Raise floor by 24 (TX) [Boom]"
+ldt 149 l "WR& F. up 32 TX"  "WR& Raise floor by 32 (TX) [Boom]"
+ldt 150 C "WR& Crush SS sil" "WR& Start slow crushing, silent [Boom]"
+ldt 151 c "WR Ceil up HEC"   "WR  Raise ceiling to HEC [Boom]"
+ldt 152 c "WR Ceil dn floor" "WR  Lower ceiling to floor [Boom]"
+ldt 153 x "W1 Floor -- TXP"  "W1  Floor transfer (TXP) [Boom]"
+ldt 154 x "WR Floor -- TXP"  "WR  Floor transfer (TXP) [Boom]"
+ldt 155 x "WR Donut"         "WR  Lower floor, raise NE floor (NXP) [Boom]"
+ldt 156 L "WR Start blink"   "WR  Start blinking lights [Boom]"
+ldt 157 L "WR Light to LE"   "WR  Light level goes to LE [Boom]"
+ldt 158 F "S1 Floor up SLT"  "S1  Raise floor by ShortestLowerTex [Boom]"
+ldt 159 f "S1 F. dn LEF NX"  "S1  Lower floor to LEF (NXP) [Boom]"
+ldt 160 F "S1 F. up 24 TXP"  "S1  Raise floor by 24 (TXP) [Boom]"
+ldt 161 F "S1 Floor up 24"   "S1  Raise floor by 24 [Boom]"
+ldt 162 m "S1 Start moving"  "S1  Start moving floor [Boom]"
+ldt 163 m "S1 Stop moving f" "S1  Stop  moving floor [Boom]"
+ldt 164 C "S1 Crush FF"      "S1  Start fast crushing [Boom]"
+ldt 165 C "S1& Crush SS sil" "S1& Start slow crushing, silent [Boom]"
+ldt 166 c "S1 Ceil up HEC"   "S1  Raise ceiling to HEC [Boom]"
+ldt 167 c "S1 Ceil dn flr+8" "S1  Lower ceiling to floor + 8 [Boom]"
+ldt 168 C "S1& Stop crush"   "S1& Stop  crushing [Boom]"
+ldt 169 L "S1 Light to HE"   "S1  Light level goes to HE [Boom]"
+ldt 170 L "S1 Light to 0"    "S1  Light level goes to 0 [Boom]"
+ldt 171 L "S1 Light to 255"  "S1  Light level goes to 255 [Boom]"
+ldt 172 L "S1 Start blink"   "S1  Start blinking lights [Boom]"
+ldt 173 L "S1 Light to LE"   "S1  Light level goes to LE [Boom]"
+ldt 174 t "S1 Teleport"      "S1  Teleport to another sector [Boom]"
+ldt 175 d "S1 Close for 30s" "S1  Close door for 30 seconds [Boom]"
+ldt 176 F "SR Floor up SLT"  "SR  Raise floor by ShortestLowerTex [Boom]"
+ldt 177 f "SR F. dn LEF NX"  "SR  Lower floor to LEF (NXP) [Boom]"
+ldt 178 F "SR Floor up 512"  "SR  Raise floor by 512 [Boom]"
+ldt 179 F "SR F. up 24 TXP"  "SR  Raise floor by 24 (TXP) [Boom]"
+ldt 180 F "SR Floor up 24"   "SR  Raise floor by 24 [Boom]"
+ldt 181 m "SR Start moving"  "SR  Start moving floor [Boom]"
+ldt 182 m "SR Stop moving f" "SR  Stop  moving floor [Boom]"
+ldt 183 C "SR Crush FF"      "SR  Start fast crushing [Boom]"
+ldt 184 C "SR& Crush SS"     "SR& Start slow crushing [Boom]"
+ldt 185 C "SR& Crush SS sil" "SR& Start slow crushing, silent [Boom]"
+ldt 186 c "SR Ceil up HEC"   "SR  Raise ceiling to HEC [Boom]"
+ldt 187 c "SR Ceil dn flr+8" "SR  Lower ceiling to floor + 8 [Boom]"
+ldt 188 C "SR& Stop crush"   "SR& Stop  crushing [Boom]"
+ldt 189 x "S1 Floor -- TXP"  "S1  Floor transfer (TXP) [Boom]"
+ldt 190 x "SR Floor -- TXP"  "SR  Floor transfer (TXP) [Boom]"
+ldt 191 x "SR Donut"         "SR  Lower floor, raise NE floor (NXP) [Boom]"
+ldt 192 L "SR Light to HE"   "SR  Light level goes to HE [Boom]"
+ldt 193 L "SR Start blink"   "SR  Start blinking lights [Boom]"
+ldt 194 L "SR Light to LE"   "SR  Light level goes to LE [Boom]"
+ldt 195 t "SR Teleport"      "SR  Teleport to another sector [Boom]"
+ldt 196 d "SR Close for 30s" "SR  Close door for 30 seconds [Boom]"
+ldt 197 e "G- End level"     "G-  End level, go to next level [Boom]"
+ldt 198 e "G- End level"     "G-  End level, go to secret level [Boom]"
+ldt 199 c "W1 Ceil dn LEC"   "W1  Lower ceiling to LEC [Boom]"
+ldt 200 c "W1 Ceil dn HEF"   "W1  Lower ceiling to HEF [Boom]"
+ldt 201 c "WR Ceil dn LEC"   "WR  Lower ceiling to LEC [Boom]"
+ldt 202 c "WR Ceil dn HEF"   "WR  Lower ceiling to HEF [Boom]"
+ldt 203 c "S1 Ceil dn LEC"   "S1  Lower ceiling to LEC [Boom]"
+ldt 204 c "S1 Ceil dn HEF"   "S1  Lower ceiling to HEF [Boom]"
+ldt 205 c "SR Ceil dn LEC"   "SR  Lower ceiling to LEC [Boom]"
+ldt 206 c "SR Ceil dn HEF"   "SR  Lower ceiling to HEF [Boom]"
+ldt 207 t "W1 Teleport pres" "W1  Teleport preserving dir [Boom]"
+ldt 208 t "WR Teleport pres" "WR  Teleport preserving dir [Boom]"
+ldt 209 t "S1 Teleport pres" "S1  Teleport preserving dir [Boom]"
+ldt 210 t "SR Teleport pres" "SR  Teleport preserving dir [Boom]"
+ldt 211 m "SR Floor toggle"  "SR  Floor toggle to ceil [Boom]"
+ldt 212 m "WR Floor toggle"  "WR  Floor toggle to ceil [Boom]"
+ldt 213 L "-- Xfer F. light" "--  Transfer floor lighting [Boom]"
+ldt 214 A "-- Scrl C. accel" "--  Scroll ceiling with accel [Boom]"
+ldt 215 A "-- Scrl F. accel" "--  Scroll floor with accel [Boom]"
+ldt 216 A "-- Push F. accel" "--  Push objects with accel [Boom]"
+ldt 217 A "-- Sc/Pu F. accl" "--  Scroll & push with accel [Boom]"
+ldt 218 A "-- Scrl wall acc" "--  Scroll wall with accel [Boom]"
+ldt 219 f "W1 F. dn nlEF"    "W1  Lower floor to nlEF [Boom]"
+ldt 220 f "WR F. dn nlEF"    "WR  Lower floor to nlEF [Boom]"
+ldt 221 f "S1 F. dn nlEF"    "S1  Lower floor to nlEF [Boom]"
+ldt 222 f "SR F. dn nlEF"    "SR  Lower floor to nlEF [Boom]"
+ldt 223 x "-- Friction"      "--  Set friction in tagged sectors [Boom]"
+ldt 224 x "-- Wind force"    "--  Set wind in tagged sectors [Boom]"
+ldt 225 x "-- Current force" "--  Set current in tagged sectors [Boom]"
+ldt 226 x "-- Point force"   "--  Set point force in sectors [Boom]"
+ldt 227 v "W1 Elevator nhEF" "W1  Raise elevator to nhEF [Boom]"
+ldt 228 v "WR Elevator nhEF" "WR  Raise elevator to nhEF [Boom]"
+ldt 229 v "S1 Elevator nhEF" "S1  Raise elevator to nhEF [Boom]"
+ldt 230 v "SR Elevator nhEF" "SR  Raise elevator to nhEF [Boom]"
+ldt 231 v "W1 Elevator nlEF" "W1  Lower elevator to nlEF [Boom]"
+ldt 232 v "WR Elevator nlEF" "WR  Lower elevator to nlEF [Boom]"
+ldt 233 v "S1 Elevator nlEF" "S1  Lower elevator to nlEF [Boom]"
+ldt 234 v "SR Elevator nlEF" "SR  Lower elevator to nlEF [Boom]"
+ldt 235 v "W1 Elevator curr" "W1  Move elevator to Current [Boom]"
+ldt 236 v "WR Elevator curr" "WR  Move elevator to Current [Boom]"
+ldt 237 v "S1 Elevator curr" "S1  Move elevator to Current [Boom]"
+ldt 238 v "SR Elevator curr" "SR  Move elevator to Current [Boom]"
+ldt 239 x "W1 Floor -- NXP"  "W1  Floor transfer (NXP) [Boom]"
+ldt 240 x "WR Floor -- NXP"  "WR  Floor transfer (NXP) [Boom]"
+ldt 241 x "S1 Floor -- NXP"  "S1  Floor transfer (NXP) [Boom]"
+ldt 242 x "-- Deep water"    "--  Deep water effect [Boom]"
+ldt 243 t "W1 Telept line"   "W1  Teleport to tagged line [Boom]"
+ldt 244 t "WR Telept line"   "WR  Teleport to tagged line [Boom]"
+ldt 245 A "-- Scrl C. disp"  "--  Scroll ceiling by displacement [Boom]"
+ldt 246 A "-- Scrl F. disp"  "--  Scroll floor by displacement [Boom]"
+ldt 247 A "-- Push F. disp"  "--  Push objects by displacement [Boom]"
+ldt 248 A "-- Sc/Pu F. disp" "--  Scroll & push by displacement [Boom]"
+ldt 249 A "-- Scrl wall dis" "--  Scroll wall by displacement [Boom]"
+ldt 250 A "-- Scroll ceil"   "--  Scroll tagged ceiling [Boom]"
+ldt 251 A "-- Scroll floor"  "--  Scroll tagged floor [Boom]"
+ldt 252 A "-- Push on floor" "--  Push objects on tagged floor [Boom]"
+ldt 253 A "-- Scroll,push f" "--  Scroll & push tagged floor [Boom]"
+ldt 254 A "-- Scrl wal with" "--  Scroll tagged wall with F/C [Boom]"
+ldt 255 A "-- Scrl wal side" "--  Scroll wall using sidedef [Boom]"
+ldt 256 s "WR Raise stairs"  "WR  Raise stairs (several sectors) [Boom]"
+ldt 257 s "WR RaiseStairs16" "WR  Raise stairs (step=16), crush [Boom]"
+ldt 258 s "SR Raise stairs"  "SR  Raise stairs (several sectors) [Boom]"
+ldt 259 s "SR RaiseStairs16" "SR  Raise stairs (step=16), crush [Boom]"
+ldt 260 A "-- Translucency"  "--  Make tagged lines translucent [Boom]"
+ldt 261 L "-- Xfer C. light" "--  Transfer ceiling lighting [Boom]"
+ldt 262 t "W1 Telept line R" "W1  Teleport to line, reverse [Boom]"
+ldt 263 t "WR Telept line R" "WR  Teleport to line, reverse [Boom]"
+ldt 264 t "W1 Tpt line mons" "W1  Teleport monsters to line [Boom]"
+ldt 265 t "WR Tpt line mons" "WR  Teleport monsters to line [Boom]"
+ldt 266 t "W1 Tpt L. mons R" "W1  Teleport monsters to line, rev [Boom]"
+ldt 267 t "WR Tpt L. mons R" "WR  Teleport monsters to line, rev [Boom]"
+ldt 268 t "W1 Teleport mons" "W1  Teleport monsters only [Boom]"
+ldt 269 t "WR Teleport mons" "WR  Teleport monsters only [Boom]"
+
 ldt 271 x "-- Xfer sky"      "--  Xfer straight upper to sky tex. [MBF]"
 ldt 272 x "-- Xfer mir. sky" "--  Xfer mirrored upper to sky tex. [MBF]"
 
+ldt 300 x "SR Sliding door"  "SR  Sliding door [XDoom]"
+ldt 320 x "-- Laser barrier" "--  Laser barrier [XDoom]"
+ldt 321 x "SR Laser off mom" "SR  Switch laser barrier off momentarily [XDoom]"
+ldt 322 x "G1 Laser off per" "G1  Switch laser barrier off permanently [XDoom]"
+ldt 330 x "WR Trigger messg" "WR  Trigger communication device message [XDoom]"
+ldt 331 x "W1 Trigger messg" "W1  Trigger communication device message [XDoom]"
+ldt 332 x "S1 Activate tele" "S1  Activate teleporter with message [XDoom]"
+ldt 333 x "S1 Deact. laser"  "S1  Deactivate laser with message [XDoom]"
+ldt 334 x "M1 Trigger messg" "M1  Trigger communication device message [XDoom]"
+ldt 350 d "W1 Silent door O" "W1  Open silent door by player (stays open) [XDoom]"
+ldt 351 d "S1 Silent door O" "S1  Open silent door by player (stays open) [XDoom]"
+ldt 352 d "M1 Silent door O" "M1  Open silent door by monster (stays open) [XDoom]"
+
 ldt 400 E "-- Thick EF"      "--  Thick extrafloor [EDGE]"
 ldt 401 E "-- Thick EF upr"  "--  Thick extrafloor, side upper [EDGE]"
 ldt 402 E "-- Thick EF lwr"  "--  Thick extrafloor, side lower [EDGE]"
@@ -284,10 +432,10 @@
 thing   20 c -  20 "Dead imp"			TROOM
 thing   21 c -  16 "Dead demon"			SARGN
 thing   22 c -  16 "Dead cacodemon"		HEADL
-thing   23 c -  16 "Dead lost soul"
+thing   23 c -  16 "Dead lost soul"		SKULK
 
 thing 2035 d -  10 "Barrel"			BAR1
-thing 7011 d -  10 "Unstable barrel [EDGE]"	BEXP
+thing 7011 d -  10 "Unstable barrel [EDGE]"	BEXP	# FIXME cut off
 thing   72 d -  16 "Commander Keen"		KEEN
 thing   48 d -  16 "Technical column"		ELEC
 thing   30 d -  16 "Tall green pillar"		COL1
@@ -320,7 +468,7 @@
 thing   59 g -  16 "Hanging arms out"		GOR2
 thing   53 g -  16 "Hanging leg O"		GOR5
 thing   62 g -  16 "Hanging leg"		GOR5
-thing   51 g -  16 "Hanging one-legged O"	GOR3
+thing   51 g -  16 "Hanging one-legged O"	GOR3	# FIXME cut off
 thing   61 g -  16 "Hanging one-legged"		GOR3
 thing   52 g -  16 "Hanging torso O"		GOR4
 thing   60 g -  16 "Hanging torso"		GOR4
@@ -390,7 +538,7 @@
 thing    2 p -  16 "Player 2 start"		PLAY
 thing    3 p -  16 "Player 3 start"		PLAY
 thing    4 p -  16 "Player 4 start"		PLAY
-thing  888 p -  16 "Dog [MBF]"
+thing  888 p -  12 "Dog [MBF]"
 thing   11 p -  16 "Deathmatch start"		PLAYF1
 thing   14 p -  16 "Teleport exit"		TFOG
 
diff -uaNr yadex-1.5.2/ygd/doompr.ygd yadex-1.6.0/ygd/doompr.ygd
--- yadex-1.5.2/ygd/doompr.ygd	2000-06-22 03:31:15.000000000 +0200
+++ yadex-1.6.0/ygd/doompr.ygd	2002-05-10 09:03:31.000000000 +0200
@@ -36,7 +36,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 ldtgroup x "Misc."
 
 #
@@ -78,8 +78,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -141,7 +141,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -150,13 +150,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -263,7 +263,7 @@
 thing   20 c -  20 "Dead imp"			TROOM
 thing   21 c -  16 "Dead demon"			SARGN
 thing   22 c -  16 "Dead cacodemon"		HEADL
-thing   23 c -  16 "Dead lost soul"
+thing   23 c -  16 "Dead lost soul"		SKULK
 
 thing 2035 d -  10 "Barrel"			BAR1
 thing   48 d -  16 "Technical column"		ELEC
@@ -293,7 +293,7 @@
 thing   59 g -  16 "Hanging arms out"		GOR2
 thing   53 g -  16 "Hanging leg O"		GOR5
 thing   62 g -  16 "Hanging leg"		GOR5
-thing   51 g -  16 "Hanging one-legged O"	GOR3
+thing   51 g -  16 "Hanging one-legged O"	GOR3	# FIXME cut off
 thing   61 g -  16 "Hanging one-legged"		GOR3
 thing   52 g -  16 "Hanging torso O"		GOR4
 thing   60 g -  16 "Hanging torso"		GOR4
@@ -338,7 +338,7 @@
 thing    2 p -  16 "Player 2 start"		PLAY
 thing    3 p -  16 "Player 3 start"		PLAY
 thing    4 p -  16 "Player 4 start"		PLAY
-thing  888 p -  16 "Dog [MBF]"
+thing  888 p -  12 "Dog [MBF]"
 thing   11 p -  16 "Deathmatch start"		PLAYE1
 thing   14 p -  16 "Teleport exit"		TFOG
 
diff -uaNr yadex-1.5.2/ygd/heretic.ygd yadex-1.6.0/ygd/heretic.ygd
--- yadex-1.5.2/ygd/heretic.ygd	2000-05-07 18:06:14.000000000 +0200
+++ yadex-1.6.0/ygd/heretic.ygd	2002-05-10 09:03:34.000000000 +0200
@@ -36,7 +36,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 ldtgroup x "Misc."
 
 #
@@ -78,8 +78,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -141,7 +141,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -150,13 +150,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -236,13 +236,11 @@
 st 50 "? Wind W mid"   "? Wind blows westward"
 st 51 "? Wind W fast"  "? Wind blows westward fast" 
 
-
 #
 #	Definition of thing groups
 #	Format is : thinggroup <thinggroup> <colour> <description>
 #
 
-
 thinggroup p rgb:4/f/4 "Player"
 thinggroup m rgb:f/0/0 "Monster"
 thinggroup w rgb:f/a/0 "Weapon"
@@ -257,7 +255,6 @@
 thinggroup e rgb:0/b/d "Environment sound"
 thinggroup s rgb:0/b/d "Ambient sound"
 
-
 #
 #	Definition of things
 #	Format is :
diff -uaNr yadex-1.5.2/ygd/hexen.ygd yadex-1.6.0/ygd/hexen.ygd
--- yadex-1.5.2/ygd/hexen.ygd	2000-07-19 02:01:43.000000000 +0200
+++ yadex-1.6.0/ygd/hexen.ygd	2002-12-31 03:53:33.000000000 +0100
@@ -6,8 +6,7 @@
 #	AYM 1999-02-25
 #
 
-# FIXME Copied from heretic.ygd -- completely broken.
-# Most things definitions are wrong.
+# FIXME lots of things are missing, some are even wrong.
 
 level_format    hexen
 level_name      map01
@@ -22,20 +21,19 @@
 #
 
 ldtgroup d "Door"
-ldtgroup r "Door (red key)"
-ldtgroup y "Door (yellow key)"
-ldtgroup b "Door (blue key)"
-ldtgroup D "Door (turbo)"
 ldtgroup l "Lift"
-ldtgroup F "Floor (raise)"
-ldtgroup f "Floor (lower)"
+ldtgroup e "Elevator"
+ldtgroup f "Floor"
 ldtgroup c "Ceiling"
-ldtgroup C "Crushing ceiling"
 ldtgroup t "Teleport"
 ldtgroup L "Light"
-ldtgroup e "End level"
-ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup p "Polyobj"
+ldtgroup P "Pillar"
+ldtgroup q "Quake"
+ldtgroup t "Teleport"
+ldtgroup T "Things"
+ldtgroup s "Stairs"
+ldtgroup a "ACS"
 ldtgroup x "Misc."
 
 #
@@ -45,147 +43,91 @@
 #
 
 ldt   0 x "-- Normal"        "--  Normal"
-ldt   1 d "DR Open door"     "DR  Open  door"
-ldt   2 d "W1 Open door (O)" "W1  Open  door (stays open)"
-ldt   3 d "W1 Close door"    "W1  Close door"
-ldt   4 d "W1 Open door"     "W1  Open  door"
-ldt   5 F "W1 Floor up LIC"  "W1  Raise floor to LIC"
-ldt   6 C "W1 Crush FF"      "W1  Start fast crushing, fast hurt"
-ldt   7 s "S1 Raise stairs"  "S1  Raise stairs (several sectors 0/999)"
-ldt   8 s "W1 Raise stairs"  "W1  Raise stairs (several sectors 0/999)"
-ldt   9 x "S1 Donut"         "S1  Lower floor, raise Ne. floor (NXP) 'Donut'"
-ldt  10 l "W1 Lower lift"    "W1  Lower lift"
-ldt  11 e "S- End level"     "S-  End level, go to next level"
-ldt  12 L "W1 Light to HE"   "W1  Light level goes to HE"
-ldt  13 L "W1 Light to 255"  "W1  Light level goes to 255"
-ldt  14 F "S1& F. up 32 TX"  "S1& Raise floor by 32 (TX)"
-ldt  15 F "S1& F. up 24 TX"  "S1& Raise floor by 24 (TX)"
-ldt  16 d "W1 Close for 30s" "W1  Close door for 30 seconds"
-ldt  17 L "W1 Start blink"   "W1  Start blinking lights"
-ldt  18 F "S1 Floor up nhEF" "S1  Raise floor to nhEF"
-ldt  19 f "W1 Floor dn HEF"  "W1  Lower floor to HEF"
-ldt  20 F "S1& F up nhEF TX" "S1& Raise floor to nhEF (TX)"
-ldt  21 l "S1 Lower lift"    "S1  Lower lift"
-ldt  22 F "W1& F up nhEF TX" "W1& Raise floor to nhEF (TX)"
-ldt  23 f "S1 Floor dn LEF"  "S1  Lower floor to LEF"
-ldt  24 F "G1 Floor up LIC"  "G1  Raise floor to LIC"
-ldt  25 C "W1 Crush FS"      "W1  Start fast crushing, slow hurt"
-ldt  26 b "DR Open blue dr"  "DR  Open  door, blue key"
-ldt  27 y "DR Open yel dr"   "DR  Open  door, yellow key"
-ldt  28 r "DR Open red dr"   "DR  Open  door, red key"
-ldt  29 d "S1 Open door"     "S1  Open  door"
-ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
-ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
-ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
-ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
-ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
-ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
-ldt  38 f "W1 Floor dn LEF"  "W1  Lower floor to LEF"
-ldt  39 t "W1 Teleport"      "W1  Teleport to another sector"
-ldt  40 c "W1 Ceil up HEC"   "W1  Raise ceiling to HEC"
-ldt  41 c "S1 Ceil dn floor" "S1  Lower ceiling to floor"
-ldt  42 d "SR Close door"    "SR  Close door"
-ldt  43 c "SR Ceil dn floor" "SR  Lower ceiling to floor"
-ldt  44 c "W1 Ceil dn flr+8" "W1  Lower ceiling to floor + 8"
-ldt  45 f "SR Floor dn HEF"  "SR  Lower floor to HEF"
-ldt  46 d "GR Open door (O)" "GR  Open  door (stays open)"
-ldt  47 F "G1 F. up nhEF TX" "G1  Raise floor to nhEF (TX)"
-ldt  48 x "-- Animated wall" "--  Animated wall (scrolls horizontally)"
-ldt  49 c "S1 Ceil dn flr+8" "S1  Lower ceiling to floor + 8"
-ldt  50 d "S1 Close door"    "S1  Close door"
-ldt  51 e "S- Secret level"  "S-  End level, go to secret level"
-ldt  52 e "W- End level"     "W-  End level, go to next level"
-ldt  53 m "W1 Start moving"  "W1  Start moving floor"
-ldt  54 m "W1 Stop moving f" "W1  Stop  moving floor"
-ldt  55 F "S1 F. up LIC-8"   "S1  Raise floor to LIC - 8, crush"
-ldt  56 F "W1& F. up LIC-8"  "W1& Raise floor to LIC - 8, crush"
-ldt  57 C "W1& Stop crush"   "W1& Stop  crushing"
-ldt  58 F "W1 Floor up 24"   "W1  Raise floor by 24"
-ldt  59 F "W1 F. up 24 TXP"  "W1  Raise floor by 24 (TXP)"
-ldt  60 f "SR Floor dn LEF"  "SR  Lower floor to LEF"
-ldt  61 d "SR Open door (O)" "SR  Open  door (stays open)"
-ldt  62 l "SR Lower lift"    "SR  Lower lift"
-ldt  63 d "SR Open door"     "SR  Open  door"
-ldt  64 F "SR Floor up LIC"  "SR  Raise floor to LIC"
-ldt  65 F "SR F. up LIC-8"   "SR  Raise floor to LIC - 8, crush"
-ldt  66 F "SR& F. up 24 TX"  "SR& Raise floor by 24 (TX)"
-ldt  67 F "SR& F. up 32 TX"  "SR& Raise floor by 32 (TX)"
-ldt  68 f "SR& F dn nhEF TX" "SR& Lower floor to nhEF (TX)"
-ldt  69 F "SR F. up nhEF"    "SR  Raise floor to nhEF"
-ldt  70 f "SR F. dn HEF+8"   "SR  Lower floor to HEF + 8"
-ldt  71 f "S1 F. dn HEF+8"   "S1  Lower floor to HEF + 8"
-ldt  72 c "WR Ceil dn flr+8" "WR  Lower ceiling to floor + 8"
-ldt  73 C "WR& Crush SS"     "WR& Start slow crushing, slow hurt"
-ldt  74 C "WR& Stop crush"   "WR& Stop  crushing"
-ldt  75 d "WR Close door"    "WR  Close door"
-ldt  76 d "WR Close for 30s" "WR  Close door for 30 seconds"
-ldt  77 C "WR& Crush FF"     "WR& Start fast crushing, fast hurt"
-#ldt 78 x "-- Unimplemented" "--  Unimplemented"
-ldt  79 L "WR Light to 0"    "WR  Light level goes to 0"
-ldt  80 L "WR Light to HE"   "WR  Light level goes to HE"
-ldt  81 L "WR Light to 255"  "WR  Light level goes to 255"
-ldt  82 f "WR Floor dn LEF"  "WR  Lower floor to LEF"
-ldt  83 f "WR Floor dn HEF"  "WR  Lower floor to HEF"
-ldt  84 f "WR F. dn LEF NX)" "WR  Lower floor to LEF (NXP)"
-#ldt 85 x "-- Unimplemented" "--  Unimplemented"
-ldt  86 d "WR Open door (O)" "WR  Open  door (stays open)"
-ldt  87 m "WR& Start moving" "WR& Start moving floor"
-ldt  88 l "WR Lower lift"    "WR  Lower lift"
-ldt  89 m "WR& Stop moving"  "WR& Stop  moving floor"
-ldt  90 d "WR Open door"     "WR  Open  door"
-ldt  91 F "WR Floor up LIC"  "WR  Raise floor to LIC"
-ldt  92 F "WR Floor up 24"   "WR  Raise floor by 24"
-ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
-ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
-ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
-ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
-ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
-ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
-ldt 100 s "W1 RaiseStairs16" "W1  Raise stairs (step=16), crush [v1.6]"
-ldt 101 F "S1 Floor up LIC"  "S1  Raise floor to LIC"
-ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
-ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
-ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
-ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
-ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
-ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
-ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
-ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
-ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
-ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
-ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
-ldt 115 D "SR OPEN door (O)" "SR  Open  turbo door (stays open) [v1.6]"
-ldt 116 D "SR CLOSE door"    "SR  Close turbo door [v1.6]"
-ldt 117 D "DR OPEN door"     "DR  Open  turbo door [v1.6]"
-ldt 118 D "D1 OPEN door (O)" "D1  Open  turbo door (stays open) [v1.6]"
-ldt 119 F "W1 Floor up nhEF" "W1  Raise floor to nhEF [v1.6]"
-ldt 120 l "WR LOWER lift"    "WR  Lower turbo lift [v1.6]"
-ldt 121 l "W1 LOWER lift"    "W1  Lower turbo lift [v1.6]"
-ldt 122 l "S1 LOWER lift"    "S1  Lower turbo lift [v1.6]"
-ldt 123 l "SR LOWER lift"    "SR  Lower turbo lift [v1.6]"
-ldt 124 e "W- Secret level"  "W-  End level, go to secret level [v1.6]"
-ldt 125 t "W1 Teleport mons" "W1  Teleport monsters only [v1.6]"
-ldt 126 t "WR Teleport mons" "WR  Teleport monsters only [v1.6]"
-ldt 127 s "S1 RaiseStairs16" "S1  Raise stairs (step=16), crush [v1.6]"
-ldt 128 F "WR Floor up nhEF" "WR  Raise floor to nhEF [v1.6]"
-ldt 129 F "WR Floor UP nhEF" "WR  Raise turbo floor to nhEF [v1.6]"
-ldt 130 F "W1 Floor UP nhEF" "W1  Raise turbo floor to nhEF [v1.6]"
-ldt 131 F "S1 Floor UP nhEF" "S1  Raise turbo floor to nhEF [v1.6]"
-ldt 132 F "SR Floor UP nhEF" "SR  Raise turbo floor to nhEF [v1.6]"
-ldt 133 b "S1 OPEN blu door" "S1  Open  turbo door, blue key [v1.6]"
-ldt 134 r "SR OPEN red door" "SR  Open  turbo door, red key [v1.6]"
-ldt 135 r "S1 OPEN red door" "S1  Open  turbo door, red key [v1.6]"
-ldt 136 y "SR OPEN yel door" "SR  Open  turbo door, yellow key [v1.6]"
-ldt 137 y "S1 OPEN yel door" "S1  Open  turbo door, yellow key [v1.6]"
-ldt 138 L "SR Light to 255"  "SR  Light level goes to 255 [v1.6]"
-ldt 139 L "SR Light to 0"    "SR  Light level goes to 0 [v1.6]"
-ldt 140 F "S1 Floor up 512"  "S1  Raise floor by 512, medium speed [v1.6]"
-ldt 141 C "W1& Crush SS sil" "W1& Start slow crushing, slow hurt, silent [v1.6]"
+ldt   1 p "?? Polyobj start" "??  Polyobj_StartLine"
+ldt   2 p "?? Rol polyobj"   "??  Polyobj_RotateLeft"
+ldt   3 p "?? Ror polyobj"   "??  Polyobj_RotateRight"
+ldt   4 p "?? Move poly"     "??  Polyobj_Move"
+ldt   5 p "?? Poly explicit" "??  Polyobj_ExplicitLine"
+ldt   6 p "?? Move8x poly"   "??  Polyobj_MoveTimes8"
+ldt   7 p "?? Polyobj swing" "??  Polyobj_DoorSwing"
+ldt   8 p "?? Polyobj slide" "??  Polyobj_DoorSlide"
+ldt  10 d "?? Close door"    "??  Door_Close"
+ldt  11 d "?? Open door"     "??  Door_Open"
+ldt  12 d "?? Raise door"    "??  Door_Raise"
+ldt  13 d "?? Raise locked"  "??  Door_LockedRaise"
+ldt  20 f "?? Lower floor"   "??  Floor_LowerByValue"
+ldt  21 f "?? Lower floor L" "??  Floor_LowerToLowest"
+ldt  22 f "?? Lower fl nl"   "??  Floor_LowerToNearest"
+ldt  23 f "?? Raise floor"   "??  Floor_RaiseByValue"
+ldt  24 f "?? Raise floor H" "??  Floor_RaiseToHighest"
+ldt  25 f "?? Raise fl nh"   "??  Floor_RaiseToNearest"
+ldt  26 s "?? Stairs down"   "??  Stairs_BuildDown"
+ldt  27 s "?? Stairs up"     "??  Stairs_BuildUp"
+ldt  28 f "?? Raise f crush" "??  Floor_RaiseAndCrush"
+ldt  29 P "?? Build pillar"  "??  Pillar_Build"
+ldt  30 P "?? Open pillar"   "??  Pillar_Open"
+ldt  31 s "?? Stairs dn syn" "??  Stairs_BuildDownSync"
+ldt  32 s "?? Stairs up syn" "??  Stairs_BuildUpSync"
+ldt  35 f "?? Raise8x floor" "??  Floor_RaiseByValueTimes8"
+ldt  36 f "?? Lower8x floor" "??  Floor_LowerByValueTimes8"
+ldt  40 c "?? Lower ceil va" "??  Ceiling_LowerByValue"
+ldt  41 c "?? Raise ceil va" "??  Ceiling_RaiseByValue"
+ldt  42 c "?? Ceil crush 1"  "??  Ceiling_CrushAndRaise"
+ldt  43 c "?? Ceil crush 2"  "??  Ceiling_LowerAndCrush"
+ldt  44 c "?? Stop ceilcrsh" "??  Ceiling_CrushStop"
+ldt  45 c "?? Ceil crush 3"  "??  Ceiling_CrushRaiseAndStay"
+ldt  46 f "?? Stop fl crush" "??  Floor_CrushStop"
+ldt  60 l "?? Raise plat"    "??  Plat_PerpetualRaise"
+ldt  61 l "?? Stop plat"     "??  Plat_Stop"
+ldt  62 l "?? Lower lift"    "??  Plat_DownWaitUpStay"
+ldt  63 l "?? Plat down"     "??  Plat_DownByValue"
+ldt  64 l "?? Raise lift"    "??  Plat_UpWaitDownStay"
+ldt  65 l "?? Plat up"       "??  Plat_UpByValue"
+ldt  66 f "?? Lower F insta" "??  Floor_LowerInstant"
+ldt  67 f "?? Raise F insta" "??  Floor_RaiseInstant"
+ldt  68 f "?? Move8x floor"  "??  Floor_MoveToValueTimes8"
+ldt  69 c "?? Move8x ceilng" "??  Ceiling_MoveToValueTimes8"
+ldt  70 t "?? Teleport"      "??  Teleport"
+ldt  71 t "?? Telept no fog" "??  Teleport_NoFog"
+ldt  72 T "?? Thrush thing"  "??  ThrustThing"
+ldt  73 T "?? Damage thing"  "??  DamageThing"
+ldt  74 x "?? Teleport map"  "??  Teleport_NewMap"
+ldt  75 x "?? Teleport end"  "??  Teleport_EndGame"
+ldt  80 a "?? Execute ACS"   "??  ACS_Execute"
+ldt  81 a "?? Suspend ACS"   "??  ACS_Suspend"
+ldt  82 a "?? Terminate ACS" "??  ACS_Terminate"
+ldt  83 a "?? Lock-exec ACS" "??  ACS_LockedExecute"
+ldt  90 p "?? Rol poly OR"   "??  Polyobj_OR_RotateLeft"
+ldt  91 p "?? Ror poly OR"   "??  Polyobj_OR_RotateRight"
+ldt  92 p "?? Move poly OR"  "??  Polyobj_OR_Move"
+ldt  93 p "?? Mov8x poly OR" "??  Polyobj_OR_MoveTimes8"
+ldt  94 P "?? Crush pillar"  "??  Pillar_BuildAndCrush"
+ldt  95 e "?? Lower fl+ceil" "??  FloorAndCeiling_LowerByValue"
+ldt  96 e "?? Raise fl+ceil" "??  FloorAndCeiling_RaiseByValue"
+ldt 100 x "?? Scroll left"   "??  Scroll_Texture_Left"
+ldt 101 x "?? Scroll right"  "??  Scroll_Texture_Right"
+ldt 102 x "?? Scroll up"     "??  Scroll_Texture_Up"
+ldt 103 x "?? Scroll down"   "??  Scroll_Texture_Down"
+ldt 110 L "?? Raise light"   "??  Light_RaiseByValue"
+ldt 111 L "?? Lower light"   "??  Light_LowerByValue"
+ldt 112 L "?? Set light"     "??  Light_ChangeToValue"
+ldt 113 L "?? Fade light"    "??  Light_Fade"
+ldt 114 L "?? Glow light"    "??  Light_Glow"
+ldt 115 L "?? Flicker light" "??  Light_Flicker"
+ldt 116 L "?? Strobe light"  "??  Light_Strobe"
+ldt 120 q "?? Radius quake"  "??  Radius_Quake"
+ldt 121 x "?? Set line id"   "??  Line_SetIdentification"
+ldt 129 x "?? Use pzzl item" "??  UsePuzzleItem"
+ldt 130 T "?? Activate thng" "??  Thing_Activate"
+ldt 131 T "?? Deact. thing"  "??  Thing_Deactivate"
+ldt 132 T "?? Remove thing"  "??  Thing_Remove"
+ldt 133 T "?? Destroy thing" "??  Thing_Destroy"
+ldt 134 T "?? Projectile th" "??  Thing_Projectile"
+ldt 135 T "?? Spawn thing"   "??  Thing_Spawn"
+ldt 136 T "?? Gravity thing" "??  Thing_ProjectileGravity"
+ldt 137 T "?? Spawn no fog"  "??  Thing_SpawnNoFog"
+ldt 138 q "?? Waggle floor"  "??  Floor_Waggle"
+ldt 140 x "?? Change sound"  "??  Sector_ChangeSound"
 
 #
 #	Definition of sector types
@@ -193,55 +135,59 @@
 #	<shortdesc> must not exceed 14 characters.
 #
 
-st  0 "X Normal"       "X Normal"
-st  1 "  Blinks rand"  "  Light blinks randomly"
-st  2 "  Flashes 2 Hz" "  Light flashes 2 Hz"
-st  3 "  Flashes 1 Hz" "  Light flashes 1 Hz"
-st  4 "P -20% & 2Hz"   "P -10/20% health, flashes 2 Hz"
-st  5 "P -10% health"  "P -5/10% health"
-st  6 "? Crush raise"  "? Ceiling crush and raise"
-st  7 "P -5% health"   "P -2/5% health"
-st  8 "  Oscillates"   "  Light oscillates"
-st  9 "P Secret"       "P Secret"
-st 10 "  Closes 30 s"  "  30 s after level start, ceiling closes like a door"
-st 11 "P -20% & end"   "P -10/20% health and end level when health <= 10%"
-st 12 "  Flash1Hz syn" "  Light flashes 1 Hz, synchronized"
-st 13 "  Flash2Hz syn" "  Light flashes 2 Hz, synchronized"
-st 14 "  Opens 300 s"  "  300 s after level start, ceiling opens like a door"
-st 15 "? Friction"     "? Friction"
-st 16 "P -20% health"  "P -10/20% health"
-st 21 "? Flow E slow"  "? Floor scrolls eastward slowly"
-st 22 "? Flow E mid"   "? Floor scrolls eastward"
-st 23 "? Flow E fast"  "? Floor scrolls eastward fast"
-st 26 "? Flow N slow"  "? Floor scrolls northward slowly" 
-st 27 "? Flow N mid"   "? Floor scrolls northward"
-st 28 "? Flow N fast"  "? Floor scrolls northward fast" 
-st 31 "? Flow S slow"  "? Floor scrolls southward slowly" 
-st 32 "? Flow S mid"   "? Floor scrolls southward"
-st 33 "? Flow S fast"  "? Floor scrolls southward fast" 
-st 36 "? Flow W slow"  "? Floor scrolls westward slowly" 
-st 37 "? Flow W mid"   "? Floor scrolls westward"
-st 38 "? Flow W fast"  "? Floor scrolls westward fast" 
-st 40 "? Wind E slow"  "? Wind blows eastward slowly"
-st 41 "? Wind E mid"   "? Wind blows eastward"
-st 42 "? Wind E fast"  "? Wind blows eastward fast"
-st 43 "? Wind N slow"  "? Wind blows northward slowly" 
-st 44 "? Wind N mid"   "? Wind blows northward"
-st 45 "? Wind N fast"  "? Wind blows northward fast" 
-st 46 "? Wind S slow"  "? Wind blows southward slowly" 
-st 47 "? Wind S mid"   "? Wind blows southward"
-st 48 "? Wind S fast"  "? Wind blows southward fast" 
-st 49 "? Wind W slow"  "? Wind blows westward slowly" 
-st 50 "? Wind W mid"   "? Wind blows westward"
-st 51 "? Wind W fast"  "? Wind blows westward fast" 
-
+st   0 "  Normal"       "Normal"
+st   1 "  Phased light" "light phased"           # FIXME
+st   2 "  Light start"  "lightsequencestart"     # FIXME
+st   3 "  Light specl1" "lightsequencespecial1"  # FIXME
+st   4 "  Light specl2" "lightsequencespecial2"  # FIXME
+st   9 "  Secret"       "Sector counts toward secret count"
+st  26 "  Stairs1"      "Stairs special 1"
+st  27 "  Stairs2"      "Stairs special 2"
+st  40 "  Wind east 1"  "Wind east force 1"
+st  41 "  Wind east 2"  "Wind east force 2"
+st  42 "  Wind east 3"  "Wind east force 3"
+st  43 "  Wind north 1" "Wind north force 1"
+st  44 "  Wind north 2" "Wind north force 2"
+st  45 "  Wind north 3" "Wind north force 3"
+st  46 "  Wind south 1" "Wind south force 1"
+st  47 "  Wind south 2" "Wind south force 2"
+st  48 "  Wind south 3" "Wind south force 3"
+st  49 "  Wind west 1"  "Wind west force 1"
+st  50 "  Wind west 2"  "Wind west force 2"
+st  51 "  Wind west 3"  "Wind west force 3"
+st 198 "  Lightning 64" "Indoor lightning, +64 units"
+st 199 "  Lightning 32" "Indoor lightning, +32 units"
+st 200 "  Sky2"         "Use MAPINFO sky2"
+st 201 "  Scroll N slo" "Scroll north slow"
+st 202 "  Scroll N med" "Scroll north medium"
+st 203 "  Scroll N fas" "Scroll north fast"
+st 204 "  Scroll E slo" "Scroll east slow"
+st 205 "  Scroll E med" "Scroll east medium"
+st 206 "  Scroll E fas" "Scroll east fast"
+st 207 "  Scroll S slo" "Scroll south slow"
+st 208 "  Scroll S med" "Scroll south medium"
+st 209 "  Scroll S fas" "Scroll south fast"
+st 210 "  Scroll W slo" "Scroll west slow"
+st 211 "  Scroll W med" "Scroll west medium"
+st 212 "  Scroll W fas" "Scroll west fast"
+st 213 "  Scroll NW S"  "Scroll northwest slow"
+st 214 "  Scroll NW M"  "Scroll northwest medium"
+st 215 "  Scroll NW F"  "Scroll northwest fast"
+st 216 "  Scroll NE S"  "Scroll northeast slow"
+st 217 "  Scroll NE M"  "Scroll northeast medium"
+st 218 "  Scroll NE F"  "Scroll northeast fast"
+st 219 "  Scroll SE S"  "Scroll southeast slow"
+st 220 "  Scroll SE M"  "Scroll southeast medium"
+st 221 "  Scroll SE F"  "Scroll southeast fast"
+st 222 "  Scroll SW S"  "Scroll southwest slow"
+st 223 "  Scroll SW M"  "Scroll southwest medium"
+st 224 "  Scroll SW F"  "Scroll southwest fast"
 
 #
 #	Definition of thing groups
 #	Format is : thinggroup <thinggroup> <colour> <description>
 #
 
-
 thinggroup p rgb:4/f/4 "Player"
 thinggroup m rgb:f/0/0 "Monster"
 thinggroup w rgb:f/a/0 "Weapon"
@@ -257,7 +203,6 @@
 thinggroup e rgb:0/b/d "Environment sound"
 thinggroup s rgb:0/b/d "Ambient sound"
 
-
 #
 #	Definition of things
 #	Format is :
@@ -274,6 +219,9 @@
 
 thing    31 m -   32 "Demon"			DEMN
 thing   107 m -   20 "Centaur"			CENT
+thing   115 m -   20 "Centaur leader"		CENTF
+thing   120 m -   17 "Serpent leader"		SSPTK	# Not too sure...
+thing   121 m -   17 "Serpent"			SSDV	# Not too sure...
 thing  8020 m -   22 "Ice guy"			ICEY
 thing 10030 m -   25 "Ettin"			ETTN
 thing 10060 m -   20 "Fire demon"		FDMN
@@ -282,6 +230,10 @@
 thing    53 w -   17 "Frost chards"		WMCS   # Mage
 thing  8010 w -   17 "Timon's axe"		WFAX   # Fighter
 
+thing   122 a -   17 "Blue manna"		MAN1
+thing   124 a -   17 "Green manna"		MAN2
+thing  8004 a -   17 "Combined manna"		MAN3
+
 thing    81 h -   17 "Crystal vial"		PTN1
 thing    82 h -   17 "Quartz flask"		PTN2
 thing  8000 h -   17 "Flechette"		PSBG
diff -uaNr yadex-1.5.2/ygd/strife.ygd yadex-1.6.0/ygd/strife.ygd
--- yadex-1.5.2/ygd/strife.ygd	2000-06-22 03:32:05.000000000 +0200
+++ yadex-1.6.0/ygd/strife.ygd	2002-12-01 19:32:41.000000000 +0100
@@ -43,7 +43,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 #ldtgroup B "Force fields"
 ldtgroup x "Misc."
 
@@ -86,8 +86,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -149,7 +149,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -158,13 +158,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -263,7 +263,9 @@
 thing   24 d -   10 "Siren"			KLAX
 thing   33 d -   16 "Dead tree"			TRE1
 thing   44 d -   16 "Statue"			STAT
+thing   46 d -   17 "Lantern"			LANT
 thing   48 d -   16 "Electrical column"		MONI
+thing   50 d -   17 "Torch on a stand"		LOGS
 thing   51 d -   16 "Palm tree"			TREEA
 thing   60 d -   10 "Small shrub"		BUSH
 thing   62 d -   10 "Shrub"			SHRB
@@ -288,6 +290,8 @@
 
 thing 2011 h -   20 "Med patch"			STMP
 thing 2012 h -   20 "Medical kit"		MDKT
+thing 2018 h -   17 "Leather armor"		ARM2
+thing 2019 h -   17 "Metal armor"		ARM1
 thing 2024 h -   20 "Shadow armor"		SHD1
 
 thing   34 l -   16 "Candle"			CNDL
@@ -316,19 +320,22 @@
 thing  187 e -   20 "Bishop?"			MLDR
 thing   76 e -   20 "Oracle's specter"		ALN1
 thing   12 e -   20 "Loremaster"		PRST
-thing   26 e -   20 "Entity nest? (pod?)"       NEST
-thing  198 e -   20 "Entity pod? (nest?)"       PODD
+thing   26 e -   20 "Entity nest? (pod?)"	NEST
+thing  198 e -   20 "Entity pod? (nest?)"	PODD
+thing   27 e -   17 "Turret"			TURT
 
 thing   72 n -   16 "Bar keeper"		MRBD # Brownish, sandy brown
 thing   73 n -   16 "Armourer"			MRBD # Nat, nat
 thing  116 n -   16 "Bowyer/Feris"		MRBD # Green, black
 thing   65 n -   20 "Harris"			PEAS # Red
-thing  130 n -   20 "Peasant, pacing"		PEAS # Greenish beige
+thing  130 n -   20 "Peasant (beige)"		PEAS # Default (beige)
 thing  132 n -   20 "Harris"			PEAS # Red
+thing  137 n -   20 "Peasant (brown)"		PEAS # Brown
 thing  169 n -   20 "Spawned peasant"		PEAS # Red
 thing  170 n -   20 "Peasant spawner"		PEAS # Red
+thing  173 n -   20 "Peasant (green)"		PEAS # Green
 thing  181 n -   20 "Governor Mourel"		PEAS # Cyan
-thing 3004 n -   20 "Peasant, standing"		PEAS # Greenish beige
+thing 3004 n -   20 "Peasant (beige)"		PEAS # Default (beige)
 thing  172 n -   20 "Richter"			PEAS # Dark green
 #Thing widths below are guesses  --mattm
 thing  141 n -   20 "MacGuffin/beggar"		BEGR
@@ -372,9 +379,10 @@
 thing  154 w -   16 "Grenade launcher"		GRND
 thing 2004 w -   16 "Mauler"			TRPD
 thing 2006 w -   16 "Pulse rifle"		RIFLB0
+thing   81 w -   17 "Sigil (assembled)"		SIGLE0
 
 thing 2007 a -   16 "Clip of bullets"		BLIT
-thing 2048 a -   16 "Box of ammo"		BBOX
+thing 2048 a -   16 "Ammo"			BBOX
 thing  115 a -   16 "Poison bolts"		PQRL
 thing  114 a -   16 "Electric bolts"		XQRL
 thing  152 a -   16 "He-grenade rounds"		GRN1
@@ -385,13 +393,16 @@
 #thing widths below are guesses  --mattm
 thing   17 a -   16 "Energy pack"		CPAC
 
+thing  138 b -   17 "10 gold"			CRED
+thing   10 b -   17 "Teleporter beacon"		BEAC
 thing  207 b -   20 "Targeter"			TARG
 thing 2025 b -   20 "Environmental suit"	MASK
+thing 2026 b -   17 "Map"			PMAP
 
 #Thing widths below are guesses  --mattm
 thing   59 k -   20 "Degnin ore"		XPRK
 thing  205 k -   20 "Chalice"			RELC
-thing  220 k -   20 "The Front's coupling"      COUPA0
+thing  220 k -   20 "The Front's coupling"	COUPA0
 thing  226 k -   20 "Junked coupling"		COUPC0
 thing   52 k -   20 "Officer's uniform"		OFIC
 
diff -uaNr yadex-1.5.2/ygd/strife10.ygd yadex-1.6.0/ygd/strife10.ygd
--- yadex-1.5.2/ygd/strife10.ygd	2000-08-24 17:05:03.000000000 +0200
+++ yadex-1.6.0/ygd/strife10.ygd	2002-12-01 19:19:58.000000000 +0100
@@ -43,7 +43,7 @@
 ldtgroup L "Light"
 ldtgroup e "End level"
 ldtgroup m "Moving floor"
-ldtgroup s "Raising stair"
+ldtgroup s "Raising stairs"
 #ldtgroup B "Force fields"
 ldtgroup x "Misc."
 
@@ -86,8 +86,8 @@
 ldt  30 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
 ldt  31 d "D1 Open door (O)" "D1  Open  door (stays open)"
 ldt  32 b "D1 Open blu (O)"  "D1  Open  door (stays open), blue key"
-ldt  33 r "D1 Open yel (O)"  "D1  Open  door (stays open), red key"
-ldt  34 y "D1 Open red (O)"  "D1  Open  door (stays open), yellow key"
+ldt  33 r "D1 Open red (O)"  "D1  Open  door (stays open), red key"
+ldt  34 y "D1 Open yel (O)"  "D1  Open  door (stays open), yellow key"
 ldt  35 L "W1 Light to 0"    "W1  Light level goes to 0"
 ldt  36 f "W1 F. Dn HEF+8"   "W1  Lower floor fast to HEF + 8"
 ldt  37 f "W1 F. dn LEF NXP" "W1  Lower floor to LEF (NXP)"
@@ -149,7 +149,7 @@
 ldt  93 F "WR F. up 24 TXP"  "WR  Raise floor by 24 (TXP)"
 ldt  94 F "WR F. up LIC-8"   "WR  Raise floor to LIC - 8, crush"
 ldt  95 F "WR F. up nhEF TX" "WR  Raise floor to nhEF (TX)"
-ldt  96 F "W1 Floor up SLT"  "W1  Raise floor by ShortestLowerTexture"
+ldt  96 F "WR Floor up SLT"  "WR  Raise floor by ShortestLowerTexture"
 ldt  97 t "WR Teleport"      "WR  Teleport to another sector"
 ldt  98 f "WR F. Dn HEF+8"   "WR  Lower floor fast to HEF + 8"
 ldt  99 b "SR OPEN blu door" "SR  Open  turbo door, blue key [v1.6]"
@@ -158,13 +158,13 @@
 ldt 102 f "S1 Floor dn HEF"  "S1  Lower floor to HEF"
 ldt 103 d "S1 Open door (O)" "S1  Open  door (stays open)"
 ldt 104 L "W1 Light to LE"   "W1  Light level goes to LE"
-ldt 105 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
+ldt 105 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
 ldt 106 D "WR OPEN door (O)" "WR  Open  turbo door (stays open) [v1.6]"
 ldt 107 D "WR CLOSE door"    "WR  Close turbo door [v1.6]"
 ldt 108 D "W1 OPEN door"     "W1  Open  turbo door [v1.6]"
 ldt 109 D "W1 OPEN door (O)" "W1  Open  turbo door (stays open) [v1.6]"
 ldt 110 D "W1 CLOSE door"    "W1  Close turbo door [v1.6]"
-ldt 111 D "WR OPEN door"     "WR  Open  turbo door [v1.6]"
+ldt 111 D "S1 OPEN door"     "S1  Open  turbo door [v1.6]"
 ldt 112 D "S1 OPEN door (O)" "S1  Open  turbo door (stays open) [v1.6]"
 ldt 113 D "S1 CLOSE door"    "S1  Close turbo door [v1.6]"
 ldt 114 D "SR OPEN door"     "SR  Open  turbo door [v1.6]"
@@ -263,7 +263,9 @@
 thing   24 d -   10 "Siren"			KLAX
 thing   33 d -   16 "Dead tree"			TRE1
 thing   44 d -   16 "Statue"			STAT
+thing   46 d -   17 "Lantern"			LANT
 thing   48 d -   16 "Electrical column"		MONI
+thing   50 d -   17 "Torch on a stand"		LOGS
 thing   51 d -   16 "Palm tree"			TREEA
 thing   60 d -   10 "Small shrub"		BUSH
 thing   62 d -   10 "Shrub"			SHRB
@@ -288,6 +290,8 @@
 
 thing 2011 h -   20 "Med patch"			STMP
 thing 2012 h -   20 "Medical kit"		MDKT
+thing 2018 h -   17 "Leather armor"		ARM2
+thing 2019 h -   17 "Metal armor"		ARM1
 thing 2024 h -   20 "Shadow armor"		SHD1
 
 thing   34 l -   16 "Candle"			CNDL
@@ -318,17 +322,20 @@
 thing   12 e -   20 "Loremaster"		PRST
 thing   26 e -   20 "Entity nest? (pod?)"       NEST
 thing  198 e -   20 "Entity pod? (nest?)"       PODD
+thing   27 e -   17 "Turret"			TURT
 
 thing   72 n -   16 "Bar keeper"		MRBD # Brownish, sandy brown
 thing   73 n -   16 "Armourer"			MRBD # Nat, nat
 thing  116 n -   16 "Bowyer/Feris"		MRBD # Green, black
 thing   65 n -   20 "Harris"			PEAS # Red
-thing  130 n -   20 "Peasant, pacing"		PEAS # Greenish beige
+thing  130 n -   20 "Peasant (greenish beige)"	PEAS # Greenish beige
 thing  132 n -   20 "Harris"			PEAS # Red
+thing  137 n -   20 "Peasant (brown)"		PEAS # Brown
 thing  169 n -   20 "Spawned peasant"		PEAS # Red
 thing  170 n -   20 "Peasant spawner"		PEAS # Red
+thing  173 n -   20 "Peasant (green)"		PEAS # Green
 thing  181 n -   20 "Governor Mourel"		PEAS # Cyan
-thing 3004 n -   20 "Peasant, standing"		PEAS # Greenish beige
+thing 3004 n -   20 "Peasant (greenish beige)"	PEAS # Greenish beige
 thing  172 n -   20 "Richter"			PEAS # Dark green
 #Thing widths below are guesses  --mattm
 thing  141 n -   20 "MacGuffin/beggar"		BEGR
@@ -372,9 +379,10 @@
 thing  154 w -   16 "Grenade launcher"		GRND
 thing 2004 w -   16 "Mauler"			TRPD
 thing 2006 w -   16 "Pulse rifle"		RIFLB0
+thing   81 w -   17 "Sigil (assembled)"		SIGLE0
 
 thing 2007 a -   16 "Clip of bullets"		BLIT
-thing 2048 a -   16 "Box of ammo"		BBOX
+thing 2048 a -   16 "Ammo"			BBOX
 thing  115 a -   16 "Poison bolts"		PQRL
 thing  114 a -   16 "Electric bolts"		XQRL
 thing  152 a -   16 "He-grenade rounds"		GRN1
@@ -385,8 +393,11 @@
 #thing widths below are guesses  --mattm
 thing   17 a -   16 "Energy pack"		CPAC
 
+thing  138 b -   17 "10 gold"			CRED
+thing   10 b -   17 "Teleporter beacon"		BEAC
 thing  207 b -   20 "Targeter"			TARG
 thing 2025 b -   20 "Environmental suit"	MASK
+thing 2026 b -   17 "Map"			PMAP
 
 #Thing widths below are guesses  --mattm
 thing   59 k -   20 "Degnin ore"		XPRK