Skip to content

Commit

Permalink
Import DeuTex 4.4.902
Browse files Browse the repository at this point in the history
  • Loading branch information
André Majorel committed Aug 31, 2005
1 parent ff1e538 commit 0279a40
Show file tree
Hide file tree
Showing 65 changed files with 7,437 additions and 4,143 deletions.
1,048 changes: 580 additions & 468 deletions CHANGES

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -280,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS

Appendix: How to Apply These Terms to Your New Programs
How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
Expand All @@ -292,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>

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
Expand All @@ -306,14 +305,15 @@ the "copyright" line and a pointer to where the full notice is found.

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.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Expand Down
6 changes: 3 additions & 3 deletions COPYING.LIB
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Version 2, June 1991

Copyright (C) 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -464,8 +464,8 @@ convey the exclusion of warranty; and each file should have at least the

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
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA

Also add information on how to contact you by electronic and paper mail.

Expand Down
71 changes: 71 additions & 0 deletions FAQ
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
THIS IS A GENERATED FILE -- DO NOT EDIT !
Edit docsrc/faq.html instead.

DeuTex FAQ

1. When I extract the contents of the Heretic iwad, why are CREDIT, E2END,
FINAL1, FINAL2, HELP1, HELP2 and TITLE extracted into lumps/ and not into
graphics/ ?

They're extracted into lumps/ because that's what they are. The
graphics/ directory is for images that are in the in the so-called
"picture" format, described in section [5-1] of the [1]UDS
([2]HTTP link). Those lumps are not in picture format, they're
just straight bitmaps (320 * 200 pixels, 64,000 bytes).

The distinction may seem academic, but it isn't. If those lumps
were extracted into graphics/, it would be impossible to compose
your wad correctly afterwards. In the wad created by DeuTex,
CREDIT and friends would be in the picture format while the engine
expects them to be in the 64000-byte matrix format.

2. When I extract the contents of the Hexen iwad, why are CREDIT, FINALE1,
FINALE2, FINALE3, HELP1, HELP2, INTERPIC and TITLE extracted into lumps/
and not into graphics/ ?

See question [3]1.

3. I've composed a wad. When I play it, the transparent areas in the
graphics look opaque and blue or grey, like this :
[4]Screenshot

This is what happens when you try to use DeuTex 4 on files
extracted by DeuTex 3 or WinTex.

It happens because DeuTex 3 and WinTex use (0, 255, 255) (cyan)
for transparent areas while DeuTex 4 uses (0, 47, 47) (dark
blue-green). Therefore, what looks like a transparent pixel to
DeuTex 3 and WinTex just looks like an opaque, cyan pixel to
DeuTex 4. The closest match to cyan in the Doom palette is (115,
115, 255) (blue-mauve) so that's what you get.

Try one of the following :

* convert your files to use (0, 47, 47) instead of (0, 255,
255),
* recreate your files using DeuTex 4,
* recreate your files using DeuTex 3 with the "-rgb 0 47 47"
option,
* recreate your files using WinTex using the appropriate option
(if it exists),
* when composing, give DeuTex 4 the "-rgb 0 255 255" option.

4. The musics are extracted into lumps/.

This has been fixed in version 4.4.

5. When composing, is there a way to include only the resources actually
used by the levels ?

No. Though it would certainly be nice to have.

---------------------------------------------------------------------------

AYM 2005-08-29

References

Visible links
1. ftp://archives.3dgamers.com/pub/idgames/docs/editing/dmspec16.zip
2. http://www.gamers.org/pub/idgames/docs/editing/dmspec16.zip
3. file:///aym/src/doom/deutex/docsrc/faq.html#q1
125 changes: 27 additions & 98 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,9 @@

DeuTex/DeuSf compilation

by Olivier Montanuy <Olivier.Montanuy@wanadoo.fr>
by Olivier Montanuy <Olivier+Montanuy=wanadoo+fr>
Revised AYM 1999-08-12
Last update 1999-11-21



****************************
* Structure of the sources *
****************************

DeuTex and DeuSF share the same sources.
When compiling, you must include all sources and define one of
those flags so that the C pre-processor knows which part to select:

- DeuSF to compile DeuSF
- DeuTex to compile DeuTex
For a windows DLL
- LDeuTex to compile DeuTex.DLL for Windoze
Last update 2005-08-19


***********************
Expand All @@ -28,8 +13,9 @@ For a windows DLL

Type

./configure
make
make install <- as root
make install # as root

See near the end of the file for any OS-specific details.

Expand Down Expand Up @@ -105,18 +91,22 @@ DJGPP 2.*

Thanks to Udo Munk, DeuTex can now be built with DJGPP.

You need a "touch" command (there's one in v2gnu/fil316b.zip) and
a command named "cc" in your path, that points to "gcc.exe" (just
type "copy c:\djgpp\bin\gcc.exe c:\djgpp\bin\cc.exe"),
You need a command named "cc" in your path, that points to "gcc.exe"
(just type "copy c:\djgpp\bin\gcc.exe c:\djgpp\bin\cc.exe").

Certain developer targets (including "make clean") also require
cp, GNU find, ln, lynx, rm, tar, tr, zip and a Unix mkdir and/or
that the SHELL be sh (Bash, that is), but you don't need them if
all you want is to compile DeuTex.
The makefile recipes are written for Bourne-compatible shells like
bash. If your DJGPP installation is set up so that make executes the
recipes with an incompatible shell such as command.com, it won't
work. Make sure you have Bash or some other Bourne-compatible shell
installed and, if necessary, invoke make with the SHELL variable set
to the pathname of that shell ("make SHELL=c:\foo\bash.exe")

To compile, type
Some recipes also require Unix commands like cp, mv, rm, touch etc.
so you may have to install additional packages.

make
If you're feeling lucky, type

dos\builddj

After deusf.exe and deutex.exe are created, copy them to a
directory in your path.
Expand All @@ -125,21 +115,12 @@ Cygwin

Thanks to Udo Munk, DeuTex can now be built with Cygwin.

You need a "touch" command (there's one in v2gnu/fil316b.zip) and
one must be able to invoke your compiler by calling "cc" (I
achieved that simply by typing "copy gcc.exe cc.exe").

Certain developer targets (including "make clean") also require
cp, GNU find, ln, lynx, rm, tar, tr, zip and a Unix mkdir and/or
that the SHELL be sh (Bash, that is), but you don't need them if
all you want is to compile DeuTex.

To compile, type
I've not tried it myself, but it should be pretty much like
compiling on any Unix :

./configure
make

After deusf.exe and deutex.exe are created, copy them to a
directory in your path.
make install


***************
Expand All @@ -150,50 +131,8 @@ Cygwin
Use the DOS deutex version under windows, with a suitable deutex.pif

.DLL
DeuTex itself can't be compiled as a 16-bit windoze DLL (too big).
the lbdeutex is for the visual basic shell.


****************
* Unix SUN O/S *
****************
by Olivier Montanuy

Unix: Sun Sparc 1, 10, 20, IPX
gcc: 2.5.8
The makefile provided for Unix and Linux does not compile .o
objects. it compiles .ot for DeuTex and .os for DeuSF.
That little trick is useful to avoid linker problems.
type: make
make install (as root)


********************
* Silicon Graphics *
********************
by Chuck Rossi

type: make
make install (as root)


**********************
* Linux *
**********************
by Per Allansson <[email protected]>
and Andr� Majorel <[email protected]>

Linux: kernel 1.1.52, 2.0.34; libc 4.5.26, glibc 2.0.7
gcc: 2.5.8, 2.7.2.3
type: make
make install (as root)


******************************
* DEC Alpha 64 bit processor *
******************************
by James Bonfield
[email protected]
DeuTex itself can't be compiled as a 16-bit windoze DLL (too
big). The lbdeutex is for the visual basic shell.


**************
Expand All @@ -209,7 +148,7 @@ Microsoft C

Might work. See the corresponding paragraphs in the DOS section.

IBM C Set++ 2.1 (by mark.mathews@channel1.com)
IBM C Set++ 2.1 (by mark+mathews=channel1+com)

For DEUTEXOS.EXE you need deutexos.mak and deutexos.def
To make DEUTEXOS.EXE type: nmake -f deutexos.mak
Expand Down Expand Up @@ -245,19 +184,9 @@ The name of the compiler is in DT_CC, defined in deutex.h :
Testing the existence of other macros, such as __MSDOS__, __GNUC__ etc.
is discouraged. Use DT_OS and DT_CC instead.

DeuTex uses specified size types Int16, Int32, UInt32, etc. Those are
defined in deutex.h. The definitions are believed to be correct for all
16-bit and 32-bit platforms. 64-bit platforms might require some
tweaking there. There is an alternate set of #define directives under
#ifdef __alpha but a clever use of limits.h and/or inttypes.h might be a
better idea. If you're the lucky owner of a 64-bit machine, send me your
diffs. Note that DeuTex and DeuSF check that the specified size types
are correctly defined and warn you if they aren't.

Some structures related to pictures or to DOOM assumes that no word or
long word alignement occur. if the entries are not put contiguously,
DeuTex/DeuSF will not work, but there will be no warning.
Some structures related to pictures or to DOOM assume that no word or
long word alignement occur. If the fields are not contiguous in core,
DeuTex and DeuSF will not work, but there will be no warning.

Most of the O/S related functions are in tools.c.


12 changes: 6 additions & 6 deletions LICENSE → LICENCE
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
License terms for DeuTex
Licence terms for DeuTex

------------------------------------------------------------------------

DeuTex is Copyright � 1994-1995 Olivier Montanuy,
and Copyright � 1999-2000 Andr� Majorel.
and Copyright � 1999-2005 Andr� Majorel.

The parts of DeuTex that have been written by Olivier Montanuy,
Kevin McGrail, Andr� Majorel and other contributors are
Expand All @@ -28,7 +28,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
------------------------------------------------------------------------

However, the DeuTex distribution includes material that was
written by other people or distributed under different licenses :
written by other people or distributed under different licences :

1. DeuTex incorporates code derived from DEU 5.21. DEU 5.21 was
put in the public domain in 1994 by Rapha�l Quinet and Brendon
Expand All @@ -38,7 +38,7 @@ written by other people or distributed under different licenses :

3. The file lzw.c contains the following notes :

> Copyright 1993, David Koblas (koblas@netcom.com)
> Copyright 1993, David Koblas (koblas=netcom+com)
>
> Permission to use, copy, modify, and to distribute this software
> and its documentation for any purpose is hereby granted without
Expand All @@ -52,7 +52,7 @@ written by other people or distributed under different licenses :
> This file is derived from ppmtogif.c and giftoppm.c
> only the compression/decompression routines were kept.
>
> Based on GIFENCOD by David Rowley <mgardi@watdscu.waterloo.edu>.
> Based on GIFENCOD by David Rowley <mgardi=watdscu+waterloo+edu>.
> A Lempel-Zim compression based on "compress".
>
> Copyright (C) 1989 by Jef Poskanzer.
Expand All @@ -71,4 +71,4 @@ written by other people or distributed under different licenses :
4. The files endianio.c and endianm.c are Copyright � Andr� Majorel 1999
and available under the terms of the LGPL.

-- AYM 1999-12-30
-- AYM 2005-08-28
Loading

0 comments on commit 0279a40

Please sign in to comment.