shithub: qk1

Download patch

ref: 908e4541be46367384ab6290caddc936b3fdb5ca
parent: e58330cb5be8f7bde57f1eacfca0c03467e21e0d
author: Konstantinn Bonnet <[email protected]>
date: Sat Mar 14 19:21:08 EDT 2015

remove unused files from quake release

--- a/u/3dfx.txt
+++ /dev/null
@@ -1,69 +1,0 @@
-GLQuake Drivers
-
-Graphics Subsystem: Voodoo Graphics or Voodoo Rush
-
-Copyright ( 1997 3Dfx Interactive, Inc. )
-All Rights Reserved
-
-3Dfx Interactive, Inc.
-www: www.3dfx.com
-news: news.3dfx.com  
-
------------------------------------------------------------------------
-NOTE: GLQuake requires DirectX support DirectSound.  DirectX can be 
-installed from the media provided with your Voodoo Based 3D Accelerator.
-
-Glide 2.31 or HIGHER runtime drivers *MUST* be installed to use this
-GLQuake driver.  Please download these drivers from your board
-manufacturer OR unsupported drivers from http://www.3dfx.com
------------------------------------------------------------------------
-
-Release Notes for GLQuake's mini-GL driver
-
-What's in the distribution?
----------------------------
-
-This distribution contains GLQuake Drivers for Voodoo Based 3D
-Accelerators.  These drivers were tested on the following boards: 
-
-Voodoo Graphics:
-- Quantum 3D Obsidian 
-- Diamond Monster 3D
-- Orchid Righteous 3D
-- Deltron Realvision Flash 3D
-- Guillemot MaxiGamer 
-- Skywell Magic 3D
-
-Voodoo Rush:
-- Hercules Stringray 128-3D
-- Intergraph Intense 3D Voodoo
-- Jazz Multimedia Adrenaline Rush
-
-NOTE:  The enclosed drivers are not meant to replace any Direct3D or 
-Glide drivers provided by your Voodoo Graphics card manufacturer. 
-Please obtain supported drivers from your board manufacturer.
-
-OEMSR2 and NT users: Do NOT replace OPENGL32.DLL located in your
-Windows\SYSTEM directory.
-
-Requirements
-------------
-
-- Voodoo Graphics or Voodoo Rush Based 3D Accelerator
-- Windows 95 (Windows NT is supported for Voodoo Rush)
-- A PC with a Pentium 90 or higher CPU
-- 16MB of RAM
-- 2D Video card set at 16 bit color
-
-Support and Frequently Asked Questions
---------------------------------------
-
-GLQuake is currently unsupported.  You may however find answers to 
-questions on various Quake dedicated websites.  3Dfx provides a GLQuake
-newsgroup on news.3dfx.com (Newsgroup name is 3dfx.games.glquake ) to
-discuss GLQuake with other users.  3Dfx also provides a regularly
-updated GLQuake FAQ at: http://www.3dfx.com/game_dev/quake_faq.html
-
-
-Voodoo Graphics and Voodoo Rush are trademarks of 3Dfx Interactive, Inc.  
-All other trademarks are the property of their respective owners.
\ No newline at end of file
--- a/u/Makefile.Solaris
+++ /dev/null
@@ -1,483 +1,0 @@
-#
-# Quake Makefile for Solaris
-#
-# Nov '97 by Zoid <[email protected]>
-#
-# ELF only
-#
-
-VERSION=1.09
-
-ifneq (,$(findstring i86pc,$(shell uname -m)))
-ARCH=i386
-else
-ARCH=sparc
-endif
-
-MOUNT_DIR=/grog/Projects/WinQuake
-
-BUILD_DEBUG_DIR=debug$(ARCH)
-BUILD_RELEASE_DIR=release$(ARCH)
-
-CC=gcc
-BASE_CFLAGS=-I/usr/openwin/include
-
-RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-LDFLAGS=-R /usr/openwin/lib -L /usr/openwin/lib -lm -lX11 -lXext -lsocket -lnsl -lthread -ldl 
-XIL_LDFLAGS=-L /opt/SUNWits/Graphics-sw/xil/lib -R /opt/SUNWits/Graphics-sw/xil/lib:/usr/openwin/lib -L /usr/openwin/lib -lm -lxil -lX11 -lXext -lsocket -lnsl -lthread -ldl 
-
-DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
-DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-
-#############################################################################
-# SETUP AND BUILD
-#############################################################################
-
-TARGETS=$(BUILDDIR)/quake.sw $(BUILDDIR)/quake.xil
-
-build_debug:
-	@-mkdir $(BUILD_DEBUG_DIR)
-	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
-
-build_release:
-	@-mkdir $(BUILD_RELEASE_DIR)
-	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)"
-
-all: build_debug build_release
-
-targets: $(TARGETS)
-
-#############################################################################
-# CLIENT/SERVER
-#############################################################################
-
-QUAKE_OBJS= \
-	$(BUILDDIR)/chase.o \
-	$(BUILDDIR)/cl_demo.o \
-	$(BUILDDIR)/cl_input.o \
-	$(BUILDDIR)/cl_main.o \
-	$(BUILDDIR)/cl_parse.o \
-	$(BUILDDIR)/cl_tent.o \
-	$(BUILDDIR)/cmd.o \
-	$(BUILDDIR)/common.o \
-	$(BUILDDIR)/console.o \
-	$(BUILDDIR)/crc.o \
-	$(BUILDDIR)/cvar.o \
-	$(BUILDDIR)/draw.o \
-	$(BUILDDIR)/d_edge.o \
-	$(BUILDDIR)/d_fill.o \
-	$(BUILDDIR)/d_init.o \
-	$(BUILDDIR)/d_modech.o \
-	$(BUILDDIR)/d_part.o \
-	$(BUILDDIR)/d_polyse.o \
-	$(BUILDDIR)/d_scan.o \
-	$(BUILDDIR)/d_sky.o \
-	$(BUILDDIR)/d_sprite.o \
-	$(BUILDDIR)/d_surf.o \
-	$(BUILDDIR)/d_vars.o \
-	$(BUILDDIR)/d_zpoint.o \
-	$(BUILDDIR)/host.o \
-	$(BUILDDIR)/host_cmd.o \
-	$(BUILDDIR)/keys.o \
-	$(BUILDDIR)/menu.o \
-	$(BUILDDIR)/mathlib.o \
-	$(BUILDDIR)/model.o \
-	$(BUILDDIR)/nonintel.o \
-	$(BUILDDIR)/pr_cmds.o \
-	$(BUILDDIR)/pr_edict.o \
-	$(BUILDDIR)/pr_exec.o \
-	$(BUILDDIR)/r_aclip.o \
-	$(BUILDDIR)/r_alias.o \
-	$(BUILDDIR)/r_bsp.o \
-	$(BUILDDIR)/r_light.o \
-	$(BUILDDIR)/r_draw.o \
-	$(BUILDDIR)/r_efrag.o \
-	$(BUILDDIR)/r_edge.o \
-	$(BUILDDIR)/r_misc.o \
-	$(BUILDDIR)/r_main.o \
-	$(BUILDDIR)/r_sky.o \
-	$(BUILDDIR)/r_sprite.o \
-	$(BUILDDIR)/r_surf.o \
-	$(BUILDDIR)/r_part.o \
-	$(BUILDDIR)/r_vars.o \
-	$(BUILDDIR)/screen.o \
-	$(BUILDDIR)/sbar.o \
-	$(BUILDDIR)/sv_main.o \
-	$(BUILDDIR)/sv_phys.o \
-	$(BUILDDIR)/sv_move.o \
-	$(BUILDDIR)/sv_user.o \
-	$(BUILDDIR)/zone.o	\
-	$(BUILDDIR)/view.o	\
-	$(BUILDDIR)/wad.o \
-	$(BUILDDIR)/world.o \
-	$(BUILDDIR)/cd_null.o \
-	$(BUILDDIR)/snd_dma.o \
-	$(BUILDDIR)/snd_mix.o \
-	$(BUILDDIR)/snd_mem.o \
-	$(BUILDDIR)/net_dgrm.o \
-	$(BUILDDIR)/net_loop.o \
-	$(BUILDDIR)/net_main.o \
-	$(BUILDDIR)/net_vcr.o \
-	$(BUILDDIR)/net_udp.o \
-	$(BUILDDIR)/net_bsd.o \
-	$(BUILDDIR)/sys_sun.o \
-	$(BUILDDIR)/snd_sun.o 
-
-QUAKE_AS_OBJS= \
-	$(BUILDDIR)/d_copy.o \
-	$(BUILDDIR)/d_draw.o \
-	$(BUILDDIR)/d_draw16.o \
-	$(BUILDDIR)/d_parta.o \
-	$(BUILDDIR)/d_polysa.o \
-	$(BUILDDIR)/d_scana.o \
-	$(BUILDDIR)/d_spr8.o \
-	$(BUILDDIR)/d_varsa.o \
-	$(BUILDDIR)/math.o \
-	$(BUILDDIR)/r_aliasa.o \
-	$(BUILDDIR)/r_drawa.o \
-	$(BUILDDIR)/r_edgea.o \
-	$(BUILDDIR)/r_varsa.o \
-	$(BUILDDIR)/surf16.o \
-	$(BUILDDIR)/surf8.o \
-	$(BUILDDIR)/worlda.o \
-	$(BUILDDIR)/r_aclipa.o \
-	$(BUILDDIR)/snd_mixa.o \
-	$(BUILDDIR)/sys_dosa.o
-
-QUAKE_X_OBJS = $(BUILDDIR)/vid_sunx.o
-
-QUAKE_XIL_OBJS = $(BUILDDIR)/vid_sunxil.o
-
-ifeq ($(ARCH),i386)
-$(BUILDDIR)/quake.sw : $(QUAKE_OBJS) $(QUAKE_AS_OBJS) $(QUAKE_X_OBJS)
-	$(CC) -o $(@) $(QUAKE_OBJS) $(QUAKE_AS_OBJS) $(QUAKE_X_OBJS) $(LDFLAGS)
-
-$(BUILDDIR)/quake.xil: $(QUAKE_OBJS) $(QUAKE_AS_OBJS) $(QUAKE_XIL_OBJS)
-	$(CC) -o $(@) $(QUAKE_OBJS) $(QUAKE_AS_OBJS) $(QUAKE_XIL_OBJS) $(XIL_LDFLAGS)
-else
-$(BUILDDIR)/quake.sw : $(QUAKE_OBJS) $(QUAKE_X_OBJS)
-	$(CC) -o $(@) $(QUAKE_OBJS) $(QUAKE_X_OBJS) $(LDFLAGS)
-
-$(BUILDDIR)/quake.xil: $(QUAKE_OBJS) $(QUAKE_XIL_OBJS)
-	$(CC) -o $(@) $(QUAKE_OBJS) $(QUAKE_XIL_OBJS) $(XIL_LDFLAGS)
-endif
-
-##
-
-$(BUILDDIR)/chase.o :				$(MOUNT_DIR)/chase.c
-	$(DO_CC)
-
-$(BUILDDIR)/cl_demo.o :             $(MOUNT_DIR)/cl_demo.c
-	$(DO_CC)
-
-$(BUILDDIR)/cl_input.o :            $(MOUNT_DIR)/cl_input.c
-	$(DO_CC)
-
-$(BUILDDIR)/cl_main.o :             $(MOUNT_DIR)/cl_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/cl_parse.o :            $(MOUNT_DIR)/cl_parse.c
-	$(DO_CC)
-
-$(BUILDDIR)/cl_tent.o :             $(MOUNT_DIR)/cl_tent.c
-	$(DO_CC)
-
-$(BUILDDIR)/cmd.o :                 $(MOUNT_DIR)/cmd.c
-	$(DO_CC)
-
-$(BUILDDIR)/common.o :              $(MOUNT_DIR)/common.c
-	$(DO_CC)
-
-$(BUILDDIR)/console.o :             $(MOUNT_DIR)/console.c
-	$(DO_CC)
-
-$(BUILDDIR)/crc.o :                 $(MOUNT_DIR)/crc.c
-	$(DO_CC)
-
-$(BUILDDIR)/cvar.o :                $(MOUNT_DIR)/cvar.c
-	$(DO_CC)
-
-$(BUILDDIR)/draw.o :                $(MOUNT_DIR)/draw.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_edge.o :              $(MOUNT_DIR)/d_edge.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_fill.o :              $(MOUNT_DIR)/d_fill.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_init.o :              $(MOUNT_DIR)/d_init.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_modech.o :            $(MOUNT_DIR)/d_modech.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_part.o :              $(MOUNT_DIR)/d_part.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_polyse.o :            $(MOUNT_DIR)/d_polyse.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_scan.o :              $(MOUNT_DIR)/d_scan.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_sky.o :               $(MOUNT_DIR)/d_sky.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_sprite.o :            $(MOUNT_DIR)/d_sprite.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_surf.o :              $(MOUNT_DIR)/d_surf.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_vars.o :              $(MOUNT_DIR)/d_vars.c
-	$(DO_CC)
-
-$(BUILDDIR)/d_zpoint.o :            $(MOUNT_DIR)/d_zpoint.c
-	$(DO_CC)
-
-$(BUILDDIR)/host.o :                $(MOUNT_DIR)/host.c
-	$(DO_CC)
-
-$(BUILDDIR)/host_cmd.o :            $(MOUNT_DIR)/host_cmd.c
-	$(DO_CC)
-
-$(BUILDDIR)/keys.o :                $(MOUNT_DIR)/keys.c
-	$(DO_CC)
-
-$(BUILDDIR)/menu.o :                $(MOUNT_DIR)/menu.c
-	$(DO_CC)
-
-$(BUILDDIR)/mathlib.o :             $(MOUNT_DIR)/mathlib.c
-	$(DO_CC)
-
-$(BUILDDIR)/model.o :               $(MOUNT_DIR)/model.c
-	$(DO_CC)
-
-$(BUILDDIR)/nonintel.o :            $(MOUNT_DIR)/nonintel.c
-	$(DO_CC)
-
-$(BUILDDIR)/pr_cmds.o :             $(MOUNT_DIR)/pr_cmds.c
-	$(DO_CC)
-
-$(BUILDDIR)/pr_edict.o :            $(MOUNT_DIR)/pr_edict.c
-	$(DO_CC)
-
-$(BUILDDIR)/pr_exec.o :             $(MOUNT_DIR)/pr_exec.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_aclip.o :             $(MOUNT_DIR)/r_aclip.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_alias.o :             $(MOUNT_DIR)/r_alias.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_bsp.o :               $(MOUNT_DIR)/r_bsp.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_light.o :             $(MOUNT_DIR)/r_light.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_draw.o :              $(MOUNT_DIR)/r_draw.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_efrag.o :             $(MOUNT_DIR)/r_efrag.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_edge.o :              $(MOUNT_DIR)/r_edge.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_misc.o :              $(MOUNT_DIR)/r_misc.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_main.o :              $(MOUNT_DIR)/r_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_sky.o :               $(MOUNT_DIR)/r_sky.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_sprite.o :            $(MOUNT_DIR)/r_sprite.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_surf.o :              $(MOUNT_DIR)/r_surf.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_part.o :              $(MOUNT_DIR)/r_part.c
-	$(DO_CC)
-
-$(BUILDDIR)/r_vars.o :              $(MOUNT_DIR)/r_vars.c
-	$(DO_CC)
-
-$(BUILDDIR)/screen.o :              $(MOUNT_DIR)/screen.c
-	$(DO_CC)
-
-$(BUILDDIR)/sbar.o :                $(MOUNT_DIR)/sbar.c
-	$(DO_CC)
-
-$(BUILDDIR)/sv_main.o :             $(MOUNT_DIR)/sv_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/sv_phys.o :             $(MOUNT_DIR)/sv_phys.c
-	$(DO_CC)
-
-$(BUILDDIR)/sv_move.o :             $(MOUNT_DIR)/sv_move.c
-	$(DO_CC)
-
-$(BUILDDIR)/sv_user.o :             $(MOUNT_DIR)/sv_user.c
-	$(DO_CC)
-
-$(BUILDDIR)/zone.o	:               $(MOUNT_DIR)/zone.c
-	$(DO_CC)
-
-$(BUILDDIR)/view.o	:               $(MOUNT_DIR)/view.c
-	$(DO_CC)
-
-$(BUILDDIR)/wad.o :                 $(MOUNT_DIR)/wad.c
-	$(DO_CC)
-
-$(BUILDDIR)/world.o :               $(MOUNT_DIR)/world.c
-	$(DO_CC)
-
-$(BUILDDIR)/cd_null.o :             $(MOUNT_DIR)/cd_null.c
-	$(DO_CC)
-
-$(BUILDDIR)/snd_dma.o :             $(MOUNT_DIR)/snd_dma.c
-	$(DO_CC)
-
-$(BUILDDIR)/snd_mix.o :             $(MOUNT_DIR)/snd_mix.c
-	$(DO_CC)
-
-$(BUILDDIR)/snd_mem.o :             $(MOUNT_DIR)/snd_mem.c
-	$(DO_CC)
-
-$(BUILDDIR)/net_dgrm.o :            $(MOUNT_DIR)/net_dgrm.c
-	$(DO_CC)
-
-$(BUILDDIR)/net_loop.o :            $(MOUNT_DIR)/net_loop.c
-	$(DO_CC)
-
-$(BUILDDIR)/net_main.o :            $(MOUNT_DIR)/net_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/net_vcr.o :             $(MOUNT_DIR)/net_vcr.c
-	$(DO_CC)
-
-$(BUILDDIR)/net_udp.o :             $(MOUNT_DIR)/net_udp.c
-	$(DO_CC)
-
-$(BUILDDIR)/net_bsd.o :             $(MOUNT_DIR)/net_bsd.c
-	$(DO_CC)
-
-$(BUILDDIR)/sys_sun.o :             $(MOUNT_DIR)/sys_sun.c
-	$(DO_CC)
-
-$(BUILDDIR)/snd_sun.o :             $(MOUNT_DIR)/snd_sun.c
-	$(DO_CC)
-
-$(BUILDDIR)/in_sun.o :             $(MOUNT_DIR)/in_sun.c
-	$(DO_CC)
-
-$(BUILDDIR)/vid_sunx.o :             $(MOUNT_DIR)/vid_sunx.c
-	$(DO_CC)
-
-$(BUILDDIR)/vid_sunxil.o :             $(MOUNT_DIR)/vid_sunxil.c
-	$(DO_CC)
-
-#####
-
-$(BUILDDIR)/d_copy.o :   $(MOUNT_DIR)/d_copy.s
-	$(DO_AS)
-
-$(BUILDDIR)/d_draw.o :   $(MOUNT_DIR)/d_draw.s
-	$(DO_AS)
-
-$(BUILDDIR)/d_draw16.o : $(MOUNT_DIR)/d_draw16.s
-	$(DO_AS)
-
-$(BUILDDIR)/d_parta.o :  $(MOUNT_DIR)/d_parta.s
-	$(DO_AS)
-
-$(BUILDDIR)/d_polysa.o : $(MOUNT_DIR)/d_polysa.s
-	$(DO_AS)
-
-$(BUILDDIR)/d_scana.o :  $(MOUNT_DIR)/d_scana.s
-	$(DO_AS)
-
-$(BUILDDIR)/d_spr8.o :   $(MOUNT_DIR)/d_spr8.s
-	$(DO_AS)
-
-$(BUILDDIR)/d_varsa.o :  $(MOUNT_DIR)/d_varsa.s
-	$(DO_AS)
-
-$(BUILDDIR)/math.o :     $(MOUNT_DIR)/math.s
-	$(DO_AS)
-
-$(BUILDDIR)/r_aliasa.o : $(MOUNT_DIR)/r_aliasa.s
-	$(DO_AS)
-
-$(BUILDDIR)/r_drawa.o :  $(MOUNT_DIR)/r_drawa.s
-	$(DO_AS)
-
-$(BUILDDIR)/r_edgea.o :  $(MOUNT_DIR)/r_edgea.s
-	$(DO_AS)
-
-$(BUILDDIR)/r_varsa.o :  $(MOUNT_DIR)/r_varsa.s
-	$(DO_AS)
-
-$(BUILDDIR)/surf16.o :   $(MOUNT_DIR)/surf16.s
-	$(DO_AS)
-
-$(BUILDDIR)/surf8.o :    $(MOUNT_DIR)/surf8.s
-	$(DO_AS)
-
-$(BUILDDIR)/worlda.o :   $(MOUNT_DIR)/worlda.s
-	$(DO_AS)
-
-$(BUILDDIR)/r_aclipa.o : $(MOUNT_DIR)/r_aclipa.s
-	$(DO_AS)
-
-$(BUILDDIR)/snd_mixa.o : $(MOUNT_DIR)/snd_mixa.s
-	$(DO_AS)
-
-$(BUILDDIR)/sys_dosa.o : $(MOUNT_DIR)/sys_dosa.s
-	$(DO_AS)
-
-#############################################################################
-# TAR
-#############################################################################
-
-# Make RPMs.  You need to be root to make this work
-RPMDIR = /var/tmp/quake-$(VERSION)
-
-tar:
-	if [ ! -d archives ];then mkdir archives;fi
-	$(MAKE) copyfiles COPYDIR=$(RPMDIR)
-	cd $(RPMDIR); tar cvf q2ded-$(VERSION)-$(ARCH)-sun-solaris2.5.1.tar *
-	cd $(RPMDIR); compress q2ded-$(VERSION)-$(ARCH)-sun-solaris2.5.1.tar
-	mv $(RPMDIR)/*.tar.Z archives/.
-	rm -rf $(RPMDIR)
-
-copyfiles:
-	-mkdirhier $(COPYDIR)
-	cp $(BUILD_RELEASE_DIR)/quake.sw $(COPYDIR)
-	cp $(BUILD_RELEASE_DIR)/quake.xil $(COPYDIR)
-	strip $(COPYDIR)/quake
-	strip $(COPYDIR)/quake.xil
-	cp $(MOUNT_DIR)/README.Solaris $(COPYDIR)/README.Solaris
-
-#############################################################################
-# MISC
-#############################################################################
-
-clean: clean-debug clean-release
-
-clean-debug:
-	$(MAKE) clean2 BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
-
-clean-release:
-	$(MAKE) clean2 BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(DEBUG_CFLAGS)"
-
-clean2:
-	-rm -f $(QUAKE_OBJS) $(QUAKE_X_OBJS) $(QUAKE_XIL_OBJS)
-
--- a/u/Makefile.linuxi386
+++ /dev/null
@@ -1,1240 +1,0 @@
-#
-# Quake Makefile for Linux 2.0
-#
-# Aug '98 by Zoid <[email protected]>
-#
-# ELF only
-#
-
-BASEVERSION=1.09
-VERSION=$(BASEVERSION)$(GLIBC)
-
-# RPM release number
-RPM_RELEASE=5
-
-ifneq (,$(findstring libc6,$(shell if [ -e /lib/libc.so.6 ];then echo libc6;fi)))
-GLIBC=-glibc
-else
-GLIBC=
-endif
-
-ifneq (,$(findstring alpha,$(shell uname -m)))
-ARCH=axp
-else
-ARCH=i386
-endif
-NOARCH=noarch
-
-MOUNT_DIR=/grog/Projects/WinQuake
-MASTER_DIR=/grog/Projects/QuakeMaster
-MESA_DIR=/usr/local/src/Mesa-2.6
-TDFXGL_DIR = /home/zoid/3dfxgl
-
-BUILD_DEBUG_DIR=debug$(ARCH)$(GLIBC)
-BUILD_RELEASE_DIR=release$(ARCH)$(GLIBC)
-
-EGCS=/usr/local/egcs-1.1.2/bin/gcc
-CC=$(EGCS)
-
-BASE_CFLAGS=-Dstricmp=strcasecmp
-RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \
-	-fomit-frame-pointer -fexpensive-optimizations
-DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-LDFLAGS=-lm
-SVGALDFLAGS=-lvga
-XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
-XCFLAGS=-DX11
-
-MESAGLLDFLAGS=-L/usr/X11/lib -L/usr/local/lib -L$(MESA_DIR)/lib -lMesaGL -lglide2x -lX11 -lXext -ldl
-TDFXGLLDFLAGS=-L$(TDFXGL_DIR)/release$(ARCH)$(GLIBC) -l3dfxgl -lglide2x -ldl
-GLLDFLAGS=-L/usr/X11/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lXxf86dga -lXxf86vm -lm
-GLCFLAGS=-DGLQUAKE -I$(MESA_DIR)/include -I/usr/include/glide
-
-DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
-DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $<
-DO_GL_CC=$(CC) $(CFLAGS) $(GLCFLAGS) -o $@ -c $<
-DO_GL_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(GLCFLAGS) -o $@ -c $<
-DO_X11_CC=$(CC) $(CFLAGS) $(XCFLAGS) -o $@ -c $<
-DO_X11_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(XCFLAGS) -o $@ -c $<
-DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $<
-DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-DO_GL_AS=$(CC) $(CFLAGS) $(GLCFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-
-#############################################################################
-# SETUP AND BUILD
-#############################################################################
-
-TARGETS=$(BUILDDIR)/bin/squake \
-	$(BUILDDIR)/bin/glquake \
-	$(BUILDDIR)/bin/glquake.glx \
-	$(BUILDDIR)/bin/glquake.3dfxgl \
-	$(BUILDDIR)/bin/quake.x11
-	# $(BUILDDIR)/bin/unixded
-
-build_debug:
-	@-mkdir $(BUILD_DEBUG_DIR) \
-		$(BUILD_DEBUG_DIR)/bin \
-		$(BUILD_DEBUG_DIR)/glquake \
-		$(BUILD_DEBUG_DIR)/squake \
-		$(BUILD_DEBUG_DIR)/unixded \
-		$(BUILD_DEBUG_DIR)/x11
-	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
-
-build_release:
-	@-mkdir $(BUILD_RELEASE_DIR) \
-		$(BUILD_RELEASE_DIR)/bin \
-		$(BUILD_RELEASE_DIR)/glquake \
-		$(BUILD_RELEASE_DIR)/squake \
-		$(BUILD_RELEASE_DIR)/unixded \
-		$(BUILD_RELEASE_DIR)/x11
-	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)"
-
-all: build_debug build_release
-
-targets: $(TARGETS)
-
-#############################################################################
-# SVGALIB Quake
-#############################################################################
-
-SQUAKE_OBJS = \
-	$(BUILDDIR)/squake/cl_demo.o \
-	$(BUILDDIR)/squake/cl_input.o \
-	$(BUILDDIR)/squake/cl_main.o \
-	$(BUILDDIR)/squake/cl_parse.o \
-	$(BUILDDIR)/squake/cl_tent.o \
-	$(BUILDDIR)/squake/chase.o \
-	$(BUILDDIR)/squake/cmd.o \
-	$(BUILDDIR)/squake/common.o \
-	$(BUILDDIR)/squake/console.o \
-	$(BUILDDIR)/squake/crc.o \
-	$(BUILDDIR)/squake/cvar.o \
-	$(BUILDDIR)/squake/draw.o \
-	$(BUILDDIR)/squake/d_edge.o \
-	$(BUILDDIR)/squake/d_fill.o \
-	$(BUILDDIR)/squake/d_init.o \
-	$(BUILDDIR)/squake/d_modech.o \
-	$(BUILDDIR)/squake/d_part.o \
-	$(BUILDDIR)/squake/d_polyse.o \
-	$(BUILDDIR)/squake/d_scan.o \
-	$(BUILDDIR)/squake/d_sky.o \
-	$(BUILDDIR)/squake/d_sprite.o \
-	$(BUILDDIR)/squake/d_surf.o \
-	$(BUILDDIR)/squake/d_vars.o \
-	$(BUILDDIR)/squake/d_zpoint.o \
-	$(BUILDDIR)/squake/host.o \
-	$(BUILDDIR)/squake/host_cmd.o \
-	$(BUILDDIR)/squake/keys.o \
-	$(BUILDDIR)/squake/menu.o \
-	$(BUILDDIR)/squake/mathlib.o \
-	$(BUILDDIR)/squake/model.o \
-	$(BUILDDIR)/squake/net_dgrm.o \
-	$(BUILDDIR)/squake/net_loop.o \
-	$(BUILDDIR)/squake/net_main.o \
-	$(BUILDDIR)/squake/net_vcr.o \
-	$(BUILDDIR)/squake/net_udp.o \
-	$(BUILDDIR)/squake/net_bsd.o \
-	$(BUILDDIR)/squake/nonintel.o \
-	$(BUILDDIR)/squake/pr_cmds.o \
-	$(BUILDDIR)/squake/pr_edict.o \
-	$(BUILDDIR)/squake/pr_exec.o \
-	$(BUILDDIR)/squake/r_aclip.o \
-	$(BUILDDIR)/squake/r_alias.o \
-	$(BUILDDIR)/squake/r_bsp.o \
-	$(BUILDDIR)/squake/r_light.o \
-	$(BUILDDIR)/squake/r_draw.o \
-	$(BUILDDIR)/squake/r_efrag.o \
-	$(BUILDDIR)/squake/r_edge.o \
-	$(BUILDDIR)/squake/r_misc.o \
-	$(BUILDDIR)/squake/r_main.o \
-	$(BUILDDIR)/squake/r_sky.o \
-	$(BUILDDIR)/squake/r_sprite.o \
-	$(BUILDDIR)/squake/r_surf.o \
-	$(BUILDDIR)/squake/r_part.o \
-	$(BUILDDIR)/squake/r_vars.o \
-	$(BUILDDIR)/squake/screen.o \
-	$(BUILDDIR)/squake/sbar.o \
-	$(BUILDDIR)/squake/sv_main.o \
-	$(BUILDDIR)/squake/sv_phys.o \
-	$(BUILDDIR)/squake/sv_move.o \
-	$(BUILDDIR)/squake/sv_user.o \
-	$(BUILDDIR)/squake/zone.o	\
-	$(BUILDDIR)/squake/view.o	\
-	$(BUILDDIR)/squake/wad.o \
-	$(BUILDDIR)/squake/world.o \
-	$(BUILDDIR)/squake/cd_linux.o \
-	$(BUILDDIR)/squake/sys_linux.o \
-	$(BUILDDIR)/squake/vid_svgalib.o \
-	$(BUILDDIR)/squake/snd_dma.o \
-	$(BUILDDIR)/squake/snd_mem.o \
-	$(BUILDDIR)/squake/snd_mix.o \
-	$(BUILDDIR)/squake/snd_linux.o \
-	\
-	$(BUILDDIR)/squake/d_copy.o \
-	$(BUILDDIR)/squake/d_draw.o \
-	$(BUILDDIR)/squake/d_draw16.o \
-	$(BUILDDIR)/squake/d_parta.o \
-	$(BUILDDIR)/squake/d_polysa.o \
-	$(BUILDDIR)/squake/d_scana.o \
-	$(BUILDDIR)/squake/d_spr8.o \
-	$(BUILDDIR)/squake/d_varsa.o \
-	$(BUILDDIR)/squake/math.o \
-	$(BUILDDIR)/squake/r_aliasa.o \
-	$(BUILDDIR)/squake/r_drawa.o \
-	$(BUILDDIR)/squake/r_edgea.o \
-	$(BUILDDIR)/squake/r_varsa.o \
-	$(BUILDDIR)/squake/surf16.o \
-	$(BUILDDIR)/squake/surf8.o \
-	$(BUILDDIR)/squake/worlda.o \
-	$(BUILDDIR)/squake/r_aclipa.o \
-	$(BUILDDIR)/squake/snd_mixa.o \
-	$(BUILDDIR)/squake/sys_dosa.o
-
-$(BUILDDIR)/bin/squake : $(SQUAKE_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(SQUAKE_OBJS) $(SVGALDFLAGS) $(LDFLAGS)
-
-####
-
-$(BUILDDIR)/squake/cl_demo.o :  $(MOUNT_DIR)/cl_demo.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/cl_input.o : $(MOUNT_DIR)/cl_input.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/cl_main.o :  $(MOUNT_DIR)/cl_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/cl_parse.o : $(MOUNT_DIR)/cl_parse.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/cl_tent.o :  $(MOUNT_DIR)/cl_tent.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/chase.o :    $(MOUNT_DIR)/chase.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/cmd.o :      $(MOUNT_DIR)/cmd.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/common.o :   $(MOUNT_DIR)/common.c
-	$(DO_DEBUG_CC)
-
-$(BUILDDIR)/squake/console.o :  $(MOUNT_DIR)/console.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/crc.o :      $(MOUNT_DIR)/crc.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/cvar.o :     $(MOUNT_DIR)/cvar.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/draw.o :     $(MOUNT_DIR)/draw.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_edge.o :   $(MOUNT_DIR)/d_edge.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_fill.o :   $(MOUNT_DIR)/d_fill.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_init.o :   $(MOUNT_DIR)/d_init.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_modech.o : $(MOUNT_DIR)/d_modech.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_part.o :   $(MOUNT_DIR)/d_part.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_polyse.o : $(MOUNT_DIR)/d_polyse.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_scan.o :   $(MOUNT_DIR)/d_scan.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_sky.o :    $(MOUNT_DIR)/d_sky.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_sprite.o : $(MOUNT_DIR)/d_sprite.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_surf.o :   $(MOUNT_DIR)/d_surf.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_vars.o :   $(MOUNT_DIR)/d_vars.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/d_zpoint.o : $(MOUNT_DIR)/d_zpoint.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/host.o :     $(MOUNT_DIR)/host.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/host_cmd.o : $(MOUNT_DIR)/host_cmd.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/keys.o :     $(MOUNT_DIR)/keys.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/menu.o :     $(MOUNT_DIR)/menu.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/mathlib.o :  $(MOUNT_DIR)/mathlib.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/model.o :    $(MOUNT_DIR)/model.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/net_dgrm.o : $(MOUNT_DIR)/net_dgrm.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/net_loop.o : $(MOUNT_DIR)/net_loop.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/net_main.o : $(MOUNT_DIR)/net_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/net_vcr.o :  $(MOUNT_DIR)/net_vcr.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/net_udp.o :  $(MOUNT_DIR)/net_udp.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/net_bsd.o :  $(MOUNT_DIR)/net_bsd.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/nonintel.o : $(MOUNT_DIR)/nonintel.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/pr_cmds.o :  $(MOUNT_DIR)/pr_cmds.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/pr_edict.o : $(MOUNT_DIR)/pr_edict.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/pr_exec.o :  $(MOUNT_DIR)/pr_exec.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_aclip.o :  $(MOUNT_DIR)/r_aclip.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_alias.o :  $(MOUNT_DIR)/r_alias.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_bsp.o :    $(MOUNT_DIR)/r_bsp.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_light.o :  $(MOUNT_DIR)/r_light.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_draw.o :   $(MOUNT_DIR)/r_draw.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_efrag.o :  $(MOUNT_DIR)/r_efrag.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_edge.o :   $(MOUNT_DIR)/r_edge.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_misc.o :   $(MOUNT_DIR)/r_misc.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_main.o :   $(MOUNT_DIR)/r_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_sky.o :    $(MOUNT_DIR)/r_sky.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_sprite.o : $(MOUNT_DIR)/r_sprite.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_surf.o :   $(MOUNT_DIR)/r_surf.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_part.o :   $(MOUNT_DIR)/r_part.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/r_vars.o :   $(MOUNT_DIR)/r_vars.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/screen.o :   $(MOUNT_DIR)/screen.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/sbar.o :     $(MOUNT_DIR)/sbar.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/sv_main.o :  $(MOUNT_DIR)/sv_main.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/sv_phys.o :  $(MOUNT_DIR)/sv_phys.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/sv_move.o :  $(MOUNT_DIR)/sv_move.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/sv_user.o :  $(MOUNT_DIR)/sv_user.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/zone.o	:   $(MOUNT_DIR)/zone.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/view.o	:   $(MOUNT_DIR)/view.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/wad.o :      $(MOUNT_DIR)/wad.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/world.o :    $(MOUNT_DIR)/world.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/cd_linux.o : $(MOUNT_DIR)/cd_linux.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/sys_linux.o :$(MOUNT_DIR)/sys_linux.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/vid_svgalib.o:$(MOUNT_DIR)/vid_svgalib.c
-	$(DO_O_CC)
-
-$(BUILDDIR)/squake/snd_dma.o :  $(MOUNT_DIR)/snd_dma.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/snd_mem.o :  $(MOUNT_DIR)/snd_mem.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/snd_mix.o :  $(MOUNT_DIR)/snd_mix.c
-	$(DO_CC)
-
-$(BUILDDIR)/squake/snd_linux.o :$(MOUNT_DIR)/snd_linux.c
-	$(DO_CC)
-
-#####
-
-$(BUILDDIR)/squake/d_copy.o :   $(MOUNT_DIR)/d_copy.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/d_draw.o :   $(MOUNT_DIR)/d_draw.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/d_draw16.o : $(MOUNT_DIR)/d_draw16.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/d_parta.o :  $(MOUNT_DIR)/d_parta.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/d_polysa.o : $(MOUNT_DIR)/d_polysa.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/d_scana.o :  $(MOUNT_DIR)/d_scana.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/d_spr8.o :   $(MOUNT_DIR)/d_spr8.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/d_varsa.o :  $(MOUNT_DIR)/d_varsa.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/math.o :     $(MOUNT_DIR)/math.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/r_aliasa.o : $(MOUNT_DIR)/r_aliasa.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/r_drawa.o :  $(MOUNT_DIR)/r_drawa.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/r_edgea.o :  $(MOUNT_DIR)/r_edgea.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/r_varsa.o :  $(MOUNT_DIR)/r_varsa.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/surf16.o :   $(MOUNT_DIR)/surf16.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/surf8.o :    $(MOUNT_DIR)/surf8.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/worlda.o :   $(MOUNT_DIR)/worlda.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/r_aclipa.o : $(MOUNT_DIR)/r_aclipa.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/snd_mixa.o : $(MOUNT_DIR)/snd_mixa.s
-	$(DO_AS)
-
-$(BUILDDIR)/squake/sys_dosa.o : $(MOUNT_DIR)/sys_dosa.s
-	$(DO_AS)
-
-#############################################################################
-# X11 Quake
-#############################################################################
-
-X11_OBJS = \
-	$(BUILDDIR)/x11/cl_demo.o \
-	$(BUILDDIR)/x11/cl_input.o \
-	$(BUILDDIR)/x11/cl_main.o \
-	$(BUILDDIR)/x11/cl_parse.o \
-	$(BUILDDIR)/x11/cl_tent.o \
-	$(BUILDDIR)/x11/chase.o \
-	$(BUILDDIR)/x11/cmd.o \
-	$(BUILDDIR)/x11/common.o \
-	$(BUILDDIR)/x11/console.o \
-	$(BUILDDIR)/x11/crc.o \
-	$(BUILDDIR)/x11/cvar.o \
-	$(BUILDDIR)/x11/draw.o \
-	$(BUILDDIR)/x11/d_edge.o \
-	$(BUILDDIR)/x11/d_fill.o \
-	$(BUILDDIR)/x11/d_init.o \
-	$(BUILDDIR)/x11/d_modech.o \
-	$(BUILDDIR)/x11/d_part.o \
-	$(BUILDDIR)/x11/d_polyse.o \
-	$(BUILDDIR)/x11/d_scan.o \
-	$(BUILDDIR)/x11/d_sky.o \
-	$(BUILDDIR)/x11/d_sprite.o \
-	$(BUILDDIR)/x11/d_surf.o \
-	$(BUILDDIR)/x11/d_vars.o \
-	$(BUILDDIR)/x11/d_zpoint.o \
-	$(BUILDDIR)/x11/host.o \
-	$(BUILDDIR)/x11/host_cmd.o \
-	$(BUILDDIR)/x11/keys.o \
-	$(BUILDDIR)/x11/menu.o \
-	$(BUILDDIR)/x11/mathlib.o \
-	$(BUILDDIR)/x11/model.o \
-	$(BUILDDIR)/x11/net_dgrm.o \
-	$(BUILDDIR)/x11/net_loop.o \
-	$(BUILDDIR)/x11/net_main.o \
-	$(BUILDDIR)/x11/net_vcr.o \
-	$(BUILDDIR)/x11/net_udp.o \
-	$(BUILDDIR)/x11/net_bsd.o \
-	$(BUILDDIR)/x11/nonintel.o \
-	$(BUILDDIR)/x11/pr_cmds.o \
-	$(BUILDDIR)/x11/pr_edict.o \
-	$(BUILDDIR)/x11/pr_exec.o \
-	$(BUILDDIR)/x11/r_aclip.o \
-	$(BUILDDIR)/x11/r_alias.o \
-	$(BUILDDIR)/x11/r_bsp.o \
-	$(BUILDDIR)/x11/r_light.o \
-	$(BUILDDIR)/x11/r_draw.o \
-	$(BUILDDIR)/x11/r_efrag.o \
-	$(BUILDDIR)/x11/r_edge.o \
-	$(BUILDDIR)/x11/r_misc.o \
-	$(BUILDDIR)/x11/r_main.o \
-	$(BUILDDIR)/x11/r_sky.o \
-	$(BUILDDIR)/x11/r_sprite.o \
-	$(BUILDDIR)/x11/r_surf.o \
-	$(BUILDDIR)/x11/r_part.o \
-	$(BUILDDIR)/x11/r_vars.o \
-	$(BUILDDIR)/x11/screen.o \
-	$(BUILDDIR)/x11/sbar.o \
-	$(BUILDDIR)/x11/sv_main.o \
-	$(BUILDDIR)/x11/sv_phys.o \
-	$(BUILDDIR)/x11/sv_move.o \
-	$(BUILDDIR)/x11/sv_user.o \
-	$(BUILDDIR)/x11/zone.o	\
-	$(BUILDDIR)/x11/view.o	\
-	$(BUILDDIR)/x11/wad.o \
-	$(BUILDDIR)/x11/world.o \
-	$(BUILDDIR)/x11/cd_linux.o \
-	$(BUILDDIR)/x11/sys_linux.o \
-	$(BUILDDIR)/x11/vid_x.o \
-	$(BUILDDIR)/x11/snd_dma.o \
-	$(BUILDDIR)/x11/snd_mem.o \
-	$(BUILDDIR)/x11/snd_mix.o \
-	$(BUILDDIR)/x11/snd_linux.o \
-	\
-	$(BUILDDIR)/x11/d_draw.o \
-	$(BUILDDIR)/x11/d_draw16.o \
-	$(BUILDDIR)/x11/d_parta.o \
-	$(BUILDDIR)/x11/d_polysa.o \
-	$(BUILDDIR)/x11/d_scana.o \
-	$(BUILDDIR)/x11/d_spr8.o \
-	$(BUILDDIR)/x11/d_varsa.o \
-	$(BUILDDIR)/x11/math.o \
-	$(BUILDDIR)/x11/r_aliasa.o \
-	$(BUILDDIR)/x11/r_drawa.o \
-	$(BUILDDIR)/x11/r_edgea.o \
-	$(BUILDDIR)/x11/r_varsa.o \
-	$(BUILDDIR)/x11/surf16.o \
-	$(BUILDDIR)/x11/surf8.o \
-	$(BUILDDIR)/x11/worlda.o \
-	$(BUILDDIR)/x11/r_aclipa.o \
-	$(BUILDDIR)/x11/snd_mixa.o \
-	$(BUILDDIR)/x11/sys_dosa.o
-
-$(BUILDDIR)/bin/quake.x11 : $(X11_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(X11_OBJS) $(XLDFLAGS) $(LDFLAGS)
-
-####
-
-$(BUILDDIR)/x11/cl_demo.o :  $(MOUNT_DIR)/cl_demo.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/cl_input.o : $(MOUNT_DIR)/cl_input.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/cl_main.o :  $(MOUNT_DIR)/cl_main.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/cl_parse.o : $(MOUNT_DIR)/cl_parse.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/cl_tent.o :  $(MOUNT_DIR)/cl_tent.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/chase.o :    $(MOUNT_DIR)/chase.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/cmd.o :      $(MOUNT_DIR)/cmd.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/common.o :   $(MOUNT_DIR)/common.c
-	$(DO_X11_DEBUG_CC)
-
-$(BUILDDIR)/x11/console.o :  $(MOUNT_DIR)/console.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/crc.o :      $(MOUNT_DIR)/crc.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/cvar.o :     $(MOUNT_DIR)/cvar.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/draw.o :     $(MOUNT_DIR)/draw.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_edge.o :   $(MOUNT_DIR)/d_edge.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_fill.o :   $(MOUNT_DIR)/d_fill.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_init.o :   $(MOUNT_DIR)/d_init.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_modech.o : $(MOUNT_DIR)/d_modech.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_part.o :   $(MOUNT_DIR)/d_part.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_polyse.o : $(MOUNT_DIR)/d_polyse.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_scan.o :   $(MOUNT_DIR)/d_scan.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_sky.o :    $(MOUNT_DIR)/d_sky.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_sprite.o : $(MOUNT_DIR)/d_sprite.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_surf.o :   $(MOUNT_DIR)/d_surf.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_vars.o :   $(MOUNT_DIR)/d_vars.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/d_zpoint.o : $(MOUNT_DIR)/d_zpoint.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/host.o :     $(MOUNT_DIR)/host.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/host_cmd.o : $(MOUNT_DIR)/host_cmd.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/keys.o :     $(MOUNT_DIR)/keys.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/menu.o :     $(MOUNT_DIR)/menu.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/mathlib.o :  $(MOUNT_DIR)/mathlib.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/model.o :    $(MOUNT_DIR)/model.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/net_dgrm.o : $(MOUNT_DIR)/net_dgrm.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/net_loop.o : $(MOUNT_DIR)/net_loop.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/net_main.o : $(MOUNT_DIR)/net_main.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/net_vcr.o :  $(MOUNT_DIR)/net_vcr.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/net_udp.o :  $(MOUNT_DIR)/net_udp.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/net_bsd.o :  $(MOUNT_DIR)/net_bsd.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/nonintel.o : $(MOUNT_DIR)/nonintel.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/pr_cmds.o :  $(MOUNT_DIR)/pr_cmds.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/pr_edict.o : $(MOUNT_DIR)/pr_edict.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/pr_exec.o :  $(MOUNT_DIR)/pr_exec.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_aclip.o :  $(MOUNT_DIR)/r_aclip.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_alias.o :  $(MOUNT_DIR)/r_alias.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_bsp.o :    $(MOUNT_DIR)/r_bsp.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_light.o :  $(MOUNT_DIR)/r_light.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_draw.o :   $(MOUNT_DIR)/r_draw.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_efrag.o :  $(MOUNT_DIR)/r_efrag.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_edge.o :   $(MOUNT_DIR)/r_edge.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_misc.o :   $(MOUNT_DIR)/r_misc.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_main.o :   $(MOUNT_DIR)/r_main.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_sky.o :    $(MOUNT_DIR)/r_sky.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_sprite.o : $(MOUNT_DIR)/r_sprite.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_surf.o :   $(MOUNT_DIR)/r_surf.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_part.o :   $(MOUNT_DIR)/r_part.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/r_vars.o :   $(MOUNT_DIR)/r_vars.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/screen.o :   $(MOUNT_DIR)/screen.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/sbar.o :     $(MOUNT_DIR)/sbar.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/sv_main.o :  $(MOUNT_DIR)/sv_main.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/sv_phys.o :  $(MOUNT_DIR)/sv_phys.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/sv_move.o :  $(MOUNT_DIR)/sv_move.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/sv_user.o :  $(MOUNT_DIR)/sv_user.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/zone.o	:   $(MOUNT_DIR)/zone.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/view.o	:   $(MOUNT_DIR)/view.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/wad.o :      $(MOUNT_DIR)/wad.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/world.o :    $(MOUNT_DIR)/world.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/cd_linux.o : $(MOUNT_DIR)/cd_linux.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/sys_linux.o :$(MOUNT_DIR)/sys_linux.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/vid_x.o: $(MOUNT_DIR)/vid_x.c
-	$(DO_O_CC)
-
-$(BUILDDIR)/x11/snd_dma.o :  $(MOUNT_DIR)/snd_dma.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/snd_mem.o :  $(MOUNT_DIR)/snd_mem.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/snd_mix.o :  $(MOUNT_DIR)/snd_mix.c
-	$(DO_X11_CC)
-
-$(BUILDDIR)/x11/snd_linux.o :$(MOUNT_DIR)/snd_linux.c
-	$(DO_X11_CC)
-
-#####
-
-$(BUILDDIR)/x11/d_copy.o :   $(MOUNT_DIR)/d_copy.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/d_draw.o :   $(MOUNT_DIR)/d_draw.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/d_draw16.o : $(MOUNT_DIR)/d_draw16.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/d_parta.o :  $(MOUNT_DIR)/d_parta.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/d_polysa.o : $(MOUNT_DIR)/d_polysa.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/d_scana.o :  $(MOUNT_DIR)/d_scana.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/d_spr8.o :   $(MOUNT_DIR)/d_spr8.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/d_varsa.o :  $(MOUNT_DIR)/d_varsa.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/math.o :     $(MOUNT_DIR)/math.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/r_aliasa.o : $(MOUNT_DIR)/r_aliasa.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/r_drawa.o :  $(MOUNT_DIR)/r_drawa.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/r_edgea.o :  $(MOUNT_DIR)/r_edgea.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/r_varsa.o :  $(MOUNT_DIR)/r_varsa.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/surf16.o :   $(MOUNT_DIR)/surf16.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/surf8.o :    $(MOUNT_DIR)/surf8.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/worlda.o :   $(MOUNT_DIR)/worlda.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/r_aclipa.o : $(MOUNT_DIR)/r_aclipa.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/snd_mixa.o : $(MOUNT_DIR)/snd_mixa.s
-	$(DO_AS)
-
-$(BUILDDIR)/x11/sys_dosa.o : $(MOUNT_DIR)/sys_dosa.s
-	$(DO_AS)
-
-#############################################################################
-# GLQuake
-#############################################################################
-
-GLQUAKE_OBJS= \
-	$(BUILDDIR)/glquake/cl_demo.o \
-	$(BUILDDIR)/glquake/cl_input.o \
-	$(BUILDDIR)/glquake/cl_main.o \
-	$(BUILDDIR)/glquake/cl_parse.o \
-	$(BUILDDIR)/glquake/cl_tent.o \
-	$(BUILDDIR)/glquake/chase.o \
-	$(BUILDDIR)/glquake/cmd.o \
-	$(BUILDDIR)/glquake/common.o \
-	$(BUILDDIR)/glquake/console.o \
-	$(BUILDDIR)/glquake/crc.o \
-	$(BUILDDIR)/glquake/cvar.o \
-	\
-	$(BUILDDIR)/glquake/gl_draw.o \
-	$(BUILDDIR)/glquake/gl_mesh.o \
-	$(BUILDDIR)/glquake/gl_model.o \
-	$(BUILDDIR)/glquake/gl_refrag.o \
-	$(BUILDDIR)/glquake/gl_rlight.o \
-	$(BUILDDIR)/glquake/gl_rmain.o \
-	$(BUILDDIR)/glquake/gl_rmisc.o \
-	$(BUILDDIR)/glquake/gl_rsurf.o \
-	$(BUILDDIR)/glquake/gl_screen.o \
-	$(BUILDDIR)/glquake/gl_test.o \
-	$(BUILDDIR)/glquake/gl_warp.o \
-	\
-	$(BUILDDIR)/glquake/host.o \
-	$(BUILDDIR)/glquake/host_cmd.o \
-	$(BUILDDIR)/glquake/keys.o \
-	$(BUILDDIR)/glquake/menu.o \
-	$(BUILDDIR)/glquake/mathlib.o \
-	$(BUILDDIR)/glquake/net_dgrm.o \
-	$(BUILDDIR)/glquake/net_loop.o \
-	$(BUILDDIR)/glquake/net_main.o \
-	$(BUILDDIR)/glquake/net_vcr.o \
-	$(BUILDDIR)/glquake/net_udp.o \
-	$(BUILDDIR)/glquake/net_bsd.o \
-	$(BUILDDIR)/glquake/pr_cmds.o \
-	$(BUILDDIR)/glquake/pr_edict.o \
-	$(BUILDDIR)/glquake/pr_exec.o \
-	$(BUILDDIR)/glquake/r_part.o \
-	$(BUILDDIR)/glquake/sbar.o \
-	$(BUILDDIR)/glquake/sv_main.o \
-	$(BUILDDIR)/glquake/sv_phys.o \
-	$(BUILDDIR)/glquake/sv_move.o \
-	$(BUILDDIR)/glquake/sv_user.o \
-	$(BUILDDIR)/glquake/zone.o	\
-	$(BUILDDIR)/glquake/view.o	\
-	$(BUILDDIR)/glquake/wad.o \
-	$(BUILDDIR)/glquake/world.o \
-	$(BUILDDIR)/glquake/cd_linux.o \
-	$(BUILDDIR)/glquake/sys_linux.o \
-	$(BUILDDIR)/glquake/snd_dma.o \
-	$(BUILDDIR)/glquake/snd_mem.o \
-	$(BUILDDIR)/glquake/snd_mix.o \
-	$(BUILDDIR)/glquake/snd_linux.o \
-	\
-	$(BUILDDIR)/glquake/math.o \
-	$(BUILDDIR)/glquake/worlda.o \
-	$(BUILDDIR)/glquake/snd_mixa.o \
-	$(BUILDDIR)/glquake/sys_dosa.o
-
-GLSVGA_OBJS=$(BUILDDIR)/glquake/gl_vidlinux.o
-
-GLX_OBJS=$(BUILDDIR)/glquake/gl_vidlinuxglx.o
-
-$(BUILDDIR)/bin/glquake : $(GLQUAKE_OBJS) $(GLSVGA_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLSVGA_OBJS) $(MESAGLLDFLAGS) $(SVGALDFLAGS) $(LDFLAGS)
-
-$(BUILDDIR)/bin/glquake.glx : $(GLQUAKE_OBJS) $(GLX_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLX_OBJS) $(GLLDFLAGS) $(LDFLAGS)
-
-$(BUILDDIR)/bin/glquake.3dfxgl : $(GLQUAKE_OBJS) $(GLSVGA_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLSVGA_OBJS) $(TDFXGLLDFLAGS) $(SVGALDFLAGS) $(LDFLAGS)
-
-$(BUILDDIR)/glquake/cl_demo.o :      $(MOUNT_DIR)/cl_demo.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/cl_input.o :     $(MOUNT_DIR)/cl_input.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/cl_main.o :      $(MOUNT_DIR)/cl_main.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/cl_parse.o :     $(MOUNT_DIR)/cl_parse.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/cl_tent.o :      $(MOUNT_DIR)/cl_tent.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/chase.o :        $(MOUNT_DIR)/chase.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/cmd.o :          $(MOUNT_DIR)/cmd.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/common.o :       $(MOUNT_DIR)/common.c
-	$(DO_GL_DEBUG_CC)
-
-$(BUILDDIR)/glquake/console.o :      $(MOUNT_DIR)/console.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/crc.o :          $(MOUNT_DIR)/crc.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/cvar.o :         $(MOUNT_DIR)/cvar.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_draw.o :      $(MOUNT_DIR)/gl_draw.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_mesh.o :      $(MOUNT_DIR)/gl_mesh.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_model.o :     $(MOUNT_DIR)/gl_model.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_refrag.o :    $(MOUNT_DIR)/gl_refrag.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_rlight.o :    $(MOUNT_DIR)/gl_rlight.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_rmain.o :     $(MOUNT_DIR)/gl_rmain.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_rmisc.o :     $(MOUNT_DIR)/gl_rmisc.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_rsurf.o :     $(MOUNT_DIR)/gl_rsurf.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_screen.o :    $(MOUNT_DIR)/gl_screen.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_test.o :      $(MOUNT_DIR)/gl_test.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_vidlinux.o :  $(MOUNT_DIR)/gl_vidlinux.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_vidlinuxglx.o :  $(MOUNT_DIR)/gl_vidlinuxglx.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/gl_warp.o :      $(MOUNT_DIR)/gl_warp.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/host.o :         $(MOUNT_DIR)/host.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/host_cmd.o :     $(MOUNT_DIR)/host_cmd.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/keys.o :         $(MOUNT_DIR)/keys.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/menu.o :         $(MOUNT_DIR)/menu.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/mathlib.o :      $(MOUNT_DIR)/mathlib.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/net_dgrm.o :     $(MOUNT_DIR)/net_dgrm.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/net_loop.o :     $(MOUNT_DIR)/net_loop.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/net_main.o :     $(MOUNT_DIR)/net_main.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/net_vcr.o :      $(MOUNT_DIR)/net_vcr.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/net_udp.o :      $(MOUNT_DIR)/net_udp.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/net_bsd.o :      $(MOUNT_DIR)/net_bsd.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/pr_cmds.o :      $(MOUNT_DIR)/pr_cmds.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/pr_edict.o :     $(MOUNT_DIR)/pr_edict.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/pr_exec.o :      $(MOUNT_DIR)/pr_exec.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/r_part.o :       $(MOUNT_DIR)/r_part.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/sbar.o :         $(MOUNT_DIR)/sbar.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/sv_main.o :      $(MOUNT_DIR)/sv_main.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/sv_phys.o :      $(MOUNT_DIR)/sv_phys.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/sv_move.o :      $(MOUNT_DIR)/sv_move.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/sv_user.o :      $(MOUNT_DIR)/sv_user.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/zone.o	:        $(MOUNT_DIR)/zone.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/view.o	:        $(MOUNT_DIR)/view.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/wad.o :          $(MOUNT_DIR)/wad.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/world.o :        $(MOUNT_DIR)/world.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/cd_linux.o :     $(MOUNT_DIR)/cd_linux.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/sys_linux.o :    $(MOUNT_DIR)/sys_linux.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/snd_dma.o :      $(MOUNT_DIR)/snd_dma.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/snd_mem.o :      $(MOUNT_DIR)/snd_mem.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/snd_mix.o :      $(MOUNT_DIR)/snd_mix.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/snd_linux.o :    $(MOUNT_DIR)/snd_linux.c
-	$(DO_GL_CC)
-
-$(BUILDDIR)/glquake/math.o :         $(MOUNT_DIR)/math.s
-	$(DO_GL_AS)
-
-$(BUILDDIR)/glquake/worlda.o :       $(MOUNT_DIR)/worlda.s
-	$(DO_GL_AS)
-
-$(BUILDDIR)/glquake/snd_mixa.o :     $(MOUNT_DIR)/snd_mixa.s
-	$(DO_GL_AS)
-
-$(BUILDDIR)/glquake/sys_dosa.o :     $(MOUNT_DIR)/sys_dosa.s
-	$(DO_GL_AS)
-
-#############################################################################
-# RPM
-#############################################################################
-
-# Make RPMs.  You need to be root to make this work
-RPMROOT=/usr/src/redhat
-RPM = rpm
-RPMFLAGS = -bb
-INSTALLDIR = /usr/local/games/quake
-TMPDIR = /var/tmp
-RPMDIR = $(TMPDIR)/quake-$(VERSION)
-BASERPMDIR = $(TMPDIR)/quake-$(BASEVERSION)
-
-rpm: rpm-quake rpm-quake-data rpm-hipnotic rpm-rogue
-
-rpm-quake: quake.spec \
-		$(BUILD_RELEASE_DIR)/bin/squake \
-		$(BUILD_RELEASE_DIR)/bin/quake.x11 \
-		$(BUILD_RELEASE_DIR)/bin/glquake \
-		$(BUILD_RELEASE_DIR)/bin/glquake.glx \
-		$(BUILD_RELEASE_DIR)/bin/glquake.3dfxgl
-	touch $(RPMROOT)/SOURCES/quake-$(VERSION).tar.gz
-	if [ ! -d RPMS ];then mkdir RPMS;fi
-	cp $(MOUNT_DIR)/quake.gif $(RPMROOT)/SOURCES/quake.gif
-
-	# basic binaries rpm
-	-mkdirhier $(RPMDIR)/$(INSTALLDIR)
-	cp $(MOUNT_DIR)/docs/README $(RPMDIR)/$(INSTALLDIR)/.
-	cp $(BUILD_RELEASE_DIR)/bin/squake $(RPMDIR)/$(INSTALLDIR)/squake
-	strip $(RPMDIR)/$(INSTALLDIR)/squake
-	cp $(BUILD_RELEASE_DIR)/bin/quake.x11 $(RPMDIR)/$(INSTALLDIR)/quake.x11
-	strip $(RPMDIR)/$(INSTALLDIR)/quake.x11
-	cp $(BUILD_RELEASE_DIR)/bin/glquake $(RPMDIR)/$(INSTALLDIR)/glquake
-	strip $(RPMDIR)/$(INSTALLDIR)/glquake
-	cp $(BUILD_RELEASE_DIR)/bin/glquake.glx $(RPMDIR)/$(INSTALLDIR)/glquake.glx
-	strip $(RPMDIR)/$(INSTALLDIR)/glquake.glx
-	cp $(BUILD_RELEASE_DIR)/bin/glquake.3dfxgl $(RPMDIR)/$(INSTALLDIR)/glquake.3dfxgl
-	strip $(RPMDIR)/$(INSTALLDIR)/glquake.3dfxgl
-	-mkdirhier $(RPMDIR)/usr/lib
-	cp $(TDFXGL_DIR)/release$(ARCH)$(GLIBC)/lib3dfxgl.so $(RPMDIR)/usr/lib/lib3dfxgl.so
-	cp $(MESA_DIR)/lib/libMesaGL.so.2.6 $(RPMDIR)/usr/lib/libMesaGL.so.2.6
-
-	cp quake.spec $(RPMROOT)/SPECS/.
-	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) quake.spec
-	rm -rf $(RPMDIR)
-	rm -f $(RPMROOT)/SOURCES/quake-$(VERSION).tar.gz
-
-	mv $(RPMROOT)/RPMS/$(ARCH)/quake-$(VERSION)-$(RPM_RELEASE).$(ARCH).rpm RPMS/.
-
-QUAKEDATADIR=$(TMPDIR)/quake-data-$(BASEVERSION)
-rpm-quake-data: quake-data.spec
-	# data rpm
-	touch $(RPMROOT)/SOURCES/quake-$(BASEVERSION)-data.tar.gz
-
-	-mkdirhier $(QUAKEDATADIR)/$(INSTALLDIR)/id1
-	cp $(MASTER_DIR)/id1/pak0.pak $(QUAKEDATADIR)/$(INSTALLDIR)/id1/.
-	cp $(MASTER_DIR)/id1/pak1.pak $(QUAKEDATADIR)/$(INSTALLDIR)/id1/.
-	cp $(MOUNT_DIR)/docs/README $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/comexp.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/help.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/licinfo.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/manual.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/readme.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/rlicnse.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/slicnse.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp $(MOUNT_DIR)/data/techinfo.txt $(QUAKEDATADIR)/$(INSTALLDIR)/.
-	cp quake-data.spec $(RPMROOT)/SPECS/.
-	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) quake-data.spec
-	rm -rf $(QUAKEDATADIR)
-	rm -f $(RPMROOT)/SOURCES/quake-$(BASEVERSION)-data.tar.gz
-
-	mv $(RPMROOT)/RPMS/$(NOARCH)/quake-data-$(BASEVERSION)-$(RPM_RELEASE).$(NOARCH).rpm RPMS/.
-
-RPMHIPNOTICDIR=$(TMPDIR)/quake-hipnotic-$(BASEVERSION)
-rpm-hipnotic: quake-hipnotic.spec
-	touch $(RPMROOT)/SOURCES/quake-hipnotic-$(BASEVERSION).tar.gz
-	if [ ! -d RPMS ];then mkdir RPMS;fi
-	cp $(MOUNT_DIR)/quake.gif $(RPMROOT)/SOURCES/quake.gif
-	-mkdirhier $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/docs
-	cp $(MASTER_DIR)/hipnotic/pak0.pak $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/.
-	cp $(MASTER_DIR)/hipnotic/config.cfg $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/.
-	cp $(MASTER_DIR)/hipnotic/docs/manual.doc $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/docs/.
-	cp $(MASTER_DIR)/hipnotic/docs/manual.htm $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/docs/.
-	cp $(MASTER_DIR)/hipnotic/docs/manual.txt $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/docs/.
-	cp $(MASTER_DIR)/hipnotic/docs/readme.doc $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/docs/.
-	cp $(MASTER_DIR)/hipnotic/docs/readme.htm $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/docs/.
-	cp $(MASTER_DIR)/hipnotic/docs/readme.txt $(RPMHIPNOTICDIR)/$(INSTALLDIR)/hipnotic/docs/.
-	cp quake-hipnotic.spec $(RPMROOT)/SPECS/.
-	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) quake-hipnotic.spec
-	rm -rf $(RPMHIPNOTICDIR)
-	rm -f $(RPMROOT)/SOURCES/quake-hipnotic-$(BASEVERSION).tar.gz
-
-	mv $(RPMROOT)/RPMS/$(NOARCH)/quake-hipnotic-$(BASEVERSION)-$(RPM_RELEASE).$(NOARCH).rpm RPMS/.
-
-RPMROGUEDIR=$(TMPDIR)/quake-rogue-$(BASEVERSION)
-rpm-rogue: quake-rogue.spec
-	touch $(RPMROOT)/SOURCES/quake-rogue-$(BASEVERSION).tar.gz
-	if [ ! -d RPMS ];then mkdir RPMS;fi
-	cp $(MOUNT_DIR)/quake.gif $(RPMROOT)/SOURCES/quake.gif
-	-mkdirhier $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs
-	cp $(MASTER_DIR)/rogue/pak0.pak $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/.
-	cp $(MASTER_DIR)/rogue/docs/manual.doc $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/manual.htm $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/manual.txt $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/readme.doc $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/readme.htm $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/readme.txt $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/ctf.doc $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/ctf.htm $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp $(MASTER_DIR)/rogue/docs/ctf.txt $(RPMROGUEDIR)/$(INSTALLDIR)/rogue/docs/.
-	cp quake-rogue.spec $(RPMROOT)/SPECS/.
-	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) quake-rogue.spec
-	rm -rf $(RPMROGUEDIR)
-	rm -f $(RPMROOT)/SOURCES/quake-rogue-$(BASEVERSION).tar.gz
-
-	mv $(RPMROOT)/RPMS/$(NOARCH)/quake-rogue-$(BASEVERSION)-$(RPM_RELEASE).$(NOARCH).rpm RPMS/.
-
-quake.spec : $(MOUNT_DIR)/quake.spec.sh
-	sh $< $(VERSION) $(RPM_RELEASE) $(INSTALLDIR) > $@
-
-quake-data.spec : $(MOUNT_DIR)/quake-data.spec.sh
-	sh $< $(BASEVERSION) $(RPM_RELEASE) $(INSTALLDIR) > $@
-
-quake-hipnotic.spec : $(MOUNT_DIR)/quake-hipnotic.spec.sh
-	sh $< $(BASEVERSION) $(RPM_RELEASE) $(INSTALLDIR) > $@
-
-quake-rogue.spec : $(MOUNT_DIR)/quake-rogue.spec.sh
-	sh $< $(BASEVERSION) $(RPM_RELEASE) $(INSTALLDIR) > $@
-
-#############################################################################
-# MISC
-#############################################################################
-
-clean: clean-debug clean-release
-	rm -f squake.spec glquake.spec quake.x11.spec
-
-clean-debug:
-	$(MAKE) clean2 BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
-
-clean-release:
-	$(MAKE) clean2 BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(DEBUG_CFLAGS)"
-
-clean2:
-	-rm -f $(SQUAKE_OBJS) $(X11_OBJS) $(GLQUAKE_OBJS) $(GLSVGA_OBJS) \
-		$(GLX_OBJS)
-
--- a/u/README.Solaris
+++ /dev/null
@@ -1,98 +1,0 @@
-Solaris 2 Quake / QuakeWorld
-----------------------------
-
-	This is an UNSUPPORTED version of Quake and QuakeWorld.  Don't
-	bother id software about it.  Bug reports will be ignored.
-	
-PORT DETAILS
-------------
-
-	There are a few major difference between this port and the
-	vanilla Quake/QuakeWorld available on the internet.  For
-	optimum performance, you should copy everything to a directory
-	on your local system before starting play so that you are
-	not mounting files from a remote filesystem.
-
-	In order to use this program, you need the files pak0.pak 
-	and pak1.pak in the id1 directory found on a registered copy of
-	Quake.  You can ftp them to your Solaris host from a Windows95
-	machine for example.  The files must be in an id1 subdirectory from
-	the directory you install Quake/QuakeWorld, and all file names must
-	be lowercase.  Add on packages such as ThreeWave CTF work fine as
-	well, just place such addon packages in their own directory as you
-	would on a Windows95 installation.  But again, make sure all files
-	are lowercase.
-			
-	COMMAND LINE FLAGS:
-	
-	+pixel_multiply 
-	
-		You can magnify the screen by using this flag:
-		
-		Ex: % quake +pixel_multiply 2
-		
-		You can also use this command (without the dash)
-		from the Quake console.  pixel_multiply is a Quake
-		cvar and is saved from session to session in the
-		config.cfg file.
-
-	-winsize <width> <height>
-
-		Set the size of the window when you start
-
-	-count_frames
-
-		See how many frames per second you're getting
-
-	GAME SETTINGS
-
-	mouse binding
-
-		You can bind and unbind the mouse to the Quake window
-		by using the Use Mouse selection in the Options menu,
-		or with the "_windowed_mouse" command in the console,
-		ex "_windowed_mouse 1" Now, moving the mouse will move
-		your player.  Use "_windowed_mouse 0" to unbind.  You
-		can bind or alias this to a key.  
-
-	Example command:
-
-		% quake.xil +pixel_multiply 2 -winsize 400 300
-
-WHAT IS "QUAKEWORLD" AND HOW DO I USE IT?
------------------------------------------
-
-	In a nutshell, QuakeWorld is an extension of Quake that is
-	much more user friendly.  It allows the user to dynamically
-	download changes from the server, such as new maps and new
-	weapons while inside the Quake client.  It is not directly
-	compatible with Quake (ie, you can't connect to a Quake server
-	from a QuakeWorld client) but in general it is superior to
-	Quake.  QuakeWorld also offers much smoother play over the 
-	Internet by using client prediction.  For more information,
-	check out http://www.quakeworld.net/.
-
-	In order to use it, you must make a copy of the "qw"
-	directory.  Any new stuff that is downloaded from a QuakeWorld
-	server will be stored in this directory.  All regular Quake
-	flags apply so you can use the same command line as before.
-
-	Example command:
-
-		% qwcl.xil +pixel_multiply 2 -winsize 400 300
-
-WHERE CAN I FIND OUT ABOUT...
------------------------------
-
-	If you've got questions about Quake, rest assured that there
-	are answers out there.  Try checking out these web sites:
-
-		http://www.planetquake.com/
-		http://www.stomped.com/
-		http://www.quakeworld.net/
-	
-	If all else fails use a search engine.
-
-Happy fragging,
-the Quake/Solaris team
-	
--- a/u/WinQuake.dsp
+++ /dev/null
@@ -1,2240 +1,0 @@
-# Microsoft Developer Studio Project File - Name="winquake" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=winquake - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "WinQuake.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "WinQuake.mak" CFG="winquake - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "winquake - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "winquake - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "winquake - Win32 GL Debug" (based on "Win32 (x86) Application")
-!MESSAGE "winquake - Win32 GL Release" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release"
-# PROP Intermediate_Dir ".\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /G5 /GX /Ox /Ot /Ow /I ".\scitech\include" /I ".\dxsdk\sdk\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /FD /c
-# SUBTRACT CPP /Oa /Og
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 .\dxsdk\sdk\lib\dxguid.lib .\scitech\lib\win32\vc\mgllt.lib winmm.lib wsock32.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /profile /machine:I386
-# SUBTRACT LINK32 /map /debug
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /G5 /ML /GX /ZI /Od /I ".\scitech\include" /I ".\dxsdk\sdk\inc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# ADD LINK32 .\dxsdk\sdk\lib\dxguid.lib .\scitech\lib\win32\vc\mgllt.lib winmm.lib wsock32.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
-# SUBTRACT LINK32 /nodefaultlib
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\winquake"
-# PROP BASE Intermediate_Dir ".\winquake"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\debug_gl"
-# PROP Intermediate_Dir ".\debug_gl"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G5 /ML /GX /Zi /Od /I ".\scitech\include" /I ".\dxsdk\sdk\inc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /G5 /ML /GX /ZI /Od /I ".\dxsdk\sdk\inc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "GLQUAKE" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 winmm.lib wsock32.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib .\scitech\lib\win32\vc\mgllt.lib /nologo /subsystem:windows /debug /machine:I386
-# SUBTRACT BASE LINK32 /nodefaultlib
-# ADD LINK32 .\dxsdk\sdk\lib\dxguid.lib comctl32.lib winmm.lib wsock32.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:".\debug_gl\glquake.exe"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\winquak0"
-# PROP BASE Intermediate_Dir ".\winquak0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\release_gl"
-# PROP Intermediate_Dir ".\release_gl"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G5 /GX /Ox /Ot /Ow /I ".\scitech\include" /I ".\dxsdk\sdk\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# SUBTRACT BASE CPP /Oa /Og
-# ADD CPP /nologo /G5 /GX /Ot /Ow /I ".\dxsdk\sdk\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "GLQUAKE" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 winmm.lib wsock32.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib .\scitech\lib\win32\vc\mgllt.lib /nologo /subsystem:windows /profile /machine:I386
-# SUBTRACT BASE LINK32 /map /debug
-# ADD LINK32 .\dxsdk\sdk\lib\dxguid.lib comctl32.lib winmm.lib wsock32.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /profile /machine:I386 /out:".\release_gl\glquake.exe"
-# SUBTRACT LINK32 /map /debug
-
-!ENDIF 
-
-# Begin Target
-
-# Name "winquake - Win32 Release"
-# Name "winquake - Win32 Debug"
-# Name "winquake - Win32 GL Debug"
-# Name "winquake - Win32 GL Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\cd_win.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\chase.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cl_demo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cl_input.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cl_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cl_parse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cl_tent.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\conproc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\console.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\crc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cvar.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_draw.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\d_draw.s
-InputName=d_draw
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\d_draw.s
-InputName=d_draw
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_draw16.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\d_draw16.s
-InputName=d_draw16
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\d_draw16.s
-InputName=d_draw16
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_edge.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_fill.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_init.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_modech.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_part.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_parta.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\d_parta.s
-InputName=d_parta
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\d_parta.s
-InputName=d_parta
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_polysa.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\d_polysa.s
-InputName=d_polysa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\d_polysa.s
-InputName=d_polysa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_polyse.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_scan.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_scana.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\d_scana.s
-InputName=d_scana
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\d_scana.s
-InputName=d_scana
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_sky.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_spr8.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\d_spr8.s
-InputName=d_spr8
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\d_spr8.s
-InputName=d_spr8
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_sprite.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_surf.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_vars.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_varsa.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\d_varsa.s
-InputName=d_varsa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\d_varsa.s
-InputName=d_varsa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_zpoint.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\draw.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_draw.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_mesh.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_model.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_refrag.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_rlight.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_rmain.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_rmisc.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_rsurf.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_screen.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_test.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_vidnt.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_warp.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\host.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\host_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\in_win.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\keys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\math.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\math.s
-InputName=math
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\math.s
-InputName=math
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\debug_gl
-InputPath=.\math.s
-InputName=math
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP /DGLQUAKE > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\release_gl
-InputPath=.\math.s
-InputName=math
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mathlib.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\menu.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\model.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_dgrm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_loop.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_vcr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_win.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_wins.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_wipx.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pr_cmds.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pr_edict.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pr_exec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_aclip.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_aclipa.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\r_aclipa.s
-InputName=r_aclipa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\r_aclipa.s
-InputName=r_aclipa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_alias.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_aliasa.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\r_aliasa.s
-InputName=r_aliasa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\r_aliasa.s
-InputName=r_aliasa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_bsp.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_draw.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_drawa.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\r_drawa.s
-InputName=r_drawa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\r_drawa.s
-InputName=r_drawa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_edge.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_edgea.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\r_edgea.s
-InputName=r_edgea
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\r_edgea.s
-InputName=r_edgea
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_efrag.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_light.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_main.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_misc.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_part.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_sky.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_sprite.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_surf.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_vars.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_varsa.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\r_varsa.s
-InputName=r_varsa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\r_varsa.s
-InputName=r_varsa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbar.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\screen.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\snd_dma.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\snd_mem.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\snd_mix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\snd_mixa.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\snd_mixa.s
-InputName=snd_mixa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\snd_mixa.s
-InputName=snd_mixa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\debug_gl
-InputPath=.\snd_mixa.s
-InputName=snd_mixa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP /DGLQUAKE > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\release_gl
-InputPath=.\snd_mixa.s
-InputName=snd_mixa
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP /DGLQUAKE > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\snd_win.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\surf16.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\surf16.s
-InputName=surf16
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\surf16.s
-InputName=surf16
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\surf8.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\surf8.s
-InputName=surf8
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\surf8.s
-InputName=surf8
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_move.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_phys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sv_user.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sys_win.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sys_wina.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\sys_wina.s
-InputName=sys_wina
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\sys_wina.s
-InputName=sys_wina
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\debug_gl
-InputPath=.\sys_wina.s
-InputName=sys_wina
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP /DGLQUAKE > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\release_gl
-InputPath=.\sys_wina.s
-InputName=sys_wina
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP /DGLQUAKE > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\vid_win.c
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\wad.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\winquake.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\world.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\worlda.s
-
-!IF  "$(CFG)" == "winquake - Win32 Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Release
-InputPath=.\worlda.s
-InputName=worlda
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\Debug
-InputPath=.\worlda.s
-InputName=worlda
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Debug"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\debug_gl
-InputPath=.\worlda.s
-InputName=worlda
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP /DGLQUAKE > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "winquake - Win32 GL Release"
-
-# Begin Custom Build - mycoolbuild
-OutDir=.\release_gl
-InputPath=.\worlda.s
-InputName=worlda
-
-"$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /EP /DGLQUAKE > $(OUTDIR)\$(InputName).spp $(InputPath) 
-	gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp >                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	ml /c /Cp /coff /Fo$(OUTDIR)\$(InputName).obj /Zm /Zi                                                                                                                                                                                                    $(OUTDIR)\$(InputName).asm 
-	del $(OUTDIR)\$(InputName).spp 
-	
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\zone.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\anorm_dots.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\anorms.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\bspfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cdaudio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\conproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\console.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\crc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cvar.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_iface.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dosisms.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\draw.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_model.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gl_warp_sin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\glquake.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\input.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\keys.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mathlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\model.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\modelgen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_dgrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_loop.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_ser.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_vcr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_wins.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\net_wipx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pr_comp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\progdefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\progs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\protocol.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\quakedef.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_local.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_shared.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\render.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\screen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\spritegn.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sys.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\vid.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\view.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wad.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\winquake.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\world.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zone.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\qe3.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\quake.ico
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\progdefs.q1
-# End Source File
-# Begin Source File
-
-SOURCE=.\progdefs.q2
-# End Source File
-# End Target
-# End Project
--- a/u/WinQuake.dsw
+++ /dev/null
@@ -1,44 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gas2masm"=.\gas2masm\gas2masm.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "winquake"=.\WinQuake.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name gas2masm
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
binary files a/u/WinQuake.mdp /dev/null differ
binary files a/u/WinQuake.ncb /dev/null differ
binary files a/u/WinQuake.opt /dev/null differ
--- a/u/WinQuake.plg
+++ /dev/null
@@ -1,595 +1,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: winquake - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\TEMP\RSP74A.bat" with contents
-[
-@echo off
-cl /EP > .\Release\worlda.spp .\worlda.s
-gas2masm\debug\gas2masm < .\Release\worlda.spp >                                                                                                                                                                                                    .\Release\worlda.asm
-ml /c /Cp /coff /Fo.\Release\worlda.obj /Zm /Zi                                                                                                                                                                                                    .\Release\worlda.asm
-del .\Release\worlda.spp
-]
-Creating command line "C:\TEMP\RSP74A.bat"
-Creating temporary file "C:\TEMP\RSP74B.bat" with contents
-[
-@echo off
-cl /EP > .\Release\sys_wina.spp .\sys_wina.s
-gas2masm\debug\gas2masm < .\Release\sys_wina.spp >                                                                                                                                                                                                    .\Release\sys_wina.asm
-ml /c /Cp /coff /Fo.\Release\sys_wina.obj /Zm /Zi                                                                                                                                                                                                    .\Release\sys_wina.asm
-del .\Release\sys_wina.spp
-]
-Creating command line "C:\TEMP\RSP74B.bat"
-Creating temporary file "C:\TEMP\RSP74C.bat" with contents
-[
-@echo off
-cl /EP > .\Release\surf8.spp .\surf8.s
-gas2masm\debug\gas2masm < .\Release\surf8.spp >                                                                                                                                                                                                    .\Release\surf8.asm
-ml /c /Cp /coff /Fo.\Release\surf8.obj /Zm /Zi                                                                                                                                                                                                    .\Release\surf8.asm
-del .\Release\surf8.spp
-]
-Creating command line "C:\TEMP\RSP74C.bat"
-Creating temporary file "C:\TEMP\RSP74D.bat" with contents
-[
-@echo off
-cl /EP > .\Release\surf16.spp .\surf16.s
-gas2masm\debug\gas2masm < .\Release\surf16.spp >                                                                                                                                                                                                    .\Release\surf16.asm
-ml /c /Cp /coff /Fo.\Release\surf16.obj /Zm /Zi                                                                                                                                                                                                    .\Release\surf16.asm
-del .\Release\surf16.spp
-]
-Creating command line "C:\TEMP\RSP74D.bat"
-Creating temporary file "C:\TEMP\RSP74E.bat" with contents
-[
-@echo off
-cl /EP > .\Release\snd_mixa.spp .\snd_mixa.s
-gas2masm\debug\gas2masm < .\Release\snd_mixa.spp >                                                                                                                                                                                                    .\Release\snd_mixa.asm
-ml /c /Cp /coff /Fo.\Release\snd_mixa.obj /Zm /Zi                                                                                                                                                                                                    .\Release\snd_mixa.asm
-del .\Release\snd_mixa.spp
-]
-Creating command line "C:\TEMP\RSP74E.bat"
-Creating temporary file "C:\TEMP\RSP74F.bat" with contents
-[
-@echo off
-cl /EP > .\Release\r_varsa.spp .\r_varsa.s
-gas2masm\debug\gas2masm < .\Release\r_varsa.spp >                                                                                                                                                                                                    .\Release\r_varsa.asm
-ml /c /Cp /coff /Fo.\Release\r_varsa.obj /Zm /Zi                                                                                                                                                                                                    .\Release\r_varsa.asm
-del .\Release\r_varsa.spp
-]
-Creating command line "C:\TEMP\RSP74F.bat"
-Creating temporary file "C:\TEMP\RSP750.bat" with contents
-[
-@echo off
-cl /EP > .\Release\r_edgea.spp .\r_edgea.s
-gas2masm\debug\gas2masm < .\Release\r_edgea.spp >                                                                                                                                                                                                    .\Release\r_edgea.asm
-ml /c /Cp /coff /Fo.\Release\r_edgea.obj /Zm /Zi                                                                                                                                                                                                    .\Release\r_edgea.asm
-del .\Release\r_edgea.spp
-]
-Creating command line "C:\TEMP\RSP750.bat"
-Creating temporary file "C:\TEMP\RSP751.bat" with contents
-[
-@echo off
-cl /EP > .\Release\r_drawa.spp .\r_drawa.s
-gas2masm\debug\gas2masm < .\Release\r_drawa.spp >                                                                                                                                                                                                    .\Release\r_drawa.asm
-ml /c /Cp /coff /Fo.\Release\r_drawa.obj /Zm /Zi                                                                                                                                                                                                    .\Release\r_drawa.asm
-del .\Release\r_drawa.spp
-]
-Creating command line "C:\TEMP\RSP751.bat"
-Creating temporary file "C:\TEMP\RSP752.bat" with contents
-[
-@echo off
-cl /EP > .\Release\r_aliasa.spp .\r_aliasa.s
-gas2masm\debug\gas2masm < .\Release\r_aliasa.spp >                                                                                                                                                                                                    .\Release\r_aliasa.asm
-ml /c /Cp /coff /Fo.\Release\r_aliasa.obj /Zm /Zi                                                                                                                                                                                                    .\Release\r_aliasa.asm
-del .\Release\r_aliasa.spp
-]
-Creating command line "C:\TEMP\RSP752.bat"
-Creating temporary file "C:\TEMP\RSP753.bat" with contents
-[
-@echo off
-cl /EP > .\Release\r_aclipa.spp .\r_aclipa.s
-gas2masm\debug\gas2masm < .\Release\r_aclipa.spp >                                                                                                                                                                                                    .\Release\r_aclipa.asm
-ml /c /Cp /coff /Fo.\Release\r_aclipa.obj /Zm /Zi                                                                                                                                                                                                    .\Release\r_aclipa.asm
-del .\Release\r_aclipa.spp
-]
-Creating command line "C:\TEMP\RSP753.bat"
-Creating temporary file "C:\TEMP\RSP754.bat" with contents
-[
-@echo off
-cl /EP > .\Release\math.spp .\math.s
-gas2masm\debug\gas2masm < .\Release\math.spp >                                                                                                                                                                                                    .\Release\math.asm
-ml /c /Cp /coff /Fo.\Release\math.obj /Zm /Zi                                                                                                                                                                                                    .\Release\math.asm
-del .\Release\math.spp
-]
-Creating command line "C:\TEMP\RSP754.bat"
-Creating temporary file "C:\TEMP\RSP755.bat" with contents
-[
-@echo off
-cl /EP > .\Release\d_varsa.spp .\d_varsa.s
-gas2masm\debug\gas2masm < .\Release\d_varsa.spp >                                                                                                                                                                                                    .\Release\d_varsa.asm
-ml /c /Cp /coff /Fo.\Release\d_varsa.obj /Zm /Zi                                                                                                                                                                                                    .\Release\d_varsa.asm
-del .\Release\d_varsa.spp
-]
-Creating command line "C:\TEMP\RSP755.bat"
-Creating temporary file "C:\TEMP\RSP756.bat" with contents
-[
-@echo off
-cl /EP > .\Release\d_spr8.spp .\d_spr8.s
-gas2masm\debug\gas2masm < .\Release\d_spr8.spp >                                                                                                                                                                                                    .\Release\d_spr8.asm
-ml /c /Cp /coff /Fo.\Release\d_spr8.obj /Zm /Zi                                                                                                                                                                                                    .\Release\d_spr8.asm
-del .\Release\d_spr8.spp
-]
-Creating command line "C:\TEMP\RSP756.bat"
-Creating temporary file "C:\TEMP\RSP757.bat" with contents
-[
-@echo off
-cl /EP > .\Release\d_scana.spp .\d_scana.s
-gas2masm\debug\gas2masm < .\Release\d_scana.spp >                                                                                                                                                                                                    .\Release\d_scana.asm
-ml /c /Cp /coff /Fo.\Release\d_scana.obj /Zm /Zi                                                                                                                                                                                                    .\Release\d_scana.asm
-del .\Release\d_scana.spp
-]
-Creating command line "C:\TEMP\RSP757.bat"
-Creating temporary file "C:\TEMP\RSP758.bat" with contents
-[
-@echo off
-cl /EP > .\Release\d_polysa.spp .\d_polysa.s
-gas2masm\debug\gas2masm < .\Release\d_polysa.spp >                                                                                                                                                                                                    .\Release\d_polysa.asm
-ml /c /Cp /coff /Fo.\Release\d_polysa.obj /Zm /Zi                                                                                                                                                                                                    .\Release\d_polysa.asm
-del .\Release\d_polysa.spp
-]
-Creating command line "C:\TEMP\RSP758.bat"
-Creating temporary file "C:\TEMP\RSP759.bat" with contents
-[
-@echo off
-cl /EP > .\Release\d_parta.spp .\d_parta.s
-gas2masm\debug\gas2masm < .\Release\d_parta.spp >                                                                                                                                                                                                    .\Release\d_parta.asm
-ml /c /Cp /coff /Fo.\Release\d_parta.obj /Zm /Zi                                                                                                                                                                                                    .\Release\d_parta.asm
-del .\Release\d_parta.spp
-]
-Creating command line "C:\TEMP\RSP759.bat"
-Creating temporary file "C:\TEMP\RSP75A.bat" with contents
-[
-@echo off
-cl /EP > .\Release\d_draw16.spp .\d_draw16.s
-gas2masm\debug\gas2masm < .\Release\d_draw16.spp >                                                                                                                                                                                                    .\Release\d_draw16.asm
-ml /c /Cp /coff /Fo.\Release\d_draw16.obj /Zm /Zi                                                                                                                                                                                                    .\Release\d_draw16.asm
-del .\Release\d_draw16.spp
-]
-Creating command line "C:\TEMP\RSP75A.bat"
-Creating temporary file "C:\TEMP\RSP75B.bat" with contents
-[
-@echo off
-cl /EP > .\Release\d_draw.spp .\d_draw.s
-gas2masm\debug\gas2masm < .\Release\d_draw.spp >                                                                                                                                                                                                    .\Release\d_draw.asm
-ml /c /Cp /coff /Fo.\Release\d_draw.obj /Zm /Zi                                                                                                                                                                                                    .\Release\d_draw.asm
-del .\Release\d_draw.spp
-]
-Creating command line "C:\TEMP\RSP75B.bat"
-Creating command line "rc.exe /l 0x409 /fo".\Release/winquake.res" /d "NDEBUG" "D:\Work\quake source\WinQuake\winquake.rc"" 
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-worlda.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\worlda.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-sys_wina.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\sys_wina.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-surf8.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\surf8.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-surf16.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\surf16.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-snd_mixa.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\snd_mixa.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r_varsa.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\r_varsa.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r_edgea.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\r_edgea.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r_drawa.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\r_drawa.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r_aliasa.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\r_aliasa.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r_aclipa.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\r_aclipa.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-math.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\math.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-d_varsa.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\d_varsa.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-d_spr8.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\d_spr8.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-d_scana.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\d_scana.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-d_polysa.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\d_polysa.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-d_parta.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\d_parta.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-d_draw16.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\d_draw16.asm
-mycoolbuild
-Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-d_draw.s
-Microsoft (R) Macro Assembler Version 6.11
-Copyright (C) Microsoft Corp 1981-1993.  All rights reserved.
-
- Assembling: .\Release\d_draw.asm
-Creating temporary file "C:\TEMP\RSP75C.tmp" with contents
-[
-/nologo /G5 /ML /GX /Ox /Ot /Ow /I ".\scitech\include" /I ".\dxsdk\sdk\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR".\Release/" /Fp".\Release/WinQuake.pch" /YX /Fo".\Release/" /Fd".\Release/" /FD /c 
-"D:\Work\quake source\WinQuake\cd_win.c"
-"D:\Work\quake source\WinQuake\chase.c"
-"D:\Work\quake source\WinQuake\cl_demo.c"
-"D:\Work\quake source\WinQuake\cl_input.c"
-"D:\Work\quake source\WinQuake\cl_main.c"
-"D:\Work\quake source\WinQuake\cl_parse.c"
-"D:\Work\quake source\WinQuake\cl_tent.c"
-"D:\Work\quake source\WinQuake\cmd.c"
-"D:\Work\quake source\WinQuake\common.c"
-"D:\Work\quake source\WinQuake\conproc.c"
-"D:\Work\quake source\WinQuake\console.c"
-"D:\Work\quake source\WinQuake\crc.c"
-"D:\Work\quake source\WinQuake\cvar.c"
-"D:\Work\quake source\WinQuake\d_edge.c"
-"D:\Work\quake source\WinQuake\d_fill.c"
-"D:\Work\quake source\WinQuake\d_init.c"
-"D:\Work\quake source\WinQuake\d_modech.c"
-"D:\Work\quake source\WinQuake\d_part.c"
-"D:\Work\quake source\WinQuake\d_polyse.c"
-"D:\Work\quake source\WinQuake\d_scan.c"
-"D:\Work\quake source\WinQuake\d_sky.c"
-"D:\Work\quake source\WinQuake\d_sprite.c"
-"D:\Work\quake source\WinQuake\d_surf.c"
-"D:\Work\quake source\WinQuake\d_vars.c"
-"D:\Work\quake source\WinQuake\d_zpoint.c"
-"D:\Work\quake source\WinQuake\draw.c"
-"D:\Work\quake source\WinQuake\host.c"
-"D:\Work\quake source\WinQuake\host_cmd.c"
-"D:\Work\quake source\WinQuake\in_win.c"
-"D:\Work\quake source\WinQuake\keys.c"
-"D:\Work\quake source\WinQuake\mathlib.c"
-"D:\Work\quake source\WinQuake\menu.c"
-"D:\Work\quake source\WinQuake\model.c"
-"D:\Work\quake source\WinQuake\net_dgrm.c"
-"D:\Work\quake source\WinQuake\net_loop.c"
-"D:\Work\quake source\WinQuake\net_main.c"
-"D:\Work\quake source\WinQuake\net_vcr.c"
-"D:\Work\quake source\WinQuake\net_win.c"
-"D:\Work\quake source\WinQuake\net_wins.c"
-"D:\Work\quake source\WinQuake\net_wipx.c"
-"D:\Work\quake source\WinQuake\pr_cmds.c"
-"D:\Work\quake source\WinQuake\pr_edict.c"
-"D:\Work\quake source\WinQuake\pr_exec.c"
-"D:\Work\quake source\WinQuake\r_aclip.c"
-"D:\Work\quake source\WinQuake\r_alias.c"
-"D:\Work\quake source\WinQuake\r_bsp.c"
-"D:\Work\quake source\WinQuake\r_draw.c"
-"D:\Work\quake source\WinQuake\r_edge.c"
-"D:\Work\quake source\WinQuake\r_efrag.c"
-"D:\Work\quake source\WinQuake\r_light.c"
-"D:\Work\quake source\WinQuake\r_main.c"
-"D:\Work\quake source\WinQuake\r_misc.c"
-"D:\Work\quake source\WinQuake\r_part.c"
-"D:\Work\quake source\WinQuake\r_sky.c"
-"D:\Work\quake source\WinQuake\r_sprite.c"
-"D:\Work\quake source\WinQuake\r_surf.c"
-"D:\Work\quake source\WinQuake\r_vars.c"
-"D:\Work\quake source\WinQuake\sbar.c"
-"D:\Work\quake source\WinQuake\screen.c"
-"D:\Work\quake source\WinQuake\snd_dma.c"
-"D:\Work\quake source\WinQuake\snd_mem.c"
-"D:\Work\quake source\WinQuake\snd_mix.c"
-"D:\Work\quake source\WinQuake\snd_win.c"
-"D:\Work\quake source\WinQuake\sv_main.c"
-"D:\Work\quake source\WinQuake\sv_move.c"
-"D:\Work\quake source\WinQuake\sv_phys.c"
-"D:\Work\quake source\WinQuake\sv_user.c"
-"D:\Work\quake source\WinQuake\sys_win.c"
-"D:\Work\quake source\WinQuake\vid_win.c"
-"D:\Work\quake source\WinQuake\view.c"
-"D:\Work\quake source\WinQuake\wad.c"
-"D:\Work\quake source\WinQuake\world.c"
-"D:\Work\quake source\WinQuake\zone.c"
-]
-Creating command line "cl.exe @C:\TEMP\RSP75C.tmp" 
-Creating temporary file "C:\TEMP\RSP75D.tmp" with contents
-[
-.\dxsdk\sdk\lib\dxguid.lib .\scitech\lib\win32\vc\mgllt.lib winmm.lib wsock32.lib opengl32.lib glu32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /profile /machine:I386 /out:".\Release/WinQuake.exe" 
-".\Release\cd_win.obj"
-".\Release\chase.obj"
-".\Release\cl_demo.obj"
-".\Release\cl_input.obj"
-".\Release\cl_main.obj"
-".\Release\cl_parse.obj"
-".\Release\cl_tent.obj"
-".\Release\cmd.obj"
-".\Release\common.obj"
-".\Release\conproc.obj"
-".\Release\console.obj"
-".\Release\crc.obj"
-".\Release\cvar.obj"
-".\Release\d_edge.obj"
-".\Release\d_fill.obj"
-".\Release\d_init.obj"
-".\Release\d_modech.obj"
-".\Release\d_part.obj"
-".\Release\d_polyse.obj"
-".\Release\d_scan.obj"
-".\Release\d_sky.obj"
-".\Release\d_sprite.obj"
-".\Release\d_surf.obj"
-".\Release\d_vars.obj"
-".\Release\d_zpoint.obj"
-".\Release\draw.obj"
-".\Release\host.obj"
-".\Release\host_cmd.obj"
-".\Release\in_win.obj"
-".\Release\keys.obj"
-".\Release\mathlib.obj"
-".\Release\menu.obj"
-".\Release\model.obj"
-".\Release\net_dgrm.obj"
-".\Release\net_loop.obj"
-".\Release\net_main.obj"
-".\Release\net_vcr.obj"
-".\Release\net_win.obj"
-".\Release\net_wins.obj"
-".\Release\net_wipx.obj"
-".\Release\pr_cmds.obj"
-".\Release\pr_edict.obj"
-".\Release\pr_exec.obj"
-".\Release\r_aclip.obj"
-".\Release\r_alias.obj"
-".\Release\r_bsp.obj"
-".\Release\r_draw.obj"
-".\Release\r_edge.obj"
-".\Release\r_efrag.obj"
-".\Release\r_light.obj"
-".\Release\r_main.obj"
-".\Release\r_misc.obj"
-".\Release\r_part.obj"
-".\Release\r_sky.obj"
-".\Release\r_sprite.obj"
-".\Release\r_surf.obj"
-".\Release\r_vars.obj"
-".\Release\sbar.obj"
-".\Release\screen.obj"
-".\Release\snd_dma.obj"
-".\Release\snd_mem.obj"
-".\Release\snd_mix.obj"
-".\Release\snd_win.obj"
-".\Release\sv_main.obj"
-".\Release\sv_move.obj"
-".\Release\sv_phys.obj"
-".\Release\sv_user.obj"
-".\Release\sys_win.obj"
-".\Release\vid_win.obj"
-".\Release\view.obj"
-".\Release\wad.obj"
-".\Release\world.obj"
-".\Release\zone.obj"
-".\Release\winquake.res"
-".\Release\d_draw.obj"
-".\Release\d_draw16.obj"
-".\Release\d_parta.obj"
-".\Release\d_polysa.obj"
-".\Release\d_scana.obj"
-".\Release\d_spr8.obj"
-".\Release\d_varsa.obj"
-".\Release\math.obj"
-".\Release\r_aclipa.obj"
-".\Release\r_aliasa.obj"
-".\Release\r_drawa.obj"
-".\Release\r_edgea.obj"
-".\Release\r_varsa.obj"
-".\Release\snd_mixa.obj"
-".\Release\surf16.obj"
-".\Release\surf8.obj"
-".\Release\sys_wina.obj"
-".\Release\worlda.obj"
-]
-Creating command line "link.exe @C:\TEMP\RSP75D.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-cd_win.c
-chase.c
-cl_demo.c
-cl_input.c
-cl_main.c
-cl_parse.c
-cl_tent.c
-cmd.c
-common.c
-conproc.c
-console.c
-crc.c
-cvar.c
-d_edge.c
-d_fill.c
-d_init.c
-d_modech.c
-d_part.c
-d_polyse.c
-d_scan.c
-d_sky.c
-d_sprite.c
-d_surf.c
-d_vars.c
-d_zpoint.c
-draw.c
-host.c
-host_cmd.c
-in_win.c
-keys.c
-D:\Work\quake source\WinQuake\in_win.c(883) : warning C4715: 'RawValuePointer' : not all control paths return a value
-mathlib.c
-menu.c
-model.c
-net_dgrm.c
-net_loop.c
-net_main.c
-net_vcr.c
-net_win.c
-net_wins.c
-net_wipx.c
-pr_cmds.c
-pr_edict.c
-pr_exec.c
-r_aclip.c
-r_alias.c
-r_bsp.c
-r_draw.c
-r_edge.c
-r_efrag.c
-r_light.c
-r_main.c
-r_misc.c
-r_part.c
-r_sky.c
-r_sprite.c
-r_surf.c
-r_vars.c
-sbar.c
-screen.c
-snd_dma.c
-snd_mem.c
-snd_mix.c
-snd_win.c
-sv_main.c
-sv_move.c
-sv_phys.c
-sv_user.c
-sys_win.c
-vid_win.c
-view.c
-D:\Work\quake source\WinQuake\vid_win.c(348) : warning C4715: 'VID_Suspend' : not all control paths return a value
-wad.c
-world.c
-zone.c
-Linking...
-
-
-
-<h3>Results</h3>
-WinQuake.exe - 0 error(s), 2 warning(s)
-</pre>
-</body>
-</html>
--- a/u/anorm_dots.h
+++ /dev/null
@@ -1,37 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-{
-{1.23,1.30,1.47,1.35,1.56,1.71,1.37,1.38,1.59,1.60,1.79,1.97,1.88,1.92,1.79,1.02,0.93,1.07,0.82,0.87,0.88,0.94,0.96,1.14,1.11,0.82,0.83,0.89,0.89,0.86,0.94,0.91,1.00,1.21,0.98,1.48,1.30,1.57,0.96,1.07,1.14,1.60,1.61,1.40,1.37,1.72,1.78,1.79,1.93,1.99,1.90,1.68,1.71,1.86,1.60,1.68,1.78,1.86,1.93,1.99,1.97,1.44,1.22,1.49,0.93,0.99,0.99,1.23,1.22,1.44,1.49,0.89,0.89,0.97,0.91,0.98,1.19,0.82,0.76,0.82,0.71,0.72,0.73,0.76,0.79,0.86,0.83,0.72,0.76,0.76,0.89,0.82,0.89,0.82,0.89,0.91,0.83,0.96,1.14,0.97,1.40,1.19,0.98,0.94,1.00,1.07,1.37,1.21,1.48,1.30,1.57,1.61,1.37,0.86,0.83,0.91,0.82,0.82,0.88,0.89,0.96,1.14,0.98,0.87,0.93,0.94,1.02,1.30,1.07,1.35,1.38,1.11,1.56,1.92,1.79,1.79,1.59,1.60,1.72,1.90,1.79,0.80,0.85,0.79,0.93,0.80,0.85,0.77,0.74,0.72,0.77,0.74,0.72,0.70,0.70,0.71,0.76,0.73,0.79,0.79,0.73,0.76,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.26,1.26,1.48,1.23,1.50,1.71,1.14,1.19,1.38,1.46,1.64,1.94,1.87,1.84,1.71,1.02,0.92,1.00,0.79,0.85,0.84,0.91,0.90,0.98,0.99,0.77,0.77,0.83,0.82,0.79,0.86,0.84,0.92,0.99,0.91,1.24,1.03,1.33,0.88,0.94,0.97,1.41,1.39,1.18,1.11,1.51,1.61,1.59,1.80,1.91,1.76,1.54,1.65,1.76,1.70,1.70,1.85,1.85,1.97,1.99,1.93,1.28,1.09,1.39,0.92,0.97,0.99,1.18,1.26,1.52,1.48,0.83,0.85,0.90,0.88,0.93,1.00,0.77,0.73,0.78,0.72,0.71,0.74,0.75,0.79,0.86,0.81,0.75,0.81,0.79,0.96,0.88,0.94,0.86,0.93,0.92,0.85,1.08,1.33,1.05,1.55,1.31,1.01,1.05,1.27,1.31,1.60,1.47,1.70,1.54,1.76,1.76,1.57,0.93,0.90,0.99,0.88,0.88,0.95,0.97,1.11,1.39,1.20,0.92,0.97,1.01,1.10,1.39,1.22,1.51,1.58,1.32,1.64,1.97,1.85,1.91,1.77,1.74,1.88,1.99,1.91,0.79,0.86,0.80,0.94,0.84,0.88,0.74,0.74,0.71,0.82,0.77,0.76,0.70,0.73,0.72,0.73,0.70,0.74,0.85,0.77,0.82,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.34,1.27,1.53,1.17,1.46,1.71,0.98,1.05,1.20,1.34,1.48,1.86,1.82,1.71,1.62,1.09,0.94,0.99,0.79,0.85,0.82,0.90,0.87,0.93,0.96,0.76,0.74,0.79,0.76,0.74,0.79,0.78,0.85,0.92,0.85,1.00,0.93,1.06,0.81,0.86,0.89,1.16,1.12,0.97,0.95,1.28,1.38,1.35,1.60,1.77,1.57,1.33,1.50,1.58,1.69,1.63,1.82,1.74,1.91,1.92,1.80,1.04,0.97,1.21,0.90,0.93,0.97,1.05,1.21,1.48,1.37,0.77,0.80,0.84,0.85,0.88,0.92,0.73,0.71,0.74,0.74,0.71,0.75,0.73,0.79,0.84,0.78,0.79,0.86,0.81,1.05,0.94,0.99,0.90,0.95,0.92,0.86,1.24,1.44,1.14,1.59,1.34,1.02,1.27,1.50,1.49,1.80,1.69,1.86,1.72,1.87,1.80,1.69,1.00,0.98,1.23,0.95,0.96,1.09,1.16,1.37,1.63,1.46,0.99,1.10,1.25,1.24,1.51,1.41,1.67,1.77,1.55,1.72,1.95,1.89,1.98,1.91,1.86,1.97,1.99,1.94,0.81,0.89,0.85,0.98,0.90,0.94,0.75,0.78,0.73,0.89,0.83,0.82,0.72,0.77,0.76,0.72,0.70,0.71,0.91,0.83,0.89,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.46,1.34,1.60,1.16,1.46,1.71,0.94,0.99,1.05,1.26,1.33,1.74,1.76,1.57,1.54,1.23,0.98,1.05,0.83,0.89,0.84,0.92,0.87,0.91,0.96,0.78,0.74,0.79,0.72,0.72,0.75,0.76,0.80,0.88,0.83,0.94,0.87,0.95,0.76,0.80,0.82,0.97,0.96,0.89,0.88,1.08,1.11,1.10,1.37,1.59,1.37,1.07,1.27,1.34,1.57,1.45,1.69,1.55,1.77,1.79,1.60,0.93,0.90,0.99,0.86,0.87,0.93,0.96,1.07,1.35,1.18,0.73,0.76,0.77,0.81,0.82,0.85,0.70,0.71,0.72,0.78,0.73,0.77,0.73,0.79,0.82,0.76,0.83,0.90,0.84,1.18,0.98,1.03,0.92,0.95,0.90,0.86,1.32,1.45,1.15,1.53,1.27,0.99,1.42,1.65,1.58,1.93,1.83,1.94,1.81,1.88,1.74,1.70,1.19,1.17,1.44,1.11,1.15,1.36,1.41,1.61,1.81,1.67,1.22,1.34,1.50,1.42,1.65,1.61,1.82,1.91,1.75,1.80,1.89,1.89,1.98,1.99,1.94,1.98,1.92,1.87,0.86,0.95,0.92,1.14,0.98,1.03,0.79,0.84,0.77,0.97,0.90,0.89,0.76,0.82,0.82,0.74,0.72,0.71,0.98,0.89,0.97,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.60,1.44,1.68,1.22,1.49,1.71,0.93,0.99,0.99,1.23,1.22,1.60,1.68,1.44,1.49,1.40,1.14,1.19,0.89,0.96,0.89,0.97,0.89,0.91,0.98,0.82,0.76,0.82,0.71,0.72,0.73,0.76,0.79,0.86,0.83,0.91,0.83,0.89,0.72,0.76,0.76,0.89,0.89,0.82,0.82,0.98,0.96,0.97,1.14,1.40,1.19,0.94,1.00,1.07,1.37,1.21,1.48,1.30,1.57,1.61,1.37,0.86,0.83,0.91,0.82,0.82,0.88,0.89,0.96,1.14,0.98,0.70,0.72,0.73,0.77,0.76,0.79,0.70,0.72,0.71,0.82,0.77,0.80,0.74,0.79,0.80,0.74,0.87,0.93,0.85,1.23,1.02,1.02,0.93,0.93,0.87,0.85,1.30,1.35,1.07,1.38,1.11,0.94,1.47,1.71,1.56,1.97,1.88,1.92,1.79,1.79,1.59,1.60,1.30,1.35,1.56,1.37,1.38,1.59,1.60,1.79,1.92,1.79,1.48,1.57,1.72,1.61,1.78,1.79,1.93,1.99,1.90,1.86,1.78,1.86,1.93,1.99,1.97,1.90,1.79,1.72,0.94,1.07,1.00,1.37,1.21,1.30,0.86,0.91,0.83,1.14,0.98,0.96,0.82,0.88,0.89,0.79,0.76,0.73,1.07,0.94,1.11,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.74,1.57,1.76,1.33,1.54,1.71,0.94,1.05,0.99,1.26,1.16,1.46,1.60,1.34,1.46,1.59,1.37,1.37,0.97,1.11,0.96,1.10,0.95,0.94,1.08,0.89,0.82,0.88,0.72,0.76,0.75,0.80,0.80,0.88,0.87,0.91,0.83,0.87,0.72,0.76,0.74,0.83,0.84,0.78,0.79,0.96,0.89,0.92,0.98,1.23,1.05,0.86,0.92,0.95,1.11,0.98,1.22,1.03,1.34,1.42,1.14,0.79,0.77,0.84,0.78,0.76,0.82,0.82,0.89,0.97,0.90,0.70,0.71,0.71,0.73,0.72,0.74,0.73,0.76,0.72,0.86,0.81,0.82,0.76,0.79,0.77,0.73,0.90,0.95,0.86,1.18,1.03,0.98,0.92,0.90,0.83,0.84,1.19,1.17,0.98,1.15,0.97,0.89,1.42,1.65,1.44,1.93,1.83,1.81,1.67,1.61,1.36,1.41,1.32,1.45,1.58,1.57,1.53,1.74,1.70,1.88,1.94,1.81,1.69,1.77,1.87,1.79,1.89,1.92,1.98,1.99,1.98,1.89,1.65,1.80,1.82,1.91,1.94,1.75,1.61,1.50,1.07,1.34,1.27,1.60,1.45,1.55,0.93,0.99,0.90,1.35,1.18,1.07,0.87,0.93,0.96,0.85,0.82,0.77,1.15,0.99,1.27,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.86,1.71,1.82,1.48,1.62,1.71,0.98,1.20,1.05,1.34,1.17,1.34,1.53,1.27,1.46,1.77,1.60,1.57,1.16,1.38,1.12,1.35,1.06,1.00,1.28,0.97,0.89,0.95,0.76,0.81,0.79,0.86,0.85,0.92,0.93,0.93,0.85,0.87,0.74,0.78,0.74,0.79,0.82,0.76,0.79,0.96,0.85,0.90,0.94,1.09,0.99,0.81,0.85,0.89,0.95,0.90,0.99,0.94,1.10,1.24,0.98,0.75,0.73,0.78,0.74,0.72,0.77,0.76,0.82,0.89,0.83,0.73,0.71,0.71,0.71,0.70,0.72,0.77,0.80,0.74,0.90,0.85,0.84,0.78,0.79,0.75,0.73,0.92,0.95,0.86,1.05,0.99,0.94,0.90,0.86,0.79,0.81,1.00,0.98,0.91,0.96,0.89,0.83,1.27,1.50,1.23,1.80,1.69,1.63,1.46,1.37,1.09,1.16,1.24,1.44,1.49,1.69,1.59,1.80,1.69,1.87,1.86,1.72,1.82,1.91,1.94,1.92,1.95,1.99,1.98,1.91,1.97,1.89,1.51,1.72,1.67,1.77,1.86,1.55,1.41,1.25,1.33,1.58,1.50,1.80,1.63,1.74,1.04,1.21,0.97,1.48,1.37,1.21,0.93,0.97,1.05,0.92,0.88,0.84,1.14,1.02,1.34,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.94,1.84,1.87,1.64,1.71,1.71,1.14,1.38,1.19,1.46,1.23,1.26,1.48,1.26,1.50,1.91,1.80,1.76,1.41,1.61,1.39,1.59,1.33,1.24,1.51,1.18,0.97,1.11,0.82,0.88,0.86,0.94,0.92,0.99,1.03,0.98,0.91,0.90,0.79,0.84,0.77,0.79,0.84,0.77,0.83,0.99,0.85,0.91,0.92,1.02,1.00,0.79,0.80,0.86,0.88,0.84,0.92,0.88,0.97,1.10,0.94,0.74,0.71,0.74,0.72,0.70,0.73,0.72,0.76,0.82,0.77,0.77,0.73,0.74,0.71,0.70,0.73,0.83,0.85,0.78,0.92,0.88,0.86,0.81,0.79,0.74,0.75,0.92,0.93,0.85,0.96,0.94,0.88,0.86,0.81,0.75,0.79,0.93,0.90,0.85,0.88,0.82,0.77,1.05,1.27,0.99,1.60,1.47,1.39,1.20,1.11,0.95,0.97,1.08,1.33,1.31,1.70,1.55,1.76,1.57,1.76,1.70,1.54,1.85,1.97,1.91,1.99,1.97,1.99,1.91,1.77,1.88,1.85,1.39,1.64,1.51,1.58,1.74,1.32,1.22,1.01,1.54,1.76,1.65,1.93,1.70,1.85,1.28,1.39,1.09,1.52,1.48,1.26,0.97,0.99,1.18,1.00,0.93,0.90,1.05,1.01,1.31,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.97,1.92,1.88,1.79,1.79,1.71,1.37,1.59,1.38,1.60,1.35,1.23,1.47,1.30,1.56,1.99,1.93,1.90,1.60,1.78,1.61,1.79,1.57,1.48,1.72,1.40,1.14,1.37,0.89,0.96,0.94,1.07,1.00,1.21,1.30,1.14,0.98,0.96,0.86,0.91,0.83,0.82,0.88,0.82,0.89,1.11,0.87,0.94,0.93,1.02,1.07,0.80,0.79,0.85,0.82,0.80,0.87,0.85,0.93,1.02,0.93,0.77,0.72,0.74,0.71,0.70,0.70,0.71,0.72,0.77,0.74,0.82,0.76,0.79,0.72,0.73,0.76,0.89,0.89,0.82,0.93,0.91,0.86,0.83,0.79,0.73,0.76,0.91,0.89,0.83,0.89,0.89,0.82,0.82,0.76,0.72,0.76,0.86,0.83,0.79,0.82,0.76,0.73,0.94,1.00,0.91,1.37,1.21,1.14,0.98,0.96,0.88,0.89,0.96,1.14,1.07,1.60,1.40,1.61,1.37,1.57,1.48,1.30,1.78,1.93,1.79,1.99,1.92,1.90,1.79,1.59,1.72,1.79,1.30,1.56,1.35,1.38,1.60,1.11,1.07,0.94,1.68,1.86,1.71,1.97,1.68,1.86,1.44,1.49,1.22,1.44,1.49,1.22,0.99,0.99,1.23,1.19,0.98,0.97,0.97,0.98,1.19,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.94,1.97,1.87,1.91,1.85,1.71,1.60,1.77,1.58,1.74,1.51,1.26,1.48,1.39,1.64,1.99,1.97,1.99,1.70,1.85,1.76,1.91,1.76,1.70,1.88,1.55,1.33,1.57,0.96,1.08,1.05,1.31,1.27,1.47,1.54,1.39,1.20,1.11,0.93,0.99,0.90,0.88,0.95,0.88,0.97,1.32,0.92,1.01,0.97,1.10,1.22,0.84,0.80,0.88,0.79,0.79,0.85,0.86,0.92,1.02,0.94,0.82,0.76,0.77,0.72,0.73,0.70,0.72,0.71,0.74,0.74,0.88,0.81,0.85,0.75,0.77,0.82,0.94,0.93,0.86,0.92,0.92,0.86,0.85,0.79,0.74,0.79,0.88,0.85,0.81,0.82,0.83,0.77,0.78,0.73,0.71,0.75,0.79,0.77,0.74,0.77,0.73,0.70,0.86,0.92,0.84,1.14,0.99,0.98,0.91,0.90,0.84,0.83,0.88,0.97,0.94,1.41,1.18,1.39,1.11,1.33,1.24,1.03,1.61,1.80,1.59,1.91,1.84,1.76,1.64,1.38,1.51,1.71,1.26,1.50,1.23,1.19,1.46,0.99,1.00,0.91,1.70,1.85,1.65,1.93,1.54,1.76,1.52,1.48,1.26,1.28,1.39,1.09,0.99,0.97,1.18,1.31,1.01,1.05,0.90,0.93,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.86,1.95,1.82,1.98,1.89,1.71,1.80,1.91,1.77,1.86,1.67,1.34,1.53,1.51,1.72,1.92,1.91,1.99,1.69,1.82,1.80,1.94,1.87,1.86,1.97,1.59,1.44,1.69,1.05,1.24,1.27,1.49,1.50,1.69,1.72,1.63,1.46,1.37,1.00,1.23,0.98,0.95,1.09,0.96,1.16,1.55,0.99,1.25,1.10,1.24,1.41,0.90,0.85,0.94,0.79,0.81,0.85,0.89,0.94,1.09,0.98,0.89,0.82,0.83,0.74,0.77,0.72,0.76,0.73,0.75,0.78,0.94,0.86,0.91,0.79,0.83,0.89,0.99,0.95,0.90,0.90,0.92,0.84,0.86,0.79,0.75,0.81,0.85,0.80,0.78,0.76,0.77,0.73,0.74,0.71,0.71,0.73,0.74,0.74,0.71,0.76,0.72,0.70,0.79,0.85,0.78,0.98,0.92,0.93,0.85,0.87,0.82,0.79,0.81,0.89,0.86,1.16,0.97,1.12,0.95,1.06,1.00,0.93,1.38,1.60,1.35,1.77,1.71,1.57,1.48,1.20,1.28,1.62,1.27,1.46,1.17,1.05,1.34,0.96,0.99,0.90,1.63,1.74,1.50,1.80,1.33,1.58,1.48,1.37,1.21,1.04,1.21,0.97,0.97,0.93,1.05,1.34,1.02,1.14,0.84,0.88,0.92,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.74,1.89,1.76,1.98,1.89,1.71,1.93,1.99,1.91,1.94,1.82,1.46,1.60,1.65,1.80,1.79,1.77,1.92,1.57,1.69,1.74,1.87,1.88,1.94,1.98,1.53,1.45,1.70,1.18,1.32,1.42,1.58,1.65,1.83,1.81,1.81,1.67,1.61,1.19,1.44,1.17,1.11,1.36,1.15,1.41,1.75,1.22,1.50,1.34,1.42,1.61,0.98,0.92,1.03,0.83,0.86,0.89,0.95,0.98,1.23,1.14,0.97,0.89,0.90,0.78,0.82,0.76,0.82,0.77,0.79,0.84,0.98,0.90,0.98,0.83,0.89,0.97,1.03,0.95,0.92,0.86,0.90,0.82,0.86,0.79,0.77,0.84,0.81,0.76,0.76,0.72,0.73,0.70,0.72,0.71,0.73,0.73,0.72,0.74,0.71,0.78,0.74,0.72,0.75,0.80,0.76,0.94,0.88,0.91,0.83,0.87,0.84,0.79,0.76,0.82,0.80,0.97,0.89,0.96,0.88,0.95,0.94,0.87,1.11,1.37,1.10,1.59,1.57,1.37,1.33,1.05,1.08,1.54,1.34,1.46,1.16,0.99,1.26,0.96,1.05,0.92,1.45,1.55,1.27,1.60,1.07,1.34,1.35,1.18,1.07,0.93,0.99,0.90,0.93,0.87,0.96,1.27,0.99,1.15,0.77,0.82,0.85,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.60,1.78,1.68,1.93,1.86,1.71,1.97,1.99,1.99,1.97,1.93,1.60,1.68,1.78,1.86,1.61,1.57,1.79,1.37,1.48,1.59,1.72,1.79,1.92,1.90,1.38,1.35,1.60,1.23,1.30,1.47,1.56,1.71,1.88,1.79,1.92,1.79,1.79,1.30,1.56,1.35,1.37,1.59,1.38,1.60,1.90,1.48,1.72,1.57,1.61,1.79,1.21,1.00,1.30,0.89,0.94,0.96,1.07,1.14,1.40,1.37,1.14,0.96,0.98,0.82,0.88,0.82,0.89,0.83,0.86,0.91,1.02,0.93,1.07,0.87,0.94,1.11,1.02,0.93,0.93,0.82,0.87,0.80,0.85,0.79,0.80,0.85,0.77,0.72,0.74,0.71,0.70,0.70,0.71,0.72,0.77,0.74,0.72,0.76,0.73,0.82,0.79,0.76,0.73,0.79,0.76,0.93,0.86,0.91,0.83,0.89,0.89,0.82,0.72,0.76,0.76,0.89,0.82,0.89,0.82,0.89,0.91,0.83,0.96,1.14,0.97,1.40,1.44,1.19,1.22,0.99,0.98,1.49,1.44,1.49,1.22,0.99,1.23,0.98,1.19,0.97,1.21,1.30,1.00,1.37,0.94,1.07,1.14,0.98,0.96,0.86,0.91,0.83,0.88,0.82,0.89,1.11,0.94,1.07,0.73,0.76,0.79,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.46,1.65,1.60,1.82,1.80,1.71,1.93,1.91,1.99,1.94,1.98,1.74,1.76,1.89,1.89,1.42,1.34,1.61,1.11,1.22,1.36,1.50,1.61,1.81,1.75,1.15,1.17,1.41,1.18,1.19,1.42,1.44,1.65,1.83,1.67,1.94,1.81,1.88,1.32,1.58,1.45,1.57,1.74,1.53,1.70,1.98,1.69,1.87,1.77,1.79,1.92,1.45,1.27,1.55,0.97,1.07,1.11,1.34,1.37,1.59,1.60,1.35,1.07,1.18,0.86,0.93,0.87,0.96,0.90,0.93,0.99,1.03,0.95,1.15,0.90,0.99,1.27,0.98,0.90,0.92,0.78,0.83,0.77,0.84,0.79,0.82,0.86,0.73,0.71,0.73,0.72,0.70,0.73,0.72,0.76,0.81,0.76,0.76,0.82,0.77,0.89,0.85,0.82,0.75,0.80,0.80,0.94,0.88,0.94,0.87,0.95,0.96,0.88,0.72,0.74,0.76,0.83,0.78,0.84,0.79,0.87,0.91,0.83,0.89,0.98,0.92,1.23,1.34,1.05,1.16,0.99,0.96,1.46,1.57,1.54,1.33,1.05,1.26,1.08,1.37,1.10,0.98,1.03,0.92,1.14,0.86,0.95,0.97,0.90,0.89,0.79,0.84,0.77,0.82,0.76,0.82,0.97,0.89,0.98,0.71,0.72,0.74,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.34,1.51,1.53,1.67,1.72,1.71,1.80,1.77,1.91,1.86,1.98,1.86,1.82,1.95,1.89,1.24,1.10,1.41,0.95,0.99,1.09,1.25,1.37,1.63,1.55,0.96,0.98,1.16,1.05,1.00,1.27,1.23,1.50,1.69,1.46,1.86,1.72,1.87,1.24,1.49,1.44,1.69,1.80,1.59,1.69,1.97,1.82,1.94,1.91,1.92,1.99,1.63,1.50,1.74,1.16,1.33,1.38,1.58,1.60,1.77,1.80,1.48,1.21,1.37,0.90,0.97,0.93,1.05,0.97,1.04,1.21,0.99,0.95,1.14,0.92,1.02,1.34,0.94,0.86,0.90,0.74,0.79,0.75,0.81,0.79,0.84,0.86,0.71,0.71,0.73,0.76,0.73,0.77,0.74,0.80,0.85,0.78,0.81,0.89,0.84,0.97,0.92,0.88,0.79,0.85,0.86,0.98,0.92,1.00,0.93,1.06,1.12,0.95,0.74,0.74,0.78,0.79,0.76,0.82,0.79,0.87,0.93,0.85,0.85,0.94,0.90,1.09,1.27,0.99,1.17,1.05,0.96,1.46,1.71,1.62,1.48,1.20,1.34,1.28,1.57,1.35,0.90,0.94,0.85,0.98,0.81,0.89,0.89,0.83,0.82,0.75,0.78,0.73,0.77,0.72,0.76,0.89,0.83,0.91,0.71,0.70,0.72,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00},
-{1.26,1.39,1.48,1.51,1.64,1.71,1.60,1.58,1.77,1.74,1.91,1.94,1.87,1.97,1.85,1.10,0.97,1.22,0.88,0.92,0.95,1.01,1.11,1.39,1.32,0.88,0.90,0.97,0.96,0.93,1.05,0.99,1.27,1.47,1.20,1.70,1.54,1.76,1.08,1.31,1.33,1.70,1.76,1.55,1.57,1.88,1.85,1.91,1.97,1.99,1.99,1.70,1.65,1.85,1.41,1.54,1.61,1.76,1.80,1.91,1.93,1.52,1.26,1.48,0.92,0.99,0.97,1.18,1.09,1.28,1.39,0.94,0.93,1.05,0.92,1.01,1.31,0.88,0.81,0.86,0.72,0.75,0.74,0.79,0.79,0.86,0.85,0.71,0.73,0.75,0.82,0.77,0.83,0.78,0.85,0.88,0.81,0.88,0.97,0.90,1.18,1.00,0.93,0.86,0.92,0.94,1.14,0.99,1.24,1.03,1.33,1.39,1.11,0.79,0.77,0.84,0.79,0.77,0.84,0.83,0.90,0.98,0.91,0.85,0.92,0.91,1.02,1.26,1.00,1.23,1.19,0.99,1.50,1.84,1.71,1.64,1.38,1.46,1.51,1.76,1.59,0.84,0.88,0.80,0.94,0.79,0.86,0.82,0.77,0.76,0.74,0.74,0.71,0.73,0.70,0.72,0.82,0.77,0.85,0.74,0.70,0.73,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00}
-}
--- a/u/asm_draw.h
+++ /dev/null
@@ -1,132 +1,0 @@
-//
-// asm_draw.h
-//
-// Include file for asm drawing routines.
-//
-
-//
-// !!! note that this file must match the corresponding C structures at all
-// times !!!
-//
-
-// !!! if this is changed, it must be changed in r_local.h too !!!
-#define	NEAR_CLIP	0.01
-
-// !!! if this is changed, it must be changed in r_local.h too !!!
-#define	CYCLE	128
-
-// espan_t structure
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define espan_t_u    	0
-#define espan_t_v	    4
-#define espan_t_count   8
-#define espan_t_pnext	12
-#define espan_t_size    16
-
-// sspan_t structure
-// !!! if this is changed, it must be changed in d_local.h too !!!
-#define sspan_t_u    	0
-#define sspan_t_v	    4
-#define sspan_t_count   8
-#define sspan_t_size    12
-
-// spanpackage_t structure
-// !!! if this is changed, it must be changed in d_polyset.c too !!!
-#define spanpackage_t_pdest				0
-#define spanpackage_t_pz				4
-#define spanpackage_t_count				8
-#define spanpackage_t_ptex				12
-#define spanpackage_t_sfrac				16
-#define spanpackage_t_tfrac				20
-#define spanpackage_t_light				24
-#define spanpackage_t_zi				28
-#define spanpackage_t_size				32 
-
-// edge_t structure
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define et_u			0
-#define et_u_step		4
-#define et_prev			8
-#define et_next			12
-#define et_surfs		16
-#define et_nextremove	20
-#define et_nearzi		24
-#define et_owner		28
-#define et_size			32
-
-// surf_t structure
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define SURF_T_SHIFT	6
-#define st_next			0
-#define st_prev			4
-#define st_spans		8
-#define st_key			12
-#define st_last_u		16
-#define st_spanstate	20
-#define st_flags		24
-#define st_data			28
-#define st_entity		32
-#define st_nearzi		36
-#define st_insubmodel	40
-#define st_d_ziorigin	44
-#define st_d_zistepu	48
-#define st_d_zistepv	52
-#define st_pad			56
-#define st_size			64
-
-// clipplane_t structure
-// !!! if this is changed, it must be changed in r_local.h too !!!
-#define cp_normal		0
-#define cp_dist			12
-#define cp_next			16
-#define cp_leftedge		20
-#define cp_rightedge	21
-#define cp_reserved		22
-#define cp_size			24
-
-// medge_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define me_v				0
-#define me_cachededgeoffset	4
-#define me_size				8
-
-// mvertex_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define mv_position		0
-#define mv_size			12
-
-// refdef_t structure
-// !!! if this is changed, it must be changed in render.h too !!!
-#define rd_vrect					0
-#define rd_aliasvrect				20
-#define rd_vrectright				40
-#define rd_vrectbottom				44
-#define rd_aliasvrectright			48
-#define rd_aliasvrectbottom			52
-#define rd_vrectrightedge			56
-#define rd_fvrectx					60
-#define rd_fvrecty					64
-#define rd_fvrectx_adj				68
-#define rd_fvrecty_adj				72
-#define rd_vrect_x_adj_shift20		76
-#define rd_vrectright_adj_shift20	80
-#define rd_fvrectright_adj			84
-#define rd_fvrectbottom_adj			88
-#define rd_fvrectright				92
-#define rd_fvrectbottom				96
-#define rd_horizontalFieldOfView	100
-#define rd_xOrigin					104
-#define rd_yOrigin					108
-#define rd_vieworg					112
-#define rd_viewangles				124
-#define rd_ambientlight				136
-#define rd_size						140
-
-// mtriangle_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define mtri_facesfront		0
-#define mtri_vertindex		4
-#define mtri_size			16	// !!! if this changes, array indexing in !!!
-								// !!! d_polysa.s must be changed to match !!!
-#define mtri_shift			4
-
--- a/u/asm_i386.h
+++ /dev/null
@@ -1,78 +1,0 @@
-#ifndef __ASM_I386__
-#define __ASM_I386__
-
-#ifdef ELF
-#define C(label) label
-#endif
-#ifndef ELF
-#define C(label) _##label
-#endif
-
-//
-// !!! note that this file must match the corresponding C structures at all
-// times !!!
-//
-
-// plane_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-// !!! if the size of this is changed, the array lookup in SV_HullPointContents
-//     must be changed too !!!
-#define pl_normal	0
-#define pl_dist		12
-#define pl_type		16
-#define pl_signbits	17
-#define pl_pad		18
-#define pl_size		20
-
-// hull_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define	hu_clipnodes		0
-#define	hu_planes			4
-#define	hu_firstclipnode	8
-#define	hu_lastclipnode		12
-#define	hu_clip_mins		16
-#define	hu_clip_maxs		28
-#define hu_size  			40
-
-// dnode_t structure
-// !!! if this is changed, it must be changed in bspfile.h too !!!
-#define	nd_planenum		0
-#define	nd_children		4
-#define	nd_mins			8
-#define	nd_maxs			20
-#define	nd_firstface	32
-#define	nd_numfaces		36
-#define nd_size			40
-
-// sfxcache_t structure
-// !!! if this is changed, it much be changed in sound.h too !!!
-#define sfxc_length		0
-#define sfxc_loopstart	4
-#define sfxc_speed		8
-#define sfxc_width		12
-#define sfxc_stereo		16
-#define sfxc_data		20
-
-// channel_t structure
-// !!! if this is changed, it much be changed in sound.h too !!!
-#define ch_sfx			0
-#define ch_leftvol		4
-#define ch_rightvol		8
-#define ch_end			12
-#define ch_pos			16
-#define ch_looping		20
-#define ch_entnum		24
-#define ch_entchannel	28
-#define ch_origin		32
-#define ch_dist_mult	44
-#define ch_master_vol	48
-#define ch_size			52
-
-// portable_samplepair_t structure
-// !!! if this is changed, it much be changed in sound.h too !!!
-#define psp_left		0
-#define psp_right		4
-#define psp_size		8
-
-#endif
-
--- a/u/block16.h
+++ /dev/null
@@ -1,123 +1,0 @@
-LEnter16_16:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch0:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch1:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch2:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch3:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch4:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch5:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch6:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch7:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
-
-LEnter8_16:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch8:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch9:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch10:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch11:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
-
-LEnter4_16:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch12:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch13:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
-
-LEnter2_16:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movw	0x12345678(,%eax,2),%ax
-LBPatch14:
-	addl	%ebp,%edx
-	movw	%ax,(%edi)
-	movw	0x12345678(,%ecx,2),%cx
-LBPatch15:
-	movw	%cx,2(%edi)
-	addl	$0x4,%edi
--- a/u/block8.h
+++ /dev/null
@@ -1,143 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-LEnter16_8:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch0:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch1:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch2:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch3:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch4:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch5:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch6:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch7:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
-LEnter8_8:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch8:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch9:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch10:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch11:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
-LEnter4_8:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch12:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch13:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
-LEnter2_8:
-	movb	(%esi),%al
-	movb	(%esi,%ebx,),%cl
-	movb	%dh,%ah
-	addl	%ebp,%edx
-	movb	%dh,%ch
-	leal	(%esi,%ebx,2),%esi
-	movb	0x12345678(%eax),%al
-LBPatch14:
-	addl	%ebp,%edx
-	movb	%al,(%edi)
-	movb	0x12345678(%ecx),%cl
-LBPatch15:
-	movb	%cl,1(%edi)
-	addl	$0x2,%edi
-
--- a/u/cd_audio.c
+++ /dev/null
@@ -1,886 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
-// rights reserved.
-
-#include <dpmi.h>
-#include "quakedef.h"
-#include "dosisms.h"
-
-extern	cvar_t	bgmvolume;
-
-#define ADDRESS_MODE_HSG		0
-#define ADDRESS_MODE_RED_BOOK	1
-
-#define STATUS_ERROR_BIT	0x8000
-#define STATUS_BUSY_BIT		0x0200
-#define STATUS_DONE_BIT		0x0100
-#define STATUS_ERROR_MASK	0x00ff
-
-#define ERROR_WRITE_PROTECT		0
-#define ERROR_UNKNOWN_UNIT		1
-#define ERROR_DRIVE_NOT_READY	2
-#define ERROR_UNKNOWN_COMMAND	3
-#define ERROR_CRC_ERROR			4
-#define ERROR_BAD_REQUEST_LEN	5
-#define ERROR_SEEK_ERROR		6
-#define ERROR_UNKNOWN_MEDIA		7
-#define ERROR_SECTOR_NOT_FOUND	8
-#define ERROR_OUT_OF_PAPER		9
-#define ERROR_WRITE_FAULT		10
-#define ERROR_READ_FAULT		11
-#define ERROR_GENERAL_FAILURE	12
-#define ERROR_RESERVED_13		13
-#define ERROR_RESERVED_14		14
-#define ERROR_BAD_DISK_CHANGE	15
-
-#define COMMAND_READ			3
-#define COMMAND_WRITE			12
-#define COMMAND_PLAY_AUDIO		132
-#define COMMAND_STOP_AUDIO		133
-#define COMMAND_RESUME_AUDIO	136
-
-#define READ_REQUEST_AUDIO_CHANNEL_INFO		4
-#define READ_REQUEST_DEVICE_STATUS			6
-#define READ_REQUEST_MEDIA_CHANGE			9
-#define READ_REQUEST_AUDIO_DISK_INFO		10
-#define READ_REQUEST_AUDIO_TRACK_INFO		11
-#define READ_REQUEST_AUDIO_STATUS			15
-
-#define WRITE_REQUEST_EJECT					0
-#define WRITE_REQUEST_RESET					2
-#define WRITE_REQUEST_AUDIO_CHANNEL_INFO	3
-
-#define STATUS_DOOR_OPEN					0x00000001
-#define STATUS_DOOR_UNLOCKED				0x00000002
-#define STATUS_RAW_SUPPORT					0x00000004
-#define STATUS_READ_WRITE					0x00000008
-#define STATUS_AUDIO_SUPPORT				0x00000010
-#define STATUS_INTERLEAVE_SUPPORT			0x00000020
-#define STATUS_BIT_6_RESERVED				0x00000040
-#define STATUS_PREFETCH_SUPPORT				0x00000080
-#define STATUS_AUDIO_MANIPLUATION_SUPPORT	0x00000100
-#define STATUS_RED_BOOK_ADDRESS_SUPPORT		0x00000200
-
-#define MEDIA_NOT_CHANGED		1
-#define MEDIA_STATUS_UNKNOWN	0
-#define MEDIA_CHANGED			-1
-
-#define AUDIO_CONTROL_MASK				0xd0
-#define AUDIO_CONTROL_DATA_TRACK		0x40
-#define AUDIO_CONTROL_AUDIO_2_TRACK		0x00
-#define AUDIO_CONTROL_AUDIO_2P_TRACK	0x10
-#define AUDIO_CONTROL_AUDIO_4_TRACK		0x80
-#define AUDIO_CONTROL_AUDIO_4P_TRACK	0x90
-
-#define AUDIO_STATUS_PAUSED				0x0001
-
-#pragma pack(1)
-
-struct playAudioRequest
-{
-	char	addressingMode;
-	int		startLocation;
-	int		sectors;
-};
-
-struct readRequest
-{
-	char	mediaDescriptor;
-	short	bufferOffset;
-	short	bufferSegment;
-	short	length;
-	short	startSector;
-	int		volumeID;
-};
-
-struct writeRequest
-{
-	char	mediaDescriptor;
-	short	bufferOffset;
-	short	bufferSegment;
-	short	length;
-	short	startSector;
-	int		volumeID;
-};
-
-struct cd_request
-{
-	char	headerLength;
-	char	unit;
-	char	command;
-	short	status;
-	char	reserved[8];
-	union
-	{
-		struct	playAudioRequest	playAudio;
-		struct	readRequest			read;
-		struct	writeRequest		write;
-	} x;
-};
-
-
-struct audioChannelInfo_s
-{
-	char	code;
-	char	channel0input;
-	char	channel0volume;
-	char	channel1input;
-	char	channel1volume;
-	char	channel2input;
-	char	channel2volume;
-	char	channel3input;
-	char	channel3volume;
-};
-
-struct deviceStatus_s
-{
-	char	code;
-	int		status;
-};
-
-struct mediaChange_s
-{
-	char	code;
-	char	status;
-};
-
-struct audioDiskInfo_s
-{
-	char	code;
-	char	lowTrack;
-	char	highTrack;
-	int		leadOutStart;
-};
-
-struct audioTrackInfo_s
-{
-	char	code;
-	char	track;
-	int		start;
-	char	control;
-};
-
-struct audioStatus_s
-{
-	char	code;
-	short	status;
-	int		PRstartLocation;
-	int		PRendLocation;
-};
-
-struct reset_s
-{
-	char	code;
-};
-
-union readInfo_u
-{
-	struct audioChannelInfo_s	audioChannelInfo;
-	struct deviceStatus_s		deviceStatus;
-	struct mediaChange_s		mediaChange;
-	struct audioDiskInfo_s		audioDiskInfo;
-	struct audioTrackInfo_s		audioTrackInfo;
-	struct audioStatus_s		audioStatus;
-	struct reset_s				reset;
-};
-
-#pragma pack()
-
-#define MAXIMUM_TRACKS			100
-
-typedef struct
-{
-	int			start;
-	int			length;
-	qboolean	isData;
-} track_info;
-
-typedef struct
-{
-	qboolean	valid;
-	int			leadOutAddress;
-	track_info	track[MAXIMUM_TRACKS];
-	byte		lowTrack;
-	byte		highTrack;
-} cd_info;
-
-static struct cd_request	*cdRequest;
-static union readInfo_u		*readInfo;
-static cd_info				cd;
-
-static qboolean	playing = false;
-static qboolean	wasPlaying = false;
-static qboolean	mediaCheck = false;
-static qboolean	initialized = false;
-static qboolean	enabled = true;
-static qboolean playLooping = false;
-static short	cdRequestSegment;
-static short	cdRequestOffset;
-static short	readInfoSegment;
-static short	readInfoOffset;
-static byte 	remap[256];
-static byte		cdrom;
-static byte		playTrack;
-static byte		cdvolume;
-
-
-static int RedBookToSector(int rb)
-{
-	byte	minute;
-	byte	second;
-	byte	frame;
-
-	minute = (rb >> 16) & 0xff;
-	second = (rb >> 8) & 0xff;
-	frame = rb & 0xff;
-	return minute * 60 * 75 + second * 75 + frame;
-}
-
-
-static void CDAudio_Reset(void)
-{
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_WRITE;
-	cdRequest->status = 0;
-
-	cdRequest->x.write.mediaDescriptor = 0;
-	cdRequest->x.write.bufferOffset = readInfoOffset;
-	cdRequest->x.write.bufferSegment = readInfoSegment;
-	cdRequest->x.write.length = sizeof(struct reset_s);
-	cdRequest->x.write.startSector = 0;
-	cdRequest->x.write.volumeID = 0;
-
-	readInfo->reset.code = WRITE_REQUEST_RESET;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-}
-
-
-static void CDAudio_Eject(void)
-{
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_WRITE;
-	cdRequest->status = 0;
-
-	cdRequest->x.write.mediaDescriptor = 0;
-	cdRequest->x.write.bufferOffset = readInfoOffset;
-	cdRequest->x.write.bufferSegment = readInfoSegment;
-	cdRequest->x.write.length = sizeof(struct reset_s);
-	cdRequest->x.write.startSector = 0;
-	cdRequest->x.write.volumeID = 0;
-
-	readInfo->reset.code = WRITE_REQUEST_EJECT;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-}
-
-
-static int CDAudio_GetAudioTrackInfo(byte track, int *start)
-{
-	byte	control;
-
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_READ;
-	cdRequest->status = 0;
-
-	cdRequest->x.read.mediaDescriptor = 0;
-	cdRequest->x.read.bufferOffset = readInfoOffset;
-	cdRequest->x.read.bufferSegment = readInfoSegment;
-	cdRequest->x.read.length = sizeof(struct audioTrackInfo_s);
-	cdRequest->x.read.startSector = 0;
-	cdRequest->x.read.volumeID = 0;
-
-	readInfo->audioTrackInfo.code = READ_REQUEST_AUDIO_TRACK_INFO;
-	readInfo->audioTrackInfo.track = track;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	if (cdRequest->status & STATUS_ERROR_BIT)
-	{
-		Con_DPrintf("CDAudio_GetAudioTrackInfo %04x\n", cdRequest->status & 	0xffff);
-		return -1;
-	}
-
-	*start = readInfo->audioTrackInfo.start;
-	control = readInfo->audioTrackInfo.control & AUDIO_CONTROL_MASK;
-	return (control & AUDIO_CONTROL_DATA_TRACK);
-}
-
-
-static int CDAudio_GetAudioDiskInfo(void)
-{
-	int n;
-
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_READ;
-	cdRequest->status = 0;
-
-	cdRequest->x.read.mediaDescriptor = 0;
-	cdRequest->x.read.bufferOffset = readInfoOffset;
-	cdRequest->x.read.bufferSegment = readInfoSegment;
-	cdRequest->x.read.length = sizeof(struct audioDiskInfo_s);
-	cdRequest->x.read.startSector = 0;
-	cdRequest->x.read.volumeID = 0;
-
-	readInfo->audioDiskInfo.code = READ_REQUEST_AUDIO_DISK_INFO;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	if (cdRequest->status & STATUS_ERROR_BIT)
-	{
-		Con_DPrintf("CDAudio_GetAudioDiskInfo %04x\n", cdRequest->status & 	0xffff);
-		return -1;
-	}
-
-	cd.valid = true;
-	cd.lowTrack = readInfo->audioDiskInfo.lowTrack;
-	cd.highTrack = readInfo->audioDiskInfo.highTrack;
-	cd.leadOutAddress = readInfo->audioDiskInfo.leadOutStart;
-
-	for (n = cd.lowTrack; n <= cd.highTrack; n++)
-	{
-		cd.track[n].isData = CDAudio_GetAudioTrackInfo (n, &cd.track[n].start);
-		if (n > cd.lowTrack)
-		{
-			cd.track[n-1].length = RedBookToSector(cd.track[n].start) - RedBookToSector(cd.track[n-1].start);
-			if (n == cd.highTrack)
-				cd.track[n].length = RedBookToSector(cd.leadOutAddress) - RedBookToSector(cd.track[n].start);
-		}
-	}
-
-	return 0;
-}
-
-
-static int CDAudio_GetAudioStatus(void)
-{
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_READ;
-	cdRequest->status = 0;
-
-	cdRequest->x.read.mediaDescriptor = 0;
-	cdRequest->x.read.bufferOffset = readInfoOffset;
-	cdRequest->x.read.bufferSegment = readInfoSegment;
-	cdRequest->x.read.length = sizeof(struct audioStatus_s);
-	cdRequest->x.read.startSector = 0;
-	cdRequest->x.read.volumeID = 0;
-
-	readInfo->audioDiskInfo.code = READ_REQUEST_AUDIO_STATUS;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	if (cdRequest->status & STATUS_ERROR_BIT)
-		return -1;
-	return 0;
-}
-
-
-static int CDAudio_MediaChange(void)
-{
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_READ;
-	cdRequest->status = 0;
-
-	cdRequest->x.read.mediaDescriptor = 0;
-	cdRequest->x.read.bufferOffset = readInfoOffset;
-	cdRequest->x.read.bufferSegment = readInfoSegment;
-	cdRequest->x.read.length = sizeof(struct mediaChange_s);
-	cdRequest->x.read.startSector = 0;
-	cdRequest->x.read.volumeID = 0;
-
-	readInfo->mediaChange.code = READ_REQUEST_MEDIA_CHANGE;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	return readInfo->mediaChange.status;
-}
-
-
-// we set the volume to 0 first and then to the desired volume
-// some cd-rom drivers seem to need it done this way
-void CDAudio_SetVolume (byte volume)
-{
-	if (!initialized || !enabled)
-		return;
-
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_WRITE;
-	cdRequest->status = 0;
-
-	cdRequest->x.read.mediaDescriptor = 0;
-	cdRequest->x.read.bufferOffset = readInfoOffset;
-	cdRequest->x.read.bufferSegment = readInfoSegment;
-	cdRequest->x.read.length = sizeof(struct audioChannelInfo_s);
-	cdRequest->x.read.startSector = 0;
-	cdRequest->x.read.volumeID = 0;
-
-	readInfo->audioChannelInfo.code = WRITE_REQUEST_AUDIO_CHANNEL_INFO;
-	readInfo->audioChannelInfo.channel0input = 0;
-	readInfo->audioChannelInfo.channel0volume = 0;
-	readInfo->audioChannelInfo.channel1input = 1;
-	readInfo->audioChannelInfo.channel1volume = 0;
-	readInfo->audioChannelInfo.channel2input = 2;
-	readInfo->audioChannelInfo.channel2volume = 0;
-	readInfo->audioChannelInfo.channel3input = 3;
-	readInfo->audioChannelInfo.channel3volume = 0;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	readInfo->audioChannelInfo.channel0volume = volume;
-	readInfo->audioChannelInfo.channel1volume = volume;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	cdvolume = volume;
-}
-
-
-void CDAudio_Play(byte track, qboolean looping)
-{
-	int		volume;
-
-	if (!initialized || !enabled)
-		return;
-	
-	if (!cd.valid)
-		return;
-
-	track = remap[track];
-
-	if (playing)
-	{
-		if (playTrack == track)
-			return;
-		CDAudio_Stop();
-	}
-
-	playLooping = looping;
-
-	if (track < cd.lowTrack || track > cd.highTrack)
-	{
-		Con_DPrintf("CDAudio_Play: Bad track number %u.\n", track);
-		return;
-	}
-
-	playTrack = track;
-
-	if (cd.track[track].isData)
-	{
-		Con_DPrintf("CDAudio_Play: Can not play data.\n");
-		return;
-	}
-
-	volume = (int)(bgmvolume.value * 255.0);
-	if (volume < 0)
-	{
-		Cvar_SetValue ("bgmvolume", 0.0);
-		volume = 0;
-	}
-	else if (volume > 255)
-	{
-		Cvar_SetValue ("bgmvolume", 1.0);
-		volume = 255;
-	}
-	CDAudio_SetVolume (volume);
-
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_PLAY_AUDIO;
-	cdRequest->status = 0;
-
-	cdRequest->x.playAudio.addressingMode = ADDRESS_MODE_RED_BOOK;
-	cdRequest->x.playAudio.startLocation = cd.track[track].start;
-	cdRequest->x.playAudio.sectors = cd.track[track].length;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	if (cdRequest->status & STATUS_ERROR_BIT)
-	{
-		Con_DPrintf("CDAudio_Play: track %u failed\n", track);
-		cd.valid = false;
-		playing = false;
-		return;
-	}
-
-	playing = true;
-}
-
-
-void CDAudio_Stop(void)
-{
-	if (!initialized || !enabled)
-		return;
-	
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_STOP_AUDIO;
-	cdRequest->status = 0;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	wasPlaying = playing;
-	playing = false;
-}
-
-
-void CDAudio_Pause(void)
-{
-	CDAudio_Stop();
-}
-
-
-void CDAudio_Resume(void)
-{
-	if (!initialized || !enabled)
-		return;
-	
-	if (!cd.valid)
-		return;
-
-	if (!wasPlaying)
-		return;
-	
-	cdRequest->headerLength = 13;
-	cdRequest->unit = 0;
-	cdRequest->command = COMMAND_RESUME_AUDIO;
-	cdRequest->status = 0;
-
-	regs.x.ax = 0x1510;
-	regs.x.cx = cdrom;
-	regs.x.es = cdRequestSegment;
-	regs.x.bx = cdRequestOffset;
-	dos_int86 (0x2f);
-
-	playing = true;
-}
-
-
-static void CD_f (void)
-{
-	char	*command;
-	int		ret;
-	int		n;
-	int		startAddress;
-
-	if (Cmd_Argc() < 2)
-		return;
-
-	command = Cmd_Argv (1);
-
-	if (Q_strcasecmp(command, "on") == 0)
-	{
-		enabled = true;
-		return;
-	}
-
-	if (Q_strcasecmp(command, "off") == 0)
-	{
-		if (playing)
-			CDAudio_Stop();
-		enabled = false;
-		return;
-	}
-
-	if (Q_strcasecmp(command, "reset") == 0)
-	{
-		enabled = true;
-		if (playing)
-			CDAudio_Stop();
-		for (n = 0; n < 256; n++)
-			remap[n] = n;
-		CDAudio_Reset();
-		CDAudio_GetAudioDiskInfo();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "remap") == 0)
-	{
-		ret = Cmd_Argc() - 2;
-		if (ret <= 0)
-		{
-			for (n = 1; n < 256; n++)
-				if (remap[n] != n)
-					Con_Printf("  %u -> %u\n", n, remap[n]);
-			return;
-		}
-		for (n = 1; n <= ret; n++)
-			remap[n] = Q_atoi(Cmd_Argv (n+1));
-		return;
-	}
-
-	if (!cd.valid)
-	{
-		Con_Printf("No CD in player.\n");
-		return;
-	}
-
-	if (Q_strcasecmp(command, "play") == 0)
-	{
-		CDAudio_Play(Q_atoi(Cmd_Argv (2)), false);
-		return;
-	}
-
-	if (Q_strcasecmp(command, "loop") == 0)
-	{
-		CDAudio_Play(Q_atoi(Cmd_Argv (2)), true);
-		return;
-	}
-
-	if (Q_strcasecmp(command, "stop") == 0)
-	{
-		CDAudio_Stop();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "pause") == 0)
-	{
-		CDAudio_Pause();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "resume") == 0)
-	{
-		CDAudio_Resume();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "eject") == 0)
-	{
-		if (playing)
-			CDAudio_Stop();
-		CDAudio_Eject();
-		cd.valid = false;
-		return;
-	}
-
-	if (Q_strcasecmp(command, "info") == 0)
-	{
-		Con_Printf("%u tracks\n", cd.highTrack - cd.lowTrack + 1);
-		for (n = cd.lowTrack; n <= cd.highTrack; n++)
-		{
-			ret = CDAudio_GetAudioTrackInfo (n, &startAddress);
-			Con_Printf("Track %2u: %s at %2u:%02u\n", n, ret ? "data " : "music", (startAddress >> 16) & 0xff, (startAddress >> 8) & 0xff);
-		}
-		if (playing)
-			Con_Printf("Currently %s track %u\n", playLooping ? "looping" : "playing", playTrack);
-		Con_Printf("Volume is %u\n", cdvolume);
-		CDAudio_MediaChange();
-		Con_Printf("Status %04x\n", cdRequest->status & 0xffff);
-		return;
-	}
-}
-
-
-void CDAudio_Update(void)
-{
-	int		ret;
-	int		newVolume;
-	static	double lastUpdate;
-
-	if (!initialized || !enabled)
-		return;
-
-	if ((realtime - lastUpdate) < 0.25)
-		return;
-	lastUpdate = realtime;
-
-	if (mediaCheck)
-	{
-		static	double lastCheck;
-
-		if ((realtime - lastCheck) < 5.0)
-			return;
-		lastCheck = realtime;
-
-		ret = CDAudio_MediaChange();
-		if (ret == MEDIA_CHANGED)
-		{
-			Con_DPrintf("CDAudio: media changed\n");
-			playing = false;
-			wasPlaying = false;
-			cd.valid = false;
-			CDAudio_GetAudioDiskInfo();
-			return;
-		}
-	}
-
-	newVolume = (int)(bgmvolume.value * 255.0);
-	if (newVolume != cdvolume)
-	{
-		if (newVolume < 0)
-		{
-			Cvar_SetValue ("bgmvolume", 0.0);
-			newVolume = 0;
-		}
-		else if (newVolume > 255)
-		{
-			Cvar_SetValue ("bgmvolume", 1.0);
-			newVolume = 255;
-		}
-		CDAudio_SetVolume (newVolume);
-	}
-
-	if (playing)
-	{
-		CDAudio_GetAudioStatus();
-		if ((cdRequest->status & STATUS_BUSY_BIT) == 0)
-		{
-			playing = false;
-			if (playLooping)
-				CDAudio_Play(playTrack, true);
-		}
-	}
-}
-
-
-int CDAudio_Init(void)
-{
-	char	*memory;
-	int		n;
-
-	if (cls.state == ca_dedicated)
-		return -1;
-
-	if (COM_CheckParm("-nocdaudio"))
-		return -1;
-
-	if (COM_CheckParm("-cdmediacheck"))
-		mediaCheck = true;
-
-	regs.x.ax = 0x1500;
-	regs.x.bx = 0;
-	dos_int86 (0x2f);
-	if (regs.x.bx == 0)
-	{
-		Con_NotifyBox (
-			"MSCDEX not loaded, music is\n"
-			"disabled.  Use \"-nocdaudio\" if you\n"
-			"wish to avoid this message in the\n"
-			"future.  See README.TXT for help.\n"
-			);			
-		return -1;
-	}
-	if (regs.x.bx > 1)
-		Con_DPrintf("CDAudio_Init: First CD-ROM drive will be used\n");
-	cdrom = regs.x.cx;
-
-	regs.x.ax = 0x150c;
-	regs.x.bx = 0;
-	dos_int86 (0x2f);
-	if (regs.x.bx == 0)
-	{
-		Con_NotifyBox (
-			"MSCDEX version 2.00 or later\n"
-			"required for music. See README.TXT\n"
-			"for help.\n"
-			);			
-		Con_DPrintf("CDAudio_Init: MSCDEX version 2.00 or later required.\n");
-		return -1;
-	}
-
-	memory = dos_getmemory(sizeof(struct cd_request
-) + sizeof(union readInfo_u));
-	if (memory == NULL)
-	{
-		Con_DPrintf("CDAudio_Init: Unable to allocate low memory.\n");
-		return -1;
-	}
-
-	cdRequest = (struct cd_request *)memory;
-	cdRequestSegment = ptr2real(cdRequest) >> 4;
-	cdRequestOffset = ptr2real(cdRequest) & 0xf;
-
-	readInfo = (union readInfo_u *)(memory + sizeof(struct cd_request));
-	readInfoSegment = ptr2real(readInfo) >> 4;
-	readInfoOffset = ptr2real(readInfo) & 0xf;
-
-	for (n = 0; n < 256; n++)
-		remap[n] = n;
-	initialized = true;
-
-	CDAudio_SetVolume (255);
-	if (CDAudio_GetAudioDiskInfo())
-	{
-		Con_Printf("CDAudio_Init: No CD in player.\n");
-		enabled = false;
-	}
-
-	Cmd_AddCommand ("cd", CD_f);
-
-	Con_Printf("CD Audio Initialized\n");
-
-	return 0;
-}
-
-
-void CDAudio_Shutdown(void)
-{
-	if (!initialized)
-		return;
-	CDAudio_Stop();
-}
--- a/u/cd_null.c
+++ /dev/null
@@ -1,55 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-
-void CDAudio_Play(byte track, qboolean looping)
-{
-}
-
-
-void CDAudio_Stop(void)
-{
-}
-
-
-void CDAudio_Pause(void)
-{
-}
-
-
-void CDAudio_Resume(void)
-{
-}
-
-
-void CDAudio_Update(void)
-{
-}
-
-
-int CDAudio_Init(void)
-{
-	return 0;
-}
-
-
-void CDAudio_Shutdown(void)
-{
-}
\ No newline at end of file
--- a/u/cd_win.c
+++ /dev/null
@@ -1,477 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
-// rights reserved.
-
-#include <windows.h>
-#include "quakedef.h"
-
-extern	HWND	mainwindow;
-extern	cvar_t	bgmvolume;
-
-static qboolean cdValid = false;
-static qboolean	playing = false;
-static qboolean	wasPlaying = false;
-static qboolean	initialized = false;
-static qboolean	enabled = false;
-static qboolean playLooping = false;
-static float	cdvolume;
-static byte 	remap[100];
-static byte		cdrom;
-static byte		playTrack;
-static byte		maxTrack;
-
-UINT	wDeviceID;
-
-
-static void CDAudio_Eject(void)
-{
-	DWORD	dwReturn;
-
-    if (dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, (DWORD)NULL))
-		Con_DPrintf("MCI_SET_DOOR_OPEN failed (%i)\n", dwReturn);
-}
-
-
-static void CDAudio_CloseDoor(void)
-{
-	DWORD	dwReturn;
-
-    if (dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_DOOR_CLOSED, (DWORD)NULL))
-		Con_DPrintf("MCI_SET_DOOR_CLOSED failed (%i)\n", dwReturn);
-}
-
-
-static int CDAudio_GetAudioDiskInfo(void)
-{
-	DWORD				dwReturn;
-	MCI_STATUS_PARMS	mciStatusParms;
-
-
-	cdValid = false;
-
-	mciStatusParms.dwItem = MCI_STATUS_READY;
-    dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
-	if (dwReturn)
-	{
-		Con_DPrintf("CDAudio: drive ready test - get status failed\n");
-		return -1;
-	}
-	if (!mciStatusParms.dwReturn)
-	{
-		Con_DPrintf("CDAudio: drive not ready\n");
-		return -1;
-	}
-
-	mciStatusParms.dwItem = MCI_STATUS_NUMBER_OF_TRACKS;
-    dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
-	if (dwReturn)
-	{
-		Con_DPrintf("CDAudio: get tracks - status failed\n");
-		return -1;
-	}
-	if (mciStatusParms.dwReturn < 1)
-	{
-		Con_DPrintf("CDAudio: no music tracks\n");
-		return -1;
-	}
-
-	cdValid = true;
-	maxTrack = mciStatusParms.dwReturn;
-
-	return 0;
-}
-
-
-void CDAudio_Play(byte track, qboolean looping)
-{
-	DWORD				dwReturn;
-    MCI_PLAY_PARMS		mciPlayParms;
-	MCI_STATUS_PARMS	mciStatusParms;
-
-	if (!enabled)
-		return;
-	
-	if (!cdValid)
-	{
-		CDAudio_GetAudioDiskInfo();
-		if (!cdValid)
-			return;
-	}
-
-	track = remap[track];
-
-	if (track < 1 || track > maxTrack)
-	{
-		Con_DPrintf("CDAudio: Bad track number %u.\n", track);
-		return;
-	}
-
-	// don't try to play a non-audio track
-	mciStatusParms.dwItem = MCI_CDA_STATUS_TYPE_TRACK;
-	mciStatusParms.dwTrack = track;
-    dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
-	if (dwReturn)
-	{
-		Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn);
-		return;
-	}
-	if (mciStatusParms.dwReturn != MCI_CDA_TRACK_AUDIO)
-	{
-		Con_Printf("CDAudio: track %i is not audio\n", track);
-		return;
-	}
-
-	// get the length of the track to be played
-	mciStatusParms.dwItem = MCI_STATUS_LENGTH;
-	mciStatusParms.dwTrack = track;
-    dwReturn = mciSendCommand(wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_TRACK | MCI_WAIT, (DWORD) (LPVOID) &mciStatusParms);
-	if (dwReturn)
-	{
-		Con_DPrintf("MCI_STATUS failed (%i)\n", dwReturn);
-		return;
-	}
-
-	if (playing)
-	{
-		if (playTrack == track)
-			return;
-		CDAudio_Stop();
-	}
-
-    mciPlayParms.dwFrom = MCI_MAKE_TMSF(track, 0, 0, 0);
-	mciPlayParms.dwTo = (mciStatusParms.dwReturn << 8) | track;
-    mciPlayParms.dwCallback = (DWORD)mainwindow;
-    dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD)(LPVOID) &mciPlayParms);
-	if (dwReturn)
-	{
-		Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
-		return;
-	}
-
-	playLooping = looping;
-	playTrack = track;
-	playing = true;
-
-	if (cdvolume == 0.0)
-		CDAudio_Pause ();
-}
-
-
-void CDAudio_Stop(void)
-{
-	DWORD	dwReturn;
-
-	if (!enabled)
-		return;
-	
-	if (!playing)
-		return;
-
-    if (dwReturn = mciSendCommand(wDeviceID, MCI_STOP, 0, (DWORD)NULL))
-		Con_DPrintf("MCI_STOP failed (%i)", dwReturn);
-
-	wasPlaying = false;
-	playing = false;
-}
-
-
-void CDAudio_Pause(void)
-{
-	DWORD				dwReturn;
-	MCI_GENERIC_PARMS	mciGenericParms;
-
-	if (!enabled)
-		return;
-
-	if (!playing)
-		return;
-
-	mciGenericParms.dwCallback = (DWORD)mainwindow;
-    if (dwReturn = mciSendCommand(wDeviceID, MCI_PAUSE, 0, (DWORD)(LPVOID) &mciGenericParms))
-		Con_DPrintf("MCI_PAUSE failed (%i)", dwReturn);
-
-	wasPlaying = playing;
-	playing = false;
-}
-
-
-void CDAudio_Resume(void)
-{
-	DWORD			dwReturn;
-    MCI_PLAY_PARMS	mciPlayParms;
-
-	if (!enabled)
-		return;
-	
-	if (!cdValid)
-		return;
-
-	if (!wasPlaying)
-		return;
-	
-    mciPlayParms.dwFrom = MCI_MAKE_TMSF(playTrack, 0, 0, 0);
-    mciPlayParms.dwTo = MCI_MAKE_TMSF(playTrack + 1, 0, 0, 0);
-    mciPlayParms.dwCallback = (DWORD)mainwindow;
-    dwReturn = mciSendCommand(wDeviceID, MCI_PLAY, MCI_TO | MCI_NOTIFY, (DWORD)(LPVOID) &mciPlayParms);
-	if (dwReturn)
-	{
-		Con_DPrintf("CDAudio: MCI_PLAY failed (%i)\n", dwReturn);
-		return;
-	}
-	playing = true;
-}
-
-
-static void CD_f (void)
-{
-	char	*command;
-	int		ret;
-	int		n;
-	int		startAddress;
-
-	if (Cmd_Argc() < 2)
-		return;
-
-	command = Cmd_Argv (1);
-
-	if (Q_strcasecmp(command, "on") == 0)
-	{
-		enabled = true;
-		return;
-	}
-
-	if (Q_strcasecmp(command, "off") == 0)
-	{
-		if (playing)
-			CDAudio_Stop();
-		enabled = false;
-		return;
-	}
-
-	if (Q_strcasecmp(command, "reset") == 0)
-	{
-		enabled = true;
-		if (playing)
-			CDAudio_Stop();
-		for (n = 0; n < 100; n++)
-			remap[n] = n;
-		CDAudio_GetAudioDiskInfo();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "remap") == 0)
-	{
-		ret = Cmd_Argc() - 2;
-		if (ret <= 0)
-		{
-			for (n = 1; n < 100; n++)
-				if (remap[n] != n)
-					Con_Printf("  %u -> %u\n", n, remap[n]);
-			return;
-		}
-		for (n = 1; n <= ret; n++)
-			remap[n] = Q_atoi(Cmd_Argv (n+1));
-		return;
-	}
-
-	if (Q_strcasecmp(command, "close") == 0)
-	{
-		CDAudio_CloseDoor();
-		return;
-	}
-
-	if (!cdValid)
-	{
-		CDAudio_GetAudioDiskInfo();
-		if (!cdValid)
-		{
-			Con_Printf("No CD in player.\n");
-			return;
-		}
-	}
-
-	if (Q_strcasecmp(command, "play") == 0)
-	{
-		CDAudio_Play((byte)Q_atoi(Cmd_Argv (2)), false);
-		return;
-	}
-
-	if (Q_strcasecmp(command, "loop") == 0)
-	{
-		CDAudio_Play((byte)Q_atoi(Cmd_Argv (2)), true);
-		return;
-	}
-
-	if (Q_strcasecmp(command, "stop") == 0)
-	{
-		CDAudio_Stop();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "pause") == 0)
-	{
-		CDAudio_Pause();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "resume") == 0)
-	{
-		CDAudio_Resume();
-		return;
-	}
-
-	if (Q_strcasecmp(command, "eject") == 0)
-	{
-		if (playing)
-			CDAudio_Stop();
-		CDAudio_Eject();
-		cdValid = false;
-		return;
-	}
-
-	if (Q_strcasecmp(command, "info") == 0)
-	{
-		Con_Printf("%u tracks\n", maxTrack);
-		if (playing)
-			Con_Printf("Currently %s track %u\n", playLooping ? "looping" : "playing", playTrack);
-		else if (wasPlaying)
-			Con_Printf("Paused %s track %u\n", playLooping ? "looping" : "playing", playTrack);
-		Con_Printf("Volume is %f\n", cdvolume);
-		return;
-	}
-}
-
-
-LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if (lParam != wDeviceID)
-		return 1;
-
-	switch (wParam)
-	{
-		case MCI_NOTIFY_SUCCESSFUL:
-			if (playing)
-			{
-				playing = false;
-				if (playLooping)
-					CDAudio_Play(playTrack, true);
-			}
-			break;
-
-		case MCI_NOTIFY_ABORTED:
-		case MCI_NOTIFY_SUPERSEDED:
-			break;
-
-		case MCI_NOTIFY_FAILURE:
-			Con_DPrintf("MCI_NOTIFY_FAILURE\n");
-			CDAudio_Stop ();
-			cdValid = false;
-			break;
-
-		default:
-			Con_DPrintf("Unexpected MM_MCINOTIFY type (%i)\n", wParam);
-			return 1;
-	}
-
-	return 0;
-}
-
-
-void CDAudio_Update(void)
-{
-	if (!enabled)
-		return;
-
-	if (bgmvolume.value != cdvolume)
-	{
-		if (cdvolume)
-		{
-			Cvar_SetValue ("bgmvolume", 0.0);
-			cdvolume = bgmvolume.value;
-			CDAudio_Pause ();
-		}
-		else
-		{
-			Cvar_SetValue ("bgmvolume", 1.0);
-			cdvolume = bgmvolume.value;
-			CDAudio_Resume ();
-		}
-	}
-}
-
-
-int CDAudio_Init(void)
-{
-	DWORD	dwReturn;
-	MCI_OPEN_PARMS	mciOpenParms;
-    MCI_SET_PARMS	mciSetParms;
-	int				n;
-
-	if (cls.state == ca_dedicated)
-		return -1;
-
-	if (COM_CheckParm("-nocdaudio"))
-		return -1;
-
-	mciOpenParms.lpstrDeviceType = "cdaudio";
-	if (dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_SHAREABLE, (DWORD) (LPVOID) &mciOpenParms))
-	{
-		Con_Printf("CDAudio_Init: MCI_OPEN failed (%i)\n", dwReturn);
-		return -1;
-	}
-	wDeviceID = mciOpenParms.wDeviceID;
-
-    // Set the time format to track/minute/second/frame (TMSF).
-    mciSetParms.dwTimeFormat = MCI_FORMAT_TMSF;
-    if (dwReturn = mciSendCommand(wDeviceID, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD)(LPVOID) &mciSetParms))
-    {
-		Con_Printf("MCI_SET_TIME_FORMAT failed (%i)\n", dwReturn);
-        mciSendCommand(wDeviceID, MCI_CLOSE, 0, (DWORD)NULL);
-		return -1;
-    }
-
-	for (n = 0; n < 100; n++)
-		remap[n] = n;
-	initialized = true;
-	enabled = true;
-
-	if (CDAudio_GetAudioDiskInfo())
-	{
-		Con_Printf("CDAudio_Init: No CD in player.\n");
-		cdValid = false;
-	}
-
-	Cmd_AddCommand ("cd", CD_f);
-
-	Con_Printf("CD Audio Initialized\n");
-
-	return 0;
-}
-
-
-void CDAudio_Shutdown(void)
-{
-	if (!initialized)
-		return;
-	CDAudio_Stop();
-	if (mciSendCommand(wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD)NULL))
-		Con_DPrintf("CDAudio_Shutdown: MCI_CLOSE failed\n");
-}
--- a/u/clean.bat
+++ /dev/null
@@ -1,18 +1,0 @@
-rmdir /s /q debug
-rmdir /s /q release
-rmdir /s /q debug_gl
-rmdir /s /q release_gl
-
-rmdir /s /q gas2masm\debug
-rmdir /s /q gas2masm\release
-
-del gas2masm\gas2masm.opt
-del gas2masm\gas2masm.plg
-del gas2masm\gas2masm.ncb
-del gas2masm\gas2masm.stt
-
-del WinQuake.opt
-del WinQuake.plg
-del WinQuake.ncb
-del WinQuake.stt
-
--- a/u/conproc.c
+++ /dev/null
@@ -1,365 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// conproc.c
-
-#include <windows.h>
-#include "conproc.h"
-#include "quakedef.h"
-
-HANDLE	heventDone;
-HANDLE	hfileBuffer;
-HANDLE	heventChildSend;
-HANDLE	heventParentSend;
-HANDLE	hStdout;
-HANDLE	hStdin;
-
-DWORD RequestProc (DWORD dwNichts);
-LPVOID GetMappedBuffer (HANDLE hfileBuffer);
-void ReleaseMappedBuffer (LPVOID pBuffer);
-BOOL GetScreenBufferLines (int *piLines);
-BOOL SetScreenBufferLines (int iLines);
-BOOL ReadText (LPTSTR pszText, int iBeginLine, int iEndLine);
-BOOL WriteText (LPCTSTR szText);
-int CharToCode (char c);
-BOOL SetConsoleCXCY(HANDLE hStdout, int cx, int cy);
-
-
-void InitConProc (HANDLE hFile, HANDLE heventParent, HANDLE heventChild)
-{
-	DWORD	dwID;
-	CONSOLE_SCREEN_BUFFER_INFO	info;
-	int		wheight, wwidth;
-
-// ignore if we don't have all the events.
-	if (!hFile || !heventParent || !heventChild)
-		return;
-
-	hfileBuffer = hFile;
-	heventParentSend = heventParent;
-	heventChildSend = heventChild;
-
-// so we'll know when to go away.
-	heventDone = CreateEvent (NULL, FALSE, FALSE, NULL);
-
-	if (!heventDone)
-	{
-		Con_SafePrintf ("Couldn't create heventDone\n");
-		return;
-	}
-
-	if (!CreateThread (NULL,
-					   0,
-					   (LPTHREAD_START_ROUTINE) RequestProc,
-					   0,
-					   0,
-					   &dwID))
-	{
-		CloseHandle (heventDone);
-		Con_SafePrintf ("Couldn't create QHOST thread\n");
-		return;
-	}
-
-// save off the input/output handles.
-	hStdout = GetStdHandle (STD_OUTPUT_HANDLE);
-	hStdin = GetStdHandle (STD_INPUT_HANDLE);
-
-// force 80 character width, at least 25 character height
-	SetConsoleCXCY (hStdout, 80, 25);
-}
-
-
-void DeinitConProc (void)
-{
-	if (heventDone)
-		SetEvent (heventDone);
-}
-
-
-DWORD RequestProc (DWORD dwNichts)
-{
-	int		*pBuffer;
-	DWORD	dwRet;
-	HANDLE	heventWait[2];
-	int		iBeginLine, iEndLine;
-	
-	heventWait[0] = heventParentSend;
-	heventWait[1] = heventDone;
-
-	while (1)
-	{
-		dwRet = WaitForMultipleObjects (2, heventWait, FALSE, INFINITE);
-
-	// heventDone fired, so we're exiting.
-		if (dwRet == WAIT_OBJECT_0 + 1)	
-			break;
-
-		pBuffer = (int *) GetMappedBuffer (hfileBuffer);
-		
-	// hfileBuffer is invalid.  Just leave.
-		if (!pBuffer)
-		{
-			Con_SafePrintf ("Invalid hfileBuffer\n");
-			break;
-		}
-
-		switch (pBuffer[0])
-		{
-			case CCOM_WRITE_TEXT:
-			// Param1 : Text
-				pBuffer[0] = WriteText ((LPCTSTR) (pBuffer + 1));
-				break;
-
-			case CCOM_GET_TEXT:
-			// Param1 : Begin line
-			// Param2 : End line
-				iBeginLine = pBuffer[1];
-				iEndLine = pBuffer[2];
-				pBuffer[0] = ReadText ((LPTSTR) (pBuffer + 1), iBeginLine, 
-									   iEndLine);
-				break;
-
-			case CCOM_GET_SCR_LINES:
-			// No params
-				pBuffer[0] = GetScreenBufferLines (&pBuffer[1]);
-				break;
-
-			case CCOM_SET_SCR_LINES:
-			// Param1 : Number of lines
-				pBuffer[0] = SetScreenBufferLines (pBuffer[1]);
-				break;
-		}
-
-		ReleaseMappedBuffer (pBuffer);
-		SetEvent (heventChildSend);
-	}
-
-	return 0;
-}
-
-
-LPVOID GetMappedBuffer (HANDLE hfileBuffer)
-{
-	LPVOID pBuffer;
-
-	pBuffer = MapViewOfFile (hfileBuffer,
-							FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
-
-	return pBuffer;
-}
-
-
-void ReleaseMappedBuffer (LPVOID pBuffer)
-{
-	UnmapViewOfFile (pBuffer);
-}
-
-
-BOOL GetScreenBufferLines (int *piLines)
-{
-	CONSOLE_SCREEN_BUFFER_INFO	info;							  
-	BOOL						bRet;
-
-	bRet = GetConsoleScreenBufferInfo (hStdout, &info);
-		
-	if (bRet)
-		*piLines = info.dwSize.Y;
-
-	return bRet;
-}
-
-
-BOOL SetScreenBufferLines (int iLines)
-{
-
-	return SetConsoleCXCY (hStdout, 80, iLines);
-}
-
-
-BOOL ReadText (LPTSTR pszText, int iBeginLine, int iEndLine)
-{
-	COORD	coord;
-	DWORD	dwRead;
-	BOOL	bRet;
-
-	coord.X = 0;
-	coord.Y = iBeginLine;
-
-	bRet = ReadConsoleOutputCharacter(
-		hStdout,
-		pszText,
-		80 * (iEndLine - iBeginLine + 1),
-		coord,
-		&dwRead);
-
-	// Make sure it's null terminated.
-	if (bRet)
-		pszText[dwRead] = '\0';
-
-	return bRet;
-}
-
-
-BOOL WriteText (LPCTSTR szText)
-{
-	DWORD			dwWritten;
-	INPUT_RECORD	rec;
-	char			upper, *sz;
-
-	sz = (LPTSTR) szText;
-
-	while (*sz)
-	{
-	// 13 is the code for a carriage return (\n) instead of 10.
-		if (*sz == 10)
-			*sz = 13;
-
-		upper = toupper(*sz);
-
-		rec.EventType = KEY_EVENT;
-		rec.Event.KeyEvent.bKeyDown = TRUE;
-		rec.Event.KeyEvent.wRepeatCount = 1;
-		rec.Event.KeyEvent.wVirtualKeyCode = upper;
-		rec.Event.KeyEvent.wVirtualScanCode = CharToCode (*sz);
-		rec.Event.KeyEvent.uChar.AsciiChar = *sz;
-		rec.Event.KeyEvent.uChar.UnicodeChar = *sz;
-		rec.Event.KeyEvent.dwControlKeyState = isupper(*sz) ? 0x80 : 0x0; 
-
-		WriteConsoleInput(
-			hStdin,
-			&rec,
-			1,
-			&dwWritten);
-
-		rec.Event.KeyEvent.bKeyDown = FALSE;
-
-		WriteConsoleInput(
-			hStdin,
-			&rec,
-			1,
-			&dwWritten);
-
-		sz++;
-	}
-
-	return TRUE;
-}
-
-
-int CharToCode (char c)
-{
-	char upper;
-		
-	upper = toupper(c);
-
-	switch (c)
-	{
-		case 13:
-			return 28;
-
-		default:
-			break;
-	}
-
-	if (isalpha(c))
-		return (30 + upper - 65); 
-
-	if (isdigit(c))
-		return (1 + upper - 47);
-
-	return c;
-}
-
-
-BOOL SetConsoleCXCY(HANDLE hStdout, int cx, int cy)
-{
-	CONSOLE_SCREEN_BUFFER_INFO	info;
-	COORD						coordMax;
- 
-	coordMax = GetLargestConsoleWindowSize(hStdout);
-
-	if (cy > coordMax.Y)
-		cy = coordMax.Y;
-
-	if (cx > coordMax.X)
-		cx = coordMax.X;
- 
-	if (!GetConsoleScreenBufferInfo(hStdout, &info))
-		return FALSE;
- 
-// height
-    info.srWindow.Left = 0;         
-    info.srWindow.Right = info.dwSize.X - 1;                
-    info.srWindow.Top = 0;
-    info.srWindow.Bottom = cy - 1;          
- 
-	if (cy < info.dwSize.Y)
-	{
-		if (!SetConsoleWindowInfo(hStdout, TRUE, &info.srWindow))
-			return FALSE;
- 
-		info.dwSize.Y = cy;
- 
-		if (!SetConsoleScreenBufferSize(hStdout, info.dwSize))
-			return FALSE;
-    }
-    else if (cy > info.dwSize.Y)
-    {
-		info.dwSize.Y = cy;
- 
-		if (!SetConsoleScreenBufferSize(hStdout, info.dwSize))
-			return FALSE;
- 
-		if (!SetConsoleWindowInfo(hStdout, TRUE, &info.srWindow))
-			return FALSE;
-    }
- 
-	if (!GetConsoleScreenBufferInfo(hStdout, &info))
-		return FALSE;
- 
-// width
-	info.srWindow.Left = 0;         
-	info.srWindow.Right = cx - 1;
-	info.srWindow.Top = 0;
-	info.srWindow.Bottom = info.dwSize.Y - 1;               
- 
-	if (cx < info.dwSize.X)
-	{
-		if (!SetConsoleWindowInfo(hStdout, TRUE, &info.srWindow))
-			return FALSE;
- 
-		info.dwSize.X = cx;
-    
-		if (!SetConsoleScreenBufferSize(hStdout, info.dwSize))
-			return FALSE;
-	}
-	else if (cx > info.dwSize.X)
-	{
-		info.dwSize.X = cx;
- 
-		if (!SetConsoleScreenBufferSize(hStdout, info.dwSize))
-			return FALSE;
- 
-		if (!SetConsoleWindowInfo(hStdout, TRUE, &info.srWindow))
-			return FALSE;
-	}
- 
-	return TRUE;
-}
-     
--- a/u/conproc.h
+++ /dev/null
@@ -1,37 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// conproc.h
-
-#define CCOM_WRITE_TEXT		0x2
-// Param1 : Text
-
-#define CCOM_GET_TEXT		0x3
-// Param1 : Begin line
-// Param2 : End line
-
-#define CCOM_GET_SCR_LINES	0x4
-// No params
-
-#define CCOM_SET_SCR_LINES	0x5
-// Param1 : Number of lines
-
-void InitConProc (HANDLE hFile, HANDLE heventParent, HANDLE heventChild);
-void DeinitConProc (void);
-
binary files a/u/cwsdpmi.exe /dev/null differ
--- a/u/d_copy.s
+++ /dev/null
@@ -1,149 +1,0 @@
-//
-// d_copy.s
-// x86 assembly-language screen copying code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-
-	.data
-
-LCopyWidth:		.long	0
-LBlockSrcStep:	.long	0
-LBlockDestStep:	.long	0
-LSrcDelta:		.long	0
-LDestDelta:		.long	0
-
-#define bufptr	4+16
-
-// copies 16 rows per plane at a pop; idea is that 16*512 = 8k, and since
-// no Mode X mode is wider than 360, all the data should fit in the cache for
-// the passes for the next 3 planes
-
-	.text
-
-.globl C(VGA_UpdatePlanarScreen)
-C(VGA_UpdatePlanarScreen):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-	movl	C(VGA_bufferrowbytes),%eax
-	shll	$1,%eax
-	movl	%eax,LBlockSrcStep
-	movl	C(VGA_rowbytes),%eax
-	shll	$1,%eax
-	movl	%eax,LBlockDestStep
-
-	movl	$0x3C4,%edx
-	movb	$2,%al
-	outb	%al,%dx		// point the SC to the Map Mask
-	incl	%edx
-
-	movl	bufptr(%esp),%esi
-	movl	C(VGA_pagebase),%edi
-	movl	C(VGA_height),%ebp
-	shrl	$1,%ebp
-
-	movl	C(VGA_width),%ecx
-	movl	C(VGA_bufferrowbytes),%eax
-	subl	%ecx,%eax
-	movl	%eax,LSrcDelta
-	movl	C(VGA_rowbytes),%eax
-	shll	$2,%eax
-	subl	%ecx,%eax
-	movl	%eax,LDestDelta
-	shrl	$4,%ecx
-	movl	%ecx,LCopyWidth
-
-LRowLoop:
-	movb	$1,%al
-
-LPlaneLoop:
-	outb	%al,%dx
-	movb	$2,%ah
-
-	pushl	%esi
-	pushl	%edi
-LRowSetLoop:
-	movl	LCopyWidth,%ecx
-LColumnLoop:
-	movb	12(%esi),%bh
-	movb	8(%esi),%bl
-	shll	$16,%ebx
-	movb	4(%esi),%bh
-	movb	(%esi),%bl
-	movl	%ebx,(%edi)
-	addl	$16,%esi
-	addl	$4,%edi
-	decl	%ecx
-	jnz		LColumnLoop
-
-	addl	LDestDelta,%edi
-	addl	LSrcDelta,%esi
-	decb	%ah
-	jnz		LRowSetLoop
-
-	popl	%edi
-	popl	%esi
-	incl	%esi
-
-	shlb	$1,%al
-	cmpb	$16,%al
-	jnz		LPlaneLoop
-
-	subl	$4,%esi
-	addl	LBlockSrcStep,%esi
-	addl	LBlockDestStep,%edi
-	decl	%ebp
-	jnz		LRowLoop
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-
-	ret
-
-
-#define srcptr			4+16
-#define destptr			8+16
-#define width			12+16
-#define height			16+16
-#define srcrowbytes		20+16
-#define destrowbytes	24+16
-
-.globl C(VGA_UpdateLinearScreen)
-C(VGA_UpdateLinearScreen):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-	cld
-	movl	srcptr(%esp),%esi
-	movl	destptr(%esp),%edi
-	movl	width(%esp),%ebx
-	movl	srcrowbytes(%esp),%eax
-	subl	%ebx,%eax
-	movl	destrowbytes(%esp),%edx
-	subl	%ebx,%edx
-	shrl	$2,%ebx
-	movl	height(%esp),%ebp
-LLRowLoop:
-	movl	%ebx,%ecx
-	rep/movsl	(%esi),(%edi)
-	addl	%eax,%esi
-	addl	%edx,%edi
-	decl	%ebp
-	jnz		LLRowLoop
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-
-	ret
-
--- a/u/d_draw.s
+++ /dev/null
@@ -1,1018 +1,0 @@
-//
-// d_draw.s
-// x86 assembly-language horizontal 8-bpp span-drawing code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef	id386
-
-//----------------------------------------------------------------------
-// 8-bpp horizontal span drawing code for polygons, with no transparency.
-//
-// Assumes there is at least one span in pspans, and that every span
-// contains at least one pixel
-//----------------------------------------------------------------------
-
-	.text
-
-// out-of-line, rarely-needed clamping code
-
-LClampHigh0:
-	movl	C(bbextents),%esi
-	jmp		LClampReentry0
-LClampHighOrLow0:
-	jg		LClampHigh0
-	xorl	%esi,%esi
-	jmp		LClampReentry0
-
-LClampHigh1:
-	movl	C(bbextentt),%edx
-	jmp		LClampReentry1
-LClampHighOrLow1:
-	jg		LClampHigh1
-	xorl	%edx,%edx
-	jmp		LClampReentry1
-
-LClampLow2:
-	movl	$2048,%ebp
-	jmp		LClampReentry2
-LClampHigh2:
-	movl	C(bbextents),%ebp
-	jmp		LClampReentry2
-
-LClampLow3:
-	movl	$2048,%ecx
-	jmp		LClampReentry3
-LClampHigh3:
-	movl	C(bbextentt),%ecx
-	jmp		LClampReentry3
-
-LClampLow4:
-	movl	$2048,%eax
-	jmp		LClampReentry4
-LClampHigh4:
-	movl	C(bbextents),%eax
-	jmp		LClampReentry4
-
-LClampLow5:
-	movl	$2048,%ebx
-	jmp		LClampReentry5
-LClampHigh5:
-	movl	C(bbextentt),%ebx
-	jmp		LClampReentry5
-
-
-#define pspans	4+16
-
-	.align 4
-.globl C(D_DrawSpans8)
-C(D_DrawSpans8):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-//
-// set up scaled-by-8 steps, for 8-long segments; also set up cacheblock
-// and span list pointers
-//
-// TODO: any overlap from rearranging?
-	flds	C(d_sdivzstepu)
-	fmuls	fp_8
-	movl	C(cacheblock),%edx
-	flds	C(d_tdivzstepu)
-	fmuls	fp_8
-	movl	pspans(%esp),%ebx	// point to the first span descriptor
-	flds	C(d_zistepu)
-	fmuls	fp_8
-	movl	%edx,pbase			// pbase = cacheblock
-	fstps	zi8stepu
-	fstps	tdivz8stepu
-	fstps	sdivz8stepu
-
-LSpanLoop:
-//
-// set up the initial s/z, t/z, and 1/z on the FP stack, and generate the
-// initial s and t values
-//
-// FIXME: pipeline FILD?
-	fildl	espan_t_v(%ebx)
-	fildl	espan_t_u(%ebx)
-
-	fld		%st(1)			// dv | du | dv
-	fmuls	C(d_sdivzstepv)	// dv*d_sdivzstepv | du | dv
-	fld		%st(1)			// du | dv*d_sdivzstepv | du | dv
-	fmuls	C(d_sdivzstepu)	// du*d_sdivzstepu | dv*d_sdivzstepv | du | dv
-	fld		%st(2)			// du | du*d_sdivzstepu | dv*d_sdivzstepv | du | dv
-	fmuls	C(d_tdivzstepu)	// du*d_tdivzstepu | du*d_sdivzstepu |
-							//  dv*d_sdivzstepv | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu | du*d_tdivzstepu |
-							//  dv*d_sdivzstepv | du | dv
-	faddp	%st(0),%st(2)	// du*d_tdivzstepu |
-							//  du*d_sdivzstepu + dv*d_sdivzstepv | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fld		%st(3)			// dv | du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fmuls	C(d_tdivzstepv)	// dv*d_tdivzstepv |
-							//  du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  dv*d_tdivzstepv | du*d_tdivzstepu | du | dv
-	fadds	C(d_sdivzorigin)	// sdivz = d_sdivzorigin + dv*d_sdivzstepv +
-							//  du*d_sdivzstepu; stays in %st(2) at end
-	fxch	%st(4)			// dv | dv*d_tdivzstepv | du*d_tdivzstepu | du |
-							//  s/z
-	fmuls	C(d_zistepv)		// dv*d_zistepv | dv*d_tdivzstepv |
-							//  du*d_tdivzstepu | du | s/z
-	fxch	%st(1)			// dv*d_tdivzstepv |  dv*d_zistepv |
-							//  du*d_tdivzstepu | du | s/z
-	faddp	%st(0),%st(2)	// dv*d_zistepv |
-							//  dv*d_tdivzstepv + du*d_tdivzstepu | du | s/z
-	fxch	%st(2)			// du | dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  dv*d_zistepv | s/z
-	fmuls	C(d_zistepu)		// du*d_zistepu |
-							//  dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  dv*d_zistepv | s/z
-	fxch	%st(1)			// dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  du*d_zistepu | dv*d_zistepv | s/z
-	fadds	C(d_tdivzorigin)	// tdivz = d_tdivzorigin + dv*d_tdivzstepv +
-							//  du*d_tdivzstepu; stays in %st(1) at end
-	fxch	%st(2)			// dv*d_zistepv | du*d_zistepu | t/z | s/z
-	faddp	%st(0),%st(1)	// dv*d_zistepv + du*d_zistepu | t/z | s/z
-
-	flds	fp_64k			// fp_64k | dv*d_zistepv + du*d_zistepu | t/z | s/z
-	fxch	%st(1)			// dv*d_zistepv + du*d_zistepu | fp_64k | t/z | s/z
-	fadds	C(d_ziorigin)		// zi = d_ziorigin + dv*d_zistepv +
-							//  du*d_zistepu; stays in %st(0) at end
-							// 1/z | fp_64k | t/z | s/z
-//
-// calculate and clamp s & t
-//
-	fdivr	%st(0),%st(1)	// 1/z | z*64k | t/z | s/z
-
-//
-// point %edi to the first pixel in the span
-//
-	movl	C(d_viewbuffer),%ecx
-	movl	espan_t_v(%ebx),%eax
-	movl	%ebx,pspantemp	// preserve spans pointer
-
-	movl	C(tadjust),%edx
-	movl	C(sadjust),%esi
-	movl	C(d_scantable)(,%eax,4),%edi	// v * screenwidth
-	addl	%ecx,%edi
-	movl	espan_t_u(%ebx),%ecx
-	addl	%ecx,%edi				// pdest = &pdestspan[scans->u];
-	movl	espan_t_count(%ebx),%ecx
-
-//
-// now start the FDIV for the end of the span
-//
-	cmpl	$8,%ecx
-	ja		LSetupNotLast1
-
-	decl	%ecx
-	jz		LCleanup1		// if only one pixel, no need to start an FDIV
-	movl	%ecx,spancountminus1
-
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-
-	fildl	spancountminus1
-
-	flds	C(d_tdivzstepu)	// C(d_tdivzstepu) | spancountminus1
-	flds	C(d_zistepu)		// C(d_zistepu) | C(d_tdivzstepu) | spancountminus1
-	fmul	%st(2),%st(0)	// C(d_zistepu)*scm1 | C(d_tdivzstepu) | scm1
-	fxch	%st(1)			// C(d_tdivzstepu) | C(d_zistepu)*scm1 | scm1
-	fmul	%st(2),%st(0)	// C(d_tdivzstepu)*scm1 | C(d_zistepu)*scm1 | scm1
-	fxch	%st(2)			// scm1 | C(d_zistepu)*scm1 | C(d_tdivzstepu)*scm1
-	fmuls	C(d_sdivzstepu)	// C(d_sdivzstepu)*scm1 | C(d_zistepu)*scm1 |
-							//  C(d_tdivzstepu)*scm1
-	fxch	%st(1)			// C(d_zistepu)*scm1 | C(d_sdivzstepu)*scm1 |
-							//  C(d_tdivzstepu)*scm1
-	faddp	%st(0),%st(3)	// C(d_sdivzstepu)*scm1 | C(d_tdivzstepu)*scm1
-	fxch	%st(1)			// C(d_tdivzstepu)*scm1 | C(d_sdivzstepu)*scm1
-	faddp	%st(0),%st(3)	// C(d_sdivzstepu)*scm1
-	faddp	%st(0),%st(3)
-
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// this is what we've gone to all this trouble to
-							//  overlap
-	jmp		LFDIVInFlight1
-
-LCleanup1:
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-	jmp		LFDIVInFlight1
-
-	.align	4
-LSetupNotLast1:
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-
-	fadds	zi8stepu
-	fxch	%st(2)
-	fadds	sdivz8stepu
-	fxch	%st(2)
-	flds	tdivz8stepu
-	faddp	%st(0),%st(2)
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// z = 1/1/z
-							// this is what we've gone to all this trouble to
-							//  overlap
-LFDIVInFlight1:
-
-	addl	s,%esi
-	addl	t,%edx
-	movl	C(bbextents),%ebx
-	movl	C(bbextentt),%ebp
-	cmpl	%ebx,%esi
-	ja		LClampHighOrLow0
-LClampReentry0:
-	movl	%esi,s
-	movl	pbase,%ebx
-	shll	$16,%esi
-	cmpl	%ebp,%edx
-	movl	%esi,sfracf
-	ja		LClampHighOrLow1
-LClampReentry1:
-	movl	%edx,t
-	movl	s,%esi					// sfrac = scans->sfrac;
-	shll	$16,%edx
-	movl	t,%eax					// tfrac = scans->tfrac;
-	sarl	$16,%esi
-	movl	%edx,tfracf
-
-//
-// calculate the texture starting address
-//
-	sarl	$16,%eax
-	movl	C(cachewidth),%edx
-	imull	%edx,%eax				// (tfrac >> 16) * cachewidth
-	addl	%ebx,%esi
-	addl	%eax,%esi				// psource = pbase + (sfrac >> 16) +
-									//           ((tfrac >> 16) * cachewidth);
-
-//
-// determine whether last span or not
-//
-	cmpl	$8,%ecx
-	jna		LLastSegment
-
-//
-// not the last segment; do full 8-wide segment
-//
-LNotLastSegment:
-
-//
-// advance s/z, t/z, and 1/z, and calculate s & t at end of span and steps to
-// get there
-//
-
-// pick up after the FDIV that was left in flight previously
-
-	fld		%st(0)			// duplicate it
-	fmul	%st(4),%st(0)	// s = s/z * z
-	fxch	%st(1)
-	fmul	%st(3),%st(0)	// t = t/z * z
-	fxch	%st(1)
-	fistpl	snext
-	fistpl	tnext
-	movl	snext,%eax
-	movl	tnext,%edx
-
-	movb	(%esi),%bl	// get first source texel
-	subl	$8,%ecx		// count off this segments' pixels
-	movl	C(sadjust),%ebp
-	movl	%ecx,counttemp	// remember count of remaining pixels
-
-	movl	C(tadjust),%ecx
-	movb	%bl,(%edi)	// store first dest pixel
-
-	addl	%eax,%ebp
-	addl	%edx,%ecx
-
-	movl	C(bbextents),%eax
-	movl	C(bbextentt),%edx
-
-	cmpl	$2048,%ebp
-	jl		LClampLow2
-	cmpl	%eax,%ebp
-	ja		LClampHigh2
-LClampReentry2:
-
-	cmpl	$2048,%ecx
-	jl		LClampLow3
-	cmpl	%edx,%ecx
-	ja		LClampHigh3
-LClampReentry3:
-
-	movl	%ebp,snext
-	movl	%ecx,tnext
-
-	subl	s,%ebp
-	subl	t,%ecx
-	
-//
-// set up advancetable
-//
-	movl	%ecx,%eax
-	movl	%ebp,%edx
-	sarl	$19,%eax			// tstep >>= 16;
-	jz		LZero
-	sarl	$19,%edx			// sstep >>= 16;
-	movl	C(cachewidth),%ebx
-	imull	%ebx,%eax
-	jmp		LSetUp1
-
-LZero:
-	sarl	$19,%edx			// sstep >>= 16;
-	movl	C(cachewidth),%ebx
-
-LSetUp1:
-
-	addl	%edx,%eax			// add in sstep
-								// (tstep >> 16) * cachewidth + (sstep >> 16);
-	movl	tfracf,%edx
-	movl	%eax,advancetable+4	// advance base in t
-	addl	%ebx,%eax			// ((tstep >> 16) + 1) * cachewidth +
-								//  (sstep >> 16);
-	shll	$13,%ebp			// left-justify sstep fractional part
-	movl	sfracf,%ebx
-	shll	$13,%ecx			// left-justify tstep fractional part
-	movl	%eax,advancetable	// advance extra in t
-
-	movl	%ecx,tstep
-	addl	%ecx,%edx			// advance tfrac fractional part by tstep frac
-
-	sbbl	%ecx,%ecx			// turn tstep carry into -1 (0 if none)
-	addl	%ebp,%ebx			// advance sfrac fractional part by sstep frac
-	adcl	advancetable+4(,%ecx,4),%esi	// point to next source texel
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	(%esi),%al
-	addl	%ebp,%ebx
-	movb	%al,1(%edi)
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,2(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,3(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-
-//
-// start FDIV for end of next segment in flight, so it can overlap
-//
-	movl	counttemp,%ecx
-	cmpl	$8,%ecx			// more than one segment after this?
-	ja		LSetupNotLast2	// yes
-
-	decl	%ecx
-	jz		LFDIVInFlight2	// if only one pixel, no need to start an FDIV
-	movl	%ecx,spancountminus1
-	fildl	spancountminus1
-
-	flds	C(d_zistepu)		// C(d_zistepu) | spancountminus1
-	fmul	%st(1),%st(0)	// C(d_zistepu)*scm1 | scm1
-	flds	C(d_tdivzstepu)	// C(d_tdivzstepu) | C(d_zistepu)*scm1 | scm1
-	fmul	%st(2),%st(0)	// C(d_tdivzstepu)*scm1 | C(d_zistepu)*scm1 | scm1
-	fxch	%st(1)			// C(d_zistepu)*scm1 | C(d_tdivzstepu)*scm1 | scm1
-	faddp	%st(0),%st(3)	// C(d_tdivzstepu)*scm1 | scm1
-	fxch	%st(1)			// scm1 | C(d_tdivzstepu)*scm1
-	fmuls	C(d_sdivzstepu)	// C(d_sdivzstepu)*scm1 | C(d_tdivzstepu)*scm1
-	fxch	%st(1)			// C(d_tdivzstepu)*scm1 | C(d_sdivzstepu)*scm1
-	faddp	%st(0),%st(3)	// C(d_sdivzstepu)*scm1
-	flds	fp_64k			// 64k | C(d_sdivzstepu)*scm1
-	fxch	%st(1)			// C(d_sdivzstepu)*scm1 | 64k
-	faddp	%st(0),%st(4)	// 64k
-
-	fdiv	%st(1),%st(0)	// this is what we've gone to all this trouble to
-							//  overlap
-	jmp		LFDIVInFlight2
-
-	.align	4
-LSetupNotLast2:
-	fadds	zi8stepu
-	fxch	%st(2)
-	fadds	sdivz8stepu
-	fxch	%st(2)
-	flds	tdivz8stepu
-	faddp	%st(0),%st(2)
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// z = 1/1/z
-							// this is what we've gone to all this trouble to
-							//  overlap
-LFDIVInFlight2:
-	movl	%ecx,counttemp
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,4(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,5(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,6(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	$8,%edi
-	movl	%edx,tfracf
-	movl	snext,%edx
-	movl	%ebx,sfracf
-	movl	tnext,%ebx
-	movl	%edx,s
-	movl	%ebx,t
-
-	movl	counttemp,%ecx		// retrieve count
-
-//
-// determine whether last span or not
-//
-	cmpl	$8,%ecx				// are there multiple segments remaining?
-	movb	%al,-1(%edi)
-	ja		LNotLastSegment		// yes
-
-//
-// last segment of scan
-//
-LLastSegment:
-
-//
-// advance s/z, t/z, and 1/z, and calculate s & t at end of span and steps to
-// get there. The number of pixels left is variable, and we want to land on the
-// last pixel, not step one past it, so we can't run into arithmetic problems
-//
-	testl	%ecx,%ecx
-	jz		LNoSteps		// just draw the last pixel and we're done
-
-// pick up after the FDIV that was left in flight previously
-
-
-	fld		%st(0)			// duplicate it
-	fmul	%st(4),%st(0)	// s = s/z * z
-	fxch	%st(1)
-	fmul	%st(3),%st(0)	// t = t/z * z
-	fxch	%st(1)
-	fistpl	snext
-	fistpl	tnext
-
-	movb	(%esi),%al		// load first texel in segment
-	movl	C(tadjust),%ebx
-	movb	%al,(%edi)		// store first pixel in segment
-	movl	C(sadjust),%eax
-
-	addl	snext,%eax
-	addl	tnext,%ebx
-
-	movl	C(bbextents),%ebp
-	movl	C(bbextentt),%edx
-
-	cmpl	$2048,%eax
-	jl		LClampLow4
-	cmpl	%ebp,%eax
-	ja		LClampHigh4
-LClampReentry4:
-	movl	%eax,snext
-
-	cmpl	$2048,%ebx
-	jl		LClampLow5
-	cmpl	%edx,%ebx
-	ja		LClampHigh5
-LClampReentry5:
-
-	cmpl	$1,%ecx			// don't bother 
-	je		LOnlyOneStep	// if two pixels in segment, there's only one step,
-							//  of the segment length
-	subl	s,%eax
-	subl	t,%ebx
-
-	addl	%eax,%eax		// convert to 15.17 format so multiply by 1.31
-	addl	%ebx,%ebx		//  reciprocal yields 16.48
-
-	imull	reciprocal_table-8(,%ecx,4) // sstep = (snext - s) / (spancount-1)
-	movl	%edx,%ebp
-
-	movl	%ebx,%eax
-	imull	reciprocal_table-8(,%ecx,4) // tstep = (tnext - t) / (spancount-1)
-
-LSetEntryvec:
-//
-// set up advancetable
-//
-	movl	entryvec_table(,%ecx,4),%ebx
-	movl	%edx,%eax
-	movl	%ebx,jumptemp		// entry point into code for RET later
-	movl	%ebp,%ecx
-	sarl	$16,%edx			// tstep >>= 16;
-	movl	C(cachewidth),%ebx
-	sarl	$16,%ecx			// sstep >>= 16;
-	imull	%ebx,%edx
-
-	addl	%ecx,%edx			// add in sstep
-								// (tstep >> 16) * cachewidth + (sstep >> 16);
-	movl	tfracf,%ecx
-	movl	%edx,advancetable+4	// advance base in t
-	addl	%ebx,%edx			// ((tstep >> 16) + 1) * cachewidth +
-								//  (sstep >> 16);
-	shll	$16,%ebp			// left-justify sstep fractional part
-	movl	sfracf,%ebx
-	shll	$16,%eax			// left-justify tstep fractional part
-	movl	%edx,advancetable	// advance extra in t
-
-	movl	%eax,tstep
-	movl	%ecx,%edx
-	addl	%eax,%edx
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	jmp		*jumptemp			// jump to the number-of-pixels handler
-
-//----------------------------------------
-
-LNoSteps:
-	movb	(%esi),%al		// load first texel in segment
-	subl	$7,%edi			// adjust for hardwired offset
-	jmp		LEndSpan
-
-
-LOnlyOneStep:
-	subl	s,%eax
-	subl	t,%ebx
-	movl	%eax,%ebp
-	movl	%ebx,%edx
-	jmp		LSetEntryvec
-
-//----------------------------------------
-
-.globl	Entry2_8
-Entry2_8:
-	subl	$6,%edi		// adjust for hardwired offsets
-	movb	(%esi),%al
-	jmp		LLEntry2_8
-
-//----------------------------------------
-
-.globl	Entry3_8
-Entry3_8:
-	subl	$5,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	jmp		LLEntry3_8
-
-//----------------------------------------
-
-.globl	Entry4_8
-Entry4_8:
-	subl	$4,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LLEntry4_8
-
-//----------------------------------------
-
-.globl	Entry5_8
-Entry5_8:
-	subl	$3,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LLEntry5_8
-
-//----------------------------------------
-
-.globl	Entry6_8
-Entry6_8:
-	subl	$2,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LLEntry6_8
-
-//----------------------------------------
-
-.globl	Entry7_8
-Entry7_8:
-	decl	%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LLEntry7_8
-
-//----------------------------------------
-
-.globl	Entry8_8
-Entry8_8:
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,1(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LLEntry7_8:
-	sbbl	%ecx,%ecx
-	movb	%al,2(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LLEntry6_8:
-	sbbl	%ecx,%ecx
-	movb	%al,3(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LLEntry5_8:
-	sbbl	%ecx,%ecx
-	movb	%al,4(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LLEntry4_8:
-	sbbl	%ecx,%ecx
-	movb	%al,5(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-LLEntry3_8:
-	movb	%al,6(%edi)
-	movb	(%esi),%al
-LLEntry2_8:
-
-LEndSpan:
-
-//
-// clear s/z, t/z, 1/z from FP stack
-//
-	fstp %st(0)
-	fstp %st(0)
-	fstp %st(0)
-
-	movl	pspantemp,%ebx				// restore spans pointer
-	movl	espan_t_pnext(%ebx),%ebx	// point to next span
-	testl	%ebx,%ebx			// any more spans?
-	movb	%al,7(%edi)
-	jnz		LSpanLoop			// more spans
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-//----------------------------------------------------------------------
-// 8-bpp horizontal span z drawing codefor polygons, with no transparency.
-//
-// Assumes there is at least one span in pzspans, and that every span
-// contains at least one pixel
-//----------------------------------------------------------------------
-
-	.text
-
-// z-clamp on a non-negative gradient span
-LClamp:
-	movl	$0x40000000,%edx
-	xorl	%ebx,%ebx
-	fstp	%st(0)
-	jmp		LZDraw
-
-// z-clamp on a negative gradient span
-LClampNeg:
-	movl	$0x40000000,%edx
-	xorl	%ebx,%ebx
-	fstp	%st(0)
-	jmp		LZDrawNeg
-
-
-#define pzspans	4+16
-
-.globl C(D_DrawZSpans)
-C(D_DrawZSpans):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-	flds	C(d_zistepu)
-	movl	C(d_zistepu),%eax
-	movl	pzspans(%esp),%esi
-	testl	%eax,%eax
-	jz		LFNegSpan
-
-	fmuls	Float2ToThe31nd
-	fistpl	izistep		// note: we are relying on FP exceptions being turned
-						// off here to avoid range problems
-	movl	izistep,%ebx	// remains loaded for all spans
-
-LFSpanLoop:
-// set up the initial 1/z value
-	fildl	espan_t_v(%esi)
-	fildl	espan_t_u(%esi)
-	movl	espan_t_v(%esi),%ecx
-	movl	C(d_pzbuffer),%edi
-	fmuls	C(d_zistepu)
-	fxch	%st(1)
-	fmuls	C(d_zistepv)
-	fxch	%st(1)
-	fadds	C(d_ziorigin)
-	imull	C(d_zrowbytes),%ecx
-	faddp	%st(0),%st(1)
-
-// clamp if z is nearer than 2 (1/z > 0.5)
-	fcoms	float_point5
-	addl	%ecx,%edi
-	movl	espan_t_u(%esi),%edx
-	addl	%edx,%edx				// word count
-	movl	espan_t_count(%esi),%ecx
-	addl	%edx,%edi				// pdest = &pdestspan[scans->u];
-	pushl	%esi		// preserve spans pointer
-	fnstsw	%ax
-	testb	$0x45,%ah
-	jz		LClamp
-
-	fmuls	Float2ToThe31nd
-	fistpl	izi			// note: we are relying on FP exceptions being turned
-						// off here to avoid problems when the span is closer
-						// than 1/(2**31)
-	movl	izi,%edx
-
-// at this point:
-// %ebx = izistep
-// %ecx = count
-// %edx = izi
-// %edi = pdest
-
-LZDraw:
-
-// do a single pixel up front, if necessary to dword align the destination
-	testl	$2,%edi
-	jz		LFMiddle
-	movl	%edx,%eax
-	addl	%ebx,%edx
-	shrl	$16,%eax
-	decl	%ecx
-	movw	%ax,(%edi)
-	addl	$2,%edi
-
-// do middle a pair of aligned dwords at a time
-LFMiddle:
-	pushl	%ecx
-	shrl	$1,%ecx				// count / 2
-	jz		LFLast				// no aligned dwords to do
-	shrl	$1,%ecx				// (count / 2) / 2
-	jnc		LFMiddleLoop		// even number of aligned dwords to do
-
-	movl	%edx,%eax
-	addl	%ebx,%edx
-	shrl	$16,%eax
-	movl	%edx,%esi
-	addl	%ebx,%edx
-	andl	$0xFFFF0000,%esi
-	orl		%esi,%eax
-	movl	%eax,(%edi)
-	addl	$4,%edi
-	andl	%ecx,%ecx
-	jz		LFLast
-
-LFMiddleLoop:
-	movl	%edx,%eax
-	addl	%ebx,%edx
-	shrl	$16,%eax
-	movl	%edx,%esi
-	addl	%ebx,%edx
-	andl	$0xFFFF0000,%esi
-	orl		%esi,%eax
-	movl	%edx,%ebp
-	movl	%eax,(%edi)
-	addl	%ebx,%edx
-	shrl	$16,%ebp
-	movl	%edx,%esi
-	addl	%ebx,%edx
-	andl	$0xFFFF0000,%esi
-	orl		%esi,%ebp
-	movl	%ebp,4(%edi)	// FIXME: eliminate register contention
-	addl	$8,%edi
-
-	decl	%ecx
-	jnz		LFMiddleLoop
-
-LFLast:
-	popl	%ecx			// retrieve count
-	popl	%esi			// retrieve span pointer
-
-// do the last, unaligned pixel, if there is one
-	andl	$1,%ecx			// is there an odd pixel left to do?
-	jz		LFSpanDone		// no
-	shrl	$16,%edx
-	movw	%dx,(%edi)		// do the final pixel's z
-
-LFSpanDone:
-	movl	espan_t_pnext(%esi),%esi
-	testl	%esi,%esi
-	jnz		LFSpanLoop
-
-	jmp		LFDone
-
-LFNegSpan:
-	fmuls	FloatMinus2ToThe31nd
-	fistpl	izistep		// note: we are relying on FP exceptions being turned
-						// off here to avoid range problems
-	movl	izistep,%ebx	// remains loaded for all spans
-
-LFNegSpanLoop:
-// set up the initial 1/z value
-	fildl	espan_t_v(%esi)
-	fildl	espan_t_u(%esi)
-	movl	espan_t_v(%esi),%ecx
-	movl	C(d_pzbuffer),%edi
-	fmuls	C(d_zistepu)
-	fxch	%st(1)
-	fmuls	C(d_zistepv)
-	fxch	%st(1)
-	fadds	C(d_ziorigin)
-	imull	C(d_zrowbytes),%ecx
-	faddp	%st(0),%st(1)
-
-// clamp if z is nearer than 2 (1/z > 0.5)
-	fcoms	float_point5
-	addl	%ecx,%edi
-	movl	espan_t_u(%esi),%edx
-	addl	%edx,%edx				// word count
-	movl	espan_t_count(%esi),%ecx
-	addl	%edx,%edi				// pdest = &pdestspan[scans->u];
-	pushl	%esi		// preserve spans pointer
-	fnstsw	%ax
-	testb	$0x45,%ah
-	jz		LClampNeg
-
-	fmuls	Float2ToThe31nd
-	fistpl	izi			// note: we are relying on FP exceptions being turned
-						// off here to avoid problems when the span is closer
-						// than 1/(2**31)
-	movl	izi,%edx
-
-// at this point:
-// %ebx = izistep
-// %ecx = count
-// %edx = izi
-// %edi = pdest
-
-LZDrawNeg:
-
-// do a single pixel up front, if necessary to dword align the destination
-	testl	$2,%edi
-	jz		LFNegMiddle
-	movl	%edx,%eax
-	subl	%ebx,%edx
-	shrl	$16,%eax
-	decl	%ecx
-	movw	%ax,(%edi)
-	addl	$2,%edi
-
-// do middle a pair of aligned dwords at a time
-LFNegMiddle:
-	pushl	%ecx
-	shrl	$1,%ecx				// count / 2
-	jz		LFNegLast			// no aligned dwords to do
-	shrl	$1,%ecx				// (count / 2) / 2
-	jnc		LFNegMiddleLoop		// even number of aligned dwords to do
-
-	movl	%edx,%eax
-	subl	%ebx,%edx
-	shrl	$16,%eax
-	movl	%edx,%esi
-	subl	%ebx,%edx
-	andl	$0xFFFF0000,%esi
-	orl		%esi,%eax
-	movl	%eax,(%edi)
-	addl	$4,%edi
-	andl	%ecx,%ecx
-	jz		LFNegLast
-
-LFNegMiddleLoop:
-	movl	%edx,%eax
-	subl	%ebx,%edx
-	shrl	$16,%eax
-	movl	%edx,%esi
-	subl	%ebx,%edx
-	andl	$0xFFFF0000,%esi
-	orl		%esi,%eax
-	movl	%edx,%ebp
-	movl	%eax,(%edi)
-	subl	%ebx,%edx
-	shrl	$16,%ebp
-	movl	%edx,%esi
-	subl	%ebx,%edx
-	andl	$0xFFFF0000,%esi
-	orl		%esi,%ebp
-	movl	%ebp,4(%edi)	// FIXME: eliminate register contention
-	addl	$8,%edi
-
-	decl	%ecx
-	jnz		LFNegMiddleLoop
-
-LFNegLast:
-	popl	%ecx			// retrieve count
-	popl	%esi			// retrieve span pointer
-
-// do the last, unaligned pixel, if there is one
-	andl	$1,%ecx			// is there an odd pixel left to do?
-	jz		LFNegSpanDone	// no
-	shrl	$16,%edx
-	movw	%dx,(%edi)		// do the final pixel's z
-
-LFNegSpanDone:
-	movl	espan_t_pnext(%esi),%esi
-	testl	%esi,%esi
-	jnz		LFNegSpanLoop
-
-LFDone:
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-#endif	// id386
--- a/u/d_draw16.s
+++ /dev/null
@@ -1,955 +1,0 @@
-//
-// d_draw16.s
-// x86 assembly-language horizontal 8-bpp span-drawing code, with 16-pixel
-// subdivision.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef	id386
-
-//----------------------------------------------------------------------
-// 8-bpp horizontal span drawing code for polygons, with no transparency and
-// 16-pixel subdivision.
-//
-// Assumes there is at least one span in pspans, and that every span
-// contains at least one pixel
-//----------------------------------------------------------------------
-
-	.data
-
-	.text
-
-// out-of-line, rarely-needed clamping code
-
-LClampHigh0:
-	movl	C(bbextents),%esi
-	jmp		LClampReentry0
-LClampHighOrLow0:
-	jg		LClampHigh0
-	xorl	%esi,%esi
-	jmp		LClampReentry0
-
-LClampHigh1:
-	movl	C(bbextentt),%edx
-	jmp		LClampReentry1
-LClampHighOrLow1:
-	jg		LClampHigh1
-	xorl	%edx,%edx
-	jmp		LClampReentry1
-
-LClampLow2:
-	movl	$4096,%ebp
-	jmp		LClampReentry2
-LClampHigh2:
-	movl	C(bbextents),%ebp
-	jmp		LClampReentry2
-
-LClampLow3:
-	movl	$4096,%ecx
-	jmp		LClampReentry3
-LClampHigh3:
-	movl	C(bbextentt),%ecx
-	jmp		LClampReentry3
-
-LClampLow4:
-	movl	$4096,%eax
-	jmp		LClampReentry4
-LClampHigh4:
-	movl	C(bbextents),%eax
-	jmp		LClampReentry4
-
-LClampLow5:
-	movl	$4096,%ebx
-	jmp		LClampReentry5
-LClampHigh5:
-	movl	C(bbextentt),%ebx
-	jmp		LClampReentry5
-
-
-#define pspans	4+16
-
-	.align 4
-.globl C(D_DrawSpans16)
-C(D_DrawSpans16):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-//
-// set up scaled-by-16 steps, for 16-long segments; also set up cacheblock
-// and span list pointers
-//
-// TODO: any overlap from rearranging?
-	flds	C(d_sdivzstepu)
-	fmuls	fp_16
-	movl	C(cacheblock),%edx
-	flds	C(d_tdivzstepu)
-	fmuls	fp_16
-	movl	pspans(%esp),%ebx	// point to the first span descriptor
-	flds	C(d_zistepu)
-	fmuls	fp_16
-	movl	%edx,pbase			// pbase = cacheblock
-	fstps	zi16stepu
-	fstps	tdivz16stepu
-	fstps	sdivz16stepu
-
-LSpanLoop:
-//
-// set up the initial s/z, t/z, and 1/z on the FP stack, and generate the
-// initial s and t values
-//
-// FIXME: pipeline FILD?
-	fildl	espan_t_v(%ebx)
-	fildl	espan_t_u(%ebx)
-
-	fld		%st(1)			// dv | du | dv
-	fmuls	C(d_sdivzstepv)	// dv*d_sdivzstepv | du | dv
-	fld		%st(1)			// du | dv*d_sdivzstepv | du | dv
-	fmuls	C(d_sdivzstepu)	// du*d_sdivzstepu | dv*d_sdivzstepv | du | dv
-	fld		%st(2)			// du | du*d_sdivzstepu | dv*d_sdivzstepv | du | dv
-	fmuls	C(d_tdivzstepu)	// du*d_tdivzstepu | du*d_sdivzstepu |
-							//  dv*d_sdivzstepv | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu | du*d_tdivzstepu |
-							//  dv*d_sdivzstepv | du | dv
-	faddp	%st(0),%st(2)	// du*d_tdivzstepu |
-							//  du*d_sdivzstepu + dv*d_sdivzstepv | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fld		%st(3)			// dv | du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fmuls	C(d_tdivzstepv)	// dv*d_tdivzstepv |
-							//  du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  dv*d_tdivzstepv | du*d_tdivzstepu | du | dv
-	fadds	C(d_sdivzorigin)	// sdivz = d_sdivzorigin + dv*d_sdivzstepv +
-							//  du*d_sdivzstepu; stays in %st(2) at end
-	fxch	%st(4)			// dv | dv*d_tdivzstepv | du*d_tdivzstepu | du |
-							//  s/z
-	fmuls	C(d_zistepv)		// dv*d_zistepv | dv*d_tdivzstepv |
-							//  du*d_tdivzstepu | du | s/z
-	fxch	%st(1)			// dv*d_tdivzstepv |  dv*d_zistepv |
-							//  du*d_tdivzstepu | du | s/z
-	faddp	%st(0),%st(2)	// dv*d_zistepv |
-							//  dv*d_tdivzstepv + du*d_tdivzstepu | du | s/z
-	fxch	%st(2)			// du | dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  dv*d_zistepv | s/z
-	fmuls	C(d_zistepu)		// du*d_zistepu |
-							//  dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  dv*d_zistepv | s/z
-	fxch	%st(1)			// dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  du*d_zistepu | dv*d_zistepv | s/z
-	fadds	C(d_tdivzorigin)	// tdivz = d_tdivzorigin + dv*d_tdivzstepv +
-							//  du*d_tdivzstepu; stays in %st(1) at end
-	fxch	%st(2)			// dv*d_zistepv | du*d_zistepu | t/z | s/z
-	faddp	%st(0),%st(1)	// dv*d_zistepv + du*d_zistepu | t/z | s/z
-
-	flds	fp_64k			// fp_64k | dv*d_zistepv + du*d_zistepu | t/z | s/z
-	fxch	%st(1)			// dv*d_zistepv + du*d_zistepu | fp_64k | t/z | s/z
-	fadds	C(d_ziorigin)		// zi = d_ziorigin + dv*d_zistepv +
-							//  du*d_zistepu; stays in %st(0) at end
-							// 1/z | fp_64k | t/z | s/z
-//
-// calculate and clamp s & t
-//
-	fdivr	%st(0),%st(1)	// 1/z | z*64k | t/z | s/z
-
-//
-// point %edi to the first pixel in the span
-//
-	movl	C(d_viewbuffer),%ecx
-	movl	espan_t_v(%ebx),%eax
-	movl	%ebx,pspantemp	// preserve spans pointer
-
-	movl	C(tadjust),%edx
-	movl	C(sadjust),%esi
-	movl	C(d_scantable)(,%eax,4),%edi	// v * screenwidth
-	addl	%ecx,%edi
-	movl	espan_t_u(%ebx),%ecx
-	addl	%ecx,%edi				// pdest = &pdestspan[scans->u];
-	movl	espan_t_count(%ebx),%ecx
-
-//
-// now start the FDIV for the end of the span
-//
-	cmpl	$16,%ecx
-	ja		LSetupNotLast1
-
-	decl	%ecx
-	jz		LCleanup1		// if only one pixel, no need to start an FDIV
-	movl	%ecx,spancountminus1
-
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-
-	fildl	spancountminus1
-
-	flds	C(d_tdivzstepu)	// C(d_tdivzstepu) | spancountminus1
-	flds	C(d_zistepu)		// C(d_zistepu) | C(d_tdivzstepu) | spancountminus1
-	fmul	%st(2),%st(0)	// C(d_zistepu)*scm1 | C(d_tdivzstepu) | scm1
-	fxch	%st(1)			// C(d_tdivzstepu) | C(d_zistepu)*scm1 | scm1
-	fmul	%st(2),%st(0)	// C(d_tdivzstepu)*scm1 | C(d_zistepu)*scm1 | scm1
-	fxch	%st(2)			// scm1 | C(d_zistepu)*scm1 | C(d_tdivzstepu)*scm1
-	fmuls	C(d_sdivzstepu)	// C(d_sdivzstepu)*scm1 | C(d_zistepu)*scm1 |
-							//  C(d_tdivzstepu)*scm1
-	fxch	%st(1)			// C(d_zistepu)*scm1 | C(d_sdivzstepu)*scm1 |
-							//  C(d_tdivzstepu)*scm1
-	faddp	%st(0),%st(3)	// C(d_sdivzstepu)*scm1 | C(d_tdivzstepu)*scm1
-	fxch	%st(1)			// C(d_tdivzstepu)*scm1 | C(d_sdivzstepu)*scm1
-	faddp	%st(0),%st(3)	// C(d_sdivzstepu)*scm1
-	faddp	%st(0),%st(3)
-
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// this is what we've gone to all this trouble to
-							//  overlap
-	jmp		LFDIVInFlight1
-
-LCleanup1:
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-	jmp		LFDIVInFlight1
-
-	.align	4
-LSetupNotLast1:
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-
-	fadds	zi16stepu
-	fxch	%st(2)
-	fadds	sdivz16stepu
-	fxch	%st(2)
-	flds	tdivz16stepu
-	faddp	%st(0),%st(2)
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// z = 1/1/z
-							// this is what we've gone to all this trouble to
-							//  overlap
-LFDIVInFlight1:
-
-	addl	s,%esi
-	addl	t,%edx
-	movl	C(bbextents),%ebx
-	movl	C(bbextentt),%ebp
-	cmpl	%ebx,%esi
-	ja		LClampHighOrLow0
-LClampReentry0:
-	movl	%esi,s
-	movl	pbase,%ebx
-	shll	$16,%esi
-	cmpl	%ebp,%edx
-	movl	%esi,sfracf
-	ja		LClampHighOrLow1
-LClampReentry1:
-	movl	%edx,t
-	movl	s,%esi					// sfrac = scans->sfrac;
-	shll	$16,%edx
-	movl	t,%eax					// tfrac = scans->tfrac;
-	sarl	$16,%esi
-	movl	%edx,tfracf
-
-//
-// calculate the texture starting address
-//
-	sarl	$16,%eax
-	movl	C(cachewidth),%edx
-	imull	%edx,%eax				// (tfrac >> 16) * cachewidth
-	addl	%ebx,%esi
-	addl	%eax,%esi				// psource = pbase + (sfrac >> 16) +
-									//           ((tfrac >> 16) * cachewidth);
-//
-// determine whether last span or not
-//
-	cmpl	$16,%ecx
-	jna		LLastSegment
-
-//
-// not the last segment; do full 16-wide segment
-//
-LNotLastSegment:
-
-//
-// advance s/z, t/z, and 1/z, and calculate s & t at end of span and steps to
-// get there
-//
-
-// pick up after the FDIV that was left in flight previously
-
-	fld		%st(0)			// duplicate it
-	fmul	%st(4),%st(0)	// s = s/z * z
-	fxch	%st(1)
-	fmul	%st(3),%st(0)	// t = t/z * z
-	fxch	%st(1)
-	fistpl	snext
-	fistpl	tnext
-	movl	snext,%eax
-	movl	tnext,%edx
-
-	movb	(%esi),%bl	// get first source texel
-	subl	$16,%ecx		// count off this segments' pixels
-	movl	C(sadjust),%ebp
-	movl	%ecx,counttemp	// remember count of remaining pixels
-
-	movl	C(tadjust),%ecx
-	movb	%bl,(%edi)	// store first dest pixel
-
-	addl	%eax,%ebp
-	addl	%edx,%ecx
-
-	movl	C(bbextents),%eax
-	movl	C(bbextentt),%edx
-
-	cmpl	$4096,%ebp
-	jl		LClampLow2
-	cmpl	%eax,%ebp
-	ja		LClampHigh2
-LClampReentry2:
-
-	cmpl	$4096,%ecx
-	jl		LClampLow3
-	cmpl	%edx,%ecx
-	ja		LClampHigh3
-LClampReentry3:
-
-	movl	%ebp,snext
-	movl	%ecx,tnext
-
-	subl	s,%ebp
-	subl	t,%ecx
-	
-//
-// set up advancetable
-//
-	movl	%ecx,%eax
-	movl	%ebp,%edx
-	sarl	$20,%eax			// tstep >>= 16;
-	jz		LZero
-	sarl	$20,%edx			// sstep >>= 16;
-	movl	C(cachewidth),%ebx
-	imull	%ebx,%eax
-	jmp		LSetUp1
-
-LZero:
-	sarl	$20,%edx			// sstep >>= 16;
-	movl	C(cachewidth),%ebx
-
-LSetUp1:
-
-	addl	%edx,%eax			// add in sstep
-								// (tstep >> 16) * cachewidth + (sstep >> 16);
-	movl	tfracf,%edx
-	movl	%eax,advancetable+4	// advance base in t
-	addl	%ebx,%eax			// ((tstep >> 16) + 1) * cachewidth +
-								//  (sstep >> 16);
-	shll	$12,%ebp			// left-justify sstep fractional part
-	movl	sfracf,%ebx
-	shll	$12,%ecx			// left-justify tstep fractional part
-	movl	%eax,advancetable	// advance extra in t
-
-	movl	%ecx,tstep
-	addl	%ecx,%edx			// advance tfrac fractional part by tstep frac
-
-	sbbl	%ecx,%ecx			// turn tstep carry into -1 (0 if none)
-	addl	%ebp,%ebx			// advance sfrac fractional part by sstep frac
-	adcl	advancetable+4(,%ecx,4),%esi	// point to next source texel
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	(%esi),%al
-	addl	%ebp,%ebx
-	movb	%al,1(%edi)
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,2(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,3(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,4(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,5(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,6(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,7(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-
-//
-// start FDIV for end of next segment in flight, so it can overlap
-//
-	movl	counttemp,%ecx
-	cmpl	$16,%ecx			// more than one segment after this?
-	ja		LSetupNotLast2	// yes
-
-	decl	%ecx
-	jz		LFDIVInFlight2	// if only one pixel, no need to start an FDIV
-	movl	%ecx,spancountminus1
-	fildl	spancountminus1
-
-	flds	C(d_zistepu)		// C(d_zistepu) | spancountminus1
-	fmul	%st(1),%st(0)	// C(d_zistepu)*scm1 | scm1
-	flds	C(d_tdivzstepu)	// C(d_tdivzstepu) | C(d_zistepu)*scm1 | scm1
-	fmul	%st(2),%st(0)	// C(d_tdivzstepu)*scm1 | C(d_zistepu)*scm1 | scm1
-	fxch	%st(1)			// C(d_zistepu)*scm1 | C(d_tdivzstepu)*scm1 | scm1
-	faddp	%st(0),%st(3)	// C(d_tdivzstepu)*scm1 | scm1
-	fxch	%st(1)			// scm1 | C(d_tdivzstepu)*scm1
-	fmuls	C(d_sdivzstepu)	// C(d_sdivzstepu)*scm1 | C(d_tdivzstepu)*scm1
-	fxch	%st(1)			// C(d_tdivzstepu)*scm1 | C(d_sdivzstepu)*scm1
-	faddp	%st(0),%st(3)	// C(d_sdivzstepu)*scm1
-	flds	fp_64k			// 64k | C(d_sdivzstepu)*scm1
-	fxch	%st(1)			// C(d_sdivzstepu)*scm1 | 64k
-	faddp	%st(0),%st(4)	// 64k
-
-	fdiv	%st(1),%st(0)	// this is what we've gone to all this trouble to
-							//  overlap
-	jmp		LFDIVInFlight2
-
-	.align	4
-LSetupNotLast2:
-	fadds	zi16stepu
-	fxch	%st(2)
-	fadds	sdivz16stepu
-	fxch	%st(2)
-	flds	tdivz16stepu
-	faddp	%st(0),%st(2)
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// z = 1/1/z
-							// this is what we've gone to all this trouble to
-							//  overlap
-LFDIVInFlight2:
-	movl	%ecx,counttemp
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,8(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,9(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,10(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,11(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,12(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,13(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,14(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	$16,%edi
-	movl	%edx,tfracf
-	movl	snext,%edx
-	movl	%ebx,sfracf
-	movl	tnext,%ebx
-	movl	%edx,s
-	movl	%ebx,t
-
-	movl	counttemp,%ecx		// retrieve count
-
-//
-// determine whether last span or not
-//
-	cmpl	$16,%ecx				// are there multiple segments remaining?
-	movb	%al,-1(%edi)
-	ja		LNotLastSegment		// yes
-
-//
-// last segment of scan
-//
-LLastSegment:
-
-//
-// advance s/z, t/z, and 1/z, and calculate s & t at end of span and steps to
-// get there. The number of pixels left is variable, and we want to land on the
-// last pixel, not step one past it, so we can't run into arithmetic problems
-//
-	testl	%ecx,%ecx
-	jz		LNoSteps		// just draw the last pixel and we're done
-
-// pick up after the FDIV that was left in flight previously
-
-
-	fld		%st(0)			// duplicate it
-	fmul	%st(4),%st(0)	// s = s/z * z
-	fxch	%st(1)
-	fmul	%st(3),%st(0)	// t = t/z * z
-	fxch	%st(1)
-	fistpl	snext
-	fistpl	tnext
-
-	movb	(%esi),%al		// load first texel in segment
-	movl	C(tadjust),%ebx
-	movb	%al,(%edi)		// store first pixel in segment
-	movl	C(sadjust),%eax
-
-	addl	snext,%eax
-	addl	tnext,%ebx
-
-	movl	C(bbextents),%ebp
-	movl	C(bbextentt),%edx
-
-	cmpl	$4096,%eax
-	jl		LClampLow4
-	cmpl	%ebp,%eax
-	ja		LClampHigh4
-LClampReentry4:
-	movl	%eax,snext
-
-	cmpl	$4096,%ebx
-	jl		LClampLow5
-	cmpl	%edx,%ebx
-	ja		LClampHigh5
-LClampReentry5:
-
-	cmpl	$1,%ecx			// don't bother 
-	je		LOnlyOneStep	// if two pixels in segment, there's only one step,
-							//  of the segment length
-	subl	s,%eax
-	subl	t,%ebx
-
-	addl	%eax,%eax		// convert to 15.17 format so multiply by 1.31
-	addl	%ebx,%ebx		//  reciprocal yields 16.48
-
-	imull	reciprocal_table_16-8(,%ecx,4)	// sstep = (snext - s) /
-											//  (spancount-1)
-	movl	%edx,%ebp
-
-	movl	%ebx,%eax
-	imull	reciprocal_table_16-8(,%ecx,4)	// tstep = (tnext - t) /
-											//  (spancount-1)
-LSetEntryvec:
-//
-// set up advancetable
-//
-	movl	entryvec_table_16(,%ecx,4),%ebx
-	movl	%edx,%eax
-	movl	%ebx,jumptemp		// entry point into code for RET later
-	movl	%ebp,%ecx
-	sarl	$16,%edx			// tstep >>= 16;
-	movl	C(cachewidth),%ebx
-	sarl	$16,%ecx			// sstep >>= 16;
-	imull	%ebx,%edx
-
-	addl	%ecx,%edx			// add in sstep
-								// (tstep >> 16) * cachewidth + (sstep >> 16);
-	movl	tfracf,%ecx
-	movl	%edx,advancetable+4	// advance base in t
-	addl	%ebx,%edx			// ((tstep >> 16) + 1) * cachewidth +
-								//  (sstep >> 16);
-	shll	$16,%ebp			// left-justify sstep fractional part
-	movl	sfracf,%ebx
-	shll	$16,%eax			// left-justify tstep fractional part
-	movl	%edx,advancetable	// advance extra in t
-
-	movl	%eax,tstep
-	movl	%ecx,%edx
-	addl	%eax,%edx
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	jmp		*jumptemp			// jump to the number-of-pixels handler
-
-//----------------------------------------
-
-LNoSteps:
-	movb	(%esi),%al		// load first texel in segment
-	subl	$15,%edi			// adjust for hardwired offset
-	jmp		LEndSpan
-
-
-LOnlyOneStep:
-	subl	s,%eax
-	subl	t,%ebx
-	movl	%eax,%ebp
-	movl	%ebx,%edx
-	jmp		LSetEntryvec
-
-//----------------------------------------
-
-.globl	Entry2_16, Entry3_16, Entry4_16, Entry5_16
-.globl	Entry6_16, Entry7_16, Entry8_16, Entry9_16
-.globl	Entry10_16, Entry11_16, Entry12_16, Entry13_16
-.globl	Entry14_16, Entry15_16, Entry16_16
-
-Entry2_16:
-	subl	$14,%edi		// adjust for hardwired offsets
-	movb	(%esi),%al
-	jmp		LEntry2_16
-
-//----------------------------------------
-
-Entry3_16:
-	subl	$13,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	jmp		LEntry3_16
-
-//----------------------------------------
-
-Entry4_16:
-	subl	$12,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry4_16
-
-//----------------------------------------
-
-Entry5_16:
-	subl	$11,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry5_16
-
-//----------------------------------------
-
-Entry6_16:
-	subl	$10,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry6_16
-
-//----------------------------------------
-
-Entry7_16:
-	subl	$9,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry7_16
-
-//----------------------------------------
-
-Entry8_16:
-	subl	$8,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry8_16
-
-//----------------------------------------
-
-Entry9_16:
-	subl	$7,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry9_16
-
-//----------------------------------------
-
-Entry10_16:
-	subl	$6,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry10_16
-
-//----------------------------------------
-
-Entry11_16:
-	subl	$5,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry11_16
-
-//----------------------------------------
-
-Entry12_16:
-	subl	$4,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry12_16
-
-//----------------------------------------
-
-Entry13_16:
-	subl	$3,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry13_16
-
-//----------------------------------------
-
-Entry14_16:
-	subl	$2,%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry14_16
-
-//----------------------------------------
-
-Entry15_16:
-	decl	%edi		// adjust for hardwired offsets
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-	jmp		LEntry15_16
-
-//----------------------------------------
-
-Entry16_16:
-	addl	%eax,%edx
-	movb	(%esi),%al
-	sbbl	%ecx,%ecx
-	addl	%ebp,%ebx
-	adcl	advancetable+4(,%ecx,4),%esi
-
-	addl	tstep,%edx
-	sbbl	%ecx,%ecx
-	movb	%al,1(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry15_16:
-	sbbl	%ecx,%ecx
-	movb	%al,2(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry14_16:
-	sbbl	%ecx,%ecx
-	movb	%al,3(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry13_16:
-	sbbl	%ecx,%ecx
-	movb	%al,4(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry12_16:
-	sbbl	%ecx,%ecx
-	movb	%al,5(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry11_16:
-	sbbl	%ecx,%ecx
-	movb	%al,6(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry10_16:
-	sbbl	%ecx,%ecx
-	movb	%al,7(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry9_16:
-	sbbl	%ecx,%ecx
-	movb	%al,8(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry8_16:
-	sbbl	%ecx,%ecx
-	movb	%al,9(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry7_16:
-	sbbl	%ecx,%ecx
-	movb	%al,10(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry6_16:
-	sbbl	%ecx,%ecx
-	movb	%al,11(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry5_16:
-	sbbl	%ecx,%ecx
-	movb	%al,12(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-	addl	tstep,%edx
-LEntry4_16:
-	sbbl	%ecx,%ecx
-	movb	%al,13(%edi)
-	addl	%ebp,%ebx
-	movb	(%esi),%al
-	adcl	advancetable+4(,%ecx,4),%esi
-LEntry3_16:
-	movb	%al,14(%edi)
-	movb	(%esi),%al
-LEntry2_16:
-
-LEndSpan:
-
-//
-// clear s/z, t/z, 1/z from FP stack
-//
-	fstp %st(0)
-	fstp %st(0)
-	fstp %st(0)
-
-	movl	pspantemp,%ebx				// restore spans pointer
-	movl	espan_t_pnext(%ebx),%ebx	// point to next span
-	testl	%ebx,%ebx			// any more spans?
-	movb	%al,15(%edi)
-	jnz		LSpanLoop			// more spans
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-#endif	// id386
--- a/u/d_ifacea.h
+++ /dev/null
@@ -1,79 +1,0 @@
-//
-// d_ifacea.h
-//
-// Include file for asm driver interface.
-//
-
-//
-// !!! note that this file must match the corresponding C structures in
-// d_iface.h at all times !!!
-//
-
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define ALIAS_ONSEAM				0x0020
-
-// !!! if this is changed, it must be changed in d_iface.h too !!!
-#define TURB_TEX_SIZE	64		// base turbulent texture size
-
-// !!! if this is changed, it must be changed in d_iface.h too !!!
-#define	CYCLE	128
-
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define	MAXHEIGHT	4096
-
-// !!! if this is changed, it must be changed in quakedef.h too !!!
-#define CACHE_SIZE	32		// used to align key data structures
-
-// particle_t structure
-// !!! if this is changed, it must be changed in d_iface.h too !!!
-// driver-usable fields
-#define pt_org				0
-#define pt_color			12
-// drivers never touch the following fields
-#define pt_next				16
-#define pt_vel				20
-#define pt_ramp				32
-#define pt_die				36
-#define pt_type				40
-#define pt_size				44
-
-#define PARTICLE_Z_CLIP	8.0
-
-// finalvert_t structure
-// !!! if this is changed, it must be changed in d_iface.h too !!!
-#define fv_v				0	// !!! if this is moved, cases where the !!!
-								// !!! address of this field is pushed in !!!
-								// !!! d_polysa.s must be changed !!!
-#define fv_flags			24
-#define fv_reserved			28
-#define fv_size				32
-#define fv_shift			5
-
-
-// stvert_t structure
-// !!! if this is changed, it must be changed in modelgen.h too !!!
-#define stv_onseam	0
-#define stv_s		4
-#define stv_t		8
-#define stv_size	12
-
-
-// trivertx_t structure
-// !!! if this is changed, it must be changed in modelgen.h too !!!
-#define tv_v				0
-#define tv_lightnormalindex	3
-#define tv_size				4
-
-// affinetridesc_t structure
-// !!! if this is changed, it must be changed in d_iface.h too !!!
-#define atd_pskin			0
-#define atd_pskindesc		4
-#define atd_skinwidth		8
-#define atd_skinheight		12
-#define atd_ptriangles		16
-#define atd_pfinalverts		20
-#define atd_numtriangles	24
-#define atd_drawtype		28
-#define atd_seamfixupX16	32
-#define atd_size			36
-
--- a/u/d_parta.s
+++ /dev/null
@@ -1,458 +1,0 @@
-//
-// d_parta.s
-// x86 assembly-language 8-bpp particle-drawing code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "d_ifacea.h"
-#include "asm_draw.h"
-
-#ifdef	id386
-
-//----------------------------------------------------------------------
-// 8-bpp particle drawing code.
-//----------------------------------------------------------------------
-
-//FIXME: comments, full optimization
-
-//----------------------------------------------------------------------
-// 8-bpp particle queueing code.
-//----------------------------------------------------------------------
-
-	.text
-
-#define P	12+4
-
-	.align 4
-.globl C(D_DrawParticle)
-C(D_DrawParticle):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi				// preserve register variables
-	pushl	%ebx
-
-	movl	P(%esp),%edi
-
-// FIXME: better FP overlap in general here
-
-// transform point
-//	VectorSubtract (p->org, r_origin, local);
-	flds	C(r_origin)
-	fsubrs	pt_org(%edi)
-	flds	pt_org+4(%edi)
-	fsubs	C(r_origin)+4
-	flds	pt_org+8(%edi)
-	fsubs	C(r_origin)+8
-	fxch	%st(2)			// local[0] | local[1] | local[2]
-
-//	transformed[2] = DotProduct(local, r_ppn);		
-	flds	C(r_ppn)		// r_ppn[0] | local[0] | local[1] | local[2]
-	fmul	%st(1),%st(0)	// dot0 | local[0] | local[1] | local[2]
-	flds	C(r_ppn)+4	// r_ppn[1] | dot0 | local[0] | local[1] | local[2]
-	fmul	%st(3),%st(0)	// dot1 | dot0 | local[0] | local[1] | local[2]
-	flds	C(r_ppn)+8	// r_ppn[2] | dot1 | dot0 | local[0] |
-						//  local[1] | local[2]
-	fmul	%st(5),%st(0)	// dot2 | dot1 | dot0 | local[0] | local[1] | local[2]
-	fxch	%st(2)		// dot0 | dot1 | dot2 | local[0] | local[1] | local[2]
-	faddp	%st(0),%st(1) // dot0 + dot1 | dot2 | local[0] | local[1] |
-						  //  local[2]
-	faddp	%st(0),%st(1) // z | local[0] | local[1] | local[2]
-	fld		%st(0)		// z | z | local[0] | local[1] |
-						//  local[2]
-	fdivrs	float_1		// 1/z | z | local[0] | local[1] | local[2]
-	fxch	%st(1)		// z | 1/z | local[0] | local[1] | local[2]
-
-//	if (transformed[2] < PARTICLE_Z_CLIP)
-//		return;
-	fcomps	float_particle_z_clip	// 1/z | local[0] | local[1] | local[2]
-	fxch	%st(3)					// local[2] | local[0] | local[1] | 1/z
-
-	flds	C(r_pup)	// r_pup[0] | local[2] | local[0] | local[1] | 1/z
-	fmul	%st(2),%st(0)	// dot0 | local[2] | local[0] | local[1] | 1/z 
-	flds	C(r_pup)+4	// r_pup[1] | dot0 | local[2] | local[0] |
-						//  local[1] | 1/z 
-
-	fnstsw	%ax
-	testb	$1,%ah
-	jnz		LPop6AndDone
-
-//	transformed[1] = DotProduct(local, r_pup);
-	fmul	%st(4),%st(0)	// dot1 | dot0 | local[2] | local[0] | local[1] | 1/z 
-	flds	C(r_pup)+8	// r_pup[2] | dot1 | dot0 | local[2] |
-						//  local[0] | local[1] | 1/z 
-	fmul	%st(3),%st(0)	// dot2 | dot1 | dot0 | local[2] | local[0] |
-						//  local[1] | 1/z 
-	fxch	%st(2)		// dot0 | dot1 | dot2 | local[2] | local[0] |
-						//  local[1] | 1/z 
-	faddp	%st(0),%st(1) // dot0 + dot1 | dot2 | local[2] | local[0] |
-						//  local[1] | 1/z 
-	faddp	%st(0),%st(1) // y | local[2] | local[0] | local[1] | 1/z 
-	fxch	%st(3)		// local[1] | local[2] | local[0] | y | 1/z 
-
-//	transformed[0] = DotProduct(local, r_pright);
-	fmuls	C(r_pright)+4	// dot1 | local[2] | local[0] | y | 1/z
-	fxch	%st(2)		// local[0] | local[2] | dot1 | y | 1/z
-	fmuls	C(r_pright)	// dot0 | local[2] | dot1 | y | 1/z
-	fxch	%st(1)		// local[2] | dot0 | dot1 | y | 1/z
-	fmuls	C(r_pright)+8	// dot2 | dot0 | dot1 | y | 1/z
-	fxch	%st(2)		// dot1 | dot0 | dot2 | y | 1/z
-	faddp	%st(0),%st(1) // dot1 + dot0 | dot2 | y | 1/z
-
-	faddp	%st(0),%st(1)	// x | y | 1/z
-	fxch	%st(1)			// y | x | 1/z
-
-// project the point
-	fmul	%st(2),%st(0)	// y/z | x | 1/z
-	fxch	%st(1)			// x | y/z | 1/z
-	fmul	%st(2),%st(0)	// x/z | y/z | 1/z
-	fxch	%st(1)			// y/z | x/z | 1/z
-	fsubrs	C(ycenter)		// v | x/z | 1/z
-	fxch	%st(1)			// x/z | v | 1/z
-	fadds	C(xcenter)		// u | v | 1/z
-// FIXME: preadjust xcenter and ycenter
-	fxch	%st(1)			// v | u | 1/z
-	fadds	float_point5	// v | u | 1/z
-	fxch	%st(1)			// u | v | 1/z
-	fadds	float_point5	// u | v | 1/z
-	fxch	%st(2)			// 1/z | v | u
-	fmuls	DP_32768		// 1/z * 0x8000 | v | u
-	fxch	%st(2)			// u | v | 1/z * 0x8000
-
-// FIXME: use Terje's fp->int trick here?
-// FIXME: check we're getting proper rounding here
-	fistpl	DP_u			// v | 1/z * 0x8000
-	fistpl	DP_v			// 1/z * 0x8000
-
-	movl	DP_u,%eax
-	movl	DP_v,%edx
-
-// if ((v > d_vrectbottom_particle) || 
-// 	(u > d_vrectright_particle) ||
-// 	(v < d_vrecty) ||
-// 	(u < d_vrectx))
-// {
-// 	continue;
-// }
-
-	movl	C(d_vrectbottom_particle),%ebx
-	movl	C(d_vrectright_particle),%ecx
-	cmpl	%ebx,%edx
-	jg		LPop1AndDone
-	cmpl	%ecx,%eax
-	jg		LPop1AndDone
-	movl	C(d_vrecty),%ebx
-	movl	C(d_vrectx),%ecx
-	cmpl	%ebx,%edx
-	jl		LPop1AndDone
-
-	cmpl	%ecx,%eax
-	jl		LPop1AndDone
-
-	flds	pt_color(%edi)	// color | 1/z * 0x8000
-// FIXME: use Terje's fast fp->int trick?
-	fistpl	DP_Color		// 1/z * 0x8000
-
-	movl	C(d_viewbuffer),%ebx
-
-	addl	%eax,%ebx
-	movl	C(d_scantable)(,%edx,4),%edi		// point to the pixel
-
-	imull	C(d_zrowbytes),%edx		// point to the z pixel
-
-	leal	(%edx,%eax,2),%edx
-	movl	C(d_pzbuffer),%eax
-
-	fistpl	izi
-
-	addl	%ebx,%edi
-	addl	%eax,%edx
-
-// pix = izi >> d_pix_shift;
-
-	movl	izi,%eax
-	movl	C(d_pix_shift),%ecx
-	shrl	%cl,%eax
-	movl	izi,%ebp
-
-// if (pix < d_pix_min)
-// 		pix = d_pix_min;
-// else if (pix > d_pix_max)
-//  	pix = d_pix_max;
-
-	movl	C(d_pix_min),%ebx
-	movl	C(d_pix_max),%ecx
-	cmpl	%ebx,%eax
-	jnl		LTestPixMax
-	movl	%ebx,%eax
-	jmp		LTestDone
-
-LTestPixMax:
-	cmpl	%ecx,%eax
-	jng		LTestDone
-	movl	%ecx,%eax
-LTestDone:
-
-	movb	DP_Color,%ch
-
-	movl	C(d_y_aspect_shift),%ebx
-	testl	%ebx,%ebx
-	jnz		LDefault
-
-	cmpl	$4,%eax
-	ja		LDefault
-
-	jmp		DP_EntryTable-4(,%eax,4)
-
-// 1x1
-.globl	DP_1x1
-DP_1x1:
-	cmpw	%bp,(%edx)		// just one pixel to do
-	jg		LDone
-	movw	%bp,(%edx)
-	movb	%ch,(%edi)
-	jmp		LDone
-
-// 2x2
-.globl	DP_2x2
-DP_2x2:
-	pushl	%esi
-	movl	C(screenwidth),%ebx
-	movl	C(d_zrowbytes),%esi
-
-	cmpw	%bp,(%edx)
-	jg		L2x2_1
-	movw	%bp,(%edx)
-	movb	%ch,(%edi)
-L2x2_1:
-	cmpw	%bp,2(%edx)
-	jg		L2x2_2
-	movw	%bp,2(%edx)
-	movb	%ch,1(%edi)
-L2x2_2:
-	cmpw	%bp,(%edx,%esi,1)
-	jg		L2x2_3
-	movw	%bp,(%edx,%esi,1)
-	movb	%ch,(%edi,%ebx,1)
-L2x2_3:
-	cmpw	%bp,2(%edx,%esi,1)
-	jg		L2x2_4
-	movw	%bp,2(%edx,%esi,1)
-	movb	%ch,1(%edi,%ebx,1)
-L2x2_4:
-
-	popl	%esi
-	jmp		LDone
-
-// 3x3
-.globl	DP_3x3
-DP_3x3:
-	pushl	%esi
-	movl	C(screenwidth),%ebx
-	movl	C(d_zrowbytes),%esi
-
-	cmpw	%bp,(%edx)
-	jg		L3x3_1
-	movw	%bp,(%edx)
-	movb	%ch,(%edi)
-L3x3_1:
-	cmpw	%bp,2(%edx)
-	jg		L3x3_2
-	movw	%bp,2(%edx)
-	movb	%ch,1(%edi)
-L3x3_2:
-	cmpw	%bp,4(%edx)
-	jg		L3x3_3
-	movw	%bp,4(%edx)
-	movb	%ch,2(%edi)
-L3x3_3:
-
-	cmpw	%bp,(%edx,%esi,1)
-	jg		L3x3_4
-	movw	%bp,(%edx,%esi,1)
-	movb	%ch,(%edi,%ebx,1)
-L3x3_4:
-	cmpw	%bp,2(%edx,%esi,1)
-	jg		L3x3_5
-	movw	%bp,2(%edx,%esi,1)
-	movb	%ch,1(%edi,%ebx,1)
-L3x3_5:
-	cmpw	%bp,4(%edx,%esi,1)
-	jg		L3x3_6
-	movw	%bp,4(%edx,%esi,1)
-	movb	%ch,2(%edi,%ebx,1)
-L3x3_6:
-
-	cmpw	%bp,(%edx,%esi,2)
-	jg		L3x3_7
-	movw	%bp,(%edx,%esi,2)
-	movb	%ch,(%edi,%ebx,2)
-L3x3_7:
-	cmpw	%bp,2(%edx,%esi,2)
-	jg		L3x3_8
-	movw	%bp,2(%edx,%esi,2)
-	movb	%ch,1(%edi,%ebx,2)
-L3x3_8:
-	cmpw	%bp,4(%edx,%esi,2)
-	jg		L3x3_9
-	movw	%bp,4(%edx,%esi,2)
-	movb	%ch,2(%edi,%ebx,2)
-L3x3_9:
-
-	popl	%esi
-	jmp		LDone
-
-
-// 4x4
-.globl	DP_4x4
-DP_4x4:
-	pushl	%esi
-	movl	C(screenwidth),%ebx
-	movl	C(d_zrowbytes),%esi
-
-	cmpw	%bp,(%edx)
-	jg		L4x4_1
-	movw	%bp,(%edx)
-	movb	%ch,(%edi)
-L4x4_1:
-	cmpw	%bp,2(%edx)
-	jg		L4x4_2
-	movw	%bp,2(%edx)
-	movb	%ch,1(%edi)
-L4x4_2:
-	cmpw	%bp,4(%edx)
-	jg		L4x4_3
-	movw	%bp,4(%edx)
-	movb	%ch,2(%edi)
-L4x4_3:
-	cmpw	%bp,6(%edx)
-	jg		L4x4_4
-	movw	%bp,6(%edx)
-	movb	%ch,3(%edi)
-L4x4_4:
-
-	cmpw	%bp,(%edx,%esi,1)
-	jg		L4x4_5
-	movw	%bp,(%edx,%esi,1)
-	movb	%ch,(%edi,%ebx,1)
-L4x4_5:
-	cmpw	%bp,2(%edx,%esi,1)
-	jg		L4x4_6
-	movw	%bp,2(%edx,%esi,1)
-	movb	%ch,1(%edi,%ebx,1)
-L4x4_6:
-	cmpw	%bp,4(%edx,%esi,1)
-	jg		L4x4_7
-	movw	%bp,4(%edx,%esi,1)
-	movb	%ch,2(%edi,%ebx,1)
-L4x4_7:
-	cmpw	%bp,6(%edx,%esi,1)
-	jg		L4x4_8
-	movw	%bp,6(%edx,%esi,1)
-	movb	%ch,3(%edi,%ebx,1)
-L4x4_8:
-
-	leal	(%edx,%esi,2),%edx
-	leal	(%edi,%ebx,2),%edi
-
-	cmpw	%bp,(%edx)
-	jg		L4x4_9
-	movw	%bp,(%edx)
-	movb	%ch,(%edi)
-L4x4_9:
-	cmpw	%bp,2(%edx)
-	jg		L4x4_10
-	movw	%bp,2(%edx)
-	movb	%ch,1(%edi)
-L4x4_10:
-	cmpw	%bp,4(%edx)
-	jg		L4x4_11
-	movw	%bp,4(%edx)
-	movb	%ch,2(%edi)
-L4x4_11:
-	cmpw	%bp,6(%edx)
-	jg		L4x4_12
-	movw	%bp,6(%edx)
-	movb	%ch,3(%edi)
-L4x4_12:
-
-	cmpw	%bp,(%edx,%esi,1)
-	jg		L4x4_13
-	movw	%bp,(%edx,%esi,1)
-	movb	%ch,(%edi,%ebx,1)
-L4x4_13:
-	cmpw	%bp,2(%edx,%esi,1)
-	jg		L4x4_14
-	movw	%bp,2(%edx,%esi,1)
-	movb	%ch,1(%edi,%ebx,1)
-L4x4_14:
-	cmpw	%bp,4(%edx,%esi,1)
-	jg		L4x4_15
-	movw	%bp,4(%edx,%esi,1)
-	movb	%ch,2(%edi,%ebx,1)
-L4x4_15:
-	cmpw	%bp,6(%edx,%esi,1)
-	jg		L4x4_16
-	movw	%bp,6(%edx,%esi,1)
-	movb	%ch,3(%edi,%ebx,1)
-L4x4_16:
-
-	popl	%esi
-	jmp		LDone
-
-// default case, handling any size particle
-LDefault:
-
-// count = pix << d_y_aspect_shift;
-
-	movl	%eax,%ebx
-	movl	%eax,DP_Pix
-	movb	C(d_y_aspect_shift),%cl
-	shll	%cl,%ebx
-
-// for ( ; count ; count--, pz += d_zwidth, pdest += screenwidth)
-// {
-// 	for (i=0 ; i<pix ; i++)
-// 	{
-// 		if (pz[i] <= izi)
-// 		{
-// 			pz[i] = izi;
-// 			pdest[i] = color;
-// 		}
-// 	}
-// }
-
-LGenRowLoop:
-	movl	DP_Pix,%eax
-
-LGenColLoop:
-	cmpw	%bp,-2(%edx,%eax,2)
-	jg		LGSkip
-	movw	%bp,-2(%edx,%eax,2)
-	movb	%ch,-1(%edi,%eax,1)
-LGSkip:
-	decl	%eax			// --pix
-	jnz		LGenColLoop
-
-	addl	C(d_zrowbytes),%edx
-	addl	C(screenwidth),%edi
-
-	decl	%ebx			// --count
-	jnz		LGenRowLoop
-
-LDone:
-	popl	%ebx				// restore register variables
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-LPop6AndDone:
-	fstp	%st(0)
-	fstp	%st(0)
-	fstp	%st(0)
-	fstp	%st(0)
-	fstp	%st(0)
-LPop1AndDone:
-	fstp	%st(0)
-	jmp		LDone
-
-#endif	// id386
--- a/u/d_polysa.s
+++ /dev/null
@@ -1,1723 +1,0 @@
-//
-// d_polysa.s
-// x86 assembly-language polygon model drawing code
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef	id386
-
-// !!! if this is changed, it must be changed in d_polyse.c too !!!
-#define DPS_MAXSPANS			MAXHEIGHT+1	
-									// 1 extra for spanpackage that marks end
-
-//#define	SPAN_SIZE	(((DPS_MAXSPANS + 1 + ((CACHE_SIZE - 1) / spanpackage_t_size)) + 1) * spanpackage_t_size)
-#define SPAN_SIZE (1024+1+1+1)*32
-
-
-	.data
-
-	.align	4
-p10_minus_p20:	.single		0
-p01_minus_p21:	.single		0
-temp0:			.single		0
-temp1:			.single		0
-Ltemp:			.single		0
-
-aff8entryvec_table:	.long	LDraw8, LDraw7, LDraw6, LDraw5
-				.long	LDraw4, LDraw3, LDraw2, LDraw1
-
-lzistepx:		.long	0
-
-
-	.text
-
-	.extern C(D_PolysetSetEdgeTable)
-	.extern C(D_RasterizeAliasPolySmooth)
-
-//----------------------------------------------------------------------
-// affine triangle gradient calculation code
-//----------------------------------------------------------------------
-
-#define skinwidth	4+0
-
-.globl C(D_PolysetCalcGradients)
-C(D_PolysetCalcGradients):
-
-//	p00_minus_p20 = r_p0[0] - r_p2[0];
-//	p01_minus_p21 = r_p0[1] - r_p2[1];
-//	p10_minus_p20 = r_p1[0] - r_p2[0];
-//	p11_minus_p21 = r_p1[1] - r_p2[1];
-//
-//	xstepdenominv = 1.0 / (p10_minus_p20 * p01_minus_p21 -
-//			     p00_minus_p20 * p11_minus_p21);
-//
-//	ystepdenominv = -xstepdenominv;
-
-	fildl	C(r_p0)+0		// r_p0[0]
-	fildl	C(r_p2)+0		// r_p2[0] | r_p0[0]
-	fildl	C(r_p0)+4		// r_p0[1] | r_p2[0] | r_p0[0]
-	fildl	C(r_p2)+4		// r_p2[1] | r_p0[1] | r_p2[0] | r_p0[0]
-	fildl	C(r_p1)+0		// r_p1[0] | r_p2[1] | r_p0[1] | r_p2[0] | r_p0[0]
-	fildl	C(r_p1)+4		// r_p1[1] | r_p1[0] | r_p2[1] | r_p0[1] |
-							//  r_p2[0] | r_p0[0]
-	fxch	%st(3)			// r_p0[1] | r_p1[0] | r_p2[1] | r_p1[1] |
-							//  r_p2[0] | r_p0[0]
-	fsub	%st(2),%st(0)	// p01_minus_p21 | r_p1[0] | r_p2[1] | r_p1[1] |
-							//  r_p2[0] | r_p0[0]
-	fxch	%st(1)			// r_p1[0] | p01_minus_p21 | r_p2[1] | r_p1[1] |
-							//  r_p2[0] | r_p0[0]
-	fsub	%st(4),%st(0)	// p10_minus_p20 | p01_minus_p21 | r_p2[1] |
-							//  r_p1[1] | r_p2[0] | r_p0[0]
-	fxch	%st(5)			// r_p0[0] | p01_minus_p21 | r_p2[1] |
-							//  r_p1[1] | r_p2[0] | p10_minus_p20
-	fsubp	%st(0),%st(4)	// p01_minus_p21 | r_p2[1] | r_p1[1] |
-							//  p00_minus_p20 | p10_minus_p20
-	fxch	%st(2)			// r_p1[1] | r_p2[1] | p01_minus_p21 |
-							//  p00_minus_p20 | p10_minus_p20
-	fsubp	%st(0),%st(1)	// p11_minus_p21 | p01_minus_p21 |
-							//  p00_minus_p20 | p10_minus_p20
-	fxch	%st(1)			// p01_minus_p21 | p11_minus_p21 |
-							//  p00_minus_p20 | p10_minus_p20
-	flds	C(d_xdenom)		// d_xdenom | p01_minus_p21 | p11_minus_p21 |
-							//  p00_minus_p20 | p10_minus_p20
-	fxch	%st(4)			// p10_minus_p20 | p01_minus_p21 | p11_minus_p21 |
-							//  p00_minus_p20 | d_xdenom
-	fstps	p10_minus_p20	// p01_minus_p21 | p11_minus_p21 |
-							//  p00_minus_p20 | d_xdenom
-	fstps	p01_minus_p21	// p11_minus_p21 | p00_minus_p20 | xstepdenominv
-	fxch	%st(2)			// xstepdenominv | p00_minus_p20 | p11_minus_p21
-
-//// ceil () for light so positive steps are exaggerated, negative steps
-//// diminished,  pushing us away from underflow toward overflow. Underflow is
-//// very visible, overflow is very unlikely, because of ambient lighting
-//	t0 = r_p0[4] - r_p2[4];
-//	t1 = r_p1[4] - r_p2[4];
-
-	fildl	C(r_p2)+16		// r_p2[4] | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fildl	C(r_p0)+16		// r_p0[4] | r_p2[4] | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fildl	C(r_p1)+16		// r_p1[4] | r_p0[4] | r_p2[4] | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// r_p2[4] | r_p0[4] | r_p1[4] | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fld		%st(0)			// r_p2[4] | r_p2[4] | r_p0[4] | r_p1[4] |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fsubrp	%st(0),%st(2)	// r_p2[4] | t0 | r_p1[4] | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fsubrp	%st(0),%st(2)	// t0 | t1 | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-
-//	r_lstepx = (int)
-//			ceil((t1 * p01_minus_p21 - t0 * p11_minus_p21) * xstepdenominv);
-//	r_lstepy = (int)
-//			ceil((t1 * p00_minus_p20 - t0 * p10_minus_p20) * ystepdenominv);
-
-	fld		%st(0)			// t0 | t0 | t1 | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmul	%st(5),%st(0)	// t0*p11_minus_p21 | t0 | t1 | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// t1 | t0 | t0*p11_minus_p21 | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fld		%st(0)			// t1 | t1 | t0 | t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmuls	p01_minus_p21	// t1*p01_minus_p21 | t1 | t0 | t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// t0 | t1 | t1*p01_minus_p21 | t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmuls	p10_minus_p20	// t0*p10_minus_p20 | t1 | t1*p01_minus_p21 |
-							//  t0*p11_minus_p21 | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fxch	%st(1)			// t1 | t0*p10_minus_p20 | t1*p01_minus_p21 |
-							//  t0*p11_minus_p21 | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fmul	%st(5),%st(0)	// t1*p00_minus_p20 | t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 | t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// t1*p01_minus_p21 | t0*p10_minus_p20 |
-							//  t1*p00_minus_p20 | t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fsubp	%st(0),%st(3)	// t0*p10_minus_p20 | t1*p00_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fsubrp	%st(0),%st(1)	// t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fld		%st(2)			// xstepdenominv |
-							//  t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmuls	float_minus_1	// ystepdenominv |
-							//  t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmul	%st(3),%st(0)	// (t1*p01_minus_p21 - t0*p11_minus_p21)*
-							//   xstepdenominv |
-							//  t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//   | ystepdenominv | xstepdenominv |
-							//   p00_minus_p20 | p11_minus_p21
-	fxch	%st(1)			// t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//  (t1*p01_minus_p21 - t0*p11_minus_p21)*
-							//   xstepdenominv | ystepdenominv |
-							//   xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmul	%st(2),%st(0)	// (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//  ystepdenominv |
-							//  (t1*p01_minus_p21 - t0*p11_minus_p21)*
-							//  xstepdenominv | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fldcw	ceil_cw
-	fistpl	C(r_lstepy)		// r_lstepx | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fistpl	C(r_lstepx)		// ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fldcw	single_cw
-
-//	t0 = r_p0[2] - r_p2[2];
-//	t1 = r_p1[2] - r_p2[2];
-
-	fildl	C(r_p2)+8		// r_p2[2] | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fildl	C(r_p0)+8		// r_p0[2] | r_p2[2] | ystepdenominv |
-							//   xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fildl	C(r_p1)+8		// r_p1[2] | r_p0[2] | r_p2[2] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// r_p2[2] | r_p0[2] | r_p1[2] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fld		%st(0)			// r_p2[2] | r_p2[2] | r_p0[2] | r_p1[2] |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fsubrp	%st(0),%st(2)	// r_p2[2] | t0 | r_p1[2] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fsubrp	%st(0),%st(2)	// t0 | t1 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-
-//	r_sstepx = (int)((t1 * p01_minus_p21 - t0 * p11_minus_p21) *
-//			xstepdenominv);
-//	r_sstepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) *
-//			ystepdenominv);
-
-	fld		%st(0)			// t0 | t0 | t1 | ystepdenominv | xstepdenominv
-	fmul	%st(6),%st(0)	// t0*p11_minus_p21 | t0 | t1 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// t1 | t0 | t0*p11_minus_p21 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fld		%st(0)			// t1 | t1 | t0 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmuls	p01_minus_p21	// t1*p01_minus_p21 | t1 | t0 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fxch	%st(2)			// t0 | t1 | t1*p01_minus_p21 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmuls	p10_minus_p20	// t0*p10_minus_p20 | t1 | t1*p01_minus_p21 |
-							//  t0*p11_minus_p21 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(1)			// t1 | t0*p10_minus_p20 | t1*p01_minus_p21 |
-							//  t0*p11_minus_p21 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmul	%st(6),%st(0)	// t1*p00_minus_p20 | t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fxch	%st(2)			// t1*p01_minus_p21 | t0*p10_minus_p20 |
-							//  t1*p00_minus_p20 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fsubp	%st(0),%st(3)	// t0*p10_minus_p20 | t1*p00_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fsubrp	%st(0),%st(1)	// t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmul	%st(2),%st(0)	// (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//   ystepdenominv |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fxch	%st(1)			// t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//   ystepdenominv | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmul	%st(3),%st(0)	// (t1*p01_minus_p21 - t0*p11_minus_p21)*
-							//  xstepdenominv |
-							//  (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//  ystepdenominv | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(1)			// (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//  ystepdenominv |
-							//  (t1*p01_minus_p21 - t0*p11_minus_p21)*
-							//  xstepdenominv | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fistpl	C(r_sstepy)		// r_sstepx | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fistpl	C(r_sstepx)		// ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-
-//	t0 = r_p0[3] - r_p2[3];
-//	t1 = r_p1[3] - r_p2[3];
-
-	fildl	C(r_p2)+12		// r_p2[3] | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fildl	C(r_p0)+12		// r_p0[3] | r_p2[3] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fildl	C(r_p1)+12		// r_p1[3] | r_p0[3] | r_p2[3] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// r_p2[3] | r_p0[3] | r_p1[3] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fld		%st(0)			// r_p2[3] | r_p2[3] | r_p0[3] | r_p1[3] |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fsubrp	%st(0),%st(2)	// r_p2[3] | t0 | r_p1[3] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fsubrp	%st(0),%st(2)	// t0 | t1 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-
-//	r_tstepx = (int)((t1 * p01_minus_p21 - t0 * p11_minus_p21) *
-//			xstepdenominv);
-//	r_tstepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) *
-//			ystepdenominv);
-
-	fld		%st(0)			// t0 | t0 | t1 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fmul	%st(6),%st(0)	// t0*p11_minus_p21 | t0 | t1 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// t1 | t0 | t0*p11_minus_p21 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fld		%st(0)			// t1 | t1 | t0 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmuls	p01_minus_p21	// t1*p01_minus_p21 | t1 | t0 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fxch	%st(2)			// t0 | t1 | t1*p01_minus_p21 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmuls	p10_minus_p20	// t0*p10_minus_p20 | t1 | t1*p01_minus_p21 |
-							//  t0*p11_minus_p21 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(1)			// t1 | t0*p10_minus_p20 | t1*p01_minus_p21 |
-							//  t0*p11_minus_p21 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmul	%st(6),%st(0)	// t1*p00_minus_p20 | t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fxch	%st(2)			// t1*p01_minus_p21 | t0*p10_minus_p20 |
-							//  t1*p00_minus_p20 | t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fsubp	%st(0),%st(3)	// t0*p10_minus_p20 | t1*p00_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fsubrp	%st(0),%st(1)	// t1*p00_minus_p20 - t0*p10_minus_p20 |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fmul	%st(2),%st(0)	// (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//   ystepdenominv |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fxch	%st(1)			// t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//  ystepdenominv | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fmul	%st(3),%st(0)	// (t1*p01_minus_p21 - t0*p11_minus_p21)*
-							//  xstepdenominv |
-							//  (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//  ystepdenominv | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(1)			// (t1*p00_minus_p20 - t0*p10_minus_p20)*
-							//  ystepdenominv |
-							//  (t1*p01_minus_p21 - t0*p11_minus_p21)*
-							//  xstepdenominv | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fistpl	C(r_tstepy)		// r_tstepx | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fistpl	C(r_tstepx)		// ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-
-//	t0 = r_p0[5] - r_p2[5];
-//	t1 = r_p1[5] - r_p2[5];
-
-	fildl	C(r_p2)+20		// r_p2[5] | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fildl	C(r_p0)+20		// r_p0[5] | r_p2[5] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fildl	C(r_p1)+20		// r_p1[5] | r_p0[5] | r_p2[5] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fxch	%st(2)			// r_p2[5] | r_p0[5] | r_p1[5] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fld		%st(0)			// r_p2[5] | r_p2[5] | r_p0[5] | r_p1[5] |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  p11_minus_p21
-	fsubrp	%st(0),%st(2)	// r_p2[5] | t0 | r_p1[5] | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 | p11_minus_p21
-	fsubrp	%st(0),%st(2)	// t0 | t1 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-
-//	r_zistepx = (int)((t1 * p01_minus_p21 - t0 * p11_minus_p21) *
-//			xstepdenominv);
-//	r_zistepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) *
-//			ystepdenominv);
-
-	fld		%st(0)			// t0 | t0 | t1 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | p11_minus_p21
-	fmulp	%st(0),%st(6)	// t0 | t1 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | t0*p11_minus_p21
-	fxch	%st(1)			// t1 | t0 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | t0*p11_minus_p21
-	fld		%st(0)			// t1 | t1 | t0 | ystepdenominv | xstepdenominv |
-							//  p00_minus_p20 | t0*p11_minus_p21
-	fmuls	p01_minus_p21	// t1*p01_minus_p21 | t1 | t0 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 |
-							//  t0*p11_minus_p21
-	fxch	%st(2)			// t0 | t1 | t1*p01_minus_p21 | ystepdenominv |
-							//  xstepdenominv | p00_minus_p20 |
-							//  t0*p11_minus_p21
-	fmuls	p10_minus_p20	// t0*p10_minus_p20 | t1 | t1*p01_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  t0*p11_minus_p21
-	fxch	%st(1)			// t1 | t0*p10_minus_p20 | t1*p01_minus_p21 |
-							//  ystepdenominv | xstepdenominv | p00_minus_p20 |
-							//  t0*p11_minus_p21
-	fmulp	%st(0),%st(5)	// t0*p10_minus_p20 | t1*p01_minus_p21 |
-							//  ystepdenominv | xstepdenominv |
-							//  t1*p00_minus_p20 | t0*p11_minus_p21
-	fxch	%st(5)			// t0*p11_minus_p21 | t1*p01_minus_p21 |
-							//  ystepdenominv | xstepdenominv |
-							//  t1*p00_minus_p20 | t0*p10_minus_p20
-	fsubrp	%st(0),%st(1)	// t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  ystepdenominv | xstepdenominv |
-							//  t1*p00_minus_p20 | t0*p10_minus_p20
-	fxch	%st(3)			// t1*p00_minus_p20 | ystepdenominv |
-							//  xstepdenominv |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  t0*p10_minus_p20
-	fsubp	%st(0),%st(4)	// ystepdenominv | xstepdenominv |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  t1*p00_minus_p20 - t0*p10_minus_p20
-	fxch	%st(1)			// xstepdenominv | ystepdenominv |
-							//  t1*p01_minus_p21 - t0*p11_minus_p21 |
-							//  t1*p00_minus_p20 - t0*p10_minus_p20
-	fmulp	%st(0),%st(2)	// ystepdenominv |
-							//  (t1*p01_minus_p21 - t0*p11_minus_p21) *
-							//  xstepdenominv |
-							//  t1*p00_minus_p20 - t0*p10_minus_p20
-	fmulp	%st(0),%st(2)	// (t1*p01_minus_p21 - t0*p11_minus_p21) *
-							//  xstepdenominv |
-							//  (t1*p00_minus_p20 - t0*p10_minus_p20) *
-							//  ystepdenominv
-	fistpl	C(r_zistepx)	// (t1*p00_minus_p20 - t0*p10_minus_p20) *
-							//  ystepdenominv
-	fistpl	C(r_zistepy)
-
-//	a_sstepxfrac = r_sstepx << 16;
-//	a_tstepxfrac = r_tstepx << 16;
-//
-//	a_ststepxwhole = r_affinetridesc.skinwidth * (r_tstepx >> 16) +
-//			(r_sstepx >> 16);
-
-	movl	C(r_sstepx),%eax
-	movl	C(r_tstepx),%edx
-	shll	$16,%eax
-	shll	$16,%edx
-	movl	%eax,C(a_sstepxfrac)
-	movl	%edx,C(a_tstepxfrac)
-
-	movl	C(r_sstepx),%ecx
-	movl	C(r_tstepx),%eax
-	sarl	$16,%ecx
-	sarl	$16,%eax
-	imull	skinwidth(%esp)
-	addl	%ecx,%eax
-	movl	%eax,C(a_ststepxwhole)
-
-	ret
-
-
-//----------------------------------------------------------------------
-// recursive subdivision affine triangle drawing code
-//
-// not C-callable because of stdcall return
-//----------------------------------------------------------------------
-
-#define lp1	4+16
-#define lp2	8+16
-#define lp3	12+16
-
-.globl C(D_PolysetRecursiveTriangle)
-C(D_PolysetRecursiveTriangle):
-	pushl	%ebp				// preserve caller stack frame pointer
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-	pushl	%ebx
-
-//	int		*temp;
-//	int		d;
-//	int		new[6];
-//	int		i;
-//	int		z;
-//	short	*zbuf;
-	movl	lp2(%esp),%esi
-	movl	lp1(%esp),%ebx
-	movl	lp3(%esp),%edi
-
-//	d = lp2[0] - lp1[0];
-//	if (d < -1 || d > 1)
-//		goto split;
-	movl	0(%esi),%eax
-
-	movl	0(%ebx),%edx
-	movl	4(%esi),%ebp
-
-	subl	%edx,%eax
-	movl	4(%ebx),%ecx
-
-	subl	%ecx,%ebp
-	incl	%eax
-
-	cmpl	$2,%eax
-	ja		LSplit
-
-//	d = lp2[1] - lp1[1];
-//	if (d < -1 || d > 1)
-//		goto split;
-	movl	0(%edi),%eax
-	incl	%ebp
-
-	cmpl	$2,%ebp
-	ja		LSplit
-
-//	d = lp3[0] - lp2[0];
-//	if (d < -1 || d > 1)
-//		goto split2;
-	movl	0(%esi),%edx
-	movl	4(%edi),%ebp
-
-	subl	%edx,%eax
-	movl	4(%esi),%ecx
-
-	subl	%ecx,%ebp
-	incl	%eax
-
-	cmpl	$2,%eax
-	ja		LSplit2
-
-//	d = lp3[1] - lp2[1];
-//	if (d < -1 || d > 1)
-//		goto split2;
-	movl	0(%ebx),%eax
-	incl	%ebp
-
-	cmpl	$2,%ebp
-	ja		LSplit2
-
-//	d = lp1[0] - lp3[0];
-//	if (d < -1 || d > 1)
-//		goto split3;
-	movl	0(%edi),%edx
-	movl	4(%ebx),%ebp
-
-	subl	%edx,%eax
-	movl	4(%edi),%ecx
-
-	subl	%ecx,%ebp
-	incl	%eax
-
-	incl	%ebp
-	movl	%ebx,%edx
-
-	cmpl	$2,%eax
-	ja		LSplit3
-
-//	d = lp1[1] - lp3[1];
-//	if (d < -1 || d > 1)
-//	{
-//split3:
-//		temp = lp1;
-//		lp3 = lp2;
-//		lp1 = lp3;
-//		lp2 = temp;
-//		goto split;
-//	}
-//
-//	return;			// entire tri is filled
-//
-	cmpl	$2,%ebp
-	jna		LDone
-
-LSplit3:
-	movl	%edi,%ebx
-	movl	%esi,%edi
-	movl	%edx,%esi
-	jmp		LSplit
-
-//split2:
-LSplit2:
-
-//	temp = lp1;
-//	lp1 = lp2;
-//	lp2 = lp3;
-//	lp3 = temp;
-	movl	%ebx,%eax
-	movl	%esi,%ebx
-	movl	%edi,%esi
-	movl	%eax,%edi
-
-//split:
-LSplit:
-
-	subl	$24,%esp		// allocate space for a new vertex
-
-//// split this edge
-//	new[0] = (lp1[0] + lp2[0]) >> 1;
-//	new[1] = (lp1[1] + lp2[1]) >> 1;
-//	new[2] = (lp1[2] + lp2[2]) >> 1;
-//	new[3] = (lp1[3] + lp2[3]) >> 1;
-//	new[5] = (lp1[5] + lp2[5]) >> 1;
-	movl	8(%ebx),%eax
-
-	movl	8(%esi),%edx
-	movl	12(%ebx),%ecx
-
-	addl	%edx,%eax
-	movl	12(%esi),%edx
-
-	sarl	$1,%eax
-	addl	%edx,%ecx
-
-	movl	%eax,8(%esp)
-	movl	20(%ebx),%eax
-
-	sarl	$1,%ecx
-	movl	20(%esi),%edx
-
-	movl	%ecx,12(%esp)
-	addl	%edx,%eax
-
-	movl	0(%ebx),%ecx
-	movl	0(%esi),%edx
-
-	sarl	$1,%eax
-	addl	%ecx,%edx
-
-	movl	%eax,20(%esp)
-	movl	4(%ebx),%eax
-
-	sarl	$1,%edx
-	movl	4(%esi),%ebp
-
-	movl	%edx,0(%esp)
-	addl	%eax,%ebp
-
-	sarl	$1,%ebp
-	movl	%ebp,4(%esp)
-
-//// draw the point if splitting a leading edge
-//	if (lp2[1] > lp1[1])
-//		goto nodraw;
-	cmpl	%eax,4(%esi)
-	jg		LNoDraw
-
-//	if ((lp2[1] == lp1[1]) && (lp2[0] < lp1[0]))
-//		goto nodraw;
-	movl	0(%esi),%edx
-	jnz		LDraw
-
-	cmpl	%ecx,%edx
-	jl		LNoDraw
-
-LDraw:
-
-// z = new[5] >> 16;
-	movl	20(%esp),%edx
-	movl	4(%esp),%ecx
-
-	sarl	$16,%edx
-	movl	0(%esp),%ebp
-
-//	zbuf = zspantable[new[1]] + new[0];
-	movl	C(zspantable)(,%ecx,4),%eax
-
-//	if (z >= *zbuf)
-//	{
-	cmpw	(%eax,%ebp,2),%dx
-	jnge	LNoDraw
-
-//		int		pix;
-//		
-//		*zbuf = z;
-	movw	%dx,(%eax,%ebp,2)
-
-//		pix = d_pcolormap[skintable[new[3]>>16][new[2]>>16]];
-	movl	12(%esp),%eax
-
-	sarl	$16,%eax
-	movl	8(%esp),%edx
-
-	sarl	$16,%edx
-	subl	%ecx,%ecx
-
-	movl	C(skintable)(,%eax,4),%eax
-	movl	4(%esp),%ebp
-
-	movb	(%eax,%edx,),%cl
-	movl	C(d_pcolormap),%edx
-
-	movb	(%edx,%ecx,),%dl
-	movl	0(%esp),%ecx
-
-//		d_viewbuffer[d_scantable[new[1]] + new[0]] = pix;
-	movl	C(d_scantable)(,%ebp,4),%eax
-	addl	%eax,%ecx
-	movl	C(d_viewbuffer),%eax
-	movb	%dl,(%eax,%ecx,1)
-
-//	}
-//
-//nodraw:
-LNoDraw:
-
-//// recursively continue
-//	D_PolysetRecursiveTriangle (lp3, lp1, new);
-	pushl	%esp
-	pushl	%ebx
-	pushl	%edi
-	call	C(D_PolysetRecursiveTriangle)
-
-//	D_PolysetRecursiveTriangle (lp3, new, lp2);
-	movl	%esp,%ebx
-	pushl	%esi
-	pushl	%ebx
-	pushl	%edi
-	call	C(D_PolysetRecursiveTriangle)
-	addl	$24,%esp
-
-LDone:
-	popl	%ebx				// restore register variables
-	popl	%edi
-	popl	%esi
-	popl	%ebp				// restore caller stack frame pointer
-	ret		$12
-
-
-//----------------------------------------------------------------------
-// 8-bpp horizontal span drawing code for affine polygons, with smooth
-// shading and no transparency
-//----------------------------------------------------------------------
-
-#define pspans	4+8
-
-.globl C(D_PolysetAff8Start)
-C(D_PolysetAff8Start):
-
-.globl C(D_PolysetDrawSpans8)
-C(D_PolysetDrawSpans8):
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-	movl	pspans(%esp),%esi	// point to the first span descriptor
-	movl	C(r_zistepx),%ecx
-
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-
-	rorl	$16,%ecx			// put high 16 bits of 1/z step in low word
-	movl	spanpackage_t_count(%esi),%edx
-
-	movl	%ecx,lzistepx
-
-LSpanLoop:
-
-//		lcount = d_aspancount - pspanpackage->count;
-//
-//		errorterm += erroradjustup;
-//		if (errorterm >= 0)
-//		{
-//			d_aspancount += d_countextrastep;
-//			errorterm -= erroradjustdown;
-//		}
-//		else
-//		{
-//			d_aspancount += ubasestep;
-//		}
-	movl	C(d_aspancount),%eax
-	subl	%edx,%eax
-
-	movl	C(erroradjustup),%edx
-	movl	C(errorterm),%ebx
-	addl	%edx,%ebx
-	js		LNoTurnover
-
-	movl	C(erroradjustdown),%edx
-	movl	C(d_countextrastep),%edi
-	subl	%edx,%ebx
-	movl	C(d_aspancount),%ebp
-	movl	%ebx,C(errorterm)
-	addl	%edi,%ebp
-	movl	%ebp,C(d_aspancount)
-	jmp		LRightEdgeStepped
-
-LNoTurnover:
-	movl	C(d_aspancount),%edi
-	movl	C(ubasestep),%edx
-	movl	%ebx,C(errorterm)
-	addl	%edx,%edi
-	movl	%edi,C(d_aspancount)
-
-LRightEdgeStepped:
-	cmpl	$1,%eax
-
-	jl		LNextSpan
-	jz		LExactlyOneLong
-
-//
-// set up advancetable
-//
-	movl	C(a_ststepxwhole),%ecx
-	movl	C(r_affinetridesc)+atd_skinwidth,%edx
-
-	movl	%ecx,advancetable+4	// advance base in t
-	addl	%edx,%ecx
-
-	movl	%ecx,advancetable	// advance extra in t
-	movl	C(a_tstepxfrac),%ecx
-
-	movw	C(r_lstepx),%cx
-	movl	%eax,%edx			// count
-
-	movl	%ecx,tstep
-	addl	$7,%edx
-
-	shrl	$3,%edx				// count of full and partial loops
-	movl	spanpackage_t_sfrac(%esi),%ebx
-
-	movw	%dx,%bx
-	movl	spanpackage_t_pz(%esi),%ecx
-
-	negl	%eax
-
-	movl	spanpackage_t_pdest(%esi),%edi
-	andl	$7,%eax		// 0->0, 1->7, 2->6, ... , 7->1
-
-	subl	%eax,%edi	// compensate for hardwired offsets
-	subl	%eax,%ecx
-
-	subl	%eax,%ecx
-	movl	spanpackage_t_tfrac(%esi),%edx
-
-	movw	spanpackage_t_light(%esi),%dx
-	movl	spanpackage_t_zi(%esi),%ebp
-
-	rorl	$16,%ebp	// put high 16 bits of 1/z in low word
-	pushl	%esi
-
-	movl	spanpackage_t_ptex(%esi),%esi
-	jmp		aff8entryvec_table(,%eax,4)
-
-// %bx = count of full and partial loops
-// %ebx high word = sfrac
-// %ecx = pz
-// %dx = light
-// %edx high word = tfrac
-// %esi = ptex
-// %edi = pdest
-// %ebp = 1/z
-// tstep low word = C(r_lstepx)
-// tstep high word = C(a_tstepxfrac)
-// C(a_sstepxfrac) low word = 0
-// C(a_sstepxfrac) high word = C(a_sstepxfrac)
-
-LDrawLoop:
-
-// FIXME: do we need to clamp light? We may need at least a buffer bit to
-// keep it from poking into tfrac and causing problems
-
-LDraw8:
-	cmpw	(%ecx),%bp
-	jl		Lp1
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch8:
-	movb	%al,(%edi)
-Lp1:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LDraw7:
-	cmpw	2(%ecx),%bp
-	jl		Lp2
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,2(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch7:
-	movb	%al,1(%edi)
-Lp2:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LDraw6:
-	cmpw	4(%ecx),%bp
-	jl		Lp3
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,4(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch6:
-	movb	%al,2(%edi)
-Lp3:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LDraw5:
-	cmpw	6(%ecx),%bp
-	jl		Lp4
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,6(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch5:
-	movb	%al,3(%edi)
-Lp4:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LDraw4:
-	cmpw	8(%ecx),%bp
-	jl		Lp5
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,8(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch4:
-	movb	%al,4(%edi)
-Lp5:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LDraw3:
-	cmpw	10(%ecx),%bp
-	jl		Lp6
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,10(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch3:
-	movb	%al,5(%edi)
-Lp6:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LDraw2:
-	cmpw	12(%ecx),%bp
-	jl		Lp7
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,12(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch2:
-	movb	%al,6(%edi)
-Lp7:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LDraw1:
-	cmpw	14(%ecx),%bp
-	jl		Lp8
-	xorl	%eax,%eax
-	movb	%dh,%ah
-	movb	(%esi),%al
-	movw	%bp,14(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch1:
-	movb	%al,7(%edi)
-Lp8:
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	lzistepx,%ebp
-	adcl	$0,%ebp
-	addl	C(a_sstepxfrac),%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-	addl	$8,%edi
-	addl	$16,%ecx
-
-	decw	%bx
-	jnz		LDrawLoop
-
-	popl	%esi				// restore spans pointer
-LNextSpan:
-	addl	$(spanpackage_t_size),%esi	// point to next span
-LNextSpanESISet:
-	movl	spanpackage_t_count(%esi),%edx
-	cmpl	$-999999,%edx		// any more spans?
-	jnz		LSpanLoop			// yes
-
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	popl	%ebx				// restore register variables
-	popl	%esi
-	ret
-
-
-// draw a one-long span
-
-LExactlyOneLong:
-
-	movl	spanpackage_t_pz(%esi),%ecx
-	movl	spanpackage_t_zi(%esi),%ebp
-
-	rorl	$16,%ebp	// put high 16 bits of 1/z in low word
-	movl	spanpackage_t_ptex(%esi),%ebx
-
-	cmpw	(%ecx),%bp
-	jl		LNextSpan
-	xorl	%eax,%eax
-	movl	spanpackage_t_pdest(%esi),%edi
-	movb	spanpackage_t_light+1(%esi),%ah
-	addl	$(spanpackage_t_size),%esi	// point to next span
-	movb	(%ebx),%al
-	movw	%bp,(%ecx)
-	movb	0x12345678(%eax),%al
-LPatch9:
-	movb	%al,(%edi)
-
-	jmp		LNextSpanESISet
-
-.globl C(D_PolysetAff8End)
-C(D_PolysetAff8End):
-
-
-#define pcolormap		4
-
-.globl C(D_Aff8Patch)
-C(D_Aff8Patch):
-	movl	pcolormap(%esp),%eax
-	movl	%eax,LPatch1-4
-	movl	%eax,LPatch2-4
-	movl	%eax,LPatch3-4
-	movl	%eax,LPatch4-4
-	movl	%eax,LPatch5-4
-	movl	%eax,LPatch6-4
-	movl	%eax,LPatch7-4
-	movl	%eax,LPatch8-4
-	movl	%eax,LPatch9-4
-
-	ret
-
-
-//----------------------------------------------------------------------
-// Alias model polygon dispatching code, combined with subdivided affine
-// triangle drawing code
-//----------------------------------------------------------------------
-
-.globl C(D_PolysetDraw)
-C(D_PolysetDraw):
-
-//	spanpackage_t	spans[DPS_MAXSPANS + 1 +
-//			((CACHE_SIZE - 1) / sizeof(spanpackage_t)) + 1];
-//						// one extra because of cache line pretouching
-//
-//	a_spans = (spanpackage_t *)
-//			(((intptr)&spans[0] + CACHE_SIZE - 1) & ~(CACHE_SIZE - 1));
-	subl	$(SPAN_SIZE),%esp
-	movl	%esp,%eax
-	addl	$(CACHE_SIZE - 1),%eax
-	andl	$(~(CACHE_SIZE - 1)),%eax
-	movl	%eax,C(a_spans)
-
-//	if (r_affinetridesc.drawtype)
-//		D_DrawSubdiv ();
-//	else
-//		D_DrawNonSubdiv ();
-	movl	C(r_affinetridesc)+atd_drawtype,%eax
-	testl	%eax,%eax
-	jz		C(D_DrawNonSubdiv)
-
-	pushl	%ebp				// preserve caller stack frame pointer
-
-//	lnumtriangles = r_affinetridesc.numtriangles;
-	movl	C(r_affinetridesc)+atd_numtriangles,%ebp
-
-	pushl	%esi				// preserve register variables
-	shll	$4,%ebp
-
-	pushl	%ebx
-//	ptri = r_affinetridesc.ptriangles;
-	movl	C(r_affinetridesc)+atd_ptriangles,%ebx
-
-	pushl	%edi
-
-//	mtriangle_t		*ptri;
-//	finalvert_t		*pfv, *index0, *index1, *index2;
-//	int				i;
-//	int				lnumtriangles;
-//	int				s0, s1, s2;
-
-//	pfv = r_affinetridesc.pfinalverts;
-	movl	C(r_affinetridesc)+atd_pfinalverts,%edi
-
-//	for (i=0 ; i<lnumtriangles ; i++)
-//	{
-
-Llooptop:
-
-//		index0 = pfv + ptri[i].vertindex[0];
-//		index1 = pfv + ptri[i].vertindex[1];
-//		index2 = pfv + ptri[i].vertindex[2];
-	movl	mtri_vertindex-16+0(%ebx,%ebp,),%ecx
-	movl	mtri_vertindex-16+4(%ebx,%ebp,),%esi
-
-	shll	$(fv_shift),%ecx
-	movl	mtri_vertindex-16+8(%ebx,%ebp,),%edx
-
-	shll	$(fv_shift),%esi
-	addl	%edi,%ecx
-
-	shll	$(fv_shift),%edx
-	addl	%edi,%esi
-
-	addl	%edi,%edx
-
-//		if (((index0->v[1]-index1->v[1]) *
-//				(index0->v[0]-index2->v[0]) -
-//				(index0->v[0]-index1->v[0])*(index0->v[1]-index2->v[1])) >= 0)
-//		{
-//			continue;
-//		}
-//
-//		d_pcolormap = &((byte *)acolormap)[index0->v[4] & 0xFF00];
-	fildl	fv_v+4(%ecx)	// i0v1
-	fildl	fv_v+4(%esi)	// i1v1 | i0v1
-	fildl	fv_v+0(%ecx)	// i0v0 | i1v1 | i0v1
-	fildl	fv_v+0(%edx)	// i2v0 | i0v0 | i1v1 | i0v1
-	fxch	%st(2)			// i1v1 | i0v0 | i2v0 | i0v1
-	fsubr	%st(3),%st(0)	// i0v1-i1v1 | i0v0 | i2v0 | i0v1
-	fildl	fv_v+0(%esi)	// i1v0 | i0v1-i1v1 | i0v0 | i2v0 | i0v1
-	fxch	%st(2)			// i0v0 | i0v1-i1v1 | i1v0 | i2v0 | i0v1
-	fsub	%st(0),%st(3)	// i0v0 | i0v1-i1v1 | i1v0 | i0v0-i2v0 | i0v1
-	fildl	fv_v+4(%edx)	// i2v1 | i0v0 | i0v1-i1v1 | i1v0 | i0v0-i2v0| i0v1
-	fxch	%st(1)			// i0v0 | i2v1 | i0v1-i1v1 | i1v0 | i0v0-i2v0| i0v1
-	fsubp	%st(0),%st(3)	// i2v1 | i0v1-i1v1 | i0v0-i1v0 | i0v0-i2v0 | i0v1
-	fxch	%st(1)			// i0v1-i1v1 | i2v1 | i0v0-i1v0 | i0v0-i2v0 | i0v1
-	fmulp	%st(0),%st(3)	// i2v1 | i0v0-i1v0 | i0v1-i1v1*i0v0-i2v0 | i0v1
-	fsubrp	%st(0),%st(3)	// i0v0-i1v0 | i0v1-i1v1*i0v0-i2v0 | i0v1-i2v1
-	movl	fv_v+16(%ecx),%eax
-	andl	$0xFF00,%eax
-	fmulp	%st(0),%st(2)	// i0v1-i1v1*i0v0-i2v0 | i0v0-i1v0*i0v1-i2v1
-	addl	C(acolormap),%eax
-	fsubp	%st(0),%st(1)	// (i0v1-i1v1)*(i0v0-i2v0)-(i0v0-i1v0)*(i0v1-i2v1)
-	movl	%eax,C(d_pcolormap)
-	fstps	Ltemp
-	movl	Ltemp,%eax
-	subl	$0x80000001,%eax
-	jc		Lskip
-
-//		if (ptri[i].facesfront)
-//		{
-//			D_PolysetRecursiveTriangle(index0->v, index1->v, index2->v);
-	movl	mtri_facesfront-16(%ebx,%ebp,),%eax
-	testl	%eax,%eax
-	jz		Lfacesback
-
-	pushl	%edx
-	pushl	%esi
-	pushl	%ecx
-	call	C(D_PolysetRecursiveTriangle)
-
-	subl	$16,%ebp
-	jnz		Llooptop
-	jmp		Ldone2
-
-//		}
-//		else
-//		{
-Lfacesback:
-
-//			s0 = index0->v[2];
-//			s1 = index1->v[2];
-//			s2 = index2->v[2];
-	movl	fv_v+8(%ecx),%eax
-	pushl	%eax
-	movl	fv_v+8(%esi),%eax
-	pushl	%eax
-	movl	fv_v+8(%edx),%eax
-	pushl	%eax
-	pushl	%ecx
-	pushl	%edx
-
-//			if (index0->flags & ALIAS_ONSEAM)
-//				index0->v[2] += r_affinetridesc.seamfixupX16;
-	movl	C(r_affinetridesc)+atd_seamfixupX16,%eax
-	testl	$(ALIAS_ONSEAM),fv_flags(%ecx)
-	jz		Lp11
-	addl	%eax,fv_v+8(%ecx)
-Lp11:
-
-//			if (index1->flags & ALIAS_ONSEAM)
-//				index1->v[2] += r_affinetridesc.seamfixupX16;
-	testl	$(ALIAS_ONSEAM),fv_flags(%esi)
-	jz		Lp12
-	addl	%eax,fv_v+8(%esi)
-Lp12:
-
-//			if (index2->flags & ALIAS_ONSEAM)
-//				index2->v[2] += r_affinetridesc.seamfixupX16;
-	testl	$(ALIAS_ONSEAM),fv_flags(%edx)
-	jz		Lp13
-	addl	%eax,fv_v+8(%edx)
-Lp13:
-
-//			D_PolysetRecursiveTriangle(index0->v, index1->v, index2->v);
-	pushl	%edx
-	pushl	%esi
-	pushl	%ecx
-	call	C(D_PolysetRecursiveTriangle)
-
-//			index0->v[2] = s0;
-//			index1->v[2] = s1;
-//			index2->v[2] = s2;
-	popl	%edx
-	popl	%ecx
-	popl	%eax
-	movl	%eax,fv_v+8(%edx)
-	popl	%eax
-	movl	%eax,fv_v+8(%esi)
-	popl	%eax
-	movl	%eax,fv_v+8(%ecx)
-
-//		}
-//	}
-Lskip:
-	subl	$16,%ebp
-	jnz		Llooptop
-
-Ldone2:
-	popl	%edi				// restore the caller's stack frame
-	popl	%ebx
-	popl	%esi				// restore register variables
-	popl	%ebp
-
-	addl	$(SPAN_SIZE),%esp
-
-	ret
-
-
-//----------------------------------------------------------------------
-// Alias model triangle left-edge scanning code
-//----------------------------------------------------------------------
-
-#define height	4+16
-
-.globl C(D_PolysetScanLeftEdge)
-C(D_PolysetScanLeftEdge):
-	pushl	%ebp				// preserve caller stack frame pointer
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-	pushl	%ebx
-
-	movl	height(%esp),%eax
-	movl	C(d_sfrac),%ecx
-	andl	$0xFFFF,%eax
-	movl	C(d_ptex),%ebx
-	orl		%eax,%ecx
-	movl	C(d_pedgespanpackage),%esi
-	movl	C(d_tfrac),%edx
-	movl	C(d_light),%edi
-	movl	C(d_zi),%ebp
-
-// %eax: scratch
-// %ebx: d_ptex
-// %ecx: d_sfrac in high word, count in low word
-// %edx: d_tfrac
-// %esi: d_pedgespanpackage, errorterm, scratch alternately
-// %edi: d_light
-// %ebp: d_zi
-
-//	do
-//	{
-
-LScanLoop:
-
-//		d_pedgespanpackage->ptex = ptex;
-//		d_pedgespanpackage->pdest = d_pdest;
-//		d_pedgespanpackage->pz = d_pz;
-//		d_pedgespanpackage->count = d_aspancount;
-//		d_pedgespanpackage->light = d_light;
-//		d_pedgespanpackage->zi = d_zi;
-//		d_pedgespanpackage->sfrac = d_sfrac << 16;
-//		d_pedgespanpackage->tfrac = d_tfrac << 16;
-	movl	%ebx,spanpackage_t_ptex(%esi)
-	movl	C(d_pdest),%eax
-	movl	%eax,spanpackage_t_pdest(%esi)
-	movl	C(d_pz),%eax
-	movl	%eax,spanpackage_t_pz(%esi)
-	movl	C(d_aspancount),%eax
-	movl	%eax,spanpackage_t_count(%esi)
-	movl	%edi,spanpackage_t_light(%esi)
-	movl	%ebp,spanpackage_t_zi(%esi)
-	movl	%ecx,spanpackage_t_sfrac(%esi)
-	movl	%edx,spanpackage_t_tfrac(%esi)
-
-// pretouch the next cache line
-	movb	spanpackage_t_size(%esi),%al
-
-//		d_pedgespanpackage++;
-	addl	$(spanpackage_t_size),%esi
-	movl	C(erroradjustup),%eax
-	movl	%esi,C(d_pedgespanpackage)
-
-//		errorterm += erroradjustup;
-	movl	C(errorterm),%esi
-	addl	%eax,%esi
-	movl	C(d_pdest),%eax
-
-//		if (errorterm >= 0)
-//		{
-	js		LNoLeftEdgeTurnover
-
-//			errorterm -= erroradjustdown;
-//			d_pdest += d_pdestextrastep;
-	subl	C(erroradjustdown),%esi
-	addl	C(d_pdestextrastep),%eax
-	movl	%esi,C(errorterm)
-	movl	%eax,C(d_pdest)
-
-//			d_pz += d_pzextrastep;
-//			d_aspancount += d_countextrastep;
-//			d_ptex += d_ptexextrastep;
-//			d_sfrac += d_sfracextrastep;
-//			d_ptex += d_sfrac >> 16;
-//			d_sfrac &= 0xFFFF;
-//			d_tfrac += d_tfracextrastep;
-	movl	C(d_pz),%eax
-	movl	C(d_aspancount),%esi
-	addl	C(d_pzextrastep),%eax
-	addl	C(d_sfracextrastep),%ecx
-	adcl	C(d_ptexextrastep),%ebx
-	addl	C(d_countextrastep),%esi
-	movl	%eax,C(d_pz)
-	movl	C(d_tfracextrastep),%eax
-	movl	%esi,C(d_aspancount)
-	addl	%eax,%edx
-
-//			if (d_tfrac & 0x10000)
-//			{
-	jnc		LSkip1
-
-//				d_ptex += r_affinetridesc.skinwidth;
-//				d_tfrac &= 0xFFFF;
-	addl	C(r_affinetridesc)+atd_skinwidth,%ebx
-
-//			}
-
-LSkip1:
-
-//			d_light += d_lightextrastep;
-//			d_zi += d_ziextrastep;
-	addl	C(d_lightextrastep),%edi
-	addl	C(d_ziextrastep),%ebp
-
-//		}
-	movl	C(d_pedgespanpackage),%esi
-	decl	%ecx
-	testl	$0xFFFF,%ecx
-	jnz		LScanLoop
-
-	popl	%ebx
-	popl	%edi
-	popl	%esi
-	popl	%ebp
-	ret
-
-//		else
-//		{
-
-LNoLeftEdgeTurnover:
-	movl	%esi,C(errorterm)
-
-//			d_pdest += d_pdestbasestep;
-	addl	C(d_pdestbasestep),%eax
-	movl	%eax,C(d_pdest)
-
-//			d_pz += d_pzbasestep;
-//			d_aspancount += ubasestep;
-//			d_ptex += d_ptexbasestep;
-//			d_sfrac += d_sfracbasestep;
-//			d_ptex += d_sfrac >> 16;
-//			d_sfrac &= 0xFFFF;
-	movl	C(d_pz),%eax
-	movl	C(d_aspancount),%esi
-	addl	C(d_pzbasestep),%eax
-	addl	C(d_sfracbasestep),%ecx
-	adcl	C(d_ptexbasestep),%ebx
-	addl	C(ubasestep),%esi
-	movl	%eax,C(d_pz)
-	movl	%esi,C(d_aspancount)
-
-//			d_tfrac += d_tfracbasestep;
-	movl	C(d_tfracbasestep),%esi
-	addl	%esi,%edx
-
-//			if (d_tfrac & 0x10000)
-//			{
-	jnc		LSkip2
-
-//				d_ptex += r_affinetridesc.skinwidth;
-//				d_tfrac &= 0xFFFF;
-	addl	C(r_affinetridesc)+atd_skinwidth,%ebx
-
-//			}
-
-LSkip2:
-
-//			d_light += d_lightbasestep;
-//			d_zi += d_zibasestep;
-	addl	C(d_lightbasestep),%edi
-	addl	C(d_zibasestep),%ebp
-
-//		}
-//	} while (--height);
-	movl	C(d_pedgespanpackage),%esi
-	decl	%ecx
-	testl	$0xFFFF,%ecx
-	jnz		LScanLoop
-
-	popl	%ebx
-	popl	%edi
-	popl	%esi
-	popl	%ebp
-	ret
-
-
-//----------------------------------------------------------------------
-// Alias model vertex drawing code
-//----------------------------------------------------------------------
-
-#define fv			4+8
-#define	numverts	8+8
-
-.globl C(D_PolysetDrawFinalVerts)
-C(D_PolysetDrawFinalVerts):
-	pushl	%ebp				// preserve caller stack frame pointer
-	pushl	%ebx
-
-//	int		i, z;
-//	short	*zbuf;
-
-	movl	numverts(%esp),%ecx
-	movl	fv(%esp),%ebx
-
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-
-LFVLoop:
-
-//	for (i=0 ; i<numverts ; i++, fv++)
-//	{
-//	// valid triangle coordinates for filling can include the bottom and
-//	// right clip edges, due to the fill rule; these shouldn't be drawn
-//		if ((fv->v[0] < r_refdef.vrectright) &&
-//			(fv->v[1] < r_refdef.vrectbottom))
-//		{
-	movl	fv_v+0(%ebx),%eax
-	movl	C(r_refdef)+rd_vrectright,%edx
-	cmpl	%edx,%eax
-	jge		LNextVert
-	movl	fv_v+4(%ebx),%esi
-	movl	C(r_refdef)+rd_vrectbottom,%edx
-	cmpl	%edx,%esi
-	jge		LNextVert
-
-//			zbuf = zspantable[fv->v[1]] + fv->v[0];
-	movl	C(zspantable)(,%esi,4),%edi
-
-//			z = fv->v[5]>>16;
-	movl	fv_v+20(%ebx),%edx
-	shrl	$16,%edx
-
-//			if (z >= *zbuf)
-//			{
-//				int		pix;
-	cmpw	(%edi,%eax,2),%dx
-	jl		LNextVert
-
-//				*zbuf = z;
-	movw	%dx,(%edi,%eax,2)
-
-//				pix = skintable[fv->v[3]>>16][fv->v[2]>>16];
-	movl	fv_v+12(%ebx),%edi
-	shrl	$16,%edi
-	movl	C(skintable)(,%edi,4),%edi
-	movl	fv_v+8(%ebx),%edx
-	shrl	$16,%edx
-	movb	(%edi,%edx),%dl
-
-//				pix = ((byte *)acolormap)[pix + (fv->v[4] & 0xFF00)];
-	movl	fv_v+16(%ebx),%edi
-	andl	$0xFF00,%edi
-	andl	$0x00FF,%edx
-	addl	%edx,%edi
-	movl	C(acolormap),%edx
-	movb	(%edx,%edi,1),%dl
-
-//				d_viewbuffer[d_scantable[fv->v[1]] + fv->v[0]] = pix;
-	movl	C(d_scantable)(,%esi,4),%edi
-	movl	C(d_viewbuffer),%esi
-	addl	%eax,%edi
-	movb	%dl,(%esi,%edi)
-
-//			}
-//		}
-//	}
-LNextVert:
-	addl	$(fv_size),%ebx
-	decl	%ecx
-	jnz		LFVLoop
-
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-
-
-//----------------------------------------------------------------------
-// Alias model non-subdivided polygon dispatching code
-//
-// not C-callable because of stack buffer cleanup
-//----------------------------------------------------------------------
-
-.globl C(D_DrawNonSubdiv)
-C(D_DrawNonSubdiv):
-	pushl	%ebp				// preserve caller stack frame pointer
-	movl	C(r_affinetridesc)+atd_numtriangles,%ebp
-	pushl	%ebx
-	shll	$(mtri_shift),%ebp
-	pushl	%esi				// preserve register variables
-	movl	C(r_affinetridesc)+atd_ptriangles,%esi
-	pushl	%edi
-
-//	mtriangle_t		*ptri;
-//	finalvert_t		*pfv, *index0, *index1, *index2;
-//	int				i;
-//	int				lnumtriangles;
-
-//	pfv = r_affinetridesc.pfinalverts;
-//	ptri = r_affinetridesc.ptriangles;
-//	lnumtriangles = r_affinetridesc.numtriangles;
-
-LNDLoop:
-
-//	for (i=0 ; i<lnumtriangles ; i++, ptri++)
-//	{
-//		index0 = pfv + ptri->vertindex[0];
-//		index1 = pfv + ptri->vertindex[1];
-//		index2 = pfv + ptri->vertindex[2];
-	movl	C(r_affinetridesc)+atd_pfinalverts,%edi
-	movl	mtri_vertindex+0-mtri_size(%esi,%ebp,1),%ecx
-	shll	$(fv_shift),%ecx
-	movl	mtri_vertindex+4-mtri_size(%esi,%ebp,1),%edx
-	shll	$(fv_shift),%edx
-	movl	mtri_vertindex+8-mtri_size(%esi,%ebp,1),%ebx
-	shll	$(fv_shift),%ebx
-	addl	%edi,%ecx
-	addl	%edi,%edx
-	addl	%edi,%ebx
-
-//		d_xdenom = (index0->v[1]-index1->v[1]) *
-//				(index0->v[0]-index2->v[0]) -
-//				(index0->v[0]-index1->v[0])*(index0->v[1]-index2->v[1]);
-	movl	fv_v+4(%ecx),%eax
-	movl	fv_v+0(%ecx),%esi
-	subl	fv_v+4(%edx),%eax
-	subl	fv_v+0(%ebx),%esi
-	imull	%esi,%eax
-	movl	fv_v+0(%ecx),%esi
-	movl	fv_v+4(%ecx),%edi
-	subl	fv_v+0(%edx),%esi
-	subl	fv_v+4(%ebx),%edi
-	imull	%esi,%edi
-	subl	%edi,%eax
-
-//		if (d_xdenom >= 0)
-//		{
-//			continue;
-	jns		LNextTri
-
-//		}
-
-	movl	%eax,C(d_xdenom)
-	fildl	C(d_xdenom)
-
-//		r_p0[0] = index0->v[0];		// u
-//		r_p0[1] = index0->v[1];		// v
-//		r_p0[2] = index0->v[2];		// s
-//		r_p0[3] = index0->v[3];		// t
-//		r_p0[4] = index0->v[4];		// light
-//		r_p0[5] = index0->v[5];		// iz
-	movl	fv_v+0(%ecx),%eax
-	movl	fv_v+4(%ecx),%esi
-	movl	%eax,C(r_p0)+0
-	movl	%esi,C(r_p0)+4
-	movl	fv_v+8(%ecx),%eax
-	movl	fv_v+12(%ecx),%esi
-	movl	%eax,C(r_p0)+8
-	movl	%esi,C(r_p0)+12
-	movl	fv_v+16(%ecx),%eax
-	movl	fv_v+20(%ecx),%esi
-	movl	%eax,C(r_p0)+16
-	movl	%esi,C(r_p0)+20
-
-	fdivrs	float_1
-
-//		r_p1[0] = index1->v[0];
-//		r_p1[1] = index1->v[1];
-//		r_p1[2] = index1->v[2];
-//		r_p1[3] = index1->v[3];
-//		r_p1[4] = index1->v[4];
-//		r_p1[5] = index1->v[5];
-	movl	fv_v+0(%edx),%eax
-	movl	fv_v+4(%edx),%esi
-	movl	%eax,C(r_p1)+0
-	movl	%esi,C(r_p1)+4
-	movl	fv_v+8(%edx),%eax
-	movl	fv_v+12(%edx),%esi
-	movl	%eax,C(r_p1)+8
-	movl	%esi,C(r_p1)+12
-	movl	fv_v+16(%edx),%eax
-	movl	fv_v+20(%edx),%esi
-	movl	%eax,C(r_p1)+16
-	movl	%esi,C(r_p1)+20
-
-//		r_p2[0] = index2->v[0];
-//		r_p2[1] = index2->v[1];
-//		r_p2[2] = index2->v[2];
-//		r_p2[3] = index2->v[3];
-//		r_p2[4] = index2->v[4];
-//		r_p2[5] = index2->v[5];
-	movl	fv_v+0(%ebx),%eax
-	movl	fv_v+4(%ebx),%esi
-	movl	%eax,C(r_p2)+0
-	movl	%esi,C(r_p2)+4
-	movl	fv_v+8(%ebx),%eax
-	movl	fv_v+12(%ebx),%esi
-	movl	%eax,C(r_p2)+8
-	movl	%esi,C(r_p2)+12
-	movl	fv_v+16(%ebx),%eax
-	movl	fv_v+20(%ebx),%esi
-	movl	%eax,C(r_p2)+16
-	movl	C(r_affinetridesc)+atd_ptriangles,%edi
-	movl	%esi,C(r_p2)+20
-	movl	mtri_facesfront-mtri_size(%edi,%ebp,1),%eax
-
-//		if (!ptri->facesfront)
-//		{
-	testl	%eax,%eax
-	jnz		LFacesFront
-
-//			if (index0->flags & ALIAS_ONSEAM)
-//				r_p0[2] += r_affinetridesc.seamfixupX16;
-	movl	fv_flags(%ecx),%eax
-	movl	fv_flags(%edx),%esi
-	movl	fv_flags(%ebx),%edi
-	testl	$(ALIAS_ONSEAM),%eax
-	movl	C(r_affinetridesc)+atd_seamfixupX16,%eax
-	jz		LOnseamDone0
-	addl	%eax,C(r_p0)+8
-LOnseamDone0:
-
-//			if (index1->flags & ALIAS_ONSEAM)
-// 				r_p1[2] += r_affinetridesc.seamfixupX16;
-	testl	$(ALIAS_ONSEAM),%esi
-	jz		LOnseamDone1
-	addl	%eax,C(r_p1)+8
-LOnseamDone1:
-
-//			if (index2->flags & ALIAS_ONSEAM)
-//				r_p2[2] += r_affinetridesc.seamfixupX16;
-	testl	$(ALIAS_ONSEAM),%edi
-	jz		LOnseamDone2
-	addl	%eax,C(r_p2)+8
-LOnseamDone2:
-
-//		}
-
-LFacesFront:
-
-	fstps	C(d_xdenom)
-
-//		D_PolysetSetEdgeTable ();
-//		D_RasterizeAliasPolySmooth ();
-		call	C(D_PolysetSetEdgeTable)
-		call	C(D_RasterizeAliasPolySmooth)
-
-LNextTri:
-		movl	C(r_affinetridesc)+atd_ptriangles,%esi
-		subl	$16,%ebp
-		jnz		LNDLoop
-//	}
-
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-
-	addl	$(SPAN_SIZE),%esp
-
-	ret
-
-
-#endif	// id386
-
--- a/u/d_scana.s
+++ /dev/null
@@ -1,70 +1,0 @@
-//
-// d_scana.s
-// x86 assembly-language turbulent texture mapping code
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef id386
-
-	.data
-
-	.text
-
-//----------------------------------------------------------------------
-// turbulent texture mapping code
-//----------------------------------------------------------------------
-
-	.align 4
-.globl C(D_DrawTurbulent8Span)
-C(D_DrawTurbulent8Span):
-	pushl	%ebp				// preserve caller's stack frame pointer
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-	pushl	%ebx
-
-	movl	C(r_turb_s),%esi
-	movl	C(r_turb_t),%ecx
-	movl	C(r_turb_pdest),%edi
-	movl	C(r_turb_spancount),%ebx
-
-Llp:
-	movl	%ecx,%eax
-	movl	%esi,%edx
-	sarl	$16,%eax
-	movl	C(r_turb_turb),%ebp
-	sarl	$16,%edx
-	andl	$(CYCLE-1),%eax
-	andl	$(CYCLE-1),%edx
-	movl	(%ebp,%eax,4),%eax
-	movl	(%ebp,%edx,4),%edx
-	addl	%esi,%eax
-	sarl	$16,%eax
-	addl	%ecx,%edx
-	sarl	$16,%edx
-	andl	$(TURB_TEX_SIZE-1),%eax
-	andl	$(TURB_TEX_SIZE-1),%edx
-	shll	$6,%edx
-	movl	C(r_turb_pbase),%ebp
-	addl	%eax,%edx
-	incl	%edi
-	addl	C(r_turb_sstep),%esi
-	addl	C(r_turb_tstep),%ecx
-	movb	(%ebp,%edx,1),%dl
-	decl	%ebx
-	movb	%dl,-1(%edi)
-	jnz		Llp
-
-	movl	%edi,C(r_turb_pdest)
-
-	popl	%ebx				// restore register variables
-	popl	%edi
-	popl	%esi
-	popl	%ebp				// restore caller's stack frame pointer
-	ret
-
-#endif	// id386
-
--- a/u/d_spr8.s
+++ /dev/null
@@ -1,881 +1,0 @@
-//
-// d_spr8.s
-// x86 assembly-language horizontal 8-bpp transparent span-drawing code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-
-#ifdef id386
-
-//----------------------------------------------------------------------
-// 8-bpp horizontal span drawing code for polygons, with transparency.
-//----------------------------------------------------------------------
-
-	.text
-
-// out-of-line, rarely-needed clamping code
-
-LClampHigh0:
-	movl	C(bbextents),%esi
-	jmp		LClampReentry0
-LClampHighOrLow0:
-	jg		LClampHigh0
-	xorl	%esi,%esi
-	jmp		LClampReentry0
-
-LClampHigh1:
-	movl	C(bbextentt),%edx
-	jmp		LClampReentry1
-LClampHighOrLow1:
-	jg		LClampHigh1
-	xorl	%edx,%edx
-	jmp		LClampReentry1
-
-LClampLow2:
-	movl	$2048,%ebp
-	jmp		LClampReentry2
-LClampHigh2:
-	movl	C(bbextents),%ebp
-	jmp		LClampReentry2
-
-LClampLow3:
-	movl	$2048,%ecx
-	jmp		LClampReentry3
-LClampHigh3:
-	movl	C(bbextentt),%ecx
-	jmp		LClampReentry3
-
-LClampLow4:
-	movl	$2048,%eax
-	jmp		LClampReentry4
-LClampHigh4:
-	movl	C(bbextents),%eax
-	jmp		LClampReentry4
-
-LClampLow5:
-	movl	$2048,%ebx
-	jmp		LClampReentry5
-LClampHigh5:
-	movl	C(bbextentt),%ebx
-	jmp		LClampReentry5
-
-
-#define pspans	4+16
-
-	.align 4
-.globl C(D_SpriteDrawSpans)
-C(D_SpriteDrawSpans):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-//
-// set up scaled-by-8 steps, for 8-long segments; also set up cacheblock
-// and span list pointers, and 1/z step in 0.32 fixed-point
-//
-// FIXME: any overlap from rearranging?
-	flds	C(d_sdivzstepu)
-	fmuls	fp_8
-	movl	C(cacheblock),%edx
-	flds	C(d_tdivzstepu)
-	fmuls	fp_8
-	movl	pspans(%esp),%ebx	// point to the first span descriptor
-	flds	C(d_zistepu)
-	fmuls	fp_8
-	movl	%edx,pbase			// pbase = cacheblock
-	flds	C(d_zistepu)
-	fmuls	fp_64kx64k
-	fxch	%st(3)
-	fstps	sdivz8stepu
-	fstps	zi8stepu
-	fstps	tdivz8stepu
-	fistpl	izistep
-	movl	izistep,%eax
-	rorl	$16,%eax		// put upper 16 bits in low word
-	movl	sspan_t_count(%ebx),%ecx
-	movl	%eax,izistep
-
-	cmpl	$0,%ecx
-	jle		LNextSpan
-
-LSpanLoop:
-
-//
-// set up the initial s/z, t/z, and 1/z on the FP stack, and generate the
-// initial s and t values
-//
-// FIXME: pipeline FILD?
-	fildl	sspan_t_v(%ebx)
-	fildl	sspan_t_u(%ebx)
-
-	fld		%st(1)			// dv | du | dv
-	fmuls	C(d_sdivzstepv)	// dv*d_sdivzstepv | du | dv
-	fld		%st(1)			// du | dv*d_sdivzstepv | du | dv
-	fmuls	C(d_sdivzstepu)	// du*d_sdivzstepu | dv*d_sdivzstepv | du | dv
-	fld		%st(2)			// du | du*d_sdivzstepu | dv*d_sdivzstepv | du | dv
-	fmuls	C(d_tdivzstepu)	// du*d_tdivzstepu | du*d_sdivzstepu |
-							//  dv*d_sdivzstepv | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu | du*d_tdivzstepu |
-							//  dv*d_sdivzstepv | du | dv
-	faddp	%st(0),%st(2)	// du*d_tdivzstepu |
-							//  du*d_sdivzstepu + dv*d_sdivzstepv | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fld		%st(3)			// dv | du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fmuls	C(d_tdivzstepv)	// dv*d_tdivzstepv |
-							//  du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  du*d_tdivzstepu | du | dv
-	fxch	%st(1)			// du*d_sdivzstepu + dv*d_sdivzstepv |
-							//  dv*d_tdivzstepv | du*d_tdivzstepu | du | dv
-	fadds	C(d_sdivzorigin) // sdivz = d_sdivzorigin + dv*d_sdivzstepv +
-							//  du*d_sdivzstepu; stays in %st(2) at end
-	fxch	%st(4)			// dv | dv*d_tdivzstepv | du*d_tdivzstepu | du |
-							//  s/z
-	fmuls	C(d_zistepv)		// dv*d_zistepv | dv*d_tdivzstepv |
-							//  du*d_tdivzstepu | du | s/z
-	fxch	%st(1)			// dv*d_tdivzstepv |  dv*d_zistepv |
-							//  du*d_tdivzstepu | du | s/z
-	faddp	%st(0),%st(2)	// dv*d_zistepv |
-							//  dv*d_tdivzstepv + du*d_tdivzstepu | du | s/z
-	fxch	%st(2)			// du | dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  dv*d_zistepv | s/z
-	fmuls	C(d_zistepu)		// du*d_zistepu |
-							//  dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  dv*d_zistepv | s/z
-	fxch	%st(1)			// dv*d_tdivzstepv + du*d_tdivzstepu |
-							//  du*d_zistepu | dv*d_zistepv | s/z
-	fadds	C(d_tdivzorigin)	// tdivz = d_tdivzorigin + dv*d_tdivzstepv +
-							//  du*d_tdivzstepu; stays in %st(1) at end
-	fxch	%st(2)			// dv*d_zistepv | du*d_zistepu | t/z | s/z
-	faddp	%st(0),%st(1)	// dv*d_zistepv + du*d_zistepu | t/z | s/z
-
-	flds	fp_64k			// fp_64k | dv*d_zistepv + du*d_zistepu | t/z | s/z
-	fxch	%st(1)			// dv*d_zistepv + du*d_zistepu | fp_64k | t/z | s/z
-	fadds	C(d_ziorigin)		// zi = d_ziorigin + dv*d_zistepv +
-							//  du*d_zistepu; stays in %st(0) at end
-							// 1/z | fp_64k | t/z | s/z
-
-	fld		%st(0)			// FIXME: get rid of stall on FMUL?
-	fmuls	fp_64kx64k
-	fxch	%st(1)
-
-//
-// calculate and clamp s & t
-//
-	fdivr	%st(0),%st(2)	// 1/z | z*64k | t/z | s/z
-	fxch	%st(1)
-
-	fistpl	izi				// 0.32 fixed-point 1/z
-	movl	izi,%ebp
-
-//
-// set pz to point to the first z-buffer pixel in the span
-//
-	rorl	$16,%ebp		// put upper 16 bits in low word
-	movl	sspan_t_v(%ebx),%eax
-	movl	%ebp,izi
-	movl	sspan_t_u(%ebx),%ebp
-	imull	C(d_zrowbytes)
-	shll	$1,%ebp					// a word per pixel
-	addl	C(d_pzbuffer),%eax
-	addl	%ebp,%eax
-	movl	%eax,pz
-
-//
-// point %edi to the first pixel in the span
-//
-	movl	C(d_viewbuffer),%ebp
-	movl	sspan_t_v(%ebx),%eax
-	pushl	%ebx		// preserve spans pointer
-	movl	C(tadjust),%edx
-	movl	C(sadjust),%esi
-	movl	C(d_scantable)(,%eax,4),%edi	// v * screenwidth
-	addl	%ebp,%edi
-	movl	sspan_t_u(%ebx),%ebp
-	addl	%ebp,%edi				// pdest = &pdestspan[scans->u];
-
-//
-// now start the FDIV for the end of the span
-//
-	cmpl	$8,%ecx
-	ja		LSetupNotLast1
-
-	decl	%ecx
-	jz		LCleanup1		// if only one pixel, no need to start an FDIV
-	movl	%ecx,spancountminus1
-
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-
-	fildl	spancountminus1
-
-	flds	C(d_tdivzstepu)	// _d_tdivzstepu | spancountminus1
-	flds	C(d_zistepu)	// _d_zistepu | _d_tdivzstepu | spancountminus1
-	fmul	%st(2),%st(0)	// _d_zistepu*scm1 | _d_tdivzstepu | scm1
-	fxch	%st(1)			// _d_tdivzstepu | _d_zistepu*scm1 | scm1
-	fmul	%st(2),%st(0)	// _d_tdivzstepu*scm1 | _d_zistepu*scm1 | scm1
-	fxch	%st(2)			// scm1 | _d_zistepu*scm1 | _d_tdivzstepu*scm1
-	fmuls	C(d_sdivzstepu)	// _d_sdivzstepu*scm1 | _d_zistepu*scm1 |
-							//  _d_tdivzstepu*scm1
-	fxch	%st(1)			// _d_zistepu*scm1 | _d_sdivzstepu*scm1 |
-							//  _d_tdivzstepu*scm1
-	faddp	%st(0),%st(3)	// _d_sdivzstepu*scm1 | _d_tdivzstepu*scm1
-	fxch	%st(1)			// _d_tdivzstepu*scm1 | _d_sdivzstepu*scm1
-	faddp	%st(0),%st(3)	// _d_sdivzstepu*scm1
-	faddp	%st(0),%st(3)
-
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// this is what we've gone to all this trouble to
-							//  overlap
-	jmp		LFDIVInFlight1
-
-LCleanup1:
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-	jmp		LFDIVInFlight1
-
-	.align	4
-LSetupNotLast1:
-// finish up the s and t calcs
-	fxch	%st(1)			// z*64k | 1/z | t/z | s/z
-
-	fld		%st(0)			// z*64k | z*64k | 1/z | t/z | s/z
-	fmul	%st(4),%st(0)	// s | z*64k | 1/z | t/z | s/z
-	fxch	%st(1)			// z*64k | s | 1/z | t/z | s/z
-	fmul	%st(3),%st(0)	// t | s | 1/z | t/z | s/z
-	fxch	%st(1)			// s | t | 1/z | t/z | s/z
-	fistpl	s				// 1/z | t | t/z | s/z
-	fistpl	t				// 1/z | t/z | s/z
-
-	fadds	zi8stepu
-	fxch	%st(2)
-	fadds	sdivz8stepu
-	fxch	%st(2)
-	flds	tdivz8stepu
-	faddp	%st(0),%st(2)
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// z = 1/1/z
-							// this is what we've gone to all this trouble to
-							//  overlap
-LFDIVInFlight1:
-
-	addl	s,%esi
-	addl	t,%edx
-	movl	C(bbextents),%ebx
-	movl	C(bbextentt),%ebp
-	cmpl	%ebx,%esi
-	ja		LClampHighOrLow0
-LClampReentry0:
-	movl	%esi,s
-	movl	pbase,%ebx
-	shll	$16,%esi
-	cmpl	%ebp,%edx
-	movl	%esi,sfracf
-	ja		LClampHighOrLow1
-LClampReentry1:
-	movl	%edx,t
-	movl	s,%esi					// sfrac = scans->sfrac;
-	shll	$16,%edx
-	movl	t,%eax					// tfrac = scans->tfrac;
-	sarl	$16,%esi
-	movl	%edx,tfracf
-
-//
-// calculate the texture starting address
-//
-	sarl	$16,%eax
-	addl	%ebx,%esi
-	imull	C(cachewidth),%eax		// (tfrac >> 16) * cachewidth
-	addl	%eax,%esi				// psource = pbase + (sfrac >> 16) +
-									//           ((tfrac >> 16) * cachewidth);
-
-//
-// determine whether last span or not
-//
-	cmpl	$8,%ecx
-	jna		LLastSegment
-
-//
-// not the last segment; do full 8-wide segment
-//
-LNotLastSegment:
-
-//
-// advance s/z, t/z, and 1/z, and calculate s & t at end of span and steps to
-// get there
-//
-
-// pick up after the FDIV that was left in flight previously
-
-	fld		%st(0)			// duplicate it
-	fmul	%st(4),%st(0)	// s = s/z * z
-	fxch	%st(1)
-	fmul	%st(3),%st(0)	// t = t/z * z
-	fxch	%st(1)
-	fistpl	snext
-	fistpl	tnext
-	movl	snext,%eax
-	movl	tnext,%edx
-
-	subl	$8,%ecx		// count off this segments' pixels
-	movl	C(sadjust),%ebp
-	pushl	%ecx		// remember count of remaining pixels
-	movl	C(tadjust),%ecx
-
-	addl	%eax,%ebp
-	addl	%edx,%ecx
-
-	movl	C(bbextents),%eax
-	movl	C(bbextentt),%edx
-
-	cmpl	$2048,%ebp
-	jl		LClampLow2
-	cmpl	%eax,%ebp
-	ja		LClampHigh2
-LClampReentry2:
-
-	cmpl	$2048,%ecx
-	jl		LClampLow3
-	cmpl	%edx,%ecx
-	ja		LClampHigh3
-LClampReentry3:
-
-	movl	%ebp,snext
-	movl	%ecx,tnext
-
-	subl	s,%ebp
-	subl	t,%ecx
-	
-//
-// set up advancetable
-//
-	movl	%ecx,%eax
-	movl	%ebp,%edx
-	sarl	$19,%edx			// sstep >>= 16;
-	movl	C(cachewidth),%ebx
-	sarl	$19,%eax			// tstep >>= 16;
-	jz		LIsZero
-	imull	%ebx,%eax			// (tstep >> 16) * cachewidth;
-LIsZero:
-	addl	%edx,%eax			// add in sstep
-								// (tstep >> 16) * cachewidth + (sstep >> 16);
-	movl	tfracf,%edx
-	movl	%eax,advancetable+4	// advance base in t
-	addl	%ebx,%eax			// ((tstep >> 16) + 1) * cachewidth +
-								//  (sstep >> 16);
-	shll	$13,%ebp			// left-justify sstep fractional part
-	movl	%ebp,sstep
-	movl	sfracf,%ebx
-	shll	$13,%ecx			// left-justify tstep fractional part
-	movl	%eax,advancetable	// advance extra in t
-	movl	%ecx,tstep
-
-	movl	pz,%ecx
-	movl	izi,%ebp
-
-	cmpw	(%ecx),%bp
-	jl		Lp1
-	movb	(%esi),%al			// get first source texel
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp1
-	movw	%bp,(%ecx)
-	movb	%al,(%edi)			// store first dest pixel
-Lp1:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx			// advance tfrac fractional part by tstep frac
-
-	sbbl	%eax,%eax			// turn tstep carry into -1 (0 if none)
-	addl	sstep,%ebx			// advance sfrac fractional part by sstep frac
-	adcl	advancetable+4(,%eax,4),%esi	// point to next source texel
-
-	cmpw	2(%ecx),%bp
-	jl		Lp2
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp2
-	movw	%bp,2(%ecx)
-	movb	%al,1(%edi)
-Lp2:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-	cmpw	4(%ecx),%bp
-	jl		Lp3
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp3
-	movw	%bp,4(%ecx)
-	movb	%al,2(%edi)
-Lp3:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-	cmpw	6(%ecx),%bp
-	jl		Lp4
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp4
-	movw	%bp,6(%ecx)
-	movb	%al,3(%edi)
-Lp4:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-	cmpw	8(%ecx),%bp
-	jl		Lp5
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp5
-	movw	%bp,8(%ecx)
-	movb	%al,4(%edi)
-Lp5:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-//
-// start FDIV for end of next segment in flight, so it can overlap
-//
-	popl	%eax
-	cmpl	$8,%eax			// more than one segment after this?
-	ja		LSetupNotLast2	// yes
-
-	decl	%eax
-	jz		LFDIVInFlight2	// if only one pixel, no need to start an FDIV
-	movl	%eax,spancountminus1
-	fildl	spancountminus1
-
-	flds	C(d_zistepu)		// _d_zistepu | spancountminus1
-	fmul	%st(1),%st(0)	// _d_zistepu*scm1 | scm1
-	flds	C(d_tdivzstepu)	// _d_tdivzstepu | _d_zistepu*scm1 | scm1
-	fmul	%st(2),%st(0)	// _d_tdivzstepu*scm1 | _d_zistepu*scm1 | scm1
-	fxch	%st(1)			// _d_zistepu*scm1 | _d_tdivzstepu*scm1 | scm1
-	faddp	%st(0),%st(3)	// _d_tdivzstepu*scm1 | scm1
-	fxch	%st(1)			// scm1 | _d_tdivzstepu*scm1
-	fmuls	C(d_sdivzstepu)	// _d_sdivzstepu*scm1 | _d_tdivzstepu*scm1
-	fxch	%st(1)			// _d_tdivzstepu*scm1 | _d_sdivzstepu*scm1
-	faddp	%st(0),%st(3)	// _d_sdivzstepu*scm1
-	flds	fp_64k			// 64k | _d_sdivzstepu*scm1
-	fxch	%st(1)			// _d_sdivzstepu*scm1 | 64k
-	faddp	%st(0),%st(4)	// 64k
-
-	fdiv	%st(1),%st(0)	// this is what we've gone to all this trouble to
-							//  overlap
-	jmp		LFDIVInFlight2
-
-	.align	4
-LSetupNotLast2:
-	fadds	zi8stepu
-	fxch	%st(2)
-	fadds	sdivz8stepu
-	fxch	%st(2)
-	flds	tdivz8stepu
-	faddp	%st(0),%st(2)
-	flds	fp_64k
-	fdiv	%st(1),%st(0)	// z = 1/1/z
-							// this is what we've gone to all this trouble to
-							//  overlap
-LFDIVInFlight2:
-	pushl	%eax
-
-	cmpw	10(%ecx),%bp
-	jl		Lp6
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp6
-	movw	%bp,10(%ecx)
-	movb	%al,5(%edi)
-Lp6:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-	cmpw	12(%ecx),%bp
-	jl		Lp7
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp7
-	movw	%bp,12(%ecx)
-	movb	%al,6(%edi)
-Lp7:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-	cmpw	14(%ecx),%bp
-	jl		Lp8
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp8
-	movw	%bp,14(%ecx)
-	movb	%al,7(%edi)
-Lp8:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-	addl	$8,%edi
-	addl	$16,%ecx
-	movl	%edx,tfracf
-	movl	snext,%edx
-	movl	%ebx,sfracf
-	movl	tnext,%ebx
-	movl	%edx,s
-	movl	%ebx,t
-
-	movl	%ecx,pz
-	movl	%ebp,izi
-
-	popl	%ecx				// retrieve count
-
-//
-// determine whether last span or not
-//
-	cmpl	$8,%ecx				// are there multiple segments remaining?
-	ja		LNotLastSegment		// yes
-
-//
-// last segment of scan
-//
-LLastSegment:
-
-//
-// advance s/z, t/z, and 1/z, and calculate s & t at end of span and steps to
-// get there. The number of pixels left is variable, and we want to land on the
-// last pixel, not step one past it, so we can't run into arithmetic problems
-//
-	testl	%ecx,%ecx
-	jz		LNoSteps		// just draw the last pixel and we're done
-
-// pick up after the FDIV that was left in flight previously
-
-
-	fld		%st(0)			// duplicate it
-	fmul	%st(4),%st(0)	// s = s/z * z
-	fxch	%st(1)
-	fmul	%st(3),%st(0)	// t = t/z * z
-	fxch	%st(1)
-	fistpl	snext
-	fistpl	tnext
-
-	movl	C(tadjust),%ebx
-	movl	C(sadjust),%eax
-
-	addl	snext,%eax
-	addl	tnext,%ebx
-
-	movl	C(bbextents),%ebp
-	movl	C(bbextentt),%edx
-
-	cmpl	$2048,%eax
-	jl		LClampLow4
-	cmpl	%ebp,%eax
-	ja		LClampHigh4
-LClampReentry4:
-	movl	%eax,snext
-
-	cmpl	$2048,%ebx
-	jl		LClampLow5
-	cmpl	%edx,%ebx
-	ja		LClampHigh5
-LClampReentry5:
-
-	cmpl	$1,%ecx			// don't bother 
-	je		LOnlyOneStep	// if two pixels in segment, there's only one step,
-							//  of the segment length
-	subl	s,%eax
-	subl	t,%ebx
-
-	addl	%eax,%eax		// convert to 15.17 format so multiply by 1.31
-	addl	%ebx,%ebx		//  reciprocal yields 16.48
-	imull	reciprocal_table-8(,%ecx,4) // sstep = (snext - s) / (spancount-1)
-	movl	%edx,%ebp
-
-	movl	%ebx,%eax
-	imull	reciprocal_table-8(,%ecx,4) // tstep = (tnext - t) / (spancount-1)
-
-LSetEntryvec:
-//
-// set up advancetable
-//
-	movl	spr8entryvec_table(,%ecx,4),%ebx
-	movl	%edx,%eax
-	pushl	%ebx				// entry point into code for RET later
-	movl	%ebp,%ecx
-	sarl	$16,%ecx			// sstep >>= 16;
-	movl	C(cachewidth),%ebx
-	sarl	$16,%edx			// tstep >>= 16;
-	jz		LIsZeroLast
-	imull	%ebx,%edx			// (tstep >> 16) * cachewidth;
-LIsZeroLast:
-	addl	%ecx,%edx			// add in sstep
-								// (tstep >> 16) * cachewidth + (sstep >> 16);
-	movl	tfracf,%ecx
-	movl	%edx,advancetable+4	// advance base in t
-	addl	%ebx,%edx			// ((tstep >> 16) + 1) * cachewidth +
-								//  (sstep >> 16);
-	shll	$16,%ebp			// left-justify sstep fractional part
-	movl	sfracf,%ebx
-	shll	$16,%eax			// left-justify tstep fractional part
-	movl	%edx,advancetable	// advance extra in t
-
-	movl	%eax,tstep
-	movl	%ebp,sstep
-	movl	%ecx,%edx
-
-	movl	pz,%ecx
-	movl	izi,%ebp
-
-	ret							// jump to the number-of-pixels handler
-
-//----------------------------------------
-
-LNoSteps:
-	movl	pz,%ecx
-	subl	$7,%edi			// adjust for hardwired offset
-	subl	$14,%ecx
-	jmp		LEndSpan
-
-
-LOnlyOneStep:
-	subl	s,%eax
-	subl	t,%ebx
-	movl	%eax,%ebp
-	movl	%ebx,%edx
-	jmp		LSetEntryvec
-
-//----------------------------------------
-
-.globl	Spr8Entry2_8
-Spr8Entry2_8:
-	subl	$6,%edi		// adjust for hardwired offsets
-	subl	$12,%ecx
-	movb	(%esi),%al
-	jmp		LLEntry2_8
-
-//----------------------------------------
-
-.globl	Spr8Entry3_8
-Spr8Entry3_8:
-	subl	$5,%edi		// adjust for hardwired offsets
-	subl	$10,%ecx
-	jmp		LLEntry3_8
-
-//----------------------------------------
-
-.globl	Spr8Entry4_8
-Spr8Entry4_8:
-	subl	$4,%edi		// adjust for hardwired offsets
-	subl	$8,%ecx
-	jmp		LLEntry4_8
-
-//----------------------------------------
-
-.globl	Spr8Entry5_8
-Spr8Entry5_8:
-	subl	$3,%edi		// adjust for hardwired offsets
-	subl	$6,%ecx
-	jmp		LLEntry5_8
-
-//----------------------------------------
-
-.globl	Spr8Entry6_8
-Spr8Entry6_8:
-	subl	$2,%edi		// adjust for hardwired offsets
-	subl	$4,%ecx
-	jmp		LLEntry6_8
-
-//----------------------------------------
-
-.globl	Spr8Entry7_8
-Spr8Entry7_8:
-	decl	%edi		// adjust for hardwired offsets
-	subl	$2,%ecx
-	jmp		LLEntry7_8
-
-//----------------------------------------
-
-.globl	Spr8Entry8_8
-Spr8Entry8_8:
-	cmpw	(%ecx),%bp
-	jl		Lp9
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp9
-	movw	%bp,(%ecx)
-	movb	%al,(%edi)
-Lp9:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-LLEntry7_8:
-	cmpw	2(%ecx),%bp
-	jl		Lp10
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp10
-	movw	%bp,2(%ecx)
-	movb	%al,1(%edi)
-Lp10:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-LLEntry6_8:
-	cmpw	4(%ecx),%bp
-	jl		Lp11
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp11
-	movw	%bp,4(%ecx)
-	movb	%al,2(%edi)
-Lp11:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-LLEntry5_8:
-	cmpw	6(%ecx),%bp
-	jl		Lp12
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp12
-	movw	%bp,6(%ecx)
-	movb	%al,3(%edi)
-Lp12:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-LLEntry4_8:
-	cmpw	8(%ecx),%bp
-	jl		Lp13
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp13
-	movw	%bp,8(%ecx)
-	movb	%al,4(%edi)
-Lp13:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-LLEntry3_8:
-	cmpw	10(%ecx),%bp
-	jl		Lp14
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp14
-	movw	%bp,10(%ecx)
-	movb	%al,5(%edi)
-Lp14:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-LLEntry2_8:
-	cmpw	12(%ecx),%bp
-	jl		Lp15
-	movb	(%esi),%al
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp15
-	movw	%bp,12(%ecx)
-	movb	%al,6(%edi)
-Lp15:
-	addl	izistep,%ebp
-	adcl	$0,%ebp
-	addl	tstep,%edx
-	sbbl	%eax,%eax
-	addl	sstep,%ebx
-	adcl	advancetable+4(,%eax,4),%esi
-
-LEndSpan:
-	cmpw	14(%ecx),%bp
-	jl		Lp16
-	movb	(%esi),%al		// load first texel in segment
-	cmpb	$(TRANSPARENT_COLOR),%al
-	jz		Lp16
-	movw	%bp,14(%ecx)
-	movb	%al,7(%edi)
-Lp16:
-
-//
-// clear s/z, t/z, 1/z from FP stack
-//
-	fstp %st(0)
-	fstp %st(0)
-	fstp %st(0)
-
-	popl	%ebx				// restore spans pointer
-LNextSpan:
-	addl	$(sspan_t_size),%ebx // point to next span
-	movl	sspan_t_count(%ebx),%ecx
-	cmpl	$0,%ecx				// any more spans?
-	jg		LSpanLoop			// yes
-	jz		LNextSpan			// yes, but this one's empty
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-#endif	// id386
--- a/u/d_varsa.s
+++ /dev/null
@@ -1,186 +1,0 @@
-//
-// d_varsa.s
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef	id386
-
-	.data
-
-//-------------------------------------------------------
-// global refresh variables
-//-------------------------------------------------------
-
-// FIXME: put all refresh variables into one contiguous block. Make into one
-// big structure, like cl or sv?
-
-	.align	4
-.globl	C(d_sdivzstepu)
-.globl	C(d_tdivzstepu)
-.globl	C(d_zistepu)
-.globl	C(d_sdivzstepv)
-.globl	C(d_tdivzstepv)
-.globl	C(d_zistepv)
-.globl	C(d_sdivzorigin)
-.globl	C(d_tdivzorigin)
-.globl	C(d_ziorigin)
-C(d_sdivzstepu):	.single	0
-C(d_tdivzstepu):	.single	0
-C(d_zistepu):		.single	0
-C(d_sdivzstepv):	.single	0
-C(d_tdivzstepv):	.single	0
-C(d_zistepv):		.single	0
-C(d_sdivzorigin):	.single	0
-C(d_tdivzorigin):	.single	0
-C(d_ziorigin):		.single	0
-
-.globl	C(sadjust)
-.globl	C(tadjust)
-.globl	C(bbextents)
-.globl	C(bbextentt)
-C(sadjust):			.long	0
-C(tadjust):			.long	0
-C(bbextents):		.long	0
-C(bbextentt):		.long	0
-
-.globl	C(cacheblock)
-.globl	C(d_viewbuffer)
-.globl	C(cachewidth)
-.globl	C(d_pzbuffer)
-.globl	C(d_zrowbytes)
-.globl	C(d_zwidth)
-C(cacheblock):		.long	0
-C(cachewidth):		.long	0
-C(d_viewbuffer):	.long	0
-C(d_pzbuffer):		.long	0
-C(d_zrowbytes):		.long	0
-C(d_zwidth):		.long	0
-
-
-//-------------------------------------------------------
-// ASM-only variables
-//-------------------------------------------------------
-.globl	izi
-izi:			.long	0
-
-.globl	pbase, s, t, sfracf, tfracf, snext, tnext
-.globl	spancountminus1, zi16stepu, sdivz16stepu, tdivz16stepu
-.globl	zi8stepu, sdivz8stepu, tdivz8stepu, pz
-s:				.long	0
-t:				.long	0
-snext:			.long	0
-tnext:			.long	0
-sfracf:			.long	0
-tfracf:			.long	0
-pbase:			.long	0
-zi8stepu:		.long	0
-sdivz8stepu:	.long	0
-tdivz8stepu:	.long	0
-zi16stepu:		.long	0
-sdivz16stepu:	.long	0
-tdivz16stepu:	.long	0
-spancountminus1: .long	0
-pz:				.long	0
-
-.globl	izistep
-izistep:				.long	0
-
-//-------------------------------------------------------
-// local variables for d_draw16.s
-//-------------------------------------------------------
-
-.globl	reciprocal_table_16, entryvec_table_16
-// 1/2, 1/3, 1/4, 1/5, 1/6, 1/7, 1/8, 1/9, 1/10, 1/11, 1/12, 1/13,
-// 1/14, and 1/15 in 0.32 form
-reciprocal_table_16:	.long	0x40000000, 0x2aaaaaaa, 0x20000000
-						.long	0x19999999, 0x15555555, 0x12492492
-						.long	0x10000000, 0xe38e38e, 0xccccccc, 0xba2e8ba
-						.long	0xaaaaaaa, 0x9d89d89, 0x9249249, 0x8888888
-
-	.extern Entry2_16
-	.extern Entry3_16
-	.extern Entry4_16
-	.extern Entry5_16
-	.extern Entry6_16
-	.extern Entry7_16
-	.extern Entry8_16
-	.extern Entry9_16
-	.extern Entry10_16
-	.extern Entry11_16
-	.extern Entry12_16
-	.extern Entry13_16
-	.extern Entry14_16
-	.extern Entry15_16
-	.extern Entry16_16
-
-entryvec_table_16:	.long	0, Entry2_16, Entry3_16, Entry4_16
-					.long	Entry5_16, Entry6_16, Entry7_16, Entry8_16
-					.long	Entry9_16, Entry10_16, Entry11_16, Entry12_16
-					.long	Entry13_16, Entry14_16, Entry15_16, Entry16_16
-
-//-------------------------------------------------------
-// local variables for d_parta.s
-//-------------------------------------------------------
-.globl	DP_Count, DP_u, DP_v, DP_32768, DP_Color, DP_Pix, DP_EntryTable
-DP_Count:		.long	0
-DP_u:			.long	0
-DP_v:			.long	0
-DP_32768:		.single	32768.0
-DP_Color:		.long	0
-DP_Pix:			.long	0
-
-
-	.extern DP_1x1
-	.extern DP_2x2
-	.extern DP_3x3
-	.extern DP_4x4
-
-DP_EntryTable:	.long	DP_1x1, DP_2x2, DP_3x3, DP_4x4
-
-//
-// advancetable is 8 bytes, but points to the middle of that range so negative
-// offsets will work
-//
-.globl	advancetable, sstep, tstep, pspantemp, counttemp, jumptemp
-advancetable:	.long	0, 0
-sstep:			.long	0
-tstep:			.long	0
-
-pspantemp:		.long	0
-counttemp:		.long	0
-jumptemp:		.long	0
-
-// 1/2, 1/3, 1/4, 1/5, 1/6, and 1/7 in 0.32 form
-.globl	reciprocal_table, entryvec_table
-reciprocal_table:	.long	0x40000000, 0x2aaaaaaa, 0x20000000
-					.long	0x19999999, 0x15555555, 0x12492492
-
-	.extern Entry2_8
-	.extern Entry3_8
-	.extern Entry4_8
-	.extern Entry5_8
-	.extern Entry6_8
-	.extern Entry7_8
-	.extern Entry8_8
-
-entryvec_table:	.long	0, Entry2_8, Entry3_8, Entry4_8
-				.long	Entry5_8, Entry6_8, Entry7_8, Entry8_8
-
-	.extern Spr8Entry2_8
-	.extern Spr8Entry3_8
-	.extern Spr8Entry4_8
-	.extern Spr8Entry5_8
-	.extern Spr8Entry6_8
-	.extern Spr8Entry7_8
-	.extern Spr8Entry8_8
-	
-.globl spr8entryvec_table
-spr8entryvec_table:	.long	0, Spr8Entry2_8, Spr8Entry3_8, Spr8Entry4_8
-					.long	Spr8Entry5_8, Spr8Entry6_8, Spr8Entry7_8, Spr8Entry8_8
-
-#endif	// id386
-
--- a/u/data/COMEXP.TXT
+++ /dev/null
@@ -1,487 +1,0 @@
-        COMMERCIAL EXPLOITATION LICENSE AGREEMENT FOR QUAKE
-
-        This Commercial Exploitation License Agreement for QUAKE
-(the "Agreement") is between Id Software, Inc., a Texas
-Corporation, (hereinafter "Id Software") and Licensee (as described
-on the signature page hereof) and is made effective beginning on
-the date of last signature hereto (the "Effective Date"). 
-
-        R E C I T A L S
-
-        WHEREAS, Id Software is the owner and developer of the
-computer software game entitled QUAKE;
-
-        WHEREAS, Id Software desires to license certain
-non-exclusive rights regarding QUAKE to Licensee; and
-
-        WHEREAS, Licensee desires to receive a license for such
-rights. 
-
-        T E R M S    A N D    C O N D I T I O N S
- 
-        NOW, THEREFORE, for and in consideration of the mutual
-premises contained herein and for other good and valuable
-consideration, the receipt and sufficiency of which is hereby
-acknowledged, the undersigned parties do hereby agree as follows: 
-
-        1.      DEFINITIONS.  As used in this Agreement, the parties
-hereto agree the words set forth below shall have the specified
-meanings: 
-
-        a.      "Authorized Copy" shall mean one (1) copy of the
-                Subject Game actually purchased by Licensee from an
-                Id Software approved retailer; and 
-
-        b.      "Subject Game" shall mean the full registered
-                version of QUAKE on a CD-ROM and shall not mean the
-                shareware or any other version. 
-
-        2.      GRANT OF RIGHTS.  Id Software hereby grants to
-Licensee and Licensee hereby accepts, subject to the provisions and
-conditions hereof, a world-wide (except as otherwise provided
-herein), non-exclusive, non-transferable, and non-assignable
-license to: 
-
-        a.      publicly display an Authorized Copy in exchange for
-                rental payment; 
-
-        b.      run the Authorized Copy so that it will accept
-                network/modem connections in exchange for payments
-                from end-users who also must have actually purchased
-                an Authorized Copy; and 
-
-        c.      otherwise commercially exploit an Authorized Copy,
-                except that Licensee shall not copy, reproduce,
-                manufacture or distribute the Authorized Copy. 
-
-        3.      RESERVATION OF RIGHTS AND PROHIBITIONS.  Id Software
-expressly reserves all rights not granted herein.  Under no
-circumstances shall Licensee copy, reproduce, manufacture or
-distribute (free of charge or otherwise) the Authorized Copy or the
-Subject Game.  Licensee shall not reverse engineer, decompile,
-disassemble, modify or alter the Authorized Copy.  Licensee is not
-receiving any rights hereunder regarding the Trademark or any
-artwork, sound, music or other element of the Subject Game. 
-
-        4.      OWNERSHIP.  Title to and all ownership rights in and
-to the Subject Game, and the QUAKE Trademark (the "Trademark") and
-the copyrights, trademarks, patents and other intellectual property
-rights related thereto shall remain with Id Software which shall have
-the exclusive right to protect the same  by copyright or otherwise.
-Licensee shall have no ownership rights in or to the Subject Game or
-the Trademark and Licensee shall not own any intellectual property
-rights regarding the Authorized Copy, including, without limitation,
-the copyright regarding the Authorized Copy. Licensee acknowledges
-that it only has a limited license to use the Authorized Copy, as
-specified in that certain QUAKE Enduser License contained within the
-Authorized Copy and as specified in this Agreement.
-
-        5.      TERM AND TERMINATION.  
-
-        a.      The term of this Agreement and the license granted
-herein begins on the Effective Date and shall expire on a date one
-(1) calendar year from the Effective Date. 
-
-        b.      Either party may terminate this Agreement, for any
-reason or no reason, on thirty (30) days written notice to the
-other party.  Termination will be effective on the thirtieth (30th)
-day following delivery of the described notice.  Notwithstanding
-anything to the contrary herein, this Agreement shall immediately
-terminate, without the requirement of any notice from Id Software
-to Licensee, upon the occurrence of any of the following:  (a) if
-Licensee shall file a petition in bankruptcy or make an assignment
-for the benefit of creditors, or if any bankruptcy proceeding or
-assignment for benefit of creditors, shall be commenced against
-Licensee and not be dismissed within sixty (60) days after the date
-of its commencement; (b) the insolvency of Licensee; (c) the
-cessation by Licensee of its business; or (d) the cessation by
-Licensee, without the prior written consent of Id Software of the
-distribution, manufacture, and sale responsibilities embodied
-herein.  Further, Id Software may elect to terminate this Agreement
-upon the occurrence of any of the following:  (1) if Licensee's
-business operations are interrupted for forty (40) consecutive
-calendar days; or (2) if each of two Id Software audit inspections
-during any eighteen (18) month period demonstrates an
-understatement by Licensee of Royalty payments due Id Software for
-the six (6) month period immediately preceding each such inspection
-of five percent (5%) or more.  Upon the occurrence of such
-terminating event, and the election of Id Software, if necessary,
-to cause such termination, this Agreement and any and all rights
-thereunder shall terminate without prejudice to any rights or
-claims Id Software may have, and all rights hereunder shall
-thereupon terminate, revert to and be vested in Id Software. 
-
-        6.      EFFECT OF TERMINATION OR EXPIRATION.  Termination or
-expiration of this Agreement, either by Id Software or
-automatically, shall not create any liability against Id Software.
-Upon expiration or earlier termination of this Agreement, Licensee
-shall have no further right to exercise the rights licensed
-hereunder or otherwise acquired in relation to this Agreement. 
-
-        7.      INDEMNIFICATION.  Licensee hereby agrees to
-indemnify, hold harmless and defend Id Software and Id Software's
-predecessors, successors, assigns, officers, directors,
-shareholders, employees, agents, representatives, licensees,
-sublicensees, distributors, attorneys and accountants
-(collectively, the "Id Related Parties") from and against any and
-all damages, claims, losses, causes of action, liabilities,
-lawsuits, judgments and expenses (including, without limitation,
-reasonable attorneys' fees and expenses) arising from, relating to
-or in connection with a breach of this Agreement by Licensee and
-arising from, relating to or in connection with the Licensee's use
-or non-use of the Authorized Copy (collectively, the "Claims").  Id
-Software agrees to notify Licensee of any such Claims within a
-reasonable time after Id Software learns of same.  Licensee, at its
-own expense, shall defend Id Software and the Id Related Parties
-from any and all Claims.  Id Software and the Id Related Parties
-reserve the right to participate in any defense of the Claims with
-counsel of their choice, and at their own expense.  In the event
-Licensee fails to provide a defense, then Licensee shall be
-responsible for paying the attorneys' fees and expenses incurred by
-Id Software and the Id Related Parties regarding the defense of the
-Claims.  Id Software and the Id Related Parties, as applicable,
-agree to reasonably assist in the defense of the Claims.  No
-settlement by Licensee of any Claims shall be valid unless Licensee
-receives the prior written consent of Id Software and the Id
-Related Parties, as applicable, to any such settlement. 
-
-        8.      CONFIDENTIALITY.  It is understood and agreed that
-any proprietary information of Id Software that may from time to
-time be made available or become known to Licensee is to be treated
-as confidential, is to be used solely in connection with Licensee's
-performance under this Agreement, and is to be disclosed only to
-employees of Licensee who have a need for access.  Such proprietary
-information shall include, but not be limited to, trade secrets,
-release information, financial information, personnel information,
-and the like.  Reasonable measures shall be taken by Licensee to
-protect the confidentiality of Id Software's proprietary
-information and any memoranda or papers containing proprietary
-information of Id Software's that Licensee may receive are to be
-returned to Id Software upon request.  Licensee's obligations and
-duties under this paragraph shall survive expiration or earlier
-termination of this Agreement.  Licensee shall obtain from its
-employees an undertaking in a form which may be supplied by Id
-Software, and which is subject to Id Software's prior written
-approval, not to use or disclose to any third party any information
-or knowledge concerning the business of Id Software which may be
-communicated to such employees. 
-
-        9.      LIMITATION OF LIABILITY.  ID SOFTWARE EXPRESSLY
-DISCLAIMS ALL WARRANTIES NOT PROVIDED BY ID SOFTWARE HEREUNDER. 
-UNDER NO CIRCUMSTANCES SHALL ID SOFTWARE BE LIABLE TO LICENSEE FOR
-ACTUAL, SPECIAL, INCIDENTAL, CONSEQUENTIAL OR PUNITIVE DAMAGES OR
-ANY OTHER DAMAGES, WHETHER OR NOT ID SOFTWARE RECEIVES NOTICE OF
-ANY SUCH DAMAGES. 
-
-        10.     COMPLIANCE WITH APPLICABLE LAWS.  In performing
-under this Agreement, Licensee agrees to comply with all applicable
-laws, [including, without limitation, 22 U.S.C., 2778 and 22
-U.S.C. C.F.R. Parts 120-130 (1995)] regulations, ordinances and
-statutes, including, but not limited to, the import/export laws and
-regulations of the United States and its governmental and
-regulatory agencies (including, without limitation, the Bureau of
-Export Administration and the U.S. Department of Commerce) and all
-applicable international treaties and laws.  Further, Licensee
-shall defend, indemnify and hold harmless Id Software from any and
-all sales tax, tariffs and/or duties in connection with Licensee's
-performance hereunder. 
-
-        11.     SPECIFIC UNDERTAKINGS BY LICENSEE.  In addition to
-the obligations of Licensee otherwise set forth in this Agreement,
-during the term of this Agreement, and thereafter where specified,
-Licensee agrees that: 
-
-        a.      It will not attack the title of Id Software to the
-Subject Game or the Trademark and any copyright, patent or
-trademark or other intellectual property right related thereto and
-it will not attack the validity of the license granted hereunder
-during the term hereof or thereafter; and 
-
-        b.      It will promptly inform Id Software of any
-unauthorized use of the Authorized Copy, the Subject Game and the
-Trademark and any portions thereof and reasonably assist Id
-Software in the enforcement of any rights Id Software may have
-against such unauthorized users. 
-
-        12.     FINANCIAL OBLIGATIONS AND ACCOUNTING.
-
-        a.      Payment of Royalties.  Licensee agrees to pay Id
-Software a royalty ("Royalty") at the rate of twelve and one-half
-percent (12.5%) of Net Income.  The term "Net Income" shall mean
-all revenue received by Licensee from the commercial use of the
-Authorized Copy, less only Licensee's actual, documented costs
-relating directly to such use.  A Royalty shall only be due for
-those months in which Licensee's gross revenue from QUAKE
-distribution exceeds U.S. Five Thousand Dollars ($5,000.00) and in
-such months Licensee shall pay a full Royalty on all revenue
-received. 
-
-        b.      Rendition of Statements.  Licensee shall account to
-Id Software with regard to transactions hereunder within forty-five
-(45) days following the conclusion of each calendar quarter. 
-Licensee hereby represents and warrants that such statements of
-account to be prepared shall be true and correct.  The accounts
-shall show in summary form the appropriate calculations relating to
-the computation of Royalties, if any.  The statements shall also
-show the gross revenue received by Licensee per month.  The
-Royalties payable to Id Software hereunder shall be remitted with
-the particular statement indicating such amount to be due.  All
-statements hereunder shall be deemed rendered when deposited,
-postage prepaid, in the United States mail, addressed to Id
-Software at Id Software's address set forth on the signature page
-hereof. 
-
-        c.      Books of Account and Audits.  Licensee shall keep
-books of account relating to the commercial use of the Authorized
-Copy on the basis of generally accepted accounting principles and
-shall maintain such books of account for a period of at least two
-(2) years after the expiration or earlier termination of this
-Agreement; provided, however, that Licensee shall not be required
-to keep such records longer than seven (7) years from their date of
-origination.  Id Software may, upon reasonable notice and at its
-own expense, audit the applicable records at Licensee's office, in
-order to verify statements rendered hereunder.  Any such audit
-shall take place during reasonable business hours and in such
-manner so as not to interfere with Licensee's normal business
-activities.  Id Software agrees that such information inspected
-and/or copied on behalf of Id Software hereunder shall be used only
-for the purpose of determining the accuracy of the statements, and
-shall be revealed only to such officers, directors, employees,
-agents and/or representatives of Id Software as necessary to verify
-the accuracy of the statements.  If in an audit of Licensee's books
-and records it is determined that there is a short fall of ten
-percent (10%) or more in Royalties reported for any calendar
-quarter, in addition to payment of such short fall and interest as
-may be due, as provided herein, Licensee shall reimburse Id
-Software for the full out-of-pocket costs of the audit including
-reasonable travel costs and expenses; provided, however, that the
-amount of reimbursement paid by Licensee shall not exceed U.S.
-Fifteen Thousand Dollars ($15,000.00) for any audit. 
-
-        d.      Payment of the Royalty.  Licensee assumes all risks
-associated with fluctuations in foreign currency exchange rates. 
-Licensee shall pay and agrees to pay all sums due Id Software in
-United States Dollars.  With respect to Royalties due for
-commercial use outside the United States, other currencies shall be
-exchanged at the expense of Licensee into United States Dollars
-using the bid price quoted at the Citibank, N.A. of New York, New
-York, for the purchase of United States Dollars at the close of
-business on the last day of the calendar quarter during which any
-amounts accrue. Payment of the Royalties shall be made in Dallas
-County, Texas. 
-
-        e.      Interest.  If Id Software does not receive the
-applicable Royalty payment on or before the due date of such
-payment, Licensee agrees to pay and shall pay interest on Royalties
-owed to Id Software from such date as specified in the following
-sentence at a rate per annum equal to the Index Rate.  For purposes
-of clarification, the interest will begin to accrue on the first
-(1st) day following the due date of the Royalty payment, unless the
-Royalty payment is paid timely.  The "Index Rate" shall be the
-prime rate as published in The Wall Street Journal's "Money Rates"
-table.  If multiple prime rates are quoted in the table, then the
-highest prime rate will be the Index Rate.  In the event that the
-prime rate is no longer published in the "Money Rates" table, then
-Id Software will choose a substitute Index Rate which is based upon
-comparable information.  The applicable interest rate will be
-determined and take effect on the first day of each month. 
-
-        NOTHING HEREIN SHALL BE CONSTRUED AS A REQUEST OR DEMAND BY
-ID SOFTWARE OF INTEREST AT A RATE HIGHER THAN ALLOWED BY APPLICABLE
-LAW.  IT IS THE INTENT OF THE PARTIES HERETO THAT NO INTEREST BE
-CHARGED HEREUNDER WHICH EXCEEDS THE MAXIMUM RATE ALLOWED BY
-APPLICABLE LAW.  IF THE RATE REFERENCED ABOVE EXCEEDS THE MAXIMUM
-RATE ALLOWED BY APPLICABLE LAW, THEN THE INTEREST RATE MADE
-APPLICABLE HEREIN SHALL BE THE MAXIMUM RATE ALLOWED BY APPLICABLE
-LAW. 
-
-        13.     SUBLICENSE.  Licensee shall not be entitled to
-sublicense any of its rights under this Agreement.   
-
-        14.     GOODWILL.  Licensee recognizes the great value of
-the goodwill associated with the Subject Game and the Trademark,
-and acknowledges that such goodwill, now existing and hereafter
-created, exclusively belongs to Id Software and that the Trademark
-has acquired a secondary meaning in the mind of the public. 
-
-        15.     REMEDIES.  In the event of a breach of this
-Agreement by Id Software, Licensee's sole remedy shall be to
-terminate this Agreement.  In the event of a breach by Licensee of
-this Agreement, Id Software may pursue the remedies to which it is
-entitled under applicable law, including, but not limited to,
-termination of this Agreement.  Licensee agrees that its failure to
-comply with the terms of this Agreement upon expiration or earlier
-termination hereof or Licensee's unauthorized use of the Authorized
-Copy may result in immediate and irreparable damage to Id Software
-for which there is no adequate remedy at law, and in the event of
-such failure by Licensee, Id Software shall be entitled to
-injunctive relief.  Pursuit of any remedy by Id Software shall not
-constitute a waiver of any other right or remedy of Id Software
-under this Agreement or under applicable law.  Termination of this
-Agreement shall not be a pre-condition to Id Software pursuing its
-other remedies for breach. 
-
-        16.     LICENSEE'S WARRANTIES.  Licensee warrants and
-represents that it has full legal rights to enter into this
-Agreement and to perform its obligations hereunder and that it will
-comply, at all times during the terms of this Agreement, with all
-applicable laws, as set forth hereinabove. 
-
-        17.     BANKRUPTCY.  If Licensee's liabilities exceed its
-assets, or if Licensee becomes unable to pay its debts as they
-become due or if Licensee files for voluntary bankruptcy, or is
-placed in bankruptcy which is not dissolved or dismissed after
-thirty (30) days from the petition filing date, or if Licensee
-becomes insolvent, or makes an assignment for the benefit of its
-creditors or an arrangement pursuant to any bankruptcy laws or if
-Licensee discontinues its business or if a receiver is appointed
-for its business, this Agreement shall automatically terminate,
-without notice, and become null and void; provided, however, all
-duties of Licensee upon termination or expiration of this Agreement
-shall continue in full force and effect. 
-
-        18.     ENTIRE AGREEMENT AND ASSIGNMENT.  This Agreement
-constitutes the entire understanding between Licensee and Id
-Software regarding the Subject Game.  Each and every clause of this
-Agreement is severable from the whole and shall survive unless the
-entire Agreement is declared unenforceable.  No prior or present
-agreements or representations shall be binding upon any of the
-parties hereto unless incorporated in this Agreement.  No
-modification or change in this Agreement shall be valid or binding
-upon the parties unless in writing, executed by the parties to be
-bound thereby.  This Agreement shall bind and inure to the benefit
-of Id Software, its successors and assigns, and Id Software may
-assign its rights hereunder, in Id Software's sole discretion. 
-This Agreement is personal to Licensee, and Licensee shall not
-sublicense, assign, transfer, convey nor franchise its rights
-granted hereunder. 
-
-        19.     CHOICE OF LAW, VENUE AND SERVICE OF PROCESS.  This
-Agreement shall be construed in accordance with the laws of the
-State of Texas and applicable U.S. federal law and all claims
-and/or lawsuits in connection with this Agreement must be brought
-in Dallas County, Texas. Licensee hereby agrees that service of
-process by certified mail to the address set forth below, with
-return receipt requested, shall constitute valid service of process
-upon Licensee.  If for any reason Licensee has moved or cannot be
-validly served, then Licensee appoints the Secretary of State of
-the state of Texas to accept service of process on Licensee's 
-behalf. 
-
-        20.     EXCUSED PERFORMANCE.  Neither party shall be deemed
-to be in default of any provision of this Agreement nor be liable
-for any delay, failure in performance or interruption of service,
-resulting directly or indirectly from acts of God, civil or
-military authority, civil disturbance, military action, war,
-strikes, other catastrophes or any other similar cause beyond its
-reasonable control. Written notice to the non-affected party of any
-such condition shall be given by the affected party within ten (10)
-days of the event. 
-
-        21.     DELIVERY OF NOTICES, AND DELIVERY OF PAYMENTS. 
-Unless otherwise directed in writing by the parties, all notices
-given hereunder and all payments made hereunder shall be sent to
-the addresses set forth on the signature page hereof.   All
-notices, requests, consents and other communications under this
-Agreement shall be in writing and shall be deemed to have been
-delivered on the date personally delivered or on the date deposited
-in the United States Postal Service, postage prepaid, by certified
-mail, return receipt requested, or telegraphed and confirmed, or
-delivered by electronic facsimile and confirmed.  Any notice to Id
-Software shall also be sent to its counsel: D. Wade Cloud, Jr.,
-Hiersche, Martens, Hayward, Drakeley & Urbach, P.C., 15303 Dallas
-Parkway, Suite 700, LB 17, Dallas, Texas  75248. 
-
-        22.     NO PARTNERSHIP, ETC.  This Agreement does not
-constitute and shall not be construed as constituting a partnership
-or joint venture between Id Software and Licensee.  Neither party
-shall have any right to obligate or bind the other party in any
-manner whatsoever, and nothing herein contained shall give, or is
-intended to give, any rights of any kind to any third persons. 
-
-        23.     COUNTERPARTS.  This Agreement may be executed in
-several counterparts, each of which will be deemed to be an
-original, and each of which alone and all of which together, shall
-constitute one and the same instrument, but in making proof of this
-Agreement it shall not be necessary to produce or account for each
-copy of any counterpart other than the counterpart signed by the
-party against whom this Agreement is to be enforced.  This
-Agreement may be transmitted by facsimile, and it is the intent of
-the parties for the facsimile of any autograph printed by a
-receiving facsimile machine to be an original signature and for the
-facsimile and any complete photocopy of the Agreement to be deemed
-an original counterpart. 
-
-        24.     MEDIATION.  If a dispute arises out of or relates to
-this Agreement, or a breach of this Agreement, and if the dispute
-cannot be settled through direct discussion, then the parties agree
-to endeavor to settle the dispute in an amicable manner by
-mediation, under the applicable provisions of Section 154.00 et
-seq., Texas Civil Practices and Remedies Code, as supplemented by
-the rules of the Association of Attorney Mediators. 
-
-        25.     SURVIVAL.  The following provisions shall survive
-the expiration or earlier termination of this Agreement: 
-paragraphs 4., 7., 8., and the audit rights of Id Software in
-paragraph 12.c. 
-
-        26.     MISCELLANEOUS.  
-
-        a.      All captions in this Agreement are intended solely
-for the convenience of the parties, and none shall effect the
-meaning or construction of any provision. 
-
-        b.      The terms and conditions of this Agreement have been
-negotiated fully and freely among the parties.  Accordingly, the
-preparation of this Agreement by counsel for a given party will not
-be material to the construction hereof, and the terms of this
-Agreement shall not be strictly construed against such party. 
-
-        By signing in the spaces provided below, the parties have
-agreed to all of the terms and conditions set forth in this
-Agreement. 
-
-
-AGREED:
-
-LICENSEE:       
-
-
-Signed:_______________________________
-Printed Name:_________________________
-Title:________________________________
-Address:______________________________
-______________________________________
-______________________________________
-Telephone #: _________________________
-Fax #:________________________________
-E-Mail Address:_______________________
-Date: ________________________________
-
-
-AGREED:
-
-ID SOFTWARE, INC.
-
-
-Signed:_______________________________
-Printed Name:_________________________
-Title:________________________________
-Address:______________________________
-______________________________________
-______________________________________
-Telephone #: _________________________
-Fax #:________________________________
-E-Mail Address:_______________________
-Date: ________________________________
-
-
-
-June 10, 1996
-
-
-
-COMMERCIAL EXPLOITATION LICENSE AGREEMENT FOR QUAKE
-(DWC:dw:3406.0299:dwc\doc:5017)
-
-
--- a/u/data/HELP.TXT
+++ /dev/null
@@ -1,119 +1,0 @@
-TECH SUPPORT
-Any of the information listed below could change. Check the id software
-Web Site, at www.idsoftware.com, for updates.
-
-A. Tech Support Options
-id Software does charge for technical support, but we strive to offer
-this service at the lowest cost possible. Because volume on the support
-lines dictate costs, we periodically adjust our rates for Voice Tech
-Support. Check our web site for current pricing.
-
-Paying for Voice or Automated Support
-1 -- You can get Voice Support using a major credit card for a one-time
-shot.  The system asks for your credit card number and expiration date,
-then pre-authorizes your credit card for the tech support call. You will
-only be billed for the number of minutes actually used.
-
-2 -- You can assign yourself a rechargeable PIN account. The system prompts
-you for your credit card information, and assigns you a PIN account number.
-You can use the PIN to access Voice Support, Automated Support and the
-Game Hints Line. Once your account runs out, you can charge it up again.
-
-3 -- You may also charge up a PIN account using the number 1 (900) call-2-id.
-Then call back at 1(800)ID-GAMES (1(800)434-3627), and use your new PIN to
-receive all the support and hints you wish.
-
-4 -- id Software's Game Hints Line is accessible either using a PIN account
-via 1 (800) ID-GAMES (see above), or by calling 1 (900) CALL2-ID, which
-places the call on your phone bill.
-
-	1. Voice Support
-		Telephone -- 1 (800) id-games
-
-		Lines Open from 12 noon to 10pm Central Time, 7 Days a
-                week ($1.75 per minute). Closed some holidays
-
-                Please have the following information handy.
-			1.  Game title and version number. (The version
-                            number can be found on the end text screen.)
-			2.  Your operating system, processor, processor
-                            speed and amount of RAM.
-			3.  If you are having a sound, video or modem
-                            problem, we need to know the device brand name
-                            and model.
-
-	2. Automated Support
-		Telephone -- 1 (800) id-games 
-
-                Lines Open 24 hours a day, 365 days a year, or 366 days
-                in Leap years ($0.25 per minute)
-
-                Please have pencil and paper handy.
-
-	3. E-mail Support
-		Just send your e-mail to [email protected]
-
-                We will do our best to respond within 48 hours after
-                receiving your e-mail.
-
-                When sending e-mail, cut and paste the following into your
-                e-mail message and fill in the blanks:
-
-Date:  
-Name:  
-Phone number:  
-E-mail address:  (please include this, we redirect tons of mail)
-Game Title:  
-Version #:  
-Operating system (eg., DOS 6.0 or Windows 95):
-Computer type:  
-Processor type:  
-Processor speed:  
-Video card brand and model:  (only if video problem)
-Audio card brand and model:  (only if audio problem)
-Modem brand and model:  (only if modem problem)
-Network card brand and model:  (only if netgame problem)
-Network configuration (eg., NET.CFG file):  (only if netgame problem)
-Drivers, protocol stacks, and versions:  (eg., lsl v2.14, exp16odi
-v2.33, and ipxodi v3.01)  (only if netgame problem)
-If there were any error messages or fault information, report them
-here:
-Please state the problem you encountered:
-Please state how to reproduce the problem:
-
-	4. Web Support
-		Found at www.idsoftware.com
-
-		Our web support pages provide the same information that's
-                available via Automated Support, except it's free!
-
-	5. News Sites
-		For information, FAQ, or announcements:
-			rec.games.computer.quake.announce 
-		For editing and hecking Quake-related files:
-			rec.games.computer.quake.editing
-		For general Quake discussion:
-			 rec.games.computer.quake.misc
-
-	6. Game Hints Line
-		Telephone -- 1 (800) id-games or 1 (900) call-2-id
-
-                Lines Open 24 hours a day, 365 days a year, or 366 days
-                in Leap years ($0.85 per minute)
-                You must be 18 years of age or have parental permission
-                to call 1 (900) call-2-id.
-
-B. In Europe
-        The help lines in Europe are open 7:30am - 5:00pm GMT,
-        Monday - Friday.
-
-English:	+44 01923 209145
-German:		+44 (0)1923 209151
-French:		+44 (0)1923 209148
-
-C. Problems
-	If you have an unfavorable experience using our services, please
-        send e-mail to [email protected].  We would also like to hear
-        from you if you have something positive to share with us.  Kindly
-        include your full name, address, phone number, and the problem
-        encountered or information you'd like to tell us about.
--- a/u/data/LICINFO.TXT
+++ /dev/null
@@ -1,97 +1,0 @@
-Here is a brief explanation  of all the legal mumbo jumbo contained in the
-various license agreements that may or may not be part of this package.
-
-(This document was designed to be a quick overview of our license terms.
-You must refer to the full text of the license for a complete listing of 
-terms and conditions.)
-
-QUAKE SHAREWARE END USER LICENSE (slicnse.txt) or
-What You Can and Cannot Do With the Shareware Version of Quake.
-
-CAN DO:
--- Play & Enjoy the single player game 
--- Setup a shareware version based server on a not-for-profit basis
-
-CANNOT DO:
--- Run the game with user developed levels.  
--- You may not commercially exploit the shareware version in any way
-        This specifically excludes retail distribution of the shareware 
-        version. Do not call or e-mail to ask if you can be a retail 
-        distributor of the shareware version -- the answer is no! 
--- Commercially exploit any id copyrighted and/or trademarked property. 
-        Example: Game names, logos, graphics, etc.
-
-
-QUAKE REGISTERED VERSION END USER LICENSE (rlicnse.txt) or
-What You Can and Cannot Do With the Registered Version of Quake.
-
-CAN DO:
--- Play & Enjoy the single player game
--- Setup a registered version based server on a not-for-profit basis
--- Develop new levels and/or level creation utilities.  
--- Play the game and/or setup a Registered Version based server using
-   a user-developed level.
-
-CANNOT DO:
--- Commercially exploit the Registered  Version of Quake in any way;
-   see commercially exploitation license info below.
--- Commercially exploit any id copyrighted and/or trademarked
-   property. 
-        Example: Game names, logos, game graphics, etc. 
--- Sell user-developed levels and/or tools
-
-COMMERCIAL EXPLOITATION LICENSE (comexp.txt -- accompanies Quake
-                                 registered version only)
-
-If you are interested in trying to make money using the registered version
-of Quake (this sort of thing is not allowed using the shareware version) you
-must sign our easy-to-digest Commercial Exploitation License.
-
-This is a royalty free license that allows you to run Quake for a profit
-through a certain monthly gross profit range. If your Quake-related business
-becomes successful the agreement brings id into the revenue stream.
-
-Basic terms of the commercial exploitation license:
-
--- License grants a royalty free commercial exploitation right for the
-   registered version of Quake as a whole so long as Quake's monthly gross
-   revenue is below $5,000.00
-
--- License provides for a 12.5% royalty to be paid to id Software in months
-   where the licensee's Quake related monthly gross revenue is above $5,000.00
-
--- Royalty is based off net income.  Net income is defined as Quake-related
-   gross income less Quake-related expenses.
-
--- License expressly prohibits commercial exploitation via the sale (retail
-   or otherwise) of the shareware or registered versions of Quake.
-
--- License expressly prohibits advertising/marketing use of our copyrighted
-   and/or trademarked properties.
-
-To get into bed with us on this deal you must print two (2) copies of the
-document named comexp.txt. (You should find comexp.txt somewhere on the
-registered version CD.)  Sign/fill in the blanks of both copies where
-indicated and mail both to:
-
-		id Software
-		18601 LBJ #666
-		Mesquite, TX  75150
-		Attn: ComExp License
-
-We will then countersign the documents and mail one back to you.
-
-Two items worth noting here:
-
-1. It is VERY IMPORTANT that the information you enter in the signature
-block be legible. We prefer it if you enter the info into the blanks before
-printing your two copies. If we cannot read your information we will not be
-able to return the documents to you.
-
-2. The terms of this document are not subject to negotiation. If you cannot
-live with the terms spelled out in the agreement do not engage in any
-commercial exploitation of Quake and do not sign the document.
-
-
- 
-
--- a/u/data/MANUAL.TXT
+++ /dev/null
@@ -1,1030 +1,0 @@
-Table of Contents
-        I. THE STORY
-                A. Background
-                B. Prelude to Destruction
-
-        II. INSTALLING QUAKE
-                A. Installation
-                B. README.TXT
-                C. MANUAL.TXT
-                D. TECHINFO.TXT
-
-        III. THE BASICS OF PLAY
-		A. Goal of the Game
-		B. Skill
-		C. Episode
-		D. Getting About 
-		E. Finding Things
-
-        IV. CONTROLS
-		A. Keyboard Commands
-		B. The Main Menu
-		C. Console
-		D. Command Line
-		E. Cheat Codes
-
-        V. THE GAME
-		A. The Screen
-		B. Messages 
-		C  Ending a Level
-		D. Ending a Dimension
-
-        VI. YOUR NEW ENVIRONMENT
-		A. Firepower
-		B. Ammo
-		C. Power-ups
-		D. Bad Guys
-		E. Environmental Hazards and Effects
-
-        VII. MULTIPLAYER ACTION 
-		A. Cooperative
-		B. Deathmatch	
-		C. Team Games 
-
-        VIII. COMMONLY ASKED QUESTIONS
-
-        IX. TECH SUPPORT
-		A. Tech Support Options
-		B. In Europe
-		C. Problems
-
-	X. LEVELS AND DESIGNERS
-
-	XI. LEGAL BOILERPLATE 
-****************
-I. THE STORY
-A. Background
-      You get the phone call at 4 a.m. By 5:30 you're in the secret
-   installation. The commander explains tersely, "It's about the Slipgate
-   device. Once we perfect these, we'll be able to use them to transport
-   people and cargo from one place to another instantly.
-
-      "An enemy codenamed Quake, is using his own slipgates to insert death
-   squads inside our bases to kill, steal, and kidnap..
-
-      "The hell of it is we have no idea where he's from. Our top scientists
-   think Quake's not from Earth, but another dimension. They say Quake's
-   preparing to unleash his real army, whatever that is.
-
-      "You're our best man. This is Operation Counterstrike and you're in
-   charge. Find Quake, and stop him ... or it ... You have full authority
-   to requisition anything you need. If the eggheads are right, all our
-   lives are expendable.."
-
-B. Prelude to Destruction
-      While scouting the neighborhood, you hear shots back at the base Damn,
-   that Quake bastard works fast! He heard about Operation Counterstrike,
-   and hit first. Racing back, you see the place is overrun. You are almost
-   certainly the only survivor. Operation Counterstrike is over. Except for
-   you.
-
-      You know that the heart of the installation holds a slipgate.
-   Since Quake's killers came through, it is still set to his dimension.
-   You can use it to get loose in his hometown. Maybe you can get to the
-   asshole personally. You pump a round into your shotgun, and get moving.
-      
-II. INSTALLING QUAKE
-A. Installation
-   You must install Quake before you can play it. It will not run off the
-   CD-ROM. Place the CD-ROM into your drive, log on to that drive, and type
-   'INSTALL'. If you have downloaded Quake via modem, simply go to the
-   directory you've placed Quake in, unzip it, and type 'INSTALL'.
-
-B. README.TXT
-   After you install Quake, you go right into the README.TXT file, which is
-   henceforth available in your Quake directory. This is a full listing of
-   Quake's technical parameters, and is constantly updated with new versions
-   of Quake. We strongly recommend that after you install Quake, you glance
-   through README.TXT.
-
-   You may wish to print this file out, so you can have a copy of it on hand
-   while playing Quake.
-
-C. MANUAL.TXT
-   Also available in your Quake directory is a file labeled MANUAL.TXT.
-   This is the file you are now reading.
-
-D. TECHINFO.TXT
-   For those who are more technically inclined, or to fill out a bug report,
-   check out TECHINFO.TXT. Information on filling out a bug report is located
-   at the end of TECHINFO.TXT.
-
-
-III. THE BASICS OF PLAY
-A. Goal of the Game
-	Quake has two basic goals. First, stay alive. Second, get out of the
-        place you're in. The first level of each episode ends in a slipgate -- 
-        these signify that
you're entering another dimension. When you complete 
-        an entire
dimension (this takes six to eight levels), you'll find a
-        Rune and another slipgate, which returns you to the start. 
-
-B. Skill
-	The start area has three short hallways. The one you go down selects
-        the Skill you wish to play at.
-	Easy -- This is meant for little kids and grandmas. 
-	Medium --  Most people should start Quake at Medium skill. 
-	Hard -- Here at id, we play Hard skill, and we think you should too,
-        once you're ready.
-	(Nightmare) -- This is so bad that the entry is hidden, so people
-        won't wander in by accident. If you find it, don't say we didn't warn
-        you.
-
-C. Episode
-	After the Skill halls, you're in a room with four exits. Each exit
-        leads to a different military complex, at the end of which is a
-        slipgate leading to a new dimension. If you have not registered, the 
-        first episode, Dimension of the Doomed, is the only place you can go. 
-        After registration, all four episodes are available. The other three 
-        episodes, in order from second to fourth, are Realm of Black Magic, 
-        Netherworld, and The Elder World.
-
-=============================================================================
-== TIP -- From episode 1 to episode 4, the dimensions become progressively ==
-== more difficult. We suggest you play the episodes in the proper order to ==
-== get the maximum fun out of Quake.                                       ==
-=============================================================================
-
-D. Getting About
-      The specific keys named below can be changed by using the Configure Keys
-      Menu. If you have renamed Run as the R key, for instance, then the Shift 
-      key will not double your speed. 
-   Walk
-      Use the arrow keys or the mouse. To walk steadily forward, hold down
-      the Forward key (up arrow or center mouse button). Turn left or right
-      with the left or right arrow keys or sliding your mouse to the left or 
-      right.
-   Run
-      Hold down Run (the Shift key) to double your speed.
-   Jumping
-      Tap the Jump key (the space bar or Enter key). You jump further if 
-      you're moving forward, and you jump higher if you're moving up a slope at 
-      the time. You'll be surprised at the spots you can reach in a jump. You 
-      can even avoid some attacks by jumping at the right time.
-   Swimming
-      When underwater, aim yourself in the direction you wish to go, and
-      move forward. You have full three-dimensional freedom. Unfortunately,
-      as in real life, you may lose your bearings while underwater. Use
-      jump (the space bar or Enter key) to kick straight up towards the
-      surface. Once on the surface, tread water by holding down jump.
-      To get out of the drink, swim towards the shore. Once there, use jump
-      to clamber up. If you're down a well or you can't get a grip, you may
-      not be able to climb out. There is always another way out, but you may
-      have to submerge to find it.
-   Shooting
-      Tap the Shoot key (the Ctrl key or left mousebutton) to fire. Hold it 
-      down to
keep firing.
-   Use
-      Quake has no "Use" function. To push a button or open a door, walk up
-      to it. To ride a platform up or down, step atop it. If a door won't open 
-      or a platform won't lower, you may need to do something special to 
-      activate it.
-   Picking up stuff
-      To pick up items, weapons, and power-ups, walk over them. If you can't
-      pick up something, it means you already have the maximum possible of 
-      that thing. If it is armor, it means the stuff you're trying to get is 
-      worse than what you now have.
-
-E. Finding Things
-   Buttons and Floorplates
-      Buttons activate with a touch, and floorplates must be stepped on.
-      If you see a distinctive-looking button in a spot you cannot reach,
-      it's probably a shootable button-- fire at it.
-   Doors
-      Most doors open at your approach. If one doesn't, seek a button,
-      floorplate, or key.
-   Secret Doors
-      Some doors are camouflaged. Almost all secret doors open when they are
-      shot or hit with an axe. The rest are opened by hidden pressure plates
-      or buttons.
-   Platforms
-      Most platforms only go up and down, while some follow tracks around
-      rooms or levels. When you step atop of a platform, it rises to its
-      full height, and usually only lowers when you step off. Some platforms
-      must be activated via button or pressure plate.
-   Pressure Plates & Motion Detectors
-      Invisible or visible sensors which open doors, unleash traps, warn
-      monsters, etc.
-   Uncovering Secrets
-      Secrets are hidden lots of ways. You might need to shoot a button, kill
-      a monster, walk through a secret motion detector, etc.
-   The Secret of Secrets
-      All secrets in Quake are indicated by clues. Don't waste your time
-      hacking at every wall. It's much more productive (and fun) to use your
-      brain and your eyes. Look up. An angled texture, a light shining under
-      a wall, a strange sound -- anything -- might be the clue. Something
-      prominent in a room might be decoration ... or it might be the clue.
-
-=============================================================================
-== TIP -- Bouncing a grenade off a shootable button or secret door won't   ==
-== open it, but if the grenade's explosion goes off nearby, this may       ==
-== activate such secrets.                                                  ==
-=============================================================================
-
-IV. CONTROLS
-A. Keyboard Commands
-   By using the key configuration option from the Main Menu, you can
-   customize the keyboard to suit your fancy, except for the Function keys,
-   the Escape key, and the ~ (tilde) key.
-
-FUNCTION KEYS
-Help				F1
-Save Game			F2
-Load Game			F3
-Options Menu			F4
-Multiplayer Menu		F5
-Quicksave			F6
-Quickload			F9
-Quit to operating system        F10
-Screenshot                      F12
-
-WEAPONS
-Axe				1
-Shotgun				2
-Double Barrelled Shotgun	3
-Nailgun				4
-Supernailgun			5
-Grenade Launcher		6
-Rocket Launcher			7
-Thunderbolt			8
-Change to next weapon		/
-
-MOVEMENT
-Move / Turn	arrow keys
-Jump / Swim	Space bar or Enter
-Run		Shift
-Sidestep Left	. or >
-Sidestep Right	, or <
-Strafe *	Alt
-Swim Up         D
-Swim Down       C
-
-OTHER CONTROLS
-Main Menu		Escape
-Console			~ (tilde)
-Look Up			A or PgDn
-Look Down		Z or Del
-Center View		X or End
-Mouse Look **		\ or center mouse button
-Keyboard Look ***	Ins
-
-  * Turning right or left sidesteps instead while the Strafe key is pressed.
- ** Sliding your mouse forward and back looks up and down while the Mouse
-    Look key is pressed.
-*** The walk forward/backpedal arrows will look up and down while the
-    Keyboard Look key is pressed.
-
-B. The Main Menu
-   Tap the Escape key to pop  up the Main Menu. While you are in the menu,
-   the game is paused.
-      Use the arrow keys to move the Quake icon up and down the menu. Place 
-   the icon before the desired option, and tap the Enter key. To return to the
-   Main Menu, tap the Escape key again. To exit the menu and return to the
-   game, tap the Escape key when you are on the Main Menu.
-
-   NEW GAME
-      Discards the game you're playing, and starts anew.
-
-   MULTIPLAYER
-      Controls multiplayer game starting and details...
-      Name
-         Type your name or alias here, and all messages about you will use
-         this. So the computer says stuff like, "Josephine rides Bad Bill's
-         rocket."
-      Shirt Color
-         Lets you select your character's uniform color from 14 different
-         options (numbered 0-13).
-      Pants Color
-         As above, but your pants color also determines what team you're on,
-         if in team play. (After all, pants are more important than shirts.)
-      Communications Configuration
-         Takes you to a separate menu on which you can change communications
-         settings.
-         Com Port
-            Selects the COM Port to use for Communications. A null modem or 
-            modem must be connected to this port.
-         Baud Rate
-            Selects the COM port baud rate (9600-57600bps). This is NOT the
-            same as setting the modem speed. The COM port speed must be AT 
-            LEAST the same speed as the modem speed.
-         Device
-            Selects the type of connection, either direct (null-modem) or
-            modem.
-         Modem Init String
-            The Initialization string for the modem. 
-      
-      Start a Multiplayer Game
-         If you want your machine to be the host for a multiplayer game 
-         (Note: if you are starting a listen server, id Software strongly 
-         recommends that the fastest machine act as the host! If you are
-         playing a game with more than 4 players, we suggest using a 
-         dedicated server as the host!), select this option, and you'll get
-         the following menu  ...
-         Begin Game
-            Starts up the game. Now all your friends have to do is log on, 
-            using either "search for local network games" or "join a 
-            running game at..." Multiplayer options (see below). 
-         Maximum Players
-            You can have up to 16 players. You need at least 2, or it's not 
-            "multiplayer", right?
-         Game Type
-            Toggles between cooperative and deathmatch.
-         Team Color Rules
-            Toggles between "none" and "no friendly fire". In the latter mode, 
-            your shots won't injure someone wearing the exact same color 
-            pants as you. 
-         Skill
-            Chooses skill level. Only applicable in a cooperative game. 
-         Frag Limit
-            From none to 100, in ten-frag increments. When someone reaches 
-            the frag limit, by killing the 40th (or whatever) person, then 
-            the game ends immediately, and final scores are printed. If your 
-            frag limit is none, the game won't end till someone exits the 
-            level or the time limit expires. 
-         Time Limit
-            From none to 60 minutes, in 10 minute increments. When the time
-            limit is up, the game ends immediately, and final scores are 
-            printed. If your time limit is none, the game won't end till 
-            someone exits the level or the frag limit is reached. 
-         Start Map 
-            Lets you choose what map you'd like to play on. The top line 
-            gives you the episode name, and the lower line is the level's 
-            name. Note that all levels in Quake are fun to play, but the 
-            episode Deathmatch Arena is composed of special levels that are 
-            solely-designed for deathmatch play. Try them, you'll like them. 
-      Search For Local Network Games
-         Has your computer look through your network. It will list all the 
-         games it finds on the console, and you can choose to join one of 
-         them by typing connect <server>.
-      Join A Running Game At ... 
-         Lets you join a game either by typing its net address (for a net 
-         game) or your friend's modem phone number (for a modem game). 
-         If necessary, ensure your modem and network connections are operative 
-         by checking your Communications Configuration menu. 
-
-   SAVE
-      Brings up a list of saved games. Highlight the desired slot, and tap the 
     Enter key. Each saved game is identified by the level's name, plus the 
-      proportion of kills you have achieved so far. 
-   LOAD
-      Brings up a list of saved games. Highlight the desired slot, and tap the
-      Enter key. 
-   OPTIONS
-      Miscellaneous game options ...
-         Configure Keys
-            Permits you to customize Quake so every action is linked to the 
-            button or key that you prefer. 
-               First, move the cursor (via the arrow keys) to the action you 
-            wish to change. Then tap the Enter key. Now press the key or 
-            button you want to bind to that action. For instance, if you wish
-            to use the Alt key for Jump, move the cursor to Jump / Swim, tap 
-            the Enter key, then press the Alt key. 
-               Each action can have two different keys assigned to it. If you 
-            already have two keys in an entry, you cannot add more from this 
-            menu. 
-               To clear the keys bound to an action, move the cursor to that 
-            action and tap the Backspace or Delete key instead of the Enter 
-            key. This will clear the keys formerly bound to that action, 
-            leaving it blank.
-               You can bind any key to an action except Function keys, the 
-            Escape key, and the ~ (tilde) key. "Weird" keys such as Scroll 
-            Lock, Print Screen, etc. may or may not work, depending on your 
-            machine, but why bother?
- 
-            Attack
-               Fires your weapon
-            Change Weapon
-               Switches to the weapon "above" the one you're now using. Wraps 
-               around to the axe.
-            Jump / Swim Up
-               If you're on land, jumps. If you're underwater, kicks you 
-               towards the surface. If you're right at the water's edge, pops
-               you up out of the water, if you combine it with forward 
-               movement. 
-            Walk Forward 
-            Backpedal 
-            Turn Left 
-            Turn Right 
-            Run
-               Press this while moving, and you move at double speed. 
-            Step Left
-               Sidesteps (strafes) left
-            Step Right
-               Sidesteps (strafes) right
-            Sidestep
-               Press this when using turn left or turn right and you sidestep
-              (strafe) instead.
-            Look Up
-               Lets you angle your view upwards. Your view returns to 
-               horizontal when you start walking forward. 
-             Look Down
-               Lets you angle your view upwards. Your view returns to 
-               horizontal when you start walking forward. 
-             Center View
-                If  you're looking up or down, returns your view to dead 
-                center. 
-             Mouse Look
-                Press this to allow your mouse to look up or down (by 
-                sliding it forward and back), and to remain looking up or 
-                down even if you move forward. 
-             Keyboard Look
-                Press this to use your movement keys to look up or down. 
-             Go To Console
-                Brings down the Console. Also possible by tapping the 
-                ~ (tilde) key. 
-             Reset To Defaults
-                Everything you've changed in the options menu is reset by 
-                this option. Consider it an "Oops" key. 
-             Screen Size
-                A slider which enlarges or shrinks your view area. All 
-                Quake's sliders use the right and left arrow keys. 
-             Brightness
-                Pretty much self-explanatory. Choose a brightness which 
-                doesn't strain your eyes. 
-             Mouse Speed
-                Adjusts mouse sensitivity. The further you set the slider 
-                to the right, the quicker your mouse reacts. 
-             Music Volume
-                Self-explanatory
-             Sound Effects Volume
-                Self-explanatory
-             Always Run
-                When this is selected, you do not need the Run key -- you 
-                are always at double speed.
-             Invert Mouse Up / Down
-                This gives your mouse "airplane-style" controls. This means 
-                that pushing the mouse forward "noses down", and pulling it 
-                back "noses up". Some people prefer this control technique. 
-              Lookspring
-                 Returns your view immediately to straight ahead when you 
-                 release the look up / down key. Otherwise, you must move 
-                 forward for a step or two before your view snaps back. 
-                 Lookspring does not work while you are underwater. 
-              Lookstrafe
-                 If you are using the look up / down key, then this option 
-                 causes you to sidestep instead of turn when you try to move 
-                 left or right.
-
-   HELP / ORDERING
-      Lists the default keyboard and mouse commands. Also contains the 
-      information you need to register Quake. 
-    QUIT
-      Exits Quake at once. 
-
-=============================================================================
-== TIP -- Quake saves your current key configuration when you quit, so     ==
-== next time you play, you have the same configuration.                    ==
-=============================================================================
-
-C. Console
-      Tap the ~ (tilde) key to bring down the console. As with the Main Menu, 
-   when the console is down, a singleplayer game is paused. A wide variety of
-   esoteric commands can be entered at the console. If your keyboard has no 
-   ~ (tilde), the Options Menu (inside the Main Menu) has a "Console" option. 
-
-D. Command Line
-   For special command line parameters, see README.TXT. 
-
-E. Cheat Codes
-   id Software, as in our previous games, has removed all cheat codes from 
-   Quake. 
-
-V. THE GAME
-A. The Screen
-      The large top part of the screen is the view area, in which you see 
-   monsters and architecture. Immediately below is the Inventory, beneath 
-   which is the Status Bar. You can enlarge the viewing area (tap the + key), 
-   so much that it engulfs first the Inventory Bar and then the Status Bar. 
-   The - key shrinks the view area. 
-
-   Inventory Bar
-      Lists ammo, weapons, deathmatch scores, and power-ups.
-         The active weapon is lit up. Each weapon has a number by it -- type 
-      the appropriate number key to switch to that weapon.
-         In addition, this gives the amount of ammo you have of each type, 
-      any keys you possess, and any power=ups currently active. Plus it shows 
-      how many and which of the four Runes you possess. 
-         In Deathmatch, it shows the top four scores in the game. 
-
-   Status Bar
-      A vital part of the screen. When your armor, hit points, or ammo get 
-      low, the number turns red. 
-         From left to right, the big numbers represent: Armor Points, Health, 
-      and Ammo (of the current weapon). Icons show the Armor Type (green,  
-      yellow, or red), your adorable face, and your Ammo Type). 
-
-   Score Bar
-      Hold down theTab key to replace the Status Bar with the Score Bar. 
-         This lists the proportion of monsters you've killed, secrets you've 
-      found, and time you've spent, along with the level name. 
-         In Deathmatch, the Score bar lists the top six scorers, along with 
-      their names. 
-
-B.  Messages 
-   Quake talks to you from time to time. Some messages appear at the top of 
-   the screen. These are non-critical, and tell you that you've picked up an 
-   object, or you've died in an interesting fashion. Ignore these messages if
-   you please. 
-      Certain messages appear inconveniently in the middle of your view. These 
-   are always important, and you do not want to ignore them!
-
-D Ending a Level
-   Once you finish a level, you'll find a slipgate or a distinctive archway 
-   leading to the next level. Pass through to emerge onto a new level. 
-      You start the new level with the same armor, weapons, and ammo you had at 
-   the end of the previous one. If a power-up was active at the end of the 
-   previous level, it is now, sadly, gone. Make the best of it. If your hit 
-   points were over 100 or under 50, they are altered to 100 or 50, 
-   respectively. Otherwise, your hit points are unchanged. 
-
-D. Ending a Dimension
-   Once you've finished all the levels in a particular dimension, you return 
-   to the starting hall. New dimensions are started from scratch -- you, your 
-   shotgun, and axe.
-
-VI. Your New Environment
-A. Firepower
-   You are blessed with eight different Means o' Mass Destruction. Each has 
-   its place in a balanced diet. 
-
-   Axe
-      The last resort. Face it  -- going toe-to-toe with the uglies in Quake
-      demonstrates all the good sense of a man parachuting into an alligator 
-      farm. 
-
-   Shotgun
-      The basic gun, to which all other guns compare favorably.
-
-   Double-barrelled Shotgun
-      A worthy weapon with three minor drawbacks: first, it uses up 2 shells 
-      per blast; second, it's slow; third, its shot pattern is very loose at 
-      long range. But in general, once you find this puppy, the other shotgun 
-      starts rusting from disuse. 
-
-   Nailgun
-      A two-barrel dingus that prickles bad guys with armor-piercing darts, 
-      technically termed "nails". 
-
-   Supernailgun 
-      The great equalizer. Four cyclic barrels that hose out spikes like 
-      crazy. Pro: foes drop like flies. Con: eats ammo like popcorn. 
-
-   Grenade Launcher
-      Thumps neat exploding bombs into the air. You can even bounce a grenade
-      off the wall or floor.. When a grenade hits someone, it explodes. 
-      If it misses, the bomb sits on the floor for a moment, then explodes. 
-      Even though I sometimes bounce grenades into myself, this gun's still 
-      my favorite. 
-
-   Rocket Launcher
-      For when a grenade positively, absolutely, has to be there on time. 
-
-   Thunderbolt  
-      Try it. You'll like it. Use the same technique as watering your 
-      rosebush.
-
-   Switching Between Weapons
-      If you are firing a weapon and run out of ammo, Quake automatically 
-      switches you to another weapon. It will never switch to the grenade 
-      launcher or rocket launcher, however, for reasons that ought to be 
-      obvious. So if you're firing away happily and suddenly switch to the 
-      axe, it doesn't mean you're out of all ammo -- you may still have 
-      grenades. But Quake requires you to select such dangerous 
-      explosives on your own. 
-
-=============================================================================
-== TIP -- If you shoot the Thunderbolt underwater, it discharges all its ==  
-== cells in every direction in a single gigantic KA-ZAP, with you at the   == 
-== center. Don't try this at home.                                         ==
-=============================================================================
-
-B. Ammo
-   The eight weapons use four types of ammo. Each ammo type comes in two 
-   flavors -- small and large. The large boxes carry twice as much as the 
-   small. 
-
-   Shells 
-      For shotguns and double-barrelled shotguns. A small box holds 20.
-
-   Flechettes 
-      For nailguns and supernailgunss. A small box holds 25. 
-
-   Grenades 
-      For grenade launchers and rocket launchers. A small crate holds 5.
-
-   Cells 
-      For Mr. Thunderbolt. A small battery has 6 charges, lasting a little 
-      over a second.
-
-C. Power-ups
-   All power-ups except armor burn out after a while, so smoke 'em while you 
-   got 'em. 
-
-   Armor 
-      Comes in three flavors; green, yellow, and red, from weakest to most 
-      powerful.
-
-   Megahealth
-      Gives you 100 additional hit points. After a few seconds, all hit points 
-      over 100 start slowing draining away, because it's too much for the human 
-      frame to hold. Still, it's nice while it lasts. 
-
-   Biosuit 
-      lets you breathe underwater and swim through slime without harm. Does 
-      not protect against lava. 
-
-   Ring of Shadows 
-      Renders you almost totally invisible. Only your eyes can be seen. 
-      Monsters don't detect you unless you do something stupid. Like shoot.
-
-   Pentagram of Protection 
-      Renders you invulnerable. 
-
-   Quad Damage 
-      Magnum upgrade! You now deliver four times the pain!
-
-=============================================================================
-== TIP -- When quad damage is activated, use the grenade or rocket         ==
-== launcher with care -- their bursts are four times as deadly to you, as  ==
-== well as your enemies.                                                   ==
-=============================================================================
-
-D. Bad Guys
-   Quake critters are extremely tough, but you have the firepower to vent 
-   your grievances on them anyway. Good hunting. 
-
-   Rottweiler
-      Bad, bad doggie! Play dead! -- blam! -- yipe! Good  dog!
-
-   Grunt 
-      Goons with probes inserted into their pleasure centers; wired up so 
-      when they kill someone, they get paroxysms of ecstasy. In essence, 
-      customized serial killers. Easy to kill, and they tote shotgun shells. 
-      It's like a little Christmas each time you blow a Grunt away!
-
-   Enforcer (registered only) 
-      Grunt, Mark Two. Recruits who are surlier and beefier than the rest get 
-      outfitted in combat armor and built-in blasters. 
-
-   Knight 
-      Canned meat. Open 'er up and see if it's still fresh. 
-
-   Death Knight (registered only) 
-      This particular canned meat tends to open you up instead. 
-
-   Rotfish (registered only) 
-      Disgusting little critters who dish it out, but can't take it.
-
-   Zombie
-      Thou canst not kill that which doth not live. But you can blast it 
-      into chunky kibbles. 
-
-   Scrag 
-      Floats like a butterfly, stings like a bee. Ugly as hell. They're not 
-      real tough, but like to bushwhack you. 
-
-   Ogre 
-      What's worse than a cannibal monster eight feet tall? One with a 
-      chainsaw. And a sack of grenades.
-
-   Spawn (registered) 
-      A merrily bouncing blob as dangerous to kill as to ignore. Blech.
-
-   Fiend 
-      In essence, organic buzzsaws, rife with pummeling power! 
-
-   Vore (registered) 
-      A spideresque hybrid horror. Keep your eye on the energy pod he hurls. 
-
-   Shambler 
-      Even other monsters fear him, so expect a clobbering. He shrugs off 
-      explosions. Good luck. 
-
-=============================================================================
-== TIP -- Some weapons are better vs. particular monsters than others. If  ==
-== a new monster seems real tough, switch weapons.                         ==
-=============================================================================
-
-E. Environmental Hazards and Effects
-
-   Explosions
-      Radioactive containers are in some military bases. Shooting these 
-      things unleashes a big boom, so be careful -- you may not want to 
-      stand too close in a firefight. 
-         Your own grenades and rockets cause explosions too, of course -- the 
-      blast can hurt you if you're too close. 
-
-   Water 
-      Safe enough unless you stay under so long you start to drown. Come up 
-      for air periodically to prevent this. 
-
-   Slime 
-      Hurts you instantly and keeps on hurting. Stay out of slime unless you 
-      have a very good reason to take a dip. 
-
-   Lava 
-      If you're quick and the lava's shallow, you might escape before you're 
-      burnt to a crisp,  but don't bet on it. 
-
-   Traps 
-      Quake has many different traps. Don't be paranoid, because traps aren't 
-      really very common, but be aware of their existence. Traps can't be 
-      classified because they come in many varieties -- monsters in ambush, 
-      spike shooters, crushing walls, trapdoors, etc. 
-
-    Teleporters 
-      These are distinctive in appearance and emit a unique sound. When you 
-      step into a teleporter, you're instantly transported to another 
-      teleporter, or atop a teleport pad. If you teleport directly right atop 
-      of somebody else, he or she is killed instantly. 
-
-=============================================================================
-== TIP -- Monsters are smart enough not to activate their own traps, but   ==
-== if you activate the traps, the monsters can get caught by them.         ==
-=============================================================================
-
-VII. Multiplayer Action 
-   Quake can be even more fun when you're playing with friends than when 
-   you're playing by yourself.
-      When you are using the console or Main Menu in multiplayer, the game does
-   not pause. Irresponsible players and monsters can freely shoot you, and
-   your only recourse is bloodthirsty vengeance. 
-     The Talk function is useful here. When you talk, the message appears at 
-   the top of all players' screens, preceded by the speaker's name.
-     To talk, press 'T' and start typing your message. Press ENTER to set
-   the message to everyone.
-     To set up, run, or join a multiplayer game, use the Main Menu Multiplayer
-   option. README.TXT contains details that may be useful if your network or 
-   modem need special configurations. 
-
-A. Cooperative
-   In a co-op game, you and your friends work together to finish the level. 
-   When one person exits, everyone else exits too, wherever they might be. If 
-   you are killed in co-op, you reappear at the start area, and have to catch 
-   up to your buddies. Use Talk to find out where they are. See the 
-   Multiplayer options on the Main Menu for more info.
-
-B. Deathmatch	
-   In a deathmatch, play is totally cutthroat. No monsters exist, and when 
-   you are killed, you reappear in a random spot. After you pick up an item, 
-   it respawns (i.e. pops back into existence) after a while. (Some items 
-   take longer to respawn than others.) Every time you kill someone, you get 
-   a Frag. The person with the most Frags wins, so wreak slaughter amongst 
-   your pals! 
-      If you kill yourself, whether intentionally or by accident, you lose a 
-   Frag. This includes drowning, getting crushed, and so forth. See the 
-   Multiplayer options on the Main Menu for more info.
-
-C. Team Games 
-   Team play is a cool combination of co-op and deathmatch. Each team picks 
-   a "uniform" and everyone on that team changes their color to the team 
-   color. The team with the most Frags wins. See README.TXT or the Main Menu 
-   for details. 
-
-=============================================================================
-== TIP -- if you have the Team Color Rules set to No Friendly Fire, your   ==
-== weapons won't hurt other players wearing the same color pants as you.   ==
-== (You can still have differently-colored shirts.) Your shots still wear  ==
-== down their armor, and your own grenade and rocket explosions still hurt ==
-== YOU, just not them.                                                     ==
-=============================================================================
-
-VIII. Commonly Asked Questions
-
-Q. I'm stuck. How do I get through the level?
-A. Take a stroll around and look for a place you haven't been yet. Sometimes 
-you have to kill a particular monster in order to progress, so exterminate 
-them all!
-
-Q. How can I find all the secrets? 
-A. Don't worry about it. You never have to find a secret to finish a level.. 
-Also, some secrets are intentionally hard to find. 
-
-Q. I've cleared out the whole level, but my monster kill score isn't 100%. 
-Where are they hiding?
-A. Some monsters hide inside secrets, or are released by them. You won't be 
-able to kill those monsters until you find their secrets. Also, some monsters 
-might  lurk underwater. Good fishing. 
-
-Q. Don't you worry that Quake teaches people that all problems can be solved 
-by the misuse of deadly force? 
-A. No. 
-
-Q. Did I really see two monsters fighting each other?
-A. Probably. Some monsters hate one another almost as much as they hate you. 
-You can use this to your advantage (exercise left up to the reader). 
-
-Q. How do I prevent motion sickness when watching Quake?
-A. If you're one of the unlucky sufferers from motion sickness in Quake, 
-we're sorry to say the answer seems to differs from person to person. Try 
-sitting closer to the screen, or further away. Dim the lights in your room, 
-or turn them up high. Adjust screen brightness up or down. Take a break from 
-Quake and rest your eyes every hour or so. One or more of these tricks, or a 
-combination, ought to work. 
-
-Q. Are you guys Satan-worshipers?
-A. No. 
-
-IX. Tech Support
-   Any of the information listed below could change. Check the id software Web
-Site, at www.idsoftware.com, for updates.
-
-A. Tech Support Options
-id Software does charge for technical support, but we strive to offer this 
-service at the lowest cost possible. Because volume on the support lines 
-dictates costs, we periodically adjust our rates for Voice Tech Support. 
-Check our web site for current pricing.
-
-Paying for Voice or Automated Support
-   1 -- You can get Voice Support using a major credit card for a one-time 
-   shot. The system asks for your credit card number and expiration date, then 
-   pre-authorizes your credit card for the tech support call. You will only be 
-   billed for the number of minutes actually used.
-
-   2 -- You can assign yourself a rechargeable PIN account. The system 
-   prompts you for your credit card information, and assigns you a PIN account
-   number. You can use the PIN to access Voice Support, Automated Support and 
-   the Game Hints Line. Once your account runs out, you can charge it up
-   again.
-
-   3 -- You may also charge up a PIN account using the number 
-   1 (900) call-2-id. Then call back at 1 (800) id-games, and use your
-   new PIN to receive all the support and hints you wish.
-
-Voice Support
-Telephone -- 1 (800) id-games
-   Lines Open from 12 noon to 10pm Central Time
-   7 Days a week ($1.75 per minute maximum as of this printing)
-   Closed some holidays
-Please have the following information handy.
-   1.  Game title and version number. (The version number can be found in the 
-   lower right-hand corner of the console.)
-   2.  Your operating system, processor, processor speed and amount of RAM.
-   3.  If you are having a sound, video or modem problem, we need to know the   
-   device brand name and model.
-
-Automated Support
-Telephone -- 1 (800) id-games 
-   Lines Open 24 hours a day, 365 days a year (366 in Leap year)
-   ($0.25 per minute)
-Please have pencil and paper handy
-
-E-mail Support
-   Just send your e-mail to [email protected]
-   We will respond within 48 hours after receiving your e-mail. When sending
-   e-mail, cut and paste the following into your e-mail message and fill
-   in the blanks --
-
-Date:  
-Name:  
-Phone number:  
-E-mail address:  (please include this, we redirect tons of mail)
-Game Title:  
-Version #:  
-Operating system (eg., DOS 6.0 or Windows 95):
-Computer type:  
-Processor type:  
-Processor speed:  
-Video card brand and model:  (only if video problem)
-Audio card brand and model:  (only if audio problem)
-Modem brand and model:  (only if modem problem)
-Network card brand and model:  (only if netgame problem)
-Network configuration (eg., NET.CFG file):  (only if netgame problem)
-Drivers, protocol stacks, and versions:  (eg., lsl v2.14, exp16odi
-v2.33, and ipxodi v3.01)  (only if netgame problem)
-If there were any error messages or fault information, report them
-here:
-Please state the problem you encountered:
-Please state how to reproduce the problem:
-
-Web Support
-   Found at www.idsoftware.com
-   Our web support pages provide the same information that's available via
-   Automated Support, except it's free!
-
-News Sites
-   For information, FAQ, or announcements, check out
-      rec.games.computer.quake.announce
-
-   For editing and hecking Quake-related files, check out
-      rec.games.computer.quake.editing
-
-   For general Quake discussion, check out
-      rec.games.computer.quake.misc
-
-Game Hints Line
-Telephone -- 1 (800) id-games or 1 (900) call-2-id
-   Lines Open 24 hours a day, 365 days a year (366 in Leap year)
-   ($0.85 per minute)
-
-B. In Europe
-   Our help lines in Europe are open 7:30am - 5:00pm GMT, Monday - Friday. 
-
-      English:  +44 01923 209145
-      German:   +44 (0)1923 209151
-      French:   +44 (0)1923 209148
-
-C. Problems
-   If you have an unfavorable experience using our services, please send
-   e-mail to [email protected]. Kindly include your full name,
-   address, phone number, and the problem encountered.
-
-X. LEVELS & DESIGNERS
-
-***************************************
-The Beginning
-start -- Welcome to Quake -- by John Romero
-***************************************
-Dimension of the Doomed (shareware episode)
-e1m1: Slipgate Complex -- by John Romero
-e1m2: Castle of the Damned -- by Tim Willits
-e1m3: The Necropolis -- by Tim Willits
-e1m4: The Grisly Grotto -- by Tim Willits
-e1m5: Gloom Keep -- by Tim Willits
-e1m6: The Door To Chthon -- by American McGee
-e1m7: The House of Chthon -- by American McGee
-***************************************
-Realm of Black Magic
-e2m1: The Installation -- by John Romero
-e2m2: Ogre Citadel -- by John Romero
-e2m3: Crypt of Decay -- by John Romero
-e2m4: The Ebon Fortress  -- by John Romero
-e2m5: The Wizard's Manse -- by John Romero
-e2m6: The Dismal Oubliette -- by John Romero
-***************************************
-Netherworld
-e3m1: Termination Central -- by John Romero
-e3m2: The Vaults of Zin -- by American McGee
-e3m3: The Tomb of Terror -- by American McGee
-e3m4: Satan's Dark Delight -- by American McGee
-e3m5: Wind Tunnels --by Tim Willits
-e3m6: Chambers of Torment -- by American McGee & Tim Willits
-***************************************
-The Elder World
-e4m1: The Sewage System -- by Tim Willits
-e4m2: The Tower of Despair --by Sandy Petersen
-e4m3: The Elder God Shrine --by Sandy Petersen
-e4m4: The Palace of Hate --by Sandy Petersen
-e4m5: Hell's Atrium --by Sandy Petersen
-e4m6: The Pain Maze --by Sandy Petersen
-e4m7: Azure Agony --by Sandy Petersen
-***************************************
-The End
-end: Shub-Niggurath's Pit --by John Romero
-***************************************
-The Deathmatch Arenas
-dm1: Place of Two Deaths --by Tim Willits
-dm2: Claustrophobopolis --by American McGee
-dm3: The Abandoned Base --by John Romero
-dm4: The Bad Place --by American McGee
-dm5: The Cistern --by Tim Willits
-dm6: The Dark Zone --by Tim Willits
-***************************************
-???
-Ziggurat Vertigo --by American McGee
-Underearth --by Tim Willits
-The Haunted Halls -- by American McGee
-The Nameless City -- by Sandy Petersen
-***************************************
-
-XI. Legal Boilerplate 
-   Quake (tm) (c) id Software, Inc. All rights reserved. All trademarks are
-   the property of their respective companies. For full information on the
-   legal issues of owning and using Quake, please refer to the files
-   LICINFO.TXT and ORDER.TXT.
-
-The program you've purchased was produced through the effort of many people.
-Don't make copies for others who have not paid for the right to the
-registered version of Quake. To report copyright violations to the Software
-Publishers Association, call 1 (800) 388-PIR8 or write:
-
-	Software Publishers Association
-	Suite 901
-	1101 Connecticut Avenue NW
-	Washington, DC  20036
-
-XII. MUSIC CREDITS
-
-Titles of Songs or Themes (C) 1996 TVT/Interscope Records.
-All Rights Reserved.
-Written by Trent Reznor (C) 1996 Leaving Hope/TVT Music.
-ASCAP All Rights Reserved.
-
-Note: music is ONLY available on CD. See your local software retailer
-or order Quake today at 1-800-idgames!
-
-XIII. Thanks
-
-id Software would like to give special thanks to:
-
-Sean Barrett
-Raymond Chen
-DJ Delorie
-Andy Glew
-Lance Hacking
-Chris Hecker
-Todd Laney
-Terje Mathisen
-Charles Sandmann
-Jon Vondrak
-Billy Zelsnack
-The GameTech crew
-Syntrillium Software for CoolEdit
--- a/u/data/ORDER.TXT
+++ /dev/null
@@ -1,103 +1,0 @@
-ORDERING INFO
-	To order the full version of Quake (or any other id Software 
-product) in North America, call our fulfillment center at 1-800-idgames
-(1-800-434-3627).  Except as noted by our operators, you can expect 
-Airborne Express afternoon delivery. The price for the full version 
-of Quake (available on PC CDROM only) is $45, plus $5 shipping, for a 
-total of $50. Our fulfillment center accepts Visa, Mastercard, and 
-American Express. You can also fax, mail, or email your order using 
-the attached forms. The fax number is (317) 361-3710 and the email 
-address is [email protected]. To prepay and order with a check 
-by mail, send your check and the order form to:
-
-		id Software
-		P.O. Box 4500
-		Crawfordsville, IN  47933
-
- To see an electronic catalog of our software, tshirts, hint books, and
- other merchandise available, check out the Shopping Maul section of our
- website at www.idsoftware.com.
-
-INTERNATIONAL ORDERS
-Quake is available worldwide as a full retail product. To find out 
-which local stores carry Quake and other id products, contact the 
-following international affiliates:
-
-Europe				Australia
-GT Interactive Software		Roadshow New Media
-1712 583791	(U.K.)		1 902 962000
-
-Taiwan				Singapore
-U.S. Summit Corporation		Summit Co. (Singapore) Pte. Ltd.
-706-0660			273-9988
-
-Malaysia			Honk Kong
-Summit Co. (Malaysia) Sdn Bhd	Tsun Tsun Trading Company
-757-2244			571-4231
-
-Thailand			Israel/Jordan/Lebanon/Egypt
-U.S. Summit Corp. (Overseas)	Mirage Mulimedia
-374-3956			972 3 510 5764
-
-If you are in a territory that cannot access 1(800)idgames, and you 
-wish to order our products directly, you must place your order in 
-writing to the fax, mail, or email addresses listed above under 
-ORDERING INFO.	
-
-International phone orders will NOT be accepted. Unfortunately, due 
-to international shipping costs, all international orders are sent 
-out via US Mail. This means we cannot guarantee timeliness of delivery 
-due to customs and other delays inherent to international shipping
-______________________________________________________________________
- ORDER FORM --  USE THIS FORM TO FAX , MAIL OR EMAIL YOUR ORDER.
-
-id Software Order Center			Date ______________
-PO BOX  4500					Phone: 1800 id games
-Crawfordsville, IN  47933			Fax: (317) 361-3710
-						[email protected]
-
-
-Product List and Prices in U.S. Currency:			(check items)
-
-Quake (CD ROM only)						$45	____
-The Ultimate DOOM (Mac version available � must specify) 	$25	____
-DOOM II (Mac version available � must specify)			$40	____	
-Master Levels for DOOM II (CD ROM only)				$25	____
-Final DOOM (CD ROM only)					$40	____
-DOOM Hint Book							$15	____
-Original DOOM Tshirt (S,M.L.XL)					$13	____
-The Ultimate DOOM Tshirt (XXL only)   				$13	____
-Final DOOM Tshirt						$13	____
-Heretic:Shadow of the Serpent Riders (CD ROM only)		$40	____
-Heretic Hint Book						$15	____
-Hexen:Beyond Heretic (Mac version available � must specify)	$40	____
-Hexen:Deathkings of the Dark Citadel (CD ROM only)		$25	____
-Hexen Hint Book							$15	____
-Hexen Tshirt (XXL only)						$13	____
-Wolfenstein 3D (PC CD only)					$20	____
-Commander Keen (3.5 disk only)					$15	____
-
-							Order total:   $______
-
-Name:						Age (optional):
-
-Form of payment (check, money order, or credit card):
-
-Credit card number:					Expiration Date:
-
-Exact mailing address:______________________________________
-			_______________________________________	
-			_______________________________________
-			_______________________________________
-
-Phone:				Fax:				Email:
-
-Shipping: US orders-$5.00 first product/$2.00 each additional 
-(allow 3-5 business days)
-
-International shipping for prepaid orders are via US Mail, and 
-we cannot guarantee the time it will take to arrive.
-
-*Prices subject to change
-
-
--- a/u/data/README.TXT
+++ /dev/null
@@ -1,456 +1,0 @@
-Welcome to Quake!
-
-This file details how to get Quake running on your system and what to do
-if you have problems.  We would like to thank Gandalf Technologies, Inc and
-MPath Interactive for the use of their technology.  We would also like to
-thank Trent Reznor and Nine Inch Nails for their tremendous contributions
-to Quake's entire audio portion.
-
-The NIN logo is a Registered Trademark licensed to Nothing Interactive, Inc.
-All Rights Reserved.
-
-Quake System Requirements
--------------------------
-IBM PC and Compatibles
-Pentium processor or better
-VGA Compatible Display or better
-8MB RAM minimum, 16MB recommended (16 MB required for running under Win95)
-CD-ROM drive Required 
-MS-DOS 5.0 or better or Windows 95 (does NOT run under Windows NT)
-Hard Drive (30MB for Shareware, 80 MB for Registered)
-
-*** IMPORTANT!: Quake requires a floating point processor.
-Systems that do not have an FPU installed will not run Quake -- at all.
-
-*** IMPORTANT Video Adapter Note! ***
-On some ATI Mach32 cards, Quake can come up with a garbled video display.
-This is due to a problem with the card in which 320x200 mode isn't
-initialized correctly.  Workarounds include:
-
-1) If running from Windows, start Quake from an icon, or from a windowed
-(not fullscreen) MS-DOS prompt.  If Quake is already running and has
-the garbled screen, press Alt-Enter twice to switch to the desktop and
-back to fullscreen, and the screen will display properly.
-
-2) If running from DOS, either put the line
-
-vid_mode 1
-
-in id1\autoexec.cfg, or, typing blind, press tilde ('~') to bring down
-the console, type
-
-vid_mode 1<enter>
-
-and the screen will display properly.
-
-========================================================================
-Here are the text files included with the shareware release of Quake and
-what they are:
-
-README.TXT              This file
-TECHINFO.TXT            Technical information on Quake's subsystems and
-                        their advanced use.
-MANUAL.TXT              Text version of the printed game manual
-LICINFO.TXT             Info on the various license files included with Quake
-SLICNSE.TXT             Shareware Quake end-user license
-ORDER.TXT               How to order Quake
-HELP.TXT                How to get help with Quake
-
-Here are the text files included with the registered version of Quake and
-what they are:
-
-README.TXT              This file
-TECHINFO.TXT            Technical information on Quake's subsystems and
-                        their advanced use.
-MANUAL.TXT              Text version of the printed game manual
-LICINFO.TXT             Info on the various license files included with Quake
-RLICNSE.TXT             Registered Quake end-user license
-COMEXP.TXT              Commercial exploitation agreement
-ORDER.TXT               How to order Quake
-HELP.TXT                How to get help with Quake
-
-
-Running Quake
--------------
-
-DOS:  To launch Quake from the DOS Prompt, go to the Quake directory and
-simply type "QUAKE" <ENTER>. (no quotes)
-
-Windows 95:  To launch Quake in single player mode, double click on the file
-QUAKE.EXE From Windows Explorer.  To run Quake in Multi-Player mode using
-the TCP/IP protocol, first check your network settings to ensure the
-protocol is installed, then double click on the Q95.BAT file to launch the
-game. In this version (v0.91) there is a minor bug that will cause the
-Q95.BAT file to exit the first time you run it, without running Quake.
-Merely double-click on that file again and it will work.
-
-Audio Setup
------------
-
-When using a Sound Card with Quake, there are a few setup steps which must
-be taken. First, the "BLASTER" environment variable setting must be in your
-autoexec.bat (or you can type it in manually from the MS-DOS command prompt).
-Running the Sound Blaster utility diagnose.exe will automatically configure
-your sound card and put this statement in your autoexec.bat file for you.
-A typical blaster setting looks like this (although yours may vary):
-
-SET BLASTER=A220 I5 D1 H5 P330 T6
-
-If you want to play the audio track from the CD-ROM while playing Quake,
-you must ensure that the audio cable from the CD-ROM is connected to the
-sound card.
-
-If you think your sound card is setup properly and it STILL doesn't work,
-check to make sure that your BLASTER environment variable contains the
-high DMA setting (H5 in the above example).
-
-If you don't get sound while trying to play the audio track, check to see
-if a small cable goes from the back of your CD-ROM player directly to your
-sound card.  If the CD-ROM audio cable is connected to your sound board (or
-the motherboard in some cases) and you STILL don't hear CD Audio coming from
-your speakers, make sure the MIXER program has the CD volume turned up.
-You will also need to run the CD-ROM driver MSCDEX.EXE. Here is an example
-of the files you should see (yours probably will vary) listed in your
-CONFIG.SYS and AUTOEXEC.BAT (explanation is in parentheses):
-
-CONFIG.SYS:
-
-DEVICE=C:\PROSCSI\CDROM.SYS /D:PROCD01 (CD-ROM driver)
-
-AUTOEXEC.BAT:
-
-SET BLASTER=A220 I5 D1 H5 P330 T6 (sound environment variable setting)
-C:\WINDOWS\COMMAND\MSCDEX.EXE  /D:PROCD01 /L:D (CD-ROM driver)
-
-===================================================
-UltraSound MAX and UltraSound PnP Support for Quake
-===================================================
-
-Before running Quake, make sure that your sound card works and your
-environment variables are set correctly.
-
-Other UltraSound Cards (ACE & Classic)
---------------------------------------
-These drivers are not for the UltraSound ACE or UltraSound Classic
-sound cards. We have heard mixed reports that MegaEm or SBOS
-have a chance of working with the UltraSound Classic but there is a
-short sound F/X delay.
-
-UltraSound PnP and PnP Pro
---------------------------
-You must make sure that you do NOT have IWSBOS or MegaEm loaded. 
-
-Setup
------
-Quake will automatically detect that the UltraSound Max or PnP
-are installed. It does this by looking at the SET INTERWAVE (PnP)
-and SET ULTRA16 (Max) environment variables.
-
-Quake will use the settings found on the SET ULTRASND/ULTRA16 (Max)
-and in the IW.INI (PnP) file to determine what port settings to use.
-
-Troubleshooting Windows 95 (DOS Box)
-------------------------------------
-We recommend that you restart your computer in MS-DOS Mode.  DOS Box 
-may or may not work, so use at your own risk.  
-
-CD Audio Input
---------------
-If you have not already enabled CD audio output by default you will
-need to enable it. For the UltraSound MAX you can run "ULTRINIT -EC".
-For the UltraSound PnP you will need to enable the CD audio output
-in Win'95 and then restart your computer into MS-DOS.
-
-===================================================
-Mouse Setup
------------
-
-If you are going to use a mouse when playing Quake, you will need to load
-your mouse driver.  This should go in the AUTOEXEC.BAT file as well.  Here
-is an example:
-
-C:\LOGITECH\MOUSE\MOUSE.EXE (mouse driver)
-
-
-Booting Clean
--------------
-
-If you are going to be running Quake with only 8 megabytes of RAM, it is best
-to boot clean .  You eliminate unwanted utilities or applications from taking
-up valuable memory, without having to alter your regular AUTOEXEC.BAT and
-CONFIG.SYS. Booting clean can be done in one of two ways. If you have
-MS-DOS version 6.xx, booting clean is as simple a pressing the shift key
-when you see the words "Starting MS-DOS". If you have MS-DOS ver 5.xx you
-will need to make a system disk.
-
-To make a boot disk, type the following from the MS-DOS command prompt:
-
-FORMAT A: /S
-
-1. Make sure that this is a disk you wish to erase.
-2. This disk absolutely HAS to be formatted in the A: drive.
-
-To use the system disk, place the disk in the A: drive and reset the
-computer.
-
-NOTE: If your sound card requires a driver to be loaded, or you will be
-using a mouse, or you will be using Quake's CD audio feature, the system
-disk will need to have a CONFIG.SYS and AUTOEXEC.BAT that load the
-appropriate drivers.
-
-Creating a Quake Shortcut
-
-As an alternative to making a Boot Disk, Windows 95 users can create a
-Quake Shortcut.  By double clicking onthis shortcut, Windows 95 will reboot
-in MS-DOS mode and install only the desired drivers, giving you the same
-results as using a Boot Disk.  To create a Quake Shortcut, do the following:
-
-1.  Using Explorer, right click and drag the file QUAKE.EXE, from the Quake
-    directory, to your desktop.  Windows 95 will make an MS-DOS Icon titled
-    "Shortcut to quake".
-2.  Right click on the new icon, and from the menu that pops up, choose
-    "Properties".  Then choose the "Program" tab at the top.
-3.  Now click on the "Advanced..." button near the bottom.  The "Advanced
-    Program Settings" window should appear.
-4.  Select the "MS-DOS mode" check box and the "Specify a new MS-DOS
-    configuration" option button.
-5.  Now simply fill in the "CONFIG.SYS for MS-DOS mode:" and "AUTOEXEC.BAT
-    for MS-DOS mode:" boxes with the same sound, CD-ROM and mouse settings as
-    mentioned above in the Boot Disks section.
-6.  Click on "OK" when you are finished.  If you wish, you can change your
-    Quake Shortcut Icon to something a little more exciting by clicking on
-    "Change Icon...".
-7.  To finish, click on "OK" again.
-    8.  You can rename your Quake Shortcut by right clicking on the shortcut
-    icon, choosing "Rename" and typing in the new name.
-
-
-======================================================
-==                  Known Problems                  ==
-======================================================
-
-Problem: Zombies sometime get stuck on the ground and connot get back up.
-(You can still hear them, but you cannot kill them. This bug makes it
-impossible to get 100% kills on whatever level it occurs on.)
-Solution: There is no workaround for this bug.
-
-Problem: It is sometimes possible for the player to get stuck in a room or
-in a wall.
-Solution: If you get stuck, use the 'kill' console command. It is a good
-idea to save your game often.
-
-Problem: View centering problems. Sometimes during a game, the view will not
-center properly.  The end result is the player view looking up torwards the
-ceiling while walking.
-Solution: Exit to the next level or use the 'kill' console command..
-
-
-======================================================
-==                 Troubleshooting                  ==
-======================================================
-
-If Quake fails to start up, or has problems not addressed elsewhere in the
-documentation, try the -safe command line switch, which disables a number
-of parts of Quake that can be problems if there are hardware or configuration
-problems.  The -safe command line switch is equivalent to -stdvid, -nosound,
--nonet, and -nocdaudio together.  Those four switches do the following:
-
--stdvid: disables VESA video modes.
-
--nosound: disables sound card support.
-
--nonet: disables network card support.
-
--nocdaudio: disables CD audio support.
-
-If -safe makes the problem go away, try using each of the switches
-individually to isolate the area in which you're experiencing the problem,
-then either correct the configuration or hardware problem or play Quake with
-that functionality disabled.
-
-If you still have problems, try booting clean in conjunction with
-the -safe command line parameter.  For information on booting clean, refer
-to the "Booting Clean" section above.
-
-If you experience page faults while running Quarterdeck's QDPMI DPMI server,
-this is caused by a bug in QDPMI.  Workarounds:  Remove QDPMI from CONFIG.SYS,
-issue the command QDPMI OFF before running QUAKE, or get the update patch
-for QDPMI from Quarterdeck.  You may be running QDPMI without knowing it if
-you have QEMM installed, because it can be installed as part of the QEMM
-installation.
-
-
-Technical Support
------------------
-
-If you are having trouble installing or running Quake you can receive
-technical support by sending e-mailing to [email protected].  You can
-also refer to our web page, www.idsoftware.com, or call 1-800-idgames.
-
-When sending support e-mail, cut and paste the following into your e-mail
-message and fill in the blanks:
-
-Date:  
-Name:  
-Phone number:  
-E-mail address:  (please include this, we redirect tons of mail)
-Game Title:  
-Version #:  
-Operating system (i.e., DOS 6.0 or Windows 95):
-Computer type:  
-BIOS date:
-BIOS version:
-Processor type:  
-Processor speed:  
-Do you program at school/work?
-Do you provide tech. support at school/work?
-Please state the problem you encountered:
-Please state how to reproduce the problem:
-
-If program crashed with nasty undecipherable techno-garbage, please
-look for the eight-digit hex number which comes after "eip="
-and write it down here:
-
-** NOTE:  If you are sending a bug report, PLEASE refer to the TECHINFO.TXT
-file for the correct form and procedures.
-
-
-======================================================
-==                 Version History                  ==
-======================================================
-v1.01 -- Bugs fixed
-------------------------------------------------------
-* Fixed modem code
-* Fixed fraglimit & timelimit
-* Added NOEXIT cvar (so no one can exit a level)
-------------------------------------------------------
-v1.00 -- Bugs fixed
-------------------------------------------------------
-* Gravis Ultrasound audio support (still has bugs)
-* More deathmatch start spots on E1M6 and END
-* Print server version and PROG CRC on connect
-* -dedicated starts start.map if nothing else specified
-* fixed lookspring function during net game
-* fixed rare crash during long running dedicated server
-------------------------------------------------------
-v0.94 -- Bugs fixed / Features added -- LIMITED BETA VERSION
-------------------------------------------------------
-* Totally rewritten menus
-* New lighting model with overbrighting
-* Parsed lowercase BLASTER parms
-* Better Sound Blaster shutdown code
-* Rewrote BLASTER initialization
-* Fixed DMA channel 0 bugs
-* Added SBPro 8 stereo setup
-* Fix delayed sound on 8 bit Sound Blasters
-* Fixed speed key affecting angle-turning from keyboard
-* Fixed "no such Alias frame" bugs
-* Fixed Zombie not getting up bug
-* Checked for very high joystick values, signalling a failed read
-* Unstuck jumping Fiends and Spawn
-* Fixed large BModels blinking out in complex areas
-* Fixed s_localsound with no sound started
-* Saved spawn parms in savegame
-* Fixed screenshot save location
-* Bind with no arguments no longer clears value
-* Allow console in intermission / finale
-* Fixed false gib messages
-* Full-screen TAB scoreboard in DeathMatch
-* Fixed "+playdemo <demo>" from command line
-* Trapped overflow in sizebuf messages
-* Moveup / movedown in water!
-* Fixed-up Talk command
-* Added unsupported crosshair option ("crosshair 1" from console)
-* Colored chat messages with notify sound
-* Fixed "connect during intermission" bug
-* Changelevel while demos running no longer crashes
-* Fixed changelevel with no map left up loading screen
-* Fixed long names entered from the console causing crash
-* Stopped demos changing while in the menus
-
-* Fixed modem initialization from menu
-* Fixed serial reliable stream getting stalled
-* Serial/modem code fixes
-	16550a lost transmit buffer empty interrupts
-	fixed sometimes processing interrupts from com1 when using com2
-	added com3/com4 support from menus
-	fixed first character of modem init not getting sent
-	saved serial/modem settings in config.cfg
-* Fixed name and colors not always sent to server at startup
-* Fixed "stopdemo" crashing the system when there wasn't a demo playing
-* Added server's TCP/IP and IPX addresses (if available) to status command
-
-* In 0.92, an additional check for a usable VESA video mode was added;
-the numpages field was verified to be greater than 0, and no mode was
-supported that had numpages set to 0 (which indicates that there's not
-enough video memory for that mode).  ATI's VESA driver, m64vbe,
-reports 0 for numpages, so VESA video modes that were available in 0.91
-were no longer available in 0.92.  This extra numpages check has
-been removed.
-
------------------------------------------------------------------------
-v0.93 -- Never officially released; internal testing only.
------------------------------------------------------------------------
-v0.92 -- Bugs fixed
------------------------------------------------------------------------
-Typing long strings in the hostname or modem init field in the menus caused
-crashes.
-
-Under Win95 IPX was detected but not functional, resulting in the game
-exiting to DOS.
-
-If -nosound, got "S_LocalSound: can't cache" on every keypress in the menu.
-
-When vid_nopageflip was set to 1 in VESA modes, going underwater resulted in
-only the upper left corner of the drawing area being updated.
-
-The single player scoreboard (tab) printed text incorrectly in all modes
-greater than 320 pixels wide.
-
-On network connections that dropped packets, the reliable message stream
-could get stopped up, resulting in frag counts and talk messages no longer
-being delivered, although game movement continued.
-
-The com port settings from the menu were getting saved & restored but
-not used.
-
-Direct serial connections did not work with slist.
-
-Quake now checks the vesa information for hardware incabable of page-flipping.
-
-Menu sound sometimes didn't play.
-
-Q95 (qlaunch.exe) frequently failed to execute on the first attempt.
-
-Q95 (quakeudp.dll) was running out of buffers when running a server.
-
-Teams were not being set according to pants colors.
-
-
-Joystick notes
---------------
-Your joystick must be plugged in when Quake is launched.
-
-If you have a joystick plugged in, but don't want to use it in Quake
-(it slows the game down a few percent), or you have weird hardware that
-doesn't like being tested as a joystick add "-nojoy" to your Quake
-command line.
-
-You can turn off joystick reading during the game by typing "joystick 0" at
-the Quake command console.
-
-You MUST configure your buttons from the configure keys menu before they will
-work.  There is no default configuration. 
-
-If your joystick or interface card improperly sets the third or fourth
-joystick buttons, type "joybuttons 2" at the quake console or in your
-.CFG file.
-
-The "mlook" button command now lets the joystick as well as the mouse control
-pitch angles.
-
-The "sidestep" buttom command works on joysticks as with mice and keyboard
-movement.
-
-The "invert mouse up/down" menu option also inverts the joystick pitch
-direction.
--- a/u/data/RLICNSE.TXT
+++ /dev/null
@@ -1,204 +1,0 @@
-REGISTERED VERSION: QUAKE
-LIMITED USE SOFTWARE LICENSE AGREEMENT
-
-        This Limited Use Software License Agreement (the
-"Agreement") is a legal agreement between you, the end-user, and Id
-Software, Inc. ("ID").  By continuing the installation of this game
-program, by loading or running the game, or by placing or copying
-the game program onto your computer hard drive, you are agreeing to
-be bound by the terms of this Agreement.  If you do not agree to
-the terms of this Agreement, promptly return the game program and
-the accompanying items (including all written materials), along
-with your receipt to the place from where you obtained them for a
-full refund. 
-
-ID SOFTWARE LICENSE
-
-        1.      Grant of License.  ID grants to you the limited
-right to use one (1) copy of the enclosed or foregoing game program
-(the "Software") on a single computer.  You have no ownership or
-proprietary rights in or to the Software or the written materials
-accompanying the Software.  For purposes of this section, "use"
-means loading the Software into RAM, as well as installation on a
-hard disk or other storage device.  You may create a map editor,
-modify maps and make your own maps (collectively referenced as the
-"Permitted Derivative Works") for the Software.  Permitted
-Derivative Works may not be sold, whether by you or by any other
-person or entity, but you may exchange the Permitted Derivative
-Works at no charge amongst other end-users.  The Software, together
-with any archive copy thereof, shall be either returned to ID or
-destroyed when no longer used in accordance with this Agreement, or
-when the right to use the Software is terminated.  You agree that
-the Software will not be shipped, transferred or exported into any
-country in violation of the U.S. Export Administration Act (or any
-other law governing such matters) and that you will not utilize, in
-any other manner, the Software in violation of any applicable law. 
-
-        2.      Commercial Use is Prohibited.  Except as provided in
-paragraph 5. hereinbelow in regard to the Software, under no
-circumstances shall you, the end-user, be permitted, allowed or
-authorized to commercially exploit the Software, any data
-comprising the Software.  Neither you nor anyone at your direction
-shall do any of the following acts (any such acts shall be deemed
-void and a breach of this Agreement) with regard to the Software,
-or any portion thereof, such as a screen display or a screenshot: 
-
-        a.      Rent the Software;
-
-        b.      Sell the Software;
-
-        c.      Lease or lend the Software;
-
-        d.      Offer the Software on a pay-per-play basis;
-
-        e.      Distribute, by electronic means or otherwise, the
-                Software for money or any other consideration; or
-
-        f.      In any other manner and through any medium
-                whatsoever commercially exploit the Software or use
-                the Software for any commercial purpose. 
-        
-        3.      Additional Prohibited Uses.  Neither you nor anyone
-at your direction shall take the following action in regard to the
-Software, or any portion thereof, such as a screen display or a 
-screenshot: 
-
-        a.      Modify, disassemble, reverse engineer or decompile
-                the Software; 
-
-        b.      Translate the Software;
-
-        c.      Reproduce the Software;
-
-        d.      Publicly display the Software; 
-
-        e.      Prepare derivative works based upon the Software
-                (except Permitted Derivative Works); or
-
-        f.      Distribute, by electronic means or otherwise, the
-                Software. 
-
-	4.	Use of Other Material is Prohibited.  Use, in any manner, of 
-	the trademarks, such as Quake(tm) and the NIN(r) logo, logos, symbols, 
-	art work, images, screen displays or screenshots, sound effects, music, 
-	and other such material contained within, generated by or relating to 
-	the Software is prohibited.
-
-        5.      To Receive Permission to Commercially Exploit.  If
-you desire to commercially exploit the Software, you may execute
-the Commercial Exploitation License Agreement for QUAKE (the
-"License") contained within the QUAKE install package and forward
-the original License to Id Software at the address noted therein. 
-Please note that ID may refuse your request and not sign the
-License in ID's sole discretion. 
-
-        6.      Restrictions Apply to Third Parties.  The
-prohibitions and restrictions described herein apply to anyone in
-possession of the Software and/or Permitted Derivative Works. 
-
-        7.      Copyright.  The Software and all copyrights related
-thereto (including all characters and other images generated by the
-Software or depicted in the Software) is owned by ID and is protected
-by United States copyright laws and international treaty provisions.
-You must treat the Software like any other copyrighted material,
-except that you may either (a) make one copy of the Software solely
-for back-up or archival purposes, or (b) transfer the Software to a
-single hard disk provided you keep the original solely for back-up or
-archival purposes.  You may not otherwise reproduce, copy or disclose
-to others, in whole or in any part, the Software.  You may not copy
-the written materials accompanying the Software.  The same
-restrictions and prohibitions regarding your use of the Software as
-provided in this Agreement apply to your use of the written materials
-accompanying the Software.  The written materials are owned by ID and
-are protected by United States copyright laws and international
-treaties.  You agree to use your best efforts to see that any user of
-the Software licensed hereunder complies with this Agreement.
-
-        8.      Limited Warranty.  ID warrants that if properly
-installed and operated on a computer for which it is designed, the
-Software will perform substantially in accordance with the
-accompanying written materials for a period of ninety (90) days
-from the date of purchase of the Software.  ID's entire liability
-and your exclusive remedy shall be, at ID's option, either (a)
-return of the price paid or (b) repair or replacement of the
-Software that does not meet ID's Limited Warranty.  To make a
-warranty claim, return the Software to the point of purchase,
-accompanied by proof of purchase, your name, your address, and a
-statement of defect, or return the Software with the above
-information to ID.  This Limited Warranty is void if failure of the
-Software has resulted in whole or in part from accident, abuse,
-misapplication or violation of this Agreement.  Any replacement
-Software will be warranted for the remainder of the original
-warranty period or thirty (30) days from your receipt of the
-replacement software, whichever is longer.  This warranty allocates
-risks of product failure between Licensee and ID.  ID's product
-pricing reflects this allocation of risk and the limitations of
-liability contained in this warranty. 
-
-        9.      NO OTHER WARRANTIES.  ID DISCLAIMS ALL OTHER
-WARRANTIES, BOTH EXPRESS IMPLIED, INCLUDING BUT NOT LIMITED TO,
-IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE WITH RESPECT TO THE SOFTWARE AND THE ACCOMPANYING WRITTEN
-MATERIALS.  THIS LIMITED WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS. 
-YOU MAY HAVE OTHER RIGHTS WHICH VARY FROM JURISDICTION TO
-JURISDICTION.  ID DOES NOT WARRANT THAT THE OPERATION OF THE
-SOFTWARE WILL BE UNINTERRUPTED, ERROR FREE OR MEET LICENSEE'S
-SPECIFIC REQUIREMENTS.  THE WARRANTY SET FORTH ABOVE IS IN LIEU OF
-ALL OTHER EXPRESS WARRANTIES WHETHER ORAL OR WRITTEN.  THE AGENTS,
-EMPLOYEES, DISTRIBUTORS, AND DEALERS OF ID ARE NOT AUTHORIZED TO
-MAKE MODIFICATIONS TO THIS WARRANTY, OR ADDITIONAL WARRANTIES ON
-BEHALF OF ID.  ADDITIONAL STATEMENTS SUCH AS DEALER ADVERTISING OR
-PRESENTATIONS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE
-WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON. 
-
-        10.     Exclusive Remedies.  You agree that your exclusive
-remedy against ID, its affiliates, contractors, suppliers, and
-agents for loss or damage caused by any defect or failure in the
-Software regardless of the form of action, whether in contract,
-tort, including negligence, strict liability or otherwise, shall be
-the return of the purchase price paid or replacement of the
-Software.  This Agreement shall be construed in accordance with and
-governed by the laws of the State of Texas. Copyright and other
-proprietary matters will be governed by United States laws and
-international treaties.  IN ANY CASE, ID SHALL NOT BE LIABLE FOR
-LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL,
-CONSEQUENTIAL, INDIRECT OR OTHER SIMILAR DAMAGES ARISING FROM
-BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, OR OTHER LEGAL
-THEORY EVEN IF ID OR ITS AGENT HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.  Some
-jurisdictions do not allow the exclusion or limitation of
-incidental or consequential damages, so the above limitation or
-exclusion may not apply to you. 
-
-        11.     General Provisions.  Neither this Agreement nor any
-part or portion hereof shall be assigned, sublicensed or otherwise
-transferred by you.  Should any provision of this Agreement be held
-to be void, invalid, unenforceable or illegal by a court, the
-validity and enforceability of the other provisions shall not be
-affected thereby.  If any provision is determined to be
-unenforceable, you agree to a modification of such provision to
-provide for enforcement of the provision's intent, to the extent
-permitted by applicable law.  Failure of a party to enforce any
-provision of this Agreement shall not constitute or be construed as
-a waiver of such provision or of the right to enforce such
-provision.  If you fail to comply with any terms of this Agreement,
-YOUR LICENSE IS AUTOMATICALLY TERMINATED. 
-
-        YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, THAT YOU
-UNDERSTAND THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE
-INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR
-BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, YOU
-AGREE TO BE BOUND BY THIS AGREEMENT'S TERMS AND CONDITIONS.  YOU
-FURTHER AGREE THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID
-AND YOU, THIS AGREEMENT IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE
-RIGHTS AND LIABILITIES OF THE PARTIES.  THIS AGREEMENT SUPERSEDES ALL
-PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER
-COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT MATTER OF
-THIS AGREEMENT. 
-
-June 21, 1996
-
-REGISTERED VERSION: QUAKE LIMITED USE SOFTWARE LICENSE AGREEMENT        Page 4
-(DWC:dw:3406.0024:DWC\doc:1164)
-
-
--- a/u/data/SLICNSE.TXT
+++ /dev/null
@@ -1,175 +1,0 @@
-SHAREWARE VERSION: QUAKE
-LIMITED USE SOFTWARE LICENSE AGREEMENT
-
-        This Limited Use Software License Agreement (the "Agreement") is a
-        legal agreement between you, the end-user, and id Software, Inc.
-        ("ID").  By continuing the installation of this game program, by
-        loading or running the game, or by placing or copying the game
-        program onto your computer hard drive, you are agreeing to be bound
-        by the terms of this Agreement.
-
-ID SOFTWARE LICENSE
-
-        1.      Grant of License.  ID grants to you the limited right to use
-        one (1) copy of the enclosed or foregoing Id Software game program
-        (the "Software"), which is the shareware version or episode one of
-        the game program.  For purposes of this section, "use" means loading
-        the Software into RAM, as well as installation on a hard disk or
-        other storage device. You agree that the Software will not be
-        shipped, transferred or exported into any country in violation of
-        the U.S. Export Administration Act (or any other law governing such
-        matters) and that you will not utilize, in any other manner, the
-        Software in violation of any applicable law.
-
-        2.      Commercial Use is Prohibited.  Under no circumstances shall
-        you, the end-user, be permitted, allowed or authorized to
-        commercially exploit the Software, or any portion thereof, such 
-	as a screen display or a screenshot.  Neither you nor anyone at your
-        direction shall do any of the following acts:
-
-        a.      Rent the Software;
-
-        b.      Sell the Software;
-
-        c.      Lease or lend the Software;
-
-        d.      Offer the Software on a pay-per-play basis;
-
-        e.      Distribute the Software for money or any other
-                consideration; or 
-
-        f.      In any other manner and through any medium
-                whatsoever commercially exploit the Software or use
-                the Software for any commercial purpose. 
-
-        3.      Additional Prohibited Uses.  Neither you, nor anyone at your
-        direction, shall take the following action in regard to the
-        Software, or any portion thereof, such as a screen display or 
-	a screenshot:
-
-        a.      Modify, disassemble, reverse engineer or decompile
-                the Software; 
-
-        b.      Translate the Software;
-
-        c.      Reproduce the Software;
-
-        d.      Publicly display the Software; or
-
-        e.      Prepare derivative works based upon the Software.
-
-	4.	Use of Other Material is Prohibited.  Use, in any manner, of 
-	the trademarks, such as Quake(tm) and the NIN(r) logo, logos, symbols, 
-	art work, images, screen displays or screenshots, sound effects, music, 
-	and other such material contained within, generated by or relating to 
-	the Software is prohibited.
-
-	5.      Restrictions Apply to Third Parties.  The prohibitions and
-        restrictions described herein apply to anyone in possession of 
-	the Software.
-
-        6.      Permitted Distribution. So long as this Agreement
-        accompanies the Software at all times, ID grants to Providers the
-        limited right to distribute, free of charge, except normal access
-        fees, and by electronic means only, the Software; provided, however,
-        the Software must be so electronically distributed only in a
-        compressed format. The term "Providers," as used in the foregoing
-        sentence, shall mean persons whose business it is to provide
-        services on the Internet, on commercial online networks, or on the
-        BBS. Anyone who receives the Software from a Provider shall be
-        limited to all the terms and conditions of this Agreement. Further,
-        ID grants to you, the end-user, the limited right to distribute,
-        free of charge only, the Software as a whole.
-
-        7.      Copyright. The Software is owned by ID and is protected by
-        United States copyright laws and international treaty provisions.
-        You must treat the Software like any other copyrighted material,
-        except that you may make copies of the Software to give to other
-        persons. You may not charge or receive any consideration from any
-        other person for the receipt or use of the Software. You agree to
-        use your best efforts to see that any user of the Software licensed
-        hereunder complies with this Agreement.
-
-        8.      Limited Warranty. ID warrants that if properly installed and
-        operated on a computer for which it is designed, the Software will
-        perform substantially in accordance with its designed purpose for a
-        period of ninety (90) days from the date the Software is first
-        obtained by an end-user. ID's entire liability and your exclusive
-        remedy shall be, at ID's option, either (a) return of the retail
-        price paid, if any, or (b) repair or replacement of the Software
-        that does not meet ID's Limited Warranty. To make a warranty claim,
-        return the Software to the point of purchase, accompanied by proof
-        of purchase, your name, your address, and a statement of defect, or
-        return the Software with the above information to ID.  This Limited
-        Warranty is void if failure of the Software has resulted in whole
-        or in part from accident, abuse, misapplication or violation of this
-        Agreement. Any replacement Software will be warranted for the
-        remainder of the original warranty period or thirty (30) days,
-        whichever is longer. This warranty allocates risks of product
-        failure between Licensee and ID. ID's product pricing reflects this
-        allocation of risk and the limitations of liability contained in
-        this warranty.
-
-        9.      NO OTHER WARRANTIES. ID DISCLAIMS ALL OTHER  WARRANTIES,
-        EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED
-        WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A pARTICULAR PURPOSE
-        WITH RESPECT TO THE SOFTWARE AND THE ACCOMPANYING WRITTEN MATERIALS,
-        IF ANY. THIS LIMITED WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS. YOU
-        MAY HAVE OTHERS WHICH VARY FROM JURISDICTION TO JURISDICTION. ID
-        DOES NOT WARRANT THAT THE OPERATION OF THE SOFTWARE WILL BE
-        UNINTERRUPTED, ERROR FREE OR MEET LICENSEE'S SPECIFIC REQUIREMENTS.
-        THE WARRANTY SET FORTH ABOVE IS IN LIEU OF ALL OTHER EXPRESS
-        WARRANTIES WHETHER ORAL OR WRITTEN. THE AGENTS, EMPLOYEES,
-        DISTRIBUTORS, AND DEALERS OF ID ARE NOT AUTHORIZED TO MAKE
-        MODIFICATIONS TO THIS WARRANTY, OR ADDITIONAL WARRANTIES ON BEHALF
-        OF ID. ADDITIONAL STATEMENTS SUCH AS DEALER ADVERTISING OR
-        PRESENTATIONS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES
-        BY ID AND SHOULD NOT BE RELIED UPON.
-
-        10.      Exclusive Remedies. You agree that your exclusive remedy
-        against ID, its affiliates, contractors, suppliers, and agents for
-        loss or damage caused by any defect or failure in the Software
-        regardless of the form of action, whether in contract,tort,
-        including negligence, strict liability or otherwise, shall be the
-        return of the retail purchase price paid, if any, or replacement of
-        the Software. This Agreement shall be construed in accordance with
-        and governed by the laws of the State of Texas. Copyright and other
-        proprietary matters will be governed by United States laws and
-        international treaties. IN ANY CASE, ID SHALL NOT BE LIABLE FOR LOSS
-        OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL,
-        CONSEQUENTIAL, INDIRECT OR OTHER SIMILAR DAMAGES ARISING FROM BREACH
-        OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, OR OTHER LEGAL THEORY
-        EVEN IF ID OR ITS AGENT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-        DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. Some jurisdictions do
-        not allow the exclusion or limitation of incidental or consequential
-        damages, so the above limitation or exclusion may not apply to you.
-
-        11.     General Provisions. Neither this Agreement nor any part or
-        portion hereof shall be assigned or sublicensed, except as described
-        herein. Should any provision of this Agreement be held to be void,
-        invalid, unenforceable or illegal by a court, the validity and
-        enforceability of the other provisions shall not be affected thereby. 
-	If any provision is determined to be unenforceable, you agree to a 
-	modification of such provision to provide for enforcement of the 
-	provision's intent, to the extent permitted by applicable law.  Failure 
-	of a party to enforce any provision of this Agreement shall not 
-	constitute or be construed as a waiver of such provision or of the 
-	right to enforce such provision. If you fail to comply with any terms 
-	of this Agreement, YOUR LICENSE IS AUTOMATICALLY TERMINATED.
-
-        YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND
-        THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION
-        OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING
-        OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, YOU AGREE TO
-        BE BOUND BY THIS AGREEMENT'S TERMS AND CONDITIONS. YOU FURTHER
-        AGREE THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID AND
-        YOU, THIS AGREEMENT IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE
-        RIGHTS AND LIABILITIES OF THE PARTIES. THIS AGREEMENT SUPERSEDES
-        ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY
-        OTHER COMMUNICATIONS BETWEEN ID AND YOU RELATING TO THE SUBJECT
-        MATTER OF THIS AGREEMENT.
-
-June 21, 1996
-
-SHAREWARE VERSION: QUAKE LIMITED USE SOFTWARE LICENSE AGREEMENT
-(DWC:dw:3406.0024:DWC\doc:1163)
--- a/u/data/TECHINFO.TXT
+++ /dev/null
@@ -1,1901 +1,0 @@
-Welcome to the Quake Technical Information file!
-
-TABLE OF CONTENTS
------------------
-Introduction to the Console..............
-Video Subsystem Documentation............
-Sound Subsystem Documentation............
-CD Audio Subsystem Documentation.........
-Network Subsystem Documentation..........
-Modem Strings............................
-Win95 Documentation......................
-Key Binding and Aliases..................
-Quake Keys and Common Commands...........
-Making a Config File.....................
-Demos....................................
-Reporting Quake Bugs.....................
-
-
-==========================================
-==     Introduction to the Console      ==
-==========================================
-
-Throughout this document, examples of commands are given, all of which
-are typed in at the console. To bring up the console, press the tilde ('~')
-key or press ESC to bring up the menu, select Options, and select Console...
-from the options menu. To exit the console, press ESC.
-
-The console provides a way to change console variables and also accepts
-commands that change game settings such as movement keys, video mode, as
-well as providing an interface for key binding and command aliasing (more
-on that later).
-
-The console also has a command history with which you can browse through
-previous commands. Use the up and down arrows to navigate through the
-command history and press <enter> to re-issue a command.
-
-Partially typing a command and then pressing the TAB key will complete the
-currently typed text with the first matching console variable or command.
-(Yes, this is a good way to look for console commands.)
-
-To review previous actions by page, use the PGUP and PGDN keys.
-
-
-==========================================
-==    Video Subsystem Documentation     ==
-==========================================
-
-The Video Modes menu
---------------------
-
-Video modes can most easily be selected from the the Video Modes menu, which
-is brought up by selecting the Video Options choice in the Options menu.
-All the resolutions that Quake can support on the current computer are
-displayed.
-
-Please note that higher-resolution modes require correspondingly more
-system memory in order for Quake to run, and that some high-resolution
-modes may not be available when running Quake on 8 Mb machines.  Such
-modes are not listed in the Video Modes menu.  Please do not report
-video modes that do not appear in the Video Modes menu as bugs; either
-those modes are not supported by your video adapter, or there is not
-enough system memory for Quake to support those modes.
-
-The video modes listed in the Video Modes menu can be tested, set, and made
-the default mode for Quake from the Video menu, as follows:
-
-* The arrow keys can be used to move the blinking indicator to any of the
-modes listed in the Video menu.
-
-* Pressing the 'T' key tests the mode the blinking indicator points to, by
-setting the mode, leaving it set for 5 seconds, and returning to the previous
-mode.  This lets you verify that your computer does in fact support that
-mode.  We highly recommend that you always test modes with 'T' before setting
-them
permanently by pressing the Enter key, in case some sort of hardware or
-software glitch causes a mode to function incorrectly and produce a garbled
-screen.  It is unlikely but possible that testing or setting a mode will
-cause your computer to hang or crash; if this happens, there is a serious
-hardware or software bug, and you should not attempt to select that mode
-again.
-
-* Pressing the Enter key sets the mode the blinking indicator points to,
-leaving it set so Quake will then run in that mode.  We suggest that you
-test a mode by pressing the 'T' key before setting it by pressing the Enter
-key.  Note that a selection made with the Enter key remains in effect only
-until Quake is exited (or a new mode is set).  You must explictly make a mode
-the default mode by pressing the 'D' key in order to automatically set that
-mode when you start Quake up in the future.
-
-* Pressing the 'D' key makes the current mode the default mode that Quake
-starts up with.  Note that the current mode is the mode that's displayed in
-white in the mode list, not necessarily the mode that the blinking indicator
-points to.  The current default mode is listed in the description of the 'D'
-key at the bottom of the Video Modes menu.
-
-* Pressing Esc exits the Video Modes menu.
-
-Please see "Bug Reporting," below, for information on how to report any
-problems you encounter.
-
-
-Video modes from the console:  Quick start
-------------------------------------------
-
-More comprehensive but more complex video control is available through the
-Quake console.  This section describes the commands necessary to perform
-basic mode setting through the console (this is similar to what can be
-accomplished through the Video Modes menu), and following sections describe
-console video control in detail.
-
-To see all the video modes that are available, bring up the console (either
-press tilde ('~'), or press Esc to bring up the menu, select Options, and
-select Console... from the Options menu).
-
-From the console, type vid_describemodes<enter> to see all available modes.
-Type vid_mode <mode #> to set a mode, where <mode #> is the mode number
-listed for the desired mode by vid_describemodes.  Higher-resolution modes
-generally require more extra system memory in order to run, and many are
-not available in 8 Mb systems; modes that are supported by the video
-adapter but are currently unavailable due to system  memory limitations
-will still show up in
the mode list from vid_describemodes, but will
-have "**" in place of a mode number.  (Such modes will not show up at
-all in the Video Modes menu.)  If you try to set a mode for which
-there is insufficient system memory, you will receive a message to that
-effect, and the video mode will remain unchanged.
-
-
-More detail
------------
-
-This version of Quake supports software drawing in a variety of
-video modes.  It does not support any 3-D hardware accelerators.
-Video modes that are built into Quake are:
-
-320x200, 360x200, 320x240, 360x240, 320x350, 360x350, 320x400,
-360x400, 320x480, 360x480
-
-However, the higher-resolution modes on this list require additional
-memory, and may not be available in 8 Mb systems.
-
-In addition, all VESA 2.0 256-color linear framebuffer modes
-supported by the video adapter are supported.  Further information
-about VESA 2.0 is provided below.
-
-
-Video mode reporting and selection
-----------------------------------
-
-Quake assigns each available video mode a mode number, which can
-then be used to query information about the mode or to select the
-mode.  The first 11 mode numbers are always as follows:
-
-0:  320x200
-1:  320x200
-2:  360x200
-3:  320x240
-4:  360x240
-5:  320x350
-6:  360x350
-7:  320x400
-8:  360x400
-9:  320x480
-10: 360x480
-
-You will notice that modes 0 and 1 are both 320x200; mode 1 is a
-Mode X-style version, which may someday allow support of page
-flipping for cleaner graphics, but right now it's just slower with
-no advantages, so use mode 0 for 320x200 resolution.  Modes 2-10
-are all higher resolution than mode 0, and look very nice, but are
-also all slower than mode 0.  Mode 0 is the fastest of the 11
-built-in modes.
-
-In addition to the built-in modes, Quake checks for the presence
-of a VESA version 2.0 driver.  If such a driver is detected, the
-driver is queried for all 8-bit-per-pixel linear framebuffer (LFB)
-modes that are supported; also, if no LFB 320x200 mode is available,
-a banked 320x200 VESA mode is queried for.  All such modes are added
-to the mode list starting at mode 11.  The available modes will vary
-depending on adapter, graphics chipset, amount of video memory, and VESA
-2.0
 driver.  The higher the resolution, the lower the performance, and
-the
higher-resolution modes will often be too slow for good gameplay
-on most machines.  (Also, higher-resolution modes often need more memory
-than is available in an 8 Mb system.)  The screen can be sized down to
-improve performance in higher-resolution modes, but then of course the
-effective resolution of Quake is reduced.
-
-At the same resolution, VESA LFB modes are often faster than the non-VESA
-modes 0-10, because adapters often have faster memory access in LFB modes.
-
-If a given VESA mode can support page flipping, then it defaults to page-
-flipped operation.  A VESA mode can be forced to non-page-flipped operation
-by setting the vid_nopageflip console variable to 1, then setting the mode
-
(note that vid_nopageflip takes operation on the next, not the current, mode
-set, and note that it then stays in effect permanently, even when Quake is
-exited and restarted, unless it is manually set back to 0).  If there is not
-enough memory for two pages in a VESA mode, or if the
-adapter doesn't support page flipping, then the mode will automatically
-be non-page-flipped.  Page flipping can have higher visual quality, but may
-be either faster or slower, depending on the graphics adapter and other
-hardware.  (See the discussion of the Pentium Pro, below, for a
-discussion of why page flipping can be faster but is sometimes much slower
-on that processor.)  Page-flipped modes use less system memory than non-
-page-flipped modes.
-
-Quake's VESA support, including VESA driver detection, can be disabled by
-using the -stdvid command-line switch, and can also be disabled, along with
-sound, network, and other hardware support, by the -safe command-line switch.
-
-The maximum resolution supported by Quake is 1280x1024.  Modes with higher
-resolutions will not be reported by vid_describemodes, and cannot be set.
-
-There is no support for any 3-D accelerator boards in this version of Quake.
-Coming soon.
-
-Quake always starts up in mode 0, and modes 0-10 are always available, given
-enough system memory.
-
-
-A note on modes reported in the Video Modes menu
-------------------------------------------------
-
-The vid_describemodes console command lists all modes with
-resolution less than or equal to 1280x1024 that are
-supported by the video adapter, although modes for which there
-is not enough system memory have "**" for the mode number.  VGA,
-Mode X-style, and VESA 2.0 modes are listed separately, so a
-single resolution can be listed as many as three times, once for
-each hardware mode that supports it.  For example, mode 0 is
-VGA mode 0x13, which supports 320x200 resolution, and mode 1 is
-320x200 Mode X-style mode.  Quake looks identical in both
-modes, although it usually runs faster in mode 0.
-
-The Video Modes menu is much simpler.  Only modes with resolution
-less than or equal to 1280x1024 that are both supported by the
-hardware and for which there is sufficient system memory are
-listed.  Further, a given resolution is listed only once.  If a
-given resolution is available in multiple hardware modes, then
-selecting that resolution will select the appropriate hardware mode
-as follows:
-
-If the mode is 320x200, then VGA mode 0x13 is selected, and
-equivalent Mode X and VESA modes are ignored;
-
-Otherwise, the VESA version of the mode is used.
-
-You can always see what video mode is selected from the console by typing
-the command:
-
-vid_mode<enter>
-
-command.
-
-None of this has any effect on selecting modes through the
-console, where all the different versions of each mode are
-listed, and the desired version can be selected by using the
-appropriate mode number.
-
-
-How to get VESA 2.0 support
----------------------------
-
-Some video adapters have VESA 2.0 support in ROM.  Other video
-adapters come with loadable VESA 2.0 TSRs.  In the absence of either
-of these, UniVBE, a shareware product from SciTech, provides VESA 2.0
-support for most video adapters.  The latest version of UniVBE can be
-obtained from the following locations:
-
-www: http://www.scitechsoft.com
-ftp: ftp.scitechsoft.com
-CIS: GO SCITECH
-AOL: Keyword SciTech
-
-SciTech can be contacted at:
-
-email: [email protected]
-
-SciTech Software
-5 Governors Lane, Suite D
-Chico, CA
-95926-1989
-
-The current version at this writing is UniVBE 5.2.  This version
-supports many more adapters than previous versions, and adds
-a number of useful low- and medium-resolution modes, such as 400x300
-and 512x384.
-
-
-Video-related commands
-----------------------
-
-vid_describecurrentmode
-   lists the description for the current video mode.
-
-vid_describemode <mode #>
-   lists the description for the specified video mode, where <mode #> is as
-   reported by vid_describemodes.
-
-vid_describemodes
-   lists descriptions for all available video modes.
-
-vid_mode <mode #>
-   sets the display to the specified mode, where <mode #> is as reported by
-   vid_describemodes.
-
-vid_nopageflip <1|0>
-   when set to 1, VESA mode sets will always select non-page-flipped
-   operation.  When set to 0, VESA mode sets will select page-flipped
-   operation whenever possible.  All non-VESA modes are always
-   non-page-flipped.  The setting of vid_nopageflip is remembered
-   when Quake is exited (by being saved in config.cfg), and is reloaded
-   when Quake is restarted, so once vid_nopageflip is set to 1, all
-   VESA modes set in all Quake sessions after that point be will non-page-
-   flipped until vid_nopageflip is set to 0.  Note that setting this
-   variable doesn't affect whether the current video mode is page-flipped,
-   but rather whether page-flipping can be used by future mode sets.
-
-vid_nummodes
-   reports the total number of modes available.
-
-vid_testmode <mode #>
-   tries to switch Quake to the specified mode, then returns to the current
-   mode after 5 seconds.  This allows you to try an untested mode without
-   ending up with a black screen if, for example, the monitor can't display
-   the mode properly.  There may still be instances in which, due to VESA
-   driver or hardware bugs, the machine will hang in certain modes;
-   vid_testmode can't recover from these situations, but it can recover
-   from a blank or scrambled screen.
-
-vid_wait <wait type>
-  sets the type of waiting that the video adapter should do, as follows:
-  0: no waiting
-  1: wait for vertical sync active
-  2: wait for display enable active
-
-The default state of vid_wait depends on the video mode selected.
-(_vid_wait_override can force vid_wait to 1, wait for vertical
-sync; see the description of _vid_wait_override below.)
-In built-in modes 0-10, the default is always 0, no waiting.  You
-can set vid_wait to 1 (wait for vertical sync) to eliminate shear
-and tearing in these modes (so partially-completed frames are never
-drawn, resulting in a rock-solid image).  However, waiting for
-vertical sync can result in substantial performance loss.
-
-In VESA modes, if the adapter is VGA compatible and there's enough
-memory for three video pages, then triple-buffering is enabled and
-vid_wait is set to 2, wait for display enable.  There is little
-performance loss to this sort of waiting.  If the adapter is not
-VGA compatible, or if there's only enough memory for double-buffering,
-then vid_wait is set to 1 (wait for vertical sync).  This can cause
-significant loss of performance, but some sort of wait is generally
-necessary to avoid occasional glitching of the screen when
-page-flipping; we always choose the lowest-cost wait option that
-seems to be safe to use.  If there's only enough memory for one
-page, or if vid_nopageflip 1 is in effect, then vid_wait is set to 0
-(no wait).  As with modes 0-10, vid_wait 1 can be used to eliminate
-shear, but at a performance cost.
-
-We have encountered problems with a few adapters in VESA modes when
-vid_wait is set to 2 (wait for display enable).  Apparently some adapters
-just toggle display enable all the time, rather than only when pixels
-are being sent to the screen; this can cause occasional glitches in
-which the screen image jumps for one frame.  You can fix this by
-setting vid_wait to 1 (wait for vertical sync).  We would have made
-vid_wait 1 the default, but it's slower, and vid_wait 2 works on most
-machines.
-
-The default setting for vid_wait can be changed from the console
-at any time.  If you are in a VESA mode that waits for vertical
-sync and want to turn it off to get a speed-up, you can do so.
-However, changing a vid_wait 1 default in a VESA mode may result
-in problems.  If vid_wait defaults to 1 (wait for vertical sync)
-in a mode, and you force it to 2 (wait for display enable), the
-machine may hang, because some VGA-incompatible adapters, such as
-some ATI Mach64s, don't support the display enable status.  If you
-force vid_wait to 0 (no wait), then the screen may glitch periodically
-if the page flips at a time that results in a bad flip address,
-although some adapters work fine with no wait at all.
-
-If you force a new setting for vid_wait and encounter problems, DO
-NOT send us a bug report!
-
-_vid_wait_override <1|0>
-	can be used to force wait for vertical sync in all modes.  When
-    _vid_wait_override is set to 0, the type of waiting, if any, for
-    each video mode that's set thereafter is automatically set to
-    what appears to be the fastest safe state.  However, it is
-    possible in some cases that automatic setting may result in some
-	screen glitching, and it is also true that shear can be
-    eliminated by waiting for vertical sync (although at a cost in
-	performance), so it may be desirable in some cases to override
-    the automatic wait selection and always wait for vertical sync.
-    This can be done by setting _vid_wait_override to 1.  Once set,
-    this remains in effect through all succeeding mode sets, even
-    when Quake is exited and re-entered; the only way to keep Quake
-    from waiting for vertical sync once _vid_wait_override is set to
-    1 is to set _vid_wait_override to 0.  Note that changing
-    _vid_wait_override doesn't affect the current mode, but rather
-    takes effect on the next mode set.  _vid_wait_override is initially
-    set to 0.
-
-_vid_default_mode <mode #>
-    can be used to force Quake to start up in a particular mode.
-    The easiest way to select a default mode is by pressing the
-    'D' key in the Video Modes menu, but you can alternatively
-    use _vid_default_mode to specify the mode in which you want
-    Quake to start up in future Quake sessions.  _vid_default_mode
-    is initially set to 0.
-
-
-Higher-quality perspective texture mapping
-------------------------------------------
-
-For maximum speed, perspective correction is performed only every 16
-pixels.  This is normally fine, but it is possible to see texture ripples
-in surfaces that are viewed at sharp angles.  For more precise texture
-mapping, set the console variable d_subdiv16 to 0.  Doing this will result
-in somewhat slower performance, however, and the difference in visual
-quality will not normally be noticeable.
-
-
-Known video problems and workarounds
-------------------------------------
-
-If you think you've encountered a bug, see "Bug Reporting," below.
-As a general rule, go back to mode 0 if you have problems; mode 0
-should work properly in all cases.
-
-On some ATI Mach64 adapters, the palette is sometimes too dark in
-some VESA modes, and is tinted oddly (too red, for example) in other
-modes.  The workaround is to use different modes, or modes 0-10.
-
-In modes 0-10, shear and tearing can occur as partially finished
-frames are displayed.  Workaround:  set vid_wait to 1 (wait for
-vertical sync); this can result in a substantial performance loss,
-however.  An alternative is to use a page-flipped VESA mode.
-
-In page-flipped VESA modes, occasional glitched frames may occur with some
-VESA driver-hardware combinations.  Workaround:  set vid_wait to 1 (wait
-for vertical sync) (you can set _vid_wait_override to 1 to make waiting
-for vertical sync permanent for future Quake sessions), or use a different
-mode.
-
-The VESA video drivers that come with some video adapters don't
-support low-resolution modes such as 320x200; often,
-nothing lower than 640x400 is supported.  For example,
-this is the case with some ATI adapters.  There's nothing
-Quake can do to provide low-resolution VESA modes in these
-cases, because Quake simply supports whatever modes the VESA
-driver chooses to report as supported.  Unfortunately, 640x400
-is too high a resolution for really good performance unless you
-have a very fast Pentium or a Pentium Pro, so on machines with
-this sort of adapter, the VESA modes aren't very usable.
-Workaround:  Use UniVBE 5.2, which supports low-resolution modes
-on a wide variety of adapters.  Note that a few adapters simply can't
-support low-resolution modes, in which case you'll have to stick with
-the low-resolution VGA and Mode X modes that are built into Quake,
-which run fine but may be somewhat slower than VESA modes.
-
-A few video adapters are almost but not fully VGA compatible, because
-they don't support some unusual VGA video modes.  In particular, a few
-adapters don't support the 360-wide Mode X-style video modes that are
-build into Quake (modes 2, 4, 6, 8, and 10), and display garbage in those
-modes.  Workaround:  use different modes, such as 0, 3, 5, 7, 9, or any
-VESA modes that are available.
-
-Under Win 95, the palette occasionally gets messed up when switching from
-Quake to the desktop and back again.  You can restore the palette by
-bringing down the console (either press tilde ('~'), or press Esc to bring
-up the menu, select Options, and select Console... from the Options menu),
-and typing bf and pressing the enter key, to generate a background flash,
-which sets the palette.  Press Esc to exit the console.  Alternatively,
-setting the screen brightness, either from the Options menu or via the
-gamma console variable, sets the palette.
-
-Under Win 95, if the system key (the key with the Win 95 flag on it) is
-pressed while Quake is running fullscreen in a VESA mode, Win 95 may be
-unable to switch back from the desktop to Quake, in which case it will
-notify you of this, then terminate the Quake session.  This is a quirk
-of Win 95, and normally there is no workaround other than not to press
-that key or not to use VESA modes.  (Some people go so far as to remove
-the system key from their keyboard.)  However, you can
-disable the system key for Quake with the following utility:
-
-http://www.microsoft.com/windows/download/doswinky.exe
-
-Switching away from Quake with Alt-Enter, Ctrl-Esc, Alt-Tab, or
-Alt-Spacebar all work fine (except that if you disable the system key
-with doswinky.exe, Ctrl-Esc will also be disabled).
-
-
-Performance
------------
-
-Quake's graphics should be adequately fast in mode 0 (320x200) on all
-Pentium-class machines. If you feel Quake is running slowly, set the
-showturtle console variable to 1; you will then see a turtle icon
-appear in the upper left corner of the screen if the frame rate drops
-below 10 frame/second.  If you are getting the turtle, you are probably
-not getting great gameplay.  Performance can be improved in several ways:
-
-* size down the screen with the minus key
-
-* select a lower-resolution mode, if possible
-
-* use a VESA mode
-
-* if you're using a VESA mode and vid_wait is set to 1 (wait for
-vertical sync) by default (you can check by typing vid_wait<enter>
-in the console), you can try setting vid_wait to 0 or 2, as detailed
-in the discussion of the vid_wait command above.  Be aware that
-risks of screen glitching or hung machines are associated with
-overriding a default vid_wait 1 setting in VESA modes.
-
-To see how exactly fast Quake is running, bring up the console and type
-
-host_speeds 1<enter>
-
-You will see a display at the top indicating total frame time in
-milliseconds, and also server, graphics, and sound frame time in
-milliseconds.  (Note, though, that unless you also do
-
-snd_noextraupdate 1<enter>
-
-sound time will actually show up as graphics time.  However,
-snd_noextraupdate 1 can cause sound to get choppy, so it's not
-generally recommended.)
-
-Lower numbers are better.
-
-Type
-
-host_speeds 0<enter>
-
-to turn off the frame time display.
-
-
-Pentium Pro Performance
------------------------
-
-The Pentium Pro is a very fast Quake platform, but has one weak spot; it is
-by default very slow on writes to video memory.  This means that in default
-hardware configurations, you are usually much better off setting
-vid_nopageflip to 1 if you use VESA modes, so drawing is done to system
-memory instead of to video memory.  Remember that you must set the mode
-after setting vid_nopageflip to 1 in order to get vid_nopageflip to take
-effect.  (vid_nopageflip can sometimes be faster on a Pentium, too, but
-not by nearly as much in general, and it's often slower.)
-
-The Pentium Pro has some special features that are not turned on by default,
-but which can help Quake performance a LOT.  These features can be enabled
-by John Hinkley's program FASTVID, which can be obtained from
-ftp://members.aol.com/JHinkley/fastvid.zip.  Performance in 640x480
-mode on a Pentium Pro/150 nearly doubled after FASTVID was run; Quake
-was very playable (and looked great!) at this resolution.
-
-There's the usual caution with FASTVID:  It could conceivably make your
-system run goofily, or who knows what.  FASTVID is not a product of
-id Software, and id makes no guarantees regarding FASTVID. In other words,
-use FASTVID at your own risk.
-
-************************************************************************
-IMPORTANT NOTE: FASTVID works only on Pentium Pros!!!  Please do NOT
-contact either John Hinkley or id with problems concerning FASTVID on
-Pentium or 486 machines.
-************************************************************************
-
-
-Video Bug Reporting
--------------------
-
-If you encounter a video-related bug, please fill out the form found at the
-end of this file and e-mail it to [email protected].  There are several
-problems that are not bugs, and shouldn't be reported, including:
-
-* unavailability of some VESA modes; VESA modes are only supported by
-Quake if they are 8-bpp, are LFB modes (except for 320x200), and are
-no greater than 1280x1024 in resolution.  If you have a VESA mode
-that doesn't seem to be working properly, please contact the
-manufacturer; we just use the information that the VESA driver
-provides us with.
-
-* problems that occur when you change vid_wait from a default value
-of 1 (wait for vertical sync) in VESA modes
-
-* sluggish performance on 486s
-
-* the known palette problem on some Mach64s.
-
-* the known palette problems switching from fullscreen to the desktop and
-back under Win95.
-
-* the known problems switching back from the desktop in VESA modes after the
-system (Windows flag) key has switched from fullscreen to the desktop.
-
-* video modes that are not listed in the Video Modes menu, or that are not
-listed or are listed with "**" in the output from vid_describemodes; such
-modes are either not supported by your video adapter, or cannot be supported
-by Quake in the amount of memory your system has.  High-resolution modes will
-often not be available in 8 Mb systems.
-
-* 360-wide video modes that don't work although other resolutions do work
-
-* lack of low-resolution VESA modes; the availability of low-resolution modes
-is the responsibility of the VESA driver.  UniVBE 5.2 provides low-resolution
-modes on most adapters.
-
-Apart from these, we would very much like to hear about any video
-problems you encounter.
-
-
-==========================================
-==     Sound Subsystem Documentation    ==
-==========================================
-
-Quake's sound subsystem works only with Sound Blaster compatible sound
-cards.  For Quake to get the correct settings for DMA channel and PORT
-address, you must set your BLASTER environment variable (or have it set for
-you with the DIAGNOSE utility in your SB16 directory).  If you do not have
-the BLASTER environment variable set, your sound will not work.  If your
-sound card supports Sound Blaster compatibility, Windows 95 should set this
-variable for you.
-
-Note:  some sound cards do not have 100% Sound Blaster compatible
-hardware, but emulate the Sound Blaster interface.  Such cards may
-display some inconsistencies relative to an actual sound blaster.
-In particular, sound may be delayed on some cards.
-
-Note:  it is possible for sound to get choppy if the frame rate
-drops to a very low level, below 5 frames a second.  A frame rate
-that low will not provide a good gameplay experience, so if you
-do experience choppy sound, your machine is almost certainly not
-fast enough to run Quake satisfactorily in general.
-
-If (when) you see bugs, please use the form attached to the end
-of these docs to submit a bug report.
-
-Sound Card Command Line Options, Commands, and Variables
-==================================================================
-
-The commands and variables below work under any operating system.
-Command-Line options are typed on the command line in most any place
-but only in operating systems which support command line interfaces,
-like DOS's COMMAND.COM, or NEXTSTEP's or Linux's csh, sh, or bash.
-For example, under DOS, the NOSOUND option would be used like this:
-"C:> quake -nosound".
-
-Command-Line Options
---------------------
-
-NOSOUND
-  Syntax: -nosound
-  Description: This will prevent *any* sound code from being executed.  If
-	you are having technical difficulty with the game and then try
-	running the game with this option and the problem goes away, then
-	the problem is probably somewhere in the sound code.
-
-SSPEED
-  Syntax: -sspeed <speed>
-  Description: This will ask the sound code to set the playback speed
-    within the constraints of the capabilities of the card.  This is
-	11025 Hz by default and usually from 8000 to 44100.  Making this
-	faster requires more CPU horsepower, and has no actual benefits,
-	because the sounds only contain 11 KHz data.  Making this slower
-	degrades sound quality, but improves performance and saves memory.
-
-Commands
---------
-
-SOUNDINFO
-  Syntax: soundinfo
-  Description: This prints the "portable" information on your current
-        audio hardware setting in the game.  It specifies whether there is
-        stereo output (0 or 1), the number of samples in the DMA buffer, the
-        current sample position (changes each time you run SOUNDINFO and
-        ranges from 0 to the number of samples), the number of sample bits,
-	the submission chunk (1 in DOS or Linux w/ mmaped sound, larger in
-	Linux w/o mmaped sound), playback speed in Hz, the DMA buffer address
-	in hexadecimal (usually 8 digits after the 0x, starting with 0xf00..
-	in DOS, starting with 0x400.. in Linux, and less than 8 digits if the
-	hardware was not initialized successfully), and the number of
-        channels mixed in software (8 by default, changeable w/NUMCHANNELS
-        command).
-
-STOPSOUNDS
-  Syntax: stopsounds
-  Description: Stops any current looping sounds.
-
-
-Sound Blaster Sound Card Command-Line Options and Commands
-==========================================================
-
-The following applies to Sound Blaster cards or compatibles under DOS
-or a DOS box.
-
-Commands
---------
-
-SBINFO
-  Syntax: sbinfo
-  Description: This will print information on the Sound Blaster card
-    in the system.  If the version is 4 or greater, then it is some
-	kind of Sound Blaster 16 or compatible.  Version 2 is an 8 bit mono
-	sound blaster, Version 3 is an 8 bit stereo sound blaster pro.
-	The port is the I/O port
sensed from the A variable in the BLASTER
-	environment variable.
The DMA is the DMA channel and is confirmed in
-	hardware if the
card is version 4 or higher.  The mixer port can be
-	ignored.
-
-
-==========================================
-==   CD Audio Subsystem Documentation   ==
-==========================================
-
-Overview
-========
-Quake is designed to play background music off of a CD-ROM.  The Quake CD has
-music tracks on it and each level has been assigned a track that will be
-played.
-
-Win95 Users:  Putting a CD other than the Quake CD into the drive when Quake
-is already running will sometimes cause another Windows application to start
-and switch you back to Windows with Quake running in the background.  You
-will probably want to stop whatever was started and switch back to Quake as
-quickly as possible... especially if you are playing deathmatch.
-
-
-Command Line Parameters
-=======================
--nocdaudio
-   This will prevent the CD audio system from even attempting to initialize.
-   No CD commands or functions will be available.  The game will just run
-   with no music.
-
--cdmediacheck
-   This causes the game to periodically check to see if the CD has been
-   removed and a new one placed in the player.  It is off by default since
-   this operation is very slow on some CD players and is not needed under
-   Win95.  There is normally no reason to enable this option; it would
-   only be useful if you were going to be changing the CD from within the
-   game on a regular basis.
-
-Commands
-========
-There is normally no reason you would need to use any of these commands.  If
-you are playing Quake with the Quake CD in your CD-ROM drive, the appropriate
-music track will be played automatically.
-
-cd on
-   Re-enables the CD audio system after a "cd off" command.
-
-cd off
-   Shuts down the CD audio system.  No more music will be played unless it
-   is re-enabled.
-
-cd reset
-   Causes the CD audio to re-initialize.  This is useful if you change
-   CDs or insert the CD after you've already run Quake.
-
-cd play <track number>
-   Plays the specified track one time.
-
-cd loop <track number>
-   Plays the specified track.  It will be repeated until either it is
-   manually stopped or another track is started.
-
-cd stop
-   Stops the currently playing track.
-
-cd resume
-   Will resume playback of a stopped track.
-
-cd eject
-   This is for CD players that do not have a manual eject button.
-
-cd remap <track1> <track2> <track3> ...
-   Allows you to switch what tracks are played.  This is especially useful
-   if you want to play music other than that on the Quake CD.  If the CD
-   audio system is told to play track 1, it will instead play the 1st
-   track you specified.  For example: assuming a CD with 1 data track and
-   8 music tracks, the command "cd remap 1 9 8 7 6 5 4 3 2" would leave
-   the data alone and play the audio tracks as if they had been placed on
-   the CD in the opposite order.
-
-cd info
-   Reports information such as the number and types of tracks on the current
-   CD, what track (if any) is currently playing, and the playback volume.
-
-
-Variables
-=========
-bgmvolume
-   The background music volume.  Valid values are 0.0 though 1.0.  Changes
-   will normally be made using the options menu.
-
-   Not all CD-ROM players support variable volume.  The 0.0 to 1.0 value
-   translated to a value from 0 to 255 before it is passed to MSCDEX.  How
-   this value is interpreted varies from drive to drive.  The only thing
-   required by the MSCDEX specification is that 0 is off and anything else
-   is on.  Some CD-ROM drives only have on and off so change to bgmvolume
-   will have have no effect on volume once it is on.
-
-
-Messages
-========
-CDAudio_Init: MSCDEX version 2.00 or later required.
-   MSCDEX was either not loaded, or is a version earlier than 2.00.
-
-CDAudio_Init: First CD-ROM drive will be used
-   MSCDEX reported that the system has more than one CD-ROM drive.
-   Quake will always use the first drive in this case.
-
-CDAudio_Init: Unable to allocate low memory.
-   We were unable to allocate the memory needed to communicate with MSCDEX.
-   Although the game can still run, this indicates a severe low memory
-   condition.
-
-CD Audio Initialized
-   Indicates that the CD audio system has successfully initialized.
-
-CDAudio_Play: Bad track number N.
-   We attempted to play a track number that that is outside the range of
-   tracks recorded on the CD currently in the CD-ROM drive.  Probable causes
-   are that a CD other than Quake is in the player, or a custom level has
-   specified an invalid track number.
-
-CDAudio_Play: Can not play data.
-   A valid track was requested to be played, but it was a not an audio track.
-   The probable causes are the same as for a bad track number.
-
-CDAudio_Play: track N failed
-   A valid audio track was going to be played, but the play command to MSCDEX
-   returned an error.
-
-CDAudio: media changed
-   This is simply a notification.  It can only occur if the "-cdmediacheck"
-   option was specified on the command line.
-
-CDAudio: Error - playback stopped N
-   An error occurred while the CD was playing audio.  Playback has been
-   stopped and no further automatic play will be attempted; the game will
-   proceed without music.
-
-CDAudio_Init: No CD in player.
-   MSCDEX reported an error while Quake was attempting to get information
-   about the current CD.  There is either no CD in the player, or it was
-   unable to get the track information.  No automatic CD play will be
-   attempted; the game will proceed without music.
-
-
-==========================================
-==    Network Subsystem Documentation   ==
-==========================================
-
-Overview
-========
-
-Quake is a client/server game.  You are always running over some type of
-network.  In a standalone game, you are using a loopback network; it just
-passes messages back and forth in memory buffers.  This readme is talking
-about real networks and multiplayer deathmatches.  There are three main
-sections: commands, LANs, and Serial.
-
-Most normal configuration can be done via the game menus.
-
-There are two types of Quake servers: dedicated and listen.  A listen server
-is a machine that is used to play the game and also hosts the game for other
-players.  A dedicated server only hosts the game; it runs in text mode and
-does not let anyone play on that machine.  A single player game is really 
-just a 1 player listen server that doesn't listen for network connections.
-
-Dedicated vs Listen.  I'll try to make this simple: it is always better to
-use a dedicated server.  Why? Fairness and playability.  With a listen
-server, the person on the server always has advantages.  They will always be
-the first person into a level, they will always have zero latency, and they
-will get a server update on each and every frame.  On a dedicated server
-everyone gets equal treatment.  Getting into the server is a first come,
-first served proposition; latency is determined by each player's connection;
-and everyone is sent the same number of updates.  It's about as fair as life
-gets.  By the way, a good 486 machine works nicely as dedicated server.
-
-Another suggestion.  Until there is a native Win95 version of Quake, IPX will
-usually provide better gameplay on a local area network.  This is due to the
-delicate balancing act that is required to let a DOS program use the Win95
-TCP/IP stack.
-
-To start a Dedicated Server, you invoke Quake with the "-dedicated"
-command-line parameter.  When the server starts, you can type any command
-that you would normally type in the Quake Console, such as "map e1m1" to
-start the server on a specific map.  This can be done from the command-
-line as well by typing "quake -dedicated +map e1m1".  If a value is entered
-after "-dedicated", that is the amount of players allowed to connect, up
-to a maximum of 16 players. A dedicated server will quit to the OS whenever
-a fraglimit or timelimit is reached.  Example: "quake -dedicated 16" will
-start a 16-player dedicated server.
-
-To start a Listen Server, you invoke Quake with the "-listen" command-
-line parameter, or use the Multiplayer menu in the game.  Starting a listen
-server from the command-line will allow you to handle more than 4 players,
-as 4 is the limit when starting a game from the Multiplayer menu.  If a
-value is used after the "-listen", that is the maximum amount of players
-allowed, up to 16 players.
-
-Command Line Parameters, Commands, and Variables
-================================================
-
-Command line parameters
------------------------
--nolan
-   Disables IPX, TCP/IP, and serial support.
-
--noudp
-   Disables support for TCP/IP.
-
--udpport <port#>
-   Specifies a UDP port to be used other than the default of 26000.
-
--noipx
-   Disables support for IPX.
-
--ipxport <port#>
-   Specifies a IPX port to be used other than the default of 26000.
-
--noserial
-   Disable serial support.
-
--mpath
-   Enables support for code to use Win95's TCP/IP stack.  Do NOT use this
-   under DOS!
-
--listen [n]
-	Starts Quake ready to be a non-dedicated server for up to <n>
-	players.  If you do not specify a number <n> after -listen it will
-	default to 8.  The maximum allowed value is 16.
-
--dedicated [n]
-	Starts Quake ready to be a dedicated server for up to <n> players.
-	If you do not specify a number <n> after -listen it will default to 8.
-	The maximum allowed value is 16.  A dedicated Quake server stays in
-	text mode.  This is the Quake console with most commands still
-	available; those that make no sense (like vid_mode) are ommitted.
-
-Console Variables
------------------
-
-net_messagetimeout
-   Specifies how long Quake should wait for a message to arrive before
-   deciding the connection has died.  The default is 3 minutes.  For
-   reference, messages usually arrive at the rate of about 20 per second.
-
-hostname
-   This is the name for your server that will show up on an slist
-   (see below).  The default value is "unnamed".
-
-sys_ticrate
-   Only used by dedicated servers.  This determines the rate at which the
-   server will send out updates to the clients.  The default value is 0.05
-   (20 updatesper second).  For servers where bandwidth is limited, using
-   modems or the internet for example, it is advisable to lower this value
-   to 0.1 (10 updates per second).  This will have a very minor effect on
-   responsiveness, but will half to outbound bandwitdh required making the
-   modem players a lot happier.
-
-
-Console commands
-----------------
-
-net_stats
-   This is for debugging. It displays various network statistics.
-
-slist
-   Looks for Quake servers on a local LAN (or over a null modem
-   cable).  This will NOT go outside the local LAN (will not cross
-   routers).
-
-
-LANs
-====
-
-Here are the LANs that are supported by the Quake test
-release.  For each one, you'll be told how to connect to a server
-*if it is not on your local network*.  If it is, you can use the
-"slist" command and connect by hostname.  See the main readme for
-a discussion of the connect command.
-
-IPX
----
-
-Quake has been run with Novell's ODI IPX stack under DOS, PDIPX with packet
-drivers under DOS, and the Microsoft IPX stack in a Win95 DOS box.  When
-connecting to a server using IPX, you specify its network:nodeaddress (like
-12345678:1234567890AB).  If you are on the same network, you can just specify
-the node address.  If you are doing a connect command from the console, a
-full IPX address must be enclosed in quotes.
-
-For example, the server's IPX address is "00FADE23:00aa00b9b5b2", you would
-enter: connect "00FADE23:00aa00b9b5b2"
-
-Win95 TCP/IP
-------------
-
-Please see the Win95 section of this file for details about playing using
-TCP/IP under Win95.
-
-Kali
-----
-
-To Quake, Kali appears to be IPX.  Once you've got Kali up and running, run
-Quake as if it was on an IPX network.
-
-Beame & Whiteside TCP/IP
-------------------------
-
-This is the only DOS TCP/IP stack supported in the test release.
-It is not shareware...it's what we use on our network (in case you
-were wondering why this particular stack).  This has been "tested"
-extensively over ethernet and you should encounter no problems
-with it.  Their SLIP and PPP have not been tested.  When connecting
-to a server using TCP/IP (UDP actually), you specifiy it's "dot notation"
-address (like 123.45.67.89).  You only need to specify the unique portion
-of the adress.  For example, if your IP address is 123.45.12.34
-and the server's is 123.45.56.78, you could use "connect 56.78".
-
-Playing over the Internet
--------------------------
-Yes, you can play Quake over the Internet.  How many people can be in
-the game? That depends.  How smooth will the game be?  That depends.
-There are just too many variables (bandwidth, latency, current load,
-etc...) for us to make any kind of promises about Internet play.
-
-
-Serial/Modem
-============
-
-The Quake serial driver supports two COM ports.  Although they are referred
-to as COM1 and COM2, you can configure them to use any normal hardware
-COM port (1 thru 4 on most PCs).  The com ports are used with interrupts,
-so their IRQ may not be used for another purpose (such as a LAN adapter
-or sound card).  The IRQ may not be shared with another device either;
-not even another COM port.  A client can only be connected to one server
-at a time, so multiple ports are really only useful on a server.
-When using modems, the client must originate the call and the server
-must answer.  This holds true even for a two player, non-dedicated
-server configuration.
-
-In the Multiplayer menu, the default modem string is "ATZ".  If your modem
-games are too slow, you can change this string to the appropriate one for
-your modem as listed below in the "Modem Strings" section.
-
-
-The COMx commands
------------------
-
-Use the menus for serial play whenever possible.  The console
-interface is only for unusual configurations.  It is much more
-difficult to understand and use correctly.
-
-Those of you who do use the console commands for serial play need to
-know that the menus always use the first Quake COM line (COM1); yes,
-even for COM2.  The names COM1 and COM2 here mean the first and second
-serial ports, not necessarily the PC COM1 and COM2 ports (although those
-are the default configurations).
-
-There are two commands to support serial/modem play for Quake.  They
-are: COM1 and COM2. Entering one of these commands with no arguments
-will display the status of that serial port, similar to this:
-
-Settings for COM1
-enabled:   true
-connected: false
-uart:      16550
-port:      3f8
-irq:       4
-baud:      57600
-CTS:       ignored 
-DSR:       ignored 
-CD:        ignored
-clear:     ATZ
-startup:
-shutdown:  ATH
-
-When used with arguments, these commands change the settings and
-status of the COM ports.  The possible arguments are listed below;
-examples follow.
-
-enable | disable
-   "enable" means that your configuration is complete and you want to use
-   the COM port.  "disable" is used to turn off a COM port, usually to
-   change its settings.  The default (initial) state is disabled.
-
-
-modem | direct
-   Use one of these two to let Quake know if you are using a modem or a
-   direct connection (also called a null modem).  Quake uses this to know
-   if it needs to handles modem initialization strings, dialing sequences,
-   and hangup procedures.
-
-reset
-   This will reset the COM port to its default settings and state.
-
-
-port <n>
-irq <n>
-   These are used to set the I/O Port and IRQ that your serial port uses.
-   The default values are: port=3f8 irq=4 for COM1 and port=2f8 irq=3 for
-   COM2.  Note that the port number is displayed in hexadecimal; to enter
-   it you would use something like "COM2 port 0x2f8"; the "0x" preceding
-   the "2f8" indicates that you are giving the value in hexadecimal
-   otherwise decimal is assumed.
-
-
-baud <n>
-   Sets the baud rate.  Valid values for <n> are: 9600, 14400,
-   28800, 57600, and 115200.  57600 is the default.  Please note that
-   this is the baud rate used for the uart, not your modem.  It is
-   perfectly valid to use 57600 on a COM port that is connected to a
-   28.8 modem.
-
-8250 | 16550
-   Specifies the type of uart chip in your system. Normally this is
-   automatically detected, one of these need only be used if your chip
-   is incorrectly detected.
-
-clear
-startup
-shutdown
-   This allows you to specify the clear, startup, and shutdown strings
-   needed for
a modem for playing Quake.  If you've found values that
-   previously worked
with Doom, use them here.  If you are playing over
-   a null modem cable,
leave these blank.
-
--cts | +cts
--dsr | +dsr
--cd  | +cd
-   These determine if certain serial control lines should be honored or
-   ignored. The "-" means you want that line ignored, the "+" means to honor
-   it. "cts" is an abbreviation for "clear to send", "dsr" for
-   "data set ready", and "cd" for "carrier detect".  Do not
change these
-   values unless you are absolutely positive you need to. The default is to
-   ignore all 3 lines.
-
-Quake always uses no parity, 8 data bits, and 1 stop bit; these
-values can not be changed.  The baud, port, irq, and uart type can
-not be changed on an enabled port, you must disable it first.
-
-
-Configuration examples
-----------------------
-Example1: You have a machine with two serial ports you are going
-to use as a Quake server.  COM1 will be using a null modem cable and
-COM2 will be connected to a 14.4 modem.  You would use commands similar
-(the startup string would almost certainly be different) to these:
-
-COM1 baud 57600 enable
-COM2 baud 14400 modem startup AT\N0%C0B8 enable
-
-
-Example2: You are going to use your machine to connect to a dial-up
-Quake server with your 28.8 modem connected to COM2.  You would
-use a command something like this:
-
-COM2 baud 57600 modem startup AT\N0%C0B8 enable
-
-Note the baud rate is not the same as the modem speed.  This allows
-the modem-to-uart communications to occur at a higher rate than
-the modem-to-modem communications.
-
-Connecting to a serial Quake server
------------------------------------
-
-Connecting to a Quake server over a serial/modem connection is done
-using the "connect" command.  The command "connect 5551212" would try to
-connect to a Quake server at the phone number 555-1212.  Note: your local
-phone company would probably appreciate it if you didn't try this number!
-
-If you are using a null modem cable, you can type "connect #".
-Quake will then attempt to connect to the server.
-
-
-Known problems / workarounds
-============================
-Packet drivers with PDIPX - there is a bug that stops a server running on
-this combination from responding to the slist command.  Use the patched
-version of PDIPX included with Quake to correct this problem.
-
-SLIST sees no servers - Some PCMCIA ethernet cards and PPP drivers will
-not do the UDP broadcasts needed for the SLIST command (search for local
-games from the menu) to function correctly.  In these cases you must
-connect to a Quake game using either its IP address or hostname
-(DNS resolvable hostname, not the hostname variable in Quake).
-
-"BW_OpenSocket failed: 5" - This error is specific to the Beame and
-Whitesdie TCP/IP stack.  This stack uses DOS file handles as it's
-socket handles.  This error occurs when DOS runs out of file handles.
-You need to increase the number specified by "FILES=" in the DOS
-config.sys file.
-
-Severe lag using TCP/IP under Win95:
-	- Occasionaly when you first connect in to a Quake game using Win95
-TCP/IP you will experience severe lag and not be able to control your
-player's actions.  This usually clears up in 10 to 15 seconds.  
-	- There is apparently a strange limbo state for Microsoft's File and
-Print sharing.  This has been seen when it was installed and then later
-removed, but it still appears on the menus.  For some unknown reason
-this causes severe lag for a Quake game.  You need to go back and make
-sure that it is either completely installed or removed.
-
-
-==========================================
-==            Modem Strings             ==
-==========================================
-
-Boca M1440i (internal):
-ATS48=0S37=9S46=136%C0%E0%M0&K0&Q0&R1&C1&D2\G0\N1N0
-
-Boca 14.4k (internal):
-AT&C0N0S37=9&K0W0&Q0S36=3S48=128%C0
-
-Boca 14.4 Fax/Modem
-AT S46=0 S37=9 N0 &Q0 &D2 &K4
-
-Boca 14.4k (external):
-AT &F S0=1 S36=0 &K0 &Q6N0S37=9 &D2
-
-Boca 14.4k:
-AT S46=0 S37=9 N0 &Q0 &D2 &K0 %C0
-
-Cardinal 14.4k v.32bis, v.42bis Fax/Modem:
-AT &F N0 S37=9 &Q0 &D2 \N1
-
-Digicom Systems (DSI) (softmodem):
-AT Z \N0 &D2 &K0 S48=48
-
-Digicom Systems Scout Plus:
-ATZ*E0*N3*M0*S0*F0&D2
-
-Gateway Telepath:
-AT &F S37=9 %C0 &K0 &Q6 \G0
-
-Gateway Telepath 14.4k:
-AT S46=0 S37=9 N0 &Q0 &D2 &K0 %C0
-
-Gateway Telepath I:
-AT S0=1 &N6 &K0 &M0
-
-Gateway Telepath II:
-AT S0=1 S37=9 %C0 &Q0 &K0
-
-Generic v.32bis 14.4k Fax/Modem:
-AT \N0 %C0 B8
-
-Generic 14.4k Fax/Modem:
-AT S46=0 S37=9 N0 &Q0 &D2 %C0 \G0 &K0
-
-GVC 14.4k (internal):
-AT &F B8 \Q0
-
-Hayes 28.8k V.FAST Modem:
-AT &Q6 &K S37=9 N %C0 \N0
-
-Infotel 144I:
-AT&Q0 S37=9 N0 &D2
-
-Infotel 14.4:
-&F0 \N1 &D2 S37=F8
-
-Intel 14.4k:
-AT \N0 %C0 \Q0 B8
-
-Intel 14.4k (internal):
-AT Z B8 Q1 \C0 \N1 %C0 \V "H
-
-Linelink 144e:
-AT &F &D1 &K0 &Q6 S36=3 S46=136 %C0
-19200
-
-Microcom AX:
-&F \N1 \Q0 &D2
-
-Microcom QX/4232bis:
-AT %C0 \N0
-
-Netcomm M7F:
-AT &E &K0 B0 \V0 X4 &D2 \N1 \Q0 #J0 #Q9 %C0
-
-Nokia ECM 4896M Trellis V.32:
-AT Z %C0 /N0
-
-Nuvotel IFX 14.4 (internal):
-&F \N1 &D2 
-
-Practical Peripherals 14400FX v.32bis:
-AT Z S46=0 &Q0 &D2
-
-Practical Peripherals 14400FX v.32bis:
-AT S46=0 &Q0 &K0 &D2
-
-Supra:
-AT &F0 S46=136 %C0
-
-Supra (external):
-AT &K &Q &D \N1
-
-Supra 14.4k v.32bis:
-AT &F S46=136 &Q0 &D2
-
-Supra 14.4k v.32bis:
-AT &K &Q &D \N1
-
-Supra Fax Modem 14.4K v.32 bis
-AT &F %C0 S48=7 Q0 V1 W1
-
-Telepath 14.4k:
-AT &F&M0&K0&N6&H0 S0=1
-
-Twincomm DFi 14.4:
-AT&F &Q0 %C0 S37=9 &D2
-
-UDS V.3223:
-&F \N1 \Q &D2
-
-UDS Fastalk 32BX:
-&F0 \N1 &D2
-
-USR Courier v.32bis:
-ATS0=1 S7=60 E1 Q0 V1 &C1 &D2 &H0 &K0 &M0 &N6 &A3
-
-USR Courier HST/DS 16.8k:
-First reset the modem in a communication program with AT&F&W
-AT X4 B0 &A0 &B0 &H2 &I0 &K0 &M0 &N6a
-
-USR DS v.32bis v.42bis (external):
-AT&m0&n6&a0&r1&h0&k0&i0&s0&b1x1
-
-USR Sporster 9600:
-AT&M0&K0&N6
-
-USR Sportster V.34 28.8 (note: works best at 19200 baud):
-AT &F &M0 &I0 &K0 &B0 &N0
-
-USR Sportster 14.4k Fax/Modem USING ERROR CORRECTION:
-AT S0=1 S7=60 E1 QO V1 &C1 &D2 &K0 &N6 &A3
-
-USR Sportster 14.4k Fax/Modem (internal):
-AT &F&M0&K0&N6&H0
-
-USR Sportster 14.4k (internal):
-AT &F &B1 &H0 &I0 &K0 &M0 &N6 &R1
-
-USR Sportster 14.4k:
-ATS0=1S7=60E1Q0V1&C1&D2&K0&N6&A3
-
-USR Sportster 14.4k:
-AT &F0 &K0 &M0 &N6 &H0 &I0 &B1 &R1
-
-USR Sportster 14,000 Fax Modem:
-AT S0=2 &N6 &K0 &M0 &I0 &H0 &R1 &A0 V1 X4
-
-USR 14.4k:
-AT &F&A0&K0&M0
-
-USR 14.4k
-AT &K0 &H0 &D0 &I0 &R1
-
-USR 14.4k Dual Standard
-ATB0&R1&B1&N6Q0X4&A0&D2&H0&I0&K0&M0M1
-
-USR (model?):
-&F E1 V1 X4 &C1 &D2 &N0             
-
-ViVa 14.4k:
-AT&F&Q6\N0%C0&D2N0S37=9
-
-ViVa modem (internal):
-&F&Q6\N0%C0&D2N0S37=9
-
-Zoltrix model 14/14 VE:
-AT S0=Q0 V1 &C1 &D2 W2 &Q0
-
-Zoom 14.4k VFX:
-AT&Q6S37=9N0%C\N0
-
-Zoom 14.4k VFX:
-AT&Q6S37=11N0%C&K0
-
-Zoom OEM Modem:
-AT&Q6S37=9N0&K0
-
-Zyxel U-1496E:
-AT Z &N4 &K0
-
-
-==========================================
-==         Win95 Documentation          ==
-==========================================
-
-Quake is a DOS application.  However, it runs fine from the MS-DOS prompt
-under Win95, so long as the Properties for the MS-DOS prompt are set up so
-that Quake can run.  (See "Set the MS-DOS Prompt Properties", below, for
-information about setting MS-DOS Prompt Properties.)  Quake will NOT run
-under Windows NT. Following are some steps that can help Quake run better
-under Win95.
-
-
-Have enough memory
-------------------
-
-Quake requires at least 16 Mb of installed memory in order to run under
-Win95.
-
-
-Set the MS-DOS Prompt Properties
---------------------------------
-
-If Quake won't run, the MS-DOS Prompt Properties may not be set correctly.
-To set the Properties for the MS-DOS prompt, bring up a DOS session, and
-either click on the MS-DOS icon in the upper left corner or press
-Alt-Spacebar, then select Properties from the menu that comes up, and make
-sure the following settings are correct.
-
-In the Program sheet of MS-DOS Prompt Properties, make sure the "Suggest
-MS-DOS mode as necessary" is checked.
-
-In the Memory sheet of MS-DOS Prompt Properties, make sure all five fields
-are "Auto".
-
-In the Screen sheet of MS-DOS Prompt Properties, set "Usage" to Full-screen.
-
-In the Misc sheet of MS-DOS Prompt Properties, uncheck the "Allow screen
-saver" box, and check the "Always suspend" box.
-
-
-Make sure there's enough free disk space
-----------------------------------------
-
-If you get error messages like "can't lock memory" under Win 95, or if you
-get other weird, inexplicable errors, make sure you haven't run out of disk
-space; delete some files if necessary.  You can see how much disk space is
-free by bringing up "My Computer" and clicking on the disk icon; the free
-disk space will be shown at the bottom of the window.
-
-
-Run fullscreen
---------------
-
-Quake can run in a window under Win95--but it will run very slowly.  You are
-unlikely to get satisfactory performance unless you run Quake fullscreen.
-Quake normally comes up fullscreen under Win95; if you have switched it back
-to windowed mode, you can get that window back to fullscreen by clicking on
-it and then pressing Alt-Enter.
-
-
-Shut down other applications
-----------------------------
-
-Many Win95 apps and DOS apps run even when they're not the foreground
-application.  Such applications contend for system resources such as memory,
-processor cycles, and sound hardware.  If Quake seems to be running choppily,
-if sound is garbled, or if the disk is going all the time, try shutting down
-whatever other applications you have running.  For example, some players
-have reported that Quake does not run as well when the Office shortcut bar
-is running.
-
-
-Restore the palette if it gets garbled
---------------------------------------
-
-Under Win 95, the palette occasionally gets messed up when switching from
-Quake to the desktop and back again.  You can restore the palette by
-bringing down the console (either press tilde ('~'), or press Esc to bring
-up the menu, select Options, and select Console... from the Options menu),
-and typing bf and pressing the enter key, to generate a background flash,
-which sets the palette.  Press Esc to exit the console.  Alternatively,
-setting the screen brightness, either from the Options menu or via the
-gamma console command, sets the palette.
-
-
-Avoid the system key
---------------------
-
-Under Win 95, if the system key (the key with the Win 95 flag on it) is
-pressed while Quake is running fullscreen in a VESA mode, Win 95 may be
-unable to switch back from the desktop to Quake, in which case it will
-notify you of this, then terminate the Quake session.  This is a quirk
-of Win 95, and there is no workaround other than not to press that key
-or not to use VESA modes.  (Some people go so far as to remove the system
-key from their keyboard.)  Switching away from Quake with Alt-Enter,
-Ctrl-Esc, Alt-Tab, or Alt-Spacebar all work fine.
-
-
-Give Quake more and/or locked memory
-------------------------------------
-
-By default, Quake tries to allocate 8 Mb of unlocked memory for heap space
-under Win 95.  More memory helps Quake run faster; you can allocate more
-memory for Quake under Win95 by setting the command-line switch
-
--winmem x
-
-where x is the number of megabytes to allocate for Quake.  If there's enough
-memory in the system, the larger the number, up to about 16, the better the
-performance.  If, however, there isn't enough memory in the system, or many
-other applications are running, the larger number can just cause Quake to
-page to disk a lot, and can actually slow performance considerably.  Also,
-higher numbers can also cause Win 95 to take longer to start Quake and take
-longer to return to the desktop afterward.  If you have 32 Mb or more in your
-machine, -winmem 16 should provide the best performance for Quake.  If you
-have less than 32 Mb, or a lot of applications running, then you will have
-to experiment to find the best amount of memory to allocate for Quake.
-
-You may optionally instruct Quake to lock itself in memory by using the
-command-line switch
-
--winlock
-
-so it won't get paged out by other applications.  This can avoid hitches when
-parts of Quake get paged into and out of memory, and thus provide a smoother
-playing experience.  On the other hand, it can cause Quake to take longer to
-start, and can make the return to the desktop take longer when Quake ends,
-because Quake has been hogging a lot of memory.  It is even possible, if most
-of the memory in the system is locked by Quake, that it will take many
-minutes to switch back to the desktop while Quake is running, so the system
-will effectively be nearly frozen.  Therefore, use -winlock with caution;
-Quake is not as well-behaved a Win95 citizen when -winlock is specified, and
-does not share resources particularly well.
-
--winmem can be used in conjunction with -winlock; if -winmem specifies more
-memory than is available to be locked, then Quake will lock as much memory
-as possible.  Being too aggressive about how much memory is locked can
-actually slow Quake performance, because unlocked parts of the system like
-system CD and sound code and data can then be forced to page, so if you do
-lock memory, you will have to experiment to find the sweet spot, unless you
-have 32 Mb or more of memory.
-
--winlockunlock can be specified as an alternative to -winlock, to tell Quake
-to lock its memory when it starts, then immediately unlock it.  The
-advantages of doing this are: 1) it forces all of Quake's pages into memory,
-so no pages should need to be brought in as Quake runs, making for smoother
-running at the start, and 2) it enables Quake to determine whether the
-specified amount of memory (if -winmem is also specified) is available in the
-machine, so you can be sure Quake won't try to allocate more heap space than
-the the amount of physical memory that's actually available.  Like -winlock,
--winlockunlock causes Quake to take quite a bit longer to start up, but it
-has the advantage of making Quake a good Win95 citizen if you need to switch
-back to the desktop, or have other apps running.
-
-In general, Quake will run fine without any of the -winxxx switches, but you
-may find that one or more of them--particularly -winmem if you have more than
-16 Mb--helps Quake performance on your machine.
-
-None of this is an issue under DOS itself (as oppsed to a DOS box under
-Win95), because Quake just uses all the memory in the machine under DOS.
-
-By default, Quake tries to allocate 8 Mb of unlocked memory for heap space
-
-
-Watch out for limbo subsystems
-------------------------------
-Microsoft's File and Print sharing and IPX protocol stack have both been
-known to cause strange problems when they are in a limbo state.  The limbo
-state is seems to be an uninstall that did not complete succesfully.  Both
-of these cause poor network play performance. If you are experiencing
-severe lag, check the File and Print services.  If you the warning "IPX
-driver send failue: 04", check the IPX protocol stack.  They need to be
-either completely installed or removed; the problems only occur when they
-get into this strange semi-installed state.
-
-
-==========================================
-==        Key Binding and Aliases       ==
-==========================================
-
-Pressing the tilde key ("~") will bring down the console (pressing the
-tilde key or ESC while in the console will close the console). From the
-console you can adjust your player controls, this is done by "binding"
-keys to commands.  The format for binding keys is as follows:
-
-bind <key> <command>
-
-Where <key> is a valid key control and <command> is a valid quake command.
-
-Example:
-To bind the j key to the 'jump' command, you would type:
-bind j +jump			
-and press enter.
-
-Non-printable keys such as 'page up' and buttons from the mouse/joystick are
-bound in the same manner as printable characters. A list of bindable keys can
-be found at the end of this file.
-
-Example:
-To bind the page up key to the 'jump' command, you would type:
-bind pageup +jump
-and press enter.
-
-To bind the right mouse button to the attack command, you would type:
-bind mouse2 +attack
-and press enter.
-
-The alias command is used to create a reference to a command or list of
-commands.  When aliasing multiple commands, or commands that contain
-multiple words (such as "fraglimit 50"), you must enclose all the commands
-in quotation marks and separate each command with a semi-colon.
-
-Example of an alias that changes some Deathmatch server parameters:
-
-alias net_game "hostname my_server ; fraglimit 15 ; timelimit 15"
-bind INS net_game
-
-Once the server is spawned (you must be the one running the -listen server),
-you just push the Insert key to set the hostname, frag limit and time limit
-of the server. So now the first person to 15 frags, or with the one with the
-most frags in 15 minutes, wins.
-
-Another example would be to change to the Rocket Launcher, fire one rocket,
-and change back to the Double Barrel Shotgun, when you press the "," key:
-
-alias rl_dbsg "impulse 7 ; +attack ; wait ; -attack ; impulse 3"
-bind , rl_dbsg
-
-Aliasing is very powerful, allowing you great flexibility, so you should
-experiment by aliasing different commands in various ways.
-
-A list of common commands can be found in the next section.
-
-
-==========================================
-==    Quake Keys and Common Commands    ==
-==========================================
-
-The following keys can be bound:
-
-A-Z                     0-9
-*F1-F12                 *TAB
-ENTER                   SPACE
-BACKSPACE               UPARROW
-DOWNARROW               LEFTARROW
-RIGHTARROW              ALT
-CTRL                    SHIFT
-INS                     DEL
-PGDN                    PGUP
-HOME                    END
-PAUSE                   SEMICOLON
-
-MOUSE1 (mouse button 1)
-MOUSE2 (mouse button 2)
-MOUSE3 (mouse button 3)
-
-*~ (tilde)
-
-* Can only be bound on the command line or in a .cfg file.
-
-The ESC key cannot be bound. 
-
-
-==========================================
-==         Making a Config File         ==
-==========================================
-
-The commands (bindings and aliases) discussed above can be included into a
-file containing all of your personal configurations, known as a "config"
-file.  This file can then be loaded during game play to enable all your
-personal bindings and settings.
-
-To do this, use your favorite editor to create a new file, such as
-"fragmstr.cfg".  Your .cfg file MUST be located in the quake\id1 directory
-or quake won't find it.  Then after launching Quake, you would type "exec
-fragmstr.cfg" and press enter, from the console.  You can also exec you .cfg
-file from the DOS command prompt by typing "quake +exec fragmstr.cfg".
-When you exec a config file, it is the same as typing all the lines in your
-config file into the console, only Quake does it for you.  Here is an
-example config file (c:\quake\id1\bear.cfg) and the meaning of all the
-bindings, aliases and settings:
-
--------------------------------cut here-------------------------------------
-name player1            // Sets player name to player1 (lets your opponent
-                        // know who fragged them)
-
-sensitivity 4           // Sets the mouse sensitivity to 4
-
-scr_conspeed 5000       // Sets the console raise/lower speed
-
-lookspring 0            // Sets Mouse Look Spring to 0 (0=keep looking,
-                        // 1=spring back, when mouse button is released)
-
-vid_mode 10             // Sets Video Mode to mode 10 (360X480 resolution)
-
-gamma .8                // Sets Gamma Correction to .8 (<1=Lighter, 1=normal
-                        // and >1=darker)
-
-viewsize 70             // Sets the Screen View size to 70 degrees
-
-bind mouse1 +forward    // Binds the left mouse button to Move Forward
-
-bind mouse3 +attack     // Binds the middle mouse button to Fire
-
-bind mouse2 +mlook      // Binds the right mouse button to Mouse Look
-
-bind HOME "save bear1"  // Binds the Home Key to quick save, saves to
-                        // bear1.sav
-
-bind ENTER +showscores  // Binds the Enter key to show Deathmatch Scores
-
-bind SHIFT +speed       // Binds the Shift key to Run
-
-bind CTRL +jump         // Binds the Control key to Jump
-
-bind ; +mlook           // Binds the ; key to Mouse Look also
-
-bind . +moveleft        // Binds the . key to Strafe Left
-
-bind / +moveright       // Binds the / key to Strafe Right
-
-color 3 4               // Makes Uniform Top green and Pants Red for Net play
-
-alias rl_dbsg "impulse 7 ; +attack ; wait ; -attack ; impulse 3"
-
-bind , rl_dbsg          // Aliases single rocket attack command and binds
-                        // it to the ',' key.
--------------------------------cut here-------------------------------------
-
-
-==========================================
-==                Demos                 ==
-==========================================
-
-The standard Demos
-------------------
-
-Quake has 3 standard demos that start playing when you first run the game.
-It will cycle through these demos until you start or join a game.
-
-Recording a Demo
-----------------
-"record <demoname> <map> [track]"  This starts up level <map> and begins
-recording a demo into a file name <demoname>.dem.  You can specify the
-optional <track> to choose a background music from the CD, otherwise the
-default selection for that map will be played.
-
-Playing a Demo
---------------
-"playdemo <demoname>"  This command will open the file <demoname>.dem and
-play the demo.
-
-How to not play the standard demos at startup
----------------------------------------------
-
-So you've seen the Necropolis demo 10 billion times now and really don't
-ever want to see it again?  Here's how.
-
-The easy way is to start Quake with a "+map" command.  You could do
-"quake +map start" and you'll start on the single player start level.
-Or you could do "quake +map nonsense" and you'll wind up at the Quake
-console since there is no map named nonsense.  You can accomplish the
-same thing with a "+connect" too.   "+connect" by itself will look for
-Quake servers on the local network, "+connect 192.12.34.56" or
-"+connect host.timbuktu.edu" will try to connect the the specified
-Quake server.
-
-There is another way to not show the demos; one that also keeps your
-customizations in a seperate directory from the data files in the
-Quake distribution.
-
-Do this in the quake directory (the directory where you installed Quake;
-where you find "quake.exe" and "the id1" directory).  Create a file named
-"quake.rc".  Its contents should be:
-
-exec default.cfg
-exec config.cfg
-exec autoexec.cfg
-stuffcmds
-menu_main
-
-Create a batch file to run Quake in the quake directory.  "Q.BAT" is a good
-name. It's contents should be:
-
-quake -game . %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-If you normally use the Q95 batch file, just add the "-game ." part to
-that file.
-
-Now you can run "q" and quake will start off with the main menu displayed
-instead of running the demos.
-
-You can also make a seperate subdirectory for this if you'd like.  For
-example, make a directory named "mine" in the quake directory.  Create
-the "quake.rc" file as specified above in this directory.  Use
-"-game mine" instead of "-game ." in your batch file.
-
-Important note:  The directory specified by "-game" is where Quake will
-look for config.cfg, load and save games, and record and play
-demos.
-
-
-==========================================
-==         Reporting Quake Bugs         ==
-==========================================
-
-How to use the bug report:
-
-Where to send bug reports:
-E-mail  : [email protected]
-FAX     : 214-686-9288
-
-There are two sections of information - primary and secondary.
-
-Primary information contains information such as date, your name, e-mail
-address, etc.  Secondary information is actual bug information. There are
-a few different sections depending on what type of bug you revieced
-(sound, video, etc). Only fill out and include information from the section
-related to the type of bug you received.
-
-If possible, start Quake with the "-condebug" command line parameter
-and try to reproduce the bug. Attach the "qconsole.log" file found in the
-"id1" directory to the end of the bug report. If the bug is sound related,
-while in Quake, execute the SOUNDINFO and SBINFO (DOS only) commands from
-the console.
-
-Please attach a copy of your CONFIG.SYS and AUTOEXEC.BAT file to the end of
-the report.
-
-Bugs submitted properly with this form will get attention.
-Unformatted ones sent to personal accounts will be ignored.
-If you see problems, please take the time to do this.
-
-If you do not have all of the information requested in the form,
-don't worry. Send what you do have.
-
-Please include the version #. THe version # for Quake can be found in the
-lower right hand corner of the console. To bring up the console, press the
-tilde ('~') key. Press tilde ('~') again or ESC to exit.
-
--------------------------------cut here-------------------------------------
-
-
-============================================================================
-==              Quake Bug Report - Primary information                    ==   
-============================================================================
-
-Date:  
-Name:  
-Phone number:  
-E-mail address:  (please include this, we redirect tons of mail)
-Game Title:  
-Version #: 
-Operating system (i.e., DOS 6.0 or Windows 95):
-Computer type:  
-BIOS date:
-BIOS version:
-Processor type:  
-Processor speed:  
-Do you program at school/work?
-Do you provide tech. support at school/work?
-Please state the problem you encountered:
-Please state how to reproduce the problem:
-
-If program crashed with nasty undecipherable techno-garbage, please
-look for the eight-digit hex number which comes after "eip="
-and write it down here:
-
-
-============================================================================
-==              Quake Bug Report - Secondary information                  ==
-============================================================================
-
------------------------------- Video Related ------------------------------ 
-
-Video Card Manufacturer:
-Video Card Model:
-Chipset Used:
-BIOS Date:
-(If using UniVBE, The above information can be found by running uvconfig)
-
-Did the problem occur while in a VESA mode?
-
-If so, what is the VESA driver and version?  (eg., UniVBE 5.1a,
-built into board BIOS, or manufacturer provided TSR)
-
------------------------------- Sound Related ------------------------------
-
-Audio card brand and model:  
-
-If DOS or a DOS box, please run the command "set > set.txt" then
-attach "set.txt" to the end of the report.
-
------------------------------ Network Related -----------------------------
-
-What type of network connection was established when the error occurred?
-(modem, nullmodem, or network)
-If modem, Modem brand and model:
-
-If network, Network card brand and model:
-            Network protocol/configuration:  
-
----------------------------------------------------------------------------
-
-
-
-
-
-
-
-                                                                          
--- a/u/docs/INSTALL
+++ /dev/null
@@ -1,177 +1,0 @@
-INSTALL for Linux Quake
------------------------
-
-Quake for Linux provides several different binary executables to support
-different hardware and drivers.
-
-Included with Linux Quake are:
-	- SVGALib Quake (squake)
-	  This is a software renderer Quake that runs at the text console in Linux.
-	- GLQuake (glquake, glquake.glx and glquake.3dfxgl)
-	  This is a hardware renderer Quake that runs using hardware 3D
-	  acceleration.
-	- X11 Quake (quake.x11)
-	  Software rendering in a window under X11.
-
-Installation
-------------
-
-Mount the Quake CD as one would usually mount a CDROM, this can be 
-accomplished by using the command:
-
-		mount /dev/cdrom /mnt
-
-As root.  Once the CD is mounted, run the setup script on the CD as root.
-
-		$ su
-		Password:
-		# mount /dev/cdrom /mnt
-		# /bin/sh /mnt/setup
-
-The script will ask some questions about what options you want to install
-and automatically install the software into /usr/local/games/quake.
-
-Requirements
-------------
-
-Requirements for SVGALib Quake:
-
-- SVGALib 1.20 or later (/lib/libvga.so.1.2.10)
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-  or glibc (libc6) for the glibc version
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Requirements for GLQuake:
-
-- 3DFX based card for the GLQuake version, VooDoo, VooDoo Rush or VooDoo2
-at this writing.  In order to use 3DFX hardware, you must have 3DFX's
-GLIDE drivers installed.  RPMs for these drivers are available at:
-http://glide.xxedgexx.com/3DfxRPMS.html
-- For the glX version, an OpenGL implementation that includes hardware
-glX support.
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib compatible mouse for glquake or X11 for glquake.glx
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Requirements for X11 Quake:
-
-- X11R5 later, only tested with XFree86, should work with most X Servers
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-  or glibc (libc6) for the glibc version
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Additional notes for SVGALib Quake
-----------------------------------
-
-SVGALib may not detect a 3-button mouse properly (it
-will only use two buttons).  Check your /etc/vga/libvga.config
-and set it up for your mouse type.
-
-Also, newer versions of SVGALib have an mouse_accel_type option.  Most
-users will want to set this to "off" in /etc/vga/libvga.config.
-
-Additional notes for GLQuake
-----------------------------
-
-There are three different ways to execute GLQuake:
-
-1. The binary "glquake" requires Mesa 3-D 2.5 or later installed and compiled
-with 3DFX support (fxMesa..() function interface).  It also requires
-svgalib 1.3.0 or later for keyboard/mouse input.  This binary is a console
-application.  Mesa 3-D requires GLIDE to be installed.
-
-2. The shell script "glquake.3dfxgl" runs the "glquake" binary after
-preloading the lib3dfxgl.so library.  This is a port of 3DFX's Win32
-OpenGL MCD (Mini Client Driver) to Linux.  It is faster than Mesa 3-D
-since it was written specifically with supporting GLQuake in mind.
-lib3dfxgl.so requires that GLIDE be installed.
-
-3. The binary "glquake.glx" is linked against standard OpenGL libraries.
-It should run on many different hardward OpenGL implementations under
-Linux and X11.  This binary is an X11 application and must be run under
-X11.  It will work with Mesa 3-D as a standard glX based OpenGL 
-applications.  If the Mesa 3-D library is compiled with 3DFX support,
-you can have Mesa 3-D support 3DFX hardware under X11 by setting the
-enviroment variable "MESA_GLX_FX" to "fullscreen" for fullscreen mode
-and "window" for windowed mode, eg. "export MESA_GLX_FX=fullscreen" for sh 
-or "setenv MESA_GLX_FX fullscreen" for csh.
-
-For glquake, you must also have SVGALib or later installed (1.3.0 or later
-prefered).  GLQuake uses SVGALib for mouse and keyboard handling.
-
-If you have gpm and/or selection running, you will have to terminate them
-before running GLQuake since they will not give up the mouse when GLQuake
-attempts to run.  You can kill gpm by typing 'killall gpm' as root.
-
-You must run GLQuake as root or setuid root since it needs to access things 
-such as sound, keyboard, mouse and the 3DFX video.  Future versions may not 
-require root permissions.
-
-Additional notes for X11 Quake
-------------------------------
-
-This is a windowed version that is generic for X11.  It runs in a window
-and can be resized.  You can specify a starting window size with:
-	-width <width>
-	-height <height>
-	-winsize <width> <height>
-Default is 320x200. It works in 16bit modes, but it's slower (twice as many
-bytes to copy).
-
-No other video modes are supported (just runs windowed).  Mouse is read, but
-not "grabbed" by default.  Go to the Options menu and turn on Use Mouse to grab
-the mouse and use it in the game (or type "_windowed_mouse 1" at the console).
-
-Command Line Options for Linux Quake
-------------------------------------
-
--mem <mb>
-Specify memory in megabytes to allocate (default is 8MB, which should be fine
-for most needs).
-
--nostdout
-Don't do any output to stdout
-
--mdev <device> (SVGALib based versions only)
-Mouse device, default is /dev/mouse
-
--mrate <speed> (SVGALib based versions only)
-Mouse baud rate, default is 1200
-
--cddev <device>
-CD device, default is /dev/cdrom
-
--mode <modenum>
-Use indicated video mode
-
--nokdb
-Don't initialize keyboard
-
--sndbits <8 or 16>
-Set sound bit sample size.  Default is 16 if supported.
-
--sndspeed <speed>
-Set sound speed.  Usual values are 8000, 11025, 22051 and 44100.
-Default is 11025.
-
--sndmono
-Set mono sound
-
--sndstereo
-Set stereo sound (default if supported)
-
--- a/u/docs/INSTALL.Q2Mission
+++ /dev/null
@@ -1,39 +1,0 @@
-INSTALL for Linux Quake2 Mission Packs
---------------------------------------
-
-Installation
-------------
-
-Mount the Quake2 Mission Pack CD as one would usually mount a CDROM, this can 
-be accomplished by using the command:
-
-		mount /dev/cdrom /mnt
-
-As root.  Once the CD is mounted, run the setup script on the CD as root.
-
-		$ su
-		Password:
-		# mount /dev/cdrom /mnt
-		# /bin/sh /mnt/setup
-
-The script will ask some questions about what options you want to install
-and automatically install the software into /usr/local/games/quake2.
-
-After Installation
-------------------
-
-To run Quake2 Mission Pack #1: The Reckoning add the following option when
-executing Quake2:
-
-	./quake2 +set game xatrix
-
-To run Quake2 Mission Pack #2: Ground Zero add the following:
-
-	./quake2 +set game rogue
-
-Requirements
-------------
-
-The Quake2 Mission Packs require a previous installation of Quake2.
-
-
--- a/u/docs/INSTALL.Quake
+++ /dev/null
@@ -1,177 +1,0 @@
-INSTALL for Linux Quake
------------------------
-
-Quake for Linux provides several different binary executables to support
-different hardware and drivers.
-
-Included with Linux Quake are:
-	- SVGALib Quake (squake)
-	  This is a software renderer Quake that runs at the text console in Linux.
-	- GLQuake (glquake, glquake.glx and glquake.3dfxgl)
-	  This is a hardware renderer Quake that runs using hardware 3D
-	  acceleration.
-	- X11 Quake (quake.x11)
-	  Software rendering in a window under X11.
-
-Installation
-------------
-
-Mount the Quake CD as one would usually mount a CDROM, this can be 
-accomplished by using the command:
-
-		mount /dev/cdrom /mnt
-
-As root.  Once the CD is mounted, run the setup script on the CD as root.
-
-		$ su
-		Password:
-		# mount /dev/cdrom /mnt
-		# /bin/sh /mnt/setup
-
-The script will ask some questions about what options you want to install
-and automatically install the software into /usr/local/games/quake.
-
-Requirements
-------------
-
-Requirements for SVGALib Quake:
-
-- SVGALib 1.20 or later (/lib/libvga.so.1.2.10)
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-  or glibc (libc6) for the glibc version
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Requirements for GLQuake:
-
-- 3DFX based card for the GLQuake version, VooDoo, VooDoo Rush or VooDoo2
-at this writing.  In order to use 3DFX hardware, you must have 3DFX's
-GLIDE drivers installed.  RPMs for these drivers are available at:
-http://glide.xxedgexx.com/3DfxRPMS.html
-- For the glX version, an OpenGL implementation that includes hardware
-glX support.
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib compatible mouse for glquake or X11 for glquake.glx
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Requirements for X11 Quake:
-
-- X11R5 later, only tested with XFree86, should work with most X Servers
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-  or glibc (libc6) for the glibc version
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Additional notes for SVGALib Quake
-----------------------------------
-
-SVGALib may not detect a 3-button mouse properly (it
-will only use two buttons).  Check your /etc/vga/libvga.config
-and set it up for your mouse type.
-
-Also, newer versions of SVGALib have an mouse_accel_type option.  Most
-users will want to set this to "off" in /etc/vga/libvga.config.
-
-Additional notes for GLQuake
-----------------------------
-
-There are three different ways to execute GLQuake:
-
-1. The binary "glquake" requires Mesa 3-D 2.5 or later installed and compiled
-with 3DFX support (fxMesa..() function interface).  It also requires
-svgalib 1.3.0 or later for keyboard/mouse input.  This binary is a console
-application.  Mesa 3-D requires GLIDE to be installed.
-
-2. The shell script "glquake.3dfxgl" runs the "glquake" binary after
-preloading the lib3dfxgl.so library.  This is a port of 3DFX's Win32
-OpenGL MCD (Mini Client Driver) to Linux.  It is faster than Mesa 3-D
-since it was written specifically with supporting GLQuake in mind.
-lib3dfxgl.so requires that GLIDE be installed.
-
-3. The binary "glquake.glx" is linked against standard OpenGL libraries.
-It should run on many different hardward OpenGL implementations under
-Linux and X11.  This binary is an X11 application and must be run under
-X11.  It will work with Mesa 3-D as a standard glX based OpenGL 
-applications.  If the Mesa 3-D library is compiled with 3DFX support,
-you can have Mesa 3-D support 3DFX hardware under X11 by setting the
-enviroment variable "MESA_GLX_FX" to "fullscreen" for fullscreen mode
-and "window" for windowed mode, eg. "export MESA_GLX_FX=fullscreen" for sh 
-or "setenv MESA_GLX_FX fullscreen" for csh.
-
-For glquake, you must also have SVGALib or later installed (1.3.0 or later
-prefered).  GLQuake uses SVGALib for mouse and keyboard handling.
-
-If you have gpm and/or selection running, you will have to terminate them
-before running GLQuake since they will not give up the mouse when GLQuake
-attempts to run.  You can kill gpm by typing 'killall gpm' as root.
-
-You must run GLQuake as root or setuid root since it needs to access things 
-such as sound, keyboard, mouse and the 3DFX video.  Future versions may not 
-require root permissions.
-
-Additional notes for X11 Quake
-------------------------------
-
-This is a windowed version that is generic for X11.  It runs in a window
-and can be resized.  You can specify a starting window size with:
-	-width <width>
-	-height <height>
-	-winsize <width> <height>
-Default is 320x200. It works in 16bit modes, but it's slower (twice as many
-bytes to copy).
-
-No other video modes are supported (just runs windowed).  Mouse is read, but
-not "grabbed" by default.  Go to the Options menu and turn on Use Mouse to grab
-the mouse and use it in the game (or type "_windowed_mouse 1" at the console).
-
-Command Line Options for Linux Quake
-------------------------------------
-
--mem <mb>
-Specify memory in megabytes to allocate (default is 8MB, which should be fine
-for most needs).
-
--nostdout
-Don't do any output to stdout
-
--mdev <device> (SVGALib based versions only)
-Mouse device, default is /dev/mouse
-
--mrate <speed> (SVGALib based versions only)
-Mouse baud rate, default is 1200
-
--cddev <device>
-CD device, default is /dev/cdrom
-
--mode <modenum>
-Use indicated video mode
-
--nokdb
-Don't initialize keyboard
-
--sndbits <8 or 16>
-Set sound bit sample size.  Default is 16 if supported.
-
--sndspeed <speed>
-Set sound speed.  Usual values are 8000, 11025, 22051 and 44100.
-Default is 11025.
-
--sndmono
-Set mono sound
-
--sndstereo
-Set stereo sound (default if supported)
-
--- a/u/docs/INSTALL.Quake2
+++ /dev/null
@@ -1,218 +1,0 @@
-INSTALL for Linux Quake2
-------------------------
-
-Quake2 for Linux supports the following video subsystems:
-
-- SVGALib Console Graphics (ref_soft.so)
-	- Requires SVGALib 1.2.0 or later
-- X11 Window Graphics (ref_softx.so)
-	- X11R5 or later, XShm shared memory extension supported
-- 3DFX fxMesa with Mesa 3-D or 3DFX Miniport (ref_gl.so)
-	- Mesa 3-D 2.6 or later, specifically compiled for 3DFX support
-	  Mesa 3-D 2.6 compiled with 3DFX support is provided with this archive.
-- Generic glX (X11) based OpenGL (ref_glx.so)
-	- Requires a glX based hardware accelerated OpenGL implementation.
-	  Mesa 3-D 2.6 supports this on 3DFX hardware.
-
-Also included is a specific 3DFX mini-OpenGL implementation for running Quake2
-on 3DFX hardware.
-
-Installation
-------------
-
-Mount the Quake2 CD as one would usually mount a CDROM, this can be 
-accomplished by using the command:
-
-		mount /dev/cdrom /mnt
-
-As root.  Once the CD is mounted, run the setup script on the CD as root.
-
-		$ su
-		Password:
-		# mount /dev/cdrom /mnt
-		# /bin/sh /mnt/setup
-
-The script will ask some questions about what options you want to install
-and automatically install the software into /usr/local/games/quake2.
-
-Make sure you have the appropirate hardware, drivers and libraries installed
-for the renderer you are going to play on.
-
-Quake2 for Linux supports the following renderers:
-
-- ref_soft
-  Software rendering under SVGALib (console only).  SVGALib 1.2.10 or later
-  is required.  Note that SVGALib 1.2.11 supports the ability to run a
-  SVGALib application under X11 as it will automatically allocate a new
-  console.  The default mode is 320x240 (ModeX) since that is the lowest
-  resolution supported by Quake2.  If SVGALib supports your video card, higher
-  resolution modes such as 640x480 and 800x600 are also supported.
-
-  Please note that you may need to configure your mouse for SVGALib in
-  /etc/vga/libvga.config (or /etc/libvga.config).
-
-- ref_softx
-  Software rendering under X11.  This uses the MITSHM Extension and should
-  work will virtually all Linux X Servers.  **NOTE: Do not resize the window
-  under X11.  You must use the Video menu to change resolution/window size.
-
-  By default, the mouse will not be 'tied' to the Quake2 window.  To cause
-  Quake2 to grab the mouse, select 'Windowed Mouse' from the video menu,
-  or type '_windowed_mouse 0' at the console.  Do the reverse to release it.
-  You can bind keys to grab and release the mouse in the console, like so:
-    bind i "_windowed_mouse 1"  
-    bind o "_windowed_mouse 0"  
-  Then "i" will grab the mouse and "o" will release it.
-
-- ref_gl
-  This render can be run with two different OpenGL drivers:  Mesa 3-D
-  ontop of Linux GLIDE, or 3DFX's mini-OpenGL Quake driver. 
-  For Mesa 3-D, the necessary libMesaGL.so.2.6 is included with this archive.  
-  You must copy it to /usr/lib or /usr/local/lib and run ldconfig (as root)
-  in order to use it.  You can do this as follows:
-    tar cf - lib*GL* | (cd /usr/lib; tar xf -)
-  You should use tar to keep the symlinks intact. Once you copy them over
-  run ldconfig.
-  You must also download and install the Linux GLIDE drivers at
-  http://www.3dfx.com/software/download_glidel.html
-  And install them as instructed.
-  RPMs for GLIDE are available at :
-     http://glide.xxedgexx.com/3DfxRPMS.html
-  With version 3.20, the GL library is entirely runtime loaded.  This means
-  you can specify what shared object to load for GL display.
-  To use Mesa 3-D GL (console), run quake with:
-  	 ./quake2 +set vid_ref gl +set gl_driver libMesaGL.so.2
-  To use the 3DFX OpenGL Miniport, run the included quake2.3dfxgl:
-     ./quake2 +set vid_ref gl +set gl_driver lib3dfxgl.so
-  The gl_driver cvar indicates the name of the library to load for GL
-  functions.  It can be in any directory listed in /etc/ld.so.conf
-  or in /etc/quake2.conf
-
-  **NOTE:  There is a problem on libc5 systems where a vid_restart (causing
-  a reload of the video system) will crash.  There doesn't seem to be a 
-  solution to this yet.  It looks to be some sort of ld.so dynamic loading
-  interaction with SVGALib and ref_gl.so.  A work around is to start in
-  software mode (./quake2 +set vid_ref soft), then use the menu to set your
-  mode and a vid_restart will work when going from software to GL.  Exit
-  out then and save your video mode settings.
-  This problem does not occur on libc6 (glibc) based systems; vid_restart
-  works fine on there.
-
-- ref_glx
-  ref_glx should run on many different hardward OpenGL implementations under
-  Linux and X11.  This binary is an X11 application and must be run under
-  X11.  It will work with Mesa 3-D as a standard glX based OpenGL 
-  applications.  If the Mesa 3-D library is compiled with 3DFX support,
-  you can have Mesa 3-D support 3DFX hardware under X11 by setting the
-  enviroment variable "MESA_GLX_FX" to "fullscreen" for fullscreen mode
-  and "window" for windowed mode, eg. "export MESA_GLX_FX=fullscreen" for sh 
-  or "setenv MESA_GLX_FX fullscreen" for csh.
-
-  As with ref_gl, the "gl_driver" cvar indicates the shared library to load
-  for OpenGL functions (the glX functions must provided in that library
-  as well).
-
-Permissions
------------
-
-Quake2 requires root permissions to use the software (SVGALib) and GL (MesaGL
-w/3dfx) renders.  In order to make this secure, some special considerations
-must be made.
-
-Quake2 should get setuid root:
-	chown root quake2
-	chmod 4711 quake2
-
-And the ref_soft.so and ref_gl.so files must owned by root.
-
-The file /etc/quake2.conf must be installed.  This file contains a single
-line with the path of where the ref shared libraries can be found.
-A sample one is included that lists /usr/games/quake2 as the default
-path.  The libraries are only loaded out of the directory listed in
-/etc/quake2.conf for security considerations.
-
-Special permissions are not required for the softx renderer, but quake2 may
-still need to be setuid root to open the sound device (quake2 will give up
-setuid root permissions before loading softx).
-
-NOTE:  If you use a setuid quake2 binary and run it as a normal user, it
-will NOT be able to switch renderers on the fly because root permissions
-are given up after the renderer is loaded.  You can switch renderers on the
-fly if you run quake2 as root (su or log in as root).
-
-NOTE:  When the quake2 binary is run in dedicated server mode
-(+set dedicated 1), no special permissions are required and 
-/etc/quake2.conf is not read since no renderer is loaded.
-
-----
-
-The first time you run Quake2, it will use ref_soft or ref_softx based
-on whether a DISPLAY environment variable exists.
-
-To force the loading of a specific renderer at load time, use the following
-command lines:
-
-	./quake2 +set vid_ref soft
-	./quake2 +set vid_ref softx
-	./quake2 +set vid_ref gl
-	./quake2 +set vid_ref glx
-
-Linux Specific Cvars
---------------------
-
-To set this, use +set on the command line, i.e.:
-	./quake2 +set cd_dev /dev/hdc +set sndmono 1
-
-nocdaudio (defaults to 0)
-  Do not enable cd audio if not zero
-
-sndbits (defaults to 16)
-  Set sound bit sample size.
-
-sndspeed (defaults to 0)
-  Set sound speed.  Usual values are 8000, 11025, 22051 and 44100.
-  If set to zero, causes the sound driver to attempt speeds in the following
-  order:  11025, 22051, 44100, 8000.
-
-sndchannels (defaults to 2)
-  Indicates stereo or mono sound.  Defaults to 2 (stereo). Use 1 for mono.
-
-nostdout (defaults to 0)
-  Whether to output console msgs to standard out.  Non-zero is cease output.
-
-Dedicated server
-----------------
-
-To run Linux Quake2 as a dedicated server, just run it as follows:
-
-  ./quake2 +set dedicated 1
-
-You can also set dmflags, timelimit, etc. in a config file, like so:
-  set timelimit 20
-  set fraglimit 25
-  set dmflags 532
-  map fact3
-
-Then exec that config file on load, like so:
-
-  ./quake2 +set dedicated 1 +exec server.cfg
-
-If you use a config file, you must put a 'map' command in it or the
-server won't load a map.
-
-To run a dedicated server in the background, use this;
-
-	nohup ./quake2 +set dedicated 1 +exec server.cfg &
-
-A better way is to run Quake2 on a tty via screen.  screen can be found
-at ftp://prep.ai.mit.edu/pub/gnu/screen-3.7.4.tar.gz, but it comes with
-most modern Linux installations now.
-
------------------------------------------------------------------------------
-
-Linux Quake2 is an unsupported product.  Usage of this product is bound by 
-the legal notice found on the distribution Quake2 CDROM.
-
-/// Zoid
[email protected]
-
--- a/u/docs/README
+++ /dev/null
@@ -1,157 +1,0 @@
-README for Linux Quake
-----------------------
-
-This README convers all versions of Quake for Linux:
-	- SVGALib Quake (squake)
-	- GLQuake (glquake, glquake.glx and glquake.3dfxgl)
-	- X11 Quake (quake.x11)
-
-Requirements for SVGALib Quake:
-
-- SVGALib 1.20 or later (/lib/libvga.so.1.2.10)
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-  or glibc (libc6) for the glibc version
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Requirements for GLQuake:
-
-- 3DFX based card for the GLQuake version, VooDoo, VooDoo Rush or VooDoo2
-at this writing.  In order to use 3DFX hardware, you must have 3DFX's
-GLIDE drivers installed.  RPMs for these drivers are available at:
-http://glide.xxedgexx.com/3DfxRPMS.html
-- For the glX version, an OpenGL implementation that includes hardware
-glX support.
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib compatible mouse for glquake or X11 for glquake.glx
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Requirements for X11 Quake:
-
-- X11R5 later, only tested with XFree86, should work with most X Servers
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-  or glibc (libc6) for the glibc version
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Additional notes for SVGALib Quake
-----------------------------------
-
-SVGALib may not detect a 3-button mouse properly (it
-will only use two buttons).  Check your /etc/vga/libvga.config
-and set it up for your mouse type.
-
-Additional notes for GLQuake
-----------------------------
-
-There are three different ways to execute GLQuake:
-
-1. The binary "glquake" requires Mesa 3-D 2.5 or later installed and compiled
-with 3DFX support (fxMesa..() function interface).  It also requires
-svgalib 1.3.0 or later for keyboard/mouse input.  This binary is a console
-application.  Mesa 3-D requires GLIDE to be installed.
-
-2. The shell script "glquake.3dfxgl" runs the "glquake" binary after
-preloading the lib3dfxgl.so library.  This is a port of 3DFX's Win32
-OpenGL MCD (Mini Client Driver) to Linux.  It is faster than Mesa 3-D
-since it was written specifically with supporting GLQuake in mind.
-lib3dfxgl.so requires that GLIDE be installed.
-
-3. The binary "glquake.glx" is linked against standard OpenGL libraries.
-It should run on many different hardward OpenGL implementations under
-Linux and X11.  This binary is an X11 application and must be run under
-X11.  It will work with Mesa 3-D as a standard glX based OpenGL 
-applications.  If the Mesa 3-D library is compiled with 3DFX support,
-you can have Mesa 3-D support 3DFX hardware under X11 by setting the
-enviroment variable "MESA_GLX_FX" to "fullscreen" for fullscreen mode
-and "window" for windowed mode, eg. "export MESA_GLX_FX=fullscreen" for sh 
-or "setenv MESA_GLX_FX fullscreen" for csh.
-
-For glquake, you must also have SVGALib or later installed (1.3.0 or later
-prefered).  GLQuake uses SVGALib for mouse and keyboard handling.
-
-If you have gpm and/or selection running, you will have to terminate them
-before running GLQuake since they will not give up the mouse when GLQuake
-attempts to run.  You can kill gpm by typing 'killall gpm' as root.
-
-You must run GLQuake as root or setuid root since it needs to access things 
-such as sound, keyboard, mouse and the 3DFX video.  Future versions may not 
-require root permissions.
-
-Additional notes for X11 Quake
-------------------------------
-
-This is a windowed version that is generic for X11.  It runs in a window
-and can be resized.  You can specify a starting window size with:
-	-width <width>
-	-height <height>
-	-winsize <width> <height>
-Default is 320x200. It works in 16bit modes, but it's slower (twice as many
-bytes to copy).
-
-No other video modes are supported (just runs windowed).  Mouse is read, but
-not "grabbed" by default.  Go to the Options menu and turn on Use Mouse to grab
-the mouse and use it in the game (or type "_windowed_mouse 1" at the console).
-
-Command Line Options for Linux Quake
-------------------------------------
-
--mem <mb>
-Specify memory in megabytes to allocate (default is 8MB, which should be fine
-for most needs).
-
--nostdout
-Don't do any output to stdout
-
--mdev <device> (SVGALib based versions only)
-Mouse device, default is /dev/mouse
-
--mrate <speed> (SVGALib based versions only)
-Mouse baud rate, default is 1200
-
--cddev <device>
-CD device, default is /dev/cdrom
-
--mode <modenum>
-Use indicated video mode
-
--nokdb
-Don't initialize keyboard
-
--sndbits <8 or 16>
-Set sound bit sample size.  Default is 16 if supported.
-
--sndspeed <speed>
-Set sound speed.  Usual values are 8000, 11025, 22051 and 44100.
-Default is 11025.
-
--sndmono
-Set mono sound
-
--sndstereo
-Set stereo sound (default if supported)
-
-End Notes
----------
-
-Linux Quake is *NOT* an officially supported product.  Mail about it
-will be deleted.  Do not email id about this product.  If you are having
-technical difficultly, you can email me, but make sure you have the correct
-kernel, libc, svgalib and other software versions before you email me.
-
-Dave 'Zoid' Kirsch
[email protected]
-Official Quake Unix Port Administrator
--- a/u/docs/README.X11
+++ /dev/null
@@ -1,107 +1,0 @@
-
-README for Linux SVGALib Quake
-------------------------------
-
-Requirements:
-
-- X11R5 later, only tested with XFree86, should work with most X Servers
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-This is a windowed version that is generic for X11.  It runs in a window
-and can be resized.  You can specify a starting window size with:
-	-width <width>
-	-height <height>
-	-winsize <width> <height>
-Default is 320x200. It works in 16bit modes, but it's slower (twice as many
-bytes to copy).
-
-No other video modes are supported (just runs windowed).  Mouse is read, but
-not "grabbed" by default.  Go to the Options menu and turn on Use Mouse to grab
-the mouse and use it in the game.  If you want to move the mouse out of
-QWCL, you have to turn Use Mouse off.
-
-Full sound support is included.  The default sound rate is 16-bit stereo,
-11KHz.  You can change this in the options section below.
-
-New Command Line Options for Linux SVGAlib Quake
-------------------------------------------------
-
--mem <mb>
-Specify memory in megabytes to allocate (default is 8MB, which should be fine
-for most needs).
-
--nostdout
-Don't do any output to stdout
-
--cddev <device>
-CD device, default is /dev/cdrom
-
--sndbits <8 or 16>
-Set sound bit sample size.  Default is 16 if supported.
-
--sndspeed <speed>
-Set sound speed.  Usual values are 8000, 11025, 22051 and 44100.
-Default is 11025.
-
--sndmono
-Set mono sound
-
--sndstereo
-Set stereo sound (default if supported)
-
-Installation
-------------
-
-Boot DOS (I know, but you need it to run the Quake install program) and
-install Quake from your Quake CD to a DOS parition.
-
-Boot Linux and make a directory for Quake.  Copy everything from the DOS Quake
-directory into it.  i.e.:
-	(cd /dos/quake; tar cf - .) | (cd ~/quake; tar xf -)
-
-Quake for X11 does not need to be setuid root.  Sound can fail if /dev/dsp is
-not mode 666.
-
-Quake may segfault if it tries to initialize your sound card and their isn't
-one.  Same with the CDROM.  If it dies, try it with -nosound and/or
--nocdaudio.  If you have a sound card it died on and you know it is
-supported by USSLite (the driver that comes with the Linux kernel), let me
-know and I'll take a look at it.
-
-It should work with SCSI CDROMs, but is untested.
-
-Full TCP/IP network support is in, including listen and dedicated server
-modes.
-
-All of the options described in TECHINFO.TXT and MANUAL.TXT from the Quake
-distribution will work, 'cept for stuff with vid modes and stuff.
-
-End Notes
----------
-
-Linux Quake is *NOT* an officially supported product.  Mail about it
-will be deleted.  Do not email id about this product.  If you are having
-technical difficultly, you can email me, but make sure you have the correct
-kernel, libc, svgalib and other software versions before you email me.
-
-Dave 'Zoid' Kirsch
[email protected]
-Official Quake Unix Port Administrator
-
-Acks
-----
-
-Greg Alexander <[email protected]> for initial work in SVGALib
-support.
-Dave Taylor <[email protected]> for basic Linux support.
-id Software for Quake and making me port it. :)
-
-Lots of people on #linux, #quake for testing.
-
--- a/u/docs/readme.glquake
+++ /dev/null
@@ -1,162 +1,0 @@
-Linux Glquake v0.98, Quake v1.09 release notes
-
-Requirements
-------------
-
-For 3DFX based hardware, you must download and install Linux GLIDE from 
-http://glide.xxedgexx.com/3DfxRPMS.html and install as per the
-instructions.
-
-Running GLQuake
----------------
-
-There are three different ways to execute GLQuake:
-
-1. The binary "glquake" requires Mesa 3-D 2.5 or later installed and compiled
-with 3DFX support (fxMesa..() function interface).  It also requires
-svgalib 1.3.0 or later for keyboard/mouse input.  This binary is a console
-application.  Mesa 3-D requires GLIDE to be installed.
-
-2. The shell script "glquake.3dfxgl" runs the "glquake" binary after
-preloading the lib3dfxgl.so library.  This is a port of 3DFX's Win32
-OpenGL MCD (Mini Client Driver) to Linux.  It is faster than Mesa 3-D
-since it was written specifically with supporting GLQuake in mind.
-lib3dfxgl.so requires that GLIDE be installed.
-
-3. The binary "glquake.glx" is linked against standard OpenGL libraries.
-It should run on many different hardward OpenGL implementations under
-Linux and X11.  This binary is an X11 application and must be run under
-X11.  It will work with Mesa 3-D as a standard glX based OpenGL 
-applications.  If the Mesa 3-D library is compiled with 3DFX support,
-you can have Mesa 3-D support 3DFX hardware under X11 by setting the
-enviroment variable "MESA_GLX_FX" to "fullscreen" for fullscreen mode
-and "window" for windowed mode.
-
-You must also have SVGALib 1.3.0 or later installed.  GLQuake uses SVGALib
-for mouse and keyboard handling.
-
-If you have gpm and/or selection running, you will have to terminate them
-before running GLQuake since they will not give up the mouse when GLQuake
-attempts to run.  You can kill gpm by typing 'killall gpm' as root.
-
-You must run GLQuake as root or setuid root since it needs to access things 
-such as sound, keyboard, mouse and the 3DFX video.  Future versions may not 
-require root permissions.
-
-resolution options
-------------------
-glquake -width 512 -height 384
-Tries to run glquake at the specified resolution.  
-Only highend VooDoo cards support such high resolutions (most
-cards on the market right now do not).  Another popular and supported mode
-is 512x384 (-width 512 -height 384) which can offer a faster speed than
-the default 640x480.
-
-You can also specify the resolution of the console independant of the screen
-resolution.
-
-glquake -conwidth 320
-This will specify a console resolution of 320 by 240 (the height is
-automatically determined by the default 4:3 aspect ratio, you can also
-specify the height directly with -conheight).
-
-In higher resolution modes such as 800x600 and 1024x768, glquake will default
-to a 640x480 console, since the font becomes small enough at higher 
-resolutions to become unreadable.  If do you wish to have a higher resolution
-console and status bar, specify it as well, such as:
-glquake -width 800 -height 600 -conwidth 800
-
-texture options
----------------
-The amount of textures used in the game can have a large impact on performance.  
-There are several options that let you trade off visual quality for better 
-performance.
-
-There is no way to flush already loaded textures, so it is best to change 
-these options on the command line, or they will only take effect on some of 
-the textures when you change levels.
-
-OpenGL only allows textures to repeat on power of two boundaries (32, 64, 
-128, etc), but software quake had a number of textures that repeated at 24 
-or 96 pixel boundaries.  These need to be either stretched out to the next 
-higher size, or shrunk down to the next lower.  By default, they are filtered 
-down to the smaller size, but you can cause it to use the larger size if you 
-really want by using: 
-
-glquake +gl_round_down 0
-This will generally run well on a normal 4 MB 3dfx card, but for other cards 
-that have either worse texture management or slower texture swapping speeds, 
-there are some additional settings that can drastically lower the amount of 
-textures to be managed.
-
-glquake +gl_picmip 1
-This causes all textures to have one half the dimensions they otherwise would.  
-This makes them blurry, but very small.  You can set this to 2 to make the 
-textures one quarter the resolution on each axis for REALLY blurry textures.
-
-glquake +gl_playermip 1
-This is similar to picmip, but is only used for other players in deathmatch.  
-Each player in a deathmatch requires an individual skin texture, so this can 
-be a serious problem for texture management.  It wouldn't be unreasonable to 
-set this to 2 or even 3 if you are playing competatively (and don't care if 
-the other guys have smudged skins).  If you change this during the game, it 
-will take effect as soon as a player changes their skin colors.
-
-run time options
-----------------
-At the console, you can set these values to effect drawing.
-
-gl_texturemode GL_NEAREST
-Sets texture mapping to point sampled, which may be faster on some GL systems 
-(not on 3dfx).
-
-gl_texturemode GL_LINEAR_MIPMAP
-This is the default texture mode.
-
-gl_texturemode GL_LINEAR_MIPMAP_LINEAR
-This is the highest quality texture mapping (trilinear), but only very high 
-end hardware (intergraph intense 3D / realizm) supports it.  Not that big of 
-a deal, actually.
-
-gl_finish 0
-This causes the game to not issue a glFinish() call each frame, which may make 
-some hardware run faster.  If this is cleared, the 3dfx will back up a number 
-of frames and not be very playable.
-
-gl_flashblend 0
-By default, glquake just draws a shaded ball around objects that are emiting 
-light.  Clearing this variable will cause it to properly relight the world 
-like normal quake, but it can be a significant speed hit on some systems.
-
-gl_ztrick 0
-Glquake uses a buffering method that avoids clearing the Z buffer, but some 
-hardware platforms don't like it.  If the status bar and console are flashing 
-every other frame, clear this variable.
-
-gl_keeptjunctions 0
-If you clear this, glquake will remove colinear vertexes when it reloads the 
-level.  This can give a few percent speedup, but it can leave a couple stray 
-blinking pixels on the screen.
-
-novelty features
-----------------
-These are some rendering tricks that were easy to do in glquake.  They aren't 
-very robust, but they are pretty cool to look at.
-
-r_shadows 1
-This causes every object to cast a shadow.
-
-r_wateralpha 0.7
-This sets the opacity of water textures, so you can see through it in properly 
-processed maps.  0.3 is very faint, almost like fog.  1 is completely solid 
-(the default).  Unfortunately, the standard quake maps don't contain any 
-visibility information for seeing past water surfaces, so you can't just play 
-quake with this turned on.  If you just want to see what it looks like, you 
-can set "r_novis 1", but that will make things go very slow.  When I get a 
-chance, I will probably release some maps that have been processed properly 
-for this.
-
-r_mirroralpha 0.3
-This changes one particular texture (the stained glass texture in the EASY 
-start hall) into a mirror.  The value is the opacity of the mirror surface.
-
--- a/u/docs/readme.squake
+++ /dev/null
@@ -1,127 +1,0 @@
-
-README for Linux SVGALib Quake
-------------------------------
-
-Requirements:
-
-- SVGALib 1.20 or later (/lib/libvga.so.1.2.10)
-- libc 5.2.18 or later (5.0.9 will not work, /lib/libc.so.5.2.18)
-- CD-ROM for CDAudio
-- Soundcard capable of mmap'd buffers.  USSLite 3.5.4 was used to build squake
-  with.  Works fine on SoundBlaster 16 and Gravis Ultrasound MAX.
-- SVGALib supported mouse (usually if it works with X, it'll work with
-  squake).
-- Kernel 2.0.24 or later
-  - untested with 2.1 kernels, your mileage may vary
-
-Here's the release you've been waiting for.  Linux squake supports
-320x200x256, the various modeX modes (320x400, 360x400, etc) as well as high
-res modes if your card is supported by SVGALib.  Use the Quake console command
-vid_describemodes to list supported modes and the command vid_mode <number> to
-change modes.
-
-Full sound support is included.  The default sound rate is 16-bit stereo,
-11KHz.  You can change this in the options section below.
-
-Mouse works great, but SVGALib may not detect a 3-button mouse properly (it
-will only use two buttons).  Check your /etc/libvga.config (or
-/etc/vga/libvga.config for SlackWare users).
-
-**Version 1.1 fixes some crash bugs with the mission packs.
-
-New Command Line Options for Linux SVGAlib Quake
-------------------------------------------------
-
--mem <mb>
-Specify memory in megabytes to allocate (default is 8MB, which should be fine
-for most needs).
-
--nostdout
-Don't do any output to stdout
-
--mdev <device>
-Mouse device, default is /dev/mouse
-
--mrate <speed>
-Mouse baud rate, default is 1200
-
--cddev <device>
-CD device, default is /dev/cdrom
-
--mode <modenum>
-Use indicated video mode
-
--nokdb
-Don't initialize keyboard
-
--sndbits <8 or 16>
-Set sound bit sample size.  Default is 16 if supported.
-
--sndspeed <speed>
-Set sound speed.  Usual values are 8000, 11025, 22051 and 44100.
-Default is 11025.
-
--sndmono
-Set mono sound
-
--sndstereo
-Set stereo sound (default if supported)
-
-Installation
-------------
-
-Boot DOS (I know, but you need it to run the Quake install program) and
-install Quake from your Quake CD to a DOS parition.
-
-Boot Linux and make a directory for Quake.  Copy everything from the DOS Quake
-directory into it.  i.e.:
-	(cd /dos/quake; tar cf - .) | (cd ~/quake; tar xf -)
-
-Place squake into your Quake directory.  You must make it setuid root (since
-Quake access stuff like direct video writes, the raw keyboard mode, CD, etc).
-Quake will setuid back to the normal user as soon as it opens these files.
-Make Quake suid root as follows:
-	chown root squake
-	chmod 4755 squake
-
-Run squake.  I don't recommend running it as root, since all the saved
-config.cfg files will be then owned as root.  Use your normal account, unless
-you do everything as root, then your mileage will vary.
-
-squake may segfault if it tries to initialize your sound card and their isn't
-one.  Same with the CDROM.  If it dies, try it with -nosound and/or
--nocdaudio.  If you have a sound card it died on and you know it is
-supported by USSLite (the driver that comes with the Linux kernel), let me
-know and I'll take a look at it.
-
-It should work with SCSI CDROMs, but is untested.
-
-Full TCP/IP network support is in, including listen and dedicated server
-modes.  squake makes a nice dedicated server as you don't need the X11
-libraries kicking around.
-
-All of the options described in TECHINFO.TXT and MANUAL.TXT from the Quake
-distribution will work, 'cept for stuff with vid modes and stuff.
-
-End Notes
----------
-
-Linux SVGALib Quake is *NOT* an officially supported product.  Mail about it
-will be deleted.  Do not email id about this product.  If you are having
-technical difficultly, you can email me, but make sure you have the correct
-kernel, libc, svgalib and other software versions before you email me.
-
-Dave 'Zoid' Kirsch
[email protected]
-Official Quake Unix Port Administrator
-
-Acks
-----
-
-Greg Alexander <[email protected]> for initial work in SVGALib
-support.
-Dave Taylor <[email protected]> for basic Linux support.
-id Software for Quake and making me port it. :)
-
-Lots of people on #linux, #quake for testing.
-
--- a/u/dos_v2.c
+++ /dev/null
@@ -1,257 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <sys/segments.h>
-#include <go32.h>
-#include <unistd.h>
-#include <sys/nearptr.h>
-#include <dos.h>
-#include <string.h>
-#include <dpmi.h>
-// #include <osfcn.h>
-#include <bios.h>
-
-#include "dosisms.h"
-
-_go32_dpmi_registers hmm;
-
-// globals
-regs_t regs;
-void (*dos_error_func)(char *msg, ...);
-
-static unsigned conventional_memory = -1;
-
-__dpmi_regs callback_regs;
-
-void map_in_conventional_memory(void)
-{
-	if (conventional_memory == -1)
-	{
-		if (__djgpp_nearptr_enable())
-		{
-			conventional_memory = __djgpp_conventional_base;
-		}
-	}
-}
-
-unsigned int ptr2real(void *ptr)
-{
-	map_in_conventional_memory();
-	return (int)ptr - conventional_memory;
-}
-
-void *real2ptr(unsigned int real)
-{
-	map_in_conventional_memory();
-	return (void *) (real + conventional_memory);
-}
-
-void *far2ptr(unsigned int farptr)
-{
-	return real2ptr(((farptr & ~0xffff) >>12) + (farptr&0xffff));
-}
-
-unsigned int ptr2far(void *ptr)
-{
-	return ((ptr2real(ptr)&~0xf) << 12) + (ptr2real(ptr) & 0xf);
-}
-
-int dos_inportb(int port)
-{
-	return inportb(port);
-}
-
-int dos_inportw(int port)
-{
-	return inportw(port);
-}
-
-void dos_outportb(int port, int val)
-{
-	outportb(port, val);
-}
-
-void dos_outportw(int port, int val)
-{
-	outportw(port, val);
-}
-
-void dos_irqenable(void)
-{
-	enable();
-}
-
-void dos_irqdisable(void)
-{
-	disable();
-}
-
-//
-// Returns 0 on success
-//
-
-int	dos_int86(int vec)
-{
-    int rc;
-    regs.x.ss = regs.x.sp = 0;
-    rc = _go32_dpmi_simulate_int(vec, (_go32_dpmi_registers *) &regs);
-    return rc || (regs.x.flags & 1);
-}
-
-int	dos_int386(int vec, regs_t *inregs, regs_t *outregs)
-{
-	int rc;
-	memcpy(outregs, inregs, sizeof(regs_t));
-	outregs->x.ss = outregs->x.sp = 0;
-	rc = _go32_dpmi_simulate_int(vec, (_go32_dpmi_registers *) outregs);
-	return rc || (outregs->x.flags & 1);
-}
-
-//
-// Because of a quirk in dj's alloc-dos-memory wrapper, you need to keep
-// the seginfo structure around for when you free the mem.
-//
-
-static _go32_dpmi_seginfo seginfo[10];
-
-void *dos_getmemory(int size)
-{
-
-	int rc;
-	_go32_dpmi_seginfo info;
-	static int firsttime=1;
-	int i;
-
-	if (firsttime)
-	{
-		memset(seginfo, 0, sizeof(seginfo));
-		firsttime = 0;
-	}
-
-	info.size = (size+15) / 16;
-	rc = _go32_dpmi_allocate_dos_memory(&info);
-	if (rc)
-		return 0;
-
-	for (i=0;i<10;i++)
-		if (!seginfo[i].rm_segment) break;
-	seginfo[i] = info;
-	return real2ptr((int) info.rm_segment << 4);
-
-}
-
-void dos_freememory(void *ptr)
-{
-
-	int i;
-	int segment;
-
-	segment = ptr2real(ptr) >> 4;
-	for (i=0 ; i<10 ; i++)
-		if (seginfo[i].rm_segment == segment)
-		{
-			_go32_dpmi_free_dos_memory(&seginfo[i]);
-			seginfo[i].rm_segment = 0;
-			break;
-		}
-
-}
-
-static struct handlerhistory_s
-{
-	int intr;
-	_go32_dpmi_seginfo pm_oldvec;
-} handlerhistory[4];
-
-static int handlercount=0;
-
-void	dos_registerintr(int intr, void (*handler)(void))
-{
-	_go32_dpmi_seginfo info;
-	struct handlerhistory_s *oldstuff;
-
-	oldstuff = &handlerhistory[handlercount];
-
-// remember old handler
-	_go32_dpmi_get_protected_mode_interrupt_vector(intr, &oldstuff->pm_oldvec);
-	oldstuff->intr = intr;
-
-	info.pm_offset = (int) handler;
-	_go32_dpmi_allocate_iret_wrapper(&info);
-
-// set new protected mode handler
-	_go32_dpmi_set_protected_mode_interrupt_vector(intr, &info);
-
-	handlercount++;
-
-}
-
-void	dos_restoreintr(int intr)
-{
-
-	int i;
-	struct handlerhistory_s *oldstuff;
-
-// find and reinstall previous interrupt
-	for (i=0 ; i<handlercount ; i++)
-	{
-		oldstuff = &handlerhistory[i];
-		if (oldstuff->intr == intr)
-		{
-			_go32_dpmi_set_protected_mode_interrupt_vector(intr,
-				&oldstuff->pm_oldvec);
-			oldstuff->intr = -1;
-			break;
-		}
-	}
-
-}
-
-void	dos_usleep(int usecs)
-{
-	usleep(usecs);
-}
-
-int dos_getheapsize(void)
-{
-	return _go32_dpmi_remaining_physical_memory();
-}
-
-int dos_lockmem(void *addr, int size)
-{
-	__dpmi_meminfo info;
-	info.address = (long) addr + __djgpp_base_address;
-	info.size = size;
-	if (__dpmi_lock_linear_region(&info))
-		return __dpmi_error;
-	else
-		return 0;
-}
-
-int dos_unlockmem(void *addr, int size)
-{
-	__dpmi_meminfo info;
-	info.address = (long) addr + __djgpp_base_address;
-	info.size = size;
-	if (__dpmi_unlock_linear_region(&info))
-		return __dpmi_error;
-	else
-		return 0;
-}
-
--- a/u/dosasm.s
+++ /dev/null
@@ -1,77 +1,0 @@
-#include "asm_i386.h"
-
-.data
-fpenv:	.long	0, 0, 0, 0, 0, 0, 0, 0
-
-.text
-.globl	C(StartMSRInterval)
-C(StartMSRInterval):
-	movl	$0x11,%ecx	// read the CESR
-	.byte	0x0F
-	.byte	0x32		// RDMSR
-
-	andl	$0xFE3FFE3F,%eax	// stop both counters
-	.byte	0x0F
-	.byte	0x30		// WRMSR
-
-	movl	4(%esp),%eax	// point counter 0 to desired event, with counters
-	andl	$0x3F,%eax		//  still stopped
-	movl	$0x11,%ecx
-	.byte	0x0F
-	.byte	0x30		// WRMSR
-
-	movl	$0x12,%ecx	// set counter 0 to the value 0
-	subl	%eax,%eax
-	subl	%edx,%edx
-	.byte	0x0F
-	.byte	0x30		// WRMSR
-	
-	movl	4(%esp),%eax // restart counter 0 with selected event
-	andl	$0x3F,%eax
-	subl	%edx,%edx
-	orl		$0xC0,%eax
-	movl	$0x11,%ecx	// control and event select
-	.byte	0x0F
-	.byte	0x30		// WRMSR
-
-	ret
-
-.globl	C(EndMSRInterval)
-C(EndMSRInterval):
-	movl	$0x12,%ecx	// counter 0
-	.byte	0x0F
-	.byte	0x32		// RDMSR
-
-	ret					// lower 32 bits of count in %eax
-
-#if 0
-	.data
-Lxxx:	.long	0
-
-	.text
-
-.globl C(setstackcheck)
-C(setstackcheck):
-
-	movl	%esp,%eax
-	subl	$0x38000,%eax
-	movl	$0x5A5A5A5A,(%eax)
-	movl	%eax,Lxxx
-
-	ret
-
-
-.globl C(dostackcheck)
-C(dostackcheck):
-
-	movl	Lxxx,%edx
-	movl	$0,%eax
-
-	cmpl	$0x5A5A5A5A,(%edx)
-	jz		qqq
-	incl	%eax
-qqq:
-
-	ret
-#endif
-
--- a/u/dosisms.h
+++ /dev/null
@@ -1,100 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-
-//
-// dosisms.h: I'd call it dos.h, but the name's taken
-//
-
-#ifndef _DOSISMS_H_
-#define _DOSISMS_H_
-
-int dos_lockmem(void *addr, int size);
-int dos_unlockmem(void *addr, int size);
-
-typedef union {
-	struct {
-		unsigned long edi;
-		unsigned long esi;
-		unsigned long ebp;
-		unsigned long res;
-		unsigned long ebx;
-		unsigned long edx;
-		unsigned long ecx;
-		unsigned long eax;
-	} d;
-	struct {
-		unsigned short di, di_hi;
-		unsigned short si, si_hi;
-		unsigned short bp, bp_hi;
-		unsigned short res, res_hi;
-		unsigned short bx, bx_hi;
-		unsigned short dx, dx_hi;
-		unsigned short cx, cx_hi;
-		unsigned short ax, ax_hi;
-		unsigned short flags;
-		unsigned short es;
-		unsigned short ds;
-		unsigned short fs;
-		unsigned short gs;
-		unsigned short ip;
-		unsigned short cs;
-		unsigned short sp;
-		unsigned short ss;
-	} x;
-	struct {
-		unsigned char edi[4];
-		unsigned char esi[4];
-		unsigned char ebp[4];
-		unsigned char res[4];
-		unsigned char bl, bh, ebx_b2, ebx_b3;
-		unsigned char dl, dh, edx_b2, edx_b3;
-		unsigned char cl, ch, ecx_b2, ecx_b3;
-		unsigned char al, ah, eax_b2, eax_b3;
-	} h;
-} regs_t;
-
-unsigned int ptr2real(void *ptr);
-void *real2ptr(unsigned int real);
-void *far2ptr(unsigned int farptr);
-unsigned int ptr2far(void *ptr);
-
-int	dos_inportb(int port);
-int	dos_inportw(int port);
-void dos_outportb(int port, int val);
-void dos_outportw(int port, int val);
-
-void dos_irqenable(void);
-void dos_irqdisable(void);
-void dos_registerintr(int intr, void (*handler)(void));
-void dos_restoreintr(int intr);
-
-int	dos_int86(int vec);
-
-void *dos_getmemory(int size);
-void dos_freememory(void *ptr);
-
-void	dos_usleep(int usecs);
-
-int dos_getheapsize(void);
-
-extern regs_t regs;
-
-#endif	// _DOSISMS_H_
-
--- a/u/dxsdk/SDK/INC/D3D.H
+++ /dev/null
@@ -1,392 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       d3d.h
- *  Content:    Direct3D include file
- *
- ***************************************************************************/
-
-#ifndef _D3D_H_
-#define _D3D_H_
-
-#include <stdlib.h>
-
-#ifdef _WIN32
-#define COM_NO_WINDOWS_H
-#include <objbase.h>
-#else
-#include "d3dcom.h"
-#endif
-
-#ifdef _WIN32
-#define D3DAPI WINAPI
-#else
-#define D3DAPI
-#endif
-
-/*
- * Interface IID's
- */
-#if defined( _WIN32 ) && !defined( _NO_COM)
-DEFINE_GUID( IID_IDirect3D,             0x3BBA0080,0x2421,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56 );
-DEFINE_GUID( IID_IDirect3DTexture,      0x2CDCD9E0,0x25A0,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56 );
-DEFINE_GUID( IID_IDirect3DLight,        0x4417C142,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E );
-DEFINE_GUID( IID_IDirect3DMaterial,     0x4417C144,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E );
-DEFINE_GUID( IID_IDirect3DExecuteBuffer,0x4417C145,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E );
-DEFINE_GUID( IID_IDirect3DViewport,     0x4417C146,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E );
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Data structures
- */
-#ifdef __cplusplus
-
-/* 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined */
-struct IDirect3D;
-struct IDirect3DDevice;
-struct IDirect3DExecuteBuffer;
-struct IDirect3DLight;
-struct IDirect3DMaterial;
-struct IDirect3DTexture;
-struct IDirect3DViewport;
-typedef struct IDirect3D                *LPDIRECT3D;
-typedef struct IDirect3DDevice          *LPDIRECT3DDEVICE;
-typedef struct IDirect3DExecuteBuffer   *LPDIRECT3DEXECUTEBUFFER;
-typedef struct IDirect3DLight           *LPDIRECT3DLIGHT;
-typedef struct IDirect3DMaterial        *LPDIRECT3DMATERIAL;
-typedef struct IDirect3DTexture         *LPDIRECT3DTEXTURE;
-typedef struct IDirect3DViewport        *LPDIRECT3DVIEWPORT;
-
-#else
-
-typedef struct IDirect3D                *LPDIRECT3D;
-typedef struct IDirect3DDevice          *LPDIRECT3DDEVICE;
-typedef struct IDirect3DExecuteBuffer   *LPDIRECT3DEXECUTEBUFFER;
-typedef struct IDirect3DLight           *LPDIRECT3DLIGHT;
-typedef struct IDirect3DMaterial        *LPDIRECT3DMATERIAL;
-typedef struct IDirect3DTexture         *LPDIRECT3DTEXTURE;
-typedef struct IDirect3DViewport        *LPDIRECT3DVIEWPORT;
-
-#endif
-
-#include "d3dtypes.h"
-#include "d3dcaps.h"
-
-/*
- * IDirect3D
- */
-#undef INTERFACE
-#define INTERFACE IDirect3D
-DECLARE_INTERFACE_(IDirect3D, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;
-    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-    STDMETHOD_(ULONG, Release) (THIS) PURE;
-    /*** IDirect3D methods ***/
-    STDMETHOD(Initialize) (THIS_ REFIID) PURE;
-    STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK, LPVOID) PURE;
-    STDMETHOD(CreateLight) (THIS_ LPDIRECT3DLIGHT*, IUnknown*) PURE;
-    STDMETHOD(CreateMaterial) (THIS_ LPDIRECT3DMATERIAL*, IUnknown*) PURE;
-    STDMETHOD(CreateViewport) (THIS_ LPDIRECT3DVIEWPORT*, IUnknown*) PURE;
-    STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirect3D_QueryInterface(p, a, b)         (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirect3D_AddRef(p)                       (p)->lpVtbl->AddRef(p)
-#define IDirect3D_Release(p)                      (p)->lpVtbl->Release(p)
-#define IDirect3D_Initialize(p, a)                (p)->lpVtbl->Initialize(p, a)
-#define IDirect3D_EnumDevices(p, a, b)            (p)->lpVtbl->EnumDevices(p, a, b)
-#define IDirect3D_CreateLight(p, a, b)            (p)->lpVtbl->CreateLight(p, a, b)
-#define IDirect3D_CreateMaterial(p, a, b)         (p)->lpVtbl->CreateMaterial(p, a, b)
-#define IDirect3D_CreateViewport(p, a, b)         (p)->lpVtbl->CreateViewport(p, a, b)
-#define IDirect3D_FindDevice(p, a, b)             (p)->lpVtbl->FindDevice(p, a, b)
-#endif
-
-/*
- * IDirect3DDevice
- */
-#undef INTERFACE
-#define INTERFACE IDirect3DDevice
-DECLARE_INTERFACE_(IDirect3DDevice, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;
-    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-    STDMETHOD_(ULONG, Release) (THIS) PURE;
-    /*** IDirect3DDevice methods ***/
-    STDMETHOD(Initialize) (THIS_ LPDIRECT3D, LPGUID, LPD3DDEVICEDESC) PURE;
-    STDMETHOD(GetCaps) (THIS_ LPD3DDEVICEDESC, LPD3DDEVICEDESC) PURE;
-    STDMETHOD(SwapTextureHandles) (THIS_ LPDIRECT3DTEXTURE, LPDIRECT3DTEXTURE) PURE;
-    STDMETHOD(CreateExecuteBuffer) (THIS_ LPD3DEXECUTEBUFFERDESC, LPDIRECT3DEXECUTEBUFFER*, IUnknown*) PURE;
-    STDMETHOD(GetStats) (THIS_ LPD3DSTATS) PURE;
-    STDMETHOD(Execute) (THIS_ LPDIRECT3DEXECUTEBUFFER, LPDIRECT3DVIEWPORT, DWORD) PURE;
-    STDMETHOD(AddViewport) (THIS_ LPDIRECT3DVIEWPORT) PURE;
-    STDMETHOD(DeleteViewport) (THIS_ LPDIRECT3DVIEWPORT) PURE;
-    STDMETHOD(NextViewport) (THIS_ LPDIRECT3DVIEWPORT, LPDIRECT3DVIEWPORT*, DWORD) PURE;
-    STDMETHOD(Pick) (THIS_ LPDIRECT3DEXECUTEBUFFER, LPDIRECT3DVIEWPORT, DWORD, LPD3DRECT) PURE;
-    STDMETHOD(GetPickRecords)(THIS_ LPDWORD, LPD3DPICKRECORD) PURE;
-    STDMETHOD(EnumTextureFormats) (THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK, LPVOID) PURE;
-    STDMETHOD(CreateMatrix) (THIS_ LPD3DMATRIXHANDLE) PURE;
-    STDMETHOD(SetMatrix) (THIS_ D3DMATRIXHANDLE, LPD3DMATRIX) PURE;
-    STDMETHOD(GetMatrix) (THIS_ D3DMATRIXHANDLE, LPD3DMATRIX) PURE;
-    STDMETHOD(DeleteMatrix) (THIS_ D3DMATRIXHANDLE) PURE;
-    STDMETHOD_(HRESULT, BeginScene) (THIS) PURE;
-    STDMETHOD_(HRESULT, EndScene) (THIS) PURE;
-    STDMETHOD(GetDirect3D) (THIS_ LPDIRECT3D*) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirect3DDevice_QueryInterface(p, a, b)         (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirect3DDevice_AddRef(p)                       (p)->lpVtbl->AddRef(p)
-#define IDirect3DDevice_Release(p)                      (p)->lpVtbl->Release(p)
-#define IDirect3DDevice_Initialize(p, a, b, c)          (p)->lpVtbl->Initialize(p, a, b, c)
-#define IDirect3DDevice_GetCaps(p, a, b)                (p)->lpVtbl->GetCaps(p, a, b)
-#define IDirect3DDevice_SwapTextureHandles(p, a, b)     (p)->lpVtbl->SwapTextureHandles(p, a, b)
-#define IDirect3DDevice_CreateExecuteBuffer(p, a, b, c) (p)->lpVtbl->ExecuteBuffer(p, a, b, c)
-#define IDirect3DDevice_GetStats(p, a)                  (p)->lpVtbl->CreateViewport(p, a)
-#define IDirect3DDevice_Execute(p, a, b, c)             (p)->lpVtbl->Execute(p, a, b, c)
-#define IDirect3DDevice_AddViewport(p, a)               (p)->lpVtbl->AddViewport(p, a)
-#define IDirect3DDevice_DeleteViewport(p, a)            (p)->lpVtbl->DeleteViewport(p, a)
-#define IDirect3DDevice_NextViewport(p, a, b)           (p)->lpVtbl->NextViewport(p, a, b)
-#define IDirect3DDevice_Pick(p, a, b, c, d)             (p)->lpVtbl->Pick(p, a, b, c, d)
-#define IDirect3DDevice_GetPickRecords(p, a, b)         (p)->lpVtbl->GetPickRecords(p, a, b)
-#define IDirect3DDevice_EnumTextureFormats(p, a, b)     (p)->lpVtbl->EnumTextureFormats(p, a, b)
-#define IDirect3DDevice_CreateMatrix(p, a)              (p)->lpVtbl->CreateMatrix(p, a)
-#define IDirect3DDevice_SetMatrix(p, a, b)              (p)->lpVtbl->SetMatrix(p, a, b)
-#define IDirect3DDevice_GetMatrix(p, a, b)              (p)->lpVtbl->GetMatrix(p, a, b)
-#define IDirect3DDevice_DeleteMatrix(p, a)              (p)->lpVtbl->DeleteMatrix(p, a)
-#define IDirect3DDevice_BeginScene(p)                   (p)->lpVtbl->BeginScene(p)
-#define IDirect3DDevice_EndScene(p)                     (p)->lpVtbl->EndScene(p)
-#define IDirect3DDevice_GetDirect3D(p, a)               (p)->lpVtbl->GetDirect3D(p, a)
-#endif
-
-/*
- * IDirect3DExecuteBuffer
- */
-#undef INTERFACE
-#define INTERFACE IDirect3DExecuteBuffer
-DECLARE_INTERFACE_(IDirect3DExecuteBuffer, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;
-    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-    STDMETHOD_(ULONG, Release) (THIS) PURE;
-    /*** IDirect3DExecuteBuffer methods ***/
-    STDMETHOD(Initialize) (THIS_ LPDIRECT3DDEVICE, LPD3DEXECUTEBUFFERDESC) PURE;
-    STDMETHOD(Lock) (THIS_ LPD3DEXECUTEBUFFERDESC) PURE;
-    STDMETHOD_(HRESULT, Unlock) (THIS) PURE;
-    STDMETHOD(SetExecuteData) (THIS_ LPD3DEXECUTEDATA) PURE;
-    STDMETHOD(GetExecuteData) (THIS_ LPD3DEXECUTEDATA) PURE;
-    STDMETHOD(Validate) (THIS_ LPDWORD, LPD3DVALIDATECALLBACK, LPVOID, DWORD) PURE;
-    STDMETHOD(Optimize) (THIS_ DWORD) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirect3DExecuteBuffer_QueryInterface(p, a, b) (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirect3DExecuteBuffer_AddRef(p)               (p)->lpVtbl->AddRef(p)
-#define IDirect3DExecuteBuffer_Release(p)              (p)->lpVtbl->Release(p)
-#define IDirect3DExecuteBuffer_Initialize(p, a, b)     (p)->lpVtbl->Initialize(p, a, b)
-#define IDirect3DExecuteBuffer_Lock(p, a)              (p)->lpVtbl->Lock(p, a)
-#define IDirect3DExecuteBuffer_Unlock(p, a)            (p)->lpVtbl->Unlock(p)
-#define IDirect3DExecuteBuffer_SetExecuteData(p, a)    (p)->lpVtbl->SetExecuteData(p, a)
-#define IDirect3DExecuteBuffer_Validate(p, a, b, c, d) (p)->lpVtbl->Validata(p, a, b, c, d)
-#endif
-
-/*
- * Flags for execute buffer calls
- */
-#define D3DNEXT_NEXT    0x00000001l
-#define D3DNEXT_HEAD    0x00000002l
-#define D3DNEXT_TAIL    0x00000004l
-
-/*
- * IDirect3DLight
- */
-#undef INTERFACE
-#define INTERFACE IDirect3DLight
-DECLARE_INTERFACE_(IDirect3DLight, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;
-    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-    STDMETHOD_(ULONG, Release) (THIS) PURE;
-    /*** IDirect3DLight methods ***/
-    STDMETHOD(Initialize) (THIS_ LPDIRECT3D) PURE;
-    STDMETHOD(SetLight) (THIS_ LPD3DLIGHT) PURE;
-    STDMETHOD(GetLight) (THIS_ LPD3DLIGHT) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirect3DLight_QueryInterface(p, a, b) (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirect3DLight_AddRef(p)               (p)->lpVtbl->AddRef(p)
-#define IDirect3DLight_Release(p)              (p)->lpVtbl->Release(p)
-#define IDirect3DLight_Initialize(p, a)        (p)->lpVtbl->Initialize(p, a)
-#define IDirect3DLight_SetLight(p, a)          (p)->lpVtbl->SetLight(p, a)
-#define IDirect3DLight_GetLight(p, a)          (p)->lpVtbl->GetLight(p, a)
-#endif
-
-/*
- * IDirect3DMaterial
- */
-#undef INTERFACE
-#define INTERFACE IDirect3DMaterial
-DECLARE_INTERFACE_(IDirect3DMaterial, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;
-    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-    STDMETHOD_(ULONG, Release) (THIS) PURE;
-    /*** IDirect3DMaterial methods ***/
-    STDMETHOD(Initialize) (THIS_ LPDIRECT3D) PURE;
-    STDMETHOD(SetMaterial) (THIS_ LPD3DMATERIAL) PURE;
-    STDMETHOD(GetMaterial) (THIS_ LPD3DMATERIAL) PURE;
-    STDMETHOD(GetHandle) (THIS_ LPDIRECT3DDEVICE, LPD3DMATERIALHANDLE) PURE;
-    STDMETHOD_(HRESULT, Reserve) (THIS) PURE;
-    STDMETHOD_(HRESULT, Unreserve) (THIS) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirect3DMaterial_QueryInterface(p, a, b) (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirect3DMaterial_AddRef(p)               (p)->lpVtbl->AddRef(p)
-#define IDirect3DMaterial_Release(p)              (p)->lpVtbl->Release(p)
-#define IDirect3DMaterial_Initialize(p, a)        (p)->lpVtbl->Initialize(p, a)
-#define IDirect3DMaterial_SetMaterial(p, a)       (p)->lpVtbl->SetLight(p, a)
-#define IDirect3DMaterial_GetMaterial(p, a)       (p)->lpVtbl->GetLight(p, a)
-#define IDirect3DMaterial_GetHandle(p, a, b)      (p)->lpVtbl->GetHandle(p, a, b)
-#define IDirect3DMaterial_Reserve(p)              (p)->lpVtbl->Reserve(p)
-#define IDirect3DMaterial_Unreserve(p)            (p)->lpVtbl->Unreserve(p)
-#endif
-
-/*
- * IDirect3DTexture
- */
-#undef INTERFACE
-#define INTERFACE IDirect3DTexture
-DECLARE_INTERFACE_(IDirect3DTexture, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;
-    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-    STDMETHOD_(ULONG, Release) (THIS) PURE;
-    /*** IDirect3DTexture methods ***/
-    STDMETHOD(Initialize) (THIS_ LPDIRECT3DDEVICE, LPDIRECTDRAWSURFACE) PURE;
-    STDMETHOD(GetHandle) (THIS_ LPDIRECT3DDEVICE, LPD3DTEXTUREHANDLE) PURE;
-    STDMETHOD(PaletteChanged) (THIS_ DWORD, DWORD) PURE;
-    STDMETHOD(Load) (THIS_ LPDIRECT3DTEXTURE) PURE;
-    STDMETHOD_(HRESULT, Unload) (THIS) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirect3DTexture_QueryInterface(p, a, b) (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirect3DTexture_AddRef(p)               (p)->lpVtbl->AddRef(p)
-#define IDirect3DTexture_Release(p)              (p)->lpVtbl->Release(p)
-#define IDirect3DTexture_Initialize(p, a, b)     (p)->lpVtbl->Initialize(p, a, b)
-#define IDirect3DTexture_GetHandle(p, a, b)      (p)->lpVtbl->GetHandle(p, a, b)
-#define IDirect3DTexture_PaletteChanged(p, a, b) (p)->lpVtbl->PaletteChanged(p, a, b)
-#define IDirect3DTexture_Load(p, a)              (p)->lpVtbl->Load(p, a)
-#define IDirect3DTexture_Unload(p)               (p)->lpVtbl->Unload(p)
-#endif
-
-/*
- * IDirect3DViewport
- */
-#undef INTERFACE
-#define INTERFACE IDirect3DViewport
-DECLARE_INTERFACE_(IDirect3DViewport, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE;
-    STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-    STDMETHOD_(ULONG, Release) (THIS) PURE;
-    /*** IDirect3DViewport methods ***/
-    STDMETHOD(Initialize) (THIS_ LPDIRECT3D) PURE;
-    STDMETHOD(GetViewport) (THIS_ LPD3DVIEWPORT) PURE;
-    STDMETHOD(SetViewport) (THIS_ LPD3DVIEWPORT) PURE;
-    STDMETHOD(TransformVertices) (THIS_ DWORD, LPD3DTRANSFORMDATA, DWORD, LPDWORD) PURE;
-    STDMETHOD(LightElements) (THIS_ DWORD, LPD3DLIGHTDATA) PURE;
-    STDMETHOD(SetBackground) (THIS_ D3DMATERIALHANDLE) PURE;
-    STDMETHOD(GetBackground) (THIS_ LPD3DMATERIALHANDLE, LPBOOL) PURE;
-    STDMETHOD(SetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE) PURE;
-    STDMETHOD(GetBackgroundDepth) (THIS_ LPDIRECTDRAWSURFACE*, LPBOOL) PURE;
-    STDMETHOD(Clear) (THIS_ DWORD, LPD3DRECT, DWORD) PURE;
-    STDMETHOD(AddLight) (THIS_ LPDIRECT3DLIGHT) PURE;
-    STDMETHOD(DeleteLight) (THIS_ LPDIRECT3DLIGHT) PURE;
-    STDMETHOD(NextLight) (THIS_ LPDIRECT3DLIGHT, LPDIRECT3DLIGHT*, DWORD) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirect3DViewport_QueryInterface(p, a, b)          (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirect3DViewport_AddRef(p)                        (p)->lpVtbl->AddRef(p)
-#define IDirect3DViewport_Release(p)                       (p)->lpVtbl->Release(p)
-#define IDirect3DViewport_Initialize(p, a)                 (p)->lpVtbl->Initialize(p, a)
-#define IDirect3DViewport_GetViewport(p, a)                (p)->lpVtbl->GetViewport(p, a)
-#define IDirect3DViewport_SetViewport(p, a)                (p)->lpVtbl->SetViewport(p, a)
-#define IDirect3DViewport_TransformVertices(p, a, b, c, d) (p)->lpVtbl->TransformVertices(p, a, b, c, d)
-#define IDirect3DViewport_LightElements(p, a, b)           (p)->lpVtbl->LightElements(p, a, b)
-#define IDirect3DViewport_SetBackground(p, a)              (p)->lpVtbl->SetBackground(p, a)
-#define IDirect3DViewport_GetBackground(p, a, b)           (p)->lpVtbl->GetBackground(p, a, b)
-#define IDirect3DViewport_Clear(p, a, b, c)                (p)->lpVtbl->Clear(p, a, b, c)
-#define IDirect3DViewport_AddLight(p, a)                   (p)->lpVtbl->AddLight(p, a)
-#define IDirect3DViewport_DeleteLight(p, a)                (p)->lpVtbl->DeleteLight(p, a)
-#define IDirect3DViewport_NextLight(p, a, b, c)            (p)->lpVtbl->NextLight(p, a, b, c)
-#endif
-
-/*
- * Direct3D Errors
- * DirectDraw error codes are used when errors not specified here.
- */
-#define D3D_OK                          DD_OK
-#define D3DERR_BADMAJORVERSION          MAKE_DDHRESULT(700)
-#define D3DERR_BADMINORVERSION          MAKE_DDHRESULT(701)
-
-#define D3DERR_EXECUTE_CREATE_FAILED    MAKE_DDHRESULT(710)
-#define D3DERR_EXECUTE_DESTROY_FAILED   MAKE_DDHRESULT(711)
-#define D3DERR_EXECUTE_LOCK_FAILED      MAKE_DDHRESULT(712)
-#define D3DERR_EXECUTE_UNLOCK_FAILED    MAKE_DDHRESULT(713)
-#define D3DERR_EXECUTE_LOCKED           MAKE_DDHRESULT(714)
-#define D3DERR_EXECUTE_NOT_LOCKED       MAKE_DDHRESULT(715)
-
-#define D3DERR_EXECUTE_FAILED           MAKE_DDHRESULT(716)
-#define D3DERR_EXECUTE_CLIPPED_FAILED   MAKE_DDHRESULT(717)
-
-#define D3DERR_TEXTURE_NO_SUPPORT       MAKE_DDHRESULT(720)
-#define D3DERR_TEXTURE_CREATE_FAILED    MAKE_DDHRESULT(721)
-#define D3DERR_TEXTURE_DESTROY_FAILED   MAKE_DDHRESULT(722)
-#define D3DERR_TEXTURE_LOCK_FAILED      MAKE_DDHRESULT(723)
-#define D3DERR_TEXTURE_UNLOCK_FAILED    MAKE_DDHRESULT(724)
-#define D3DERR_TEXTURE_LOAD_FAILED      MAKE_DDHRESULT(725)
-#define D3DERR_TEXTURE_SWAP_FAILED      MAKE_DDHRESULT(726)
-#define D3DERR_TEXTURE_LOCKED           MAKE_DDHRESULT(727)
-#define D3DERR_TEXTURE_NOT_LOCKED       MAKE_DDHRESULT(728)
-#define D3DERR_TEXTURE_GETSURF_FAILED   MAKE_DDHRESULT(729)
-
-#define D3DERR_MATRIX_CREATE_FAILED     MAKE_DDHRESULT(730)
-#define D3DERR_MATRIX_DESTROY_FAILED    MAKE_DDHRESULT(731)
-#define D3DERR_MATRIX_SETDATA_FAILED    MAKE_DDHRESULT(732)
-#define D3DERR_MATRIX_GETDATA_FAILED    MAKE_DDHRESULT(733)
-#define D3DERR_SETVIEWPORTDATA_FAILED   MAKE_DDHRESULT(734)
-
-#define D3DERR_MATERIAL_CREATE_FAILED   MAKE_DDHRESULT(740)
-#define D3DERR_MATERIAL_DESTROY_FAILED  MAKE_DDHRESULT(741)
-#define D3DERR_MATERIAL_SETDATA_FAILED  MAKE_DDHRESULT(742)
-#define D3DERR_MATERIAL_GETDATA_FAILED  MAKE_DDHRESULT(743)
-
-#define D3DERR_LIGHT_SET_FAILED         MAKE_DDHRESULT(750)
-
-#define D3DERR_SCENE_IN_SCENE           MAKE_DDHRESULT(760)
-#define D3DERR_SCENE_NOT_IN_SCENE       MAKE_DDHRESULT(761)
-#define D3DERR_SCENE_BEGIN_FAILED       MAKE_DDHRESULT(762)
-#define D3DERR_SCENE_END_FAILED         MAKE_DDHRESULT(763)
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _D3D_H_ */
--- a/u/dxsdk/SDK/INC/D3DCAPS.H
+++ /dev/null
@@ -1,290 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       d3dcaps.h
- *  Content:    Direct3D capabilities include file
- *
- ***************************************************************************/
-
-#ifndef _D3DCAPS_H
-#define _D3DCAPS_H
-
-/* 
- *  Pull in DirectDraw include file automatically:
- */
-#include <ddraw.h>
-
-#pragma pack(4)
-
-/* Description of capabilities of transform */
-
-typedef struct _D3DTRANSFORMCAPS {
-    DWORD dwSize;
-    DWORD dwCaps;
-} D3DTRANSFORMCAPS, *LPD3DTRANSFORMCAPS;
-
-#define D3DTRANSFORMCAPS_CLIP           0x00000001L /* Will clip whilst transforming */
-
-/* Description of capabilities of lighting */
-
-typedef struct _D3DLIGHTINGCAPS {
-    DWORD dwSize;
-    DWORD dwCaps;                   /* Lighting caps */
-    DWORD dwLightingModel;          /* Lighting model - RGB or mono */
-    DWORD dwNumLights;              /* Number of lights that can be handled */
-} D3DLIGHTINGCAPS, *LPD3DLIGHTINGCAPS;
-
-#define D3DLIGHTINGMODEL_RGB            0x00000001L
-#define D3DLIGHTINGMODEL_MONO           0x00000002L
-
-#define D3DLIGHTCAPS_POINT              0x00000001L /* Point lights supported */
-#define D3DLIGHTCAPS_SPOT               0x00000002L /* Spot lights supported */
-#define D3DLIGHTCAPS_DIRECTIONAL        0x00000004L /* Directional lights supported */
-#define D3DLIGHTCAPS_PARALLELPOINT      0x00000008L /* Parallel point lights supported */
-#define D3DLIGHTCAPS_GLSPOT             0x00000010L /* GL syle spot lights supported */
-
-/* Description of capabilities for each primitive type */
-
-typedef struct _D3DPrimCaps {
-    DWORD dwSize;
-    DWORD dwMiscCaps;                 /* Capability flags */
-    DWORD dwRasterCaps;
-    DWORD dwZCmpCaps;
-    DWORD dwSrcBlendCaps;
-    DWORD dwDestBlendCaps;
-    DWORD dwAlphaCmpCaps;
-    DWORD dwShadeCaps;
-    DWORD dwTextureCaps;
-    DWORD dwTextureFilterCaps;
-    DWORD dwTextureBlendCaps;
-    DWORD dwTextureAddressCaps;
-    DWORD dwStippleWidth;             /* maximum width and height of */
-    DWORD dwStippleHeight;            /* of supported stipple (up to 32x32) */
-} D3DPRIMCAPS, *LPD3DPRIMCAPS;
-
-/* D3DPRIMCAPS dwMiscCaps */
-
-#define D3DPMISCCAPS_MASKPLANES         0x00000001L
-#define D3DPMISCCAPS_MASKZ              0x00000002L
-#define D3DPMISCCAPS_LINEPATTERNREP     0x00000004L
-#define D3DPMISCCAPS_CONFORMANT         0x00000008L
-#define D3DPMISCCAPS_CULLNONE           0x00000010L
-#define D3DPMISCCAPS_CULLCW             0x00000020L
-#define D3DPMISCCAPS_CULLCCW            0x00000040L
-
-/* D3DPRIMCAPS dwRasterCaps */
-
-#define D3DPRASTERCAPS_DITHER           0x00000001L
-#define D3DPRASTERCAPS_ROP2             0x00000002L
-#define D3DPRASTERCAPS_XOR              0x00000004L
-#define D3DPRASTERCAPS_PAT              0x00000008L
-#define D3DPRASTERCAPS_ZTEST            0x00000010L
-#define D3DPRASTERCAPS_SUBPIXEL         0x00000020L
-#define D3DPRASTERCAPS_SUBPIXELX        0x00000040L
-#define D3DPRASTERCAPS_FOGVERTEX        0x00000080L
-#define D3DPRASTERCAPS_FOGTABLE         0x00000100L
-#define D3DPRASTERCAPS_STIPPLE          0x00000200L
-
-/* D3DPRIMCAPS dwZCmpCaps, dwAlphaCmpCaps */
-
-#define D3DPCMPCAPS_NEVER               0x00000001L
-#define D3DPCMPCAPS_LESS                0x00000002L
-#define D3DPCMPCAPS_EQUAL               0x00000004L
-#define D3DPCMPCAPS_LESSEQUAL           0x00000008L
-#define D3DPCMPCAPS_GREATER             0x00000010L
-#define D3DPCMPCAPS_NOTEQUAL            0x00000020L
-#define D3DPCMPCAPS_GREATEREQUAL        0x00000040L
-#define D3DPCMPCAPS_ALWAYS              0x00000080L
-
-/* D3DPRIMCAPS dwSourceBlendCaps, dwDestBlendCaps */
-
-#define D3DPBLENDCAPS_ZERO              0x00000001L
-#define D3DPBLENDCAPS_ONE               0x00000002L
-#define D3DPBLENDCAPS_SRCCOLOR          0x00000004L
-#define D3DPBLENDCAPS_INVSRCCOLOR       0x00000008L
-#define D3DPBLENDCAPS_SRCALPHA          0x00000010L
-#define D3DPBLENDCAPS_INVSRCALPHA       0x00000020L
-#define D3DPBLENDCAPS_DESTALPHA         0x00000040L
-#define D3DPBLENDCAPS_INVDESTALPHA      0x00000080L
-#define D3DPBLENDCAPS_DESTCOLOR         0x00000100L
-#define D3DPBLENDCAPS_INVDESTCOLOR      0x00000200L
-#define D3DPBLENDCAPS_SRCALPHASAT       0x00000400L
-#define D3DPBLENDCAPS_BOTHSRCALPHA      0x00000800L
-#define D3DPBLENDCAPS_BOTHINVSRCALPHA   0x00001000L
-
-/* D3DPRIMCAPS dwShadeCaps */
-
-#define D3DPSHADECAPS_COLORFLATMONO             0x00000001L
-#define D3DPSHADECAPS_COLORFLATRGB              0x00000002L
-#define D3DPSHADECAPS_COLORGOURAUDMONO          0x00000004L
-#define D3DPSHADECAPS_COLORGOURAUDRGB           0x00000008L
-#define D3DPSHADECAPS_COLORPHONGMONO            0x00000010L
-#define D3DPSHADECAPS_COLORPHONGRGB             0x00000020L
-
-#define D3DPSHADECAPS_SPECULARFLATMONO          0x00000040L
-#define D3DPSHADECAPS_SPECULARFLATRGB           0x00000080L
-#define D3DPSHADECAPS_SPECULARGOURAUDMONO       0x00000100L
-#define D3DPSHADECAPS_SPECULARGOURAUDRGB        0x00000200L
-#define D3DPSHADECAPS_SPECULARPHONGMONO         0x00000400L
-#define D3DPSHADECAPS_SPECULARPHONGRGB          0x00000800L
-
-#define D3DPSHADECAPS_ALPHAFLATBLEND            0x00001000L
-#define D3DPSHADECAPS_ALPHAFLATSTIPPLED         0x00002000L
-#define D3DPSHADECAPS_ALPHAGOURAUDBLEND         0x00004000L
-#define D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED      0x00008000L
-#define D3DPSHADECAPS_ALPHAPHONGBLEND           0x00010000L
-#define D3DPSHADECAPS_ALPHAPHONGSTIPPLED        0x00020000L
-
-#define D3DPSHADECAPS_FOGFLAT                   0x00040000L
-#define D3DPSHADECAPS_FOGGOURAUD                0x00080000L
-#define D3DPSHADECAPS_FOGPHONG                  0x00100000L
-
-/* D3DPRIMCAPS dwTextureCaps */
-
-#define D3DPTEXTURECAPS_PERSPECTIVE     0x00000001L
-#define D3DPTEXTURECAPS_POW2            0x00000002L
-#define D3DPTEXTURECAPS_ALPHA           0x00000004L
-#define D3DPTEXTURECAPS_TRANSPARENCY    0x00000008L
-#define D3DPTEXTURECAPS_BORDER          0x00000010L
-#define D3DPTEXTURECAPS_SQUAREONLY      0x00000020L
-
-/* D3DPRIMCAPS dwTextureFilterCaps */
-
-#define D3DPTFILTERCAPS_NEAREST         0x00000001L
-#define D3DPTFILTERCAPS_LINEAR          0x00000002L
-#define D3DPTFILTERCAPS_MIPNEAREST      0x00000004L
-#define D3DPTFILTERCAPS_MIPLINEAR       0x00000008L
-#define D3DPTFILTERCAPS_LINEARMIPNEAREST 0x00000010L
-#define D3DPTFILTERCAPS_LINEARMIPLINEAR 0x00000020L
-
-/* D3DPRIMCAPS dwTextureBlendCaps */
-
-#define D3DPTBLENDCAPS_DECAL            0x00000001L
-#define D3DPTBLENDCAPS_MODULATE         0x00000002L
-#define D3DPTBLENDCAPS_DECALALPHA       0x00000004L
-#define D3DPTBLENDCAPS_MODULATEALPHA    0x00000008L
-#define D3DPTBLENDCAPS_DECALMASK        0x00000010L
-#define D3DPTBLENDCAPS_MODULATEMASK     0x00000020L
-#define D3DPTBLENDCAPS_COPY             0x00000040L
-
-/* D3DPRIMCAPS dwTextureAddressCaps */
-#define D3DPTADDRESSCAPS_WRAP           0x00000001L
-#define D3DPTADDRESSCAPS_MIRROR         0x00000002L
-#define D3DPTADDRESSCAPS_CLAMP          0x00000004L
-
-/*
- * Description for a device.
- * This is used to describe a device that is to be created or to query
- * the current device.
- */
-typedef struct _D3DDeviceDesc {
-    DWORD            dwSize;                 /* Size of D3DDEVICEDESC structure */
-    DWORD            dwFlags;                /* Indicates which fields have valid data */
-    D3DCOLORMODEL    dcmColorModel;          /* Color model of device */
-    DWORD            dwDevCaps;              /* Capabilities of device */
-    D3DTRANSFORMCAPS dtcTransformCaps;       /* Capabilities of transform */
-    BOOL             bClipping;              /* Device can do 3D clipping */
-    D3DLIGHTINGCAPS  dlcLightingCaps;        /* Capabilities of lighting */
-    D3DPRIMCAPS      dpcLineCaps;
-    D3DPRIMCAPS      dpcTriCaps;
-    DWORD            dwDeviceRenderBitDepth; /* One of DDBB_8, 16, etc.. */
-    DWORD            dwDeviceZBufferBitDepth;/* One of DDBD_16, 32, etc.. */
-    DWORD            dwMaxBufferSize;        /* Maximum execute buffer size */
-    DWORD            dwMaxVertexCount;       /* Maximum vertex count */
-} D3DDEVICEDESC, *LPD3DDEVICEDESC;
-
-typedef HRESULT (FAR PASCAL * LPD3DENUMDEVICESCALLBACK)(LPGUID lpGuid, LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC, LPD3DDEVICEDESC, LPVOID);
-
-/* D3DDEVICEDESC dwFlags indicating valid fields */
-
-#define D3DDD_COLORMODEL            0x00000001L /* dcmColorModel is valid */
-#define D3DDD_DEVCAPS               0x00000002L /* dwDevCaps is valid */
-#define D3DDD_TRANSFORMCAPS         0x00000004L /* dtcTransformCaps is valid */
-#define D3DDD_LIGHTINGCAPS          0x00000008L /* dlcLightingCaps is valid */
-#define D3DDD_BCLIPPING             0x00000010L /* bClipping is valid */
-#define D3DDD_LINECAPS              0x00000020L /* dpcLineCaps is valid */
-#define D3DDD_TRICAPS               0x00000040L /* dpcTriCaps is valid */
-#define D3DDD_DEVICERENDERBITDEPTH  0x00000080L /* dwDeviceRenderBitDepth is valid */
-#define D3DDD_DEVICEZBUFFERBITDEPTH 0x00000100L /* dwDeviceZBufferBitDepth is valid */
-#define D3DDD_MAXBUFFERSIZE         0x00000200L /* dwMaxBufferSize is valid */
-#define D3DDD_MAXVERTEXCOUNT        0x00000400L /* dwMaxVertexCount is valid */
-
-/* D3DDEVICEDESC dwDevCaps flags */
-
-#define D3DDEVCAPS_FLOATTLVERTEX        0x00000001L /* Device accepts floating point */
-                                                    /* for post-transform vertex data */
-#define D3DDEVCAPS_SORTINCREASINGZ      0x00000002L /* Device needs data sorted for increasing Z*/
-#define D3DDEVCAPS_SORTDECREASINGZ      0X00000004L /* Device needs data sorted for decreasing Z*/
-#define D3DDEVCAPS_SORTEXACT            0x00000008L /* Device needs data sorted exactly */
-
-#define D3DDEVCAPS_EXECUTESYSTEMMEMORY  0x00000010L /* Device can use execute buffers from system memory */
-#define D3DDEVCAPS_EXECUTEVIDEOMEMORY   0x00000020L /* Device can use execute buffers from video memory */
-#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040L /* Device can use TL buffers from system memory */
-#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY  0x00000080L /* Device can use TL buffers from video memory */
-#define D3DDEVCAPS_TEXTURESYSTEMMEMORY  0x00000100L /* Device can texture from system memory */
-#define D3DDEVCAPS_TEXTUREVIDEOMEMORY   0x00000200L /* Device can texture from device memory */
-
-#define D3DFDS_COLORMODEL        0x00000001L /* Match color model */
-#define D3DFDS_GUID              0x00000002L /* Match guid */
-#define D3DFDS_HARDWARE          0x00000004L /* Match hardware/software */
-#define D3DFDS_TRIANGLES         0x00000008L /* Match in triCaps */
-#define D3DFDS_LINES             0x00000010L /* Match in lineCaps  */
-#define D3DFDS_MISCCAPS          0x00000020L /* Match primCaps.dwMiscCaps */
-#define D3DFDS_RASTERCAPS        0x00000040L /* Match primCaps.dwRasterCaps */
-#define D3DFDS_ZCMPCAPS          0x00000080L /* Match primCaps.dwZCmpCaps */
-#define D3DFDS_ALPHACMPCAPS      0x00000100L /* Match primCaps.dwAlphaCmpCaps */
-#define D3DFDS_SRCBLENDCAPS      0x00000200L /* Match primCaps.dwSourceBlendCaps */
-#define D3DFDS_DSTBLENDCAPS      0x00000400L /* Match primCaps.dwDestBlendCaps */
-#define D3DFDS_SHADECAPS         0x00000800L /* Match primCaps.dwShadeCaps */
-#define D3DFDS_TEXTURECAPS       0x00001000L /* Match primCaps.dwTextureCaps */
-#define D3DFDS_TEXTUREFILTERCAPS 0x00002000L /* Match primCaps.dwTextureFilterCaps */
-#define D3DFDS_TEXTUREBLENDCAPS  0x00004000L /* Match primCaps.dwTextureBlendCaps */
-#define D3DFDS_TEXTUREADDRESSCAPS  0x00008000L /* Match primCaps.dwTextureBlendCaps */
-
-/*
- * FindDevice arguments
- */
-typedef struct _D3DFINDDEVICESEARCH {
-    DWORD               dwSize;
-    DWORD               dwFlags;
-    BOOL                bHardware;
-    D3DCOLORMODEL       dcmColorModel;
-    GUID                guid;
-    DWORD               dwCaps;
-    D3DPRIMCAPS         dpcPrimCaps;
-} D3DFINDDEVICESEARCH, *LPD3DFINDDEVICESEARCH;
-
-typedef struct _D3DFINDDEVICERESULT {
-    DWORD               dwSize;
-    GUID                guid;           /* guid which matched */
-    D3DDEVICEDESC       ddHwDesc;               /* hardware D3DDEVICEDESC */
-    D3DDEVICEDESC       ddSwDesc;       /* software D3DDEVICEDESC */
-} D3DFINDDEVICERESULT, *LPD3DFINDDEVICERESULT;
-
-/*
- * Description of execute buffer.
- */
-typedef struct _D3DExecuteBufferDesc {
-    DWORD               dwSize;         /* size of this structure */
-    DWORD               dwFlags;        /* flags indicating which fields are valid */
-    DWORD               dwCaps;         /* capabilities of execute buffer */
-    DWORD               dwBufferSize;   /* size of execute buffer data */
-    LPVOID              lpData;         /* pointer to actual data */
-} D3DEXECUTEBUFFERDESC, *LPD3DEXECUTEBUFFERDESC;
-
-/* D3DEXECUTEBUFFER dwFlags indicating valid fields */
-
-#define D3DDEB_BUFSIZE          0x00000001l     /* buffer size valid */
-#define D3DDEB_CAPS             0x00000002l     /* caps valid */
-#define D3DDEB_LPDATA           0x00000004l     /* lpData valid */
-
-/* D3DEXECUTEBUFFER dwCaps */
-
-#define D3DDEBCAPS_SYSTEMMEMORY 0x00000001l     /* buffer in system memory */
-#define D3DDEBCAPS_VIDEOMEMORY  0x00000002l     /* buffer in device memory */
-#define D3DDEBCAPS_MEM (D3DDEBCAPS_SYSTEMMEMORY|D3DDEBCAPS_VIDEOMEMORY)
-
-#pragma pack()
-
-#endif /* _D3DCAPS_H_ */
--- a/u/dxsdk/SDK/INC/D3DRM.H
+++ /dev/null
@@ -1,134 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       d3drm.h
- *  Content:    Direct3DRM include file
- *
- ***************************************************************************/
-
-#ifndef __D3DRM_H__
-#define __D3DRM_H__
-
-#include "d3drmobj.h"
-
-#ifdef __cplusplus
-extern "C" {
-struct IDirect3DRM;
-#endif
-
-
-typedef void (*D3DRMDEVICEPALETTECALLBACK)
-    (LPDIRECT3DRMDEVICE lpDirect3DRMDev, LPVOID lpArg, DWORD dwIndex, LONG red, LONG green, LONG blue);
-
-DEFINE_GUID(IID_IDirect3DRM,    0x2bc49361, 0x8327, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-WIN_TYPES(IDirect3DRM, DIRECT3DRM);
-
-
-/* Create a Direct3DRM API */
-STDAPI Direct3DRMCreate(LPDIRECT3DRM FAR *lplpDirect3DRM);
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRM
-
-DECLARE_INTERFACE_(IDirect3DRM, IUnknown)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD(CreateObject)
-        (THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID FAR* ppv) PURE;
-    STDMETHOD(CreateFrame)      (THIS_ LPDIRECT3DRMFRAME, LPDIRECT3DRMFRAME *) PURE;
-    STDMETHOD(CreateMesh)       (THIS_ LPDIRECT3DRMMESH *) PURE;
-    STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER *) PURE;
-    STDMETHOD(CreateFace)       (THIS_ LPDIRECT3DRMFACE *) PURE;
-    STDMETHOD(CreateAnimation)  (THIS_ LPDIRECT3DRMANIMATION *) PURE;
-    STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
-    STDMETHOD(CreateTexture)    (THIS_ LPD3DRMIMAGE, LPDIRECT3DRMTEXTURE *) PURE;
-    STDMETHOD(CreateLight)      (THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE;
-    STDMETHOD(CreateLightRGB)
-        (THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE;
-    STDMETHOD(CreateMaterial)   (THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE;
-    STDMETHOD(CreateDevice)     (THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE *) PURE;
-
-    /* Create a Windows Device using DirectDraw surfaces */
-    STDMETHOD(CreateDeviceFromSurface)
-    (   THIS_ LPGUID lpGUID, LPDIRECTDRAW lpDD,
-        LPDIRECTDRAWSURFACE lpDDSBack, LPDIRECT3DRMDEVICE *
-    ) PURE;
-
-    /* Create a Windows Device using D3D objects */
-    STDMETHOD(CreateDeviceFromD3D)
-    (   THIS_ LPDIRECT3D lpD3D, LPDIRECT3DDEVICE lpD3DDev,
-        LPDIRECT3DRMDEVICE *
-    ) PURE;
-
-    STDMETHOD(CreateDeviceFromClipper)
-    (   THIS_ LPDIRECTDRAWCLIPPER lpDDClipper, LPGUID lpGUID,
-        int width, int height, LPDIRECT3DRMDEVICE *) PURE;
-
-    STDMETHOD(CreateTextureFromSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDS, LPDIRECT3DRMTEXTURE *) PURE;
-   
-    STDMETHOD(CreateShadow)
-    (   THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT,
-        D3DVALUE px, D3DVALUE py, D3DVALUE pz,
-        D3DVALUE nx, D3DVALUE ny, D3DVALUE nz,
-        LPDIRECT3DRMVISUAL *
-    ) PURE;
-    STDMETHOD(CreateViewport)
-    (   THIS_ LPDIRECT3DRMDEVICE, LPDIRECT3DRMFRAME, DWORD, DWORD,
-        DWORD, DWORD, LPDIRECT3DRMVIEWPORT *
-    ) PURE;
-    STDMETHOD(CreateWrap)
-    (   THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME,
-        D3DVALUE ox, D3DVALUE oy, D3DVALUE oz,
-        D3DVALUE dx, D3DVALUE dy, D3DVALUE dz,
-        D3DVALUE ux, D3DVALUE uy, D3DVALUE uz,
-        D3DVALUE ou, D3DVALUE ov,
-        D3DVALUE su, D3DVALUE sv,
-        LPDIRECT3DRMWRAP *
-    ) PURE;
-    STDMETHOD(CreateUserVisual) (THIS_ D3DRMUSERVISUALCALLBACK, LPVOID lPArg, LPDIRECT3DRMUSERVISUAL *) PURE;
-    STDMETHOD(LoadTexture)      (THIS_ const char *, LPDIRECT3DRMTEXTURE *) PURE;
-    STDMETHOD(LoadTextureFromResource)  (THIS_ HRSRC rs, LPDIRECT3DRMTEXTURE *) PURE;
-   
-    STDMETHOD(SetSearchPath)    (THIS_ LPCSTR) PURE;
-    STDMETHOD(AddSearchPath)    (THIS_ LPCSTR) PURE;
-    STDMETHOD(GetSearchPath)    (THIS_ DWORD *size_return, LPSTR path_return);
-    //STDMETHOD(GetSearchPath)  (THIS_ int *return_count, char ***return_path) PURE;
-    STDMETHOD(SetDefaultTextureColors)(THIS_ DWORD) PURE;
-    STDMETHOD(SetDefaultTextureShades)(THIS_ DWORD) PURE;
-   
-    STDMETHOD(GetDevices)       (THIS_ LPDIRECT3DRMDEVICEARRAY *) PURE;
-    STDMETHOD(GetNamedObject)   (THIS_ const char *, LPDIRECT3DRMOBJECT *) PURE;
-   
-    STDMETHOD(EnumerateObjects) (THIS_ D3DRMOBJECTCALLBACK, LPVOID) PURE;
-   
-    STDMETHOD(Load)             
-    (   THIS_ LPVOID, LPVOID, LPIID *, DWORD, D3DRMLOADOPTIONS,
-        D3DRMLOADCALLBACK, LPVOID, D3DRMLOADTEXTURECALLBACK, LPVOID,
-        LPDIRECT3DRMFRAME
-    ) PURE;
-    STDMETHOD(Tick)             (THIS_ D3DVALUE) PURE;
-};
-
-#define D3DRM_OK                        DD_OK
-#define D3DRMERR_BADOBJECT              MAKE_DDHRESULT(781)
-#define D3DRMERR_BADTYPE                MAKE_DDHRESULT(782)
-#define D3DRMERR_BADALLOC               MAKE_DDHRESULT(783)
-#define D3DRMERR_FACEUSED               MAKE_DDHRESULT(784)
-#define D3DRMERR_NOTFOUND               MAKE_DDHRESULT(785)
-#define D3DRMERR_NOTDONEYET             MAKE_DDHRESULT(786)
-#define D3DRMERR_FILENOTFOUND           MAKE_DDHRESULT(787)
-#define D3DRMERR_BADFILE                MAKE_DDHRESULT(788)
-#define D3DRMERR_BADDEVICE              MAKE_DDHRESULT(789)
-#define D3DRMERR_BADVALUE               MAKE_DDHRESULT(790)
-#define D3DRMERR_BADMAJORVERSION        MAKE_DDHRESULT(791)
-#define D3DRMERR_BADMINORVERSION        MAKE_DDHRESULT(792)
-#define D3DRMERR_UNABLETOEXECUTE        MAKE_DDHRESULT(793)
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _D3DRMAPI_H_ */
-
--- a/u/dxsdk/SDK/INC/D3DRMDEF.H
+++ /dev/null
@@ -1,402 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       d3drm.h
- *  Content:    Direct3DRM include file
- *
- ***************************************************************************/
-
-#ifndef __D3DRMDEFS_H__
-#define __D3DRMDEFS_H__
-
-#include <stddef.h>
-#include "d3dtypes.h"
-
-#ifdef WIN32
-#define D3DRMAPI  __stdcall
-#else
-#define D3DRMAPI
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifndef TRUE
-#define FALSE 0
-#define TRUE 1
-#endif
-
-typedef struct _D3DRMVECTOR4D
-{   D3DVALUE x, y, z, w;
-} D3DRMVECTOR4D, *LPD3DRMVECTOR4D;
-
-typedef D3DVALUE D3DRMMATRIX4D[4][4];
-
-typedef struct _D3DRMQUATERNION
-{   D3DVALUE s;
-    D3DVECTOR v;
-} D3DRMQUATERNION, *LPD3DRMQUATERNION;
-
-typedef struct _D3DRMBOX
-{   D3DVECTOR min, max;
-} D3DRMBOX, *LPD3DRMBOX;
-
-typedef void (*D3DRMWRAPCALLBACK)
-    (LPD3DVECTOR, int* u, int* v, LPD3DVECTOR a, LPD3DVECTOR b, LPVOID);
-
-typedef enum _D3DRMLIGHTTYPE
-{   D3DRMLIGHT_AMBIENT,
-    D3DRMLIGHT_POINT,
-    D3DRMLIGHT_SPOT,
-    D3DRMLIGHT_DIRECTIONAL,
-    D3DRMLIGHT_PARALLELPOINT
-} D3DRMLIGHTTYPE, *LPD3DRMLIGHTTYPE;
-
-typedef enum _D3DRMSHADEMODE {
-    D3DRMSHADE_FLAT     = 0,
-    D3DRMSHADE_GOURAUD  = 1,
-    D3DRMSHADE_PHONG    = 2,
-
-    D3DRMSHADE_MASK     = 7,
-    D3DRMSHADE_MAX      = 8
-} D3DRMSHADEMODE, *LPD3DRMSHADEMODE;
-
-typedef enum _D3DRMLIGHTMODE {
-    D3DRMLIGHT_OFF      = 0 * D3DRMSHADE_MAX,
-    D3DRMLIGHT_ON       = 1 * D3DRMSHADE_MAX,
-
-    D3DRMLIGHT_MASK     = 7 * D3DRMSHADE_MAX,
-    D3DRMLIGHT_MAX      = 8 * D3DRMSHADE_MAX
-} D3DRMLIGHTMODE, *LPD3DRMLIGHTMODE;
-
-typedef enum _D3DRMFILLMODE {
-    D3DRMFILL_POINTS    = 0 * D3DRMLIGHT_MAX,
-    D3DRMFILL_WIREFRAME = 1 * D3DRMLIGHT_MAX,
-    D3DRMFILL_SOLID     = 2 * D3DRMLIGHT_MAX,
-
-    D3DRMFILL_MASK      = 7 * D3DRMLIGHT_MAX,
-    D3DRMFILL_MAX       = 8 * D3DRMLIGHT_MAX
-} D3DRMFILLMODE, *LPD3DRMFILLMODE;
-
-typedef DWORD D3DRMRENDERQUALITY, *LPD3DRMRENDERQUALITY;
-
-#define D3DRMRENDER_WIREFRAME   (D3DRMSHADE_FLAT+D3DRMLIGHT_OFF+D3DRMFILL_WIREFRAME)
-#define D3DRMRENDER_UNLITFLAT   (D3DRMSHADE_FLAT+D3DRMLIGHT_OFF+D3DRMFILL_SOLID)
-#define D3DRMRENDER_FLAT        (D3DRMSHADE_FLAT+D3DRMLIGHT_ON+D3DRMFILL_SOLID)
-#define D3DRMRENDER_GOURAUD     (D3DRMSHADE_GOURAUD+D3DRMLIGHT_ON+D3DRMFILL_SOLID)
-#define D3DRMRENDER_PHONG       (D3DRMSHADE_PHONG+D3DRMLIGHT_ON+D3DRMFILL_SOLID)
-
-typedef enum _D3DRMTEXTUREQUALITY
-{   D3DRMTEXTURE_NEAREST,               /* choose nearest texel */
-    D3DRMTEXTURE_LINEAR,                /* interpolate 4 texels */
-    D3DRMTEXTURE_MIPNEAREST,            /* nearest texel in nearest mipmap  */
-    D3DRMTEXTURE_MIPLINEAR,             /* interpolate 2 texels from 2 mipmaps */
-    D3DRMTEXTURE_LINEARMIPNEAREST,      /* interpolate 4 texels in nearest mipmap */
-    D3DRMTEXTURE_LINEARMIPLINEAR        /* interpolate 8 texels from 2 mipmaps */
-} D3DRMTEXTUREQUALITY, *LPD3DRMTEXTUREQUALITY;
-
-typedef enum _D3DRMCOMBINETYPE
-{   D3DRMCOMBINE_REPLACE,
-    D3DRMCOMBINE_BEFORE,
-    D3DRMCOMBINE_AFTER
-} D3DRMCOMBINETYPE, *LPD3DRMCOMBINETYPE;
-
-typedef D3DCOLORMODEL D3DRMCOLORMODEL, *LPD3DRMCOLORMODEL;
-
-typedef enum _D3DRMPALETTEFLAGS
-{   D3DRMPALETTE_FREE,                  /* renderer may use this entry freely */
-    D3DRMPALETTE_READONLY,              /* fixed but may be used by renderer */
-    D3DRMPALETTE_RESERVED               /* may not be used by renderer */
-} D3DRMPALETTEFLAGS, *LPD3DRMPALETTEFLAGS;
-
-typedef struct _D3DRMPALETTEENTRY
-{   unsigned char red;          /* 0 .. 255 */
-    unsigned char green;        /* 0 .. 255 */
-    unsigned char blue;         /* 0 .. 255 */
-    unsigned char flags;        /* one of D3DRMPALETTEFLAGS */
-} D3DRMPALETTEENTRY, *LPD3DRMPALETTEENTRY;
-
-typedef struct _D3DRMIMAGE
-{   int width, height;          /* width and height in pixels */
-    int aspectx, aspecty;       /* aspect ratio for non-square pixels */
-    int depth;                  /* bits per pixel */
-    int rgb;                    /* if false, pixels are indices into a
-                                   palette otherwise, pixels encode
-                                   RGB values. */
-    int bytes_per_line;         /* number of bytes of memory for a
-                                   scanline. This must be a multiple
-                                   of 4. */
-    void* buffer1;              /* memory to render into (first buffer). */
-    void* buffer2;              /* second rendering buffer for double
-                                   buffering, set to NULL for single
-                                   buffering. */
-    unsigned long red_mask;
-    unsigned long green_mask;
-    unsigned long blue_mask;
-    unsigned long alpha_mask;   /* if rgb is true, these are masks for
-                                   the red, green and blue parts of a
-                                   pixel.  Otherwise, these are masks
-                                   for the significant bits of the
-                                   red, green and blue elements in the
-                                   palette.  For instance, most SVGA
-                                   displays use 64 intensities of red,
-                                   green and blue, so the masks should
-                                   all be set to 0xfc. */
-    int palette_size;           /* number of entries in palette */
-    D3DRMPALETTEENTRY* palette; /* description of the palette (only if
-                                   rgb is false).  Must be (1<<depth)
-                                   elements. */
-} D3DRMIMAGE, *LPD3DRMIMAGE;
-
-typedef enum _D3DRMWRAPTYPE
-{   D3DRMWRAP_FLAT,
-    D3DRMWRAP_CYLINDER,
-    D3DRMWRAP_SPHERE,
-    D3DRMWRAP_CHROME
-} D3DRMWRAPTYPE, *LPD3DRMWRAPTYPE;
-
-#define D3DRMWIREFRAME_CULL             1 /* cull backfaces */
-#define D3DRMWIREFRAME_HIDDENLINE       2 /* lines are obscured by closer objects */
-
-typedef enum _D3DRMPROJECTIONTYPE
-{   D3DRMPROJECT_PERSPECTIVE,
-    D3DRMPROJECT_ORTHOGRAPHIC
-} D3DRMPROJECTIONTYPE, *LPD3DRMPROJECTIONTYPE;
-
-typedef enum _D3DRMXOFFORMAT
-{   D3DRMXOF_BINARY,
-    D3DRMXOF_COMPRESSED,
-    D3DRMXOF_TEXT
-} D3DRMXOFFORMAT, *LPD3DRMXOFFORMAT;
-
-typedef DWORD D3DRMSAVEOPTIONS;
-#define D3DRMXOFSAVE_NORMALS 1
-#define D3DRMXOFSAVE_TEXTURECOORDINATES 2
-#define D3DRMXOFSAVE_MATERIALS 4
-#define D3DRMXOFSAVE_TEXTURENAMES 8
-#define D3DRMXOFSAVE_ALL 15
-
-typedef enum _D3DRMCOLORSOURCE
-{   D3DRMCOLOR_FROMFACE,
-    D3DRMCOLOR_FROMVERTEX
-} D3DRMCOLORSOURCE, *LPD3DRMCOLORSOURCE;
-
-typedef enum _D3DRMFRAMECONSTRAINT
-{   D3DRMCONSTRAIN_Z,           /* use only X and Y rotations */
-    D3DRMCONSTRAIN_Y,           /* use only X and Z rotations */
-    D3DRMCONSTRAIN_X            /* use only Y and Z rotations */
-} D3DRMFRAMECONSTRAINT, *LPD3DRMFRAMECONSTRAINT;
-
-typedef enum _D3DRMMATERIALMODE
-{   D3DRMMATERIAL_FROMMESH,
-    D3DRMMATERIAL_FROMPARENT,
-    D3DRMMATERIAL_FROMFRAME
-} D3DRMMATERIALMODE, *LPD3DRMMATERIALMODE;
-
-typedef enum _D3DRMFOGMODE
-{   D3DRMFOG_LINEAR,            /* linear between start and end */
-    D3DRMFOG_EXPONENTIAL,       /* density * exp(-distance) */
-    D3DRMFOG_EXPONENTIALSQUARED /* density * exp(-distance*distance) */
-} D3DRMFOGMODE, *LPD3DRMFOGMODE;
-
-typedef enum _D3DRMZBUFFERMODE {
-    D3DRMZBUFFER_FROMPARENT,    /* default */
-    D3DRMZBUFFER_ENABLE,        /* enable zbuffering */
-    D3DRMZBUFFER_DISABLE        /* disable zbuffering */
-} D3DRMZBUFFERMODE, *LPD3DRMZBUFFERMODE;
-
-typedef enum _D3DRMSORTMODE {
-    D3DRMSORT_FROMPARENT,       /* default */
-    D3DRMSORT_NONE,             /* don't sort child frames */
-    D3DRMSORT_FRONTTOBACK,      /* sort child frames front-to-back */
-    D3DRMSORT_BACKTOFRONT       /* sort child frames back-to-front */
-} D3DRMSORTMODE, *LPD3DRMSORTMODE;
-
-typedef DWORD D3DRMANIMATIONOPTIONS;
-#define D3DRMANIMATION_OPEN 0x01L
-#define D3DRMANIMATION_CLOSED 0x02L
-#define D3DRMANIMATION_LINEARPOSITION 0x04L
-#define D3DRMANIMATION_SPLINEPOSITION 0x08L
-#define D3DRMANIMATION_SCALEANDROTATION 0x00000010L
-#define D3DRMANIMATION_POSITION 0x00000020L
-
-typedef DWORD D3DRMLOADOPTIONS;
-
-#define D3DRMLOAD_FROMFILE  0x00L
-#define D3DRMLOAD_FROMRESOURCE 0x01L
-#define D3DRMLOAD_FROMMEMORY 0x02L
-#define D3DRMLOAD_FROMSTREAM 0x04L
-
-#define D3DRMLOAD_BYNAME 0x10L
-#define D3DRMLOAD_BYPOSITION 0x20L
-#define D3DRMLOAD_BYGUID 0x40L
-#define D3DRMLOAD_FIRST 0x80L
-
-#define D3DRMLOAD_INSTANCEBYREFERENCE 0x100L
-#define D3DRMLOAD_INSTANCEBYCOPYING 0x200L
-
-typedef struct _D3DRMLOADRESOURCE {
-  HMODULE hModule;
-  LPCTSTR lpName;
-  LPCTSTR lpType;
-} D3DRMLOADRESOURCE, *LPD3DRMLOADRESOURCE;
-
-typedef struct _D3DRMLOADMEMORY {
-  LPVOID lpMemory;
-  DWORD dSize;
-} D3DRMLOADMEMORY, *LPD3DRMLOADMEMORY;
-
-typedef enum _D3DRMUSERVISUALREASON {
-    D3DRMUSERVISUAL_CANSEE,
-    D3DRMUSERVISUAL_RENDER
-} D3DRMUSERVISUALREASON, *LPD3DRMUSERVISUALREASON;
-
-
-typedef DWORD D3DRMMAPPING, D3DRMMAPPINGFLAG, *LPD3DRMMAPPING;
-static const D3DRMMAPPINGFLAG D3DRMMAP_WRAPU = 1;
-static const D3DRMMAPPINGFLAG D3DRMMAP_WRAPV = 2;
-static const D3DRMMAPPINGFLAG D3DRMMAP_PERSPCORRECT = 4;
-
-typedef struct _D3DRMVERTEX
-{   D3DVECTOR       position;
-    D3DVECTOR       normal;
-    D3DVALUE        tu, tv;
-    D3DCOLOR        color;
-} D3DRMVERTEX, *LPD3DRMVERTEX;
-
-typedef LONG D3DRMGROUPINDEX; /* group indexes begin a 0 */
-static const D3DRMGROUPINDEX D3DRMGROUP_ALLGROUPS = -1;
-
-/*
- * Create a color from three components in the range 0-1 inclusive.
- */
-extern D3DCOLOR D3DRMAPI        D3DRMCreateColorRGB(D3DVALUE red,
-                                          D3DVALUE green,
-                                          D3DVALUE blue);
-
-/*
- * Create a color from four components in the range 0-1 inclusive.
- */
-extern D3DCOLOR D3DRMAPI        D3DRMCreateColorRGBA(D3DVALUE red,
-                                                 D3DVALUE green,
-                                                 D3DVALUE blue,
-                                                 D3DVALUE alpha);
-
-/*
- * Get the red component of a color.
- */
-extern D3DVALUE                 D3DRMAPI D3DRMColorGetRed(D3DCOLOR);
-
-/*
- * Get the green component of a color.
- */
-extern D3DVALUE                 D3DRMAPI D3DRMColorGetGreen(D3DCOLOR);
-
-/*
- * Get the blue component of a color.
- */
-extern D3DVALUE                 D3DRMAPI D3DRMColorGetBlue(D3DCOLOR);
-
-/*
- * Get the alpha component of a color.
- */
-extern D3DVALUE                 D3DRMAPI D3DRMColorGetAlpha(D3DCOLOR);
-
-/*
- * Add two vectors.  Returns its first argument.
- */
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorAdd(LPD3DVECTOR d,
-                                          LPD3DVECTOR s1,
-                                          LPD3DVECTOR s2);
-
-/*
- * Subtract two vectors.  Returns its first argument.
- */
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorSubtract(LPD3DVECTOR d,
-                                               LPD3DVECTOR s1,
-                                               LPD3DVECTOR s2);
-/*
- * Reflect a ray about a given normal.  Returns its first argument.
- */
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorReflect(LPD3DVECTOR d,
-                                              LPD3DVECTOR ray,
-                                              LPD3DVECTOR norm);
-
-/*
- * Calculate the vector cross product.  Returns its first argument.
- */
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorCrossProduct(LPD3DVECTOR d,
-                                                   LPD3DVECTOR s1,
-                                                   LPD3DVECTOR s2);
-/*
- * Return the vector dot product.
- */
-extern D3DVALUE                 D3DRMAPI D3DRMVectorDotProduct(LPD3DVECTOR s1,
-                                                 LPD3DVECTOR s2);
-
-/*
- * Scale a vector so that its modulus is 1.  Returns its argument or
- * NULL if there was an error (e.g. a zero vector was passed).
- */
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorNormalize(LPD3DVECTOR);
-#define D3DRMVectorNormalise D3DRMVectorNormalize
-
-/*
- * Return the length of a vector (e.g. sqrt(x*x + y*y + z*z)).
- */
-extern D3DVALUE                 D3DRMAPI D3DRMVectorModulus(LPD3DVECTOR v);
-
-/*
- * Set the rotation part of a matrix to be a rotation of theta radians
- * around the given axis.
- */
-
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorRotate(LPD3DVECTOR r, LPD3DVECTOR v, LPD3DVECTOR axis, D3DVALUE theta);
-
-/*
- * Scale a vector uniformly in all three axes
- */
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorScale(LPD3DVECTOR d, LPD3DVECTOR s, D3DVALUE factor);
-
-/*
- * Return a random unit vector
- */
-extern LPD3DVECTOR      D3DRMAPI D3DRMVectorRandom(LPD3DVECTOR d);
-
-/*
- * Returns a unit quaternion that represents a rotation of theta radians
- * around the given axis.
- */
-
-extern LPD3DRMQUATERNION D3DRMAPI D3DRMQuaternionFromRotation(LPD3DRMQUATERNION quat,
-                                                              LPD3DVECTOR v,
-                                                              D3DVALUE theta);
-
-/*
- * Calculate the product of two quaternions
- */
-extern LPD3DRMQUATERNION D3DRMAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q,
-                                                          LPD3DRMQUATERNION a,
-                                                          LPD3DRMQUATERNION b);
-
-/*
- * Interpolate between two quaternions
- */
-extern LPD3DRMQUATERNION D3DRMAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION q,
-                                                       LPD3DRMQUATERNION a,
-                                                       LPD3DRMQUATERNION b,
-                                                       D3DVALUE alpha);
-
-/*
- * Calculate the matrix for the rotation that a unit quaternion represents
- */
-extern void             D3DRMAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D dmMat, LPD3DRMQUATERNION lpDqQuat);
-
-
-#if defined(__cplusplus)
-};
-#endif
-
-#endif
--- a/u/dxsdk/SDK/INC/D3DRMOBJ.H
+++ /dev/null
@@ -1,727 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       d3drm.h
- *  Content:    Direct3DRM include file
- *
- ***************************************************************************/
-
-#ifndef _D3DRMOBJ_H_
-#define _D3DRMOBJ_H_
-
-#include <objbase.h> /* Use Windows header files */
-#define VIRTUAL
-
-#include "d3drmdef.h"
-#include "d3d.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * The methods for IUnknown
- */
-#define IUNKNOWN_METHODS(kind) \
-    STDMETHOD(QueryInterface)           (THIS_ REFIID riid, LPVOID *ppvObj) kind; \
-    STDMETHOD_(ULONG, AddRef)           (THIS) kind; \
-    STDMETHOD_(ULONG, Release)          (THIS) kind
-
-/*
- * The methods for IDirect3DRMObject
- */
-#define IDIRECT3DRMOBJECT_METHODS(kind) \
-    STDMETHOD(Clone)                    (THIS_ LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) kind; \
-    STDMETHOD(AddDestroyCallback)       (THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) kind; \
-    STDMETHOD(DeleteDestroyCallback)    (THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) kind; \
-    STDMETHOD(SetAppData)               (THIS_ DWORD data) kind; \
-    STDMETHOD_(DWORD, GetAppData)       (THIS) kind; \
-    STDMETHOD(SetName)                  (THIS_ LPCSTR) kind; \
-    STDMETHOD(GetName)                  (THIS_ LPDWORD lpdwSize, LPSTR lpName) kind; \
-    STDMETHOD(GetClassName)             (THIS_ LPDWORD lpdwSize, LPSTR lpName) kind
-
-
-#define WIN_TYPES(itype, ptype) \
-    typedef interface itype FAR *LP##ptype, FAR **LPLP##ptype
-
-WIN_TYPES(IDirect3DRMObject, DIRECT3DRMOBJECT);
-WIN_TYPES(IDirect3DRMDevice, DIRECT3DRMDEVICE);
-WIN_TYPES(IDirect3DRMViewport, DIRECT3DRMVIEWPORT);
-WIN_TYPES(IDirect3DRMFrame, DIRECT3DRMFRAME);
-WIN_TYPES(IDirect3DRMVisual, DIRECT3DRMVISUAL);
-WIN_TYPES(IDirect3DRMMesh, DIRECT3DRMMESH);
-WIN_TYPES(IDirect3DRMMeshBuilder, DIRECT3DRMMESHBUILDER);
-WIN_TYPES(IDirect3DRMFace, DIRECT3DRMFACE);
-WIN_TYPES(IDirect3DRMLight, DIRECT3DRMLIGHT);
-WIN_TYPES(IDirect3DRMTexture, DIRECT3DRMTEXTURE);
-WIN_TYPES(IDirect3DRMWrap, DIRECT3DRMWRAP);
-WIN_TYPES(IDirect3DRMMaterial, DIRECT3DRMMATERIAL);
-WIN_TYPES(IDirect3DRMAnimation, DIRECT3DRMANIMATION);
-WIN_TYPES(IDirect3DRMAnimationSet, DIRECT3DRMANIMATIONSET);
-WIN_TYPES(IDirect3DRMUserVisual, DIRECT3DRMUSERVISUAL);
-WIN_TYPES(IDirect3DRMShadow, DIRECT3DRMSHADOW);
-WIN_TYPES(IDirect3DRMArray, DIRECT3DRMOBJECTARRAY);
-WIN_TYPES(IDirect3DRMDeviceArray, DIRECT3DRMDEVICEARRAY);
-WIN_TYPES(IDirect3DRMFaceArray, DIRECT3DRMFACEARRAY);
-WIN_TYPES(IDirect3DRMViewportArray, DIRECT3DRMVIEWPORTARRAY);
-WIN_TYPES(IDirect3DRMFrameArray, DIRECT3DRMFRAMEARRAY);
-WIN_TYPES(IDirect3DRMVisualArray, DIRECT3DRMVISUALARRAY);
-WIN_TYPES(IDirect3DRMPickedArray, DIRECT3DRMPICKEDARRAY);
-WIN_TYPES(IDirect3DRMLightArray, DIRECT3DRMLIGHTARRAY);
-
-/*
- * Direct3DRM Object classes
- */
-DEFINE_GUID(CLSID_CDirect3DRMDevice,        0x4fa3568e, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMViewport,      0x4fa3568f, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMFrame,         0x4fa35690, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMMesh,          0x4fa35691, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMMeshBuilder,   0x4fa35692, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMFace,          0x4fa35693, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMLight,         0x4fa35694, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMTexture,       0x4fa35695, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMWrap,          0x4fa35696, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMMaterial,      0x4fa35697, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMAnimation,     0x4fa35698, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMAnimationSet,  0x4fa35699, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMUserVisual,    0x4fa3569a, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMShadow,        0x4fa3569b, 0x623f, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-
-/*
- * Direct3DRM Object interfaces
- */
-DEFINE_GUID(IID_IDirect3DRMObject,          0xeb16cb00, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMDevice,          0xe9e19280, 0x6e05, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMViewport,        0xeb16cb02, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMFrame,           0xeb16cb03, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMVisual,          0xeb16cb04, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMMesh,            0xa3a80d01, 0x6e12, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMMeshBuilder,     0xa3a80d02, 0x6e12, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMFace,            0xeb16cb07, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMLight,           0xeb16cb08, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMTexture,         0xeb16cb09, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMWrap,            0xeb16cb0a, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMMaterial,        0xeb16cb0b, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMAnimation,       0xeb16cb0d, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMAnimationSet,    0xeb16cb0e, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMDeviceArray,     0xeb16cb10, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMViewportArray,   0xeb16cb11, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMFrameArray,      0xeb16cb12, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMVisualArray,     0xeb16cb13, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMLightArray,      0xeb16cb14, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMPickedArray,     0xeb16cb16, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMFaceArray,       0xeb16cb17, 0xd271, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMUserVisual,      0x59163de0, 0x6d43, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-DEFINE_GUID(IID_IDirect3DRMShadow,          0xaf359780, 0x6ba3, 0x11cf, 0xac, 0x4a, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-
-typedef void (*D3DRMOBJECTCALLBACK)(LPDIRECT3DRMOBJECT obj, LPVOID arg);
-typedef void (*D3DRMFRAMEMOVECALLBACK)(LPDIRECT3DRMFRAME obj, LPVOID arg, D3DVALUE delta);
-typedef void (*D3DRMUPDATECALLBACK)(LPDIRECT3DRMDEVICE obj, LPVOID arg, int, LPD3DRECT);
-typedef int (*D3DRMUSERVISUALCALLBACK)(LPDIRECT3DRMUSERVISUAL obj, LPVOID arg,
-                                    D3DRMUSERVISUALREASON reason,
-                                    LPDIRECT3DRMDEVICE dev,
-                                    LPDIRECT3DRMVIEWPORT view);
-typedef HRESULT (*D3DRMLOADTEXTURECALLBACK)
-    (char *tex_name, void *arg, LPDIRECT3DRMTEXTURE *);
-typedef void (*D3DRMLOADCALLBACK)
-     (LPDIRECT3DRMOBJECT object, REFIID objectguid, LPVOID arg);
-
-
-
-typedef struct _D3DRMPICKDESC
-{
-    ULONG       ulFaceIdx;
-    LONG        lGroupIdx;
-    D3DVECTOR   vPosition;
-
-} D3DRMPICKDESC, *LPD3DRMPICKDESC;
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMObject
-
-/*
- * Base class
- */
-DECLARE_INTERFACE_(IDirect3DRMObject, IUnknown)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMVisual
-
-DECLARE_INTERFACE_(IDirect3DRMVisual, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMDevice
-
-DECLARE_INTERFACE_(IDirect3DRMDevice, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMDevice methods
-     */
-    STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE;
-    STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D lpD3D, LPDIRECT3DDEVICE lpD3DDev) PURE;
-    STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper, LPGUID lpGUID, int width, int height) PURE;
-
-    STDMETHOD(Update)(THIS) PURE;
-    STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;
-    STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;
-    STDMETHOD(SetBufferCount)(THIS_ DWORD) PURE;
-    STDMETHOD_(DWORD, GetBufferCount)(THIS) PURE;
-
-    STDMETHOD(SetDither)(THIS_ BOOL) PURE;
-    STDMETHOD(SetShades)(THIS_ DWORD) PURE;
-    STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE;
-    STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE;
-
-    STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE;
-
-    STDMETHOD_(BOOL, GetDither)(THIS) PURE;
-    STDMETHOD_(DWORD, GetShades)(THIS) PURE;
-    STDMETHOD_(DWORD, GetHeight)(THIS) PURE;
-    STDMETHOD_(DWORD, GetWidth)(THIS) PURE;
-    STDMETHOD_(DWORD, GetTrianglesDrawn)(THIS) PURE;
-    STDMETHOD_(DWORD, GetWireframeOptions)(THIS) PURE;
-    STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE;
-    STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE;
-    STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE;
-    STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMViewport
-
-DECLARE_INTERFACE_(IDirect3DRMViewport, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMViewport methods
-     */
-    STDMETHOD(Init)
-    (   THIS_ LPDIRECT3DRMDEVICE dev, LPDIRECT3DRMFRAME camera,
-        DWORD xpos, DWORD ypos, DWORD width, DWORD height
-    ) PURE;
-    STDMETHOD(Clear)(THIS) PURE;
-    STDMETHOD(Render)(THIS_ LPDIRECT3DRMFRAME) PURE;
-
-    STDMETHOD(SetFront)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetBack)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetField)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetUniformScaling)(THIS_ BOOL) PURE;
-    STDMETHOD(SetCamera)(THIS_ LPDIRECT3DRMFRAME) PURE;
-    STDMETHOD(SetProjection)(THIS_ D3DRMPROJECTIONTYPE) PURE;
-    STDMETHOD(Transform)(THIS_ D3DRMVECTOR4D *d, D3DVECTOR *s) PURE;
-    STDMETHOD(InverseTransform)(THIS_ D3DVECTOR *d, D3DRMVECTOR4D *s) PURE;
-    STDMETHOD(Configure)(THIS_ LONG x, LONG y, DWORD width, DWORD height) PURE;
-    STDMETHOD(ForceUpdate)(THIS_ DWORD x1, DWORD y1, DWORD x2, DWORD y2) PURE;
-    STDMETHOD(SetPlane)(THIS_ D3DVALUE left, D3DVALUE right, D3DVALUE bottom, D3DVALUE top) PURE;
-
-    STDMETHOD(GetCamera)(THIS_ LPDIRECT3DRMFRAME *) PURE;
-    STDMETHOD(GetDevice)(THIS_ LPDIRECT3DRMDEVICE *) PURE;
-    STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE;
-    STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE;
-
-    STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE;
-    STDMETHOD_(LONG, GetX)(THIS) PURE;
-    STDMETHOD_(LONG, GetY)(THIS) PURE;
-    STDMETHOD_(DWORD, GetWidth)(THIS) PURE;
-    STDMETHOD_(DWORD, GetHeight)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetField)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetBack)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetFront)(THIS) PURE;
-    STDMETHOD_(D3DRMPROJECTIONTYPE, GetProjection)(THIS) PURE;
-    STDMETHOD(GetDirect3DViewport)(THIS_ LPDIRECT3DVIEWPORT *) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMFrame
-
-DECLARE_INTERFACE_(IDirect3DRMFrame, IDirect3DRMVisual)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMFrame methods
-     */
-    STDMETHOD(AddChild)(THIS_ LPDIRECT3DRMFRAME child) PURE;
-    STDMETHOD(AddLight)(THIS_ LPDIRECT3DRMLIGHT) PURE;
-    STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE;
-    STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE;
-    STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
-    STDMETHOD(AddRotation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) PURE;
-    STDMETHOD(AddVisual)(THIS_ LPDIRECT3DRMVISUAL) PURE;
-    STDMETHOD(GetChildren)(THIS_ LPDIRECT3DRMFRAMEARRAY *children) PURE;
-    STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE;
-    STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE;
-    STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE;
-    STDMETHOD(GetParent)(THIS_ LPDIRECT3DRMFRAME *) PURE;
-    STDMETHOD(GetPosition)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR return_position) PURE;
-    STDMETHOD(GetRotation)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR axis, LPD3DVALUE return_theta) PURE;
-    STDMETHOD(GetScene)(THIS_ LPDIRECT3DRMFRAME *) PURE;
-    STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE;
-    STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE;
-    STDMETHOD(GetTransform)(THIS_ D3DRMMATRIX4D return_matrix) PURE;
-    STDMETHOD(GetVelocity)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR return_velocity, BOOL with_rotation) PURE;
-    STDMETHOD(GetOrientation)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR dir, LPD3DVECTOR up) PURE;
-    STDMETHOD(GetVisuals)(THIS_ LPDIRECT3DRMVISUALARRAY *visuals) PURE;
-    STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE;
-    STDMETHOD(InverseTransform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE;
-    STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK, LPVOID lpArg)PURE;
-    STDMETHOD(LookAt)(THIS_ LPDIRECT3DRMFRAME target, LPDIRECT3DRMFRAME reference, D3DRMFRAMECONSTRAINT) PURE;
-    STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE;
-    STDMETHOD(DeleteChild)(THIS_ LPDIRECT3DRMFRAME) PURE;
-    STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DRMLIGHT) PURE;
-    STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE;
-    STDMETHOD(DeleteVisual)(THIS_ LPDIRECT3DRMVISUAL) PURE;
-    STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE;
-    STDMETHOD(GetSceneBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE *) PURE;
-    STDMETHOD_(D3DCOLOR, GetSceneFogColor)(THIS) PURE;
-    STDMETHOD_(BOOL, GetSceneFogEnable)(THIS) PURE;
-    STDMETHOD_(D3DRMFOGMODE, GetSceneFogMode)(THIS) PURE;
-    STDMETHOD(GetSceneFogParams)(THIS_ D3DVALUE *return_start, D3DVALUE *return_end, D3DVALUE *return_density) PURE;
-    STDMETHOD(SetSceneBackground)(THIS_ D3DCOLOR) PURE;
-    STDMETHOD(SetSceneBackgroundRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
-    STDMETHOD(SetSceneBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE) PURE;
-    STDMETHOD(SetSceneBackgroundImage)(THIS_ LPDIRECT3DRMTEXTURE) PURE;
-    STDMETHOD(SetSceneFogEnable)(THIS_ BOOL) PURE;
-    STDMETHOD(SetSceneFogColor)(THIS_ D3DCOLOR) PURE;
-    STDMETHOD(SetSceneFogMode)(THIS_ D3DRMFOGMODE) PURE;
-    STDMETHOD(SetSceneFogParams)(THIS_ D3DVALUE start, D3DVALUE end, D3DVALUE density) PURE;
-    STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE;
-    STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
-    STDMETHOD_(D3DRMZBUFFERMODE, GetZbufferMode)(THIS) PURE;
-    STDMETHOD(SetMaterialMode)(THIS_ D3DRMMATERIALMODE) PURE;
-    STDMETHOD(SetOrientation)
-    (   THIS_ LPDIRECT3DRMFRAME reference,
-        D3DVALUE dx, D3DVALUE dy, D3DVALUE dz,
-        D3DVALUE ux, D3DVALUE uy, D3DVALUE uz
-    ) PURE;
-    STDMETHOD(SetPosition)(THIS_ LPDIRECT3DRMFRAME reference, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD(SetRotation)(THIS_ LPDIRECT3DRMFRAME reference, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) PURE;
-    STDMETHOD(SetSortMode)(THIS_ D3DRMSORTMODE) PURE;
-    STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE;
-    STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE;
-    STDMETHOD(SetVelocity)(THIS_ LPDIRECT3DRMFRAME reference, D3DVALUE x, D3DVALUE y, D3DVALUE z, BOOL with_rotation) PURE;
-    STDMETHOD(SetZbufferMode)(THIS_ D3DRMZBUFFERMODE) PURE;
-    STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMMesh
-
-DECLARE_INTERFACE_(IDirect3DRMMesh, IDirect3DRMVisual)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMMesh methods
-     */
-    STDMETHOD(Scale)(THIS_ D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
-    STDMETHOD(Translate)(THIS_ D3DVALUE tx, D3DVALUE ty, D3DVALUE tz) PURE;
-    STDMETHOD(GetBox)(THIS_ D3DRMBOX *) PURE;
-    STDMETHOD(AddGroup)(THIS_ unsigned vCount, unsigned fCount, unsigned vPerFace, unsigned *fData, D3DRMGROUPINDEX *returnId) PURE;
-    STDMETHOD(SetVertices)(THIS_ D3DRMGROUPINDEX id, unsigned index, unsigned count, D3DRMVERTEX *values) PURE;
-    STDMETHOD(SetGroupColor)(THIS_ D3DRMGROUPINDEX id, D3DCOLOR value) PURE;
-    STDMETHOD(SetGroupColorRGB)(THIS_ D3DRMGROUPINDEX id, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
-    STDMETHOD(SetGroupMapping)(THIS_ D3DRMGROUPINDEX id, D3DRMMAPPING value) PURE;
-    STDMETHOD(SetGroupQuality)(THIS_ D3DRMGROUPINDEX id, D3DRMRENDERQUALITY value) PURE;
-    STDMETHOD(SetGroupMaterial)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL value) PURE;
-    STDMETHOD(SetGroupTexture)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE value) PURE;
-
-    STDMETHOD_(unsigned, GetGroupCount)(THIS) PURE;
-    STDMETHOD(GetGroup)(THIS_ D3DRMGROUPINDEX id, unsigned *vCount, unsigned *fCount, unsigned *vPerFace, DWORD *fDataSize, unsigned *fData) PURE;
-    STDMETHOD(GetVertices)(THIS_ D3DRMGROUPINDEX id, DWORD index, DWORD count, D3DRMVERTEX *returnPtr) PURE;
-    STDMETHOD_(D3DCOLOR, GetGroupColor)(THIS_ D3DRMGROUPINDEX id) PURE;
-    STDMETHOD_(D3DRMMAPPING, GetGroupMapping)(THIS_ D3DRMGROUPINDEX id) PURE;
-    STDMETHOD_(D3DRMRENDERQUALITY, GetGroupQuality)(THIS_ D3DRMGROUPINDEX id) PURE;
-    STDMETHOD(GetGroupMaterial)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL *returnPtr) PURE;
-    STDMETHOD(GetGroupTexture)(THIS_ D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE *returnPtr) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMShadow
-
-DECLARE_INTERFACE_(IDirect3DRMShadow, IDirect3DRMVisual)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMShadow methods
-     */
-    STDMETHOD(Init)
-    (   THIS_ LPDIRECT3DRMVISUAL visual, LPDIRECT3DRMLIGHT light,
-        D3DVALUE px, D3DVALUE py, D3DVALUE pz,
-        D3DVALUE nx, D3DVALUE ny, D3DVALUE nz
-    ) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMFace
-
-DECLARE_INTERFACE_(IDirect3DRMFace, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMFace methods
-     */
-     STDMETHOD(AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-     STDMETHOD(AddVertexAndNormalIndexed)(THIS_ DWORD vertex, DWORD normal) PURE;
-     STDMETHOD(SetColorRGB)(THIS_ D3DVALUE, D3DVALUE, D3DVALUE) PURE;
-     STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE;
-     STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE;
-     STDMETHOD(SetTextureCoordinates)(THIS_ DWORD vertex, D3DVALUE u, D3DVALUE v) PURE;
-     STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE;
-     STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE;
-
-     STDMETHOD(GetVertex)(THIS_ DWORD index, D3DVECTOR *vertex, D3DVECTOR *normal) PURE;
-     STDMETHOD(GetVertices)(THIS_ DWORD *vertex_count, D3DVECTOR *coords, D3DVECTOR *normals);
-     STDMETHOD(GetTextureCoordinates)(THIS_ DWORD vertex, D3DVALUE *u, D3DVALUE *v) PURE;
-     STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE;
-     STDMETHOD(GetNormal)(THIS_ D3DVECTOR *) PURE;
-     STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE;
-     STDMETHOD(GetMaterial)(THIS_ LPDIRECT3DRMMATERIAL *) PURE;
-
-     STDMETHOD_(int, GetVertexCount)(THIS) PURE;
-     STDMETHOD_(int, GetVertexIndex)(THIS_ DWORD which) PURE;
-     STDMETHOD_(int, GetTextureCoordinateIndex)(THIS_ DWORD which) PURE;
-     STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMMeshBuilder
-
-DECLARE_INTERFACE_(IDirect3DRMMeshBuilder, IDirect3DRMVisual)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMMeshBuilder methods
-     */
-    STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK, LPVOID lpArg) PURE;
-    STDMETHOD(Save)(THIS_ const char *filename, D3DRMXOFFORMAT, D3DRMSAVEOPTIONS save) PURE;
-    STDMETHOD(Scale)(THIS_ D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
-    STDMETHOD(Translate)(THIS_ D3DVALUE tx, D3DVALUE ty, D3DVALUE tz) PURE;
-    STDMETHOD(SetColorSource)(THIS_ D3DRMCOLORSOURCE) PURE;
-    STDMETHOD(GetBox)(THIS_ D3DRMBOX *) PURE;
-    STDMETHOD(GenerateNormals)(THIS) PURE;
-    STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE;
-
-    STDMETHOD(AddMesh)(THIS_ LPDIRECT3DRMMESH) PURE;
-    STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE;
-    STDMETHOD(AddFrame)(THIS_ LPDIRECT3DRMFRAME) PURE;
-    STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE;
-    STDMETHOD(AddFaces)
-    (   THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals,
-        DWORD *data, LPDIRECT3DRMFACEARRAY*
-    ) PURE;
-    STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE;
-    STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
-    STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE;
-    STDMETHOD(SetTexture)(THIS_ LPDIRECT3DRMTEXTURE) PURE;
-    STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE;
-    STDMETHOD(SetTextureTopology)(THIS_ BOOL wrap_u, BOOL wrap_v) PURE;
-    STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE;
-    STDMETHOD(SetPerspective)(THIS_ BOOL) PURE;
-    STDMETHOD(SetVertex)(THIS_ DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD(SetNormal)(THIS_ DWORD index, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD(SetTextureCoordinates)(THIS_ DWORD index, D3DVALUE u, D3DVALUE v) PURE;
-    STDMETHOD(SetVertexColor)(THIS_ DWORD index, D3DCOLOR) PURE;
-    STDMETHOD(SetVertexColorRGB)(THIS_ DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
-
-    STDMETHOD(GetFaces)(THIS_ LPDIRECT3DRMFACEARRAY*) PURE;
-    STDMETHOD(GetVertices)
-    (   THIS_ DWORD *vcount, D3DVECTOR *vertices, DWORD *ncount, D3DVECTOR *normals, DWORD *face_data_size, DWORD *face_data
-    ) PURE;
-    STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE;
-
-    STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE*) PURE;
-    STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE;
-    STDMETHOD_(BOOL, GetPerspective)(THIS) PURE;
-    STDMETHOD_(int, GetFaceCount)(THIS) PURE;
-    STDMETHOD_(int, GetVertexCount)(THIS) PURE;
-    STDMETHOD_(D3DCOLOR, GetVertexColor)(THIS_ DWORD index) PURE;
-
-    STDMETHOD(CreateMesh)(THIS_ LPDIRECT3DRMMESH*) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMLight
-
-DECLARE_INTERFACE_(IDirect3DRMLight, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMLight methods
-     */
-    STDMETHOD(SetType)(THIS_ D3DRMLIGHTTYPE) PURE;
-    STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE;
-    STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
-    STDMETHOD(SetRange)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetUmbra)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetPenumbra)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetConstantAttenuation)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetLinearAttenuation)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(SetQuadraticAttenuation)(THIS_ D3DVALUE) PURE;
-
-    STDMETHOD_(D3DVALUE, GetRange)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetUmbra)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetPenumbra)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetConstantAttenuation)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetLinearAttenuation)(THIS) PURE;
-    STDMETHOD_(D3DVALUE, GetQuadraticAttenuation)(THIS) PURE;
-    STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE;
-    STDMETHOD_(D3DRMLIGHTTYPE, GetType)(THIS) PURE;
-
-    STDMETHOD(SetEnableFrame)(THIS_ LPDIRECT3DRMFRAME) PURE;
-    STDMETHOD(GetEnableFrame)(THIS_ LPDIRECT3DRMFRAME*) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMTexture
-
-DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMTexture methods
-     */
-    STDMETHOD(InitFromFile)(THIS_ const char *filename) PURE;
-    STDMETHOD(InitFromSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDS) PURE;
-    STDMETHOD(InitFromResource)(THIS_ HRSRC) PURE;
-    STDMETHOD(Changed)(THIS_ BOOL pixels, BOOL palette) PURE;
-
-    STDMETHOD(SetColors)(THIS_ DWORD) PURE;
-    STDMETHOD(SetShades)(THIS_ DWORD) PURE;
-    STDMETHOD(SetDecalSize)(THIS_ D3DVALUE width, D3DVALUE height) PURE;
-    STDMETHOD(SetDecalOrigin)(THIS_ LONG x, LONG y) PURE;
-    STDMETHOD(SetDecalScale)(THIS_ DWORD) PURE;
-    STDMETHOD(SetDecalTransparency)(THIS_ BOOL) PURE;
-    STDMETHOD(SetDecalTransparentColor)(THIS_ D3DCOLOR) PURE;
-
-    STDMETHOD(GetDecalSize)(THIS_ D3DVALUE *width_return, D3DVALUE *height_return) PURE;
-    STDMETHOD(GetDecalOrigin)(THIS_ LONG *x_return, LONG *y_return) PURE;
-
-    STDMETHOD_(D3DRMIMAGE *, GetImage)(THIS) PURE;
-    STDMETHOD_(DWORD, GetShades)(THIS) PURE;
-    STDMETHOD_(DWORD, GetColors)(THIS) PURE;
-    STDMETHOD_(DWORD, GetDecalScale)(THIS) PURE;
-    STDMETHOD_(BOOL, GetDecalTransparency)(THIS) PURE;
-    STDMETHOD_(D3DCOLOR, GetDecalTransparentColor)(THIS) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMWrap
-
-DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMWrap methods
-     */
-    STDMETHOD(Init)
-    (   THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME ref,
-        D3DVALUE ox, D3DVALUE oy, D3DVALUE oz,
-        D3DVALUE dx, D3DVALUE dy, D3DVALUE dz,
-        D3DVALUE ux, D3DVALUE uy, D3DVALUE uz,
-        D3DVALUE ou, D3DVALUE ov,
-        D3DVALUE su, D3DVALUE sv
-    ) PURE;
-    STDMETHOD(Apply)(THIS_ LPDIRECT3DRMOBJECT) PURE;
-    STDMETHOD(ApplyRelative)(THIS_ LPDIRECT3DRMFRAME frame, LPDIRECT3DRMOBJECT) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMMaterial
-
-DECLARE_INTERFACE_(IDirect3DRMMaterial, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMMaterial methods
-     */
-    STDMETHOD(SetPower)(THIS_ D3DVALUE power) PURE;
-    STDMETHOD(SetSpecular)(THIS_ D3DVALUE r, D3DVALUE g, D3DVALUE b) PURE;
-    STDMETHOD(SetEmissive)(THIS_ D3DVALUE r, D3DVALUE g, D3DVALUE b) PURE;
-
-    STDMETHOD_(D3DVALUE, GetPower)(THIS) PURE;
-    STDMETHOD(GetSpecular)(THIS_ D3DVALUE* r, D3DVALUE* g, D3DVALUE* b) PURE;
-    STDMETHOD(GetEmissive)(THIS_ D3DVALUE* r, D3DVALUE* g, D3DVALUE* b) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMAnimation
-
-DECLARE_INTERFACE_(IDirect3DRMAnimation, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMAnimation methods
-     */
-    STDMETHOD(SetOptions)(THIS_ D3DRMANIMATIONOPTIONS flags) PURE;
-    STDMETHOD(AddRotateKey)(THIS_ D3DVALUE time, D3DRMQUATERNION *q) PURE;
-    STDMETHOD(AddPositionKey)(THIS_ D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD(AddScaleKey)(THIS_ D3DVALUE time, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
-    STDMETHOD(DeleteKey)(THIS_ D3DVALUE time) PURE;
-    STDMETHOD(SetFrame)(THIS_ LPDIRECT3DRMFRAME frame) PURE;
-    STDMETHOD(SetTime)(THIS_ D3DVALUE time) PURE;
-
-    STDMETHOD_(D3DRMANIMATIONOPTIONS, GetOptions)(THIS) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMAnimationSet
-
-DECLARE_INTERFACE_(IDirect3DRMAnimationSet, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMAnimationSet methods
-     */
-    STDMETHOD(AddAnimation)(THIS_ LPDIRECT3DRMANIMATION aid) PURE;
-    STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK, LPVOID lpArg, LPDIRECT3DRMFRAME parent)PURE;
-    STDMETHOD(DeleteAnimation)(THIS_ LPDIRECT3DRMANIMATION aid) PURE;
-    STDMETHOD(SetTime)(THIS_ D3DVALUE time) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMUserVisual
-
-DECLARE_INTERFACE_(IDirect3DRMUserVisual, IDirect3DRMVisual)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMUserVisual methods
-     */
-    STDMETHOD(Init)(THIS_ D3DRMUSERVISUALCALLBACK fn, void *arg) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMArray
-
-DECLARE_INTERFACE_(IDirect3DRMArray, IUnknown)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    /* No GetElement method as it would get overloaded
-     * in derived classes, and overloading is
-     * a no-no in COM
-     */
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMDeviceArray
-
-DECLARE_INTERFACE_(IDirect3DRMDeviceArray, IDirect3DRMArray)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMDEVICE *) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMFrameArray
-
-DECLARE_INTERFACE_(IDirect3DRMFrameArray, IDirect3DRMArray)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMFRAME *) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMViewportArray
-
-DECLARE_INTERFACE_(IDirect3DRMViewportArray, IDirect3DRMArray)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMVIEWPORT *) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMVisualArray
-
-DECLARE_INTERFACE_(IDirect3DRMVisualArray, IDirect3DRMArray)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMVISUAL *) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMPickedArray
-
-DECLARE_INTERFACE_(IDirect3DRMPickedArray, IDirect3DRMArray)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    STDMETHOD(GetPick)(THIS_ DWORD index, LPDIRECT3DRMVISUAL *, LPDIRECT3DRMFRAMEARRAY *, LPD3DRMPICKDESC) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMLightArray
-
-DECLARE_INTERFACE_(IDirect3DRMLightArray, IDirect3DRMArray)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMLIGHT *) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMFaceArray
-
-DECLARE_INTERFACE_(IDirect3DRMFaceArray, IDirect3DRMArray)
-{
-    IUNKNOWN_METHODS(PURE);
-
-    STDMETHOD_(DWORD, GetSize)(THIS) PURE;
-    STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMFACE *) PURE;
-};
-
-#ifdef __cplusplus
-};
-#endif
-#endif /* _D3DRMOBJ_H_ */
--- a/u/dxsdk/SDK/INC/D3DRMWIN.H
+++ /dev/null
@@ -1,48 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       d3drm.h
- *  Content:    Direct3DRM include file
- *
- ***************************************************************************/
-
-#ifndef __D3DRMWIN_H__
-#define __D3DRMWIN_H__
-
-#ifndef WIN32
-#define WIN32
-#endif
-
-#include "d3drm.h"
-#include "ddraw.h"
-#include "d3d.h"
-
-/*
- * GUIDS used by Direct3DRM Windows interface
- */
-DEFINE_GUID(IID_IDirect3DRMWinDevice,   0xc5016cc0, 0xd273, 0x11ce, 0xac, 0x48, 0x0, 0x0, 0xc0, 0x38, 0x25, 0xa1);
-
-WIN_TYPES(IDirect3DRMWinDevice, DIRECT3DRMWINDEVICE);
-
-#undef INTERFACE
-#define INTERFACE IDirect3DRMWinDevice
-
-DECLARE_INTERFACE_(IDirect3DRMWinDevice, IDirect3DRMObject)
-{
-    IUNKNOWN_METHODS(PURE);
-    IDIRECT3DRMOBJECT_METHODS(PURE);
-
-    /*
-     * IDirect3DRMWinDevice methods
-     */
-
-    /* Repaint the window with the last frame which was rendered. */
-    STDMETHOD(HandlePaint)(THIS_ HDC hdc) PURE;
-
-    /* Respond to a WM_ACTIVATE message. */
-    STDMETHOD(HandleActivate)(THIS_ WORD wparam) PURE;
-};
-
-
-#endif
--- a/u/dxsdk/SDK/INC/D3DTYPES.H
+++ /dev/null
@@ -1,956 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       d3dtypes.h
- *  Content:    Direct3D types include file
- *
- ***************************************************************************/
-
-#ifndef _D3DTYPES_H_
-#define _D3DTYPES_H_
-
-#ifndef WIN32
-#include "subwtype.h"
-#else
-#include <windows.h>
-#endif
-
-#include <ddraw.h>
-
-#pragma pack(4)
-
-#if defined(__cplusplus)
-extern "C"
-{
-#endif
-
-/* D3DVALUE is the fundamental Direct3D fractional data type */
-
-#define D3DVALP(val, prec) ((float)(val))
-#define D3DVAL(val) ((float)(val))
-typedef float D3DVALUE, *LPD3DVALUE;
-#define D3DDivide(a, b)    (float)((double) (a) / (double) (b))
-#define D3DMultiply(a, b)    ((a) * (b))
-
-typedef LONG D3DFIXED;
-
-#ifndef RGB_MAKE
-/*
- * Format of CI colors is
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |    alpha      |         color index           |   fraction    |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-#define CI_GETALPHA(ci)    ((ci) >> 24)
-#define CI_GETINDEX(ci)    (((ci) >> 8) & 0xffff)
-#define CI_GETFRACTION(ci) ((ci) & 0xff)
-#define CI_ROUNDINDEX(ci)  CI_GETINDEX((ci) + 0x80)
-#define CI_MASKALPHA(ci)   ((ci) & 0xffffff)
-#define CI_MAKE(a, i, f)    (((a) << 24) | ((i) << 8) | (f))
-
-/*
- * Format of RGBA colors is
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |    alpha      |      red      |     green     |     blue      |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-#define RGBA_GETALPHA(rgb)      ((rgb) >> 24)
-#define RGBA_GETRED(rgb)        (((rgb) >> 16) & 0xff)
-#define RGBA_GETGREEN(rgb)      (((rgb) >> 8) & 0xff)
-#define RGBA_GETBLUE(rgb)       ((rgb) & 0xff)
-#define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
-
-/* D3DRGB and D3DRGBA may be used as initialisers for D3DCOLORs
- * The float values must be in the range 0..1
- */
-#define D3DRGB(r, g, b) \
-    (0xff000000L | ( ((long)((r) * 255)) << 16) | (((long)((g) * 255)) << 8) | (long)((b) * 255))
-#define D3DRGBA(r, g, b, a) \
-    (   (((long)((a) * 255)) << 24) | (((long)((r) * 255)) << 16) \
-    |   (((long)((g) * 255)) << 8) | (long)((b) * 255) \
-    )
-
-/*
- * Format of RGB colors is
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |    ignored    |      red      |     green     |     blue      |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-#define RGB_GETRED(rgb)         (((rgb) >> 16) & 0xff)
-#define RGB_GETGREEN(rgb)       (((rgb) >> 8) & 0xff)
-#define RGB_GETBLUE(rgb)        ((rgb) & 0xff)
-#define RGBA_SETALPHA(rgba, x) (((x) << 24) | ((rgba) & 0x00ffffff))
-#define RGB_MAKE(r, g, b)       ((D3DCOLOR) (((r) << 16) | ((g) << 8) | (b)))
-#define RGBA_TORGB(rgba)       ((D3DCOLOR) ((rgba) & 0xffffff))
-#define RGB_TORGBA(rgb)        ((D3DCOLOR) ((rgb) | 0xff000000))
-
-#endif
-
-/*
- * Flags for Enumerate functions
- */
-
-/*
- * Stop the enumeration
- */
-#define D3DENUMRET_CANCEL                        DDENUMRET_CANCEL
-
-/*
- * Continue the enumeration
- */
-#define D3DENUMRET_OK                            DDENUMRET_OK
-
-typedef HRESULT (WINAPI* LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset);
-typedef HRESULT (WINAPI* LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext);
-
-typedef DWORD D3DCOLOR, D3DCOLOR, *LPD3DCOLOR;
-
-typedef DWORD D3DMATERIALHANDLE, *LPD3DMATERIALHANDLE;
-typedef DWORD D3DTEXTUREHANDLE, *LPD3DTEXTUREHANDLE;
-typedef DWORD D3DMATRIXHANDLE, *LPD3DMATRIXHANDLE;
-
-typedef struct _D3DCOLORVALUE {
-    union {
-        D3DVALUE r;
-        D3DVALUE dvR;
-    };
-    union {
-        D3DVALUE g;
-        D3DVALUE dvG;
-    };
-    union {
-        D3DVALUE b;
-        D3DVALUE dvB;
-    };
-    union {
-        D3DVALUE a;
-        D3DVALUE dvA;
-    };
-} D3DCOLORVALUE;
-
-typedef struct _D3DRECT {
-    union {
-        LONG x1;
-        LONG lX1;
-    };
-    union {
-        LONG y1;
-        LONG lY1;
-    };
-    union {
-        LONG x2;
-        LONG lX2;
-    };
-    union {
-        LONG y2;
-        LONG lY2;
-    };
-} D3DRECT, *LPD3DRECT;
-
-typedef struct _D3DVECTOR {
-    union {
-        D3DVALUE x;
-        D3DVALUE dvX;
-    };
-    union {
-        D3DVALUE y;
-        D3DVALUE dvY;
-    };
-    union {
-        D3DVALUE z;
-        D3DVALUE dvZ;
-    };
-} D3DVECTOR, *LPD3DVECTOR;
-
-
-/*
- * Vertex data types supported in an ExecuteBuffer.
- */
-
-/*
- * Homogeneous vertices
- */
-
-typedef struct _D3DHVERTEX {
-    DWORD           dwFlags;        /* Homogeneous clipping flags */
-    union {
-        D3DVALUE    hx;
-        D3DVALUE    dvHX;
-    };
-    union {
-        D3DVALUE    hy;
-        D3DVALUE    dvHY;
-    };
-    union {
-        D3DVALUE    hz;
-        D3DVALUE    dvHZ;
-    };
-} D3DHVERTEX, *LPD3DHVERTEX;
-
-/*
- * Transformed/lit vertices
- */
-typedef struct _D3DTLVERTEX {
-    union {
-        D3DVALUE    sx;             /* Screen coordinates */
-        D3DVALUE    dvSX;
-    };
-    union {
-        D3DVALUE    sy;
-        D3DVALUE    dvSY;
-    };
-    union {
-        D3DVALUE    sz;
-        D3DVALUE    dvSZ;
-    };
-    union {
-        D3DVALUE    rhw;            /* Reciprocal of homogeneous w */
-        D3DVALUE    dvRHW;
-    };
-    union {
-        D3DCOLOR    color;          /* Vertex color */
-        D3DCOLOR    dcColor;
-    };
-    union {
-        D3DCOLOR    specular;       /* Specular component of vertex */
-        D3DCOLOR    dcSpecular;
-    };
-    union {
-        D3DVALUE    tu;             /* Texture coordinates */
-        D3DVALUE    dvTU;
-    };
-    union {
-        D3DVALUE    tv;
-        D3DVALUE    dvTV;
-    };
-} D3DTLVERTEX, *LPD3DTLVERTEX;
-
-/*
- * Untransformed/lit vertices
- */
-typedef struct _D3DLVERTEX {
-    union {
-        D3DVALUE     x;             /* Homogeneous coordinates */
-        D3DVALUE     dvX;
-    };
-    union {
-        D3DVALUE     y;
-        D3DVALUE     dvY;
-    };
-    union {
-        D3DVALUE     z;
-        D3DVALUE     dvZ;
-    };
-    DWORD            dwReserved;
-    union {
-        D3DCOLOR     color;         /* Vertex color */
-        D3DCOLOR     dcColor;
-    };
-    union {
-        D3DCOLOR     specular;      /* Specular component of vertex */
-        D3DCOLOR     dcSpecular;
-    };
-    union {
-        D3DVALUE     tu;            /* Texture coordinates */
-        D3DVALUE     dvTU;
-    };
-    union {
-        D3DVALUE     tv;
-        D3DVALUE     dvTV;
-    };
-} D3DLVERTEX, *LPD3DLVERTEX;
-
-/*
- * Untransformed/unlit vertices
- */
-
-typedef struct _D3DVERTEX {
-    union {
-        D3DVALUE     x;             /* Homogeneous coordinates */
-        D3DVALUE     dvX;
-    };
-    union {
-        D3DVALUE     y;
-        D3DVALUE     dvY;
-    };
-    union {
-        D3DVALUE     z;
-        D3DVALUE     dvZ;
-    };
-    union {
-        D3DVALUE     nx;            /* Normal */
-        D3DVALUE     dvNX;
-    };
-    union {
-        D3DVALUE     ny;
-        D3DVALUE     dvNY;
-    };
-    union {
-        D3DVALUE     nz;
-        D3DVALUE     dvNZ;
-    };
-    union {
-        D3DVALUE     tu;            /* Texture coordinates */
-        D3DVALUE     dvTU;
-    };
-    union {
-        D3DVALUE     tv;
-        D3DVALUE     dvTV;
-    };
-} D3DVERTEX, *LPD3DVERTEX;
-
-/*
- * Matrix, viewport, and tranformation structures and definitions.
- */
-
-typedef struct _D3DMATRIX {
-    D3DVALUE        _11, _12, _13, _14;
-    D3DVALUE        _21, _22, _23, _24;
-    D3DVALUE        _31, _32, _33, _34;
-    D3DVALUE        _41, _42, _43, _44;
-} D3DMATRIX, *LPD3DMATRIX;
-
-typedef struct _D3DVIEWPORT {
-    DWORD       dwSize;
-    DWORD       dwX;
-    DWORD       dwY;            /* Top left */
-    DWORD       dwWidth;
-    DWORD       dwHeight;       /* Dimensions */
-    D3DVALUE    dvScaleX;       /* Scale homogeneous to screen */
-    D3DVALUE    dvScaleY;       /* Scale homogeneous to screen */
-    D3DVALUE    dvMaxX;         /* Min/max homogeneous x coord */
-    D3DVALUE    dvMaxY;         /* Min/max homogeneous y coord */
-    D3DVALUE    dvMinZ;
-    D3DVALUE    dvMaxZ;         /* Min/max homogeneous z coord */
-} D3DVIEWPORT, *LPD3DVIEWPORT;
-
-/*
- * Values for clip fields.
- */
-#define D3DCLIP_LEFT                            0x00000001L
-#define D3DCLIP_RIGHT                           0x00000002L
-#define D3DCLIP_TOP                             0x00000004L
-#define D3DCLIP_BOTTOM                          0x00000008L
-#define D3DCLIP_FRONT                           0x00000010L
-#define D3DCLIP_BACK                            0x00000020L
-#define D3DCLIP_GEN0                            0x00000040L
-#define D3DCLIP_GEN1                            0x00000080L
-#define D3DCLIP_GEN2                            0x00000100L
-#define D3DCLIP_GEN3                            0x00000200L
-#define D3DCLIP_GEN4                            0x00000400L
-#define D3DCLIP_GEN5                            0x00000800L
-
-/*
- * Values for d3d status.
- */
-#define D3DSTATUS_CLIPUNIONLEFT                 D3DCLIP_LEFT
-#define D3DSTATUS_CLIPUNIONRIGHT                D3DCLIP_RIGHT
-#define D3DSTATUS_CLIPUNIONTOP                  D3DCLIP_TOP
-#define D3DSTATUS_CLIPUNIONBOTTOM               D3DCLIP_BOTTOM
-#define D3DSTATUS_CLIPUNIONFRONT                D3DCLIP_FRONT
-#define D3DSTATUS_CLIPUNIONBACK                 D3DCLIP_BACK
-#define D3DSTATUS_CLIPUNIONGEN0                 D3DCLIP_GEN0
-#define D3DSTATUS_CLIPUNIONGEN1                 D3DCLIP_GEN1
-#define D3DSTATUS_CLIPUNIONGEN2                 D3DCLIP_GEN2
-#define D3DSTATUS_CLIPUNIONGEN3                 D3DCLIP_GEN3
-#define D3DSTATUS_CLIPUNIONGEN4                 D3DCLIP_GEN4
-#define D3DSTATUS_CLIPUNIONGEN5                 D3DCLIP_GEN5
-
-#define D3DSTATUS_CLIPINTERSECTIONLEFT          0x00001000L
-#define D3DSTATUS_CLIPINTERSECTIONRIGHT         0x00002000L
-#define D3DSTATUS_CLIPINTERSECTIONTOP           0x00004000L
-#define D3DSTATUS_CLIPINTERSECTIONBOTTOM        0x00008000L
-#define D3DSTATUS_CLIPINTERSECTIONFRONT         0x00010000L
-#define D3DSTATUS_CLIPINTERSECTIONBACK          0x00020000L
-#define D3DSTATUS_CLIPINTERSECTIONGEN0          0x00040000L
-#define D3DSTATUS_CLIPINTERSECTIONGEN1          0x00080000L
-#define D3DSTATUS_CLIPINTERSECTIONGEN2          0x00100000L
-#define D3DSTATUS_CLIPINTERSECTIONGEN3          0x00200000L
-#define D3DSTATUS_CLIPINTERSECTIONGEN4          0x00400000L
-#define D3DSTATUS_CLIPINTERSECTIONGEN5          0x00800000L
-#define D3DSTATUS_ZNOTVISIBLE                   0x01000000L
-
-#define D3DSTATUS_CLIPUNIONALL  (               \
-            D3DSTATUS_CLIPUNIONLEFT     |       \
-            D3DSTATUS_CLIPUNIONRIGHT    |       \
-            D3DSTATUS_CLIPUNIONTOP      |       \
-            D3DSTATUS_CLIPUNIONBOTTOM   |       \
-            D3DSTATUS_CLIPUNIONFRONT    |       \
-            D3DSTATUS_CLIPUNIONBACK     |       \
-            D3DSTATUS_CLIPUNIONGEN0     |       \
-            D3DSTATUS_CLIPUNIONGEN1     |       \
-            D3DSTATUS_CLIPUNIONGEN2     |       \
-            D3DSTATUS_CLIPUNIONGEN3     |       \
-            D3DSTATUS_CLIPUNIONGEN4     |       \
-            D3DSTATUS_CLIPUNIONGEN5             \
-            )
-
-#define D3DSTATUS_CLIPINTERSECTIONALL   (               \
-            D3DSTATUS_CLIPINTERSECTIONLEFT      |       \
-            D3DSTATUS_CLIPINTERSECTIONRIGHT     |       \
-            D3DSTATUS_CLIPINTERSECTIONTOP       |       \
-            D3DSTATUS_CLIPINTERSECTIONBOTTOM    |       \
-            D3DSTATUS_CLIPINTERSECTIONFRONT     |       \
-            D3DSTATUS_CLIPINTERSECTIONBACK      |       \
-            D3DSTATUS_CLIPINTERSECTIONGEN0      |       \
-            D3DSTATUS_CLIPINTERSECTIONGEN1      |       \
-            D3DSTATUS_CLIPINTERSECTIONGEN2      |       \
-            D3DSTATUS_CLIPINTERSECTIONGEN3      |       \
-            D3DSTATUS_CLIPINTERSECTIONGEN4      |       \
-            D3DSTATUS_CLIPINTERSECTIONGEN5              \
-            )
-
-#define D3DSTATUS_DEFAULT       (                       \
-            D3DSTATUS_CLIPINTERSECTIONALL       |       \
-            D3DSTATUS_ZNOTVISIBLE)
-
-
-/*
- * Options for direct transform calls
- */
-#define D3DTRANSFORM_CLIPPED       0x00000001l
-#define D3DTRANSFORM_UNCLIPPED     0x00000002l
-
-typedef struct _D3DTRANSFORMDATA {
-    DWORD           dwSize;
-    LPVOID          lpIn;           /* Input vertices */
-    DWORD           dwInSize;       /* Stride of input vertices */
-    LPVOID          lpOut;          /* Output vertices */
-    DWORD           dwOutSize;      /* Stride of output vertices */
-    LPD3DHVERTEX    lpHOut;         /* Output homogeneous vertices */
-    DWORD           dwClip;         /* Clipping hint */
-    DWORD           dwClipIntersection;
-    DWORD           dwClipUnion;    /* Union of all clip flags */
-    D3DRECT         drExtent;       /* Extent of transformed vertices */
-} D3DTRANSFORMDATA, *LPD3DTRANSFORMDATA;
-
-/*
- * Structure defining position and direction properties for lighting.
- */
-typedef struct _D3DLIGHTINGELEMENT {
-    D3DVECTOR dvPosition;           /* Lightable point in model space */
-    D3DVECTOR dvNormal;             /* Normalised unit vector */
-} D3DLIGHTINGELEMENT, *LPD3DLIGHTINGELEMENT;
-
-/*
- * Structure defining material properties for lighting.
- */
-typedef struct _D3DMATERIAL {
-    DWORD               dwSize;
-    union {
-        D3DCOLORVALUE   diffuse;        /* Diffuse color RGBA */
-        D3DCOLORVALUE   dcvDiffuse;
-    };
-    union {
-        D3DCOLORVALUE   ambient;        /* Ambient color RGB */
-        D3DCOLORVALUE   dcvAmbient;
-    };
-    union {
-        D3DCOLORVALUE   specular;       /* Specular 'shininess' */
-        D3DCOLORVALUE   dcvSpecular;
-    };
-    union {
-        D3DCOLORVALUE   emissive;       /* Emissive color RGB */
-        D3DCOLORVALUE   dcvEmissive;
-    };
-    union {
-        D3DVALUE        power;          /* Sharpness if specular highlight */
-        D3DVALUE        dvPower;
-    };
-    D3DTEXTUREHANDLE    hTexture;       /* Handle to texture map */
-    DWORD               dwRampSize;
-} D3DMATERIAL, *LPD3DMATERIAL;
-
-typedef enum _D3DLIGHTTYPE {
-    D3DLIGHT_POINT          = 1,
-    D3DLIGHT_SPOT           = 2,
-    D3DLIGHT_DIRECTIONAL    = 3,
-    D3DLIGHT_PARALLELPOINT  = 4,
-    D3DLIGHT_GLSPOT         = 5,
-} D3DLIGHTTYPE;
-
-/*
- * Structure defining a light source and its properties.
- */
-typedef struct _D3DLIGHT {
-    DWORD           dwSize;
-    D3DLIGHTTYPE    dltType;            /* Type of light source */
-    D3DCOLORVALUE   dcvColor;           /* Color of light */
-    D3DVECTOR       dvPosition;         /* Position in world space */
-    D3DVECTOR       dvDirection;        /* Direction in world space */
-    D3DVALUE        dvRange;            /* Cutoff range */
-    D3DVALUE        dvFalloff;          /* Falloff */
-    D3DVALUE        dvAttenuation0;     /* Constant attenuation */
-    D3DVALUE        dvAttenuation1;     /* Linear attenuation */
-    D3DVALUE        dvAttenuation2;     /* Quadratic attenuation */
-    D3DVALUE        dvTheta;            /* Inner angle of spotlight cone */
-    D3DVALUE        dvPhi;              /* Outer angle of spotlight cone */
-} D3DLIGHT, *LPD3DLIGHT;
-
-typedef struct _D3DLIGHTDATA {
-    DWORD                dwSize;
-    LPD3DLIGHTINGELEMENT lpIn;          /* Input positions and normals */
-    DWORD                dwInSize;      /* Stride of input elements */
-    LPD3DTLVERTEX        lpOut;         /* Output colors */
-    DWORD                dwOutSize;     /* Stride of output colors */
-} D3DLIGHTDATA, *LPD3DLIGHTDATA;
-
-typedef enum _D3DCOLORMODEL {
-    D3DCOLOR_MONO           = 1,
-    D3DCOLOR_RGB            = 2,
-} D3DCOLORMODEL;
-
-/*
- * Options for clearing
- */
-#define D3DCLEAR_TARGET            0x00000001l /* Clear target surface */
-#define D3DCLEAR_ZBUFFER           0x00000002l /* Clear target z buffer */
-
-/*
- * Execute buffers are allocated via Direct3D.  These buffers may then
- * be filled by the application with instructions to execute along with
- * vertex data.
- */
-
-/*
- * Supported op codes for execute instructions.
- */
-typedef enum _D3DOPCODE {
-    D3DOP_POINT                 = 1,
-    D3DOP_LINE                  = 2,
-    D3DOP_TRIANGLE              = 3,
-    D3DOP_MATRIXLOAD            = 4,
-    D3DOP_MATRIXMULTIPLY        = 5,
-    D3DOP_STATETRANSFORM        = 6,
-    D3DOP_STATELIGHT            = 7,
-    D3DOP_STATERENDER           = 8,
-    D3DOP_PROCESSVERTICES       = 9,
-    D3DOP_TEXTURELOAD           = 10,
-    D3DOP_EXIT                  = 11,
-    D3DOP_BRANCHFORWARD         = 12,
-    D3DOP_SPAN                  = 13,
-    D3DOP_SETSTATUS             = 14,
-} D3DOPCODE;
-
-typedef struct _D3DINSTRUCTION {
-    BYTE bOpcode;   /* Instruction opcode */
-    BYTE bSize;     /* Size of each instruction data unit */
-    WORD wCount;    /* Count of instruction data units to follow */
-} D3DINSTRUCTION, *LPD3DINSTRUCTION;
-
-/*
- * Structure for texture loads
- */
-typedef struct _D3DTEXTURELOAD {
-    D3DTEXTUREHANDLE hDestTexture;
-    D3DTEXTUREHANDLE hSrcTexture;
-} D3DTEXTURELOAD, *LPD3DTEXTURELOAD;
-
-/*
- * Structure for picking
- */
-typedef struct _D3DPICKRECORD {
-    BYTE     bOpcode;
-    BYTE     bPad;
-    DWORD    dwOffset;
-    D3DVALUE dvZ;
-} D3DPICKRECORD, *LPD3DPICKRECORD;
-
-/*
- * The following defines the rendering states which can be set in the
- * execute buffer.
- */
-
-typedef enum _D3DSHADEMODE {
-    D3DSHADE_FLAT              = 1,
-    D3DSHADE_GOURAUD           = 2,
-    D3DSHADE_PHONG             = 3,
-} D3DSHADEMODE;
-
-typedef enum _D3DFILLMODE {
-    D3DFILL_POINT              = 1,
-    D3DFILL_WIREFRAME          = 2,
-    D3DFILL_SOLID              = 3,
-} D3DFILLMODE;
-
-typedef struct _D3DLINEPATTERN {
-    WORD        wRepeatFactor;
-    WORD        wLinePattern;
-} D3DLINEPATTERN;
-
-typedef enum _D3DTEXTUREFILTER {
-    D3DFILTER_NEAREST          = 1,
-    D3DFILTER_LINEAR           = 2,
-    D3DFILTER_MIPNEAREST       = 3,
-    D3DFILTER_MIPLINEAR        = 4,
-    D3DFILTER_LINEARMIPNEAREST = 5,
-    D3DFILTER_LINEARMIPLINEAR  = 6,
-} D3DTEXTUREFILTER;
-
-typedef enum _D3DBLEND {
-    D3DBLEND_ZERO              = 1,
-    D3DBLEND_ONE               = 2,
-    D3DBLEND_SRCCOLOR          = 3,
-    D3DBLEND_INVSRCCOLOR       = 4,
-    D3DBLEND_SRCALPHA          = 5,
-    D3DBLEND_INVSRCALPHA       = 6,
-    D3DBLEND_DESTALPHA         = 7,
-    D3DBLEND_INVDESTALPHA      = 8,
-    D3DBLEND_DESTCOLOR         = 9,
-    D3DBLEND_INVDESTCOLOR      = 10,
-    D3DBLEND_SRCALPHASAT       = 11,
-    D3DBLEND_BOTHSRCALPHA      = 12,
-    D3DBLEND_BOTHINVSRCALPHA   = 13,
-} D3DBLEND;
-
-typedef enum _D3DTEXTUREBLEND {
-    D3DTBLEND_DECAL            = 1,
-    D3DTBLEND_MODULATE         = 2,
-    D3DTBLEND_DECALALPHA       = 3,
-    D3DTBLEND_MODULATEALPHA    = 4,
-    D3DTBLEND_DECALMASK        = 5,
-    D3DTBLEND_MODULATEMASK     = 6,
-    D3DTBLEND_COPY             = 7,
-} D3DTEXTUREBLEND;
-
-typedef enum _D3DTEXTUREADDRESS {
-    D3DTADDRESS_WRAP           = 1,
-    D3DTADDRESS_MIRROR         = 2,
-    D3DTADDRESS_CLAMP          = 3,
-} D3DTEXTUREADDRESS;
-
-typedef enum _D3DCULL {
-    D3DCULL_NONE               = 1,
-    D3DCULL_CW                 = 2,
-    D3DCULL_CCW                = 3,
-} D3DCULL;
-
-typedef enum _D3DCMPFUNC {
-    D3DCMP_NEVER               = 1,
-    D3DCMP_LESS                = 2,
-    D3DCMP_EQUAL               = 3,
-    D3DCMP_LESSEQUAL           = 4,
-    D3DCMP_GREATER             = 5,
-    D3DCMP_NOTEQUAL            = 6,
-    D3DCMP_GREATEREQUAL        = 7,
-    D3DCMP_ALWAYS              = 8,
-} D3DCMPFUNC;
-
-typedef enum _D3DFOGMODE {
-    D3DFOG_NONE                = 0,
-    D3DFOG_EXP                 = 1,
-    D3DFOG_EXP2                = 2,
-    D3DFOG_LINEAR              = 3
-} D3DFOGMODE;
-
-/*
- * Amount to add to a state to generate the override for that state.
- */
-#define D3DSTATE_OVERRIDE_BIAS          256
-
-/*
- * A state which sets the override flag for the specified state type.
- */
-#define D3DSTATE_OVERRIDE(type) ((DWORD) (type) + D3DSTATE_OVERRIDE_BIAS)
-
-typedef enum _D3DTRANSFORMSTATETYPE {
-    D3DTRANSFORMSTATE_WORLD           = 1,
-    D3DTRANSFORMSTATE_VIEW            = 2,
-    D3DTRANSFORMSTATE_PROJECTION      = 3,
-} D3DTRANSFORMSTATETYPE;
-
-typedef enum _D3DLIGHTSTATETYPE {
-    D3DLIGHTSTATE_MATERIAL            = 1,
-    D3DLIGHTSTATE_AMBIENT             = 2,
-    D3DLIGHTSTATE_COLORMODEL          = 3,
-    D3DLIGHTSTATE_FOGMODE             = 4,
-    D3DLIGHTSTATE_FOGSTART            = 5,
-    D3DLIGHTSTATE_FOGEND              = 6,
-    D3DLIGHTSTATE_FOGDENSITY          = 7,
-} D3DLIGHTSTATETYPE;
-
-typedef enum _D3DRENDERSTATETYPE {
-    D3DRENDERSTATE_TEXTUREHANDLE      = 1,    /* Texture handle */
-    D3DRENDERSTATE_ANTIALIAS          = 2,    /* Antialiasing prim edges */
-    D3DRENDERSTATE_TEXTUREADDRESS     = 3,    /* D3DTEXTUREADDRESS      */
-    D3DRENDERSTATE_TEXTUREPERSPECTIVE = 4,    /* TRUE for perspective correction */
-    D3DRENDERSTATE_WRAPU              = 5,    /* TRUE for wrapping in u */
-    D3DRENDERSTATE_WRAPV              = 6,    /* TRUE for wrapping in v */
-    D3DRENDERSTATE_ZENABLE            = 7,    /* TRUE to enable z test */
-    D3DRENDERSTATE_FILLMODE           = 8,    /* D3DFILL_MODE            */
-    D3DRENDERSTATE_SHADEMODE          = 9,    /* D3DSHADEMODE */
-    D3DRENDERSTATE_LINEPATTERN        = 10,   /* D3DLINEPATTERN */
-    D3DRENDERSTATE_MONOENABLE         = 11,   /* TRUE to enable mono rasterization */
-    D3DRENDERSTATE_ROP2               = 12,   /* ROP2 */
-    D3DRENDERSTATE_PLANEMASK          = 13,   /* DWORD physical plane mask */
-    D3DRENDERSTATE_ZWRITEENABLE       = 14,   /* TRUE to enable z writes */
-    D3DRENDERSTATE_ALPHATESTENABLE    = 15,   /* TRUE to enable alpha tests */
-    D3DRENDERSTATE_LASTPIXEL          = 16,   /* TRUE for last-pixel on lines */
-    D3DRENDERSTATE_TEXTUREMAG         = 17,   /* D3DTEXTUREFILTER */
-    D3DRENDERSTATE_TEXTUREMIN         = 18,   /* D3DTEXTUREFILTER */
-    D3DRENDERSTATE_SRCBLEND           = 19,   /* D3DBLEND */
-    D3DRENDERSTATE_DESTBLEND          = 20,   /* D3DBLEND */
-    D3DRENDERSTATE_TEXTUREMAPBLEND    = 21,   /* D3DTEXTUREBLEND */
-    D3DRENDERSTATE_CULLMODE           = 22,   /* D3DCULL */
-    D3DRENDERSTATE_ZFUNC              = 23,   /* D3DCMPFUNC */
-    D3DRENDERSTATE_ALPHAREF           = 24,   /* D3DFIXED */
-    D3DRENDERSTATE_ALPHAFUNC          = 25,   /* D3DCMPFUNC */
-    D3DRENDERSTATE_DITHERENABLE       = 26,   /* TRUE to enable dithering */
-    D3DRENDERSTATE_BLENDENABLE        = 27,   /* TRUE to enable alpha blending */
-    D3DRENDERSTATE_FOGENABLE          = 28,   /* TRUE to enable fog */
-    D3DRENDERSTATE_SPECULARENABLE     = 29,   /* TRUE to enable specular */
-    D3DRENDERSTATE_ZVISIBLE           = 30,   /* TRUE to enable z checking */
-    D3DRENDERSTATE_SUBPIXEL           = 31,   /* TRUE to enable subpixel correction */
-    D3DRENDERSTATE_SUBPIXELX          = 32,   /* TRUE to enable correction in X only */
-    D3DRENDERSTATE_STIPPLEDALPHA      = 33,   /* TRUE to enable stippled alpha */
-    D3DRENDERSTATE_FOGCOLOR           = 34,   /* D3DCOLOR */
-    D3DRENDERSTATE_FOGTABLEMODE       = 35,   /* D3DFOGMODE */
-    D3DRENDERSTATE_FOGTABLESTART      = 36,   /* Fog table start        */
-    D3DRENDERSTATE_FOGTABLEEND        = 37,   /* Fog table end          */
-    D3DRENDERSTATE_FOGTABLEDENSITY    = 38,   /* Fog table density      */
-    D3DRENDERSTATE_STIPPLEENABLE      = 39,   /* TRUE to enable stippling */
-    D3DRENDERSTATE_STIPPLEPATTERN00   = 64,   /* Stipple pattern 01...  */      
-    D3DRENDERSTATE_STIPPLEPATTERN01   = 65,
-    D3DRENDERSTATE_STIPPLEPATTERN02   = 66,
-    D3DRENDERSTATE_STIPPLEPATTERN03   = 67,
-    D3DRENDERSTATE_STIPPLEPATTERN04   = 68,
-    D3DRENDERSTATE_STIPPLEPATTERN05   = 69,
-    D3DRENDERSTATE_STIPPLEPATTERN06   = 70,
-    D3DRENDERSTATE_STIPPLEPATTERN07   = 71,
-    D3DRENDERSTATE_STIPPLEPATTERN08   = 72,
-    D3DRENDERSTATE_STIPPLEPATTERN09   = 73,
-    D3DRENDERSTATE_STIPPLEPATTERN10   = 74,
-    D3DRENDERSTATE_STIPPLEPATTERN11   = 75,
-    D3DRENDERSTATE_STIPPLEPATTERN12   = 76,
-    D3DRENDERSTATE_STIPPLEPATTERN13   = 77,
-    D3DRENDERSTATE_STIPPLEPATTERN14   = 78,
-    D3DRENDERSTATE_STIPPLEPATTERN15   = 79,
-    D3DRENDERSTATE_STIPPLEPATTERN16   = 80,
-    D3DRENDERSTATE_STIPPLEPATTERN17   = 81,
-    D3DRENDERSTATE_STIPPLEPATTERN18   = 82,
-    D3DRENDERSTATE_STIPPLEPATTERN19   = 83,
-    D3DRENDERSTATE_STIPPLEPATTERN20   = 84,
-    D3DRENDERSTATE_STIPPLEPATTERN21   = 85,
-    D3DRENDERSTATE_STIPPLEPATTERN22   = 86,
-    D3DRENDERSTATE_STIPPLEPATTERN23   = 87,
-    D3DRENDERSTATE_STIPPLEPATTERN24   = 88,
-    D3DRENDERSTATE_STIPPLEPATTERN25   = 89,
-    D3DRENDERSTATE_STIPPLEPATTERN26   = 90,
-    D3DRENDERSTATE_STIPPLEPATTERN27   = 91,
-    D3DRENDERSTATE_STIPPLEPATTERN28   = 92,
-    D3DRENDERSTATE_STIPPLEPATTERN29   = 93,
-    D3DRENDERSTATE_STIPPLEPATTERN30   = 94,
-    D3DRENDERSTATE_STIPPLEPATTERN31   = 95,
-} D3DRENDERSTATETYPE;
-
-#define D3DRENDERSTATE_STIPPLEPATTERN(y) (D3DRENDERSTATE_STIPPLEPATTERN00 + (y))
-
-typedef struct _D3DSTATE {
-    union {
-        D3DTRANSFORMSTATETYPE   dtstTransformStateType;
-        D3DLIGHTSTATETYPE       dlstLightStateType;
-        D3DRENDERSTATETYPE      drstRenderStateType;
-    };
-    union {
-        DWORD                   dwArg[1];
-        D3DVALUE                dvArg[1];
-    };
-} D3DSTATE, *LPD3DSTATE;
-
-/*
- * Operation used to load matrices
- * hDstMat = hSrcMat
- */
-typedef struct _D3DMATRIXLOAD {
-    D3DMATRIXHANDLE hDestMatrix;   /* Destination matrix */
-    D3DMATRIXHANDLE hSrcMatrix;   /* Source matrix */
-} D3DMATRIXLOAD, *LPD3DMATRIXLOAD;
-
-/*
- * Operation used to multiply matrices
- * hDstMat = hSrcMat1 * hSrcMat2
- */
-typedef struct _D3DMATRIXMULTIPLY {
-    D3DMATRIXHANDLE hDestMatrix;   /* Destination matrix */
-    D3DMATRIXHANDLE hSrcMatrix1;  /* First source matrix */
-    D3DMATRIXHANDLE hSrcMatrix2;  /* Second source matrix */
-} D3DMATRIXMULTIPLY, *LPD3DMATRIXMULTIPLY;
-
-/*
- * Operation used to transform and light vertices.
- */
-typedef struct _D3DPROCESSVERTICES {
-    DWORD        dwFlags;    /* Do we transform or light or just copy? */
-    WORD         wStart;     /* Index to first vertex in source */
-    WORD         wDest;      /* Index to first vertex in local buffer */
-    DWORD        dwCount;    /* Number of vertices to be processed */
-    DWORD        dwReserved; /* Must be zero */
-} D3DPROCESSVERTICES, *LPD3DPROCESSVERTICES;
-
-#define D3DPROCESSVERTICES_TRANSFORMLIGHT       0x00000000L
-#define D3DPROCESSVERTICES_TRANSFORM            0x00000001L
-#define D3DPROCESSVERTICES_COPY                 0x00000002L
-#define D3DPROCESSVERTICES_OPMASK               0x00000007L
-
-#define D3DPROCESSVERTICES_UPDATEEXTENTS        0x00000008L
-#define D3DPROCESSVERTICES_NOCOLOR              0x00000010L
-
-
-/*
- * Triangle flags
- */
- 
-/*
- * Tri strip and fan flags.
- * START loads all three vertices
- * EVEN and ODD load just v3 with even or odd culling
- * START_FLAT contains a count from 0 to 29 that allows the
- * whole strip or fan to be culled in one hit.
- * e.g. for a quad len = 1
- */
-#define D3DTRIFLAG_START                        0x00000000L
-#define D3DTRIFLAG_STARTFLAT(len) (len)         /* 0 < len < 30 */
-#define D3DTRIFLAG_ODD                          0x0000001eL
-#define D3DTRIFLAG_EVEN                         0x0000001fL
-
-/*
- * Triangle edge flags
- * enable edges for wireframe or antialiasing
- */
-#define D3DTRIFLAG_EDGEENABLE1                  0x00000100L /* v0-v1 edge */
-#define D3DTRIFLAG_EDGEENABLE2                  0x00000200L /* v1-v2 edge */
-#define D3DTRIFLAG_EDGEENABLE3                  0x00000400L /* v2-v0 edge */
-#define D3DTRIFLAG_EDGEENABLETRIANGLE \
-        (D3DTRIFLAG_EDGEENABLE1 | D3DTRIFLAG_EDGEENABLE2 | D3DTRIFLAG_EDGEENABLE3)
-        
-/*
- * Primitive structures and related defines.  Vertex offsets are to types
- * D3DVERTEX, D3DLVERTEX, or D3DTLVERTEX.
- */
-
-/*
- * Triangle list primitive structure
- */
-typedef struct _D3DTRIANGLE {
-    union {
-        WORD    v1;            /* Vertex indices */
-        WORD    wV1;
-    };
-    union {
-        WORD    v2;
-        WORD    wV2;
-    };
-    union {
-        WORD    v3;
-        WORD    wV3;
-    };
-    WORD        wFlags;       /* Edge (and other) flags */
-} D3DTRIANGLE, *LPD3DTRIANGLE;
-
-/*
- * Line strip structure.
- * The instruction count - 1 defines the number of line segments.
- */
-typedef struct _D3DLINE {
-    union {
-        WORD    v1;            /* Vertex indices */
-        WORD    wV1;
-    };
-    union {
-        WORD    v2;
-        WORD    wV2;
-    };
-} D3DLINE, *LPD3DLINE;
-
-/*
- * Span structure
- * Spans join a list of points with the same y value.
- * If the y value changes, a new span is started.
- */
-typedef struct _D3DSPAN {
-    WORD        wCount; /* Number of spans */
-    WORD        wFirst; /* Index to first vertex */
-} D3DSPAN, *LPD3DSPAN;
-
-/*
- * Point structure
- */
-typedef struct _D3DPOINT {
-    WORD        wCount;         /* number of points         */
-    WORD        wFirst;         /* index to first vertex    */
-} D3DPOINT, *LPD3DPOINT;
-
-
-/*
- * Forward branch structure.
- * Mask is logically anded with the driver status mask
- * if the result equals 'value', the branch is taken.
- */
-typedef struct _D3DBRANCH {
-    DWORD       dwMask;         /* Bitmask against D3D status */
-    DWORD       dwValue;
-    BOOL        bNegate;        /* TRUE to negate comparison */
-    DWORD       dwOffset;       /* How far to branch forward (0 for exit)*/
-} D3DBRANCH, *LPD3DBRANCH;
-
-/*
- * Status used for set status instruction.
- * The D3D status is initialised on device creation
- * and is modified by all execute calls.
- */
-typedef struct _D3DSTATUS {
-    DWORD       dwFlags;        /* Do we set extents or status */
-    DWORD       dwStatus;       /* D3D status */
-    D3DRECT     drExtent;
-} D3DSTATUS, *LPD3DSTATUS;
-
-#define D3DSETSTATUS_STATUS             0x00000001L
-#define D3DSETSTATUS_EXTENTS            0x00000002L
-#define D3DSETSTATUS_ALL        (D3DSETSTATUS_STATUS | D3DSETSTATUS_EXTENTS)
-
-/*
- * Statistics structure
- */
-typedef struct _D3DSTATS {
-    DWORD        dwSize;
-    DWORD        dwTrianglesDrawn;
-    DWORD        dwLinesDrawn;
-    DWORD        dwPointsDrawn;
-    DWORD        dwSpansDrawn;
-    DWORD        dwVerticesProcessed;
-} D3DSTATS, *LPD3DSTATS;
-
-/*
- * Execute options.
- * When calling using D3DEXECUTE_UNCLIPPED all the primitives 
- * inside the buffer must be contained within the viewport.
- */
-#define D3DEXECUTE_CLIPPED       0x00000001l
-#define D3DEXECUTE_UNCLIPPED     0x00000002l
-
-typedef struct _D3DEXECUTEDATA {
-    DWORD       dwSize;
-    DWORD       dwVertexOffset;
-    DWORD       dwVertexCount;
-    DWORD       dwInstructionOffset;
-    DWORD       dwInstructionLength;
-    DWORD       dwHVertexOffset;
-    D3DSTATUS   dsStatus;       /* Status after execute */
-} D3DEXECUTEDATA, *LPD3DEXECUTEDATA;
-
-/*
- * Palette flags.
- * This are or'ed with the peFlags in the PALETTEENTRYs passed to DirectDraw.
- */
-#define D3DPAL_FREE     0x00    /* Renderer may use this entry freely */
-#define D3DPAL_READONLY 0x40    /* Renderer may not set this entry */
-#define D3DPAL_RESERVED 0x80    /* Renderer may not use this entry */
-
-#if defined(__cplusplus)
-};
-#endif
-
-#pragma pack()
-
-#endif /* _D3DTYPES_H_ */
--- a/u/dxsdk/SDK/INC/DDRAW.H
+++ /dev/null
@@ -1,3102 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1994-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       ddraw.h
- *  Content:    DirectDraw include file
- *
- ***************************************************************************/
-
-#ifndef __DDRAW_INCLUDED__
-#define __DDRAW_INCLUDED__
-#if defined( _WIN32 )  && !defined( _NO_COM )
-#define COM_NO_WINDOWS_H
-#include <objbase.h>
-#else
-#define IUnknown            void
-#define CO_E_NOTINITIALIZED 0x800401F0L
-#endif
-
-#define _FACDD  0x876
-#define MAKE_DDHRESULT( code )  MAKE_HRESULT( 1, _FACDD, code )
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * GUIDS used by DirectDraw objects
- */
-#if defined( _WIN32 ) && !defined( _NO_COM )
-DEFINE_GUID( CLSID_DirectDraw,                  0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 );
-DEFINE_GUID( CLSID_DirectDrawClipper,           0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56 );
-DEFINE_GUID( IID_IDirectDraw,                   0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDraw2,                  0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );
-DEFINE_GUID( IID_IDirectDrawSurface,            0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawSurface2,           0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27 );
-
-DEFINE_GUID( IID_IDirectDrawPalette,            0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawClipper,            0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-                 
-#endif
-
-/*============================================================================
- *
- * DirectDraw Structures
- *
- * Various structures used to invoke DirectDraw.
- *
- *==========================================================================*/
-
-struct IDirectDraw;
-struct IDirectDrawSurface;
-struct IDirectDrawPalette;
-struct IDirectDrawClipper;
-
-typedef struct IDirectDraw                      FAR *LPDIRECTDRAW;
-typedef struct IDirectDraw2                     FAR *LPDIRECTDRAW2;
-typedef struct IDirectDrawSurface               FAR *LPDIRECTDRAWSURFACE;
-typedef struct IDirectDrawSurface2              FAR *LPDIRECTDRAWSURFACE2;
-
-typedef struct IDirectDrawPalette               FAR *LPDIRECTDRAWPALETTE;
-typedef struct IDirectDrawClipper               FAR *LPDIRECTDRAWCLIPPER;
-
-typedef struct _DDFXROP                 FAR *LPDDFXROP;
-typedef struct _DDSURFACEDESC           FAR *LPDDSURFACEDESC;
-
-/*
- * API's
- */
-#if (defined (WIN32) || defined( _WIN32 ) ) && !defined( _NO_COM )
-//#if defined( _WIN32 ) && !defined( _NO_ENUM )
-    typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
-    typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKW)(GUID FAR *, LPWSTR, LPWSTR, LPVOID);
-    extern HRESULT WINAPI DirectDrawEnumerateW( LPDDENUMCALLBACKW lpCallback, LPVOID lpContext );
-    extern HRESULT WINAPI DirectDrawEnumerateA( LPDDENUMCALLBACKA lpCallback, LPVOID lpContext );
-    #ifdef UNICODE
-        typedef LPDDENUMCALLBACKW       LPDDENUMCALLBACK;
-        #define DirectDrawEnumerate     DirectDrawEnumerateW
-    #else
-        typedef LPDDENUMCALLBACKA       LPDDENUMCALLBACK;
-        #define DirectDrawEnumerate     DirectDrawEnumerateA
-    #endif
-    extern HRESULT WINAPI DirectDrawCreate( GUID FAR *lpGUID, LPDIRECTDRAW FAR *lplpDD, IUnknown FAR *pUnkOuter );
-    extern HRESULT WINAPI DirectDrawCreateClipper( DWORD dwFlags, LPDIRECTDRAWCLIPPER FAR *lplpDDClipper, IUnknown FAR *pUnkOuter );
-    #ifdef WINNT
-        //This is the user-mode entry stub to the kernel mode procedure.
-        extern HRESULT NtDirectDrawCreate( GUID FAR *lpGUID, HANDLE *lplpDD, IUnknown FAR *pUnkOuter );
-    #endif
-#endif
-
-#define REGSTR_KEY_DDHW_DESCRIPTION     "Description"
-#define REGSTR_KEY_DDHW_DRIVERNAME      "DriverName"
-#define REGSTR_PATH_DDHW                "Hardware\\DirectDrawDrivers"
-
-#define DDCREATE_HARDWAREONLY           0x00000001l
-#define DDCREATE_EMULATIONONLY          0x00000002l
-
-#ifdef WINNT
-typedef long HRESULT;
-#endif
-
-//#ifndef WINNT
-typedef HRESULT (FAR PASCAL * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
-typedef HRESULT (FAR PASCAL * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
-//#endif
-/*
- * DDCOLORKEY
- */
-typedef struct _DDCOLORKEY
-{
-    DWORD       dwColorSpaceLowValue;   // low boundary of color space that is to 
-                                        // be treated as Color Key, inclusive
-    DWORD       dwColorSpaceHighValue;  // high boundary of color space that is 
-                                        // to be treated as Color Key, inclusive
-} DDCOLORKEY;
-
-typedef DDCOLORKEY FAR* LPDDCOLORKEY;
-
-/*
- * DDBLTFX
- * Used to pass override information to the DIRECTDRAWSURFACE callback Blt.
- */
-typedef struct _DDBLTFX
-{
-    DWORD       dwSize;                         // size of structure
-    DWORD       dwDDFX;                         // FX operations
-    DWORD       dwROP;                          // Win32 raster operations
-    DWORD       dwDDROP;                        // Raster operations new for DirectDraw
-    DWORD       dwRotationAngle;                // Rotation angle for blt
-    DWORD       dwZBufferOpCode;                // ZBuffer compares
-    DWORD       dwZBufferLow;                   // Low limit of Z buffer
-    DWORD       dwZBufferHigh;                  // High limit of Z buffer
-    DWORD       dwZBufferBaseDest;              // Destination base value
-    DWORD       dwZDestConstBitDepth;           // Bit depth used to specify Z constant for destination
-    union
-    {
-        DWORD   dwZDestConst;                   // Constant to use as Z buffer for dest
-        LPDIRECTDRAWSURFACE lpDDSZBufferDest;   // Surface to use as Z buffer for dest
-    };
-    DWORD       dwZSrcConstBitDepth;            // Bit depth used to specify Z constant for source
-    union
-    {
-        DWORD   dwZSrcConst;                    // Constant to use as Z buffer for src
-        LPDIRECTDRAWSURFACE lpDDSZBufferSrc;    // Surface to use as Z buffer for src
-    };
-    DWORD       dwAlphaEdgeBlendBitDepth;       // Bit depth used to specify constant for alpha edge blend
-    DWORD       dwAlphaEdgeBlend;               // Alpha for edge blending
-    DWORD       dwReserved;
-    DWORD       dwAlphaDestConstBitDepth;       // Bit depth used to specify alpha constant for destination
-    union
-    {
-        DWORD   dwAlphaDestConst;               // Constant to use as Alpha Channel
-        LPDIRECTDRAWSURFACE lpDDSAlphaDest;     // Surface to use as Alpha Channel
-    };
-    DWORD       dwAlphaSrcConstBitDepth;        // Bit depth used to specify alpha constant for source
-    union
-    {
-        DWORD   dwAlphaSrcConst;                // Constant to use as Alpha Channel
-        LPDIRECTDRAWSURFACE lpDDSAlphaSrc;      // Surface to use as Alpha Channel
-    };
-    union
-    {
-        DWORD   dwFillColor;                    // color in RGB or Palettized
-        DWORD   dwFillDepth;                    // depth value for z-buffer
-        LPDIRECTDRAWSURFACE lpDDSPattern;       // Surface to use as pattern
-    };
-    DDCOLORKEY  ddckDestColorkey;               // DestColorkey override
-    DDCOLORKEY  ddckSrcColorkey;                // SrcColorkey override
-} DDBLTFX;
-
-typedef DDBLTFX FAR* LPDDBLTFX;
-
-
-/*
- * DDSCAPS
- */
-typedef struct _DDSCAPS
-{
-    DWORD       dwCaps;         // capabilities of surface wanted
-} DDSCAPS;
-
-typedef DDSCAPS FAR* LPDDSCAPS; 
-
-/*
- * DDCAPS
- */
-#define DD_ROP_SPACE            (256/32)        // space required to store ROP array
-
-typedef struct _DDCAPS
-{
-    DWORD       dwSize;                 // size of the DDDRIVERCAPS structure
-    DWORD       dwCaps;                 // driver specific capabilities
-    DWORD       dwCaps2;                // more driver specific capabilites
-    DWORD       dwCKeyCaps;             // color key capabilities of the surface
-    DWORD       dwFXCaps;               // driver specific stretching and effects capabilites
-    DWORD       dwFXAlphaCaps;          // alpha driver specific capabilities
-    DWORD       dwPalCaps;              // palette capabilities
-    DWORD       dwSVCaps;               // stereo vision capabilities
-    DWORD       dwAlphaBltConstBitDepths;       // DDBD_2,4,8
-    DWORD       dwAlphaBltPixelBitDepths;       // DDBD_1,2,4,8
-    DWORD       dwAlphaBltSurfaceBitDepths;     // DDBD_1,2,4,8
-    DWORD       dwAlphaOverlayConstBitDepths;   // DDBD_2,4,8
-    DWORD       dwAlphaOverlayPixelBitDepths;   // DDBD_1,2,4,8
-    DWORD       dwAlphaOverlaySurfaceBitDepths; // DDBD_1,2,4,8
-    DWORD       dwZBufferBitDepths;             // DDBD_8,16,24,32
-    DWORD       dwVidMemTotal;          // total amount of video memory
-    DWORD       dwVidMemFree;           // amount of free video memory
-    DWORD       dwMaxVisibleOverlays;   // maximum number of visible overlays
-    DWORD       dwCurrVisibleOverlays;  // current number of visible overlays
-    DWORD       dwNumFourCCCodes;       // number of four cc codes
-    DWORD       dwAlignBoundarySrc;     // source rectangle alignment
-    DWORD       dwAlignSizeSrc;         // source rectangle byte size
-    DWORD       dwAlignBoundaryDest;    // dest rectangle alignment
-    DWORD       dwAlignSizeDest;        // dest rectangle byte size
-    DWORD       dwAlignStrideAlign;     // stride alignment
-    DWORD       dwRops[DD_ROP_SPACE];   // ROPS supported
-    DDSCAPS     ddsCaps;                // DDSCAPS structure has all the general capabilities
-    DWORD       dwMinOverlayStretch;    // minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3
-    DWORD       dwMaxOverlayStretch;    // maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3
-    DWORD       dwMinLiveVideoStretch;  // minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3
-    DWORD       dwMaxLiveVideoStretch;  // maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3
-    DWORD       dwMinHwCodecStretch;    // minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3
-    DWORD       dwMaxHwCodecStretch;    // maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3
-    DWORD       dwReserved1;            // reserved
-    DWORD       dwReserved2;            // reserved
-    DWORD       dwReserved3;            // reserved
-    DWORD       dwSVBCaps;              // driver specific capabilities for System->Vmem blts
-    DWORD       dwSVBCKeyCaps;          // driver color key capabilities for System->Vmem blts
-    DWORD       dwSVBFXCaps;            // driver FX capabilities for System->Vmem blts
-    DWORD       dwSVBRops[DD_ROP_SPACE];// ROPS supported for System->Vmem blts
-    DWORD       dwVSBCaps;              // driver specific capabilities for Vmem->System blts
-    DWORD       dwVSBCKeyCaps;          // driver color key capabilities for Vmem->System blts
-    DWORD       dwVSBFXCaps;            // driver FX capabilities for Vmem->System blts
-    DWORD       dwVSBRops[DD_ROP_SPACE];// ROPS supported for Vmem->System blts
-    DWORD       dwSSBCaps;              // driver specific capabilities for System->System blts
-    DWORD       dwSSBCKeyCaps;          // driver color key capabilities for System->System blts
-    DWORD       dwSSBFXCaps;            // driver FX capabilities for System->System blts
-    DWORD       dwSSBRops[DD_ROP_SPACE];// ROPS supported for System->System blts
-    DWORD       dwReserved4;            // reserved
-    DWORD       dwReserved5;            // reserved
-    DWORD       dwReserved6;            // reserved
-} DDCAPS;
-
-typedef DDCAPS FAR* LPDDCAPS;
-
-
-
-/*
- * DDPIXELFORMAT
- */
-typedef struct _DDPIXELFORMAT
-{
-    DWORD       dwSize;                 // size of structure
-    DWORD       dwFlags;                // pixel format flags
-    DWORD       dwFourCC;               // (FOURCC code)
-    union
-    {
-        DWORD   dwRGBBitCount;          // how many bits per pixel (BD_4,8,16,24,32)
-        DWORD   dwYUVBitCount;          // how many bits per pixel (BD_4,8,16,24,32)
-        DWORD   dwZBufferBitDepth;      // how many bits for z buffers (BD_8,16,24,32)
-        DWORD   dwAlphaBitDepth;        // how many bits for alpha channels (BD_1,2,4,8)
-    };
-    union
-    {
-        DWORD   dwRBitMask;             // mask for red bit
-        DWORD   dwYBitMask;             // mask for Y bits
-    };
-    union
-    {
-        DWORD   dwGBitMask;             // mask for green bits
-        DWORD   dwUBitMask;             // mask for U bits
-    };
-    union
-    {
-        DWORD   dwBBitMask;             // mask for blue bits
-        DWORD   dwVBitMask;             // mask for V bits
-    };
-    union
-    {
-        DWORD   dwRGBAlphaBitMask;      // mask for alpha channel
-        DWORD   dwYUVAlphaBitMask;      // mask for alpha channel
-    };
-} DDPIXELFORMAT;
-
-typedef DDPIXELFORMAT FAR* LPDDPIXELFORMAT;
-
-/*
- * DDOVERLAYFX
- */
-typedef struct _DDOVERLAYFX
-{
-    DWORD       dwSize;                         // size of structure
-    DWORD       dwAlphaEdgeBlendBitDepth;       // Bit depth used to specify constant for alpha edge blend
-    DWORD       dwAlphaEdgeBlend;               // Constant to use as alpha for edge blend
-    DWORD       dwReserved;
-    DWORD       dwAlphaDestConstBitDepth;       // Bit depth used to specify alpha constant for destination
-    union
-    {
-        DWORD   dwAlphaDestConst;               // Constant to use as alpha channel for dest
-        LPDIRECTDRAWSURFACE lpDDSAlphaDest;     // Surface to use as alpha channel for dest
-    };
-    DWORD       dwAlphaSrcConstBitDepth;        // Bit depth used to specify alpha constant for source
-    union
-    {
-        DWORD   dwAlphaSrcConst;                // Constant to use as alpha channel for src
-        LPDIRECTDRAWSURFACE lpDDSAlphaSrc;      // Surface to use as alpha channel for src
-    };
-    DDCOLORKEY  dckDestColorkey;                // DestColorkey override
-    DDCOLORKEY  dckSrcColorkey;                 // DestColorkey override
-    DWORD       dwDDFX;                         // Overlay FX
-    DWORD       dwFlags;                        // flags
-} DDOVERLAYFX;
-
-typedef DDOVERLAYFX FAR *LPDDOVERLAYFX;
-
-/*
- * DDBLTBATCH: BltBatch entry structure
- */
-typedef struct _DDBLTBATCH
-{
-    LPRECT              lprDest;
-    LPDIRECTDRAWSURFACE lpDDSSrc;
-    LPRECT              lprSrc;
-    DWORD               dwFlags;
-    LPDDBLTFX           lpDDBltFx;
-} DDBLTBATCH;
-
-typedef DDBLTBATCH FAR * LPDDBLTBATCH;
-
-/*
- * callbacks
- */
-typedef DWORD   (FAR PASCAL *LPCLIPPERCALLBACK)(LPDIRECTDRAWCLIPPER lpDDClipper, HWND hWnd, DWORD code, LPVOID lpContext );
-#ifdef STREAMING
-typedef DWORD   (FAR PASCAL *LPSURFACESTREAMINGCALLBACK)(DWORD);
-#endif
-
-
-/*
- * INTERACES FOLLOW:
- *      IDirectDraw
- *      IDirectDrawClipper
- *      IDirectDrawPalette
- *      IDirectDrawSurface
- */
-
-/*
- * IDirectDraw 
- */
-#if defined( _WIN32 ) && !defined( _NO_COM )
-#undef INTERFACE
-#define INTERFACE IDirectDraw
-DECLARE_INTERFACE_( IDirectDraw, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectDraw methods ***/
-    STDMETHOD(Compact)(THIS) PURE;
-    STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER FAR*, IUnknown FAR * ) PURE;
-    STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE FAR*, IUnknown FAR * ) PURE;
-    STDMETHOD(CreateSurface)(THIS_  LPDDSURFACEDESC, LPDIRECTDRAWSURFACE FAR *, IUnknown FAR *) PURE;
-    STDMETHOD(DuplicateSurface)( THIS_ LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE FAR * ) PURE;
-    STDMETHOD(EnumDisplayModes)( THIS_ DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK ) PURE;
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK ) PURE;
-    STDMETHOD(FlipToGDISurface)(THIS) PURE;
-    STDMETHOD(GetCaps)( THIS_ LPDDCAPS, LPDDCAPS) PURE;
-    STDMETHOD(GetDisplayMode)( THIS_ LPDDSURFACEDESC) PURE;
-    STDMETHOD(GetFourCCCodes)(THIS_  LPDWORD, LPDWORD ) PURE;
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE FAR *) PURE;
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE;
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE;
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ LPBOOL ) PURE;
-    STDMETHOD(Initialize)(THIS_ GUID FAR *) PURE;
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD) PURE;
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectDraw_QueryInterface(p, a, b)         (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirectDraw_AddRef(p)                       (p)->lpVtbl->AddRef(p)
-#define IDirectDraw_Release(p)                      (p)->lpVtbl->Release(p)
-#define IDirectDraw_Compact(p)                      (p)->lpVtbl->Compact(p)
-#define IDirectDraw_CreateClipper(p, a, b, c)       (p)->lpVtbl->CreateClipper(p, a, b, c)
-#define IDirectDraw_CreatePalette(p, a, b, c, d)    (p)->lpVtbl->CreatePalette(p, a, b, c, d)
-#define IDirectDraw_CreateSurface(p, a, b, c)       (p)->lpVtbl->CreateSurface(p, a, b, c)
-#define IDirectDraw_DuplicateSurface(p, a, b)       (p)->lpVtbl->DuplicateSurface(p, a, b)
-#define IDirectDraw_EnumDisplayModes(p, a, b, c, d) (p)->lpVtbl->EnumDisplayModes(p, a, b, c, d)
-#define IDirectDraw_EnumSurfaces(p, a, b, c, d)     (p)->lpVtbl->EnumSurfaces(p, a, b, c, d)
-#define IDirectDraw_FlipToGDISurface(p)             (p)->lpVtbl->FlipToGDISurface(p)
-#define IDirectDraw_GetCaps(p, a, b)                (p)->lpVtbl->GetCaps(p, a, b)
-#define IDirectDraw_GetDisplayMode(p, a)            (p)->lpVtbl->GetDisplayMode(p, a)
-#define IDirectDraw_GetFourCCCodes(p, a, b)         (p)->lpVtbl->GetFourCCCodes(p, a, b)
-#define IDirectDraw_GetGDISurface(p, a)             (p)->lpVtbl->GetGDISurface(p, a)
-#define IDirectDraw_GetMonitorFrequency(p, a)       (p)->lpVtbl->GetMonitorFrequency(p, a)
-#define IDirectDraw_GetScanLine(p, a)               (p)->lpVtbl->GetScanLine(p, a)
-#define IDirectDraw_GetVerticalBlankStatus(p, a)    (p)->lpVtbl->GetVerticalBlankStatus(p, a)
-#define IDirectDraw_Initialize(p, a)                (p)->lpVtbl->Initialize(p, a)
-#define IDirectDraw_RestoreDisplayMode(p)           (p)->lpVtbl->RestoreDisplayMode(p)
-#define IDirectDraw_SetCooperativeLevel(p, a, b)    (p)->lpVtbl->SetCooperativeLevel(p, a, b)
-#define IDirectDraw_SetDisplayMode(p, a, b, c)      (p)->lpVtbl->SetDisplayMode(p, a, b, c)
-#define IDirectDraw_WaitForVerticalBlank(p, a, b)   (p)->lpVtbl->WaitForVerticalBlank(p, a, b)
-#endif
-
-#endif
-
-#if defined( _WIN32 ) && !defined( _NO_COM )
-#undef INTERFACE
-#define INTERFACE IDirectDraw2
-DECLARE_INTERFACE_( IDirectDraw2, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectDraw methods ***/
-    STDMETHOD(Compact)(THIS) PURE;
-    STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER FAR*, IUnknown FAR * ) PURE;
-    STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE FAR*, IUnknown FAR * ) PURE;
-    STDMETHOD(CreateSurface)(THIS_  LPDDSURFACEDESC, LPDIRECTDRAWSURFACE FAR *, IUnknown FAR *) PURE;
-    STDMETHOD(DuplicateSurface)( THIS_ LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE FAR * ) PURE;
-    STDMETHOD(EnumDisplayModes)( THIS_ DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK ) PURE;
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK ) PURE;
-    STDMETHOD(FlipToGDISurface)(THIS) PURE;
-    STDMETHOD(GetCaps)( THIS_ LPDDCAPS, LPDDCAPS) PURE;
-    STDMETHOD(GetDisplayMode)( THIS_ LPDDSURFACEDESC) PURE;
-    STDMETHOD(GetFourCCCodes)(THIS_  LPDWORD, LPDWORD ) PURE;
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE FAR *) PURE;
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD) PURE;
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD) PURE;
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ LPBOOL ) PURE;
-    STDMETHOD(Initialize)(THIS_ GUID FAR *) PURE;
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD, DWORD, DWORD) PURE;
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
-    /*** Added in the v2 interface ***/
-    STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS, LPDWORD, LPDWORD) PURE;
-};
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectDraw2_QueryInterface(p, a, b)         (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirectDraw2_AddRef(p)                       (p)->lpVtbl->AddRef(p)
-#define IDirectDraw2_Release(p)                      (p)->lpVtbl->Release(p)
-#define IDirectDraw2_Compact(p)                      (p)->lpVtbl->Compact(p)
-#define IDirectDraw2_CreateClipper(p, a, b, c)       (p)->lpVtbl->CreateClipper(p, a, b, c)
-#define IDirectDraw2_CreatePalette(p, a, b, c, d)    (p)->lpVtbl->CreatePalette(p, a, b, c, d)
-#define IDirectDraw2_CreateSurface(p, a, b, c)       (p)->lpVtbl->CreateSurface(p, a, b, c)
-#define IDirectDraw2_DuplicateSurface(p, a, b)       (p)->lpVtbl->DuplicateSurface(p, a, b)
-#define IDirectDraw2_EnumDisplayModes(p, a, b, c, d) (p)->lpVtbl->EnumDisplayModes(p, a, b, c, d)
-#define IDirectDraw2_EnumSurfaces(p, a, b, c, d)     (p)->lpVtbl->EnumSurfaces(p, a, b, c, d)
-#define IDirectDraw2_FlipToGDISurface(p)             (p)->lpVtbl->FlipToGDISurface(p)
-#define IDirectDraw2_GetCaps(p, a, b)                (p)->lpVtbl->GetCaps(p, a, b)
-#define IDirectDraw2_GetDisplayMode(p, a)            (p)->lpVtbl->GetDisplayMode(p, a)
-#define IDirectDraw2_GetFourCCCodes(p, a, b)         (p)->lpVtbl->GetFourCCCodes(p, a, b)
-#define IDirectDraw2_GetGDISurface(p, a)             (p)->lpVtbl->GetGDISurface(p, a)
-#define IDirectDraw2_GetMonitorFrequency(p, a)       (p)->lpVtbl->GetMonitorFrequency(p, a)
-#define IDirectDraw2_GetScanLine(p, a)               (p)->lpVtbl->GetScanLine(p, a)
-#define IDirectDraw2_GetVerticalBlankStatus(p, a)    (p)->lpVtbl->GetVerticalBlankStatus(p, a)
-#define IDirectDraw2_Initialize(p, a)                (p)->lpVtbl->Initialize(p, a)
-#define IDirectDraw2_RestoreDisplayMode(p)           (p)->lpVtbl->RestoreDisplayMode(p)
-#define IDirectDraw2_SetCooperativeLevel(p, a, b)    (p)->lpVtbl->SetCooperativeLevel(p, a, b)
-#define IDirectDraw2_SetDisplayMode(p, a, b, c, d)   (p)->lpVtbl->SetDisplayMode(p, a, b, c, d)
-#define IDirectDraw2_WaitForVerticalBlank(p, a, b)   (p)->lpVtbl->WaitForVerticalBlank(p, a, b)
-#define IDirectDraw2_GetAvailableVidMem(p, a, b, c)  (p)->lpVtbl->GetAvailableVidMem(p, a, b, c)
-#endif
-
-#endif
-
-/*
- * IDirectDrawPalette
- */
-#if defined( _WIN32 ) && !defined( _NO_COM )
-#undef INTERFACE
-#define INTERFACE IDirectDrawPalette
-DECLARE_INTERFACE_( IDirectDrawPalette, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectDrawPalette methods ***/
-    STDMETHOD(GetCaps)(THIS_ LPDWORD) PURE;
-    STDMETHOD(GetEntries)(THIS_ DWORD,DWORD,DWORD,LPPALETTEENTRY) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD, LPPALETTEENTRY) PURE;
-    STDMETHOD(SetEntries)(THIS_ DWORD,DWORD,DWORD,LPPALETTEENTRY) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectDrawPalette_QueryInterface(p, a, b)      (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirectDrawPalette_AddRef(p)                    (p)->lpVtbl->AddRef(p)
-#define IDirectDrawPalette_Release(p)                   (p)->lpVtbl->Release(p)
-#define IDirectDrawPalette_GetCaps(p, a)                (p)->lpVtbl->GetCaps(p, a)
-#define IDirectDrawPalette_GetEntries(p, a, b, c, d)    (p)->lpVtbl->GetEntries(p, a, b, c, d)
-#define IDirectDrawPalette_Initialize(p, a, b, c)       (p)->lpVtbl->Initialize(p, a, b, c)
-#define IDirectDrawPalette_SetEntries(p, a, b, c, d)    (p)->lpVtbl->SetEntries(p, a, b, c, d)
-#endif
-
-#endif
-
-/*
- * IDirectDrawClipper
- */
-#if defined( _WIN32 ) && !defined( _NO_COM )
-#undef INTERFACE
-#define INTERFACE IDirectDrawClipper
-DECLARE_INTERFACE_( IDirectDrawClipper, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectDrawClipper methods ***/
-    STDMETHOD(GetClipList)(THIS_ LPRECT, LPRGNDATA, LPDWORD) PURE;
-    STDMETHOD(GetHWnd)(THIS_ HWND FAR *) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, DWORD) PURE;
-    STDMETHOD(IsClipListChanged)(THIS_ BOOL FAR *) PURE;
-    STDMETHOD(SetClipList)(THIS_ LPRGNDATA,DWORD) PURE;
-    STDMETHOD(SetHWnd)(THIS_ DWORD, HWND ) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectDrawClipper_QueryInterface(p, a, b)  (p)->lpVtbl->QueryInterface(p, a, b)
-#define IDirectDrawClipper_AddRef(p)                (p)->lpVtbl->AddRef(p)
-#define IDirectDrawClipper_Release(p)               (p)->lpVtbl->Release(p)
-#define IDirectDrawClipper_GetClipList(p, a, b, c)  (p)->lpVtbl->GetClipList(p, a, b, c)
-#define IDirectDrawClipper_GetHWnd(p, a)            (p)->lpVtbl->GetHWnd(p, a)
-#define IDirectDrawClipper_Initialize(p, a, b)      (p)->lpVtbl->Initialize(p, a, b)
-#define IDirectDrawClipper_IsClipListChanged(p, a)  (p)->lpVtbl->IsClipListChanged(p, a)
-#define IDirectDrawClipper_SetClipList(p, a, b)     (p)->lpVtbl->SetClipList(p, a, b)
-#define IDirectDrawClipper_SetHWnd(p, a, b)         (p)->lpVtbl->SetHWnd(p, a, b)
-#endif
-
-#endif
-
-/*
- * IDirectDrawSurface and related interfaces
- */
-#if defined( _WIN32 ) && !defined( _NO_COM )
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface
-DECLARE_INTERFACE_( IDirectDrawSurface, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectDrawSurface methods ***/
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE) PURE;
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
-    STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE, LPRECT,DWORD, LPDDBLTFX) PURE;
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
-    STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT,DWORD) PURE;
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE) PURE;
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE;
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE FAR *) PURE;
-    STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE;
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE;
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER FAR*) PURE;
-    STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-    STDMETHOD(GetDC)(THIS_ HDC FAR *) PURE;
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE;
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE;
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE FAR*) PURE;
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT) PURE;
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE;
-    STDMETHOD(IsLost)(THIS) PURE;
-    STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE;
-    STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
-    STDMETHOD(Restore)(THIS) PURE;
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE;
-    STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE;
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE;
-    STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectDrawSurface_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirectDrawSurface_AddRef(p)                    (p)->lpVtbl->AddRef(p)
-#define IDirectDrawSurface_Release(p)                   (p)->lpVtbl->Release(p)
-#define IDirectDrawSurface_AddAttachedSurface(p,a)      (p)->lpVtbl->AddAttachedSurface(p,a)
-#define IDirectDrawSurface_AddOverlayDirtyRect(p,a)     (p)->lpVtbl->AddOverlayDirtyRect(p,a)
-#define IDirectDrawSurface_Blt(p,a,b,c,d,e)             (p)->lpVtbl->Blt(p,a,b,c,d,e)
-#define IDirectDrawSurface_BltBatch(p,a,b,c)            (p)->lpVtbl->BltBatch(p,a,b,c)
-#define IDirectDrawSurface_BltFast(p,a,b,c,d,e)         (p)->lpVtbl->BltFast(p,a,b,c,d,e)
-#define IDirectDrawSurface_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
-#define IDirectDrawSurface_EnumAttachedSurfaces(p,a,b)  (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
-#define IDirectDrawSurface_EnumOverlayZOrders(p,a,b,c)  (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
-#define IDirectDrawSurface_Flip(p,a,b)                  (p)->lpVtbl->Flip(p,a,b)
-#define IDirectDrawSurface_GetAttachedSurface(p,a,b)    (p)->lpVtbl->GetAttachedSurface(p,a,b)
-#define IDirectDrawSurface_GetBltStatus(p,a)            (p)->lpVtbl->GetBltStatus(p,a)
-#define IDirectDrawSurface_GetCaps(p,b)                 (p)->lpVtbl->GetCaps(p,b)
-#define IDirectDrawSurface_GetClipper(p,a)              (p)->lpVtbl->GetClipper(p,a)
-#define IDirectDrawSurface_GetColorKey(p,a,b)           (p)->lpVtbl->GetColorKey(p,a,b)
-#define IDirectDrawSurface_GetDC(p,a)                   (p)->lpVtbl->GetDC(p,a)
-#define IDirectDrawSurface_GetFlipStatus(p,a)           (p)->lpVtbl->GetFlipStatus(p,a)
-#define IDirectDrawSurface_GetOverlayPosition(p,a,b)    (p)->lpVtbl->GetOverlayPosition(p,a,b)
-#define IDirectDrawSurface_GetPalette(p,a)              (p)->lpVtbl->GetPalette(p,a)
-#define IDirectDrawSurface_GetPixelFormat(p,a)          (p)->lpVtbl->GetPixelFormat(p,a)
-#define IDirectDrawSurface_GetSurfaceDesc(p,a)          (p)->lpVtbl->GetSurfaceDesc(p,a)
-#define IDirectDrawSurface_Initialize(p,a,b)            (p)->lpVtbl->Initialize(p,a,b)
-#define IDirectDrawSurface_IsLost(p)                    (p)->lpVtbl->IsLost(p)
-#define IDirectDrawSurface_Lock(p,a,b,c,d)              (p)->lpVtbl->Lock(p,a,b,c,d)
-#define IDirectDrawSurface_ReleaseDC(p,a)               (p)->lpVtbl->ReleaseDC(p,a)
-#define IDirectDrawSurface_Restore(p)                   (p)->lpVtbl->Restore(p)
-#define IDirectDrawSurface_SetClipper(p,a)              (p)->lpVtbl->SetClipper(p,a)
-#define IDirectDrawSurface_SetColorKey(p,a,b)           (p)->lpVtbl->SetColorKey(p,a,b)
-#define IDirectDrawSurface_SetOverlayPosition(p,a,b)    (p)->lpVtbl->SetOverlayPosition(p,a,b)
-#define IDirectDrawSurface_SetPalette(p,a)              (p)->lpVtbl->SetPalette(p,a)
-#define IDirectDrawSurface_Unlock(p,b)                  (p)->lpVtbl->Unlock(p,b)
-#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e)   (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
-#define IDirectDrawSurface_UpdateOverlayDisplay(p,a)    (p)->lpVtbl->UpdateOverlayDisplay(p,a)
-#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b)   (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
-#endif
-
-/*
- * IDirectDrawSurface2 and related interfaces
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface2
-DECLARE_INTERFACE_( IDirectDrawSurface2, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID FAR * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectDrawSurface methods ***/
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2) PURE;
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
-    STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE2, LPRECT,DWORD, LPDDBLTFX) PURE;
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
-    STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE2, LPRECT,DWORD) PURE;
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE2) PURE;
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE2, DWORD) PURE;
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE2 FAR *) PURE;
-    STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE;
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS) PURE;
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER FAR*) PURE;
-    STDMETHOD(GetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-    STDMETHOD(GetDC)(THIS_ HDC FAR *) PURE;
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD) PURE;
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG, LPLONG ) PURE;
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE FAR*) PURE;
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT) PURE;
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW, LPDDSURFACEDESC) PURE;
-    STDMETHOD(IsLost)(THIS) PURE;
-    STDMETHOD(Lock)(THIS_ LPRECT,LPDDSURFACEDESC,DWORD,HANDLE) PURE;
-    STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
-    STDMETHOD(Restore)(THIS) PURE;
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER) PURE;
-    STDMETHOD(SetColorKey)(THIS_ DWORD, LPDDCOLORKEY) PURE;
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG, LONG ) PURE;
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE) PURE;
-    STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE2,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE2) PURE;
-    /*** Added in the v2 interface ***/
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID FAR *) PURE;
-    STDMETHOD(PageLock)(THIS_ DWORD) PURE;
-    STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectDrawSurface2_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirectDrawSurface2_AddRef(p)                    (p)->lpVtbl->AddRef(p)
-#define IDirectDrawSurface2_Release(p)                   (p)->lpVtbl->Release(p)
-#define IDirectDrawSurface2_AddAttachedSurface(p,a)      (p)->lpVtbl->AddAttachedSurface(p,a)
-#define IDirectDrawSurface2_AddOverlayDirtyRect(p,a)     (p)->lpVtbl->AddOverlayDirtyRect(p,a)
-#define IDirectDrawSurface2_Blt(p,a,b,c,d,e)             (p)->lpVtbl->Blt(p,a,b,c,d,e)
-#define IDirectDrawSurface2_BltBatch(p,a,b,c)            (p)->lpVtbl->BltBatch(p,a,b,c)
-#define IDirectDrawSurface2_BltFast(p,a,b,c,d,e)         (p)->lpVtbl->BltFast(p,a,b,c,d,e)
-#define IDirectDrawSurface2_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
-#define IDirectDrawSurface2_EnumAttachedSurfaces(p,a,b)  (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
-#define IDirectDrawSurface2_EnumOverlayZOrders(p,a,b,c)  (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
-#define IDirectDrawSurface2_Flip(p,a,b)                  (p)->lpVtbl->Flip(p,a,b)
-#define IDirectDrawSurface2_GetAttachedSurface(p,a,b)    (p)->lpVtbl->GetAttachedSurface(p,a,b)
-#define IDirectDrawSurface2_GetBltStatus(p,a)            (p)->lpVtbl->GetBltStatus(p,a)
-#define IDirectDrawSurface2_GetCaps(p,b)                 (p)->lpVtbl->GetCaps(p,b)
-#define IDirectDrawSurface2_GetClipper(p,a)              (p)->lpVtbl->GetClipper(p,a)
-#define IDirectDrawSurface2_GetColorKey(p,a,b)           (p)->lpVtbl->GetColorKey(p,a,b)
-#define IDirectDrawSurface2_GetDC(p,a)                   (p)->lpVtbl->GetDC(p,a)
-#define IDirectDrawSurface2_GetFlipStatus(p,a)           (p)->lpVtbl->GetFlipStatus(p,a)
-#define IDirectDrawSurface2_GetOverlayPosition(p,a,b)    (p)->lpVtbl->GetOverlayPosition(p,a,b)
-#define IDirectDrawSurface2_GetPalette(p,a)              (p)->lpVtbl->GetPalette(p,a)
-#define IDirectDrawSurface2_GetPixelFormat(p,a)          (p)->lpVtbl->GetPixelFormat(p,a)
-#define IDirectDrawSurface2_GetSurfaceDesc(p,a)          (p)->lpVtbl->GetSurfaceDesc(p,a)
-#define IDirectDrawSurface2_Initialize(p,a,b)            (p)->lpVtbl->Initialize(p,a,b)
-#define IDirectDrawSurface2_IsLost(p)                    (p)->lpVtbl->IsLost(p)
-#define IDirectDrawSurface2_Lock(p,a,b,c,d)              (p)->lpVtbl->Lock(p,a,b,c,d)
-#define IDirectDrawSurface2_ReleaseDC(p,a)               (p)->lpVtbl->ReleaseDC(p,a)
-#define IDirectDrawSurface2_Restore(p)                   (p)->lpVtbl->Restore(p)
-#define IDirectDrawSurface2_SetClipper(p,a)              (p)->lpVtbl->SetClipper(p,a)
-#define IDirectDrawSurface2_SetColorKey(p,a,b)           (p)->lpVtbl->SetColorKey(p,a,b)
-#define IDirectDrawSurface2_SetOverlayPosition(p,a,b)    (p)->lpVtbl->SetOverlayPosition(p,a,b)
-#define IDirectDrawSurface2_SetPalette(p,a)              (p)->lpVtbl->SetPalette(p,a)
-#define IDirectDrawSurface2_Unlock(p,b)                  (p)->lpVtbl->Unlock(p,b)
-#define IDirectDrawSurface2_UpdateOverlay(p,a,b,c,d,e)   (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
-#define IDirectDrawSurface2_UpdateOverlayDisplay(p,a)    (p)->lpVtbl->UpdateOverlayDisplay(p,a)
-#define IDirectDrawSurface2_UpdateOverlayZOrder(p,a,b)   (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
-#define IDirectDrawSurface2_GetDDInterface(p,a)          (p)->lpVtbl->GetDDInterface(p,a)
-#define IDirectDrawSurface2_PageLock(p,a)                (p)->lpVtbl->PageLock(p,a)
-#define IDirectDrawSurface2_PageUnlock(p,a)              (p)->lpVtbl->PageUnlock(p,a)
-#endif
-
-
-#endif
-
-
-/*
- * DDSURFACEDESC
- */
-typedef struct _DDSURFACEDESC
-{
-    DWORD               dwSize;                 // size of the DDSURFACEDESC structure
-    DWORD               dwFlags;                // determines what fields are valid
-    DWORD               dwHeight;               // height of surface to be created
-    DWORD               dwWidth;                // width of input surface
-    LONG                lPitch;                 // distance to start of next line (return value only)
-    DWORD               dwBackBufferCount;      // number of back buffers requested
-    union
-    {
-        DWORD           dwMipMapCount;          // number of mip-map levels requested
-        DWORD           dwZBufferBitDepth;      // depth of Z buffer requested
-        DWORD           dwRefreshRate;          // refresh rate (used when display mode is described)
-    };
-    DWORD               dwAlphaBitDepth;        // depth of alpha buffer requested
-    DWORD               dwReserved;             // reserved
-    LPVOID              lpSurface;              // pointer to the associated surface memory
-    DDCOLORKEY          ddckCKDestOverlay;      // color key for destination overlay use
-    DDCOLORKEY          ddckCKDestBlt;          // color key for destination blt use
-    DDCOLORKEY          ddckCKSrcOverlay;       // color key for source overlay use
-    DDCOLORKEY          ddckCKSrcBlt;           // color key for source blt use
-    DDPIXELFORMAT       ddpfPixelFormat;        // pixel format description of the surface
-    DDSCAPS             ddsCaps;                // direct draw surface capabilities
-} DDSURFACEDESC;
-
-/*
- * ddsCaps field is valid.
- */
-#define DDSD_CAPS               0x00000001l     // default
-
-/*
- * dwHeight field is valid.
- */
-#define DDSD_HEIGHT             0x00000002l
-
-/*
- * dwWidth field is valid.
- */
-#define DDSD_WIDTH              0x00000004l
-
-/*
- * lPitch is valid.
- */
-#define DDSD_PITCH              0x00000008l
-
-/*
- * dwBackBufferCount is valid.
- */
-#define DDSD_BACKBUFFERCOUNT    0x00000020l
-
-/*
- * dwZBufferBitDepth is valid.
- */
-#define DDSD_ZBUFFERBITDEPTH    0x00000040l
-
-/*
- * dwAlphaBitDepth is valid.
- */
-#define DDSD_ALPHABITDEPTH      0x00000080l
-
-
-
-/*
- * ddpfPixelFormat is valid.
- */
-#define DDSD_PIXELFORMAT        0x00001000l
-
-/*
- * ddckCKDestOverlay is valid.
- */
-#define DDSD_CKDESTOVERLAY      0x00002000l
-
-/*
- * ddckCKDestBlt is valid.
- */
-#define DDSD_CKDESTBLT          0x00004000l
-
-/*
- * ddckCKSrcOverlay is valid.
- */
-#define DDSD_CKSRCOVERLAY       0x00008000l
-
-/*
- * ddckCKSrcBlt is valid.
- */
-#define DDSD_CKSRCBLT           0x00010000l
-
-/*
- * dwMipMapCount is valid.
- */
-#define DDSD_MIPMAPCOUNT        0x00020000l
-
- /*
-  * dwRefreshRate is valid
-  */
-#define DDSD_REFRESHRATE        0x00040000l
-
-
-/*
- * All input fields are valid. 
- */
-#define DDSD_ALL                0x0007f9eel
-
-
-/*============================================================================
- *
- * Direct Draw Capability Flags
- *
- * These flags are used to describe the capabilities of a given Surface.
- * All flags are bit flags. 
- *
- *==========================================================================*/
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE CAPABILITY FLAGS
- *
- ****************************************************************************/
-/*
- * This bit currently has no meaning.
- */
-#define DDSCAPS_3D                              0x00000001l
-
-/*
- * Indicates that this surface contains alpha information.  The pixel
- * format must be interrogated to determine whether this surface
- * contains only alpha information or alpha information interlaced
- * with pixel color data (e.g. RGBA or YUVA).
- */
-#define DDSCAPS_ALPHA                           0x00000002l
-
-/*
- * Indicates that this surface is a backbuffer.  It is generally
- * set by CreateSurface when the DDSCAPS_FLIP capability bit is set.
- * It indicates that this surface is THE back buffer of a surface
- * flipping structure.  DirectDraw supports N surfaces in a
- * surface flipping structure.  Only the surface that immediately
- * precedeces the DDSCAPS_FRONTBUFFER has this capability bit set.
- * The other surfaces are identified as back buffers by the presence
- * of the DDSCAPS_FLIP capability, their attachment order, and the
- * absence of the DDSCAPS_FRONTBUFFER and DDSCAPS_BACKBUFFER
- * capabilities.  The bit is sent to CreateSurface when a standalone
- * back buffer is being created.  This surface could be attached to
- * a front buffer and/or back buffers to form a flipping surface
- * structure after the CreateSurface call.  See AddAttachments for
- * a detailed description of the behaviors in this case.
- */
-#define DDSCAPS_BACKBUFFER                      0x00000004l
-
-/*
- * Indicates a complex surface structure is being described.  A
- * complex surface structure results in the creation of more than
- * one surface.  The additional surfaces are attached to the root
- * surface.  The complex structure can only be destroyed by
- * destroying the root.
- */
-#define DDSCAPS_COMPLEX                         0x00000008l
-
-/*
- * Indicates that this surface is a part of a surface flipping structure.
- * When it is passed to CreateSurface the DDSCAPS_FRONTBUFFER and
- * DDSCAP_BACKBUFFER bits are not set.  They are set by CreateSurface
- * on the resulting creations.  The dwBackBufferCount field in the
- * DDSURFACEDESC structure must be set to at least 1 in order for
- * the CreateSurface call to succeed.  The DDSCAPS_COMPLEX capability
- * must always be set with creating multiple surfaces through CreateSurface.
- */
-#define DDSCAPS_FLIP                            0x00000010l
-
-/*
- * Indicates that this surface is THE front buffer of a surface flipping
- * structure.  It is generally set by CreateSurface when the DDSCAPS_FLIP
- * capability bit is set.
- * If this capability is sent to CreateSurface then a standalonw front buffer
- * is created.  This surface will not have the DDSCAPS_FLIP capability.
- * It can be attached to other back buffers to form a flipping structure.
- * See AddAttachments for a detailed description of the behaviors in this
- * case.
- */
-#define DDSCAPS_FRONTBUFFER                     0x00000020l
-
-/*
- * Indicates that this surface is any offscreen surface that is not an overlay,
- * texture, zbuffer, front buffer, back buffer, or alpha surface.  It is used
- * to identify plain vanilla surfaces.
- */
-#define DDSCAPS_OFFSCREENPLAIN                  0x00000040l
-
-/*
- * Indicates that this surface is an overlay.  It may or may not be directly visible
- * depending on whether or not it is currently being overlayed onto the primary 
- * surface.  DDSCAPS_VISIBLE can be used to determine whether or not it is being 
- * overlayed at the moment. 
- */
-#define DDSCAPS_OVERLAY                         0x00000080l
-
-/*
- * Indicates that unique DirectDrawPalette objects can be created and
- * attached to this surface.
- */
-#define DDSCAPS_PALETTE                         0x00000100l
-
-/*
- * Indicates that this surface is the primary surface.  The primary
- * surface represents what the user is seeing at the moment.
- */
-#define DDSCAPS_PRIMARYSURFACE                  0x00000200l
-
-/*
- * Indicates that this surface is the primary surface for the left eye.
- * The primary surface for the left eye represents what the user is seeing
- * at the moment with the users left eye.  When this surface is created the
- * DDSCAPS_PRIMARYSURFACE represents what the user is seeing with the users
- * right eye.
- */
-#define DDSCAPS_PRIMARYSURFACELEFT              0x00000400l
-
-/*
- * Indicates that this surface memory was allocated in system memory
- */
-#define DDSCAPS_SYSTEMMEMORY                    0x00000800l
-
-/*
- * Indicates that this surface can be used as a 3D texture.  It does not
- * indicate whether or not the surface is being used for that purpose.
- */
-#define DDSCAPS_TEXTURE                         0x00001000l
-
-/*
- * Indicates that a surface may be a destination for 3D rendering.  This
- * bit must be set in order to query for a Direct3D Device Interface 
- * from this surface.
- */
-#define DDSCAPS_3DDEVICE                        0x00002000l
-
-/*
- * Indicates that this surface exists in video memory.
- */
-#define DDSCAPS_VIDEOMEMORY                     0x00004000l
-
-/*
- * Indicates that changes made to this surface are immediately visible.  
- * It is always set for the primary surface and is set for overlays while
- * they are being overlayed and texture maps while they are being textured.
- */
-#define DDSCAPS_VISIBLE                         0x00008000l
-
-/*
- * Indicates that only writes are permitted to the surface.  Read accesses 
- * from the surface may or may not generate a protection fault, but the 
- * results of a read from this surface will not be meaningful.  READ ONLY.
- */
-#define DDSCAPS_WRITEONLY                       0x00010000l
-
-/*
- * Indicates that this surface is a z buffer. A z buffer does not contain
- * displayable information.  Instead it contains bit depth information that is
- * used to determine which pixels are visible and which are obscured. 
- */
-#define DDSCAPS_ZBUFFER                         0x00020000l
-
-/*
- * Indicates surface will have a DC associated long term
- */
-#define DDSCAPS_OWNDC                           0x00040000l
-
-/*
- * Indicates surface should be able to receive live video
- */
-#define DDSCAPS_LIVEVIDEO                       0x00080000l
-
-/*
- * Indicates surface should be able to have a stream decompressed
- * to it by the hardware.
- */
-#define DDSCAPS_HWCODEC                         0x00100000l
-
-/*
- * Surface is a 320x200 or 320x240 ModeX surface
- */
-#define DDSCAPS_MODEX                           0x00200000l
-
-/*
- * Indicates surface is one level of a mip-map. This surface will
- * be attached to other DDSCAPS_MIPMAP surfaces to form the mip-map.
- * This can be done explicitly, by creating a number of surfaces and
- * attaching them with AddAttachedSurface or by implicitly by CreateSurface.
- * If this bit is set then DDSCAPS_TEXTURE must also be set.
- */
-#define DDSCAPS_MIPMAP                          0x00400000l
-
-
-
-/*
- * Indicates that memory for the surface is not allocated until the surface
- * is loaded (via the Direct3D texture Load() function).
- */
-#define DDSCAPS_ALLOCONLOAD                     0x04000000l
-
-
-
- /****************************************************************************
- *
- * DIRECTDRAW DRIVER CAPABILITY FLAGS
- *
- ****************************************************************************/
-
-/*
- * Display hardware has 3D acceleration.
- */
-#define DDCAPS_3D                       0x00000001l
-
-/*
- * Indicates that DirectDraw will support only dest rectangles that are aligned
- * on DIRECTDRAWCAPS.dwAlignBoundaryDest boundaries of the surface, respectively.
- * READ ONLY.
- */
-#define DDCAPS_ALIGNBOUNDARYDEST        0x00000002l
-
-/*
- * Indicates that DirectDraw will support only source rectangles  whose sizes in 
- * BYTEs are DIRECTDRAWCAPS.dwAlignSizeDest multiples, respectively.  READ ONLY.
- */
-#define DDCAPS_ALIGNSIZEDEST            0x00000004l
-/*
- * Indicates that DirectDraw will support only source rectangles that are aligned
- * on DIRECTDRAWCAPS.dwAlignBoundarySrc boundaries of the surface, respectively.
- * READ ONLY.
- */
-#define DDCAPS_ALIGNBOUNDARYSRC         0x00000008l
-
-/*
- * Indicates that DirectDraw will support only source rectangles  whose sizes in 
- * BYTEs are DIRECTDRAWCAPS.dwAlignSizeSrc multiples, respectively.  READ ONLY.
- */
-#define DDCAPS_ALIGNSIZESRC             0x00000010l
-
-/*
- * Indicates that DirectDraw will create video memory surfaces that have a stride 
- * alignment equal to DIRECTDRAWCAPS.dwAlignStride.  READ ONLY.
- */
-#define DDCAPS_ALIGNSTRIDE              0x00000020l
-
-/*
- * Display hardware is capable of blt operations.
- */
-#define DDCAPS_BLT                      0x00000040l
-
-/*
- * Display hardware is capable of asynchronous blt operations.
- */
-#define DDCAPS_BLTQUEUE                 0x00000080l
-
-/*
- * Display hardware is capable of color space conversions during the blt operation.
- */
-#define DDCAPS_BLTFOURCC                0x00000100l
-
-/*
- * Display hardware is capable of stretching during blt operations.
- */
-#define DDCAPS_BLTSTRETCH               0x00000200l
-
-/*
- * Display hardware is shared with GDI.
- */
-#define DDCAPS_GDI                      0x00000400l
-
-/*
- * Display hardware can overlay.
- */
-#define DDCAPS_OVERLAY                  0x00000800l
-
-/*
- * Set if display hardware supports overlays but can not clip them.
- */
-#define DDCAPS_OVERLAYCANTCLIP          0x00001000l
-
-/*
- * Indicates that overlay hardware is capable of color space conversions during
- * the overlay operation.
- */
-#define DDCAPS_OVERLAYFOURCC            0x00002000l
-
-/*
- * Indicates that stretching can be done by the overlay hardware.
- */
-#define DDCAPS_OVERLAYSTRETCH           0x00004000l
-
-/*
- * Indicates that unique DirectDrawPalettes can be created for DirectDrawSurfaces
- * other than the primary surface.
- */
-#define DDCAPS_PALETTE                  0x00008000l
-
-/*
- * Indicates that palette changes can be syncd with the veritcal refresh.
- */
-#define DDCAPS_PALETTEVSYNC             0x00010000l
-
-/*
- * Display hardware can return the current scan line.
- */
-#define DDCAPS_READSCANLINE             0x00020000l
-
-/*
- * Display hardware has stereo vision capabilities.  DDSCAPS_PRIMARYSURFACELEFT 
- * can be created.
- */
-#define DDCAPS_STEREOVIEW               0x00040000l
-
-/*
- * Display hardware is capable of generating a vertical blank interrupt.
- */
-#define DDCAPS_VBI                      0x00080000l
-
-/*
- * Supports the use of z buffers with blt operations.
- */
-#define DDCAPS_ZBLTS                    0x00100000l
-
-/*
- * Supports Z Ordering of overlays.
- */
-#define DDCAPS_ZOVERLAYS                0x00200000l
-
-/*
- * Supports color key
- */
-#define DDCAPS_COLORKEY                 0x00400000l
-
-/*
- * Supports alpha surfaces
- */
-#define DDCAPS_ALPHA                    0x00800000l
-
-/*
- * colorkey is hardware assisted(DDCAPS_COLORKEY will also be set)
- */
-#define DDCAPS_COLORKEYHWASSIST         0x01000000l
-
-/*
- * no hardware support at all
- */
-#define DDCAPS_NOHARDWARE               0x02000000l
-
-/*
- * Display hardware is capable of color fill with bltter
- */
-#define DDCAPS_BLTCOLORFILL             0x04000000l
-
-/*
- * Display hardware is bank switched, and potentially very slow at
- * random access to VRAM.
- */
-#define DDCAPS_BANKSWITCHED             0x08000000l
-
-/*
- * Display hardware is capable of depth filling Z-buffers with bltter
- */
-#define DDCAPS_BLTDEPTHFILL             0x10000000l
-
-/*
- * Display hardware is capable of clipping while bltting.
- */
-#define DDCAPS_CANCLIP                  0x20000000l
-
-/*
- * Display hardware is capable of clipping while stretch bltting.
- */
-#define DDCAPS_CANCLIPSTRETCHED         0x40000000l
-
-/*
- * Display hardware is capable of bltting to or from system memory
- */
-#define DDCAPS_CANBLTSYSMEM             0x80000000l
-
-
- /****************************************************************************
- *
- * MORE DIRECTDRAW DRIVER CAPABILITY FLAGS (dwCaps2)
- *
- ****************************************************************************/
-
-/*
- * Display hardware is certified
- */
-#define DDCAPS2_CERTIFIED               0x00000001l
-
-/*
- * Driver cannot interleave 2D operations (lock and blt) to surfaces with
- * Direct3D rendering operations between calls to BeginScene() and EndScene()
- */
-#define DDCAPS2_NO2DDURING3DSCENE       0x00000002l
-
-/****************************************************************************
- *
- * DIRECTDRAW FX ALPHA CAPABILITY FLAGS
- *
- ****************************************************************************/
-
-/*
- * Supports alpha blending around the edge of a source color keyed surface.
- * For Blt.
- */
-#define DDFXALPHACAPS_BLTALPHAEDGEBLEND         0x00000001l
-
-/*
- * Supports alpha information in the pixel format.  The bit depth of alpha 
- * information in the pixel format can be 1,2,4, or 8.  The alpha value becomes
- * more opaque as the alpha value increases.  (0 is transparent.)
- * For Blt.
- */
-#define DDFXALPHACAPS_BLTALPHAPIXELS            0x00000002l
-
-/*
- * Supports alpha information in the pixel format.  The bit depth of alpha 
- * information in the pixel format can be 1,2,4, or 8.  The alpha value 
- * becomes more transparent as the alpha value increases.  (0 is opaque.) 
- * This flag can only be set if DDCAPS_ALPHA is set.
- * For Blt.
- */
-#define DDFXALPHACAPS_BLTALPHAPIXELSNEG         0x00000004l
-
-/*
- * Supports alpha only surfaces.  The bit depth of an alpha only surface can be
- * 1,2,4, or 8.  The alpha value becomes more opaque as the alpha value increases.
- * (0 is transparent.)
- * For Blt.
- */
-#define DDFXALPHACAPS_BLTALPHASURFACES          0x00000008l
-
-/*
- * The depth of the alpha channel data can range can be 1,2,4, or 8.  
- * The NEG suffix indicates that this alpha channel becomes more transparent
- * as the alpha value increases. (0 is opaque.)  This flag can only be set if
- * DDCAPS_ALPHA is set.
- * For Blt.
- */
-#define DDFXALPHACAPS_BLTALPHASURFACESNEG       0x00000010l
-
-/*
- * Supports alpha blending around the edge of a source color keyed surface.
- * For Overlays.
- */
-#define DDFXALPHACAPS_OVERLAYALPHAEDGEBLEND     0x00000020l
-
-/*
- * Supports alpha information in the pixel format.  The bit depth of alpha 
- * information in the pixel format can be 1,2,4, or 8.  The alpha value becomes
- * more opaque as the alpha value increases.  (0 is transparent.)
- * For Overlays.
- */
-#define DDFXALPHACAPS_OVERLAYALPHAPIXELS        0x00000040l
-
-/*
- * Supports alpha information in the pixel format.  The bit depth of alpha 
- * information in the pixel format can be 1,2,4, or 8.  The alpha value 
- * becomes more transparent as the alpha value increases.  (0 is opaque.) 
- * This flag can only be set if DDCAPS_ALPHA is set.
- * For Overlays.
- */
-#define DDFXALPHACAPS_OVERLAYALPHAPIXELSNEG     0x00000080l
-
-/*
- * Supports alpha only surfaces.  The bit depth of an alpha only surface can be
- * 1,2,4, or 8.  The alpha value becomes more opaque as the alpha value increases.
- * (0 is transparent.)
- * For Overlays.
- */
-#define DDFXALPHACAPS_OVERLAYALPHASURFACES      0x00000100l
-
-/*
- * The depth of the alpha channel data can range can be 1,2,4, or 8.  
- * The NEG suffix indicates that this alpha channel becomes more transparent
- * as the alpha value increases. (0 is opaque.)  This flag can only be set if
- * DDCAPS_ALPHA is set.
- * For Overlays.
- */
-#define DDFXALPHACAPS_OVERLAYALPHASURFACESNEG   0x00000200l
-
-/****************************************************************************
- *
- * DIRECTDRAW FX CAPABILITY FLAGS
- *
- ****************************************************************************/
-
-/*
- * Uses arithmetic operations to stretch and shrink surfaces during blt
- * rather than pixel doubling techniques.  Along the Y axis.
- */
-#define DDFXCAPS_BLTARITHSTRETCHY       0x00000020l
-
-/*
- * Uses arithmetic operations to stretch during blt
- * rather than pixel doubling techniques.  Along the Y axis. Only
- * works for x1, x2, etc.
- */
-#define DDFXCAPS_BLTARITHSTRETCHYN      0x00000010l
-
-/*
- * Supports mirroring left to right in blt.
- */
-#define DDFXCAPS_BLTMIRRORLEFTRIGHT     0x00000040l
-
-/*
- * Supports mirroring top to bottom in blt.
- */
-#define DDFXCAPS_BLTMIRRORUPDOWN        0x00000080l
-
-/*
- * Supports arbitrary rotation for blts.
- */
-#define DDFXCAPS_BLTROTATION            0x00000100l
-
-/*
- * Supports 90 degree rotations for blts.
- */
-#define DDFXCAPS_BLTROTATION90          0x00000200l
-
-/*
- * DirectDraw supports arbitrary shrinking of a surface along the
- * x axis (horizontal direction) for blts.
- */
-#define DDFXCAPS_BLTSHRINKX             0x00000400l
-
-/*
- * DirectDraw supports integer shrinking (1x,2x,) of a surface
- * along the x axis (horizontal direction) for blts.
- */
-#define DDFXCAPS_BLTSHRINKXN            0x00000800l
-
-/*
- * DirectDraw supports arbitrary shrinking of a surface along the
- * y axis (horizontal direction) for blts.  
- */
-#define DDFXCAPS_BLTSHRINKY             0x00001000l
-
-/*
- * DirectDraw supports integer shrinking (1x,2x,) of a surface
- * along the y axis (vertical direction) for blts.  
- */
-#define DDFXCAPS_BLTSHRINKYN            0x00002000l
-
-/*
- * DirectDraw supports arbitrary stretching of a surface along the
- * x axis (horizontal direction) for blts.
- */
-#define DDFXCAPS_BLTSTRETCHX            0x00004000l
-
-/*
- * DirectDraw supports integer stretching (1x,2x,) of a surface
- * along the x axis (horizontal direction) for blts.
- */
-#define DDFXCAPS_BLTSTRETCHXN           0x00008000l
-
-/*
- * DirectDraw supports arbitrary stretching of a surface along the
- * y axis (horizontal direction) for blts.  
- */
-#define DDFXCAPS_BLTSTRETCHY            0x00010000l
-
-/*
- * DirectDraw supports integer stretching (1x,2x,) of a surface
- * along the y axis (vertical direction) for blts.  
- */
-#define DDFXCAPS_BLTSTRETCHYN           0x00020000l
-
-/*
- * Uses arithmetic operations to stretch and shrink surfaces during 
- * overlay rather than pixel doubling techniques.  Along the Y axis 
- * for overlays.
- */
-#define DDFXCAPS_OVERLAYARITHSTRETCHY   0x00040000l
-
-/*
- * Uses arithmetic operations to stretch surfaces during 
- * overlay rather than pixel doubling techniques.  Along the Y axis 
- * for overlays. Only works for x1, x2, etc.
- */
-#define DDFXCAPS_OVERLAYARITHSTRETCHYN  0x00000008l
-
-/*
- * DirectDraw supports arbitrary shrinking of a surface along the
- * x axis (horizontal direction) for overlays.
- */
-#define DDFXCAPS_OVERLAYSHRINKX         0x00080000l
-
-/*
- * DirectDraw supports integer shrinking (1x,2x,) of a surface
- * along the x axis (horizontal direction) for overlays.
- */
-#define DDFXCAPS_OVERLAYSHRINKXN        0x00100000l
-
-/*
- * DirectDraw supports arbitrary shrinking of a surface along the
- * y axis (horizontal direction) for overlays.  
- */
-#define DDFXCAPS_OVERLAYSHRINKY         0x00200000l
-
-/*
- * DirectDraw supports integer shrinking (1x,2x,) of a surface
- * along the y axis (vertical direction) for overlays.  
- */
-#define DDFXCAPS_OVERLAYSHRINKYN        0x00400000l
-
-/*
- * DirectDraw supports arbitrary stretching of a surface along the
- * x axis (horizontal direction) for overlays.
- */
-#define DDFXCAPS_OVERLAYSTRETCHX        0x00800000l
-
-/*
- * DirectDraw supports integer stretching (1x,2x,) of a surface
- * along the x axis (horizontal direction) for overlays.
- */
-#define DDFXCAPS_OVERLAYSTRETCHXN       0x01000000l
-
-/*
- * DirectDraw supports arbitrary stretching of a surface along the
- * y axis (horizontal direction) for overlays.  
- */
-#define DDFXCAPS_OVERLAYSTRETCHY        0x02000000l
-
-/*
- * DirectDraw supports integer stretching (1x,2x,) of a surface
- * along the y axis (vertical direction) for overlays.  
- */
-#define DDFXCAPS_OVERLAYSTRETCHYN       0x04000000l
-
-/*
- * DirectDraw supports mirroring of overlays across the vertical axis
- */
-#define DDFXCAPS_OVERLAYMIRRORLEFTRIGHT 0x08000000l
-
-/*
- * DirectDraw supports mirroring of overlays across the horizontal axis
- */
-#define DDFXCAPS_OVERLAYMIRRORUPDOWN    0x10000000l
-
-/****************************************************************************
- *
- * DIRECTDRAW STEREO VIEW CAPABILITIES
- *
- ****************************************************************************/
-
-/*
- * The stereo view is accomplished via enigma encoding.
- */
-#define DDSVCAPS_ENIGMA                 0x00000001l
-
-/*
- * The stereo view is accomplished via high frequency flickering.
- */
-#define DDSVCAPS_FLICKER                0x00000002l
-
-/*
- * The stereo view is accomplished via red and blue filters applied
- * to the left and right eyes.  All images must adapt their colorspaces
- * for this process.
- */
-#define DDSVCAPS_REDBLUE                0x00000004l
-
-/*
- * The stereo view is accomplished with split screen technology.
- */
-#define DDSVCAPS_SPLIT                  0x00000008l
-
-/****************************************************************************
- *
- * DIRECTDRAWPALETTE CAPABILITIES
- *
- ****************************************************************************/
-
-/*
- * Index is 4 bits.  There are sixteen color entries in the palette table.
- */
-#define DDPCAPS_4BIT                    0x00000001l
-
-/*
- * Index is onto a 8 bit color index.  This field is only valid with the
- * DDPCAPS_1BIT, DDPCAPS_2BIT or DDPCAPS_4BIT capability and the target
- * surface is in 8bpp. Each color entry is one byte long and is an index
- * into destination surface's 8bpp palette.
- */
-#define DDPCAPS_8BITENTRIES             0x00000002l
-
-/*
- * Index is 8 bits.  There are 256 color entries in the palette table.
- */
-#define DDPCAPS_8BIT                    0x00000004l
-
-/*
- * Indicates that this DIRECTDRAWPALETTE should use the palette color array
- * passed into the lpDDColorArray parameter to initialize the DIRECTDRAWPALETTE
- * object.
- */
-#define DDPCAPS_INITIALIZE              0x00000008l
-
-/*
- * This palette is the one attached to the primary surface.  Changing this
- * table has immediate effect on the display unless DDPSETPAL_VSYNC is specified
- * and supported.
- */
-#define DDPCAPS_PRIMARYSURFACE          0x00000010l
-
-/*
- * This palette is the one attached to the primary surface left.  Changing
- * this table has immediate effect on the display for the left eye unless
- * DDPSETPAL_VSYNC is specified and supported.
- */
-#define DDPCAPS_PRIMARYSURFACELEFT      0x00000020l
-
-/*
- * This palette can have all 256 entries defined
- */
-#define DDPCAPS_ALLOW256                0x00000040l
-
-/*
- * This palette can have modifications to it synced with the monitors
- * refresh rate.
- */
-#define DDPCAPS_VSYNC                   0x00000080l
-
-/*
- * Index is 1 bit.  There are two color entries in the palette table.
- */
-#define DDPCAPS_1BIT                    0x00000100l
-
-/*
- * Index is 2 bit.  There are four color entries in the palette table.
- */
-#define DDPCAPS_2BIT                    0x00000200l
-
-
-/****************************************************************************
- *
- * DIRECTDRAWPALETTE SETENTRY CONSTANTS
- *
- ****************************************************************************/
-
-
-/****************************************************************************
- *
- * DIRECTDRAWPALETTE GETENTRY CONSTANTS
- *
- ****************************************************************************/
-
-/* 0 is the only legal value */
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE SETPALETTE CONSTANTS
- *
- ****************************************************************************/
-
-
-/****************************************************************************
- *
- * DIRECTDRAW BITDEPTH CONSTANTS
- *
- * NOTE:  These are only used to indicate supported bit depths.   These
- * are flags only, they are not to be used as an actual bit depth.   The
- * absolute numbers 1, 2, 4, 8, 16, 24 and 32 are used to indicate actual
- * bit depths in a surface or for changing the display mode.
- *
- ****************************************************************************/
-
-/*
- * 1 bit per pixel.
- */
-#define DDBD_1                  0x00004000l
-
-/*
- * 2 bits per pixel.
- */
-#define DDBD_2                  0x00002000l
-
-/*
- * 4 bits per pixel.
- */
-#define DDBD_4                  0x00001000l
-
-/*
- * 8 bits per pixel.
- */
-#define DDBD_8                  0x00000800l
-
-/*
- * 16 bits per pixel.
- */
-#define DDBD_16                 0x00000400l
-
-/*
- * 24 bits per pixel.
- */
-#define DDBD_24                 0X00000200l
-
-/*
- * 32 bits per pixel.
- */
-#define DDBD_32                 0x00000100l
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE SET/GET COLOR KEY FLAGS
- *
- ****************************************************************************/
-
-/*
- * Set if the structure contains a color space.  Not set if the structure
- * contains a single color key.
- */
-#define DDCKEY_COLORSPACE       0x00000001l
-
-/*
- * Set if the structure specifies a color key or color space which is to be
- * used as a destination color key for blt operations.
- */
-#define DDCKEY_DESTBLT          0x00000002l
-
-/*
- * Set if the structure specifies a color key or color space which is to be
- * used as a destination color key for overlay operations.
- */
-#define DDCKEY_DESTOVERLAY      0x00000004l
-
-/*
- * Set if the structure specifies a color key or color space which is to be
- * used as a source color key for blt operations.
- */
-#define DDCKEY_SRCBLT           0x00000008l
-
-/*
- * Set if the structure specifies a color key or color space which is to be
- * used as a source color key for overlay operations.
- */
-#define DDCKEY_SRCOVERLAY       0x00000010l
-
-
-/****************************************************************************
- *
- * DIRECTDRAW COLOR KEY CAPABILITY FLAGS
- *
- ****************************************************************************/
-
-/*
- * Supports transparent blting using a color key to identify the replaceable 
- * bits of the destination surface for RGB colors.
- */
-#define DDCKEYCAPS_DESTBLT                      0x00000001l
-
-/*
- * Supports transparent blting using a color space to identify the replaceable
- * bits of the destination surface for RGB colors.
- */
-#define DDCKEYCAPS_DESTBLTCLRSPACE              0x00000002l
-
-/*
- * Supports transparent blting using a color space to identify the replaceable
- * bits of the destination surface for YUV colors.
- */
-#define DDCKEYCAPS_DESTBLTCLRSPACEYUV           0x00000004l
-
-/*
- * Supports transparent blting using a color key to identify the replaceable 
- * bits of the destination surface for YUV colors.
- */
-#define DDCKEYCAPS_DESTBLTYUV                   0x00000008l
-
-/*
- * Supports overlaying using colorkeying of the replaceable bits of the surface
- * being overlayed for RGB colors.
- */
-#define DDCKEYCAPS_DESTOVERLAY                  0x00000010l
-
-/*
- * Supports a color space as the color key for the destination for RGB colors.
- */
-#define DDCKEYCAPS_DESTOVERLAYCLRSPACE          0x00000020l
-
-/*
- * Supports a color space as the color key for the destination for YUV colors.
- */
-#define DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV       0x00000040l
-
-/*
- * Supports only one active destination color key value for visible overlay
- * surfaces.
- */
-#define DDCKEYCAPS_DESTOVERLAYONEACTIVE         0x00000080l
-
-/*
- * Supports overlaying using colorkeying of the replaceable bits of the 
- * surface being overlayed for YUV colors.
- */
-#define DDCKEYCAPS_DESTOVERLAYYUV               0x00000100l
-
-/*
- * Supports transparent blting using the color key for the source with
- * this surface for RGB colors.
- */
-#define DDCKEYCAPS_SRCBLT                       0x00000200l
-
-/*
- * Supports transparent blting using a color space for the source with
- * this surface for RGB colors.
- */
-#define DDCKEYCAPS_SRCBLTCLRSPACE               0x00000400l
-
-/*
- * Supports transparent blting using a color space for the source with
- * this surface for YUV colors.
- */
-#define DDCKEYCAPS_SRCBLTCLRSPACEYUV            0x00000800l
-
-/*
- * Supports transparent blting using the color key for the source with
- * this surface for YUV colors.
- */
-#define DDCKEYCAPS_SRCBLTYUV                    0x00001000l
-
-/*
- * Supports overlays using the color key for the source with this
- * overlay surface for RGB colors.
- */
-#define DDCKEYCAPS_SRCOVERLAY                   0x00002000l
-
-/*
- * Supports overlays using a color space as the source color key for
- * the overlay surface for RGB colors.
- */
-#define DDCKEYCAPS_SRCOVERLAYCLRSPACE           0x00004000l
-
-/*
- * Supports overlays using a color space as the source color key for
- * the overlay surface for YUV colors.
- */
-#define DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV        0x00008000l
-
-/*
- * Supports only one active source color key value for visible
- * overlay surfaces.
- */
-#define DDCKEYCAPS_SRCOVERLAYONEACTIVE          0x00010000l
-
-/*
- * Supports overlays using the color key for the source with this
- * overlay surface for YUV colors.
- */
-#define DDCKEYCAPS_SRCOVERLAYYUV                0x00020000l
-
-/*
- * there are no bandwidth trade-offs for using colorkey with an overlay
- */
-#define DDCKEYCAPS_NOCOSTOVERLAY                0x00040000l
-
-
-/****************************************************************************
- *
- * DIRECTDRAW PIXELFORMAT FLAGS
- *
- ****************************************************************************/
-
-/*
- * The surface has alpha channel information in the pixel format.
- */
-#define DDPF_ALPHAPIXELS                        0x00000001l
-
-/*
- * The pixel format contains alpha only information
- */
-#define DDPF_ALPHA                              0x00000002l
-
-/*
- * The FourCC code is valid.
- */
-#define DDPF_FOURCC                             0x00000004l
-
-/*
- * The surface is 4-bit color indexed.
- */
-#define DDPF_PALETTEINDEXED4                    0x00000008l
-
-/*
- * The surface is indexed into a palette which stores indices
- * into the destination surface's 8-bit palette.
- */
-#define DDPF_PALETTEINDEXEDTO8                  0x00000010l
-
-/*
- * The surface is 8-bit color indexed.
- */
-#define DDPF_PALETTEINDEXED8                    0x00000020l
-
-/*
- * The RGB data in the pixel format structure is valid.
- */
-#define DDPF_RGB                                0x00000040l
-
-/*
- * The surface will accept pixel data in the format specified
- * and compress it during the write.
- */
-#define DDPF_COMPRESSED                         0x00000080l
-
-/*
- * The surface will accept RGB data and translate it during
- * the write to YUV data.  The format of the data to be written
- * will be contained in the pixel format structure.  The DDPF_RGB
- * flag will be set. 
- */
-#define DDPF_RGBTOYUV                           0x00000100l
-
-/*
- * pixel format is YUV - YUV data in pixel format struct is valid
- */
-#define DDPF_YUV                                0x00000200l
-
-/*
- * pixel format is a z buffer only surface
- */
-#define DDPF_ZBUFFER                            0x00000400l
-
-/*
- * The surface is 1-bit color indexed.
- */
-#define DDPF_PALETTEINDEXED1                    0x00000800l
-
-/*
- * The surface is 2-bit color indexed.
- */
-#define DDPF_PALETTEINDEXED2                    0x00001000l
-
-/*===========================================================================
- *
- *
- * DIRECTDRAW CALLBACK FLAGS
- *
- *
- *==========================================================================*/
-
-/****************************************************************************
- *
- * DIRECTDRAW ENUMSURFACES FLAGS
- *
- ****************************************************************************/
-
-/*
- * Enumerate all of the surfaces that meet the search criterion.
- */
-#define DDENUMSURFACES_ALL                      0x00000001l
-
-/*
- * A search hit is a surface that matches the surface description.
- */
-#define DDENUMSURFACES_MATCH                    0x00000002l
-
-/*
- * A search hit is a surface that does not match the surface description.
- */
-#define DDENUMSURFACES_NOMATCH                  0x00000004l
-
-/*
- * Enumerate the first surface that can be created which meets the search criterion.
- */
-#define DDENUMSURFACES_CANBECREATED             0x00000008l
-
-/*
- * Enumerate the surfaces that already exist that meet the search criterion.
- */
-#define DDENUMSURFACES_DOESEXIST                0x00000010l
-
-
-/****************************************************************************
- *
- * DIRECTDRAW ENUMDISPLAYMODES FLAGS
- *
- ****************************************************************************/
-
-/*
- * Enumerate Modes with different refresh rates.  EnumDisplayModes guarantees
- * that a particular mode will be enumerated only once.  This flag specifies whether
- * the refresh rate is taken into account when determining if a mode is unique.
- */
-#define DDEDM_REFRESHRATES                      0x00000001l
-
-
-/****************************************************************************
- *
- * DIRECTDRAW SETCOOPERATIVELEVEL FLAGS
- *
- ****************************************************************************/
-
-/*
- * Exclusive mode owner will be responsible for the entire primary surface.
- * GDI can be ignored. used with DD
- */
-#define DDSCL_FULLSCREEN                        0x00000001l
-
-/*
- * allow CTRL_ALT_DEL to work while in fullscreen exclusive mode 
- */
-#define DDSCL_ALLOWREBOOT                       0x00000002l
-
-/*
- * prevents DDRAW from modifying the application window.
- * prevents DDRAW from minimize/restore the application window on activation.
- */
-#define DDSCL_NOWINDOWCHANGES                   0x00000004l
-
-/*
- * app wants to work as a regular Windows application
- */
-#define DDSCL_NORMAL                            0x00000008l
-
-/*
- * app wants exclusive access
- */
-#define DDSCL_EXCLUSIVE                         0x00000010l
-
-
-/*
- * app can deal with non-windows display modes
- */
-#define DDSCL_ALLOWMODEX                        0x00000040l
-
-
-/****************************************************************************
- *
- * DIRECTDRAW BLT FLAGS
- *
- ****************************************************************************/
-
-/*
- * Use the alpha information in the pixel format or the alpha channel surface
- * attached to the destination surface as the alpha channel for this blt.
- */
-#define DDBLT_ALPHADEST                         0x00000001l
-
-/*
- * Use the dwConstAlphaDest field in the DDBLTFX structure as the alpha channel
- * for the destination surface for this blt.
- */
-#define DDBLT_ALPHADESTCONSTOVERRIDE            0x00000002l
-
-/*
- * The NEG suffix indicates that the destination surface becomes more
- * transparent as the alpha value increases. (0 is opaque)
- */
-#define DDBLT_ALPHADESTNEG                      0x00000004l
-
-/*
- * Use the lpDDSAlphaDest field in the DDBLTFX structure as the alpha
- * channel for the destination for this blt.
- */
-#define DDBLT_ALPHADESTSURFACEOVERRIDE          0x00000008l
-
-/*
- * Use the dwAlphaEdgeBlend field in the DDBLTFX structure as the alpha channel
- * for the edges of the image that border the color key colors.
- */
-#define DDBLT_ALPHAEDGEBLEND                    0x00000010l
-
-/*
- * Use the alpha information in the pixel format or the alpha channel surface
- * attached to the source surface as the alpha channel for this blt.
- */
-#define DDBLT_ALPHASRC                          0x00000020l
-
-/*
- * Use the dwConstAlphaSrc field in the DDBLTFX structure as the alpha channel
- * for the source for this blt.
- */
-#define DDBLT_ALPHASRCCONSTOVERRIDE             0x00000040l
-
-/*
- * The NEG suffix indicates that the source surface becomes more transparent
- * as the alpha value increases. (0 is opaque)
- */
-#define DDBLT_ALPHASRCNEG                       0x00000080l
-
-/*
- * Use the lpDDSAlphaSrc field in the DDBLTFX structure as the alpha channel
- * for the source for this blt. 
- */
-#define DDBLT_ALPHASRCSURFACEOVERRIDE           0x00000100l
-
-/*
- * Do this blt asynchronously through the FIFO in the order received.  If
- * there is no room in the hardware FIFO fail the call.
- */
-#define DDBLT_ASYNC                             0x00000200l
-
-/*
- * Uses the dwFillColor field in the DDBLTFX structure as the RGB color
- * to fill the destination rectangle on the destination surface with.
- */
-#define DDBLT_COLORFILL                         0x00000400l
-
-/*
- * Uses the dwDDFX field in the DDBLTFX structure to specify the effects
- * to use for the blt.
- */
-#define DDBLT_DDFX                              0x00000800l
-
-/*
- * Uses the dwDDROPS field in the DDBLTFX structure to specify the ROPS
- * that are not part of the Win32 API.
- */
-#define DDBLT_DDROPS                            0x00001000l
-
-/*
- * Use the color key associated with the destination surface.
- */
-#define DDBLT_KEYDEST                           0x00002000l
-
-/*
- * Use the dckDestColorkey field in the DDBLTFX structure as the color key
- * for the destination surface.
- */
-#define DDBLT_KEYDESTOVERRIDE                   0x00004000l
-
-/*
- * Use the color key associated with the source surface.
- */
-#define DDBLT_KEYSRC                            0x00008000l
-
-/*
- * Use the dckSrcColorkey field in the DDBLTFX structure as the color key
- * for the source surface.
- */
-#define DDBLT_KEYSRCOVERRIDE                    0x00010000l
-
-/*
- * Use the dwROP field in the DDBLTFX structure for the raster operation
- * for this blt.  These ROPs are the same as the ones defined in the Win32 API.
- */
-#define DDBLT_ROP                               0x00020000l
-
-/*
- * Use the dwRotationAngle field in the DDBLTFX structure as the angle
- * (specified in 1/100th of a degree) to rotate the surface.
- */
-#define DDBLT_ROTATIONANGLE                     0x00040000l
-
-/*
- * Z-buffered blt using the z-buffers attached to the source and destination
- * surfaces and the dwZBufferOpCode field in the DDBLTFX structure as the
- * z-buffer opcode.
- */
-#define DDBLT_ZBUFFER                           0x00080000l
-
-/*
- * Z-buffered blt using the dwConstDest Zfield and the dwZBufferOpCode field
- * in the DDBLTFX structure as the z-buffer and z-buffer opcode respectively
- * for the destination.
- */
-#define DDBLT_ZBUFFERDESTCONSTOVERRIDE          0x00100000l
-
-/*
- * Z-buffered blt using the lpDDSDestZBuffer field and the dwZBufferOpCode
- * field in the DDBLTFX structure as the z-buffer and z-buffer opcode
- * respectively for the destination.
- */
-#define DDBLT_ZBUFFERDESTOVERRIDE               0x00200000l
-
-/*
- * Z-buffered blt using the dwConstSrcZ field and the dwZBufferOpCode field
- * in the DDBLTFX structure as the z-buffer and z-buffer opcode respectively
- * for the source.
- */
-#define DDBLT_ZBUFFERSRCCONSTOVERRIDE           0x00400000l
-
-/*
- * Z-buffered blt using the lpDDSSrcZBuffer field and the dwZBufferOpCode
- * field in the DDBLTFX structure as the z-buffer and z-buffer opcode
- * respectively for the source.
- */
-#define DDBLT_ZBUFFERSRCOVERRIDE                0x00800000l
-
-/*
- * wait until the device is ready to handle the blt
- * this will cause blt to not return DDERR_WASSTILLDRAWING
- */
-#define DDBLT_WAIT                              0x01000000l
-
-/*
- * Uses the dwFillDepth field in the DDBLTFX structure as the depth value
- * to fill the destination rectangle on the destination Z-buffer surface
- * with.
- */
-#define DDBLT_DEPTHFILL                         0x02000000l
-
-
-/****************************************************************************
- *
- * BLTFAST FLAGS
- *
- ****************************************************************************/
-
-#define DDBLTFAST_NOCOLORKEY                    0x00000000
-#define DDBLTFAST_SRCCOLORKEY                   0x00000001
-#define DDBLTFAST_DESTCOLORKEY                  0x00000002
-#define DDBLTFAST_WAIT                          0x00000010
-
-/****************************************************************************
- *
- * FLIP FLAGS
- *
- ****************************************************************************/
-
-#define DDFLIP_WAIT                          0x00000001l
-
-
-/****************************************************************************
- *
- * DIRECTDRAW SURFACE OVERLAY FLAGS
- *
- ****************************************************************************/
-
-/*
- * Use the alpha information in the pixel format or the alpha channel surface
- * attached to the destination surface as the alpha channel for the
- * destination overlay.
- */
-#define DDOVER_ALPHADEST                        0x00000001l
-
-/*
- * Use the dwConstAlphaDest field in the DDOVERLAYFX structure as the
- * destination alpha channel for this overlay.
- */
-#define DDOVER_ALPHADESTCONSTOVERRIDE           0x00000002l
-
-/*
- * The NEG suffix indicates that the destination surface becomes more
- * transparent as the alpha value increases. 
- */
-#define DDOVER_ALPHADESTNEG                     0x00000004l
-
-/*
- * Use the lpDDSAlphaDest field in the DDOVERLAYFX structure as the alpha
- * channel destination for this overlay.
- */
-#define DDOVER_ALPHADESTSURFACEOVERRIDE         0x00000008l
-
-/*
- * Use the dwAlphaEdgeBlend field in the DDOVERLAYFX structure as the alpha
- * channel for the edges of the image that border the color key colors.
- */
-#define DDOVER_ALPHAEDGEBLEND                   0x00000010l
-
-/*
- * Use the alpha information in the pixel format or the alpha channel surface
- * attached to the source surface as the source alpha channel for this overlay.
- */
-#define DDOVER_ALPHASRC                         0x00000020l
-
-/*
- * Use the dwConstAlphaSrc field in the DDOVERLAYFX structure as the source
- * alpha channel for this overlay.
- */
-#define DDOVER_ALPHASRCCONSTOVERRIDE            0x00000040l
-
-/*
- * The NEG suffix indicates that the source surface becomes more transparent
- * as the alpha value increases.
- */
-#define DDOVER_ALPHASRCNEG                      0x00000080l
-
-/*
- * Use the lpDDSAlphaSrc field in the DDOVERLAYFX structure as the alpha channel
- * source for this overlay.
- */
-#define DDOVER_ALPHASRCSURFACEOVERRIDE          0x00000100l
-
-/*
- * Turn this overlay off.
- */
-#define DDOVER_HIDE                             0x00000200l
-
-/*
- * Use the color key associated with the destination surface.
- */
-#define DDOVER_KEYDEST                          0x00000400l
-
-/*
- * Use the dckDestColorkey field in the DDOVERLAYFX structure as the color key
- * for the destination surface
- */
-#define DDOVER_KEYDESTOVERRIDE                  0x00000800l
-
-/*
- * Use the color key associated with the source surface.
- */
-#define DDOVER_KEYSRC                           0x00001000l
-
-/*
- * Use the dckSrcColorkey field in the DDOVERLAYFX structure as the color key
- * for the source surface.
- */
-#define DDOVER_KEYSRCOVERRIDE                   0x00002000l
-
-/*
- * Turn this overlay on.
- */
-#define DDOVER_SHOW                             0x00004000l
-
-/*
- * Add a dirty rect to an emulated overlayed surface.
- */
-#define DDOVER_ADDDIRTYRECT                     0x00008000l
-
-/*
- * Redraw all dirty rects on an emulated overlayed surface.
- */
-#define DDOVER_REFRESHDIRTYRECTS                0x00010000l
-
-/*
- * Redraw the entire surface on an emulated overlayed surface.
- */
-#define DDOVER_REFRESHALL                      0x00020000l
-
-
-/*
- * Use the overlay FX flags to define special overlay FX
- */
-#define DDOVER_DDFX                             0x00080000l
-
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE LOCK FLAGS
- *
- ****************************************************************************/
-
-/*
- * The default.  Set to indicate that Lock should return a valid memory pointer
- * to the top of the specified rectangle.  If no rectangle is specified then a
- * pointer to the top of the surface is returned.
- */
-#define DDLOCK_SURFACEMEMORYPTR                 0x00000000L     // default
-
-/*
- * Set to indicate that Lock should wait until it can obtain a valid memory
- * pointer before returning.  If this bit is set, Lock will never return 
- * DDERR_WASSTILLDRAWING.
- */
-#define DDLOCK_WAIT                             0x00000001L
-
-/*
- * Set if an event handle is being passed to Lock.  Lock will trigger the event
- * when it can return the surface memory pointer requested.
- */
-#define DDLOCK_EVENT                            0x00000002L
-
-/*
- * Indicates that the surface being locked will only be read from.
- */
-#define DDLOCK_READONLY                         0x00000010L
-
-/*
- * Indicates that the surface being locked will only be written to
- */
-#define DDLOCK_WRITEONLY                        0x00000020L
-
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE PAGELOCK FLAGS
- *
- ****************************************************************************/
-
-/*
- * No flags defined at present
- */
-
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE PAGEUNLOCK FLAGS
- *
- ****************************************************************************/
-
-/*
- * No flags defined at present
- */
-
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE BLT FX FLAGS
- *
- ****************************************************************************/
-
-/*
- * If stretching, use arithmetic stretching along the Y axis for this blt.
- */
-#define DDBLTFX_ARITHSTRETCHY                   0x00000001l
-
-/*
- * Do this blt mirroring the surface left to right.  Spin the
- * surface around its y-axis.
- */
-#define DDBLTFX_MIRRORLEFTRIGHT                 0x00000002l
-
-/*
- * Do this blt mirroring the surface up and down.  Spin the surface
- * around its x-axis.
- */
-#define DDBLTFX_MIRRORUPDOWN                    0x00000004l
-
-/*
- * Schedule this blt to avoid tearing.
- */
-#define DDBLTFX_NOTEARING                       0x00000008l
-
-/*
- * Do this blt rotating the surface one hundred and eighty degrees.
- */
-#define DDBLTFX_ROTATE180                       0x00000010l
-
-/*
- * Do this blt rotating the surface two hundred and seventy degrees.
- */
-#define DDBLTFX_ROTATE270                       0x00000020l
-
-/*
- * Do this blt rotating the surface ninety degrees.
- */
-#define DDBLTFX_ROTATE90                        0x00000040l
-
-/*
- * Do this z blt using dwZBufferLow and dwZBufferHigh as  range values
- * specified to limit the bits copied from the source surface.
- */
-#define DDBLTFX_ZBUFFERRANGE                    0x00000080l
-
-/*
- * Do this z blt adding the dwZBufferBaseDest to each of the sources z values
- * before comparing it with the desting z values.
- */
-#define DDBLTFX_ZBUFFERBASEDEST                 0x00000100l
-
-/****************************************************************************
- *
- * DIRECTDRAWSURFACE OVERLAY FX FLAGS
- *
- ****************************************************************************/
-
-/*
- * If stretching, use arithmetic stretching along the Y axis for this overlay.
- */
-#define DDOVERFX_ARITHSTRETCHY                  0x00000001l
-
-/*
- * Mirror the overlay across the vertical axis
- */
-#define DDOVERFX_MIRRORLEFTRIGHT                0x00000002l
-
-/*
- * Mirror the overlay across the horizontal axis
- */
-#define DDOVERFX_MIRRORUPDOWN                   0x00000004l
-
-/****************************************************************************
- *
- * DIRECTDRAW WAITFORVERTICALBLANK FLAGS
- *
- ****************************************************************************/
-
-/*
- * return when the vertical blank interval begins
- */
-#define DDWAITVB_BLOCKBEGIN                     0x00000001l
-
-/*
- * set up an event to trigger when the vertical blank begins
- */
-#define DDWAITVB_BLOCKBEGINEVENT                0x00000002l
-
-/*
- * return when the vertical blank interval ends and display begins
- */
-#define DDWAITVB_BLOCKEND                       0x00000004l
-
-/****************************************************************************
- *
- * DIRECTDRAW GETFLIPSTATUS FLAGS
- *
- ****************************************************************************/
-
-/*
- * is it OK to flip now?
- */
-#define DDGFS_CANFLIP                   0x00000001l
-
-/*
- * is the last flip finished?
- */
-#define DDGFS_ISFLIPDONE                0x00000002l
-
-/****************************************************************************
- *
- * DIRECTDRAW GETBLTSTATUS FLAGS
- *
- ****************************************************************************/
-
-/*
- * is it OK to blt now?
- */
-#define DDGBS_CANBLT                    0x00000001l
-
-/*
- * is the blt to the surface finished?
- */
-#define DDGBS_ISBLTDONE                 0x00000002l
-
-
-/****************************************************************************
- *
- * DIRECTDRAW ENUMOVERLAYZORDER FLAGS
- *
- ****************************************************************************/
-
-/*
- * Enumerate overlays back to front.
- */
-#define DDENUMOVERLAYZ_BACKTOFRONT      0x00000000l
-
-/*
- * Enumerate overlays front to back
- */
-#define DDENUMOVERLAYZ_FRONTTOBACK      0x00000001l
-
-/****************************************************************************
- *
- * DIRECTDRAW UPDATEOVERLAYZORDER FLAGS
- *
- ****************************************************************************/
-
-/*
- * Send overlay to front
- */
-#define DDOVERZ_SENDTOFRONT             0x00000000l
-
-/*
- * Send overlay to back
- */
-#define DDOVERZ_SENDTOBACK              0x00000001l
-
-/*
- * Move Overlay forward
- */
-#define DDOVERZ_MOVEFORWARD             0x00000002l
-
-/*
- * Move Overlay backward
- */
-#define DDOVERZ_MOVEBACKWARD            0x00000003l
-
-/*
- * Move Overlay in front of relative surface
- */
-#define DDOVERZ_INSERTINFRONTOF         0x00000004l
-
-/*
- * Move Overlay in back of relative surface
- */
-#define DDOVERZ_INSERTINBACKOF          0x00000005l
-
-/*===========================================================================
- *
- *
- * DIRECTDRAW RETURN CODES
- *
- * The return values from DirectDraw Commands and Surface that return an HRESULT
- * are codes from DirectDraw concerning the results of the action
- * requested by DirectDraw.
- *
- *==========================================================================*/
-
-/*
- * Status is OK
- *
- * Issued by: DirectDraw Commands and all callbacks
- */
-#define DD_OK                                   0
-
-/****************************************************************************
- *
- * DIRECTDRAW ENUMCALLBACK RETURN VALUES
- *
- * EnumCallback returns are used to control the flow of the DIRECTDRAW and
- * DIRECTDRAWSURFACE object enumerations.   They can only be returned by
- * enumeration callback routines.
- *
- ****************************************************************************/
-
-/*
- * stop the enumeration
- */
-#define DDENUMRET_CANCEL                        0
-
-/*
- * continue the enumeration
- */
-#define DDENUMRET_OK                            1
-
-/****************************************************************************
- *
- * DIRECTDRAW ERRORS
- *
- * Errors are represented by negative values and cannot be combined.
- *
- ****************************************************************************/
-
-/*
- * This object is already initialized
- */
-#define DDERR_ALREADYINITIALIZED                MAKE_DDHRESULT( 5 )
-
-/*
- * This surface can not be attached to the requested surface.
- */
-#define DDERR_CANNOTATTACHSURFACE               MAKE_DDHRESULT( 10 )
-
-/*
- * This surface can not be detached from the requested surface.
- */
-#define DDERR_CANNOTDETACHSURFACE               MAKE_DDHRESULT( 20 )
-
-/*
- * Support is currently not available.
- */
-#define DDERR_CURRENTLYNOTAVAIL                 MAKE_DDHRESULT( 40 )
-
-/*
- * An exception was encountered while performing the requested operation
- */
-#define DDERR_EXCEPTION                         MAKE_DDHRESULT( 55 )
-
-/*
- * Generic failure.
- */
-#define DDERR_GENERIC                           E_FAIL
-
-/*
- * Height of rectangle provided is not a multiple of reqd alignment
- */
-#define DDERR_HEIGHTALIGN                       MAKE_DDHRESULT( 90 )
-
-/*
- * Unable to match primary surface creation request with existing 
- * primary surface.
- */
-#define DDERR_INCOMPATIBLEPRIMARY               MAKE_DDHRESULT( 95 )
-
-/*
- * One or more of the caps bits passed to the callback are incorrect.
- */
-#define DDERR_INVALIDCAPS                       MAKE_DDHRESULT( 100 )
-
-/*
- * DirectDraw does not support provided Cliplist.
- */
-#define DDERR_INVALIDCLIPLIST                   MAKE_DDHRESULT( 110 )
-
-/*
- * DirectDraw does not support the requested mode
- */
-#define DDERR_INVALIDMODE                       MAKE_DDHRESULT( 120 )
-
-/*
- * DirectDraw received a pointer that was an invalid DIRECTDRAW object.
- */
-#define DDERR_INVALIDOBJECT                     MAKE_DDHRESULT( 130 )
-
-/*
- * One or more of the parameters passed to the callback function are
- * incorrect.
- */
-#define DDERR_INVALIDPARAMS                     E_INVALIDARG
-
-/*
- * pixel format was invalid as specified
- */
-#define DDERR_INVALIDPIXELFORMAT                MAKE_DDHRESULT( 145 )
-
-/*
- * Rectangle provided was invalid.
- */
-#define DDERR_INVALIDRECT                       MAKE_DDHRESULT( 150 )
-
-/*
- * Operation could not be carried out because one or more surfaces are locked
- */
-#define DDERR_LOCKEDSURFACES                    MAKE_DDHRESULT( 160 )
-
-/*
- * There is no 3D present.
- */
-#define DDERR_NO3D                              MAKE_DDHRESULT( 170 )
-
-/*
- * Operation could not be carried out because there is no alpha accleration
- * hardware present or available.
- */
-#define DDERR_NOALPHAHW                         MAKE_DDHRESULT( 180 )
-
-
-/*
- * no clip list available
- */
-#define DDERR_NOCLIPLIST                        MAKE_DDHRESULT( 205 )
-
-/*
- * Operation could not be carried out because there is no color conversion
- * hardware present or available.
- */
-#define DDERR_NOCOLORCONVHW                     MAKE_DDHRESULT( 210 )
-
-/*
- * Create function called without DirectDraw object method SetCooperativeLevel
- * being called.
- */
-#define DDERR_NOCOOPERATIVELEVELSET             MAKE_DDHRESULT( 212 )
-
-/*
- * Surface doesn't currently have a color key
- */
-#define DDERR_NOCOLORKEY                        MAKE_DDHRESULT( 215 )
-
-/*
- * Operation could not be carried out because there is no hardware support
- * of the dest color key.
- */
-#define DDERR_NOCOLORKEYHW                      MAKE_DDHRESULT( 220 )
-
-/*
- * No DirectDraw support possible with current display driver
- */
-#define DDERR_NODIRECTDRAWSUPPORT               MAKE_DDHRESULT( 222 )
-
-/*
- * Operation requires the application to have exclusive mode but the
- * application does not have exclusive mode.
- */
-#define DDERR_NOEXCLUSIVEMODE                   MAKE_DDHRESULT( 225 )
-
-/*
- * Flipping visible surfaces is not supported.
- */
-#define DDERR_NOFLIPHW                          MAKE_DDHRESULT( 230 )
-
-/*
- * There is no GDI present.
- */
-#define DDERR_NOGDI                             MAKE_DDHRESULT( 240 )
-
-/*
- * Operation could not be carried out because there is no hardware present
- * or available.
- */
-#define DDERR_NOMIRRORHW                        MAKE_DDHRESULT( 250 )
-
-/*
- * Requested item was not found
- */
-#define DDERR_NOTFOUND                          MAKE_DDHRESULT( 255 )
-
-/*
- * Operation could not be carried out because there is no overlay hardware
- * present or available.
- */
-#define DDERR_NOOVERLAYHW                       MAKE_DDHRESULT( 260 )
-
-/*
- * Operation could not be carried out because there is no appropriate raster
- * op hardware present or available.
- */
-#define DDERR_NORASTEROPHW                      MAKE_DDHRESULT( 280 )
-
-/*
- * Operation could not be carried out because there is no rotation hardware
- * present or available.
- */
-#define DDERR_NOROTATIONHW                      MAKE_DDHRESULT( 290 )
-
-/*
- * Operation could not be carried out because there is no hardware support
- * for stretching
- */
-#define DDERR_NOSTRETCHHW                       MAKE_DDHRESULT( 310 )
-
-/*
- * DirectDrawSurface is not in 4 bit color palette and the requested operation
- * requires 4 bit color palette.
- */
-#define DDERR_NOT4BITCOLOR                      MAKE_DDHRESULT( 316 )
-
-/*
- * DirectDrawSurface is not in 4 bit color index palette and the requested
- * operation requires 4 bit color index palette.
- */
-#define DDERR_NOT4BITCOLORINDEX                 MAKE_DDHRESULT( 317 )
-
-/*
- * DirectDraw Surface is not in 8 bit color mode and the requested operation
- * requires 8 bit color.
- */
-#define DDERR_NOT8BITCOLOR                      MAKE_DDHRESULT( 320 )
-
-/*
- * Operation could not be carried out because there is no texture mapping
- * hardware present or available.
- */
-#define DDERR_NOTEXTUREHW                       MAKE_DDHRESULT( 330 )
-
-/*
- * Operation could not be carried out because there is no hardware support
- * for vertical blank synchronized operations.
- */
-#define DDERR_NOVSYNCHW                         MAKE_DDHRESULT( 335 )
-
-/*
- * Operation could not be carried out because there is no hardware support
- * for zbuffer blting.
- */
-#define DDERR_NOZBUFFERHW                       MAKE_DDHRESULT( 340 )
-
-/*
- * Overlay surfaces could not be z layered based on their BltOrder because
- * the hardware does not support z layering of overlays.
- */
-#define DDERR_NOZOVERLAYHW                      MAKE_DDHRESULT( 350 )
-
-/*
- * The hardware needed for the requested operation has already been
- * allocated.
- */
-#define DDERR_OUTOFCAPS                         MAKE_DDHRESULT( 360 )
-
-/*
- * DirectDraw does not have enough memory to perform the operation.
- */
-#define DDERR_OUTOFMEMORY                       E_OUTOFMEMORY
-
-/*
- * DirectDraw does not have enough memory to perform the operation.
- */
-#define DDERR_OUTOFVIDEOMEMORY                  MAKE_DDHRESULT( 380 )
-
-/*
- * hardware does not support clipped overlays
- */
-#define DDERR_OVERLAYCANTCLIP                   MAKE_DDHRESULT( 382 )
-
-/*
- * Can only have ony color key active at one time for overlays
- */
-#define DDERR_OVERLAYCOLORKEYONLYONEACTIVE      MAKE_DDHRESULT( 384 )
-
-/*
- * Access to this palette is being refused because the palette is already
- * locked by another thread.
- */
-#define DDERR_PALETTEBUSY                       MAKE_DDHRESULT( 387 )
-
-/*
- * No src color key specified for this operation.
- */
-#define DDERR_COLORKEYNOTSET                    MAKE_DDHRESULT( 400 )
-
-/*
- * This surface is already attached to the surface it is being attached to.
- */
-#define DDERR_SURFACEALREADYATTACHED            MAKE_DDHRESULT( 410 )
-
-/*
- * This surface is already a dependency of the surface it is being made a
- * dependency of.
- */
-#define DDERR_SURFACEALREADYDEPENDENT           MAKE_DDHRESULT( 420 )
-
-/*
- * Access to this surface is being refused because the surface is already
- * locked by another thread.
- */
-#define DDERR_SURFACEBUSY                       MAKE_DDHRESULT( 430 )
-
-/*
- * Access to this surface is being refused because no driver exists
- * which can supply a pointer to the surface.
- * This is most likely to happen when attempting to lock the primary
- * surface when no DCI provider is present.
- */
-#define DDERR_CANTLOCKSURFACE                   MAKE_DDHRESULT( 435 )
-
-/*
- * Access to Surface refused because Surface is obscured.
- */
-#define DDERR_SURFACEISOBSCURED                 MAKE_DDHRESULT( 440 )
-
-/*
- * Access to this surface is being refused because the surface is gone.
- * The DIRECTDRAWSURFACE object representing this surface should 
- * have Restore called on it.
- */
-#define DDERR_SURFACELOST                       MAKE_DDHRESULT( 450 )
-
-/*
- * The requested surface is not attached.
- */
-#define DDERR_SURFACENOTATTACHED                MAKE_DDHRESULT( 460 )
-
-/*
- * Height requested by DirectDraw is too large.
- */
-#define DDERR_TOOBIGHEIGHT                      MAKE_DDHRESULT( 470 )
-
-/*
- * Size requested by DirectDraw is too large --  The individual height and
- * width are OK.
- */
-#define DDERR_TOOBIGSIZE                        MAKE_DDHRESULT( 480 )
-
-/*
- * Width requested by DirectDraw is too large.
- */
-#define DDERR_TOOBIGWIDTH                       MAKE_DDHRESULT( 490 )
-
-/*
- * Action not supported.
- */
-#define DDERR_UNSUPPORTED                       E_NOTIMPL
-
-/*
- * FOURCC format requested is unsupported by DirectDraw
- */
-#define DDERR_UNSUPPORTEDFORMAT                 MAKE_DDHRESULT( 510 )
-
-/*
- * Bitmask in the pixel format requested is unsupported by DirectDraw
- */
-#define DDERR_UNSUPPORTEDMASK                   MAKE_DDHRESULT( 520 )
-
-/*
- * vertical blank is in progress
- */
-#define DDERR_VERTICALBLANKINPROGRESS           MAKE_DDHRESULT( 537 )
-
-/*
- * Informs DirectDraw that the previous Blt which is transfering information
- * to or from this Surface is incomplete.
- */
-#define DDERR_WASSTILLDRAWING                   MAKE_DDHRESULT( 540 )
-
-/*
- * Rectangle provided was not horizontally aligned on reqd. boundary
- */
-#define DDERR_XALIGN                            MAKE_DDHRESULT( 560 )
-
-/*
- * The GUID passed to DirectDrawCreate is not a valid DirectDraw driver
- * identifier.
- */
-#define DDERR_INVALIDDIRECTDRAWGUID             MAKE_DDHRESULT( 561 )
-
-/*
- * A DirectDraw object representing this driver has already been created
- * for this process.
- */
-#define DDERR_DIRECTDRAWALREADYCREATED          MAKE_DDHRESULT( 562 )
-
-/*
- * A hardware only DirectDraw object creation was attempted but the driver
- * did not support any hardware.
- */
-#define DDERR_NODIRECTDRAWHW                    MAKE_DDHRESULT( 563 )
-
-/*
- * this process already has created a primary surface
- */
-#define DDERR_PRIMARYSURFACEALREADYEXISTS       MAKE_DDHRESULT( 564 )
-
-/*
- * software emulation not available.
- */
-#define DDERR_NOEMULATION                       MAKE_DDHRESULT( 565 )
-
-/*
- * region passed to Clipper::GetClipList is too small.
- */
-#define DDERR_REGIONTOOSMALL                    MAKE_DDHRESULT( 566 )
-
-/*
- * an attempt was made to set a clip list for a clipper objec that
- * is already monitoring an hwnd.
- */
-#define DDERR_CLIPPERISUSINGHWND                MAKE_DDHRESULT( 567 )
-
-/*
- * No clipper object attached to surface object
- */
-#define DDERR_NOCLIPPERATTACHED                 MAKE_DDHRESULT( 568 )
-
-/*
- * Clipper notification requires an HWND or
- * no HWND has previously been set as the CooperativeLevel HWND.
- */
-#define DDERR_NOHWND                            MAKE_DDHRESULT( 569 )
-
-/*
- * HWND used by DirectDraw CooperativeLevel has been subclassed,
- * this prevents DirectDraw from restoring state.
- */
-#define DDERR_HWNDSUBCLASSED                    MAKE_DDHRESULT( 570 )
-
-/*
- * The CooperativeLevel HWND has already been set.
- * It can not be reset while the process has surfaces or palettes created.
- */
-#define DDERR_HWNDALREADYSET                    MAKE_DDHRESULT( 571 )
-
-/*
- * No palette object attached to this surface.
- */
-#define DDERR_NOPALETTEATTACHED                 MAKE_DDHRESULT( 572 )
-
-/*
- * No hardware support for 16 or 256 color palettes.
- */
-#define DDERR_NOPALETTEHW                       MAKE_DDHRESULT( 573 )
-
-/*
- * If a clipper object is attached to the source surface passed into a
- * BltFast call.
- */
-#define DDERR_BLTFASTCANTCLIP                   MAKE_DDHRESULT( 574 )
-
-/*
- * No blter.
- */
-#define DDERR_NOBLTHW                           MAKE_DDHRESULT( 575 )
-
-/*
- * No DirectDraw ROP hardware.
- */
-#define DDERR_NODDROPSHW                        MAKE_DDHRESULT( 576 )
-
-/*
- * returned when GetOverlayPosition is called on a hidden overlay
- */
-#define DDERR_OVERLAYNOTVISIBLE                 MAKE_DDHRESULT( 577 )
-
-/*
- * returned when GetOverlayPosition is called on a overlay that UpdateOverlay
- * has never been called on to establish a destionation.
- */
-#define DDERR_NOOVERLAYDEST                     MAKE_DDHRESULT( 578 )
-
-/*
- * returned when the position of the overlay on the destionation is no longer
- * legal for that destionation.
- */
-#define DDERR_INVALIDPOSITION                   MAKE_DDHRESULT( 579 )
-
-/*
- * returned when an overlay member is called for a non-overlay surface
- */
-#define DDERR_NOTAOVERLAYSURFACE                MAKE_DDHRESULT( 580 )
- 
-/*
- * An attempt was made to set the cooperative level when it was already
- * set to exclusive.
- */
-#define DDERR_EXCLUSIVEMODEALREADYSET           MAKE_DDHRESULT( 581 )
-
-/*
- * An attempt has been made to flip a surface that is not flippable.
- */
-#define DDERR_NOTFLIPPABLE                      MAKE_DDHRESULT( 582 )
-
-/*
- * Can't duplicate primary & 3D surfaces, or surfaces that are implicitly
- * created.
- */
-#define DDERR_CANTDUPLICATE                     MAKE_DDHRESULT( 583 )
-
-/*
- * Surface was not locked.  An attempt to unlock a surface that was not
- * locked at all, or by this process, has been attempted.
- */
-#define DDERR_NOTLOCKED                         MAKE_DDHRESULT( 584 )
-
-/*
- * Windows can not create any more DCs
- */
-#define DDERR_CANTCREATEDC                      MAKE_DDHRESULT( 585 )
-
-/*
- * No DC was ever created for this surface.
- */
-#define DDERR_NODC                              MAKE_DDHRESULT( 586 )
-
-/*
- * This surface can not be restored because it was created in a different
- * mode.
- */
-#define DDERR_WRONGMODE                         MAKE_DDHRESULT( 587 )
-
-/*
- * This surface can not be restored because it is an implicitly created
- * surface.
- */
-#define DDERR_IMPLICITLYCREATED                 MAKE_DDHRESULT( 588 )
-
-/*
- * The surface being used is not a palette-based surface
- */
-#define DDERR_NOTPALETTIZED                     MAKE_DDHRESULT( 589 )
-
-
-/*
- * The display is currently in an unsupported mode
- */
-#define DDERR_UNSUPPORTEDMODE                   MAKE_DDHRESULT( 590 )
-
-/*
- * Operation could not be carried out because there is no mip-map
- * texture mapping hardware present or available.
- */
-#define DDERR_NOMIPMAPHW                        MAKE_DDHRESULT( 591 )
-
-/*
- * The requested action could not be performed because the surface was of
- * the wrong type.
- */
-#define DDERR_INVALIDSURFACETYPE                MAKE_DDHRESULT( 592 )
-
-
-
-/*
- * A DC has already been returned for this surface. Only one DC can be 
- * retrieved per surface.
- */
-#define DDERR_DCALREADYCREATED                  MAKE_DDHRESULT( 620 )
-
-/*
- * The attempt to page lock a surface failed.
- */
-#define DDERR_CANTPAGELOCK                      MAKE_DDHRESULT( 640 )
-
-/*
- * The attempt to page unlock a surface failed.
- */
-#define DDERR_CANTPAGEUNLOCK                    MAKE_DDHRESULT( 660 )
-
-/*
- * An attempt was made to page unlock a surface with no outstanding page locks.
- */
-#define DDERR_NOTPAGELOCKED                     MAKE_DDHRESULT( 680 )
-
-/*
- * An attempt was made to invoke an interface member of a DirectDraw object
- * created by CoCreateInstance() before it was initialized.
- */
-#define DDERR_NOTINITIALIZED                    CO_E_NOTINITIALIZED
-
-/* Alpha bit depth constants */
-
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
--- a/u/dxsdk/SDK/INC/DINPUT.H
+++ /dev/null
@@ -1,873 +1,0 @@
-/****************************************************************************
- *
- *  Copyright (C) 1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       dinput.h
- *  Content:    DirectInput include file
- *
- ****************************************************************************/
-
-#ifndef __DINPUT_INCLUDED__
-#define __DINPUT_INCLUDED__
-
-#ifdef _WIN32
-#define COM_NO_WINDOWS_H
-#include <objbase.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DIRECTINPUT_VERSION         0x0300
-
-/****************************************************************************
- *
- *      Class IDs
- *
- ****************************************************************************/
-
-DEFINE_GUID(CLSID_DirectInput,      0x25E609E0,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(CLSID_DirectInputDevice,0x25E609E1,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-/****************************************************************************
- *
- *      Interfaces
- *
- ****************************************************************************/
-
-DEFINE_GUID(IID_IDirectInputA,     0x89521360,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputW,     0x89521361,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-DEFINE_GUID(IID_IDirectInputDeviceA,0x5944E680,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputDeviceW,0x5944E681,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-/****************************************************************************
- *
- *      Predefined object types
- *
- ****************************************************************************/
-
-DEFINE_GUID(GUID_XAxis,   0xA36D02E0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_YAxis,   0xA36D02E1,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_ZAxis,   0xA36D02E2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_RAxis,   0xA36D02E3,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_UAxis,   0xA36D02E4,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_VAxis,   0xA36D02E5,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-DEFINE_GUID(GUID_Button,  0xA36D02F0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_Key,     0x55728220,0xD33C,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-DEFINE_GUID(GUID_POV,     0xA36D02F2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-/****************************************************************************
- *
- *      Predefined product GUIDs
- *
- ****************************************************************************/
-
-DEFINE_GUID(GUID_SysMouse,   0x6F1D2B60,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_SysKeyboard,0x6F1D2B61,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-/****************************************************************************
- *
- *      Interfaces and Structures...
- *
- ****************************************************************************/
-
-/****************************************************************************
- *
- *      IDirectInputDevice
- *
- ****************************************************************************/
-
-#define DIDEVTYPE_DEVICE    1
-#define DIDEVTYPE_MOUSE     2
-#define DIDEVTYPE_KEYBOARD  3
-#define DIDEVTYPE_JOYSTICK  4
-
-#define DIDEVTYPEMOUSE_UNKNOWN          1
-#define DIDEVTYPEMOUSE_TRADITIONAL      2
-#define DIDEVTYPEMOUSE_FINGERSTICK      3
-#define DIDEVTYPEMOUSE_TOUCHPAD         4
-#define DIDEVTYPEMOUSE_TRACKBALL        5
-
-#define DIDEVTYPEKEYBOARD_PCXT          1
-#define DIDEVTYPEKEYBOARD_OLIVETTI      2
-#define DIDEVTYPEKEYBOARD_PCAT          3
-#define DIDEVTYPEKEYBOARD_PCENH         4
-#define DIDEVTYPEKEYBOARD_NOKIA1050     5
-#define DIDEVTYPEKEYBOARD_NOKIA9140     6
-#define DIDEVTYPEKEYBOARD_NEC98         7
-#define DIDEVTYPEKEYBOARD_NEC98LAPTOP   8
-#define DIDEVTYPEKEYBOARD_NEC98106      9
-#define DIDEVTYPEKEYBOARD_JAPAN106     10
-#define DIDEVTYPEKEYBOARD_JAPANAX      11
-#define DIDEVTYPEKEYBOARD_J3100        12
-
-#define GET_DIDEVICE_TYPE(dwDevType)    LOBYTE(dwDevType)
-#define GET_DIDEVICE_SUBTYPE(dwDevType) HIBYTE(dwDevType)
-
-typedef struct _DIDEVCAPS {
-    DWORD   dwSize;
-    DWORD   dwFlags;
-    DWORD   dwDevType;
-    DWORD   dwAxes;
-    DWORD   dwButtons;
-    DWORD   dwPOVs;
-} DIDEVCAPS, *LPDIDEVCAPS;
-
-#define DIDC_ATTACHED           0x00000001
-#define DIDC_POLLEDDEVICE       0x00000002
-
-#define DIDFT_ALL           0x00000000
-
-#define DIDFT_RELAXIS       0x00000001
-#define DIDFT_ABSAXIS       0x00000002
-#define DIDFT_AXIS          0x00000003
-
-#define DIDFT_PSHBUTTON     0x00000004
-#define DIDFT_TGLBUTTON     0x00000008
-#define DIDFT_BUTTON        0x0000000C
-
-#define DIDFT_POV           0x00000010
-
-#define DIDFT_ANYINSTANCE   0x0000FF00
-#define DIDFT_MAKEINSTANCE(n) ((BYTE)(n) << 8)
-#define DIDFT_GETTYPE(n)     LOBYTE(n)
-#define DIDFT_GETINSTANCE(n) HIBYTE(n)
-
-typedef struct _DIOBJECTDATAFORMAT {
-    const GUID *pguid;
-    DWORD   dwOfs;
-    DWORD   dwType;
-    DWORD   dwFlags;
-} DIOBJECTDATAFORMAT, *LPDIOBJECTDATAFORMAT;
-typedef const DIOBJECTDATAFORMAT *LPCDIOBJECTDATAFORMAT;
-
-typedef struct _DIDATAFORMAT {
-    DWORD   dwSize;
-    DWORD   dwObjSize;
-    DWORD   dwFlags;
-    DWORD   dwDataSize;
-    DWORD   dwNumObjs;
-    LPDIOBJECTDATAFORMAT rgodf;
-} DIDATAFORMAT, *LPDIDATAFORMAT;
-typedef const DIDATAFORMAT *LPCDIDATAFORMAT;
-
-#define DIDF_ABSAXIS            0x00000001
-#define DIDF_RELAXIS            0x00000002
-
-extern const DIDATAFORMAT c_dfDIMouse;
-extern const DIDATAFORMAT c_dfDIKeyboard;
-
-typedef struct DIDEVICEOBJECTINSTANCEA {
-    DWORD   dwSize;
-    GUID    guidType;
-    DWORD   dwOfs;
-    DWORD   dwType;
-    DWORD   dwFlags;
-    CHAR    tszName[MAX_PATH];
-} DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA;
-typedef struct DIDEVICEOBJECTINSTANCEW {
-    DWORD   dwSize;
-    GUID    guidType;
-    DWORD   dwOfs;
-    DWORD   dwType;
-    DWORD   dwFlags;
-    WCHAR   tszName[MAX_PATH];
-} DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW;
-#ifdef UNICODE
-typedef DIDEVICEOBJECTINSTANCEW DIDEVICEOBJECTINSTANCE;
-typedef LPDIDEVICEOBJECTINSTANCEW LPDIDEVICEOBJECTINSTANCE;
-#else
-typedef DIDEVICEOBJECTINSTANCEA DIDEVICEOBJECTINSTANCE;
-typedef LPDIDEVICEOBJECTINSTANCEA LPDIDEVICEOBJECTINSTANCE;
-#endif // UNICODE
-typedef const DIDEVICEOBJECTINSTANCEA *LPCDIDEVICEOBJECTINSTANCEA;
-typedef const DIDEVICEOBJECTINSTANCEW *LPCDIDEVICEOBJECTINSTANCEW;
-typedef const DIDEVICEOBJECTINSTANCE  *LPCDIDEVICEOBJECTINSTANCE;
-
-typedef BOOL (FAR PASCAL * LPDIENUMDEVICEOBJECTSCALLBACKA)(LPCDIDEVICEOBJECTINSTANCEA, LPVOID);
-typedef BOOL (FAR PASCAL * LPDIENUMDEVICEOBJECTSCALLBACKW)(LPCDIDEVICEOBJECTINSTANCEW, LPVOID);
-#ifdef UNICODE
-#define LPDIENUMDEVICEOBJECTSCALLBACK  LPDIENUMDEVICEOBJECTSCALLBACKW
-#else
-#define LPDIENUMDEVICEOBJECTSCALLBACK  LPDIENUMDEVICEOBJECTSCALLBACKA
-#endif // !UNICODE
-
-typedef struct DIPROPHEADER {
-    DWORD   dwSize;
-    DWORD   dwHeaderSize;
-    DWORD   dwObj;
-    DWORD   dwHow;
-} DIPROPHEADER, *LPDIPROPHEADER;
-typedef const DIPROPHEADER *LPCDIPROPHEADER;
-
-#define DIPH_DEVICE             0
-#define DIPH_BYOFFSET           1
-#define DIPH_BYID               2
-
-typedef struct DIPROPDWORD {
-    DIPROPHEADER diph;
-    DWORD   dwData;
-} DIPROPDWORD, *LPDIPROPDWORD;
-typedef const DIPROPDWORD *LPCDIPROPDWORD;
-
-typedef struct DIPROPRANGE {
-    DIPROPHEADER diph;
-    LONG    lMin;
-    LONG    lMax;
-} DIPROPRANGE, *LPDIPROPRANGE;
-typedef const DIPROPRANGE *LPCDIPROPRANGE;
-
-#define DIPROPRANGE_NOMIN       ((LONG)0x80000000)
-#define DIPROPRANGE_NOMAX       ((LONG)0x7FFFFFFF)
-
-#ifdef __cplusplus
-#define MAKEDIPROP(prop)    (*(const GUID *)(prop))
-#else
-#define MAKEDIPROP(prop)    ((REFGUID)(prop))
-#endif
-
-#define DIPROP_BUFFERSIZE       MAKEDIPROP(1)
-
-#define DIPROP_AXISMODE         MAKEDIPROP(2)
-
-#define DIPROPAXISMODE_ABS      0
-#define DIPROPAXISMODE_REL      1
-
-#define DIPROP_GRANULARITY      MAKEDIPROP(3)
-
-#define DIPROP_RANGE            MAKEDIPROP(4)
-
-typedef struct DIDEVICEOBJECTDATA {
-    DWORD   dwOfs;
-    DWORD   dwData;
-    DWORD   dwTimeStamp;
-    DWORD   dwSequence;
-} DIDEVICEOBJECTDATA, *LPDIDEVICEOBJECTDATA;
-
-#define DIGDD_PEEK          0x00000001
-
-#define DISEQUENCE_COMPARE(dwSequence1, cmp, dwSequence2) \
-                        ((int)((dwSequence1) - (dwSequence2)) cmp 0)
-
-#define DISCL_EXCLUSIVE     0x00000001
-#define DISCL_NONEXCLUSIVE  0x00000002
-#define DISCL_FOREGROUND    0x00000004
-#define DISCL_BACKGROUND    0x00000008
-
-typedef struct DIDEVICEINSTANCEA {
-    DWORD   dwSize;
-    GUID    guidInstance;
-    GUID    guidProduct;
-    DWORD   dwDevType;
-    CHAR    tszInstanceName[MAX_PATH];
-    CHAR    tszProductName[MAX_PATH];
-} DIDEVICEINSTANCEA, *LPDIDEVICEINSTANCEA;
-typedef struct DIDEVICEINSTANCEW {
-    DWORD   dwSize;
-    GUID    guidInstance;
-    GUID    guidProduct;
-    DWORD   dwDevType;
-    WCHAR   tszInstanceName[MAX_PATH];
-    WCHAR   tszProductName[MAX_PATH];
-} DIDEVICEINSTANCEW, *LPDIDEVICEINSTANCEW;
-#ifdef UNICODE
-typedef DIDEVICEINSTANCEW DIDEVICEINSTANCE;
-typedef LPDIDEVICEINSTANCEW LPDIDEVICEINSTANCE;
-#else
-typedef DIDEVICEINSTANCEA DIDEVICEINSTANCE;
-typedef LPDIDEVICEINSTANCEA LPDIDEVICEINSTANCE;
-#endif // UNICODE
-typedef const DIDEVICEINSTANCEA *LPCDIDEVICEINSTANCEA;
-typedef const DIDEVICEINSTANCEW *LPCDIDEVICEINSTANCEW;
-typedef const DIDEVICEINSTANCE  *LPCDIDEVICEINSTANCE;
-
-#undef INTERFACE
-#define INTERFACE IDirectInputDeviceW
-
-DECLARE_INTERFACE_(IDirectInputDeviceW, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-    /*** IDirectInputDeviceW methods ***/
-    STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-    STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKW,LPVOID,DWORD) PURE;
-    STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-    STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-    STDMETHOD(Acquire)(THIS) PURE;
-    STDMETHOD(Unacquire)(THIS) PURE;
-    STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-    STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-    STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-    STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-    STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEW,DWORD,DWORD) PURE;
-    STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEW) PURE;
-    STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-    STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-};
-
-typedef struct IDirectInputDeviceW *LPDIRECTINPUTDEVICEW;
-
-#undef INTERFACE
-#define INTERFACE IDirectInputDeviceA
-
-DECLARE_INTERFACE_(IDirectInputDeviceA, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-    /*** IDirectInputDeviceA methods ***/
-    STDMETHOD(GetCapabilities)(THIS_ LPDIDEVCAPS) PURE;
-    STDMETHOD(EnumObjects)(THIS_ LPDIENUMDEVICEOBJECTSCALLBACKA,LPVOID,DWORD) PURE;
-    STDMETHOD(GetProperty)(THIS_ REFGUID,LPDIPROPHEADER) PURE;
-    STDMETHOD(SetProperty)(THIS_ REFGUID,LPCDIPROPHEADER) PURE;
-    STDMETHOD(Acquire)(THIS) PURE;
-    STDMETHOD(Unacquire)(THIS) PURE;
-    STDMETHOD(GetDeviceState)(THIS_ DWORD,LPVOID) PURE;
-    STDMETHOD(GetDeviceData)(THIS_ DWORD,LPDIDEVICEOBJECTDATA,LPDWORD,DWORD) PURE;
-    STDMETHOD(SetDataFormat)(THIS_ LPCDIDATAFORMAT) PURE;
-    STDMETHOD(SetEventNotification)(THIS_ HANDLE) PURE;
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND,DWORD) PURE;
-    STDMETHOD(GetObjectInfo)(THIS_ LPDIDEVICEOBJECTINSTANCEA,DWORD,DWORD) PURE;
-    STDMETHOD(GetDeviceInfo)(THIS_ LPDIDEVICEINSTANCEA) PURE;
-    STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-    STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD,REFGUID) PURE;
-};
-
-typedef struct IDirectInputDeviceA *LPDIRECTINPUTDEVICEA;
-
-#ifdef UNICODE
-#define IID_IDirectInputDevice IID_IDirectInputDeviceW
-#define IDirectInputDevice IDirectInputDeviceW
-#define IDirectInputDeviceVtbl IDirectInputDeviceWVtbl
-#else
-#define IID_IDirectInputDevice IID_IDirectInputDeviceA
-#define IDirectInputDevice IDirectInputDeviceA
-#define IDirectInputDeviceVtbl IDirectInputDeviceAVtbl
-#endif
-typedef struct IDirectInputDevice *LPDIRECTINPUTDEVICE;
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectInputDevice_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirectInputDevice_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IDirectInputDevice_Release(p) (p)->lpVtbl->Release(p)
-#define IDirectInputDevice_GetCapabilities(p,a) (p)->lpVtbl->GetCapabilities(p,a)
-#define IDirectInputDevice_EnumObjects(p,a,b,c) (p)->lpVtbl->EnumObjects(p,a,b,c)
-#define IDirectInputDevice_GetProperty(p,a,b) (p)->lpVtbl->GetProperty(p,a,b)
-#define IDirectInputDevice_SetProperty(p,a,b) (p)->lpVtbl->SetProperty(p,a,b)
-#define IDirectInputDevice_Acquire(p) (p)->lpVtbl->Acquire(p)
-#define IDirectInputDevice_Unacquire(p) (p)->lpVtbl->Unacquire(p)
-#define IDirectInputDevice_GetDeviceState(p,a,b) (p)->lpVtbl->GetDeviceState(p,a,b)
-#define IDirectInputDevice_GetDeviceData(p,a,b,c,d) (p)->lpVtbl->GetDeviceData(p,a,b,c,d)
-#define IDirectInputDevice_SetDataFormat(p,a) (p)->lpVtbl->SetDataFormat(p,a)
-#define IDirectInputDevice_SetEventNotification(p,a) (p)->lpVtbl->SetEventNotification(p,a)
-#define IDirectInputDevice_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-#define IDirectInputDevice_GetObjectInfo(p,a,b,c) (p)->lpVtbl->GetObjectInfo(p,a,b,c)
-#define IDirectInputDevice_GetDeviceInfo(p,a) (p)->lpVtbl->GetDeviceInfo(p,a)
-#define IDirectInputDevice_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-#define IDirectInputDevice_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
-#endif
-
-/****************************************************************************
- *
- *      Mouse
- *
- ****************************************************************************/
-
-typedef struct _DIMOUSESTATE {
-    LONG    lX;
-    LONG    lY;
-    LONG    lZ;
-    BYTE    rgbButtons[4];
-} DIMOUSESTATE, *LPDIMOUSESTATE;
-
-#define DIMOFS_X        FIELD_OFFSET(DIMOUSESTATE, lX)
-#define DIMOFS_Y        FIELD_OFFSET(DIMOUSESTATE, lY)
-#define DIMOFS_Z        FIELD_OFFSET(DIMOUSESTATE, lZ)
-#define DIMOFS_BUTTON0 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 0)
-#define DIMOFS_BUTTON1 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 1)
-#define DIMOFS_BUTTON2 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 2)
-#define DIMOFS_BUTTON3 (FIELD_OFFSET(DIMOUSESTATE, rgbButtons) + 3)
-
-/****************************************************************************
- *
- *      Keyboard
- *
- ****************************************************************************/
-
-/****************************************************************************
- *
- *      DirectInput keyboard scan codes
- *
- ****************************************************************************/
-
-#define DIK_ESCAPE          0x01
-#define DIK_1               0x02
-#define DIK_2               0x03
-#define DIK_3               0x04
-#define DIK_4               0x05
-#define DIK_5               0x06
-#define DIK_6               0x07
-#define DIK_7               0x08
-#define DIK_8               0x09
-#define DIK_9               0x0A
-#define DIK_0               0x0B
-#define DIK_MINUS           0x0C    /* - on main keyboard */
-#define DIK_EQUALS          0x0D
-#define DIK_BACK            0x0E    /* backspace */
-#define DIK_TAB             0x0F
-#define DIK_Q               0x10
-#define DIK_W               0x11
-#define DIK_E               0x12
-#define DIK_R               0x13
-#define DIK_T               0x14
-#define DIK_Y               0x15
-#define DIK_U               0x16
-#define DIK_I               0x17
-#define DIK_O               0x18
-#define DIK_P               0x19
-#define DIK_LBRACKET        0x1A
-#define DIK_RBRACKET        0x1B
-#define DIK_RETURN          0x1C    /* Enter on main keyboard */
-#define DIK_LCONTROL        0x1D
-#define DIK_A               0x1E
-#define DIK_S               0x1F
-#define DIK_D               0x20
-#define DIK_F               0x21
-#define DIK_G               0x22
-#define DIK_H               0x23
-#define DIK_J               0x24
-#define DIK_K               0x25
-#define DIK_L               0x26
-#define DIK_SEMICOLON       0x27
-#define DIK_APOSTROPHE      0x28
-#define DIK_GRAVE           0x29    /* accent grave */
-#define DIK_LSHIFT          0x2A
-#define DIK_BACKSLASH       0x2B
-#define DIK_Z               0x2C
-#define DIK_X               0x2D
-#define DIK_C               0x2E
-#define DIK_V               0x2F
-#define DIK_B               0x30
-#define DIK_N               0x31
-#define DIK_M               0x32
-#define DIK_COMMA           0x33
-#define DIK_PERIOD          0x34    /* . on main keyboard */
-#define DIK_SLASH           0x35    /* / on main keyboard */
-#define DIK_RSHIFT          0x36
-#define DIK_MULTIPLY        0x37    /* * on numeric keypad */
-#define DIK_LMENU           0x38    /* left Alt */
-#define DIK_SPACE           0x39
-#define DIK_CAPITAL         0x3A
-#define DIK_F1              0x3B
-#define DIK_F2              0x3C
-#define DIK_F3              0x3D
-#define DIK_F4              0x3E
-#define DIK_F5              0x3F
-#define DIK_F6              0x40
-#define DIK_F7              0x41
-#define DIK_F8              0x42
-#define DIK_F9              0x43
-#define DIK_F10             0x44
-#define DIK_NUMLOCK         0x45
-#define DIK_SCROLL          0x46    /* Scroll Lock */
-#define DIK_NUMPAD7         0x47
-#define DIK_NUMPAD8         0x48
-#define DIK_NUMPAD9         0x49
-#define DIK_SUBTRACT        0x4A    /* - on numeric keypad */
-#define DIK_NUMPAD4         0x4B
-#define DIK_NUMPAD5         0x4C
-#define DIK_NUMPAD6         0x4D
-#define DIK_ADD             0x4E    /* + on numeric keypad */
-#define DIK_NUMPAD1         0x4F
-#define DIK_NUMPAD2         0x50
-#define DIK_NUMPAD3         0x51
-#define DIK_NUMPAD0         0x52
-#define DIK_DECIMAL         0x53    /* . on numeric keypad */
-#define DIK_F11             0x57
-#define DIK_F12             0x58
-
-#define DIK_F13             0x64    /*                     (NEC PC98) */
-#define DIK_F14             0x65    /*                     (NEC PC98) */
-#define DIK_F15             0x66    /*                     (NEC PC98) */
-
-#define DIK_KANA            0x70    /* (Japanese keyboard)            */
-#define DIK_CONVERT         0x79    /* (Japanese keyboard)            */
-#define DIK_NOCONVERT       0x7B    /* (Japanese keyboard)            */
-#define DIK_YEN             0x7D    /* (Japanese keyboard)            */
-#define DIK_NUMPADEQUALS    0x8D    /* = on numeric keypad (NEC PC98) */
-#define DIK_CIRCUMFLEX      0x90    /* (Japanese keyboard)            */
-#define DIK_AT              0x91    /*                     (NEC PC98) */
-#define DIK_COLON           0x92    /*                     (NEC PC98) */
-#define DIK_UNDERLINE       0x93    /*                     (NEC PC98) */
-#define DIK_KANJI           0x94    /* (Japanese keyboard)            */
-#define DIK_STOP            0x95    /*                     (NEC PC98) */
-#define DIK_AX              0x96    /*                     (Japan AX) */
-#define DIK_UNLABELED       0x97    /*                        (J3100) */
-#define DIK_NUMPADENTER     0x9C    /* Enter on numeric keypad */
-#define DIK_RCONTROL        0x9D
-#define DIK_NUMPADCOMMA     0xB3    /* , on numeric keypad (NEC PC98) */
-#define DIK_DIVIDE          0xB5    /* / on numeric keypad */
-#define DIK_SYSRQ           0xB7
-#define DIK_RMENU           0xB8    /* right Alt */
-#define DIK_HOME            0xC7    /* Home on arrow keypad */
-#define DIK_UP              0xC8    /* UpArrow on arrow keypad */
-#define DIK_PRIOR           0xC9    /* PgUp on arrow keypad */
-#define DIK_LEFT            0xCB    /* LeftArrow on arrow keypad */
-#define DIK_RIGHT           0xCD    /* RightArrow on arrow keypad */
-#define DIK_END             0xCF    /* End on arrow keypad */
-#define DIK_DOWN            0xD0    /* DownArrow on arrow keypad */
-#define DIK_NEXT            0xD1    /* PgDn on arrow keypad */
-#define DIK_INSERT          0xD2    /* Insert on arrow keypad */
-#define DIK_DELETE          0xD3    /* Delete on arrow keypad */
-#define DIK_LWIN            0xDB    /* Left Windows key */
-#define DIK_RWIN            0xDC    /* Right Windows key */
-#define DIK_APPS            0xDD    /* AppMenu key */
-
-/*
- *  Alternate names for keys, to facilitate transition from DOS.
- */
-#define DIK_BACKSPACE       DIK_BACK            /* backspace */
-#define DIK_NUMPADSTAR      DIK_MULTIPLY        /* * on numeric keypad */
-#define DIK_LALT            DIK_LMENU           /* left Alt */
-#define DIK_CAPSLOCK        DIK_CAPITAL         /* CapsLock */
-#define DIK_NUMPADMINUS     DIK_SUBTRACT        /* - on numeric keypad */
-#define DIK_NUMPADPLUS      DIK_ADD             /* + on numeric keypad */
-#define DIK_NUMPADPERIOD    DIK_DECIMAL         /* . on numeric keypad */
-#define DIK_NUMPADSLASH     DIK_DIVIDE          /* / on numeric keypad */
-#define DIK_RALT            DIK_RMENU           /* right Alt */
-#define DIK_UPARROW         DIK_UP              /* UpArrow on arrow keypad */
-#define DIK_PGUP            DIK_PRIOR           /* PgUp on arrow keypad */
-#define DIK_LEFTARROW       DIK_LEFT            /* LeftArrow on arrow keypad */
-#define DIK_RIGHTARROW      DIK_RIGHT           /* RightArrow on arrow keypad */
-#define DIK_DOWNARROW       DIK_DOWN            /* DownArrow on arrow keypad */
-#define DIK_PGDN            DIK_NEXT            /* PgDn on arrow keypad */
-
-/****************************************************************************
- *
- *  IDirectInput
- *
- ****************************************************************************/
-
-#define DIENUM_STOP             0
-#define DIENUM_CONTINUE         1
-
-typedef BOOL (FAR PASCAL * LPDIENUMDEVICESCALLBACKA)(LPCDIDEVICEINSTANCEA, LPVOID);
-typedef BOOL (FAR PASCAL * LPDIENUMDEVICESCALLBACKW)(LPCDIDEVICEINSTANCEW, LPVOID);
-#ifdef UNICODE
-#define LPDIENUMDEVICESCALLBACK  LPDIENUMDEVICESCALLBACKW
-#else
-#define LPDIENUMDEVICESCALLBACK  LPDIENUMDEVICESCALLBACKA
-#endif // !UNICODE
-
-#define DIEDFL_ALLDEVICES       0x00000000
-#define DIEDFL_ATTACHEDONLY     0x00000001
-
-#undef INTERFACE
-#define INTERFACE IDirectInputW
-
-DECLARE_INTERFACE_(IDirectInputW, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-    /*** IDirectInputW methods ***/
-    STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEW *,LPUNKNOWN) PURE;
-    STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKW,LPVOID,DWORD) PURE;
-    STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-    STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-    STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-};
-
-typedef struct IDirectInputW *LPDIRECTINPUTW;
-
-#undef INTERFACE
-#define INTERFACE IDirectInputA
-
-DECLARE_INTERFACE_(IDirectInputA, IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-    /*** IDirectInputA methods ***/
-    STDMETHOD(CreateDevice)(THIS_ REFGUID,LPDIRECTINPUTDEVICEA *,LPUNKNOWN) PURE;
-    STDMETHOD(EnumDevices)(THIS_ DWORD,LPDIENUMDEVICESCALLBACKA,LPVOID,DWORD) PURE;
-    STDMETHOD(GetDeviceStatus)(THIS_ REFGUID) PURE;
-    STDMETHOD(RunControlPanel)(THIS_ HWND,DWORD) PURE;
-    STDMETHOD(Initialize)(THIS_ HINSTANCE,DWORD) PURE;
-};
-
-typedef struct IDirectInputA *LPDIRECTINPUTA;
-
-#ifdef UNICODE
-#define IID_IDirectInput IID_IDirectInputW
-#define IDirectInput IDirectInputW
-#define IDirectInputVtbl IDirectInputWVtbl
-#else
-#define IID_IDirectInput IID_IDirectInputA
-#define IDirectInput IDirectInputA
-#define IDirectInputVtbl IDirectInputAVtbl
-#endif
-typedef struct IDirectInput *LPDIRECTINPUT;
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectInput_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirectInput_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IDirectInput_Release(p) (p)->lpVtbl->Release(p)
-#define IDirectInput_CreateDevice(p,a,b,c) (p)->lpVtbl->CreateDevice(p,a,b,c)
-#define IDirectInput_EnumDevices(p,a,b,c,d) (p)->lpVtbl->EnumDevices(p,a,b,c,d)
-#define IDirectInput_GetDeviceStatus(p,a) (p)->lpVtbl->GetDeviceStatus(p,a)
-#define IDirectInput_RunControlPanel(p,a,b) (p)->lpVtbl->RunControlPanel(p,a,b)
-#define IDirectInput_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
-#endif
-
-extern HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter);
-extern HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTW *ppDI, LPUNKNOWN punkOuter);
-#ifdef UNICODE
-#define DirectInputCreate  DirectInputCreateW
-#else
-#define DirectInputCreate  DirectInputCreateA
-#endif // !UNICODE
-
-/****************************************************************************
- *
- *  Return Codes
- *
- ****************************************************************************/
-
-/*
- *  The operation completed successfully.
- */
-#define DI_OK                           S_OK
-
-/*
- *  The device exists but is not currently attached.
- */
-#define DI_NOTATTACHED                  S_FALSE
-
-/*
- *  The device buffer overflowed; some input was lost.
- */
-#define DI_BUFFEROVERFLOW               S_FALSE
-
-/*
- *  The change in device properties had no effect.
- */
-#define DI_PROPNOEFFECT                 S_FALSE
-
-/*
- *  The device is a polled device.  As a result, device buffering
- *  will not collect any data and event notifications will not be
- *  signalled until GetDeviceState is called.
- */
-#define DI_POLLEDDEVICE                 ((HRESULT)0x00000002L)
-
-/*
- *  The application requires a newer version of DirectInput.
- */
-#define DIERR_OLDDIRECTINPUTVERSION     \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_OLD_WIN_VERSION)
-
-/*
- *  The application was written for an unsupported prerelease version
- *  of DirectInput.
- */
-#define DIERR_BETADIRECTINPUTVERSION    \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_RMODE_APP)
-
-/*
- *  The object could not be created due to an incompatible driver version
- *  or mismatched or incomplete driver components.
- */
-#define DIERR_BADDRIVERVER              \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_BAD_DRIVER_LEVEL)
-
-/*
- * The device or device instance is not registered with DirectInput.
- */
-#define DIERR_DEVICENOTREG              REGDB_E_CLASSNOTREG
-
-/*
- * The requested object does not exist.
- */
-#define DIERR_OBJECTNOTFOUND            \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_FILE_NOT_FOUND)
-
-/*
- * An invalid parameter was passed to the returning function,
- * or the object was not in a state that admitted the function
- * to be called.
- */
-#define DIERR_INVALIDPARAM              E_INVALIDARG
-
-/*
- * The specified interface is not supported by the object
- */
-#define DIERR_NOINTERFACE               E_NOINTERFACE
-
-/*
- * An undetermined error occured inside the DInput subsystem
- */
-#define DIERR_GENERIC                   E_FAIL
-
-/*
- * The DInput subsystem couldn't allocate sufficient memory to complete the
- * caller's request.
- */
-#define DIERR_OUTOFMEMORY               E_OUTOFMEMORY
-
-/*
- * The function called is not supported at this time
- */
-#define DIERR_UNSUPPORTED               E_NOTIMPL
-
-/*
- * This object has not been initialized
- */
-#define DIERR_NOTINITIALIZED            \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_NOT_READY)
-
-/*
- * This object is already initialized
- */
-#define DIERR_ALREADYINITIALIZED        \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_ALREADY_INITIALIZED)
-
-/*
- * This object does not support aggregation
- */
-#define DIERR_NOAGGREGATION             CLASS_E_NOAGGREGATION
-
-/*
- * Another app has a higher priority level, preventing this call from
- * succeeding.
- */
-#define DIERR_OTHERAPPHASPRIO           E_ACCESSDENIED
-
-/*
- * Access to the input device has been lost.  It must be re-acquired.
- */
-#define DIERR_INPUTLOST                 \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_READ_FAULT)
-
-/*
- * The operation cannot be performed while the device is acquired.
- */
-#define DIERR_ACQUIRED                  \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_BUSY)
-
-/*
- * The operation cannot be performed unless the device is acquired.
- */
-#define DIERR_NOTACQUIRED               \
-    MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_INVALID_ACCESS)
-
-/*
- * The specified property cannot be changed.
- */
-#define DIERR_READONLY                  E_ACCESSDENIED
-
-/*
- * The device already has an event notification associated with it.
- */
-#define DIERR_HANDLEEXISTS              E_ACCESSDENIED
-
-/*
- * Data is not yet available.
- */
-#ifndef E_PENDING
-#define E_PENDING                       0x80070007L
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif  /* __DINPUT_INCLUDED__ */
-
-/****************************************************************************
- *
- *  Definitions for non-IDirectInput (VJoyD) features defined more recently
- *  than the current sdk files
- *
- ****************************************************************************/
-
-#ifdef _INC_MMSYSTEM
-#ifndef MMNOJOY
-
-#ifndef __VJOYDX_INCLUDED__
-#define __VJOYDX_INCLUDED__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Flag to indicate that the dwReserved2 field of the JOYINFOEX structure
- * contains mini-driver specific data to be passed by VJoyD to the mini-
- * driver instead of doing a poll.
- */
-#define JOY_PASSDRIVERDATA          0x10000000l
-
-/*
- * Informs the joystick driver that the configuration has been changed
- * and should be reloaded from the registery.
- * dwFlags is reserved and should be set to zero
- */
-WINMMAPI MMRESULT WINAPI joyConfigChanged( DWORD dwFlags );
-
-/*
- * Hardware Setting indicating that the device is a headtracker
- */
-#define JOY_HWS_ISHEADTRACKER       0x02000000l
-
-/*
- * Hardware Setting indicating that the VxD is used to replace
- * the standard analog polling
- */
-#define JOY_HWS_ISGAMEPORTDRIVER    0x04000000l
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif  /* __VJOYDX_INCLUDED__ */
-
-#endif  /* not MMNOJOY */
-#endif  /* _INC_MMSYSTEM */
-
-/****************************************************************************
- *
- *  Definitions for non-IDirectInput (VJoyD) features defined more recently
- *  than the current ddk files
- *
- ****************************************************************************/
-
-#ifdef _INC_MMDDK
-#ifndef MMNOJOYDEV
-
-#ifndef __VJOYDXD_INCLUDED__
-#define __VJOYDXD_INCLUDED__
-/*
- * Poll type in which the do_other field of the JOYOEMPOLLDATA
- * structure contains mini-driver specific data passed from an app.
- */
-#define JOY_OEMPOLL_PASSDRIVERDATA  7
-
-#endif  /* __VJOYDXD_INCLUDED__ */
-
-#endif  /* not MMNOJOYDEV */
-#endif  /* _INC_MMDDK */
--- a/u/dxsdk/SDK/INC/DPLAY.H
+++ /dev/null
@@ -1,308 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1994-1995 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       dplay.h
- *  Content:    DirectPlay include file
- *
- ***************************************************************************/
-
-#ifndef __DPLAY_INCLUDED__
-#define __DPLAY_INCLUDED__
-#ifdef _WIN32
-/* for DECLARE_INTERFACE and HRESULT. */
-#include <ole2.h>
-#endif
-
-#define _FACDP  0x877
-#define MAKE_DPHRESULT( code )    MAKE_HRESULT( 1, _FACDP, code )
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push, 1)
-
-
-/*============================================================================
- *
- * DirectPlay Structures
- *
- * Various structures used to invoke DirectPlay.
- *
- *==========================================================================*/
-
-#ifdef __cplusplus
-/* 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined */
-struct IDirectPlay;
-typedef struct IDirectPlay        FAR *LPDIRECTPLAY;
-#else                  
-typedef struct IDirectPlay        FAR *LPDIRECTPLAY;
-#endif
-
-typedef DWORD DPID, FAR *LPDPID;
-
-typedef struct _DPCAPS
-{
-    DWORD   dwSize;
-    DWORD   dwFlags;
-    DWORD   dwMaxBufferSize;
-    DWORD   dwMaxQueueSize;             // Function of DPlay, not SP.
-    DWORD   dwMaxPlayers;
-    DWORD   dwHundredBaud;              // 24 is 2400, 96 is 9600, etc.
-    DWORD   dwLatency;
-} DPCAPS;
-
-typedef DPCAPS        FAR *LPDPCAPS;
-
-#define DPLONGNAMELEN           52
-#define DPSHORTNAMELEN          20
-#define DPSESSIONNAMELEN        32
-#define DPPASSWORDLEN           16
-#define DPUSERRESERVED          16
-
-typedef struct
-{
-    DWORD   dwSize;
-    GUID    guidSession;                  // Id for Game.  Null is all games.
-    DWORD   dwSession;                    // session identifier
-    DWORD   dwMaxPlayers;                 // Maximum players allowed in game.
-    DWORD   dwCurrentPlayers;             // Current  players in Game.
-    DWORD   dwFlags;                      // DPOPEN_* flags
-    char    szSessionName[DPSESSIONNAMELEN];// Human readable name for Game
-    char    szUserField[DPUSERRESERVED];
-    DWORD   dwReserved1;                  // Reserved for future MS use.
-    char    szPassword[DPPASSWORDLEN];    // Password to be allowed into game.
-    DWORD   dwReserved2;                  // Reserved for future MS use. 
-    DWORD   dwUser1;
-    DWORD   dwUser2;
-    DWORD   dwUser3;
-    DWORD   dwUser4;
-} DPSESSIONDESC;
-typedef DPSESSIONDESC FAR *LPDPSESSIONDESC;
-
-
-/*
- * Create API
- */
-typedef BOOL (FAR PASCAL * LPDPENUMDPCALLBACK)(
-    LPGUID              lpSPGuid,
-    LPSTR               lpFriendlyName,
-    DWORD               dwMajorVersion,
-    DWORD               dwMinorVersion,
-    LPVOID              lpContext);
-
-typedef BOOL (FAR PASCAL * LPDPENUMSESSIONSCALLBACK)(
-    LPDPSESSIONDESC     lpDPSGameDesc,
-    LPVOID              lpContext,
-    LPDWORD             lpdwTimeOut,
-    DWORD               dwFlags);
-
-
-
-extern HRESULT WINAPI DirectPlayCreate( LPGUID lpGUID, LPDIRECTPLAY FAR *lplpDP, IUnknown FAR *pUnk);
-extern HRESULT WINAPI DirectPlayEnumerate( LPDPENUMDPCALLBACK, LPVOID );
-
-
-/* Player enumeration callback prototype */
-typedef BOOL (FAR PASCAL *LPDPENUMPLAYERSCALLBACK)(
-    DPID    dpId,
-    LPSTR   lpFriendlyName,
-    LPSTR   lpFormalName,
-    DWORD   dwFlags,
-    LPVOID  lpContext );
-
-/*
- * IDirectPlay
- */
-#undef INTERFACE
-#define INTERFACE IDirectPlay
-#ifdef _WIN32
-DECLARE_INTERFACE_( IDirectPlay, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface)       (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef)        (THIS)  PURE;
-    STDMETHOD_(ULONG,Release)       (THIS) PURE;
-    /*** IDirectPlay methods ***/
-    STDMETHOD(AddPlayerToGroup)     (THIS_ DPID, DPID) PURE;
-    STDMETHOD(Close)                (THIS) PURE;
-    STDMETHOD(CreatePlayer)         (THIS_ LPDPID,LPSTR,LPSTR,LPHANDLE) PURE;
-    STDMETHOD(CreateGroup)          (THIS_ LPDPID,LPSTR,LPSTR) PURE;
-    STDMETHOD(DeletePlayerFromGroup)(THIS_ DPID,DPID) PURE;
-    STDMETHOD(DestroyPlayer)        (THIS_ DPID) PURE;
-    STDMETHOD(DestroyGroup)         (THIS_ DPID) PURE;
-    STDMETHOD(EnableNewPlayers)     (THIS_ BOOL) PURE;
-    STDMETHOD(EnumGroupPlayers)     (THIS_ DPID, LPDPENUMPLAYERSCALLBACK,LPVOID,DWORD) PURE;
-    STDMETHOD(EnumGroups)           (THIS_ DWORD, LPDPENUMPLAYERSCALLBACK,LPVOID,DWORD) PURE;
-    STDMETHOD(EnumPlayers)          (THIS_ DWORD, LPDPENUMPLAYERSCALLBACK,LPVOID,DWORD) PURE;
-    STDMETHOD(EnumSessions)         (THIS_ LPDPSESSIONDESC,DWORD,LPDPENUMSESSIONSCALLBACK,LPVOID,DWORD) PURE;
-    STDMETHOD(GetCaps)              (THIS_ LPDPCAPS) PURE;
-    STDMETHOD(GetMessageCount)      (THIS_ DPID, LPDWORD) PURE;
-    STDMETHOD(GetPlayerCaps)        (THIS_ DPID, LPDPCAPS) PURE;
-    STDMETHOD(GetPlayerName)        (THIS_ DPID,LPSTR,LPDWORD,LPSTR,LPDWORD) PURE;
-    STDMETHOD(Initialize)           (THIS_ LPGUID) PURE;
-    STDMETHOD(Open)                 (THIS_ LPDPSESSIONDESC) PURE;
-    STDMETHOD(Receive)              (THIS_ LPDPID,LPDPID,DWORD,LPVOID,LPDWORD) PURE;
-    STDMETHOD(SaveSession)          (THIS_ LPSTR) PURE;
-    STDMETHOD(Send)                 (THIS_ DPID, DPID, DWORD, LPVOID, DWORD) PURE;
-    STDMETHOD(SetPlayerName)        (THIS_ DPID,LPSTR,LPSTR) PURE;
-};
-#endif
-
-
-
-
-/****************************************************************************
- *
- * DIRECTPLAY ERRORS
- *
- * Errors are represented by negative values and cannot be combined.
- *
- ****************************************************************************/
-#define DP_OK                           0
-#define DPERR_ALREADYINITIALIZED        MAKE_DPHRESULT(   5 )
-#define DPERR_ACCESSDENIED              MAKE_DPHRESULT(  10 )
-#define DPERR_ACTIVEPLAYERS             MAKE_DPHRESULT(  20 )
-#define DPERR_BUFFERTOOSMALL            MAKE_DPHRESULT(  30 )
-#define DPERR_CANTADDPLAYER             MAKE_DPHRESULT(  40 )
-#define DPERR_CANTCREATEGROUP           MAKE_DPHRESULT(  50 )
-#define DPERR_CANTCREATEPLAYER          MAKE_DPHRESULT(  60 )
-#define DPERR_CANTCREATESESSION         MAKE_DPHRESULT(  70 )
-#define DPERR_CAPSNOTAVAILABLEYET       MAKE_DPHRESULT(  80 )
-#define DPERR_EXCEPTION                 MAKE_DPHRESULT(  90 )
-#define DPERR_GENERIC                   E_FAIL
-
-#define DPERR_INVALIDFLAGS              MAKE_DPHRESULT( 120 )
-#define DPERR_INVALIDOBJECT             MAKE_DPHRESULT( 130 )
-#define DPERR_INVALIDPARAM              E_INVALIDARG
-#define DPERR_INVALIDPARAMS             DPERR_INVALIDPARAM
-#define DPERR_INVALIDPLAYER             MAKE_DPHRESULT( 150 )
-#define DPERR_NOCAPS                    MAKE_DPHRESULT( 160 )
-#define DPERR_NOCONNECTION              MAKE_DPHRESULT( 170 )
-#define DPERR_NOMEMORY                  E_OUTOFMEMORY
-#define DPERR_OUTOFMEMORY               DPERR_NOMEMORY
-#define DPERR_NOMESSAGES                MAKE_DPHRESULT( 190 )
-#define DPERR_NONAMESERVERFOUND         MAKE_DPHRESULT( 200 )
-#define DPERR_NOPLAYERS                 MAKE_DPHRESULT( 210 )
-#define DPERR_NOSESSIONS                MAKE_DPHRESULT( 220 )
-#define DPERR_SENDTOOBIG                MAKE_DPHRESULT( 230 )
-#define DPERR_TIMEOUT                   MAKE_DPHRESULT( 240 )
-#define DPERR_UNAVAILABLE               MAKE_DPHRESULT( 250 )
-#define DPERR_UNSUPPORTED               E_NOTIMPL
-#define DPERR_BUSY                      MAKE_DPHRESULT( 270 )
-#define DPERR_USERCANCEL                MAKE_DPHRESULT( 280 ) 
-
-
-#define DPOPEN_OPENSESSION          0x00000001
-#define DPOPEN_CREATESESSION        0x00000002
-
-#define DPSEND_GUARANTEE            0x00000001
-#define DPSEND_HIGHPRIORITY         0x00000002
-#define DPSEND_TRYONCE              0x00000004
-
-#define DPRECEIVE_ALL               0x00000001
-#define DPRECEIVE_TOPLAYER          0x00000002
-#define DPRECEIVE_FROMPLAYER        0x00000004
-#define DPRECEIVE_PEEK              0x00000008
-
-#define DPCAPS_NAMESERVICE          0x00000001 // A name server is supported.
-#define DPCAPS_NAMESERVER           0x00000002 // You are the name server.
-#define DPCAPS_GUARANTEED           0x00000004 // SP's don't have to implement guarantees.
-
-#define DPENUMSESSIONS_AVAILABLE    0x00000001 // All games that match password (if given)
-                                               // and have openings.
-#define DPENUMSESSIONS_ALL          0x00000002
-#define DPENUMSESSIONS_PREVIOUS     0x00000004
-
-#define DPENUMPLAYERS_ALL           0x00000000
-#define DPENUMPLAYERS_PREVIOUS      0x00000004
-#define DPENUMPLAYERS_LOCAL         0x00000008
-#define DPENUMPLAYERS_REMOTE        0x00000010
-#define DPENUMPLAYERS_GROUP         0x00000020
-#define DPENUMPLAYERS_SESSION       0x00000080
-
-//
-// This flag is set on the enumsessions callback when the time out has occured.
-// This means that there is no session data for this callback.
-// If lpdwTimeOut is set to a non-zero value and the EnumSessionsCallback returns
-// TRUE then EnumSessions will continue until the next timeout occurs.
-// Timeouts are in milliseconds.
- 
-#define DPESC_TIMEDOUT              0x00000001
-
-
-//
-// System message structures and types.
-//
-// System messages have a leading 4 byte type code to identify the message.
-// an app knows it is a system message because it is addressed 'To' player 0.
-//
-
-                                    
-#define DPSYS_ADDPLAYER               0x0003  // DPMSG_ADDPLAYER
-#define DPSYS_DELETEPLAYER            0x0005  // DPMSG_DELETEPLAYER
-
-#define DPSYS_ADDPLAYERTOGROUP        0x0007  // DPMSG_GROUPADD
-
-#define DPSYS_INVITE                  0x000e  // DPMSG_INVITE, Net only.
-
-#define DPSYS_DELETEGROUP             0x0020  // DPMSG_DELETEPLAYER
-#define DPSYS_DELETEPLAYERFROMGRP     0x0021  // DPMSG_GROUPDELETE
-#define DPSYS_SESSIONLOST             0x0031
-
-#define DPSYS_CONNECT                 0x484b  // DPMSG_GENERIC
-
-
-
-typedef struct
-{
-    DWORD       dwType;
-    DWORD       dwPlayerType;
-    DPID        dpId;
-    char        szLongName[DPLONGNAMELEN];
-    char        szShortName[DPSHORTNAMELEN];
-    DWORD       dwCurrentPlayers;
-}   DPMSG_ADDPLAYER;
-
-typedef DPMSG_ADDPLAYER DPMSG_ADDGROUP;
-
-typedef struct
-{
-    DWORD       dwType;
-    DPID        dpIdGroup;
-    DPID        dpIdPlayer;
-} DPMSG_GROUPADD;
-
-typedef DPMSG_GROUPADD DPMSG_GROUPDELETE;
-typedef struct
-{
-    DWORD       dwType;
-    DPID        dpId;
-} DPMSG_DELETEPLAYER;
-
-typedef struct
-{
-    DWORD           dwType;
-    DPSESSIONDESC   dpsDesc;
-} DPMSG_INVITE;
-
-
-
-typedef struct
-{
-    DWORD           dwType;
-} DPMSG_GENERIC;
-
-#pragma pack(pop)
-
-
-DEFINE_GUID( IID_IDirectPlay, 0x5454e9a0, 0xdb65, 0x11ce, 0x92, 0x1c, 0x00, 0xaa, 0x00, 0x6c, 0x49, 0x72);
-
-
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
--- a/u/dxsdk/SDK/INC/DSETUP.H
+++ /dev/null
@@ -1,66 +1,0 @@
-/*==========================================================================
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       dsetup.h
- *  Content:    DirectXSetup, error codes and flags
- ***************************************************************************/
-
-#ifndef __DSETUP_H__
-#define __DSETUP_H__
-
-#ifdef _WIN32
-#define COM_NO_WINDOWS_H
-#include <objbase.h>
-#else
-#define GUID void
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DSETUPERR_BADWINDOWSVERSION     -1
-#define DSETUPERR_SOURCEFILENOTFOUND    -2
-#define DSETUPERR_BADSOURCESIZE         -3
-#define DSETUPERR_BADSOURCETIME         -4
-#define DSETUPERR_NOCOPY                -5
-#define DSETUPERR_OUTOFDISKSPACE        -6
-#define DSETUPERR_CANTFINDINF           -7
-#define DSETUPERR_CANTFINDDIR           -8
-#define DSETUPERR_INTERNAL              -9
-#define DSETUPERR_NTWITHNO3D            -10
-
-
-#define MAX_INFLINE             (16*1024)
-#define MAX_DESCRIPTION         256
-
-#define DSETUP_DDRAW            0x00000001      /* install DirectDraw           */
-#define DSETUP_DSOUND           0x00000002      /* install DirectSound          */
-#define DSETUP_DPLAY            0x00000004      /* install DirectPlay           */
-#define DSETUP_DDRAWDRV         0x00000008      /* install DirectDraw Drivers   */
-#define DSETUP_DSOUNDDRV        0x00000010      /* install DirectSound Drivers  */
-#define DSETUP_DPLAYSP          0x00000020      /* install DirectPlay Providers */
-#define DSETUP_DVIDEO           0x00000040      /* install DirectVideo          */
-#define DSETUP_REINSTALL        0x00000080      /* install DirectX even if existing components have the same version    */
-#define DSETUP_DRVINFONLY       0x00000100      /* install DirectX inf files but not drivers                            */
-#define DSETUP_D3D              0x00000200      /* install Direct3D                                                     */
-#define DSETUP_REQUIRESD3D      0x00000400 | DSETUP_D3D /* install Direct3D, pop up dialog box on NT, if no D3D present         */
-
-#define DSETUP_DIRECTX          (DSETUP_D3D | DSETUP_DDRAW | DSETUP_DSOUND | DSETUP_DPLAY | DSETUP_DDRAWDRV | DSETUP_DSOUNDDRV | DSETUP_DPLAYSP)
-
-int WINAPI DirectXSetup( HWND hwnd, LPSTR root_path, DWORD flags );
-int WINAPI DirectXDeviceDriverSetup( HWND hwnd, LPSTR driver_class, LPSTR inf_path, LPSTR driver_path, DWORD flags );
-int WINAPI DirectXSetupIsJapan( void );
-int WINAPI DirectXSetupIsJapanNec( void );
-
-typedef int (WINAPI * LPDIRECTXSETUP)( HWND, LPSTR, DWORD );
-typedef int (WINAPI * LPDIRECTXDEVICEDRIVERSETUP)( HWND, LPSTR, LPSTR, LPSTR, DWORD );
-typedef int (WINAPI * LPDIRECTXSETUPISJAPAN)( void );
-typedef int (WINAPI * LPDIRECTXSETUPISJAPANNEC)( void );
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
--- a/u/dxsdk/SDK/INC/DSOUND.H
+++ /dev/null
@@ -1,366 +1,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) 1995,1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       dsound.h
- *  Content:    DirectSound include file
- *
- ***************************************************************************/
-
-#ifndef __DSOUND_INCLUDED__
-#define __DSOUND_INCLUDED__
-
-#ifdef _WIN32
-#define COM_NO_WINDOWS_H
-#include <objbase.h>
-#endif
-
-#define _FACDS  0x878
-#define MAKE_DSHRESULT( code )  MAKE_HRESULT( 1, _FACDS, code )
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Direct Sound Component GUID    {47D4D946-62E8-11cf-93BC-444553540000}
-DEFINE_GUID(CLSID_DirectSound,
-0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
-
-// DirectSound 279afa83-4981-11ce-a521-0020af0be560
-DEFINE_GUID(IID_IDirectSound,0x279AFA83,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-// DirectSoundBuffer 279afa85-4981-11ce-a521-0020af0be560
-DEFINE_GUID(IID_IDirectSoundBuffer,0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-
-
-
-//==========================================================================;
-//
-//                            Structures...
-//
-//==========================================================================;
-#ifdef __cplusplus
-/* 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined */
-struct IDirectSound;
-struct IDirectSoundBuffer;
-#endif
-
-typedef struct IDirectSound           *LPDIRECTSOUND;        
-typedef struct IDirectSoundBuffer     *LPDIRECTSOUNDBUFFER;  
-typedef struct IDirectSoundBuffer    **LPLPDIRECTSOUNDBUFFER;  
-
-
-typedef struct _DSCAPS
-{
-    DWORD       dwSize;
-    DWORD       dwFlags;
-    DWORD       dwMinSecondarySampleRate;
-    DWORD       dwMaxSecondarySampleRate;
-    DWORD       dwPrimaryBuffers;
-    DWORD       dwMaxHwMixingAllBuffers;
-    DWORD       dwMaxHwMixingStaticBuffers;
-    DWORD       dwMaxHwMixingStreamingBuffers;
-    DWORD       dwFreeHwMixingAllBuffers;
-    DWORD       dwFreeHwMixingStaticBuffers;
-    DWORD       dwFreeHwMixingStreamingBuffers;
-    DWORD       dwMaxHw3DAllBuffers;
-    DWORD       dwMaxHw3DStaticBuffers;
-    DWORD       dwMaxHw3DStreamingBuffers;
-    DWORD       dwFreeHw3DAllBuffers;
-    DWORD       dwFreeHw3DStaticBuffers;
-    DWORD       dwFreeHw3DStreamingBuffers;
-    DWORD       dwTotalHwMemBytes;
-    DWORD       dwFreeHwMemBytes;
-    DWORD       dwMaxContigFreeHwMemBytes;
-    DWORD       dwUnlockTransferRateHwBuffers;
-    DWORD       dwPlayCpuOverheadSwBuffers;
-    DWORD       dwReserved1;
-    DWORD       dwReserved2;
-} DSCAPS, *LPDSCAPS;
-
-typedef struct _DSBCAPS
-{
-    
-    DWORD       dwSize;
-    DWORD       dwFlags;
-    DWORD       dwBufferBytes;
-    DWORD       dwUnlockTransferRate;
-    DWORD       dwPlayCpuOverhead;
-} DSBCAPS, *LPDSBCAPS;
-
-typedef struct _DSBUFFERDESC
-{
-    DWORD                   dwSize;
-    DWORD                   dwFlags;
-    DWORD                   dwBufferBytes;
-    DWORD                   dwReserved;
-    LPWAVEFORMATEX          lpwfxFormat;
-} DSBUFFERDESC, *LPDSBUFFERDESC;
-
-
-
-typedef LPVOID* LPLPVOID;
-
-
-typedef BOOL (FAR PASCAL * LPDSENUMCALLBACKW)(GUID FAR *, LPWSTR, LPWSTR, LPVOID);
-typedef BOOL (FAR PASCAL * LPDSENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
-
-extern HRESULT WINAPI DirectSoundCreate(GUID FAR * lpGUID, LPDIRECTSOUND * ppDS, IUnknown FAR *pUnkOuter );
-extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW lpCallback, LPVOID lpContext );
-extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA lpCallback, LPVOID lpContext );
-
-#ifdef UNICODE
-#define LPDSENUMCALLBACK        LPDSENUMCALLBACKW
-#define DirectSoundEnumerate    DirectSoundEnumerateW
-#else
-#define LPDSENUMCALLBACK        LPDSENUMCALLBACKA
-#define DirectSoundEnumerate    DirectSoundEnumerateA
-#endif
-
-//
-// IDirectSound
-//
-#undef INTERFACE
-#define INTERFACE IDirectSound
-#ifdef _WIN32
-DECLARE_INTERFACE_( IDirectSound, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectSound methods ***/
-
-    STDMETHOD( CreateSoundBuffer)(THIS_ LPDSBUFFERDESC, LPLPDIRECTSOUNDBUFFER, IUnknown FAR *) PURE;
-    STDMETHOD( GetCaps)(THIS_ LPDSCAPS ) PURE;
-    STDMETHOD( DuplicateSoundBuffer)(THIS_ LPDIRECTSOUNDBUFFER, LPLPDIRECTSOUNDBUFFER ) PURE;
-    STDMETHOD( SetCooperativeLevel)(THIS_ HWND, DWORD ) PURE;
-    STDMETHOD( Compact)(THIS ) PURE;
-    STDMETHOD( GetSpeakerConfig)(THIS_ LPDWORD ) PURE;
-    STDMETHOD( SetSpeakerConfig)(THIS_ DWORD ) PURE;
-    STDMETHOD( Initialize)(THIS_ GUID FAR * ) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectSound_QueryInterface(p,a,b)       (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirectSound_AddRef(p)                   (p)->lpVtbl->AddRef(p)
-#define IDirectSound_Release(p)                  (p)->lpVtbl->Release(p)
-#define IDirectSound_CreateSoundBuffer(p,a,b,c)  (p)->lpVtbl->CreateSoundBuffer(p,a,b,c)
-#define IDirectSound_GetCaps(p,a)                (p)->lpVtbl->GetCaps(p,a)
-#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->lpVtbl->DuplicateSoundBuffer(p,a,b)
-#define IDirectSound_SetCooperativeLevel(p,a,b)  (p)->lpVtbl->SetCooperativeLevel(p,a,b)
-#define IDirectSound_Compact(p)                  (p)->lpVtbl->Compact(p)
-#define IDirectSound_GetSpeakerConfig(p,a)       (p)->lpVtbl->GetSpeakerConfig(p,a)
-#define IDirectSound_SetSpeakerConfig(p,b)       (p)->lpVtbl->SetSpeakerConfig(p,b)
-#define IDirectSound_Initialize(p,a)             (p)->lpVtbl->Initialize(p,a)
-#endif
-
-#endif
-
-//
-// IDirectSoundBuffer
-//
-#undef INTERFACE
-#define INTERFACE IDirectSoundBuffer
-#ifdef _WIN32
-DECLARE_INTERFACE_( IDirectSoundBuffer, IUnknown )
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
-    STDMETHOD_(ULONG,Release) (THIS) PURE;
-    /*** IDirectSoundBuffer methods ***/
-
-    STDMETHOD(           GetCaps)(THIS_ LPDSBCAPS ) PURE;
-    STDMETHOD(GetCurrentPosition)(THIS_ LPDWORD,LPDWORD ) PURE;
-    STDMETHOD(         GetFormat)(THIS_ LPWAVEFORMATEX, DWORD, LPDWORD ) PURE;
-    STDMETHOD(         GetVolume)(THIS_ LPLONG ) PURE;
-    STDMETHOD(            GetPan)(THIS_ LPLONG ) PURE;
-    STDMETHOD(      GetFrequency)(THIS_ LPDWORD ) PURE;
-    STDMETHOD(         GetStatus)(THIS_ LPDWORD ) PURE;
-    STDMETHOD(        Initialize)(THIS_ LPDIRECTSOUND, LPDSBUFFERDESC ) PURE;
-    STDMETHOD(              Lock)(THIS_ DWORD,DWORD,LPVOID,LPDWORD,LPVOID,LPDWORD,DWORD ) PURE;
-    STDMETHOD(              Play)(THIS_ DWORD,DWORD,DWORD ) PURE;
-    STDMETHOD(SetCurrentPosition)(THIS_ DWORD ) PURE;
-    STDMETHOD(         SetFormat)(THIS_ LPWAVEFORMATEX ) PURE;
-    STDMETHOD(         SetVolume)(THIS_ LONG ) PURE;
-    STDMETHOD(            SetPan)(THIS_ LONG ) PURE;
-    STDMETHOD(      SetFrequency)(THIS_ DWORD ) PURE;
-    STDMETHOD(              Stop)(THIS  ) PURE;
-    STDMETHOD(            Unlock)(THIS_ LPVOID,DWORD,LPVOID,DWORD ) PURE;
-    STDMETHOD(           Restore)(THIS  ) PURE;
-};
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-#define IDirectSoundBuffer_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDirectSoundBuffer_AddRef(p)                    (p)->lpVtbl->AddRef(p)
-#define IDirectSoundBuffer_Release(p)                   (p)->lpVtbl->Release(p)
-#define IDirectSoundBuffer_GetCaps(p,a)                 (p)->lpVtbl->GetCaps(p,a)
-#define IDirectSoundBuffer_GetCurrentPosition(p,a,b)    (p)->lpVtbl->GetCurrentPosition(p,a,b)
-#define IDirectSoundBuffer_GetFormat(p,a,b,c)           (p)->lpVtbl->GetFormat(p,a,b,c)
-#define IDirectSoundBuffer_GetVolume(p,a)               (p)->lpVtbl->GetVolume(p,a)
-#define IDirectSoundBuffer_GetPan(p,a)                  (p)->lpVtbl->GetPan(p,a)
-#define IDirectSoundBuffer_GetFrequency(p,a)            (p)->lpVtbl->GetFrequency(p,a)
-#define IDirectSoundBuffer_GetStatus(p,a)               (p)->lpVtbl->GetStatus(p,a)
-#define IDirectSoundBuffer_Initialize(p,a,b)            (p)->lpVtbl->Initialize(p,a,b)
-#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g)        (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
-#define IDirectSoundBuffer_Play(p,a,b,c)                (p)->lpVtbl->Play(p,a,b,c)
-#define IDirectSoundBuffer_SetCurrentPosition(p,a)      (p)->lpVtbl->SetCurrentPosition(p,a)
-#define IDirectSoundBuffer_SetFormat(p,a)               (p)->lpVtbl->SetFormat(p,a)
-#define IDirectSoundBuffer_SetVolume(p,a)               (p)->lpVtbl->SetVolume(p,a)
-#define IDirectSoundBuffer_SetPan(p,a)                  (p)->lpVtbl->SetPan(p,a)
-#define IDirectSoundBuffer_SetFrequency(p,a)            (p)->lpVtbl->SetFrequency(p,a)
-#define IDirectSoundBuffer_Stop(p)                      (p)->lpVtbl->Stop(p)
-#define IDirectSoundBuffer_Unlock(p,a,b,c,d)            (p)->lpVtbl->Unlock(p,a,b,c,d)
-#define IDirectSoundBuffer_Restore(p)                   (p)->lpVtbl->Restore(p)
-#endif
-
-#endif
-
-
-
-/*
- * Return Codes
- */
-
-#define DS_OK                           0
-
-/*
- * The call failed because resources (such as a priority level)
- *  were already being used by another caller.
- */
-#define DSERR_ALLOCATED                 MAKE_DSHRESULT( 10 )
-/*
- * The control (vol,pan,etc.) requested by the caller is not available.
- */
-#define DSERR_CONTROLUNAVAIL            MAKE_DSHRESULT( 30 )
-/*
- * An invalid parameter was passed to the returning function
- */
-#define DSERR_INVALIDPARAM              E_INVALIDARG
-/*
- * This call is not valid for the current state of this object
- */
-#define DSERR_INVALIDCALL               MAKE_DSHRESULT( 50 )
-/*
- * An undetermined error occured inside the DSound subsystem
- */
-#define DSERR_GENERIC                   E_FAIL
-/*
- * The caller does not have the priority level required for the function to
- * succeed.
- */
-#define DSERR_PRIOLEVELNEEDED           MAKE_DSHRESULT( 70 )
-/*
- * The DSound subsystem couldn't allocate sufficient memory to complete the
- * caller's request.
- */
-#define DSERR_OUTOFMEMORY               E_OUTOFMEMORY
-/*
- * The specified WAVE format is not supported
- */
-#define DSERR_BADFORMAT                 MAKE_DSHRESULT( 100 )
-/*
- * The function called is not supported at this time
- */
-#define DSERR_UNSUPPORTED               E_NOTIMPL
-/*
- * No sound driver is available for use
- */
-#define DSERR_NODRIVER                  MAKE_DSHRESULT( 120 )
-/*
- * This object is already initialized
- */
-#define DSERR_ALREADYINITIALIZED        MAKE_DSHRESULT( 130 )
-/*
- * This object does not support aggregation
- */
-#define DSERR_NOAGGREGATION             CLASS_E_NOAGGREGATION
-/*
- * The buffer memory has been lost, and must be Restored.
- */
-#define DSERR_BUFFERLOST                MAKE_DSHRESULT( 150 )
-/*
- * Another app has a higher priority level, preventing this call from
- * succeeding.
- */
-#define DSERR_OTHERAPPHASPRIO           MAKE_DSHRESULT( 160 )
-/*
- * The Initialize() member on the Direct Sound Object has not been
- * called or called successfully before calls to other members.
- */
-#define DSERR_UNINITIALIZED             MAKE_DSHRESULT( 170 )
-
-
-
-
-//==========================================================================;
-//
-//                               Flags...
-//
-//==========================================================================;
-
-#define DSCAPS_PRIMARYMONO          0x00000001
-#define DSCAPS_PRIMARYSTEREO        0x00000002
-#define DSCAPS_PRIMARY8BIT          0x00000004
-#define DSCAPS_PRIMARY16BIT         0x00000008
-#define DSCAPS_CONTINUOUSRATE       0x00000010
-#define DSCAPS_EMULDRIVER           0x00000020
-#define DSCAPS_CERTIFIED            0x00000040
-#define DSCAPS_SECONDARYMONO        0x00000100
-#define DSCAPS_SECONDARYSTEREO      0x00000200
-#define DSCAPS_SECONDARY8BIT        0x00000400
-#define DSCAPS_SECONDARY16BIT       0x00000800
-
-
-
-#define DSBPLAY_LOOPING         0x00000001
-
-
-          
-#define DSBSTATUS_PLAYING           0x00000001
-#define DSBSTATUS_BUFFERLOST        0x00000002
-#define DSBSTATUS_LOOPING           0x00000004
-         
-
-#define DSBLOCK_FROMWRITECURSOR         0x00000001
-
-
-
-#define DSSCL_NORMAL                1
-#define DSSCL_PRIORITY              2
-#define DSSCL_EXCLUSIVE             3
-#define DSSCL_WRITEPRIMARY          4
-
-
-
-#define DSBCAPS_PRIMARYBUFFER       0x00000001
-#define DSBCAPS_STATIC              0x00000002
-#define DSBCAPS_LOCHARDWARE         0x00000004
-#define DSBCAPS_LOCSOFTWARE         0x00000008
-#define DSBCAPS_CTRLFREQUENCY       0x00000020
-#define DSBCAPS_CTRLPAN             0x00000040
-#define DSBCAPS_CTRLVOLUME          0x00000080
-#define DSBCAPS_CTRLDEFAULT         0x000000E0  // Pan + volume + frequency.
-#define DSBCAPS_CTRLALL             0x000000E0  // All control capabilities
-#define DSBCAPS_STICKYFOCUS         0x00004000
-#define DSBCAPS_GETCURRENTPOSITION2 0x00010000  // More accurate play cursor under emulation
-
-
-
-
-#define DSSPEAKER_HEADPHONE     1
-#define DSSPEAKER_MONO          2
-#define DSSPEAKER_QUAD          3
-#define DSSPEAKER_STEREO        4
-#define DSSPEAKER_SURROUND      5
-
-
-
-
-
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif  /* __DSOUND_INCLUDED__ */
--- a/u/dxsdk/SDK/INC/FASTFILE.H
+++ /dev/null
@@ -1,24 +1,0 @@
-/*==========================================================================
- *
- *  Copyright (C) 1995-1996 Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       fastfile.h
- *  Content:    Definitions for fastfile access.
- *
- * THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
- * EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
- * WARRANTIES OF MERCHANTBILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- ***************************************************************************/
-
-typedef LPVOID  HFASTFILE;
-
-extern BOOL FastFileInit( LPSTR fname, int max_handles );
-extern void FastFileFini( void );
-extern HFASTFILE FastFileOpen( LPSTR name );
-extern BOOL FastFileClose( HFASTFILE pfe );
-extern BOOL FastFileRead( HFASTFILE pfh, LPVOID ptr, int size );
-extern BOOL FastFileSeek( HFASTFILE pfe, int off, int how );
-extern long FastFileTell( HFASTFILE pfe );
-extern LPVOID FastFileLock( HFASTFILE pfe, int off, int len );
-extern BOOL FastFileUnlock( HFASTFILE pfe, int off, int len );
binary files a/u/dxsdk/SDK/LIB/DINPUT.LIB /dev/null differ
binary files a/u/dxsdk/SDK/LIB/DXGUID.LIB /dev/null differ
--- a/u/gas2masm/gas2masm.c
+++ /dev/null
@@ -1,1056 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// gas to MASM source code converter
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define MAX_TOKENS			100
-#define MAX_TOKEN_LENGTH	1024
-#define LF					0x0A
-
-typedef enum {NOT_WHITESPACE, WHITESPACE, TOKEN_AVAILABLE, LINE_DONE, FILE_DONE, PARSED_OKAY} tokenstat;
-typedef enum {NOSEG, DATASEG, TEXTSEG} segtype;
-
-int		tokennum;
-int		inline, outline;
-
-char	*token;
-char	tokens[MAX_TOKENS][MAX_TOKEN_LENGTH+1];
-
-segtype	currentseg = NOSEG;
-
-typedef struct {
-	char	*text;
-	char	*emit;
-	int		numtokens;
-	void	(*parsefunc) (void);
-} parsefield;
-
-
-void errorexit (void);
-
-
-//==============================================
-
-typedef struct {
-	char	*text;
-	char	*emit;
-	int		len;
-} regdesc;
-
-regdesc	reglist[] = {
-	{"%eax", "eax", 4},
-	{"%ebx", "ebx", 4},
-	{"%ecx", "ecx", 4},
-	{"%edx", "edx", 4},
-	{"%esi", "esi", 4},
-	{"%edi", "edi", 4},
-	{"%ebp", "ebp", 4},
-	{"%esp", "esp", 4},
-	{"%ax", "ax", 3},
-	{"%bx", "bx", 3},
-	{"%cx", "cx", 3},
-	{"%dx", "dx", 3},
-	{"%si", "si", 3},
-	{"%di", "di", 3},
-	{"%bp", "bp", 3},
-	{"%sp", "sp", 3},
-	{"%al", "al", 3},
-	{"%bl", "bl", 3},
-	{"%cl", "cl", 3},
-	{"%dl", "dl", 3},
-	{"%ah", "ah", 3},
-	{"%bh", "bh", 3},
-	{"%ch", "ch", 3},
-	{"%dh", "dh", 3},
-	{"%st(0)", "st(0)", 6},
-	{"%st(1)", "st(1)", 6},
-	{"%st(2)", "st(2)", 6},
-	{"%st(3)", "st(3)", 6},
-	{"%st(4)", "st(4)", 6},
-	{"%st(5)", "st(5)", 6},
-	{"%st(6)", "st(6)", 6},
-	{"%st(7)", "st(7)", 6},
-};
-
-int	numregs = sizeof (reglist) / sizeof (reglist[0]);
-
-//==============================================
-
-
-void emitanoperand (int tnum, char *type, int notdata)
-{
-	int		i, index, something_outside_parens, regfound;
-	int		parencount;
-	char	*pt;
-	char	temp[MAX_TOKEN_LENGTH+1];
-
-	pt = tokens[tnum];
-
-	if (pt[0] == '%')
-	{
-	// register
-		for (i=0 ; i<numregs ; i++)
-		{
-			if (!strcmpi (pt, reglist[i].text))
-			{
-				printf ("%s", reglist[i].emit);
-				return;
-			}
-		}
-
-		fprintf (stderr, "Error: bad register %s\n", pt);
-		errorexit ();
-	}
-	else if (pt[0] == '$')
-	{
-	// constant
-		if (pt[1] == '(')
-		{
-			if ((pt[2] > '9') || (pt[2] < '0'))
-			{
-				i = 2;
-				printf ("offset ");
-
-				parencount = 1;
-
-				while ((pt[i] != ')') || (parencount > 1))
-				{
-					if (!pt[i])
-					{
-						fprintf (stderr, "mismatched parens");
-						errorexit ();
-					}
-
-					if (pt[i] == ')')
-						parencount--;
-					else if (pt[i] == '(')
-						parencount++;
-
-					printf ("%c", pt[i]);
-					i++;
-				}
-			}
-			else
-			{
-				pt++;
-
-				parencount = 1;
-
-				for (i=1 ; (pt[i] != ')') || (parencount > 1) ; i++)
-				{
-					if (!pt[i])
-					{
-						fprintf (stderr, "mismatched parens");
-						errorexit ();
-					}
-
-					if (pt[i] == ')')
-						parencount--;
-					else if (pt[i] == '(')
-						parencount++;
-				}
-
-				pt[i] = 0;
-
-				if ((pt[1] == '0') && ((pt[2] == 'x') || (pt[2] == 'X')))
-				{
-					printf ("0%sh", &pt[3]);
-				}
-				else
-				{
-					printf ("%s", &pt[1]);
-				}
- 			}
-		}
-		else if ((pt[1] == '0') && ((pt[2] == 'x') || (pt[2] == 'X')))
-		{
-			printf ("0%sh", &pt[3]);
-		}
-		else if ((pt[1] >= '0') && (pt[1] <= '9'))
-		{
-			printf ("%s", &pt[1]);
-		}
-		else
-		{
-			printf ("offset %s", &pt[1]);
-		}
-	}
-	else if (!notdata && ((pt[0] >= '0') && (pt[0] <= '9')))
-	{
-		pt--;
-
-		if ((pt[1] == '0') && ((pt[2] == 'x') || (pt[2] == 'X')))
-		{
-			printf ("0%sh", &pt[3]);
-		}
-		else
-		{
-			printf ("%s", &pt[1]);
-		}
-	}
-	else
-	{
-	// must be a memory location
-		strcpy (temp, type);
-		index = strlen (temp);
-
-		if (notdata)
-			temp[index++] = '[';
-
-		something_outside_parens = 0;
-
-		while (*pt)
-		{
-			if (index > (MAX_TOKEN_LENGTH - 10))
-			{
-				fprintf (stderr, "Error: operand too long %s\n",
-						 tokens[tnum]);
-				errorexit ();
-			}
-
-			if (*pt != ')')
-			{
-				if (*pt == '(')
-				{
-					if (something_outside_parens)
-						temp[index++] = '+';
-				}
-				else if (*pt == '%')
-				{
-					regfound = 0;
-
-					for (i=0 ; i<numregs ; i++)
-					{
-						if (!strnicmp (pt, reglist[i].text,
-							reglist[i].len))
-						{
-							strcpy (&temp[index], reglist[i].emit);
-							index += strlen (reglist[i].emit);
-							pt += strlen (reglist[i].text) - 1;
-							regfound = 1;
-							break;
-						}
-					}
-
-					if (!regfound)
-					{
-						fprintf (stderr, "Error: bad register %s\n", pt);
-						errorexit ();
-					}
-				}
-				else if (*pt == ',')
-				{
-					pt++;
-
-					if ((*pt >= '1') && (*pt <= '8'))
-					{
-						temp[index++] = '*';
-						temp[index++] = *pt;
-					}
-					else if (*pt != ')')
-					{
-						if (temp[index-1] != '+')
-							temp[index++] = '+';
-					}
-				}
-				else
-				{
-					something_outside_parens = 1;
-
-					// handle hexadecimal constants in addresses
-					if ((*pt == '0') &&
-						((*(pt+1) == 'x') || (*(pt+1) == 'X')))
-					{
-						pt += 2;
-
-						do
-						{
-							temp[index++] = *pt++;
-						} while (((*pt >= '0') && (*pt <= '9'))     ||
-								 ((*pt >= 'a') && (*pt <= 'f')) ||
-								 ((*pt >= 'A') && (*pt <= 'F')));
-
-						pt--;
-						temp[index++] = 'h';
-					}
-					else
-					{
-						temp[index++] = *pt;
-					}
-				}
-			}
-
-			pt++;
-		}
-
-		if (notdata)
-			temp[index++] = ']';
-
-		temp[index] = 0;
-		printf ("%s", temp);
-	}
-}
-
-
-void datasegstart (void)
-{
-	if (currentseg == DATASEG)
-		return;
-
-	if (currentseg == TEXTSEG)
-		printf ("_TEXT ENDS\n");
-
-	printf ("_DATA SEGMENT");
-
-	currentseg = DATASEG;
-}
-
-
-void textsegstart (void)
-{
-	if (currentseg == TEXTSEG)
-		return;
-
-	if (currentseg == DATASEG)
-		printf ("_DATA ENDS\n");
-
-	printf ("_TEXT SEGMENT");
-
-	currentseg = TEXTSEG;
-}
-
-
-void emitdata (void)
-{
-	int		i;
-
-	for (i=1 ; i<(tokennum-1) ; i++)
-		printf (" %s,", tokens[i]);
-
-	printf (" %s", tokens[tokennum-1]);
-}
-
-
-void emitonedata (void)
-{
-
-	printf (" %s", tokens[1]);
-}
-
-
-void emitonecalldata (void)
-{
-	int	i, isaddr, len;
-
-	if (tokens[1][0] == '*')
-	{
-		printf (" dword ptr[%s]", &tokens[1][1]);
-	}
-	else
-	{
-		isaddr = 0;
-		len = strlen(tokens[1]);
-
-		for (i=0 ; i<len ; i++)
-		{
-			if (tokens[1][i] == '(')
-			{
-				isaddr = 1;
-				break;
-			}
-		}
-
-		if (!isaddr)
-		{
-			printf (" near ptr %s", tokens[1]);
-		}
-		else
-		{
-			emitanoperand (1, " dword ptr", 1);
-		}
-	}
-}
-
-
-void emitonejumpdata (void)
-{
-	int	i, isaddr, len;
-
-	if (tokens[1][0] == '*')
-	{
-		printf (" dword ptr[%s]", &tokens[1][1]);
-	}
-	else
-	{
-		isaddr = 0;
-		len = strlen(tokens[1]);
-
-		for (i=0 ; i<len ; i++)
-		{
-			if (tokens[1][i] == '(')
-			{
-				isaddr = 1;
-				break;
-			}
-		}
-
-		if (!isaddr)
-		{
-			printf (" %s", tokens[1]);
-		}
-		else
-		{
-			emitanoperand (1, " dword ptr", 1);
-		}
-	}
-}
-
-
-void emitexterndef (void)
-{
-
-	printf (" %s:dword", tokens[1]);
-}
-
-
-void nooperands (void)
-{
-
-}
-
-
-void emitoneoperandl (void)
-{
-
-	printf (" ");
-	emitanoperand (1, "ds:dword ptr", 1);
-}
-
-
-void emitoneoperandb (void)
-{
-
-	printf (" ");
-	emitanoperand (1, "ds:byte ptr", 1);
-}
-
-
-void emitoneoperandw (void)
-{
-
-	printf (" ");
-	emitanoperand (1, "ds:word ptr", 1);
-}
-
-
-void emittwooperandsl (void)
-{
-
-	printf (" ");
-	emitanoperand (2, "ds:dword ptr", 1);
-	printf (",");
-	emitanoperand (1, "ds:dword ptr", 1);
-}
-
-
-void emittwooperandsb (void)
-{
-
-	printf (" ");
-	emitanoperand (2, "ds:byte ptr", 1);
-	printf (",");
-	emitanoperand (1, "ds:byte ptr", 1);
-}
-
-
-void emittwooperandsw (void)
-{
-
-	printf (" ");
-	emitanoperand (2, "ds:word ptr", 1);
-	printf (",");
-	emitanoperand (1, "ds:word ptr", 1);
-}
-
-
-void emit_0_or_1_operandsl (void)
-{
-
-	if (tokennum == 2)
-	{
-		printf (" ");
-		emitanoperand (1, "ds:dword ptr", 1);
-	}
-}
-
-
-void emit_1_or_2_operandsl (void)
-{
-	int		j;
-
-	if (tokennum == 2)
-	{
-		printf (" ");
-		emitanoperand (1, "ds:dword ptr", 1);
-	}
-	else if (tokennum == 3)
-	{
-		printf (" ");
-		emitanoperand (2, "ds:dword ptr", 1);
-		printf (",");
-		emitanoperand (1, "ds:dword ptr", 1);
-	}
-	else
-	{
-
-		fprintf (stderr, "Error: too many operands\n");
-
-		for (j=0 ; j<tokennum ; j++)
-			fprintf (stderr, "%s\n", tokens[j]);
-
-		fprintf (stderr, "\n");
-		errorexit ();
-	}
-}
-
-
-void emit_1_or_2_operandsl_vartext (char *str0, char *str1)
-{
-	int		j;
-
-	if (tokennum == 2)
-	{
-		printf (" %s ", str0);
-		emitanoperand (1, "ds:dword ptr", 1);
-	}
-	else if (tokennum == 3)
-	{
-		if (!strcmpi (tokens[2], "%st(0)"))
-			printf (" %s ", str0);
-		else
-			printf (" %s ", str1);
-
-		emitanoperand (2, "ds:dword ptr", 1);
-		printf (",");
-		emitanoperand (1, "ds:dword ptr", 1);
-	}
-	else
-	{
-
-		fprintf (stderr, "Error: too many operands\n");
-
-		for (j=0 ; j<tokennum ; j++)
-			fprintf (stderr, "%s\n", tokens[j]);
-
-		fprintf (stderr, "\n");
-		errorexit ();
-	}
-}
-
-
-void special_fdivl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fdiv", "fdivr");
-}
-
-
-void special_fdivpl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fdivp", "fdivrp");
-}
-
-
-void special_fdivrl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fdivr", "fdiv");
-}
-
-
-void special_fdivrpl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fdivrp", "fdivp");
-}
-
-
-void special_fsubl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fsub", "fsubr");
-}
-
-
-void special_fsubpl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fsubp", "fsubrp");
-}
-
-
-void special_fsubrl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fsubr", "fsub");
-}
-
-
-void special_fsubrpl (void)
-{
-
-	emit_1_or_2_operandsl_vartext ("fsubrp", "fsubp");
-}
-
-
-void emit_multiple_data (void)
-{
-	int		i;
-
-	printf (" ");
-
-	for (i=1 ; i<(tokennum-1) ; i++)
-	{
-		emitanoperand (i, "", 0);
-		printf (", ");
-	}
-
-	emitanoperand (i, "", 0);
-}
-
-
-//==============================================
-
-parsefield	parsedata[] = {
-	{".align", " align", 2, emitonedata},
-	{".byte",  " db", -2, emit_multiple_data},
-	{".data",  "", 1, datasegstart},
-	{".extern"," externdef", 2, emitexterndef},
-	{".globl", " public", -2, emit_multiple_data},
-	{".long",  " dd", -2, emit_multiple_data},
-	{".single"," dd", -2, emit_multiple_data},
-	{".text",  "", 1, textsegstart},
-	{"adcl",   " adc", 3, emittwooperandsl},
-	{"addb",   " add", 3, emittwooperandsb},
-	{"addl",   " add", 3, emittwooperandsl},
-	{"andb",   " and", 3, emittwooperandsb},
-	{"andl",   " and", 3, emittwooperandsl},
-	{"call",   " call", 2, emitonecalldata},
-	{"cmpb",   " cmp", 3, emittwooperandsb},
-	{"cmpl",   " cmp", 3, emittwooperandsl},
-	{"cmpw",   " cmp", 3, emittwooperandsw},
-	{"decl",   " dec", 2, emitoneoperandl},
-	{"decw",   " dec", 2, emitoneoperandw},
-	{"divl",   " div", 2, emitoneoperandl},
-	{"fadd",   " fadd", -2, emit_1_or_2_operandsl},
-	{"faddp",  " faddp", -2, emit_1_or_2_operandsl},
-	{"faddps", " faddp", -2, emit_1_or_2_operandsl},
-	{"fadds",  " fadd", -2, emit_1_or_2_operandsl},
-	{"fcom",   " fcom", 2, emitoneoperandl},
-	{"fcoms",  " fcom", 2, emitoneoperandl},
-	{"fcomp",  " fcomp", 2, emitoneoperandl},
-	{"fcomps", " fcomp", 2, emitoneoperandl},
-	{"fdiv",   "", -2, special_fdivl}, 
-	{"fdivp",  "", -2, special_fdivpl}, 
-	{"fdivr",  "", -2, special_fdivrl},
-	{"fdivrp", "", -2, special_fdivrpl},
-	{"fdivrs", "", -2, special_fdivrl},
-	{"fildl",  " fild", 2, emitoneoperandl},
-	{"fistl",  " fist", 2, emitoneoperandl},
-	{"fistpl", " fistp", 2, emitoneoperandl},
-	{"fld",    " fld", 2, emitoneoperandl},
-	{"fldcw",  " fldcw", 2, emitoneoperandw},
-	{"fldenv", " fldenv", 2, emitoneoperandl},
-	{"flds",   " fld", 2, emitoneoperandl},
-	{"fmul",   " fmul", -2, emit_1_or_2_operandsl},
-	{"fmulp",  " fmulp", -2, emit_1_or_2_operandsl},
-	{"fmulps", " fmulp", -2, emit_1_or_2_operandsl},
-	{"fmuls",  " fmul", -2, emit_1_or_2_operandsl},
-	{"fnstcw", " fnstcw", 2, emitoneoperandw},
-	{"fnstenv"," fnstenv", 2, emitoneoperandl},
-	{"fnstsw", " fnstsw", 2, emitoneoperandw},
-	{"fstp",   " fstp", 2, emitoneoperandl},
-	{"fstps",  " fstp", 2, emitoneoperandl},
-	{"fsts",   " fst", 2, emitoneoperandl},
-	{"fsubr",  "", -2, special_fsubrl},
-	{"fsubrp", "", -2, special_fsubrpl},
-	{"fsubrs", "", -2, special_fsubrl},
-	{"fsub",   "", -2, special_fsubl},
-	{"fsubp",  "", -2, special_fsubpl},
-	{"fsubps", "", -2, special_fsubpl},
-	{"fsubs",  "", -2, special_fsubl},
-	{"fxch",   " fxch", 2, emitoneoperandl},
-	{"imull",  " imul", -2, emit_1_or_2_operandsl},
-	{"incl",   " inc", 2, emitoneoperandl},
-	{"ja",     " ja", 2, emitonedata},
-	{"jae",    " jae", 2, emitonedata},
-	{"jb",     " jb", 2, emitonedata},
-	{"jbe",    " jbe", 2, emitonedata},
-	{"jc",     " jc", 2, emitonedata},
-	{"je",     " je", 2, emitonedata},
-	{"jg",     " jg", 2, emitonedata},
-	{"jge",    " jge", 2, emitonedata},
-	{"jl",     " jl", 2, emitonedata},
-	{"jle",    " jle", 2, emitonedata},
-	{"jmp",    " jmp", 2, emitonejumpdata},
-	{"jna",    " jna", 2, emitonedata},
-	{"jnae",   " jnae", 2, emitonedata},
-	{"jnb",    " jnb", 2, emitonedata},
-	{"jnbe",   " jnbe", 2, emitonedata},
-	{"jnc",    " jnc", 2, emitonedata},
-	{"jne",    " jne", 2, emitonedata},
-	{"jng",    " jng", 2, emitonedata},
-	{"jnge",   " jnge", 2, emitonedata},
-	{"jnl",    " jnl", 2, emitonedata},
-	{"jnle",   " jnle", 2, emitonedata},
-	{"jns",    " jns", 2, emitonedata},
-	{"jnz",    " jnz", 2, emitonedata},
-	{"js",     " js", 2, emitonedata},
-	{"jz",     " jz", 2, emitonedata},
-	{"leal",   " lea", 3, emittwooperandsl},
-	{"movb",   " mov", 3, emittwooperandsb},
-	{"movl",   " mov", 3, emittwooperandsl},
-	{"movw",   " mov", 3, emittwooperandsw},
-	{"negl",   " neg", 2, emitoneoperandl},
-	{"orb",    " or", 3, emittwooperandsb},
-	{"orl",    " or", 3, emittwooperandsl},
-	{"popl",   " pop", 2, emitoneoperandl},
-	{"pushl",  " push", 2, emitoneoperandl},
-	{"ret",    " ret", -1, emit_0_or_1_operandsl},
-	{"rorl",   " ror", 3, emittwooperandsl},
-	{"sarl",   " sar", 3, emittwooperandsl},
-	{"sbbl",   " sbb", 3, emittwooperandsl},
-	{"shll",   " shl", 3, emittwooperandsl},
-	{"shrl",   " shr", 3, emittwooperandsl},	
-	{"subl",   " sub", 3, emittwooperandsl},
-	{"testb",  " test", 3, emittwooperandsb},
-	{"testl",  " test", 3, emittwooperandsl},
-	{"xorb",   " xor", 3, emittwooperandsb},
-	{"xorl",   " xor", 3, emittwooperandsl},
-};
-
-int	numparse = sizeof (parsedata) / sizeof (parsedata[0]);
-
-//==============================================
-
-void errorexit (void)
-{
-	fprintf (stderr, "In line: %d, out line: %d\n", inline, outline);
-	exit (1);
-}
-
-
-tokenstat whitespace (char c)
-{
-	if (c == '\n')
-		return LINE_DONE;
-
-	if ((c <= ' ') ||
-		(c > 127) ||
-		(c == ','))
-	{
-		return WHITESPACE;
-	}
-
-	return NOT_WHITESPACE;
-}
-
-
-int gettoken (void)
-{
-	char		c;
-	int			count, parencount;
-	tokenstat	stat;
-
-	do
-	{
-		if ((c = getchar ()) == EOF)
-			return FILE_DONE;
-
-		if ((stat = whitespace (c)) == LINE_DONE)
-			return LINE_DONE;
-	} while (stat == WHITESPACE);
-
-	token[0] = c;
-	count = 1;
-
-	if (c == '~')
-	{
-		count--;
-		token[count++] = 'n';
-		token[count++] = 'o';
-		token[count++] = 't';
-		token[count++] = ' ';
-	}
-
-	if (c == '(')
-	{
-		do
-		{
-			if ((c = getchar ()) == EOF)
-			{
-				fprintf (stderr, "EOF in middle of parentheses\n");
-				errorexit ();
-			}
-
-			token[count++] = c;
-
-		} while (c != ')');
-	}
-	
-	for ( ;; )
-	{
-		if ((c = getchar ()) == EOF)
-		{
-			token[count] = 0;
-			return TOKEN_AVAILABLE;
-		}
-
-		if (whitespace (c) == LINE_DONE)
-		{
-			if (ungetc (c, stdin) == EOF)
-			{
-				fprintf (stderr, "Couldn't unget character\n");
-				errorexit ();
-			}
-
-			token[count] = 0;
-			return TOKEN_AVAILABLE;
-		}
-
-		if (whitespace (c) == WHITESPACE)
-		{
-			token[count] = 0;
-			return TOKEN_AVAILABLE;
-		}
-
-		if (count >= MAX_TOKEN_LENGTH)
-		{
-			fprintf (stderr, "Error: token too long\n");
-			errorexit ();
-		}
-
-		token[count++] = c;
-
-		if (c == '~')
-		{
-			count--;
-			token[count++] = 'n';
-			token[count++] = 'o';
-			token[count++] = 't';
-			token[count++] = ' ';
-		}
-		else if (c == '(')
-		{
-			parencount = 1;
-
-			do
-			{
-				if ((c = getchar ()) == EOF)
-				{
-					fprintf (stderr, "EOF in middle of parentheses\n");
-					errorexit ();
-				}
-
-				if (c == '(')
-					parencount++;
-				else if (c == ')')
-					parencount--;
-
-				if (c == '~')
-				{
-					token[count++] = 'n';
-					token[count++] = 'o';
-					token[count++] = 't';
-					token[count++] = ' ';
-				}
-				else
-				{
-					token[count++] = c;
-				}
-
-			} while ((c != ')') || (parencount > 0));
-		}
-	}
-}
-
-
-tokenstat parseline (void)
-{
-	tokenstat	stat;
-	int			i, j, firsttoken, labelfound;
-	int			mnemfound;
-
-	firsttoken = 1;
-	tokennum = 0;
-	labelfound = 0;
-
-	for ( ;; )
-	{
-		token = tokens[tokennum];
-		stat = gettoken ();
-
-		switch (stat)
-		{
-		case FILE_DONE:
-			return FILE_DONE;
-
-		case LINE_DONE:
-			if (!firsttoken && tokennum)
-			{
-				mnemfound = 0;
-
-				for (i=0 ; i<numparse; i++)
-				{
-					if (!strcmpi (tokens[0], parsedata[i].text))
-					{
-						if (((parsedata[i].numtokens > 0) &&
-							 (parsedata[i].numtokens != tokennum)) ||
-							((parsedata[i].numtokens < 0) &&
-							 (tokennum < -parsedata[i].numtokens)))
-						{
-							fprintf (stderr, "mismatched number of tokens\n");
-
-							for (j=0 ; j<tokennum ; j++)
-								fprintf (stderr, "%s\n", tokens[j]);
-
-							fprintf (stderr, "\n");
-							errorexit ();
-						}
-
-						printf ("%s", parsedata[i].emit);
-						(*parsedata[i].parsefunc) ();
-
-						mnemfound = 1;
-						break;
-					}
-				}
-
-				if (!mnemfound)
-				{
-					fprintf (stderr, "Error: unknown mnemonic\n");
-
-					for (j=0 ; j<tokennum ; j++)
-						fprintf (stderr, "%s\n", tokens[j]);
-
-					fprintf (stderr, "\n");
-					errorexit ();
-				}
-			}
-
-			if (!firsttoken)
-			{
-				if ((currentseg == DATASEG) && labelfound && !tokennum)
-					printf (":\n");
-				else
-					printf ("\n");
-
-				outline++;
-			}
-			return PARSED_OKAY;
-
-		case TOKEN_AVAILABLE:
-			if (firsttoken)
-			{
-				if (token[strlen(token) - 1] == ':')
-				{
-					labelfound = 1;
-
-					if (currentseg == DATASEG)
-					{
-						token[strlen(token) - 1] = 0;
-						printf ("%s", token);
-					}
-					else if (currentseg == TEXTSEG)
-					{
-						printf ("%s", token);
-					}
-					else
-					{
-						fprintf (stderr, "Error: not in segment block\n");
-						errorexit ();
-					}
-
-					firsttoken = 0;
-					break;
-				}
-			}
-
-			firsttoken = 0;
-
-			if (tokennum >= MAX_TOKENS)
-			{
-				fprintf (stderr, "Error: too many tokens\n");
-				exit (0);
-			}
-
-			tokennum++;
-
-			break;
-
-		default:
-			fprintf (stderr, "Error: unknown tokenstat %d\n", stat);
-			exit (0);
-		}
-	}
-}
-
-
-void main (int argc, char **argv)
-{
-	tokenstat	stat;
-
-	printf (" .386P\n"
-            " .model FLAT\n");
-	inline = 1;
-	outline = 3;
-
-	for ( ;; )
-	{
-		stat = parseline ();
-		inline++;
-
-		switch (stat)
-		{
-		case FILE_DONE:
-			if (currentseg == TEXTSEG)
-				printf ("_TEXT ENDS\n");
-			else if (currentseg == DATASEG)
-				printf ("_DATA ENDS\n");
-
-			printf (" END\n");
-			exit (0);
-		
-		case PARSED_OKAY:
-			break;
-
-		default:
-			fprintf (stderr, "Error: unknown tokenstat %d\n", stat);
-			exit (0);
-		}
-	}
-}
-
--- a/u/gas2masm/gas2masm.dsp
+++ /dev/null
@@ -1,100 +1,0 @@
-# Microsoft Developer Studio Project File - Name="gas2masm" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=gas2masm - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "gas2masm.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "gas2masm.mak" CFG="gas2masm - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "gas2masm - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "gas2masm - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "gas2masm - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\Release"
-# PROP Intermediate_Dir ".\Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "gas2masm - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\Debug"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-
-!ENDIF 
-
-# Begin Target
-
-# Name "gas2masm - Win32 Release"
-# Name "gas2masm - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\gas2masm.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/u/gas2masm/gas2masm.dsw
+++ /dev/null
@@ -1,29 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "gas2masm"=.\gas2masm.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
binary files a/u/gas2masm/gas2masm.mdp /dev/null differ
--- a/u/gas2masm/gas2masm.plg
+++ /dev/null
@@ -1,32 +1,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: gas2masm - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\TEMP\RSP730.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /Fp".\Debug/gas2masm.pch" /YX /Fo".\Debug/" /Fd".\Debug/" /FD /c 
-"D:\Work\quake source\WinQuake\gas2masm\gas2masm.c"
-]
-Creating command line "cl.exe @C:\TEMP\RSP730.tmp" 
-Creating temporary file "C:\TEMP\RSP731.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:".\Debug/gas2masm.pdb" /debug /machine:I386 /out:".\Debug/gas2masm.exe" 
-".\Debug\gas2masm.obj"
-]
-Creating command line "link.exe @C:\TEMP\RSP731.tmp"
-<h3>Output Window</h3>
-Compiling...
-gas2masm.c
-Linking...
-
-
-
-<h3>Results</h3>
-gas2masm.exe - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
--- a/u/gl_draw.c
+++ /dev/null
@@ -1,1297 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-
-// draw.c -- this is the only file outside the refresh that touches the
-// vid buffer
-
-#include "quakedef.h"
-
-#define GL_COLOR_INDEX8_EXT     0x80E5
-
-extern unsigned char d_15to8table[65536];
-
-cvar_t		gl_nobind = {"gl_nobind", "0"};
-cvar_t		gl_max_size = {"gl_max_size", "1024"};
-cvar_t		gl_picmip = {"gl_picmip", "0"};
-
-byte		*draw_chars;				// 8*8 graphic characters
-qpic_t		*draw_disc;
-qpic_t		*draw_backtile;
-
-int			translate_texture;
-int			char_texture;
-
-typedef struct
-{
-	int		texnum;
-	float	sl, tl, sh, th;
-} glpic_t;
-
-byte		conback_buffer[sizeof(qpic_t) + sizeof(glpic_t)];
-qpic_t		*conback = (qpic_t *)&conback_buffer;
-
-int		gl_lightmap_format = 4;
-int		gl_solid_format = 3;
-int		gl_alpha_format = 4;
-
-int		gl_filter_min = GL_LINEAR_MIPMAP_NEAREST;
-int		gl_filter_max = GL_LINEAR;
-
-
-int		texels;
-
-typedef struct
-{
-	int		texnum;
-	char	identifier[64];
-	int		width, height;
-	qboolean	mipmap;
-} gltexture_t;
-
-#define	MAX_GLTEXTURES	1024
-gltexture_t	gltextures[MAX_GLTEXTURES];
-int			numgltextures;
-
-
-void GL_Bind (int texnum)
-{
-	if (gl_nobind.value)
-		texnum = char_texture;
-	if (currenttexture == texnum)
-		return;
-	currenttexture = texnum;
-#ifdef _WIN32
-	bindTexFunc (GL_TEXTURE_2D, texnum);
-#else
-	glBindTexture(GL_TEXTURE_2D, texnum);
-#endif
-}
-
-
-/*
-=============================================================================
-
-  scrap allocation
-
-  Allocate all the little status bar obejcts into a single texture
-  to crutch up stupid hardware / drivers
-
-=============================================================================
-*/
-
-#define	MAX_SCRAPS		2
-#define	BLOCK_WIDTH		256
-#define	BLOCK_HEIGHT	256
-
-int			scrap_allocated[MAX_SCRAPS][BLOCK_WIDTH];
-byte		scrap_texels[MAX_SCRAPS][BLOCK_WIDTH*BLOCK_HEIGHT*4];
-qboolean	scrap_dirty;
-int			scrap_texnum;
-
-// returns a texture number and the position inside it
-int Scrap_AllocBlock (int w, int h, int *x, int *y)
-{
-	int		i, j;
-	int		best, best2;
-	int		bestx;
-	int		texnum;
-
-	for (texnum=0 ; texnum<MAX_SCRAPS ; texnum++)
-	{
-		best = BLOCK_HEIGHT;
-
-		for (i=0 ; i<BLOCK_WIDTH-w ; i++)
-		{
-			best2 = 0;
-
-			for (j=0 ; j<w ; j++)
-			{
-				if (scrap_allocated[texnum][i+j] >= best)
-					break;
-				if (scrap_allocated[texnum][i+j] > best2)
-					best2 = scrap_allocated[texnum][i+j];
-			}
-			if (j == w)
-			{	// this is a valid spot
-				*x = i;
-				*y = best = best2;
-			}
-		}
-
-		if (best + h > BLOCK_HEIGHT)
-			continue;
-
-		for (i=0 ; i<w ; i++)
-			scrap_allocated[texnum][*x + i] = best + h;
-
-		return texnum;
-	}
-
-	Sys_Error ("Scrap_AllocBlock: full");
-}
-
-int	scrap_uploads;
-
-void Scrap_Upload (void)
-{
-	int		texnum;
-
-	scrap_uploads++;
-
-	for (texnum=0 ; texnum<MAX_SCRAPS ; texnum++) {
-		GL_Bind(scrap_texnum + texnum);
-		GL_Upload8 (scrap_texels[texnum], BLOCK_WIDTH, BLOCK_HEIGHT, false, true);
-	}
-	scrap_dirty = false;
-}
-
-//=============================================================================
-/* Support Routines */
-
-typedef struct cachepic_s
-{
-	char		name[MAX_QPATH];
-	qpic_t		pic;
-	byte		padding[32];	// for appended glpic
-} cachepic_t;
-
-#define	MAX_CACHED_PICS		128
-cachepic_t	menu_cachepics[MAX_CACHED_PICS];
-int			menu_numcachepics;
-
-byte		menuplyr_pixels[4096];
-
-int		pic_texels;
-int		pic_count;
-
-qpic_t *Draw_PicFromWad (char *name)
-{
-	qpic_t	*p;
-	glpic_t	*gl;
-
-	p = W_GetLumpName (name);
-	gl = (glpic_t *)p->data;
-
-	// load little ones into the scrap
-	if (p->width < 64 && p->height < 64)
-	{
-		int		x, y;
-		int		i, j, k;
-		int		texnum;
-
-		texnum = Scrap_AllocBlock (p->width, p->height, &x, &y);
-		scrap_dirty = true;
-		k = 0;
-		for (i=0 ; i<p->height ; i++)
-			for (j=0 ; j<p->width ; j++, k++)
-				scrap_texels[texnum][(y+i)*BLOCK_WIDTH + x + j] = p->data[k];
-		texnum += scrap_texnum;
-		gl->texnum = texnum;
-		gl->sl = (x+0.01)/(float)BLOCK_WIDTH;
-		gl->sh = (x+p->width-0.01)/(float)BLOCK_WIDTH;
-		gl->tl = (y+0.01)/(float)BLOCK_WIDTH;
-		gl->th = (y+p->height-0.01)/(float)BLOCK_WIDTH;
-
-		pic_count++;
-		pic_texels += p->width*p->height;
-	}
-	else
-	{
-		gl->texnum = GL_LoadPicTexture (p);
-		gl->sl = 0;
-		gl->sh = 1;
-		gl->tl = 0;
-		gl->th = 1;
-	}
-	return p;
-}
-
-
-/*
-================
-Draw_CachePic
-================
-*/
-qpic_t	*Draw_CachePic (char *path)
-{
-	cachepic_t	*pic;
-	int			i;
-	qpic_t		*dat;
-	glpic_t		*gl;
-
-	for (pic=menu_cachepics, i=0 ; i<menu_numcachepics ; pic++, i++)
-		if (!strcmp (path, pic->name))
-			return &pic->pic;
-
-	if (menu_numcachepics == MAX_CACHED_PICS)
-		Sys_Error ("menu_numcachepics == MAX_CACHED_PICS");
-	menu_numcachepics++;
-	strcpy (pic->name, path);
-
-//
-// load the pic from disk
-//
-	dat = (qpic_t *)COM_LoadTempFile (path);	
-	if (!dat)
-		Sys_Error ("Draw_CachePic: failed to load %s", path);
-	SwapPic (dat);
-
-	// HACK HACK HACK --- we need to keep the bytes for
-	// the translatable player picture just for the menu
-	// configuration dialog
-	if (!strcmp (path, "gfx/menuplyr.lmp"))
-		memcpy (menuplyr_pixels, dat->data, dat->width*dat->height);
-
-	pic->pic.width = dat->width;
-	pic->pic.height = dat->height;
-
-	gl = (glpic_t *)pic->pic.data;
-	gl->texnum = GL_LoadPicTexture (dat);
-	gl->sl = 0;
-	gl->sh = 1;
-	gl->tl = 0;
-	gl->th = 1;
-
-	return &pic->pic;
-}
-
-
-void Draw_CharToConback (int num, byte *dest)
-{
-	int		row, col;
-	byte	*source;
-	int		drawline;
-	int		x;
-
-	row = num>>4;
-	col = num&15;
-	source = draw_chars + (row<<10) + (col<<3);
-
-	drawline = 8;
-
-	while (drawline--)
-	{
-		for (x=0 ; x<8 ; x++)
-			if (source[x] != 255)
-				dest[x] = 0x60 + source[x];
-		source += 128;
-		dest += 320;
-	}
-
-}
-
-typedef struct
-{
-	char *name;
-	int	minimize, maximize;
-} glmode_t;
-
-glmode_t modes[] = {
-	{"GL_NEAREST", GL_NEAREST, GL_NEAREST},
-	{"GL_LINEAR", GL_LINEAR, GL_LINEAR},
-	{"GL_NEAREST_MIPMAP_NEAREST", GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST},
-	{"GL_LINEAR_MIPMAP_NEAREST", GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR},
-	{"GL_NEAREST_MIPMAP_LINEAR", GL_NEAREST_MIPMAP_LINEAR, GL_NEAREST},
-	{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
-};
-
-/*
-===============
-Draw_TextureMode_f
-===============
-*/
-void Draw_TextureMode_f (void)
-{
-	int		i;
-	gltexture_t	*glt;
-
-	if (Cmd_Argc() == 1)
-	{
-		for (i=0 ; i< 6 ; i++)
-			if (gl_filter_min == modes[i].minimize)
-			{
-				Con_Printf ("%s\n", modes[i].name);
-				return;
-			}
-		Con_Printf ("current filter is unknown???\n");
-		return;
-	}
-
-	for (i=0 ; i< 6 ; i++)
-	{
-		if (!Q_strcasecmp (modes[i].name, Cmd_Argv(1) ) )
-			break;
-	}
-	if (i == 6)
-	{
-		Con_Printf ("bad filter name\n");
-		return;
-	}
-
-	gl_filter_min = modes[i].minimize;
-	gl_filter_max = modes[i].maximize;
-
-	// change all the existing mipmap texture objects
-	for (i=0, glt=gltextures ; i<numgltextures ; i++, glt++)
-	{
-		if (glt->mipmap)
-		{
-			GL_Bind (glt->texnum);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-		}
-	}
-}
-
-/*
-===============
-Draw_Init
-===============
-*/
-void Draw_Init (void)
-{
-	int		i;
-	qpic_t	*cb;
-	byte	*dest, *src;
-	int		x, y;
-	char	ver[40];
-	glpic_t	*gl;
-	int		start;
-	byte	*ncdata;
-	int		f, fstep;
-
-
-	Cvar_RegisterVariable (&gl_nobind);
-	Cvar_RegisterVariable (&gl_max_size);
-	Cvar_RegisterVariable (&gl_picmip);
-
-	// 3dfx can only handle 256 wide textures
-	if (!Q_strncasecmp ((char *)gl_renderer, "3dfx",4) ||
-		strstr((char *)gl_renderer, "Glide"))
-		Cvar_Set ("gl_max_size", "256");
-
-	Cmd_AddCommand ("gl_texturemode", &Draw_TextureMode_f);
-
-	// load the console background and the charset
-	// by hand, because we need to write the version
-	// string into the background before turning
-	// it into a texture
-	draw_chars = W_GetLumpName ("conchars");
-	for (i=0 ; i<256*64 ; i++)
-		if (draw_chars[i] == 0)
-			draw_chars[i] = 255;	// proper transparent color
-
-	// now turn them into textures
-	char_texture = GL_LoadTexture ("charset", 128, 128, draw_chars, false, true);
-
-	start = Hunk_LowMark();
-
-	cb = (qpic_t *)COM_LoadTempFile ("gfx/conback.lmp");	
-	if (!cb)
-		Sys_Error ("Couldn't load gfx/conback.lmp");
-	SwapPic (cb);
-
-	// hack the version number directly into the pic
-#if defined(__linux__)
-	sprintf (ver, "(Linux %2.2f, gl %4.2f) %4.2f", (float)LINUX_VERSION, (float)GLQUAKE_VERSION, (float)VERSION);
-#else
-	sprintf (ver, "(gl %4.2f) %4.2f", (float)GLQUAKE_VERSION, (float)VERSION);
-#endif
-	dest = cb->data + 320*186 + 320 - 11 - 8*strlen(ver);
-	y = strlen(ver);
-	for (x=0 ; x<y ; x++)
-		Draw_CharToConback (ver[x], dest+(x<<3));
-
-#if 0
-	conback->width = vid.conwidth;
-	conback->height = vid.conheight;
-
- 	// scale console to vid size
- 	dest = ncdata = Hunk_AllocName(vid.conwidth * vid.conheight, "conback");
- 
- 	for (y=0 ; y<vid.conheight ; y++, dest += vid.conwidth)
- 	{
- 		src = cb->data + cb->width * (y*cb->height/vid.conheight);
- 		if (vid.conwidth == cb->width)
- 			memcpy (dest, src, vid.conwidth);
- 		else
- 		{
- 			f = 0;
- 			fstep = cb->width*0x10000/vid.conwidth;
- 			for (x=0 ; x<vid.conwidth ; x+=4)
- 			{
- 				dest[x] = src[f>>16];
- 				f += fstep;
- 				dest[x+1] = src[f>>16];
- 				f += fstep;
- 				dest[x+2] = src[f>>16];
- 				f += fstep;
- 				dest[x+3] = src[f>>16];
- 				f += fstep;
- 			}
- 		}
- 	}
-#else
-	conback->width = cb->width;
-	conback->height = cb->height;
-	ncdata = cb->data;
-#endif
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-	gl = (glpic_t *)conback->data;
-	gl->texnum = GL_LoadTexture ("conback", conback->width, conback->height, ncdata, false, false);
-	gl->sl = 0;
-	gl->sh = 1;
-	gl->tl = 0;
-	gl->th = 1;
-	conback->width = vid.width;
-	conback->height = vid.height;
-
-	// free loaded console
-	Hunk_FreeToLowMark(start);
-
-	// save a texture slot for translated picture
-	translate_texture = texture_extension_number++;
-
-	// save slots for scraps
-	scrap_texnum = texture_extension_number;
-	texture_extension_number += MAX_SCRAPS;
-
-	//
-	// get the other pics we need
-	//
-	draw_disc = Draw_PicFromWad ("disc");
-	draw_backtile = Draw_PicFromWad ("backtile");
-}
-
-
-
-/*
-================
-Draw_Character
-
-Draws one 8*8 graphics character with 0 being transparent.
-It can be clipped to the top of the screen to allow the console to be
-smoothly scrolled off.
-================
-*/
-void Draw_Character (int x, int y, int num)
-{
-	byte			*dest;
-	byte			*source;
-	unsigned short	*pusdest;
-	int				drawline;	
-	int				row, col;
-	float			frow, fcol, size;
-
-	if (num == 32)
-		return;		// space
-
-	num &= 255;
-	
-	if (y <= -8)
-		return;			// totally off screen
-
-	row = num>>4;
-	col = num&15;
-
-	frow = row*0.0625;
-	fcol = col*0.0625;
-	size = 0.0625;
-
-	GL_Bind (char_texture);
-
-	glBegin (GL_QUADS);
-	glTexCoord2f (fcol, frow);
-	glVertex2f (x, y);
-	glTexCoord2f (fcol + size, frow);
-	glVertex2f (x+8, y);
-	glTexCoord2f (fcol + size, frow + size);
-	glVertex2f (x+8, y+8);
-	glTexCoord2f (fcol, frow + size);
-	glVertex2f (x, y+8);
-	glEnd ();
-}
-
-/*
-================
-Draw_String
-================
-*/
-void Draw_String (int x, int y, char *str)
-{
-	while (*str)
-	{
-		Draw_Character (x, y, *str);
-		str++;
-		x += 8;
-	}
-}
-
-/*
-================
-Draw_DebugChar
-
-Draws a single character directly to the upper right corner of the screen.
-This is for debugging lockups by drawing different chars in different parts
-of the code.
-================
-*/
-void Draw_DebugChar (char num)
-{
-}
-
-/*
-=============
-Draw_AlphaPic
-=============
-*/
-void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha)
-{
-	byte			*dest, *source;
-	unsigned short	*pusdest;
-	int				v, u;
-	glpic_t			*gl;
-
-	if (scrap_dirty)
-		Scrap_Upload ();
-	gl = (glpic_t *)pic->data;
-	glDisable(GL_ALPHA_TEST);
-	glEnable (GL_BLEND);
-//	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//	glCullFace(GL_FRONT);
-	glColor4f (1,1,1,alpha);
-	GL_Bind (gl->texnum);
-	glBegin (GL_QUADS);
-	glTexCoord2f (gl->sl, gl->tl);
-	glVertex2f (x, y);
-	glTexCoord2f (gl->sh, gl->tl);
-	glVertex2f (x+pic->width, y);
-	glTexCoord2f (gl->sh, gl->th);
-	glVertex2f (x+pic->width, y+pic->height);
-	glTexCoord2f (gl->sl, gl->th);
-	glVertex2f (x, y+pic->height);
-	glEnd ();
-	glColor4f (1,1,1,1);
-	glEnable(GL_ALPHA_TEST);
-	glDisable (GL_BLEND);
-}
-
-
-/*
-=============
-Draw_Pic
-=============
-*/
-void Draw_Pic (int x, int y, qpic_t *pic)
-{
-	byte			*dest, *source;
-	unsigned short	*pusdest;
-	int				v, u;
-	glpic_t			*gl;
-
-	if (scrap_dirty)
-		Scrap_Upload ();
-	gl = (glpic_t *)pic->data;
-	glColor4f (1,1,1,1);
-	GL_Bind (gl->texnum);
-	glBegin (GL_QUADS);
-	glTexCoord2f (gl->sl, gl->tl);
-	glVertex2f (x, y);
-	glTexCoord2f (gl->sh, gl->tl);
-	glVertex2f (x+pic->width, y);
-	glTexCoord2f (gl->sh, gl->th);
-	glVertex2f (x+pic->width, y+pic->height);
-	glTexCoord2f (gl->sl, gl->th);
-	glVertex2f (x, y+pic->height);
-	glEnd ();
-}
-
-
-/*
-=============
-Draw_TransPic
-=============
-*/
-void Draw_TransPic (int x, int y, qpic_t *pic)
-{
-	byte	*dest, *source, tbyte;
-	unsigned short	*pusdest;
-	int				v, u;
-
-	if (x < 0 || (unsigned)(x + pic->width) > vid.width || y < 0 ||
-		 (unsigned)(y + pic->height) > vid.height)
-	{
-		Sys_Error ("Draw_TransPic: bad coordinates");
-	}
-		
-	Draw_Pic (x, y, pic);
-}
-
-
-/*
-=============
-Draw_TransPicTranslate
-
-Only used for the player color selection menu
-=============
-*/
-void Draw_TransPicTranslate (int x, int y, qpic_t *pic, byte *translation)
-{
-	int				v, u, c;
-	unsigned		trans[64*64], *dest;
-	byte			*src;
-	int				p;
-
-	GL_Bind (translate_texture);
-
-	c = pic->width * pic->height;
-
-	dest = trans;
-	for (v=0 ; v<64 ; v++, dest += 64)
-	{
-		src = &menuplyr_pixels[ ((v*pic->height)>>6) *pic->width];
-		for (u=0 ; u<64 ; u++)
-		{
-			p = src[(u*pic->width)>>6];
-			if (p == 255)
-				dest[u] = p;
-			else
-				dest[u] =  d_8to24table[translation[p]];
-		}
-	}
-
-	glTexImage2D (GL_TEXTURE_2D, 0, gl_alpha_format, 64, 64, 0, GL_RGBA, GL_UNSIGNED_BYTE, trans);
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-	glColor3f (1,1,1);
-	glBegin (GL_QUADS);
-	glTexCoord2f (0, 0);
-	glVertex2f (x, y);
-	glTexCoord2f (1, 0);
-	glVertex2f (x+pic->width, y);
-	glTexCoord2f (1, 1);
-	glVertex2f (x+pic->width, y+pic->height);
-	glTexCoord2f (0, 1);
-	glVertex2f (x, y+pic->height);
-	glEnd ();
-}
-
-
-/*
-================
-Draw_ConsoleBackground
-
-================
-*/
-void Draw_ConsoleBackground (int lines)
-{
-	int y = (vid.height * 3) >> 2;
-
-	if (lines > y)
-		Draw_Pic(0, lines - vid.height, conback);
-	else
-		Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y);
-}
-
-
-/*
-=============
-Draw_TileClear
-
-This repeats a 64*64 tile graphic to fill the screen around a sized down
-refresh window.
-=============
-*/
-void Draw_TileClear (int x, int y, int w, int h)
-{
-	glColor3f (1,1,1);
-	GL_Bind (*(int *)draw_backtile->data);
-	glBegin (GL_QUADS);
-	glTexCoord2f (x/64.0, y/64.0);
-	glVertex2f (x, y);
-	glTexCoord2f ( (x+w)/64.0, y/64.0);
-	glVertex2f (x+w, y);
-	glTexCoord2f ( (x+w)/64.0, (y+h)/64.0);
-	glVertex2f (x+w, y+h);
-	glTexCoord2f ( x/64.0, (y+h)/64.0 );
-	glVertex2f (x, y+h);
-	glEnd ();
-}
-
-
-/*
-=============
-Draw_Fill
-
-Fills a box of pixels with a single color
-=============
-*/
-void Draw_Fill (int x, int y, int w, int h, int c)
-{
-	glDisable (GL_TEXTURE_2D);
-	glColor3f (host_basepal[c*3]/255.0,
-		host_basepal[c*3+1]/255.0,
-		host_basepal[c*3+2]/255.0);
-
-	glBegin (GL_QUADS);
-
-	glVertex2f (x,y);
-	glVertex2f (x+w, y);
-	glVertex2f (x+w, y+h);
-	glVertex2f (x, y+h);
-
-	glEnd ();
-	glColor3f (1,1,1);
-	glEnable (GL_TEXTURE_2D);
-}
-//=============================================================================
-
-/*
-================
-Draw_FadeScreen
-
-================
-*/
-void Draw_FadeScreen (void)
-{
-	glEnable (GL_BLEND);
-	glDisable (GL_TEXTURE_2D);
-	glColor4f (0, 0, 0, 0.8);
-	glBegin (GL_QUADS);
-
-	glVertex2f (0,0);
-	glVertex2f (vid.width, 0);
-	glVertex2f (vid.width, vid.height);
-	glVertex2f (0, vid.height);
-
-	glEnd ();
-	glColor4f (1,1,1,1);
-	glEnable (GL_TEXTURE_2D);
-	glDisable (GL_BLEND);
-
-	Sbar_Changed();
-}
-
-//=============================================================================
-
-/*
-================
-Draw_BeginDisc
-
-Draws the little blue disc in the corner of the screen.
-Call before beginning any disc IO.
-================
-*/
-void Draw_BeginDisc (void)
-{
-	if (!draw_disc)
-		return;
-	glDrawBuffer  (GL_FRONT);
-	Draw_Pic (vid.width - 24, 0, draw_disc);
-	glDrawBuffer  (GL_BACK);
-}
-
-
-/*
-================
-Draw_EndDisc
-
-Erases the disc icon.
-Call after completing any disc IO
-================
-*/
-void Draw_EndDisc (void)
-{
-}
-
-/*
-================
-GL_Set2D
-
-Setup as if the screen was 320*200
-================
-*/
-void GL_Set2D (void)
-{
-	glViewport (glx, gly, glwidth, glheight);
-
-	glMatrixMode(GL_PROJECTION);
-    glLoadIdentity ();
-	glOrtho  (0, vid.width, vid.height, 0, -99999, 99999);
-
-	glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity ();
-
-	glDisable (GL_DEPTH_TEST);
-	glDisable (GL_CULL_FACE);
-	glDisable (GL_BLEND);
-	glEnable (GL_ALPHA_TEST);
-//	glDisable (GL_ALPHA_TEST);
-
-	glColor4f (1,1,1,1);
-}
-
-//====================================================================
-
-/*
-================
-GL_FindTexture
-================
-*/
-int GL_FindTexture (char *identifier)
-{
-	int		i;
-	gltexture_t	*glt;
-
-	for (i=0, glt=gltextures ; i<numgltextures ; i++, glt++)
-	{
-		if (!strcmp (identifier, glt->identifier))
-			return gltextures[i].texnum;
-	}
-
-	return -1;
-}
-
-/*
-================
-GL_ResampleTexture
-================
-*/
-void GL_ResampleTexture (unsigned *in, int inwidth, int inheight, unsigned *out,  int outwidth, int outheight)
-{
-	int		i, j;
-	unsigned	*inrow;
-	unsigned	frac, fracstep;
-
-	fracstep = inwidth*0x10000/outwidth;
-	for (i=0 ; i<outheight ; i++, out += outwidth)
-	{
-		inrow = in + inwidth*(i*inheight/outheight);
-		frac = fracstep >> 1;
-		for (j=0 ; j<outwidth ; j+=4)
-		{
-			out[j] = inrow[frac>>16];
-			frac += fracstep;
-			out[j+1] = inrow[frac>>16];
-			frac += fracstep;
-			out[j+2] = inrow[frac>>16];
-			frac += fracstep;
-			out[j+3] = inrow[frac>>16];
-			frac += fracstep;
-		}
-	}
-}
-
-/*
-================
-GL_Resample8BitTexture -- JACK
-================
-*/
-void GL_Resample8BitTexture (unsigned char *in, int inwidth, int inheight, unsigned char *out,  int outwidth, int outheight)
-{
-	int		i, j;
-	unsigned	char *inrow;
-	unsigned	frac, fracstep;
-
-	fracstep = inwidth*0x10000/outwidth;
-	for (i=0 ; i<outheight ; i++, out += outwidth)
-	{
-		inrow = in + inwidth*(i*inheight/outheight);
-		frac = fracstep >> 1;
-		for (j=0 ; j<outwidth ; j+=4)
-		{
-			out[j] = inrow[frac>>16];
-			frac += fracstep;
-			out[j+1] = inrow[frac>>16];
-			frac += fracstep;
-			out[j+2] = inrow[frac>>16];
-			frac += fracstep;
-			out[j+3] = inrow[frac>>16];
-			frac += fracstep;
-		}
-	}
-}
-
-
-/*
-================
-GL_MipMap
-
-Operates in place, quartering the size of the texture
-================
-*/
-void GL_MipMap (byte *in, int width, int height)
-{
-	int		i, j;
-	byte	*out;
-
-	width <<=2;
-	height >>= 1;
-	out = in;
-	for (i=0 ; i<height ; i++, in+=width)
-	{
-		for (j=0 ; j<width ; j+=8, out+=4, in+=8)
-		{
-			out[0] = (in[0] + in[4] + in[width+0] + in[width+4])>>2;
-			out[1] = (in[1] + in[5] + in[width+1] + in[width+5])>>2;
-			out[2] = (in[2] + in[6] + in[width+2] + in[width+6])>>2;
-			out[3] = (in[3] + in[7] + in[width+3] + in[width+7])>>2;
-		}
-	}
-}
-
-/*
-================
-GL_MipMap8Bit
-
-Mipping for 8 bit textures
-================
-*/
-void GL_MipMap8Bit (byte *in, int width, int height)
-{
-	int		i, j;
-	unsigned short     r,g,b;
-	byte	*out, *at1, *at2, *at3, *at4;
-
-//	width <<=2;
-	height >>= 1;
-	out = in;
-	for (i=0 ; i<height ; i++, in+=width)
-	{
-		for (j=0 ; j<width ; j+=2, out+=1, in+=2)
-		{
-			at1 = (byte *) (d_8to24table + in[0]);
-			at2 = (byte *) (d_8to24table + in[1]);
-			at3 = (byte *) (d_8to24table + in[width+0]);
-			at4 = (byte *) (d_8to24table + in[width+1]);
-
- 			r = (at1[0]+at2[0]+at3[0]+at4[0]); r>>=5;
- 			g = (at1[1]+at2[1]+at3[1]+at4[1]); g>>=5;
- 			b = (at1[2]+at2[2]+at3[2]+at4[2]); b>>=5;
-
-			out[0] = d_15to8table[(r<<0) + (g<<5) + (b<<10)];
-		}
-	}
-}
-
-/*
-===============
-GL_Upload32
-===============
-*/
-void GL_Upload32 (unsigned *data, int width, int height,  qboolean mipmap, qboolean alpha)
-{
-	int			samples;
-static	unsigned	scaled[1024*512];	// [512*256];
-	int			scaled_width, scaled_height;
-
-	for (scaled_width = 1 ; scaled_width < width ; scaled_width<<=1)
-		;
-	for (scaled_height = 1 ; scaled_height < height ; scaled_height<<=1)
-		;
-
-	scaled_width >>= (int)gl_picmip.value;
-	scaled_height >>= (int)gl_picmip.value;
-
-	if (scaled_width > gl_max_size.value)
-		scaled_width = gl_max_size.value;
-	if (scaled_height > gl_max_size.value)
-		scaled_height = gl_max_size.value;
-
-	if (scaled_width * scaled_height > sizeof(scaled)/4)
-		Sys_Error ("GL_LoadTexture: too big");
-
-	samples = alpha ? gl_alpha_format : gl_solid_format;
-
-#if 0
-	if (mipmap)
-		gluBuild2DMipmaps (GL_TEXTURE_2D, samples, width, height, GL_RGBA, GL_UNSIGNED_BYTE, trans);
-	else if (scaled_width == width && scaled_height == height)
-		glTexImage2D (GL_TEXTURE_2D, 0, samples, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, trans);
-	else
-	{
-		gluScaleImage (GL_RGBA, width, height, GL_UNSIGNED_BYTE, trans,
-			scaled_width, scaled_height, GL_UNSIGNED_BYTE, scaled);
-		glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
-	}
-#else
-texels += scaled_width * scaled_height;
-
-	if (scaled_width == width && scaled_height == height)
-	{
-		if (!mipmap)
-		{
-			glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
-			goto done;
-		}
-		memcpy (scaled, data, width*height*4);
-	}
-	else
-		GL_ResampleTexture (data, width, height, scaled, scaled_width, scaled_height);
-
-	glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
-	if (mipmap)
-	{
-		int		miplevel;
-
-		miplevel = 0;
-		while (scaled_width > 1 || scaled_height > 1)
-		{
-			GL_MipMap ((byte *)scaled, scaled_width, scaled_height);
-			scaled_width >>= 1;
-			scaled_height >>= 1;
-			if (scaled_width < 1)
-				scaled_width = 1;
-			if (scaled_height < 1)
-				scaled_height = 1;
-			miplevel++;
-			glTexImage2D (GL_TEXTURE_2D, miplevel, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled);
-		}
-	}
-done: ;
-#endif
-
-
-	if (mipmap)
-	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-	else
-	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-}
-
-void GL_Upload8_EXT (byte *data, int width, int height,  qboolean mipmap, qboolean alpha) 
-{
-	int			i, s;
-	qboolean	noalpha;
-	int			p;
-	static unsigned j;
-	int			samples;
-    static	unsigned char scaled[1024*512];	// [512*256];
-	int			scaled_width, scaled_height;
-
-	s = width*height;
-	// if there are no transparent pixels, make it a 3 component
-	// texture even if it was specified as otherwise
-	if (alpha)
-	{
-		noalpha = true;
-		for (i=0 ; i<s ; i++)
-		{
-			if (data[i] == 255)
-				noalpha = false;
-		}
-
-		if (alpha && noalpha)
-			alpha = false;
-	}
-	for (scaled_width = 1 ; scaled_width < width ; scaled_width<<=1)
-		;
-	for (scaled_height = 1 ; scaled_height < height ; scaled_height<<=1)
-		;
-
-	scaled_width >>= (int)gl_picmip.value;
-	scaled_height >>= (int)gl_picmip.value;
-
-	if (scaled_width > gl_max_size.value)
-		scaled_width = gl_max_size.value;
-	if (scaled_height > gl_max_size.value)
-		scaled_height = gl_max_size.value;
-
-	if (scaled_width * scaled_height > sizeof(scaled))
-		Sys_Error ("GL_LoadTexture: too big");
-
-	samples = 1; // alpha ? gl_alpha_format : gl_solid_format;
-
-	texels += scaled_width * scaled_height;
-
-	if (scaled_width == width && scaled_height == height)
-	{
-		if (!mipmap)
-		{
-			glTexImage2D (GL_TEXTURE_2D, 0, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX , GL_UNSIGNED_BYTE, data);
-			goto done;
-		}
-		memcpy (scaled, data, width*height);
-	}
-	else
-		GL_Resample8BitTexture (data, width, height, scaled, scaled_width, scaled_height);
-
-	glTexImage2D (GL_TEXTURE_2D, 0, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, scaled);
-	if (mipmap)
-	{
-		int		miplevel;
-
-		miplevel = 0;
-		while (scaled_width > 1 || scaled_height > 1)
-		{
-			GL_MipMap8Bit ((byte *)scaled, scaled_width, scaled_height);
-			scaled_width >>= 1;
-			scaled_height >>= 1;
-			if (scaled_width < 1)
-				scaled_width = 1;
-			if (scaled_height < 1)
-				scaled_height = 1;
-			miplevel++;
-			glTexImage2D (GL_TEXTURE_2D, miplevel, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, scaled);
-		}
-	}
-done: ;
-
-
-	if (mipmap)
-	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-	else
-	{
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-}
-
-/*
-===============
-GL_Upload8
-===============
-*/
-void GL_Upload8 (byte *data, int width, int height,  qboolean mipmap, qboolean alpha)
-{
-static	unsigned	trans[640*480];		// FIXME, temporary
-	int			i, s;
-	qboolean	noalpha;
-	int			p;
-
-	s = width*height;
-	// if there are no transparent pixels, make it a 3 component
-	// texture even if it was specified as otherwise
-	if (alpha)
-	{
-		noalpha = true;
-		for (i=0 ; i<s ; i++)
-		{
-			p = data[i];
-			if (p == 255)
-				noalpha = false;
-			trans[i] = d_8to24table[p];
-		}
-
-		if (alpha && noalpha)
-			alpha = false;
-	}
-	else
-	{
-		if (s&3)
-			Sys_Error ("GL_Upload8: s&3");
-		for (i=0 ; i<s ; i+=4)
-		{
-			trans[i] = d_8to24table[data[i]];
-			trans[i+1] = d_8to24table[data[i+1]];
-			trans[i+2] = d_8to24table[data[i+2]];
-			trans[i+3] = d_8to24table[data[i+3]];
-		}
-	}
-
- 	if (VID_Is8bit() && !alpha && (data!=scrap_texels[0])) {
- 		GL_Upload8_EXT (data, width, height, mipmap, alpha);
- 		return;
-	}
-	GL_Upload32 (trans, width, height, mipmap, alpha);
-}
-
-/*
-================
-GL_LoadTexture
-================
-*/
-int GL_LoadTexture (char *identifier, int width, int height, byte *data, qboolean mipmap, qboolean alpha)
-{
-	qboolean	noalpha;
-	int			i, p, s;
-	gltexture_t	*glt;
-
-	// see if the texture is allready present
-	if (identifier[0])
-	{
-		for (i=0, glt=gltextures ; i<numgltextures ; i++, glt++)
-		{
-			if (!strcmp (identifier, glt->identifier))
-			{
-				if (width != glt->width || height != glt->height)
-					Sys_Error ("GL_LoadTexture: cache mismatch");
-				return gltextures[i].texnum;
-			}
-		}
-	}
-	else {
-		glt = &gltextures[numgltextures];
-		numgltextures++;
-	}
-
-	strcpy (glt->identifier, identifier);
-	glt->texnum = texture_extension_number;
-	glt->width = width;
-	glt->height = height;
-	glt->mipmap = mipmap;
-
-	GL_Bind(texture_extension_number );
-
-	GL_Upload8 (data, width, height, mipmap, alpha);
-
-	texture_extension_number++;
-
-	return texture_extension_number-1;
-}
-
-/*
-================
-GL_LoadPicTexture
-================
-*/
-int GL_LoadPicTexture (qpic_t *pic)
-{
-	return GL_LoadTexture ("", pic->width, pic->height, pic->data, false, true);
-}
-
-/****************************************/
-
-static GLenum oldtarget = TEXTURE0_SGIS;
-
-void GL_SelectTexture (GLenum target) 
-{
-	if (!gl_mtexable)
-		return;
-	qglSelectTextureSGIS(target);
-	if (target == oldtarget) 
-		return;
-	cnttextures[oldtarget-TEXTURE0_SGIS] = currenttexture;
-	currenttexture = cnttextures[target-TEXTURE0_SGIS];
-	oldtarget = target;
-}
--- a/u/gl_mesh.c
+++ /dev/null
@@ -1,360 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// gl_mesh.c: triangle model functions
-
-#include "quakedef.h"
-
-/*
-=================================================================
-
-ALIAS MODEL DISPLAY LIST GENERATION
-
-=================================================================
-*/
-
-model_t		*aliasmodel;
-aliashdr_t	*paliashdr;
-
-qboolean	used[8192];
-
-// the command list holds counts and s/t values that are valid for
-// every frame
-int		commands[8192];
-int		numcommands;
-
-// all frames will have their vertexes rearranged and expanded
-// so they are in the order expected by the command list
-int		vertexorder[8192];
-int		numorder;
-
-int		allverts, alltris;
-
-int		stripverts[128];
-int		striptris[128];
-int		stripcount;
-
-/*
-================
-StripLength
-================
-*/
-int	StripLength (int starttri, int startv)
-{
-	int			m1, m2;
-	int			j;
-	mtriangle_t	*last, *check;
-	int			k;
-
-	used[starttri] = 2;
-
-	last = &triangles[starttri];
-
-	stripverts[0] = last->vertindex[(startv)%3];
-	stripverts[1] = last->vertindex[(startv+1)%3];
-	stripverts[2] = last->vertindex[(startv+2)%3];
-
-	striptris[0] = starttri;
-	stripcount = 1;
-
-	m1 = last->vertindex[(startv+2)%3];
-	m2 = last->vertindex[(startv+1)%3];
-
-	// look for a matching triangle
-nexttri:
-	for (j=starttri+1, check=&triangles[starttri+1] ; j<pheader->numtris ; j++, check++)
-	{
-		if (check->facesfront != last->facesfront)
-			continue;
-		for (k=0 ; k<3 ; k++)
-		{
-			if (check->vertindex[k] != m1)
-				continue;
-			if (check->vertindex[ (k+1)%3 ] != m2)
-				continue;
-
-			// this is the next part of the fan
-
-			// if we can't use this triangle, this tristrip is done
-			if (used[j])
-				goto done;
-
-			// the new edge
-			if (stripcount & 1)
-				m2 = check->vertindex[ (k+2)%3 ];
-			else
-				m1 = check->vertindex[ (k+2)%3 ];
-
-			stripverts[stripcount+2] = check->vertindex[ (k+2)%3 ];
-			striptris[stripcount] = j;
-			stripcount++;
-
-			used[j] = 2;
-			goto nexttri;
-		}
-	}
-done:
-
-	// clear the temp used flags
-	for (j=starttri+1 ; j<pheader->numtris ; j++)
-		if (used[j] == 2)
-			used[j] = 0;
-
-	return stripcount;
-}
-
-/*
-===========
-FanLength
-===========
-*/
-int	FanLength (int starttri, int startv)
-{
-	int		m1, m2;
-	int		j;
-	mtriangle_t	*last, *check;
-	int		k;
-
-	used[starttri] = 2;
-
-	last = &triangles[starttri];
-
-	stripverts[0] = last->vertindex[(startv)%3];
-	stripverts[1] = last->vertindex[(startv+1)%3];
-	stripverts[2] = last->vertindex[(startv+2)%3];
-
-	striptris[0] = starttri;
-	stripcount = 1;
-
-	m1 = last->vertindex[(startv+0)%3];
-	m2 = last->vertindex[(startv+2)%3];
-
-
-	// look for a matching triangle
-nexttri:
-	for (j=starttri+1, check=&triangles[starttri+1] ; j<pheader->numtris ; j++, check++)
-	{
-		if (check->facesfront != last->facesfront)
-			continue;
-		for (k=0 ; k<3 ; k++)
-		{
-			if (check->vertindex[k] != m1)
-				continue;
-			if (check->vertindex[ (k+1)%3 ] != m2)
-				continue;
-
-			// this is the next part of the fan
-
-			// if we can't use this triangle, this tristrip is done
-			if (used[j])
-				goto done;
-
-			// the new edge
-			m2 = check->vertindex[ (k+2)%3 ];
-
-			stripverts[stripcount+2] = m2;
-			striptris[stripcount] = j;
-			stripcount++;
-
-			used[j] = 2;
-			goto nexttri;
-		}
-	}
-done:
-
-	// clear the temp used flags
-	for (j=starttri+1 ; j<pheader->numtris ; j++)
-		if (used[j] == 2)
-			used[j] = 0;
-
-	return stripcount;
-}
-
-
-/*
-================
-BuildTris
-
-Generate a list of trifans or strips
-for the model, which holds for all frames
-================
-*/
-void BuildTris (void)
-{
-	int		i, j, k;
-	int		startv;
-	mtriangle_t	*last, *check;
-	int		m1, m2;
-	int		striplength;
-	trivertx_t	*v;
-	mtriangle_t *tv;
-	float	s, t;
-	int		index;
-	int		len, bestlen, besttype;
-	int		bestverts[1024];
-	int		besttris[1024];
-	int		type;
-
-	//
-	// build tristrips
-	//
-	numorder = 0;
-	numcommands = 0;
-	memset (used, 0, sizeof(used));
-	for (i=0 ; i<pheader->numtris ; i++)
-	{
-		// pick an unused triangle and start the trifan
-		if (used[i])
-			continue;
-
-		bestlen = 0;
-		for (type = 0 ; type < 2 ; type++)
-//	type = 1;
-		{
-			for (startv =0 ; startv < 3 ; startv++)
-			{
-				if (type == 1)
-					len = StripLength (i, startv);
-				else
-					len = FanLength (i, startv);
-				if (len > bestlen)
-				{
-					besttype = type;
-					bestlen = len;
-					for (j=0 ; j<bestlen+2 ; j++)
-						bestverts[j] = stripverts[j];
-					for (j=0 ; j<bestlen ; j++)
-						besttris[j] = striptris[j];
-				}
-			}
-		}
-
-		// mark the tris on the best strip as used
-		for (j=0 ; j<bestlen ; j++)
-			used[besttris[j]] = 1;
-
-		if (besttype == 1)
-			commands[numcommands++] = (bestlen+2);
-		else
-			commands[numcommands++] = -(bestlen+2);
-
-		for (j=0 ; j<bestlen+2 ; j++)
-		{
-			// emit a vertex into the reorder buffer
-			k = bestverts[j];
-			vertexorder[numorder++] = k;
-
-			// emit s/t coords into the commands stream
-			s = stverts[k].s;
-			t = stverts[k].t;
-			if (!triangles[besttris[0]].facesfront && stverts[k].onseam)
-				s += pheader->skinwidth / 2;	// on back side
-			s = (s + 0.5) / pheader->skinwidth;
-			t = (t + 0.5) / pheader->skinheight;
-
-			*(float *)&commands[numcommands++] = s;
-			*(float *)&commands[numcommands++] = t;
-		}
-	}
-
-	commands[numcommands++] = 0;		// end of list marker
-
-	Con_DPrintf ("%3i tri %3i vert %3i cmd\n", pheader->numtris, numorder, numcommands);
-
-	allverts += numorder;
-	alltris += pheader->numtris;
-}
-
-
-/*
-================
-GL_MakeAliasModelDisplayLists
-================
-*/
-void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr)
-{
-	int		i, j;
-	maliasgroup_t	*paliasgroup;
-	int			*cmds;
-	trivertx_t	*verts;
-	char	cache[MAX_QPATH], fullpath[MAX_OSPATH], *c;
-	FILE	*f;
-	int		len;
-	byte	*data;
-
-	aliasmodel = m;
-	paliashdr = hdr;	// (aliashdr_t *)Mod_Extradata (m);
-
-	//
-	// look for a cached version
-	//
-	strcpy (cache, "glquake/");
-	COM_StripExtension (m->name+strlen("progs/"), cache+strlen("glquake/"));
-	strcat (cache, ".ms2");
-
-	COM_FOpenFile (cache, &f);	
-	if (f)
-	{
-		fread (&numcommands, 4, 1, f);
-		fread (&numorder, 4, 1, f);
-		fread (&commands, numcommands * sizeof(commands[0]), 1, f);
-		fread (&vertexorder, numorder * sizeof(vertexorder[0]), 1, f);
-		fclose (f);
-	}
-	else
-	{
-		//
-		// build it from scratch
-		//
-		Con_Printf ("meshing %s...\n",m->name);
-
-		BuildTris ();		// trifans or lists
-
-		//
-		// save out the cached version
-		//
-		sprintf (fullpath, "%s/%s", com_gamedir, cache);
-		f = fopen (fullpath, "wb");
-		if (f)
-		{
-			fwrite (&numcommands, 4, 1, f);
-			fwrite (&numorder, 4, 1, f);
-			fwrite (&commands, numcommands * sizeof(commands[0]), 1, f);
-			fwrite (&vertexorder, numorder * sizeof(vertexorder[0]), 1, f);
-			fclose (f);
-		}
-	}
-
-
-	// save the data out
-
-	paliashdr->poseverts = numorder;
-
-	cmds = Hunk_Alloc (numcommands * 4);
-	paliashdr->commands = (byte *)cmds - (byte *)paliashdr;
-	memcpy (cmds, commands, numcommands * 4);
-
-	verts = Hunk_Alloc (paliashdr->numposes * paliashdr->poseverts 
-		* sizeof(trivertx_t) );
-	paliashdr->posedata = (byte *)verts - (byte *)paliashdr;
-	for (i=0 ; i<paliashdr->numposes ; i++)
-		for (j=0 ; j<numorder ; j++)
-			*verts++ = poseverts[i][vertexorder[j]];
-}
-
--- a/u/gl_model.c
+++ /dev/null
@@ -1,1840 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// models.c -- model loading and caching
-
-// models are the only shared resource between a client and server running
-// on the same machine.
-
-#include "quakedef.h"
-
-model_t	*loadmodel;
-char	loadname[32];	// for hunk tags
-
-void Mod_LoadSpriteModel (model_t *mod, void *buffer);
-void Mod_LoadBrushModel (model_t *mod, void *buffer);
-void Mod_LoadAliasModel (model_t *mod, void *buffer);
-model_t *Mod_LoadModel (model_t *mod, qboolean crash);
-
-byte	mod_novis[MAX_MAP_LEAFS/8];
-
-#define	MAX_MOD_KNOWN	512
-model_t	mod_known[MAX_MOD_KNOWN];
-int		mod_numknown;
-
-cvar_t gl_subdivide_size = {"gl_subdivide_size", "128", true};
-
-/*
-===============
-Mod_Init
-===============
-*/
-void Mod_Init (void)
-{
-	Cvar_RegisterVariable (&gl_subdivide_size);
-	memset (mod_novis, 0xff, sizeof(mod_novis));
-}
-
-/*
-===============
-Mod_Init
-
-Caches the data if needed
-===============
-*/
-void *Mod_Extradata (model_t *mod)
-{
-	void	*r;
-	
-	r = Cache_Check (&mod->cache);
-	if (r)
-		return r;
-
-	Mod_LoadModel (mod, true);
-	
-	if (!mod->cache.data)
-		Sys_Error ("Mod_Extradata: caching failed");
-	return mod->cache.data;
-}
-
-/*
-===============
-Mod_PointInLeaf
-===============
-*/
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
-{
-	mnode_t		*node;
-	float		d;
-	mplane_t	*plane;
-	
-	if (!model || !model->nodes)
-		Sys_Error ("Mod_PointInLeaf: bad model");
-
-	node = model->nodes;
-	while (1)
-	{
-		if (node->contents < 0)
-			return (mleaf_t *)node;
-		plane = node->plane;
-		d = DotProduct (p,plane->normal) - plane->dist;
-		if (d > 0)
-			node = node->children[0];
-		else
-			node = node->children[1];
-	}
-	
-	return NULL;	// never reached
-}
-
-
-/*
-===================
-Mod_DecompressVis
-===================
-*/
-byte *Mod_DecompressVis (byte *in, model_t *model)
-{
-	static byte	decompressed[MAX_MAP_LEAFS/8];
-	int		c;
-	byte	*out;
-	int		row;
-
-	row = (model->numleafs+7)>>3;	
-	out = decompressed;
-
-#if 0
-	memcpy (out, in, row);
-#else
-	if (!in)
-	{	// no vis info, so make all visible
-		while (row)
-		{
-			*out++ = 0xff;
-			row--;
-		}
-		return decompressed;		
-	}
-
-	do
-	{
-		if (*in)
-		{
-			*out++ = *in++;
-			continue;
-		}
-	
-		c = in[1];
-		in += 2;
-		while (c)
-		{
-			*out++ = 0;
-			c--;
-		}
-	} while (out - decompressed < row);
-#endif
-	
-	return decompressed;
-}
-
-byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model)
-{
-	if (leaf == model->leafs)
-		return mod_novis;
-	return Mod_DecompressVis (leaf->compressed_vis, model);
-}
-
-/*
-===================
-Mod_ClearAll
-===================
-*/
-void Mod_ClearAll (void)
-{
-	int		i;
-	model_t	*mod;
-	
-	for (i=0 , mod=mod_known ; i<mod_numknown ; i++, mod++)
-		if (mod->type != mod_alias)
-			mod->needload = true;
-}
-
-/*
-==================
-Mod_FindName
-
-==================
-*/
-model_t *Mod_FindName (char *name)
-{
-	int		i;
-	model_t	*mod;
-	
-	if (!name[0])
-		Sys_Error ("Mod_ForName: NULL name");
-		
-//
-// search the currently loaded models
-//
-	for (i=0 , mod=mod_known ; i<mod_numknown ; i++, mod++)
-		if (!strcmp (mod->name, name) )
-			break;
-			
-	if (i == mod_numknown)
-	{
-		if (mod_numknown == MAX_MOD_KNOWN)
-			Sys_Error ("mod_numknown == MAX_MOD_KNOWN");
-		strcpy (mod->name, name);
-		mod->needload = true;
-		mod_numknown++;
-	}
-
-	return mod;
-}
-
-/*
-==================
-Mod_TouchModel
-
-==================
-*/
-void Mod_TouchModel (char *name)
-{
-	model_t	*mod;
-	
-	mod = Mod_FindName (name);
-	
-	if (!mod->needload)
-	{
-		if (mod->type == mod_alias)
-			Cache_Check (&mod->cache);
-	}
-}
-
-/*
-==================
-Mod_LoadModel
-
-Loads a model into the cache
-==================
-*/
-model_t *Mod_LoadModel (model_t *mod, qboolean crash)
-{
-	void	*d;
-	unsigned *buf;
-	byte	stackbuf[1024];		// avoid dirtying the cache heap
-
-	if (!mod->needload)
-	{
-		if (mod->type == mod_alias)
-		{
-			d = Cache_Check (&mod->cache);
-			if (d)
-				return mod;
-		}
-		else
-			return mod;		// not cached at all
-	}
-
-//
-// because the world is so huge, load it one piece at a time
-//
-	if (!crash)
-	{
-	
-	}
-	
-//
-// load the file
-//
-	buf = (unsigned *)COM_LoadStackFile (mod->name, stackbuf, sizeof(stackbuf));
-	if (!buf)
-	{
-		if (crash)
-			Sys_Error ("Mod_NumForName: %s not found", mod->name);
-		return NULL;
-	}
-	
-//
-// allocate a new model
-//
-	COM_FileBase (mod->name, loadname);
-	
-	loadmodel = mod;
-
-//
-// fill it in
-//
-
-// call the apropriate loader
-	mod->needload = false;
-	
-	switch (LittleLong(*(unsigned *)buf))
-	{
-	case IDPOLYHEADER:
-		Mod_LoadAliasModel (mod, buf);
-		break;
-		
-	case IDSPRITEHEADER:
-		Mod_LoadSpriteModel (mod, buf);
-		break;
-	
-	default:
-		Mod_LoadBrushModel (mod, buf);
-		break;
-	}
-
-	return mod;
-}
-
-/*
-==================
-Mod_ForName
-
-Loads in a model for the given name
-==================
-*/
-model_t *Mod_ForName (char *name, qboolean crash)
-{
-	model_t	*mod;
-	
-	mod = Mod_FindName (name);
-	
-	return Mod_LoadModel (mod, crash);
-}
-
-
-/*
-===============================================================================
-
-					BRUSHMODEL LOADING
-
-===============================================================================
-*/
-
-byte	*mod_base;
-
-
-/*
-=================
-Mod_LoadTextures
-=================
-*/
-void Mod_LoadTextures (lump_t *l)
-{
-	int		i, j, pixels, num, max, altmax;
-	miptex_t	*mt;
-	texture_t	*tx, *tx2;
-	texture_t	*anims[10];
-	texture_t	*altanims[10];
-	dmiptexlump_t *m;
-
-	if (!l->filelen)
-	{
-		loadmodel->textures = NULL;
-		return;
-	}
-	m = (dmiptexlump_t *)(mod_base + l->fileofs);
-	
-	m->nummiptex = LittleLong (m->nummiptex);
-	
-	loadmodel->numtextures = m->nummiptex;
-	loadmodel->textures = Hunk_AllocName (m->nummiptex * sizeof(*loadmodel->textures) , loadname);
-
-	for (i=0 ; i<m->nummiptex ; i++)
-	{
-		m->dataofs[i] = LittleLong(m->dataofs[i]);
-		if (m->dataofs[i] == -1)
-			continue;
-		mt = (miptex_t *)((byte *)m + m->dataofs[i]);
-		mt->width = LittleLong (mt->width);
-		mt->height = LittleLong (mt->height);
-		for (j=0 ; j<MIPLEVELS ; j++)
-			mt->offsets[j] = LittleLong (mt->offsets[j]);
-		
-		if ( (mt->width & 15) || (mt->height & 15) )
-			Sys_Error ("Texture %s is not 16 aligned", mt->name);
-		pixels = mt->width*mt->height/64*85;
-		tx = Hunk_AllocName (sizeof(texture_t) +pixels, loadname );
-		loadmodel->textures[i] = tx;
-
-		memcpy (tx->name, mt->name, sizeof(tx->name));
-		tx->width = mt->width;
-		tx->height = mt->height;
-		for (j=0 ; j<MIPLEVELS ; j++)
-			tx->offsets[j] = mt->offsets[j] + sizeof(texture_t) - sizeof(miptex_t);
-		// the pixels immediately follow the structures
-		memcpy ( tx+1, mt+1, pixels);
-		
-
-		if (!Q_strncmp(mt->name,"sky",3))	
-			R_InitSky (tx);
-		else
-		{
-			texture_mode = GL_LINEAR_MIPMAP_NEAREST; //_LINEAR;
-			tx->gl_texturenum = GL_LoadTexture (mt->name, tx->width, tx->height, (byte *)(tx+1), true, false);
-			texture_mode = GL_LINEAR;
-		}
-	}
-
-//
-// sequence the animations
-//
-	for (i=0 ; i<m->nummiptex ; i++)
-	{
-		tx = loadmodel->textures[i];
-		if (!tx || tx->name[0] != '+')
-			continue;
-		if (tx->anim_next)
-			continue;	// allready sequenced
-
-	// find the number of frames in the animation
-		memset (anims, 0, sizeof(anims));
-		memset (altanims, 0, sizeof(altanims));
-
-		max = tx->name[1];
-		altmax = 0;
-		if (max >= 'a' && max <= 'z')
-			max -= 'a' - 'A';
-		if (max >= '0' && max <= '9')
-		{
-			max -= '0';
-			altmax = 0;
-			anims[max] = tx;
-			max++;
-		}
-		else if (max >= 'A' && max <= 'J')
-		{
-			altmax = max - 'A';
-			max = 0;
-			altanims[altmax] = tx;
-			altmax++;
-		}
-		else
-			Sys_Error ("Bad animating texture %s", tx->name);
-
-		for (j=i+1 ; j<m->nummiptex ; j++)
-		{
-			tx2 = loadmodel->textures[j];
-			if (!tx2 || tx2->name[0] != '+')
-				continue;
-			if (strcmp (tx2->name+2, tx->name+2))
-				continue;
-
-			num = tx2->name[1];
-			if (num >= 'a' && num <= 'z')
-				num -= 'a' - 'A';
-			if (num >= '0' && num <= '9')
-			{
-				num -= '0';
-				anims[num] = tx2;
-				if (num+1 > max)
-					max = num + 1;
-			}
-			else if (num >= 'A' && num <= 'J')
-			{
-				num = num - 'A';
-				altanims[num] = tx2;
-				if (num+1 > altmax)
-					altmax = num+1;
-			}
-			else
-				Sys_Error ("Bad animating texture %s", tx->name);
-		}
-		
-#define	ANIM_CYCLE	2
-	// link them all together
-		for (j=0 ; j<max ; j++)
-		{
-			tx2 = anims[j];
-			if (!tx2)
-				Sys_Error ("Missing frame %i of %s",j, tx->name);
-			tx2->anim_total = max * ANIM_CYCLE;
-			tx2->anim_min = j * ANIM_CYCLE;
-			tx2->anim_max = (j+1) * ANIM_CYCLE;
-			tx2->anim_next = anims[ (j+1)%max ];
-			if (altmax)
-				tx2->alternate_anims = altanims[0];
-		}
-		for (j=0 ; j<altmax ; j++)
-		{
-			tx2 = altanims[j];
-			if (!tx2)
-				Sys_Error ("Missing frame %i of %s",j, tx->name);
-			tx2->anim_total = altmax * ANIM_CYCLE;
-			tx2->anim_min = j * ANIM_CYCLE;
-			tx2->anim_max = (j+1) * ANIM_CYCLE;
-			tx2->anim_next = altanims[ (j+1)%altmax ];
-			if (max)
-				tx2->alternate_anims = anims[0];
-		}
-	}
-}
-
-/*
-=================
-Mod_LoadLighting
-=================
-*/
-void Mod_LoadLighting (lump_t *l)
-{
-	if (!l->filelen)
-	{
-		loadmodel->lightdata = NULL;
-		return;
-	}
-	loadmodel->lightdata = Hunk_AllocName ( l->filelen, loadname);	
-	memcpy (loadmodel->lightdata, mod_base + l->fileofs, l->filelen);
-}
-
-
-/*
-=================
-Mod_LoadVisibility
-=================
-*/
-void Mod_LoadVisibility (lump_t *l)
-{
-	if (!l->filelen)
-	{
-		loadmodel->visdata = NULL;
-		return;
-	}
-	loadmodel->visdata = Hunk_AllocName ( l->filelen, loadname);	
-	memcpy (loadmodel->visdata, mod_base + l->fileofs, l->filelen);
-}
-
-
-/*
-=================
-Mod_LoadEntities
-=================
-*/
-void Mod_LoadEntities (lump_t *l)
-{
-	if (!l->filelen)
-	{
-		loadmodel->entities = NULL;
-		return;
-	}
-	loadmodel->entities = Hunk_AllocName ( l->filelen, loadname);	
-	memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen);
-}
-
-
-/*
-=================
-Mod_LoadVertexes
-=================
-*/
-void Mod_LoadVertexes (lump_t *l)
-{
-	dvertex_t	*in;
-	mvertex_t	*out;
-	int			i, count;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->vertexes = out;
-	loadmodel->numvertexes = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		out->position[0] = LittleFloat (in->point[0]);
-		out->position[1] = LittleFloat (in->point[1]);
-		out->position[2] = LittleFloat (in->point[2]);
-	}
-}
-
-/*
-=================
-Mod_LoadSubmodels
-=================
-*/
-void Mod_LoadSubmodels (lump_t *l)
-{
-	dmodel_t	*in;
-	dmodel_t	*out;
-	int			i, j, count;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->submodels = out;
-	loadmodel->numsubmodels = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{	// spread the mins / maxs by a pixel
-			out->mins[j] = LittleFloat (in->mins[j]) - 1;
-			out->maxs[j] = LittleFloat (in->maxs[j]) + 1;
-			out->origin[j] = LittleFloat (in->origin[j]);
-		}
-		for (j=0 ; j<MAX_MAP_HULLS ; j++)
-			out->headnode[j] = LittleLong (in->headnode[j]);
-		out->visleafs = LittleLong (in->visleafs);
-		out->firstface = LittleLong (in->firstface);
-		out->numfaces = LittleLong (in->numfaces);
-	}
-}
-
-/*
-=================
-Mod_LoadEdges
-=================
-*/
-void Mod_LoadEdges (lump_t *l)
-{
-	dedge_t *in;
-	medge_t *out;
-	int 	i, count;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( (count + 1) * sizeof(*out), loadname);	
-
-	loadmodel->edges = out;
-	loadmodel->numedges = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		out->v[0] = (unsigned short)LittleShort(in->v[0]);
-		out->v[1] = (unsigned short)LittleShort(in->v[1]);
-	}
-}
-
-/*
-=================
-Mod_LoadTexinfo
-=================
-*/
-void Mod_LoadTexinfo (lump_t *l)
-{
-	texinfo_t *in;
-	mtexinfo_t *out;
-	int 	i, j, count;
-	int		miptex;
-	float	len1, len2;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->texinfo = out;
-	loadmodel->numtexinfo = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		for (j=0 ; j<8 ; j++)
-			out->vecs[0][j] = LittleFloat (in->vecs[0][j]);
-		len1 = Length (out->vecs[0]);
-		len2 = Length (out->vecs[1]);
-		len1 = (len1 + len2)/2;
-		if (len1 < 0.32)
-			out->mipadjust = 4;
-		else if (len1 < 0.49)
-			out->mipadjust = 3;
-		else if (len1 < 0.99)
-			out->mipadjust = 2;
-		else
-			out->mipadjust = 1;
-#if 0
-		if (len1 + len2 < 0.001)
-			out->mipadjust = 1;		// don't crash
-		else
-			out->mipadjust = 1 / floor( (len1+len2)/2 + 0.1 );
-#endif
-
-		miptex = LittleLong (in->miptex);
-		out->flags = LittleLong (in->flags);
-	
-		if (!loadmodel->textures)
-		{
-			out->texture = r_notexture_mip;	// checkerboard texture
-			out->flags = 0;
-		}
-		else
-		{
-			if (miptex >= loadmodel->numtextures)
-				Sys_Error ("miptex >= loadmodel->numtextures");
-			out->texture = loadmodel->textures[miptex];
-			if (!out->texture)
-			{
-				out->texture = r_notexture_mip; // texture not found
-				out->flags = 0;
-			}
-		}
-	}
-}
-
-/*
-================
-CalcSurfaceExtents
-
-Fills in s->texturemins[] and s->extents[]
-================
-*/
-void CalcSurfaceExtents (msurface_t *s)
-{
-	float	mins[2], maxs[2], val;
-	int		i,j, e;
-	mvertex_t	*v;
-	mtexinfo_t	*tex;
-	int		bmins[2], bmaxs[2];
-
-	mins[0] = mins[1] = 999999;
-	maxs[0] = maxs[1] = -99999;
-
-	tex = s->texinfo;
-	
-	for (i=0 ; i<s->numedges ; i++)
-	{
-		e = loadmodel->surfedges[s->firstedge+i];
-		if (e >= 0)
-			v = &loadmodel->vertexes[loadmodel->edges[e].v[0]];
-		else
-			v = &loadmodel->vertexes[loadmodel->edges[-e].v[1]];
-		
-		for (j=0 ; j<2 ; j++)
-		{
-			val = v->position[0] * tex->vecs[j][0] + 
-				v->position[1] * tex->vecs[j][1] +
-				v->position[2] * tex->vecs[j][2] +
-				tex->vecs[j][3];
-			if (val < mins[j])
-				mins[j] = val;
-			if (val > maxs[j])
-				maxs[j] = val;
-		}
-	}
-
-	for (i=0 ; i<2 ; i++)
-	{	
-		bmins[i] = floor(mins[i]/16);
-		bmaxs[i] = ceil(maxs[i]/16);
-
-		s->texturemins[i] = bmins[i] * 16;
-		s->extents[i] = (bmaxs[i] - bmins[i]) * 16;
-		if ( !(tex->flags & TEX_SPECIAL) && s->extents[i] > 512 /* 256 */ )
-			Sys_Error ("Bad surface extents");
-	}
-}
-
-
-/*
-=================
-Mod_LoadFaces
-=================
-*/
-void Mod_LoadFaces (lump_t *l)
-{
-	dface_t		*in;
-	msurface_t 	*out;
-	int			i, count, surfnum;
-	int			planenum, side;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->surfaces = out;
-	loadmodel->numsurfaces = count;
-
-	for ( surfnum=0 ; surfnum<count ; surfnum++, in++, out++)
-	{
-		out->firstedge = LittleLong(in->firstedge);
-		out->numedges = LittleShort(in->numedges);		
-		out->flags = 0;
-
-		planenum = LittleShort(in->planenum);
-		side = LittleShort(in->side);
-		if (side)
-			out->flags |= SURF_PLANEBACK;			
-
-		out->plane = loadmodel->planes + planenum;
-
-		out->texinfo = loadmodel->texinfo + LittleShort (in->texinfo);
-
-		CalcSurfaceExtents (out);
-				
-	// lighting info
-
-		for (i=0 ; i<MAXLIGHTMAPS ; i++)
-			out->styles[i] = in->styles[i];
-		i = LittleLong(in->lightofs);
-		if (i == -1)
-			out->samples = NULL;
-		else
-			out->samples = loadmodel->lightdata + i;
-		
-	// set the drawing flags flag
-		
-		if (!Q_strncmp(out->texinfo->texture->name,"sky",3))	// sky
-		{
-			out->flags |= (SURF_DRAWSKY | SURF_DRAWTILED);
-#ifndef QUAKE2
-			GL_SubdivideSurface (out);	// cut up polygon for warps
-#endif
-			continue;
-		}
-		
-		if (!Q_strncmp(out->texinfo->texture->name,"*",1))		// turbulent
-		{
-			out->flags |= (SURF_DRAWTURB | SURF_DRAWTILED);
-			for (i=0 ; i<2 ; i++)
-			{
-				out->extents[i] = 16384;
-				out->texturemins[i] = -8192;
-			}
-			GL_SubdivideSurface (out);	// cut up polygon for warps
-			continue;
-		}
-
-	}
-}
-
-
-/*
-=================
-Mod_SetParent
-=================
-*/
-void Mod_SetParent (mnode_t *node, mnode_t *parent)
-{
-	node->parent = parent;
-	if (node->contents < 0)
-		return;
-	Mod_SetParent (node->children[0], node);
-	Mod_SetParent (node->children[1], node);
-}
-
-/*
-=================
-Mod_LoadNodes
-=================
-*/
-void Mod_LoadNodes (lump_t *l)
-{
-	int			i, j, count, p;
-	dnode_t		*in;
-	mnode_t 	*out;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->nodes = out;
-	loadmodel->numnodes = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{
-			out->minmaxs[j] = LittleShort (in->mins[j]);
-			out->minmaxs[3+j] = LittleShort (in->maxs[j]);
-		}
-	
-		p = LittleLong(in->planenum);
-		out->plane = loadmodel->planes + p;
-
-		out->firstsurface = LittleShort (in->firstface);
-		out->numsurfaces = LittleShort (in->numfaces);
-		
-		for (j=0 ; j<2 ; j++)
-		{
-			p = LittleShort (in->children[j]);
-			if (p >= 0)
-				out->children[j] = loadmodel->nodes + p;
-			else
-				out->children[j] = (mnode_t *)(loadmodel->leafs + (-1 - p));
-		}
-	}
-	
-	Mod_SetParent (loadmodel->nodes, NULL);	// sets nodes and leafs
-}
-
-/*
-=================
-Mod_LoadLeafs
-=================
-*/
-void Mod_LoadLeafs (lump_t *l)
-{
-	dleaf_t 	*in;
-	mleaf_t 	*out;
-	int			i, j, count, p;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->leafs = out;
-	loadmodel->numleafs = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{
-			out->minmaxs[j] = LittleShort (in->mins[j]);
-			out->minmaxs[3+j] = LittleShort (in->maxs[j]);
-		}
-
-		p = LittleLong(in->contents);
-		out->contents = p;
-
-		out->firstmarksurface = loadmodel->marksurfaces +
-			LittleShort(in->firstmarksurface);
-		out->nummarksurfaces = LittleShort(in->nummarksurfaces);
-		
-		p = LittleLong(in->visofs);
-		if (p == -1)
-			out->compressed_vis = NULL;
-		else
-			out->compressed_vis = loadmodel->visdata + p;
-		out->efrags = NULL;
-		
-		for (j=0 ; j<4 ; j++)
-			out->ambient_sound_level[j] = in->ambient_level[j];
-
-		// gl underwater warp
-		if (out->contents != CONTENTS_EMPTY)
-		{
-			for (j=0 ; j<out->nummarksurfaces ; j++)
-				out->firstmarksurface[j]->flags |= SURF_UNDERWATER;
-		}
-	}	
-}
-
-/*
-=================
-Mod_LoadClipnodes
-=================
-*/
-void Mod_LoadClipnodes (lump_t *l)
-{
-	dclipnode_t *in, *out;
-	int			i, count;
-	hull_t		*hull;
-
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->clipnodes = out;
-	loadmodel->numclipnodes = count;
-
-	hull = &loadmodel->hulls[1];
-	hull->clipnodes = out;
-	hull->firstclipnode = 0;
-	hull->lastclipnode = count-1;
-	hull->planes = loadmodel->planes;
-	hull->clip_mins[0] = -16;
-	hull->clip_mins[1] = -16;
-	hull->clip_mins[2] = -24;
-	hull->clip_maxs[0] = 16;
-	hull->clip_maxs[1] = 16;
-	hull->clip_maxs[2] = 32;
-
-	hull = &loadmodel->hulls[2];
-	hull->clipnodes = out;
-	hull->firstclipnode = 0;
-	hull->lastclipnode = count-1;
-	hull->planes = loadmodel->planes;
-	hull->clip_mins[0] = -32;
-	hull->clip_mins[1] = -32;
-	hull->clip_mins[2] = -24;
-	hull->clip_maxs[0] = 32;
-	hull->clip_maxs[1] = 32;
-	hull->clip_maxs[2] = 64;
-
-	for (i=0 ; i<count ; i++, out++, in++)
-	{
-		out->planenum = LittleLong(in->planenum);
-		out->children[0] = LittleShort(in->children[0]);
-		out->children[1] = LittleShort(in->children[1]);
-	}
-}
-
-/*
-=================
-Mod_MakeHull0
-
-Deplicate the drawing hull structure as a clipping hull
-=================
-*/
-void Mod_MakeHull0 (void)
-{
-	mnode_t		*in, *child;
-	dclipnode_t *out;
-	int			i, j, count;
-	hull_t		*hull;
-	
-	hull = &loadmodel->hulls[0];	
-	
-	in = loadmodel->nodes;
-	count = loadmodel->numnodes;
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	hull->clipnodes = out;
-	hull->firstclipnode = 0;
-	hull->lastclipnode = count-1;
-	hull->planes = loadmodel->planes;
-
-	for (i=0 ; i<count ; i++, out++, in++)
-	{
-		out->planenum = in->plane - loadmodel->planes;
-		for (j=0 ; j<2 ; j++)
-		{
-			child = in->children[j];
-			if (child->contents < 0)
-				out->children[j] = child->contents;
-			else
-				out->children[j] = child - loadmodel->nodes;
-		}
-	}
-}
-
-/*
-=================
-Mod_LoadMarksurfaces
-=================
-*/
-void Mod_LoadMarksurfaces (lump_t *l)
-{	
-	int		i, j, count;
-	short		*in;
-	msurface_t **out;
-	
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->marksurfaces = out;
-	loadmodel->nummarksurfaces = count;
-
-	for ( i=0 ; i<count ; i++)
-	{
-		j = LittleShort(in[i]);
-		if (j >= loadmodel->numsurfaces)
-			Sys_Error ("Mod_ParseMarksurfaces: bad surface number");
-		out[i] = loadmodel->surfaces + j;
-	}
-}
-
-/*
-=================
-Mod_LoadSurfedges
-=================
-*/
-void Mod_LoadSurfedges (lump_t *l)
-{	
-	int		i, count;
-	int		*in, *out;
-	
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*sizeof(*out), loadname);	
-
-	loadmodel->surfedges = out;
-	loadmodel->numsurfedges = count;
-
-	for ( i=0 ; i<count ; i++)
-		out[i] = LittleLong (in[i]);
-}
-
-
-/*
-=================
-Mod_LoadPlanes
-=================
-*/
-void Mod_LoadPlanes (lump_t *l)
-{
-	int			i, j;
-	mplane_t	*out;
-	dplane_t 	*in;
-	int			count;
-	int			bits;
-	
-	in = (void *)(mod_base + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		Sys_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
-	count = l->filelen / sizeof(*in);
-	out = Hunk_AllocName ( count*2*sizeof(*out), loadname);	
-	
-	loadmodel->planes = out;
-	loadmodel->numplanes = count;
-
-	for ( i=0 ; i<count ; i++, in++, out++)
-	{
-		bits = 0;
-		for (j=0 ; j<3 ; j++)
-		{
-			out->normal[j] = LittleFloat (in->normal[j]);
-			if (out->normal[j] < 0)
-				bits |= 1<<j;
-		}
-
-		out->dist = LittleFloat (in->dist);
-		out->type = LittleLong (in->type);
-		out->signbits = bits;
-	}
-}
-
-/*
-=================
-RadiusFromBounds
-=================
-*/
-float RadiusFromBounds (vec3_t mins, vec3_t maxs)
-{
-	int		i;
-	vec3_t	corner;
-
-	for (i=0 ; i<3 ; i++)
-	{
-		corner[i] = fabs(mins[i]) > fabs(maxs[i]) ? fabs(mins[i]) : fabs(maxs[i]);
-	}
-
-	return Length (corner);
-}
-
-/*
-=================
-Mod_LoadBrushModel
-=================
-*/
-void Mod_LoadBrushModel (model_t *mod, void *buffer)
-{
-	int			i, j;
-	dheader_t	*header;
-	dmodel_t 	*bm;
-	
-	loadmodel->type = mod_brush;
-	
-	header = (dheader_t *)buffer;
-
-	i = LittleLong (header->version);
-	if (i != BSPVERSION)
-		Sys_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i)", mod->name, i, BSPVERSION);
-
-// swap all the lumps
-	mod_base = (byte *)header;
-
-	for (i=0 ; i<sizeof(dheader_t)/4 ; i++)
-		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
-
-// load into heap
-	
-	Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]);
-	Mod_LoadEdges (&header->lumps[LUMP_EDGES]);
-	Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]);
-	Mod_LoadTextures (&header->lumps[LUMP_TEXTURES]);
-	Mod_LoadLighting (&header->lumps[LUMP_LIGHTING]);
-	Mod_LoadPlanes (&header->lumps[LUMP_PLANES]);
-	Mod_LoadTexinfo (&header->lumps[LUMP_TEXINFO]);
-	Mod_LoadFaces (&header->lumps[LUMP_FACES]);
-	Mod_LoadMarksurfaces (&header->lumps[LUMP_MARKSURFACES]);
-	Mod_LoadVisibility (&header->lumps[LUMP_VISIBILITY]);
-	Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
-	Mod_LoadNodes (&header->lumps[LUMP_NODES]);
-	Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-	Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-	Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-
-	Mod_MakeHull0 ();
-	
-	mod->numframes = 2;		// regular and alternate animation
-	
-//
-// set up the submodels (FIXME: this is confusing)
-//
-	for (i=0 ; i<mod->numsubmodels ; i++)
-	{
-		bm = &mod->submodels[i];
-
-		mod->hulls[0].firstclipnode = bm->headnode[0];
-		for (j=1 ; j<MAX_MAP_HULLS ; j++)
-		{
-			mod->hulls[j].firstclipnode = bm->headnode[j];
-			mod->hulls[j].lastclipnode = mod->numclipnodes-1;
-		}
-		
-		mod->firstmodelsurface = bm->firstface;
-		mod->nummodelsurfaces = bm->numfaces;
-		
-		VectorCopy (bm->maxs, mod->maxs);
-		VectorCopy (bm->mins, mod->mins);
-
-		mod->radius = RadiusFromBounds (mod->mins, mod->maxs);
-
-		mod->numleafs = bm->visleafs;
-
-		if (i < mod->numsubmodels-1)
-		{	// duplicate the basic information
-			char	name[10];
-
-			sprintf (name, "*%i", i+1);
-			loadmodel = Mod_FindName (name);
-			*loadmodel = *mod;
-			strcpy (loadmodel->name, name);
-			mod = loadmodel;
-		}
-	}
-}
-
-/*
-==============================================================================
-
-ALIAS MODELS
-
-==============================================================================
-*/
-
-aliashdr_t	*pheader;
-
-stvert_t	stverts[MAXALIASVERTS];
-mtriangle_t	triangles[MAXALIASTRIS];
-
-// a pose is a single set of vertexes.  a frame may be
-// an animating sequence of poses
-trivertx_t	*poseverts[MAXALIASFRAMES];
-int			posenum;
-
-byte		**player_8bit_texels_tbl;
-byte		*player_8bit_texels;
-
-/*
-=================
-Mod_LoadAliasFrame
-=================
-*/
-void * Mod_LoadAliasFrame (void * pin, maliasframedesc_t *frame)
-{
-	trivertx_t		*pframe, *pinframe;
-	int				i, j;
-	daliasframe_t	*pdaliasframe;
-	
-	pdaliasframe = (daliasframe_t *)pin;
-
-	strcpy (frame->name, pdaliasframe->name);
-	frame->firstpose = posenum;
-	frame->numposes = 1;
-
-	for (i=0 ; i<3 ; i++)
-	{
-	// these are byte values, so we don't have to worry about
-	// endianness
-		frame->bboxmin.v[i] = pdaliasframe->bboxmin.v[i];
-		frame->bboxmin.v[i] = pdaliasframe->bboxmax.v[i];
-	}
-
-	pinframe = (trivertx_t *)(pdaliasframe + 1);
-
-	poseverts[posenum] = pinframe;
-	posenum++;
-
-	pinframe += pheader->numverts;
-
-	return (void *)pinframe;
-}
-
-
-/*
-=================
-Mod_LoadAliasGroup
-=================
-*/
-void *Mod_LoadAliasGroup (void * pin,  maliasframedesc_t *frame)
-{
-	daliasgroup_t		*pingroup;
-	int					i, numframes;
-	daliasinterval_t	*pin_intervals;
-	void				*ptemp;
-	
-	pingroup = (daliasgroup_t *)pin;
-
-	numframes = LittleLong (pingroup->numframes);
-
-	frame->firstpose = posenum;
-	frame->numposes = numframes;
-
-	for (i=0 ; i<3 ; i++)
-	{
-	// these are byte values, so we don't have to worry about endianness
-		frame->bboxmin.v[i] = pingroup->bboxmin.v[i];
-		frame->bboxmin.v[i] = pingroup->bboxmax.v[i];
-	}
-
-	pin_intervals = (daliasinterval_t *)(pingroup + 1);
-
-	frame->interval = LittleFloat (pin_intervals->interval);
-
-	pin_intervals += numframes;
-
-	ptemp = (void *)pin_intervals;
-
-	for (i=0 ; i<numframes ; i++)
-	{
-		poseverts[posenum] = (trivertx_t *)((daliasframe_t *)ptemp + 1);
-		posenum++;
-
-		ptemp = (trivertx_t *)((daliasframe_t *)ptemp + 1) + pheader->numverts;
-	}
-
-	return ptemp;
-}
-
-//=========================================================
-
-/*
-=================
-Mod_FloodFillSkin
-
-Fill background pixels so mipmapping doesn't have haloes - Ed
-=================
-*/
-
-typedef struct
-{
-	short		x, y;
-} floodfill_t;
-
-extern unsigned d_8to24table[];
-
-// must be a power of 2
-#define FLOODFILL_FIFO_SIZE 0x1000
-#define FLOODFILL_FIFO_MASK (FLOODFILL_FIFO_SIZE - 1)
-
-#define FLOODFILL_STEP( off, dx, dy ) \
-{ \
-	if (pos[off] == fillcolor) \
-	{ \
-		pos[off] = 255; \
-		fifo[inpt].x = x + (dx), fifo[inpt].y = y + (dy); \
-		inpt = (inpt + 1) & FLOODFILL_FIFO_MASK; \
-	} \
-	else if (pos[off] != 255) fdc = pos[off]; \
-}
-
-void Mod_FloodFillSkin( byte *skin, int skinwidth, int skinheight )
-{
-	byte				fillcolor = *skin; // assume this is the pixel to fill
-	floodfill_t			fifo[FLOODFILL_FIFO_SIZE];
-	int					inpt = 0, outpt = 0;
-	int					filledcolor = -1;
-	int					i;
-
-	if (filledcolor == -1)
-	{
-		filledcolor = 0;
-		// attempt to find opaque black
-		for (i = 0; i < 256; ++i)
-			if (d_8to24table[i] == (255 << 0)) // alpha 1.0
-			{
-				filledcolor = i;
-				break;
-			}
-	}
-
-	// can't fill to filled color or to transparent color (used as visited marker)
-	if ((fillcolor == filledcolor) || (fillcolor == 255))
-	{
-		//printf( "not filling skin from %d to %d\n", fillcolor, filledcolor );
-		return;
-	}
-
-	fifo[inpt].x = 0, fifo[inpt].y = 0;
-	inpt = (inpt + 1) & FLOODFILL_FIFO_MASK;
-
-	while (outpt != inpt)
-	{
-		int			x = fifo[outpt].x, y = fifo[outpt].y;
-		int			fdc = filledcolor;
-		byte		*pos = &skin[x + skinwidth * y];
-
-		outpt = (outpt + 1) & FLOODFILL_FIFO_MASK;
-
-		if (x > 0)				FLOODFILL_STEP( -1, -1, 0 );
-		if (x < skinwidth - 1)	FLOODFILL_STEP( 1, 1, 0 );
-		if (y > 0)				FLOODFILL_STEP( -skinwidth, 0, -1 );
-		if (y < skinheight - 1)	FLOODFILL_STEP( skinwidth, 0, 1 );
-		skin[x + skinwidth * y] = fdc;
-	}
-}
-
-/*
-===============
-Mod_LoadAllSkins
-===============
-*/
-void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
-{
-	int		i, j, k;
-	char	name[32];
-	int		s;
-	byte	*copy;
-	byte	*skin;
-	byte	*texels;
-	daliasskingroup_t		*pinskingroup;
-	int		groupskins;
-	daliasskininterval_t	*pinskinintervals;
-	
-	skin = (byte *)(pskintype + 1);
-
-	if (numskins < 1 || numskins > MAX_SKINS)
-		Sys_Error ("Mod_LoadAliasModel: Invalid # of skins: %d\n", numskins);
-
-	s = pheader->skinwidth * pheader->skinheight;
-
-	for (i=0 ; i<numskins ; i++)
-	{
-		if (pskintype->type == ALIAS_SKIN_SINGLE) {
-			Mod_FloodFillSkin( skin, pheader->skinwidth, pheader->skinheight );
-
-			// save 8 bit texels for the player model to remap
-	//		if (!strcmp(loadmodel->name,"progs/player.mdl")) {
-				texels = Hunk_AllocName(s, loadname);
-				pheader->texels[i] = texels - (byte *)pheader;
-				memcpy (texels, (byte *)(pskintype + 1), s);
-	//		}
-			sprintf (name, "%s_%i", loadmodel->name, i);
-			pheader->gl_texturenum[i][0] =
-			pheader->gl_texturenum[i][1] =
-			pheader->gl_texturenum[i][2] =
-			pheader->gl_texturenum[i][3] =
-				GL_LoadTexture (name, pheader->skinwidth, 
-				pheader->skinheight, (byte *)(pskintype + 1), true, false);
-			pskintype = (daliasskintype_t *)((byte *)(pskintype+1) + s);
-		} else {
-			// animating skin group.  yuck.
-			pskintype++;
-			pinskingroup = (daliasskingroup_t *)pskintype;
-			groupskins = LittleLong (pinskingroup->numskins);
-			pinskinintervals = (daliasskininterval_t *)(pinskingroup + 1);
-
-			pskintype = (void *)(pinskinintervals + groupskins);
-
-			for (j=0 ; j<groupskins ; j++)
-			{
-					Mod_FloodFillSkin( skin, pheader->skinwidth, pheader->skinheight );
-					if (j == 0) {
-						texels = Hunk_AllocName(s, loadname);
-						pheader->texels[i] = texels - (byte *)pheader;
-						memcpy (texels, (byte *)(pskintype), s);
-					}
-					sprintf (name, "%s_%i_%i", loadmodel->name, i,j);
-					pheader->gl_texturenum[i][j&3] = 
-						GL_LoadTexture (name, pheader->skinwidth, 
-						pheader->skinheight, (byte *)(pskintype), true, false);
-					pskintype = (daliasskintype_t *)((byte *)(pskintype) + s);
-			}
-			k = j;
-			for (/* */; j < 4; j++)
-				pheader->gl_texturenum[i][j&3] = 
-				pheader->gl_texturenum[i][j - k]; 
-		}
-	}
-
-	return (void *)pskintype;
-}
-
-//=========================================================================
-
-/*
-=================
-Mod_LoadAliasModel
-=================
-*/
-void Mod_LoadAliasModel (model_t *mod, void *buffer)
-{
-	int					i, j;
-	mdl_t				*pinmodel;
-	stvert_t			*pinstverts;
-	dtriangle_t			*pintriangles;
-	int					version, numframes, numskins;
-	int					size;
-	daliasframetype_t	*pframetype;
-	daliasskintype_t	*pskintype;
-	int					start, end, total;
-	
-	start = Hunk_LowMark ();
-
-	pinmodel = (mdl_t *)buffer;
-
-	version = LittleLong (pinmodel->version);
-	if (version != ALIAS_VERSION)
-		Sys_Error ("%s has wrong version number (%i should be %i)",
-				 mod->name, version, ALIAS_VERSION);
-
-//
-// allocate space for a working header, plus all the data except the frames,
-// skin and group info
-//
-	size = 	sizeof (aliashdr_t) 
-			+ (LittleLong (pinmodel->numframes) - 1) *
-			sizeof (pheader->frames[0]);
-	pheader = Hunk_AllocName (size, loadname);
-	
-	mod->flags = LittleLong (pinmodel->flags);
-
-//
-// endian-adjust and copy the data, starting with the alias model header
-//
-	pheader->boundingradius = LittleFloat (pinmodel->boundingradius);
-	pheader->numskins = LittleLong (pinmodel->numskins);
-	pheader->skinwidth = LittleLong (pinmodel->skinwidth);
-	pheader->skinheight = LittleLong (pinmodel->skinheight);
-
-	if (pheader->skinheight > MAX_LBM_HEIGHT)
-		Sys_Error ("model %s has a skin taller than %d", mod->name,
-				   MAX_LBM_HEIGHT);
-
-	pheader->numverts = LittleLong (pinmodel->numverts);
-
-	if (pheader->numverts <= 0)
-		Sys_Error ("model %s has no vertices", mod->name);
-
-	if (pheader->numverts > MAXALIASVERTS)
-		Sys_Error ("model %s has too many vertices", mod->name);
-
-	pheader->numtris = LittleLong (pinmodel->numtris);
-
-	if (pheader->numtris <= 0)
-		Sys_Error ("model %s has no triangles", mod->name);
-
-	pheader->numframes = LittleLong (pinmodel->numframes);
-	numframes = pheader->numframes;
-	if (numframes < 1)
-		Sys_Error ("Mod_LoadAliasModel: Invalid # of frames: %d\n", numframes);
-
-	pheader->size = LittleFloat (pinmodel->size) * ALIAS_BASE_SIZE_RATIO;
-	mod->synctype = LittleLong (pinmodel->synctype);
-	mod->numframes = pheader->numframes;
-
-	for (i=0 ; i<3 ; i++)
-	{
-		pheader->scale[i] = LittleFloat (pinmodel->scale[i]);
-		pheader->scale_origin[i] = LittleFloat (pinmodel->scale_origin[i]);
-		pheader->eyeposition[i] = LittleFloat (pinmodel->eyeposition[i]);
-	}
-
-
-//
-// load the skins
-//
-	pskintype = (daliasskintype_t *)&pinmodel[1];
-	pskintype = Mod_LoadAllSkins (pheader->numskins, pskintype);
-
-//
-// load base s and t vertices
-//
-	pinstverts = (stvert_t *)pskintype;
-
-	for (i=0 ; i<pheader->numverts ; i++)
-	{
-		stverts[i].onseam = LittleLong (pinstverts[i].onseam);
-		stverts[i].s = LittleLong (pinstverts[i].s);
-		stverts[i].t = LittleLong (pinstverts[i].t);
-	}
-
-//
-// load triangle lists
-//
-	pintriangles = (dtriangle_t *)&pinstverts[pheader->numverts];
-
-	for (i=0 ; i<pheader->numtris ; i++)
-	{
-		triangles[i].facesfront = LittleLong (pintriangles[i].facesfront);
-
-		for (j=0 ; j<3 ; j++)
-		{
-			triangles[i].vertindex[j] =
-					LittleLong (pintriangles[i].vertindex[j]);
-		}
-	}
-
-//
-// load the frames
-//
-	posenum = 0;
-	pframetype = (daliasframetype_t *)&pintriangles[pheader->numtris];
-
-	for (i=0 ; i<numframes ; i++)
-	{
-		aliasframetype_t	frametype;
-
-		frametype = LittleLong (pframetype->type);
-
-		if (frametype == ALIAS_SINGLE)
-		{
-			pframetype = (daliasframetype_t *)
-					Mod_LoadAliasFrame (pframetype + 1, &pheader->frames[i]);
-		}
-		else
-		{
-			pframetype = (daliasframetype_t *)
-					Mod_LoadAliasGroup (pframetype + 1, &pheader->frames[i]);
-		}
-	}
-
-	pheader->numposes = posenum;
-
-	mod->type = mod_alias;
-
-// FIXME: do this right
-	mod->mins[0] = mod->mins[1] = mod->mins[2] = -16;
-	mod->maxs[0] = mod->maxs[1] = mod->maxs[2] = 16;
-
-	//
-	// build the draw lists
-	//
-	GL_MakeAliasModelDisplayLists (mod, pheader);
-
-//
-// move the complete, relocatable alias model to the cache
-//	
-	end = Hunk_LowMark ();
-	total = end - start;
-	
-	Cache_Alloc (&mod->cache, total, loadname);
-	if (!mod->cache.data)
-		return;
-	memcpy (mod->cache.data, pheader, total);
-
-	Hunk_FreeToLowMark (start);
-}
-
-//=============================================================================
-
-/*
-=================
-Mod_LoadSpriteFrame
-=================
-*/
-void * Mod_LoadSpriteFrame (void * pin, mspriteframe_t **ppframe, int framenum)
-{
-	dspriteframe_t		*pinframe;
-	mspriteframe_t		*pspriteframe;
-	int					i, width, height, size, origin[2];
-	unsigned short		*ppixout;
-	byte				*ppixin;
-	char				name[64];
-
-	pinframe = (dspriteframe_t *)pin;
-
-	width = LittleLong (pinframe->width);
-	height = LittleLong (pinframe->height);
-	size = width * height;
-
-	pspriteframe = Hunk_AllocName (sizeof (mspriteframe_t),loadname);
-
-	Q_memset (pspriteframe, 0, sizeof (mspriteframe_t));
-
-	*ppframe = pspriteframe;
-
-	pspriteframe->width = width;
-	pspriteframe->height = height;
-	origin[0] = LittleLong (pinframe->origin[0]);
-	origin[1] = LittleLong (pinframe->origin[1]);
-
-	pspriteframe->up = origin[1];
-	pspriteframe->down = origin[1] - height;
-	pspriteframe->left = origin[0];
-	pspriteframe->right = width + origin[0];
-
-	sprintf (name, "%s_%i", loadmodel->name, framenum);
-	pspriteframe->gl_texturenum = GL_LoadTexture (name, width, height, (byte *)(pinframe + 1), true, true);
-
-	return (void *)((byte *)pinframe + sizeof (dspriteframe_t) + size);
-}
-
-
-/*
-=================
-Mod_LoadSpriteGroup
-=================
-*/
-void * Mod_LoadSpriteGroup (void * pin, mspriteframe_t **ppframe, int framenum)
-{
-	dspritegroup_t		*pingroup;
-	mspritegroup_t		*pspritegroup;
-	int					i, numframes;
-	dspriteinterval_t	*pin_intervals;
-	float				*poutintervals;
-	void				*ptemp;
-
-	pingroup = (dspritegroup_t *)pin;
-
-	numframes = LittleLong (pingroup->numframes);
-
-	pspritegroup = Hunk_AllocName (sizeof (mspritegroup_t) +
-				(numframes - 1) * sizeof (pspritegroup->frames[0]), loadname);
-
-	pspritegroup->numframes = numframes;
-
-	*ppframe = (mspriteframe_t *)pspritegroup;
-
-	pin_intervals = (dspriteinterval_t *)(pingroup + 1);
-
-	poutintervals = Hunk_AllocName (numframes * sizeof (float), loadname);
-
-	pspritegroup->intervals = poutintervals;
-
-	for (i=0 ; i<numframes ; i++)
-	{
-		*poutintervals = LittleFloat (pin_intervals->interval);
-		if (*poutintervals <= 0.0)
-			Sys_Error ("Mod_LoadSpriteGroup: interval<=0");
-
-		poutintervals++;
-		pin_intervals++;
-	}
-
-	ptemp = (void *)pin_intervals;
-
-	for (i=0 ; i<numframes ; i++)
-	{
-		ptemp = Mod_LoadSpriteFrame (ptemp, &pspritegroup->frames[i], framenum * 100 + i);
-	}
-
-	return ptemp;
-}
-
-
-/*
-=================
-Mod_LoadSpriteModel
-=================
-*/
-void Mod_LoadSpriteModel (model_t *mod, void *buffer)
-{
-	int					i;
-	int					version;
-	dsprite_t			*pin;
-	msprite_t			*psprite;
-	int					numframes;
-	int					size;
-	dspriteframetype_t	*pframetype;
-	
-	pin = (dsprite_t *)buffer;
-
-	version = LittleLong (pin->version);
-	if (version != SPRITE_VERSION)
-		Sys_Error ("%s has wrong version number "
-				 "(%i should be %i)", mod->name, version, SPRITE_VERSION);
-
-	numframes = LittleLong (pin->numframes);
-
-	size = sizeof (msprite_t) +	(numframes - 1) * sizeof (psprite->frames);
-
-	psprite = Hunk_AllocName (size, loadname);
-
-	mod->cache.data = psprite;
-
-	psprite->type = LittleLong (pin->type);
-	psprite->maxwidth = LittleLong (pin->width);
-	psprite->maxheight = LittleLong (pin->height);
-	psprite->beamlength = LittleFloat (pin->beamlength);
-	mod->synctype = LittleLong (pin->synctype);
-	psprite->numframes = numframes;
-
-	mod->mins[0] = mod->mins[1] = -psprite->maxwidth/2;
-	mod->maxs[0] = mod->maxs[1] = psprite->maxwidth/2;
-	mod->mins[2] = -psprite->maxheight/2;
-	mod->maxs[2] = psprite->maxheight/2;
-	
-//
-// load the frames
-//
-	if (numframes < 1)
-		Sys_Error ("Mod_LoadSpriteModel: Invalid # of frames: %d\n", numframes);
-
-	mod->numframes = numframes;
-
-	pframetype = (dspriteframetype_t *)(pin + 1);
-
-	for (i=0 ; i<numframes ; i++)
-	{
-		spriteframetype_t	frametype;
-
-		frametype = LittleLong (pframetype->type);
-		psprite->frames[i].type = frametype;
-
-		if (frametype == SPR_SINGLE)
-		{
-			pframetype = (dspriteframetype_t *)
-					Mod_LoadSpriteFrame (pframetype + 1,
-										 &psprite->frames[i].frameptr, i);
-		}
-		else
-		{
-			pframetype = (dspriteframetype_t *)
-					Mod_LoadSpriteGroup (pframetype + 1,
-										 &psprite->frames[i].frameptr, i);
-		}
-	}
-
-	mod->type = mod_sprite;
-}
-
-//=============================================================================
-
-/*
-================
-Mod_Print
-================
-*/
-void Mod_Print (void)
-{
-	int		i;
-	model_t	*mod;
-
-	Con_Printf ("Cached models:\n");
-	for (i=0, mod=mod_known ; i < mod_numknown ; i++, mod++)
-	{
-		Con_Printf ("%8p : %s\n",mod->cache.data, mod->name);
-	}
-}
-
-
--- a/u/gl_model.h
+++ /dev/null
@@ -1,430 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 __MODEL__
-#define __MODEL__
-
-#include "modelgen.h"
-#include "spritegn.h"
-
-/*
-
-d*_t structures are on-disk representations
-m*_t structures are in-memory
-
-*/
-
-// entity effects
-
-#define	EF_BRIGHTFIELD			1
-#define	EF_MUZZLEFLASH 			2
-#define	EF_BRIGHTLIGHT 			4
-#define	EF_DIMLIGHT 			8
-
-
-/*
-==============================================================================
-
-BRUSH MODELS
-
-==============================================================================
-*/
-
-
-//
-// in memory representation
-//
-// !!! if this is changed, it must be changed in asm_draw.h too !!!
-typedef struct
-{
-	vec3_t		position;
-} mvertex_t;
-
-#define	SIDE_FRONT	0
-#define	SIDE_BACK	1
-#define	SIDE_ON		2
-
-
-// plane_t structure
-// !!! if this is changed, it must be changed in asm_i386.h too !!!
-typedef struct mplane_s
-{
-	vec3_t	normal;
-	float	dist;
-	byte	type;			// for texture axis selection and fast side tests
-	byte	signbits;		// signx + signy<<1 + signz<<1
-	byte	pad[2];
-} mplane_t;
-
-typedef struct texture_s
-{
-	char		name[16];
-	unsigned	width, height;
-	int			gl_texturenum;
-	struct msurface_s	*texturechain;	// for gl_texsort drawing
-	int			anim_total;				// total tenths in sequence ( 0 = no)
-	int			anim_min, anim_max;		// time for this frame min <=time< max
-	struct texture_s *anim_next;		// in the animation sequence
-	struct texture_s *alternate_anims;	// bmodels in frmae 1 use these
-	unsigned	offsets[MIPLEVELS];		// four mip maps stored
-} texture_t;
-
-
-#define	SURF_PLANEBACK		2
-#define	SURF_DRAWSKY		4
-#define SURF_DRAWSPRITE		8
-#define SURF_DRAWTURB		0x10
-#define SURF_DRAWTILED		0x20
-#define SURF_DRAWBACKGROUND	0x40
-#define SURF_UNDERWATER		0x80
-
-// !!! if this is changed, it must be changed in asm_draw.h too !!!
-typedef struct
-{
-	unsigned short	v[2];
-	unsigned int	cachededgeoffset;
-} medge_t;
-
-typedef struct
-{
-	float		vecs[2][4];
-	float		mipadjust;
-	texture_t	*texture;
-	int			flags;
-} mtexinfo_t;
-
-#define	VERTEXSIZE	7
-
-typedef struct glpoly_s
-{
-	struct	glpoly_s	*next;
-	struct	glpoly_s	*chain;
-	int		numverts;
-	int		flags;			// for SURF_UNDERWATER
-	float	verts[4][VERTEXSIZE];	// variable sized (xyz s1t1 s2t2)
-} glpoly_t;
-
-typedef struct msurface_s
-{
-	int			visframe;		// should be drawn when node is crossed
-
-	mplane_t	*plane;
-	int			flags;
-
-	int			firstedge;	// look up in model->surfedges[], negative numbers
-	int			numedges;	// are backwards edges
-	
-	short		texturemins[2];
-	short		extents[2];
-
-	int			light_s, light_t;	// gl lightmap coordinates
-
-	glpoly_t	*polys;				// multiple if warped
-	struct	msurface_s	*texturechain;
-
-	mtexinfo_t	*texinfo;
-	
-// lighting info
-	int			dlightframe;
-	int			dlightbits;
-
-	int			lightmaptexturenum;
-	byte		styles[MAXLIGHTMAPS];
-	int			cached_light[MAXLIGHTMAPS];	// values currently used in lightmap
-	qboolean	cached_dlight;				// true if dynamic light in cache
-	byte		*samples;		// [numstyles*surfsize]
-} msurface_t;
-
-typedef struct mnode_s
-{
-// common with leaf
-	int			contents;		// 0, to differentiate from leafs
-	int			visframe;		// node needs to be traversed if current
-	
-	float		minmaxs[6];		// for bounding box culling
-
-	struct mnode_s	*parent;
-
-// node specific
-	mplane_t	*plane;
-	struct mnode_s	*children[2];	
-
-	unsigned short		firstsurface;
-	unsigned short		numsurfaces;
-} mnode_t;
-
-
-
-typedef struct mleaf_s
-{
-// common with node
-	int			contents;		// wil be a negative contents number
-	int			visframe;		// node needs to be traversed if current
-
-	float		minmaxs[6];		// for bounding box culling
-
-	struct mnode_s	*parent;
-
-// leaf specific
-	byte		*compressed_vis;
-	efrag_t		*efrags;
-
-	msurface_t	**firstmarksurface;
-	int			nummarksurfaces;
-	int			key;			// BSP sequence number for leaf's contents
-	byte		ambient_sound_level[NUM_AMBIENTS];
-} mleaf_t;
-
-// !!! if this is changed, it must be changed in asm_i386.h too !!!
-typedef struct
-{
-	dclipnode_t	*clipnodes;
-	mplane_t	*planes;
-	int			firstclipnode;
-	int			lastclipnode;
-	vec3_t		clip_mins;
-	vec3_t		clip_maxs;
-} hull_t;
-
-/*
-==============================================================================
-
-SPRITE MODELS
-
-==============================================================================
-*/
-
-
-// FIXME: shorten these?
-typedef struct mspriteframe_s
-{
-	int		width;
-	int		height;
-	float	up, down, left, right;
-	int		gl_texturenum;
-} mspriteframe_t;
-
-typedef struct
-{
-	int				numframes;
-	float			*intervals;
-	mspriteframe_t	*frames[1];
-} mspritegroup_t;
-
-typedef struct
-{
-	spriteframetype_t	type;
-	mspriteframe_t		*frameptr;
-} mspriteframedesc_t;
-
-typedef struct
-{
-	int					type;
-	int					maxwidth;
-	int					maxheight;
-	int					numframes;
-	float				beamlength;		// remove?
-	void				*cachespot;		// remove?
-	mspriteframedesc_t	frames[1];
-} msprite_t;
-
-
-/*
-==============================================================================
-
-ALIAS MODELS
-
-Alias models are position independent, so the cache manager can move them.
-==============================================================================
-*/
-
-typedef struct
-{
-	int					firstpose;
-	int					numposes;
-	float				interval;
-	trivertx_t			bboxmin;
-	trivertx_t			bboxmax;
-	int					frame;
-	char				name[16];
-} maliasframedesc_t;
-
-typedef struct
-{
-	trivertx_t			bboxmin;
-	trivertx_t			bboxmax;
-	int					frame;
-} maliasgroupframedesc_t;
-
-typedef struct
-{
-	int						numframes;
-	int						intervals;
-	maliasgroupframedesc_t	frames[1];
-} maliasgroup_t;
-
-// !!! if this is changed, it must be changed in asm_draw.h too !!!
-typedef struct mtriangle_s {
-	int					facesfront;
-	int					vertindex[3];
-} mtriangle_t;
-
-
-#define	MAX_SKINS	32
-typedef struct {
-	int			ident;
-	int			version;
-	vec3_t		scale;
-	vec3_t		scale_origin;
-	float		boundingradius;
-	vec3_t		eyeposition;
-	int			numskins;
-	int			skinwidth;
-	int			skinheight;
-	int			numverts;
-	int			numtris;
-	int			numframes;
-	synctype_t	synctype;
-	int			flags;
-	float		size;
-
-	int					numposes;
-	int					poseverts;
-	int					posedata;	// numposes*poseverts trivert_t
-	int					commands;	// gl command list with embedded s/t
-	int					gl_texturenum[MAX_SKINS][4];
-	int					texels[MAX_SKINS];	// only for player skins
-	maliasframedesc_t	frames[1];	// variable sized
-} aliashdr_t;
-
-#define	MAXALIASVERTS	1024
-#define	MAXALIASFRAMES	256
-#define	MAXALIASTRIS	2048
-extern	aliashdr_t	*pheader;
-extern	stvert_t	stverts[MAXALIASVERTS];
-extern	mtriangle_t	triangles[MAXALIASTRIS];
-extern	trivertx_t	*poseverts[MAXALIASFRAMES];
-
-//===================================================================
-
-//
-// Whole model
-//
-
-typedef enum {mod_brush, mod_sprite, mod_alias} modtype_t;
-
-#define	EF_ROCKET	1			// leave a trail
-#define	EF_GRENADE	2			// leave a trail
-#define	EF_GIB		4			// leave a trail
-#define	EF_ROTATE	8			// rotate (bonus items)
-#define	EF_TRACER	16			// green split trail
-#define	EF_ZOMGIB	32			// small blood trail
-#define	EF_TRACER2	64			// orange split trail + rotate
-#define	EF_TRACER3	128			// purple trail
-
-typedef struct model_s
-{
-	char		name[MAX_QPATH];
-	qboolean	needload;		// bmodels and sprites don't cache normally
-
-	modtype_t	type;
-	int			numframes;
-	synctype_t	synctype;
-	
-	int			flags;
-
-//
-// volume occupied by the model graphics
-//		
-	vec3_t		mins, maxs;
-	float		radius;
-
-//
-// solid volume for clipping 
-//
-	qboolean	clipbox;
-	vec3_t		clipmins, clipmaxs;
-
-//
-// brush model
-//
-	int			firstmodelsurface, nummodelsurfaces;
-
-	int			numsubmodels;
-	dmodel_t	*submodels;
-
-	int			numplanes;
-	mplane_t	*planes;
-
-	int			numleafs;		// number of visible leafs, not counting 0
-	mleaf_t		*leafs;
-
-	int			numvertexes;
-	mvertex_t	*vertexes;
-
-	int			numedges;
-	medge_t		*edges;
-
-	int			numnodes;
-	mnode_t		*nodes;
-
-	int			numtexinfo;
-	mtexinfo_t	*texinfo;
-
-	int			numsurfaces;
-	msurface_t	*surfaces;
-
-	int			numsurfedges;
-	int			*surfedges;
-
-	int			numclipnodes;
-	dclipnode_t	*clipnodes;
-
-	int			nummarksurfaces;
-	msurface_t	**marksurfaces;
-
-	hull_t		hulls[MAX_MAP_HULLS];
-
-	int			numtextures;
-	texture_t	**textures;
-
-	byte		*visdata;
-	byte		*lightdata;
-	char		*entities;
-
-//
-// additional model data
-//
-	cache_user_t	cache;		// only access through Mod_Extradata
-
-} model_t;
-
-//============================================================================
-
-void	Mod_Init (void);
-void	Mod_ClearAll (void);
-model_t *Mod_ForName (char *name, qboolean crash);
-void	*Mod_Extradata (model_t *mod);	// handles caching
-void	Mod_TouchModel (char *name);
-
-mleaf_t *Mod_PointInLeaf (float *p, model_t *model);
-byte	*Mod_LeafPVS (mleaf_t *leaf, model_t *model);
-
-#endif	// __MODEL__
--- a/u/gl_refrag.c
+++ /dev/null
@@ -1,234 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// r_efrag.c
-
-#include "quakedef.h"
-
-mnode_t	*r_pefragtopnode;
-
-
-//===========================================================================
-
-/*
-===============================================================================
-
-					ENTITY FRAGMENT FUNCTIONS
-
-===============================================================================
-*/
-
-efrag_t		**lastlink;
-
-vec3_t		r_emins, r_emaxs;
-
-entity_t	*r_addent;
-
-
-/*
-================
-R_RemoveEfrags
-
-Call when removing an object from the world or moving it to another position
-================
-*/
-void R_RemoveEfrags (entity_t *ent)
-{
-	efrag_t		*ef, *old, *walk, **prev;
-	
-	ef = ent->efrag;
-	
-	while (ef)
-	{
-		prev = &ef->leaf->efrags;
-		while (1)
-		{
-			walk = *prev;
-			if (!walk)
-				break;
-			if (walk == ef)
-			{	// remove this fragment
-				*prev = ef->leafnext;
-				break;
-			}
-			else
-				prev = &walk->leafnext;
-		}
-				
-		old = ef;
-		ef = ef->entnext;
-		
-	// put it on the free list
-		old->entnext = cl.free_efrags;
-		cl.free_efrags = old;
-	}
-	
-	ent->efrag = NULL; 
-}
-
-/*
-===================
-R_SplitEntityOnNode
-===================
-*/
-void R_SplitEntityOnNode (mnode_t *node)
-{
-	efrag_t		*ef;
-	mplane_t	*splitplane;
-	mleaf_t		*leaf;
-	int			sides;
-	
-	if (node->contents == CONTENTS_SOLID)
-	{
-		return;
-	}
-	
-// add an efrag if the node is a leaf
-
-	if ( node->contents < 0)
-	{
-		if (!r_pefragtopnode)
-			r_pefragtopnode = node;
-
-		leaf = (mleaf_t *)node;
-
-// grab an efrag off the free list
-		ef = cl.free_efrags;
-		if (!ef)
-		{
-			Con_Printf ("Too many efrags!\n");
-			return;		// no free fragments...
-		}
-		cl.free_efrags = cl.free_efrags->entnext;
-
-		ef->entity = r_addent;
-		
-// add the entity link	
-		*lastlink = ef;
-		lastlink = &ef->entnext;
-		ef->entnext = NULL;
-		
-// set the leaf links
-		ef->leaf = leaf;
-		ef->leafnext = leaf->efrags;
-		leaf->efrags = ef;
-			
-		return;
-	}
-	
-// NODE_MIXED
-
-	splitplane = node->plane;
-	sides = BOX_ON_PLANE_SIDE(r_emins, r_emaxs, splitplane);
-	
-	if (sides == 3)
-	{
-	// split on this plane
-	// if this is the first splitter of this bmodel, remember it
-		if (!r_pefragtopnode)
-			r_pefragtopnode = node;
-	}
-	
-// recurse down the contacted sides
-	if (sides & 1)
-		R_SplitEntityOnNode (node->children[0]);
-		
-	if (sides & 2)
-		R_SplitEntityOnNode (node->children[1]);
-}
-
-
-
-/*
-===========
-R_AddEfrags
-===========
-*/
-void R_AddEfrags (entity_t *ent)
-{
-	model_t		*entmodel;
-	int			i;
-		
-	if (!ent->model)
-		return;
-
-	r_addent = ent;
-			
-	lastlink = &ent->efrag;
-	r_pefragtopnode = NULL;
-	
-	entmodel = ent->model;
-
-	for (i=0 ; i<3 ; i++)
-	{
-		r_emins[i] = ent->origin[i] + entmodel->mins[i];
-		r_emaxs[i] = ent->origin[i] + entmodel->maxs[i];
-	}
-
-	R_SplitEntityOnNode (cl.worldmodel->nodes);
-
-	ent->topnode = r_pefragtopnode;
-}
-
-
-/*
-================
-R_StoreEfrags
-
-// FIXME: a lot of this goes away with edge-based
-================
-*/
-void R_StoreEfrags (efrag_t **ppefrag)
-{
-	entity_t	*pent;
-	model_t		*clmodel;
-	efrag_t		*pefrag;
-
-
-	while ((pefrag = *ppefrag) != NULL)
-	{
-		pent = pefrag->entity;
-		clmodel = pent->model;
-
-		switch (clmodel->type)
-		{
-		case mod_alias:
-		case mod_brush:
-		case mod_sprite:
-			pent = pefrag->entity;
-
-			if ((pent->visframe != r_framecount) &&
-				(cl_numvisedicts < MAX_VISEDICTS))
-			{
-				cl_visedicts[cl_numvisedicts++] = pent;
-
-			// mark that we've recorded this entity for this frame
-				pent->visframe = r_framecount;
-			}
-
-			ppefrag = &pefrag->leafnext;
-			break;
-
-		default:	
-			Sys_Error ("R_StoreEfrags: Bad entity type %d\n", clmodel->type);
-		}
-	}
-}
-
-
--- a/u/gl_rlight.c
+++ /dev/null
@@ -1,354 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// r_light.c
-
-#include "quakedef.h"
-
-int	r_dlightframecount;
-
-
-/*
-==================
-R_AnimateLight
-==================
-*/
-void R_AnimateLight (void)
-{
-	int			i,j,k;
-	
-//
-// light animations
-// 'm' is normal light, 'a' is no light, 'z' is double bright
-	i = (int)(cl.time*10);
-	for (j=0 ; j<MAX_LIGHTSTYLES ; j++)
-	{
-		if (!cl_lightstyle[j].length)
-		{
-			d_lightstylevalue[j] = 256;
-			continue;
-		}
-		k = i % cl_lightstyle[j].length;
-		k = cl_lightstyle[j].map[k] - 'a';
-		k = k*22;
-		d_lightstylevalue[j] = k;
-	}	
-}
-
-/*
-=============================================================================
-
-DYNAMIC LIGHTS BLEND RENDERING
-
-=============================================================================
-*/
-
-void AddLightBlend (float r, float g, float b, float a2)
-{
-	float	a;
-
-	v_blend[3] = a = v_blend[3] + a2*(1-v_blend[3]);
-
-	a2 = a2/a;
-
-	v_blend[0] = v_blend[1]*(1-a2) + r*a2;
-	v_blend[1] = v_blend[1]*(1-a2) + g*a2;
-	v_blend[2] = v_blend[2]*(1-a2) + b*a2;
-}
-
-void R_RenderDlight (dlight_t *light)
-{
-	int		i, j;
-	float	a;
-	vec3_t	v;
-	float	rad;
-
-	rad = light->radius * 0.35;
-
-	VectorSubtract (light->origin, r_origin, v);
-	if (Length (v) < rad)
-	{	// view is inside the dlight
-		AddLightBlend (1, 0.5, 0, light->radius * 0.0003);
-		return;
-	}
-
-	glBegin (GL_TRIANGLE_FAN);
-	glColor3f (0.2,0.1,0.0);
-	for (i=0 ; i<3 ; i++)
-		v[i] = light->origin[i] - vpn[i]*rad;
-	glVertex3fv (v);
-	glColor3f (0,0,0);
-	for (i=16 ; i>=0 ; i--)
-	{
-		a = i/16.0 * M_PI*2;
-		for (j=0 ; j<3 ; j++)
-			v[j] = light->origin[j] + vright[j]*cos(a)*rad
-				+ vup[j]*sin(a)*rad;
-		glVertex3fv (v);
-	}
-	glEnd ();
-}
-
-/*
-=============
-R_RenderDlights
-=============
-*/
-void R_RenderDlights (void)
-{
-	int		i;
-	dlight_t	*l;
-
-	if (!gl_flashblend.value)
-		return;
-
-	r_dlightframecount = r_framecount + 1;	// because the count hasn't
-											//  advanced yet for this frame
-	glDepthMask (0);
-	glDisable (GL_TEXTURE_2D);
-	glShadeModel (GL_SMOOTH);
-	glEnable (GL_BLEND);
-	glBlendFunc (GL_ONE, GL_ONE);
-
-	l = cl_dlights;
-	for (i=0 ; i<MAX_DLIGHTS ; i++, l++)
-	{
-		if (l->die < cl.time || !l->radius)
-			continue;
-		R_RenderDlight (l);
-	}
-
-	glColor3f (1,1,1);
-	glDisable (GL_BLEND);
-	glEnable (GL_TEXTURE_2D);
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glDepthMask (1);
-}
-
-
-/*
-=============================================================================
-
-DYNAMIC LIGHTS
-
-=============================================================================
-*/
-
-/*
-=============
-R_MarkLights
-=============
-*/
-void R_MarkLights (dlight_t *light, int bit, mnode_t *node)
-{
-	mplane_t	*splitplane;
-	float		dist;
-	msurface_t	*surf;
-	int			i;
-	
-	if (node->contents < 0)
-		return;
-
-	splitplane = node->plane;
-	dist = DotProduct (light->origin, splitplane->normal) - splitplane->dist;
-	
-	if (dist > light->radius)
-	{
-		R_MarkLights (light, bit, node->children[0]);
-		return;
-	}
-	if (dist < -light->radius)
-	{
-		R_MarkLights (light, bit, node->children[1]);
-		return;
-	}
-		
-// mark the polygons
-	surf = cl.worldmodel->surfaces + node->firstsurface;
-	for (i=0 ; i<node->numsurfaces ; i++, surf++)
-	{
-		if (surf->dlightframe != r_dlightframecount)
-		{
-			surf->dlightbits = 0;
-			surf->dlightframe = r_dlightframecount;
-		}
-		surf->dlightbits |= bit;
-	}
-
-	R_MarkLights (light, bit, node->children[0]);
-	R_MarkLights (light, bit, node->children[1]);
-}
-
-
-/*
-=============
-R_PushDlights
-=============
-*/
-void R_PushDlights (void)
-{
-	int		i;
-	dlight_t	*l;
-
-	if (gl_flashblend.value)
-		return;
-
-	r_dlightframecount = r_framecount + 1;	// because the count hasn't
-											//  advanced yet for this frame
-	l = cl_dlights;
-
-	for (i=0 ; i<MAX_DLIGHTS ; i++, l++)
-	{
-		if (l->die < cl.time || !l->radius)
-			continue;
-		R_MarkLights ( l, 1<<i, cl.worldmodel->nodes );
-	}
-}
-
-
-/*
-=============================================================================
-
-LIGHT SAMPLING
-
-=============================================================================
-*/
-
-mplane_t		*lightplane;
-vec3_t			lightspot;
-
-int RecursiveLightPoint (mnode_t *node, vec3_t start, vec3_t end)
-{
-	int			r;
-	float		front, back, frac;
-	int			side;
-	mplane_t	*plane;
-	vec3_t		mid;
-	msurface_t	*surf;
-	int			s, t, ds, dt;
-	int			i;
-	mtexinfo_t	*tex;
-	byte		*lightmap;
-	unsigned	scale;
-	int			maps;
-
-	if (node->contents < 0)
-		return -1;		// didn't hit anything
-	
-// calculate mid point
-
-// FIXME: optimize for axial
-	plane = node->plane;
-	front = DotProduct (start, plane->normal) - plane->dist;
-	back = DotProduct (end, plane->normal) - plane->dist;
-	side = front < 0;
-	
-	if ( (back < 0) == side)
-		return RecursiveLightPoint (node->children[side], start, end);
-	
-	frac = front / (front-back);
-	mid[0] = start[0] + (end[0] - start[0])*frac;
-	mid[1] = start[1] + (end[1] - start[1])*frac;
-	mid[2] = start[2] + (end[2] - start[2])*frac;
-	
-// go down front side	
-	r = RecursiveLightPoint (node->children[side], start, mid);
-	if (r >= 0)
-		return r;		// hit something
-		
-	if ( (back < 0) == side )
-		return -1;		// didn't hit anuthing
-		
-// check for impact on this node
-	VectorCopy (mid, lightspot);
-	lightplane = plane;
-
-	surf = cl.worldmodel->surfaces + node->firstsurface;
-	for (i=0 ; i<node->numsurfaces ; i++, surf++)
-	{
-		if (surf->flags & SURF_DRAWTILED)
-			continue;	// no lightmaps
-
-		tex = surf->texinfo;
-		
-		s = DotProduct (mid, tex->vecs[0]) + tex->vecs[0][3];
-		t = DotProduct (mid, tex->vecs[1]) + tex->vecs[1][3];;
-
-		if (s < surf->texturemins[0] ||
-		t < surf->texturemins[1])
-			continue;
-		
-		ds = s - surf->texturemins[0];
-		dt = t - surf->texturemins[1];
-		
-		if ( ds > surf->extents[0] || dt > surf->extents[1] )
-			continue;
-
-		if (!surf->samples)
-			return 0;
-
-		ds >>= 4;
-		dt >>= 4;
-
-		lightmap = surf->samples;
-		r = 0;
-		if (lightmap)
-		{
-
-			lightmap += dt * ((surf->extents[0]>>4)+1) + ds;
-
-			for (maps = 0 ; maps < MAXLIGHTMAPS && surf->styles[maps] != 255 ;
-					maps++)
-			{
-				scale = d_lightstylevalue[surf->styles[maps]];
-				r += *lightmap * scale;
-				lightmap += ((surf->extents[0]>>4)+1) *
-						((surf->extents[1]>>4)+1);
-			}
-			
-			r >>= 8;
-		}
-		
-		return r;
-	}
-
-// go down back side
-	return RecursiveLightPoint (node->children[!side], mid, end);
-}
-
-int R_LightPoint (vec3_t p)
-{
-	vec3_t		end;
-	int			r;
-	
-	if (!cl.worldmodel->lightdata)
-		return 255;
-	
-	end[0] = p[0];
-	end[1] = p[1];
-	end[2] = p[2] - 2048;
-	
-	r = RecursiveLightPoint (cl.worldmodel->nodes, p, end);
-	
-	if (r == -1)
-		r = 0;
-
-	return r;
-}
-
--- a/u/gl_rmain.c
+++ /dev/null
@@ -1,1159 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// r_main.c
-
-#include "quakedef.h"
-
-entity_t	r_worldentity;
-
-qboolean	r_cache_thrash;		// compatability
-
-vec3_t		modelorg, r_entorigin;
-entity_t	*currententity;
-
-int			r_visframecount;	// bumped when going to a new PVS
-int			r_framecount;		// used for dlight push checking
-
-mplane_t	frustum[4];
-
-int			c_brush_polys, c_alias_polys;
-
-qboolean	envmap;				// true during envmap command capture 
-
-int			currenttexture = -1;		// to avoid unnecessary texture sets
-
-int			cnttextures[2] = {-1, -1};     // cached
-
-int			particletexture;	// little dot for particles
-int			playertextures;		// up to 16 color translated skins
-
-int			mirrortexturenum;	// quake texturenum, not gltexturenum
-qboolean	mirror;
-mplane_t	*mirror_plane;
-
-//
-// view origin
-//
-vec3_t	vup;
-vec3_t	vpn;
-vec3_t	vright;
-vec3_t	r_origin;
-
-float	r_world_matrix[16];
-float	r_base_world_matrix[16];
-
-//
-// screen size info
-//
-refdef_t	r_refdef;
-
-mleaf_t		*r_viewleaf, *r_oldviewleaf;
-
-texture_t	*r_notexture_mip;
-
-int		d_lightstylevalue[256];	// 8.8 fraction of base light value
-
-
-void R_MarkLeaves (void);
-
-cvar_t	r_norefresh = {"r_norefresh","0"};
-cvar_t	r_drawentities = {"r_drawentities","1"};
-cvar_t	r_drawviewmodel = {"r_drawviewmodel","1"};
-cvar_t	r_speeds = {"r_speeds","0"};
-cvar_t	r_fullbright = {"r_fullbright","0"};
-cvar_t	r_lightmap = {"r_lightmap","0"};
-cvar_t	r_shadows = {"r_shadows","0"};
-cvar_t	r_mirroralpha = {"r_mirroralpha","1"};
-cvar_t	r_wateralpha = {"r_wateralpha","1"};
-cvar_t	r_dynamic = {"r_dynamic","1"};
-cvar_t	r_novis = {"r_novis","0"};
-
-cvar_t	gl_finish = {"gl_finish","0"};
-cvar_t	gl_clear = {"gl_clear","0"};
-cvar_t	gl_cull = {"gl_cull","1"};
-cvar_t	gl_texsort = {"gl_texsort","1"};
-cvar_t	gl_smoothmodels = {"gl_smoothmodels","1"};
-cvar_t	gl_affinemodels = {"gl_affinemodels","0"};
-cvar_t	gl_polyblend = {"gl_polyblend","1"};
-cvar_t	gl_flashblend = {"gl_flashblend","1"};
-cvar_t	gl_playermip = {"gl_playermip","0"};
-cvar_t	gl_nocolors = {"gl_nocolors","0"};
-cvar_t	gl_keeptjunctions = {"gl_keeptjunctions","0"};
-cvar_t	gl_reporttjunctions = {"gl_reporttjunctions","0"};
-cvar_t	gl_doubleeyes = {"gl_doubleeys", "1"};
-
-extern	cvar_t	gl_ztrick;
-
-/*
-=================
-R_CullBox
-
-Returns true if the box is completely outside the frustom
-=================
-*/
-qboolean R_CullBox (vec3_t mins, vec3_t maxs)
-{
-	int		i;
-
-	for (i=0 ; i<4 ; i++)
-		if (BoxOnPlaneSide (mins, maxs, &frustum[i]) == 2)
-			return true;
-	return false;
-}
-
-
-void R_RotateForEntity (entity_t *e)
-{
-    glTranslatef (e->origin[0],  e->origin[1],  e->origin[2]);
-
-    glRotatef (e->angles[1],  0, 0, 1);
-    glRotatef (-e->angles[0],  0, 1, 0);
-    glRotatef (e->angles[2],  1, 0, 0);
-}
-
-/*
-=============================================================
-
-  SPRITE MODELS
-
-=============================================================
-*/
-
-/*
-================
-R_GetSpriteFrame
-================
-*/
-mspriteframe_t *R_GetSpriteFrame (entity_t *currententity)
-{
-	msprite_t		*psprite;
-	mspritegroup_t	*pspritegroup;
-	mspriteframe_t	*pspriteframe;
-	int				i, numframes, frame;
-	float			*pintervals, fullinterval, targettime, time;
-
-	psprite = currententity->model->cache.data;
-	frame = currententity->frame;
-
-	if ((frame >= psprite->numframes) || (frame < 0))
-	{
-		Con_Printf ("R_DrawSprite: no such frame %d\n", frame);
-		frame = 0;
-	}
-
-	if (psprite->frames[frame].type == SPR_SINGLE)
-	{
-		pspriteframe = psprite->frames[frame].frameptr;
-	}
-	else
-	{
-		pspritegroup = (mspritegroup_t *)psprite->frames[frame].frameptr;
-		pintervals = pspritegroup->intervals;
-		numframes = pspritegroup->numframes;
-		fullinterval = pintervals[numframes-1];
-
-		time = cl.time + currententity->syncbase;
-
-	// when loading in Mod_LoadSpriteGroup, we guaranteed all interval values
-	// are positive, so we don't have to worry about division by 0
-		targettime = time - ((int)(time / fullinterval)) * fullinterval;
-
-		for (i=0 ; i<(numframes-1) ; i++)
-		{
-			if (pintervals[i] > targettime)
-				break;
-		}
-
-		pspriteframe = pspritegroup->frames[i];
-	}
-
-	return pspriteframe;
-}
-
-
-/*
-=================
-R_DrawSpriteModel
-
-=================
-*/
-void R_DrawSpriteModel (entity_t *e)
-{
-	vec3_t	point;
-	mspriteframe_t	*frame;
-	float		*up, *right;
-	vec3_t		v_forward, v_right, v_up;
-	msprite_t		*psprite;
-
-	// don't even bother culling, because it's just a single
-	// polygon without a surface cache
-	frame = R_GetSpriteFrame (e);
-	psprite = currententity->model->cache.data;
-
-	if (psprite->type == SPR_ORIENTED)
-	{	// bullet marks on walls
-		AngleVectors (currententity->angles, v_forward, v_right, v_up);
-		up = v_up;
-		right = v_right;
-	}
-	else
-	{	// normal sprite
-		up = vup;
-		right = vright;
-	}
-
-	glColor3f (1,1,1);
-
-	GL_DisableMultitexture();
-
-    GL_Bind(frame->gl_texturenum);
-
-	glEnable (GL_ALPHA_TEST);
-	glBegin (GL_QUADS);
-
-	glTexCoord2f (0, 1);
-	VectorMA (e->origin, frame->down, up, point);
-	VectorMA (point, frame->left, right, point);
-	glVertex3fv (point);
-
-	glTexCoord2f (0, 0);
-	VectorMA (e->origin, frame->up, up, point);
-	VectorMA (point, frame->left, right, point);
-	glVertex3fv (point);
-
-	glTexCoord2f (1, 0);
-	VectorMA (e->origin, frame->up, up, point);
-	VectorMA (point, frame->right, right, point);
-	glVertex3fv (point);
-
-	glTexCoord2f (1, 1);
-	VectorMA (e->origin, frame->down, up, point);
-	VectorMA (point, frame->right, right, point);
-	glVertex3fv (point);
-	
-	glEnd ();
-
-	glDisable (GL_ALPHA_TEST);
-}
-
-/*
-=============================================================
-
-  ALIAS MODELS
-
-=============================================================
-*/
-
-
-#define NUMVERTEXNORMALS	162
-
-float	r_avertexnormals[NUMVERTEXNORMALS][3] = {
-#include "anorms.h"
-};
-
-vec3_t	shadevector;
-float	shadelight, ambientlight;
-
-// precalculated dot products for quantized angles
-#define SHADEDOT_QUANT 16
-float	r_avertexnormal_dots[SHADEDOT_QUANT][256] =
-#include "anorm_dots.h"
-;
-
-float	*shadedots = r_avertexnormal_dots[0];
-
-int	lastposenum;
-
-/*
-=============
-GL_DrawAliasFrame
-=============
-*/
-void GL_DrawAliasFrame (aliashdr_t *paliashdr, int posenum)
-{
-	float	s, t;
-	float 	l;
-	int		i, j;
-	int		index;
-	trivertx_t	*v, *verts;
-	int		list;
-	int		*order;
-	vec3_t	point;
-	float	*normal;
-	int		count;
-
-lastposenum = posenum;
-
-	verts = (trivertx_t *)((byte *)paliashdr + paliashdr->posedata);
-	verts += posenum * paliashdr->poseverts;
-	order = (int *)((byte *)paliashdr + paliashdr->commands);
-
-	while (1)
-	{
-		// get the vertex count and primitive type
-		count = *order++;
-		if (!count)
-			break;		// done
-		if (count < 0)
-		{
-			count = -count;
-			glBegin (GL_TRIANGLE_FAN);
-		}
-		else
-			glBegin (GL_TRIANGLE_STRIP);
-
-		do
-		{
-			// texture coordinates come from the draw list
-			glTexCoord2f (((float *)order)[0], ((float *)order)[1]);
-			order += 2;
-
-			// normals and vertexes come from the frame list
-			l = shadedots[verts->lightnormalindex] * shadelight;
-			glColor3f (l, l, l);
-			glVertex3f (verts->v[0], verts->v[1], verts->v[2]);
-			verts++;
-		} while (--count);
-
-		glEnd ();
-	}
-}
-
-
-/*
-=============
-GL_DrawAliasShadow
-=============
-*/
-extern	vec3_t			lightspot;
-
-void GL_DrawAliasShadow (aliashdr_t *paliashdr, int posenum)
-{
-	float	s, t, l;
-	int		i, j;
-	int		index;
-	trivertx_t	*v, *verts;
-	int		list;
-	int		*order;
-	vec3_t	point;
-	float	*normal;
-	float	height, lheight;
-	int		count;
-
-	lheight = currententity->origin[2] - lightspot[2];
-
-	height = 0;
-	verts = (trivertx_t *)((byte *)paliashdr + paliashdr->posedata);
-	verts += posenum * paliashdr->poseverts;
-	order = (int *)((byte *)paliashdr + paliashdr->commands);
-
-	height = -lheight + 1.0;
-
-	while (1)
-	{
-		// get the vertex count and primitive type
-		count = *order++;
-		if (!count)
-			break;		// done
-		if (count < 0)
-		{
-			count = -count;
-			glBegin (GL_TRIANGLE_FAN);
-		}
-		else
-			glBegin (GL_TRIANGLE_STRIP);
-
-		do
-		{
-			// texture coordinates come from the draw list
-			// (skipped for shadows) glTexCoord2fv ((float *)order);
-			order += 2;
-
-			// normals and vertexes come from the frame list
-			point[0] = verts->v[0] * paliashdr->scale[0] + paliashdr->scale_origin[0];
-			point[1] = verts->v[1] * paliashdr->scale[1] + paliashdr->scale_origin[1];
-			point[2] = verts->v[2] * paliashdr->scale[2] + paliashdr->scale_origin[2];
-
-			point[0] -= shadevector[0]*(point[2]+lheight);
-			point[1] -= shadevector[1]*(point[2]+lheight);
-			point[2] = height;
-//			height -= 0.001;
-			glVertex3fv (point);
-
-			verts++;
-		} while (--count);
-
-		glEnd ();
-	}	
-}
-
-
-
-/*
-=================
-R_SetupAliasFrame
-
-=================
-*/
-void R_SetupAliasFrame (int frame, aliashdr_t *paliashdr)
-{
-	int				pose, numposes;
-	float			interval;
-
-	if ((frame >= paliashdr->numframes) || (frame < 0))
-	{
-		Con_DPrintf ("R_AliasSetupFrame: no such frame %d\n", frame);
-		frame = 0;
-	}
-
-	pose = paliashdr->frames[frame].firstpose;
-	numposes = paliashdr->frames[frame].numposes;
-
-	if (numposes > 1)
-	{
-		interval = paliashdr->frames[frame].interval;
-		pose += (int)(cl.time / interval) % numposes;
-	}
-
-	GL_DrawAliasFrame (paliashdr, pose);
-}
-
-
-
-/*
-=================
-R_DrawAliasModel
-
-=================
-*/
-void R_DrawAliasModel (entity_t *e)
-{
-	int			i, j;
-	int			lnum;
-	vec3_t		dist;
-	float		add;
-	model_t		*clmodel;
-	vec3_t		mins, maxs;
-	aliashdr_t	*paliashdr;
-	trivertx_t	*verts, *v;
-	int			index;
-	float		s, t, an;
-	int			anim;
-
-	clmodel = currententity->model;
-
-	VectorAdd (currententity->origin, clmodel->mins, mins);
-	VectorAdd (currententity->origin, clmodel->maxs, maxs);
-
-	if (R_CullBox (mins, maxs))
-		return;
-
-
-	VectorCopy (currententity->origin, r_entorigin);
-	VectorSubtract (r_origin, r_entorigin, modelorg);
-
-	//
-	// get lighting information
-	//
-
-	ambientlight = shadelight = R_LightPoint (currententity->origin);
-
-	// allways give the gun some light
-	if (e == &cl.viewent && ambientlight < 24)
-		ambientlight = shadelight = 24;
-
-	for (lnum=0 ; lnum<MAX_DLIGHTS ; lnum++)
-	{
-		if (cl_dlights[lnum].die >= cl.time)
-		{
-			VectorSubtract (currententity->origin,
-							cl_dlights[lnum].origin,
-							dist);
-			add = cl_dlights[lnum].radius - Length(dist);
-
-			if (add > 0) {
-				ambientlight += add;
-				//ZOID models should be affected by dlights as well
-				shadelight += add;
-			}
-		}
-	}
-
-	// clamp lighting so it doesn't overbright as much
-	if (ambientlight > 128)
-		ambientlight = 128;
-	if (ambientlight + shadelight > 192)
-		shadelight = 192 - ambientlight;
-
-	// ZOID: never allow players to go totally black
-	i = currententity - cl_entities;
-	if (i >= 1 && i<=cl.maxclients /* && !strcmp (currententity->model->name, "progs/player.mdl") */)
-		if (ambientlight < 8)
-			ambientlight = shadelight = 8;
-
-	// HACK HACK HACK -- no fullbright colors, so make torches full light
-	if (!strcmp (clmodel->name, "progs/flame2.mdl")
-		|| !strcmp (clmodel->name, "progs/flame.mdl") )
-		ambientlight = shadelight = 256;
-
-	shadedots = r_avertexnormal_dots[((int)(e->angles[1] * (SHADEDOT_QUANT / 360.0))) & (SHADEDOT_QUANT - 1)];
-	shadelight = shadelight / 200.0;
-	
-	an = e->angles[1]/180*M_PI;
-	shadevector[0] = cos(-an);
-	shadevector[1] = sin(-an);
-	shadevector[2] = 1;
-	VectorNormalize (shadevector);
-
-	//
-	// locate the proper data
-	//
-	paliashdr = (aliashdr_t *)Mod_Extradata (currententity->model);
-
-	c_alias_polys += paliashdr->numtris;
-
-	//
-	// draw all the triangles
-	//
-
-	GL_DisableMultitexture();
-
-    glPushMatrix ();
-	R_RotateForEntity (e);
-
-	if (!strcmp (clmodel->name, "progs/eyes.mdl") && gl_doubleeyes.value) {
-		glTranslatef (paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2] - (22 + 8));
-// double size of eyes, since they are really hard to see in gl
-		glScalef (paliashdr->scale[0]*2, paliashdr->scale[1]*2, paliashdr->scale[2]*2);
-	} else {
-		glTranslatef (paliashdr->scale_origin[0], paliashdr->scale_origin[1], paliashdr->scale_origin[2]);
-		glScalef (paliashdr->scale[0], paliashdr->scale[1], paliashdr->scale[2]);
-	}
-
-	anim = (int)(cl.time*10) & 3;
-    GL_Bind(paliashdr->gl_texturenum[currententity->skinnum][anim]);
-
-	// we can't dynamically colormap textures, so they are cached
-	// seperately for the players.  Heads are just uncolored.
-	if (currententity->colormap != vid.colormap && !gl_nocolors.value)
-	{
-		i = currententity - cl_entities;
-		if (i >= 1 && i<=cl.maxclients /* && !strcmp (currententity->model->name, "progs/player.mdl") */)
-		    GL_Bind(playertextures - 1 + i);
-	}
-
-	if (gl_smoothmodels.value)
-		glShadeModel (GL_SMOOTH);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-	if (gl_affinemodels.value)
-		glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-
-	R_SetupAliasFrame (currententity->frame, paliashdr);
-
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-	glShadeModel (GL_FLAT);
-	if (gl_affinemodels.value)
-		glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-
-	glPopMatrix ();
-
-	if (r_shadows.value)
-	{
-		glPushMatrix ();
-		R_RotateForEntity (e);
-		glDisable (GL_TEXTURE_2D);
-		glEnable (GL_BLEND);
-		glColor4f (0,0,0,0.5);
-		GL_DrawAliasShadow (paliashdr, lastposenum);
-		glEnable (GL_TEXTURE_2D);
-		glDisable (GL_BLEND);
-		glColor4f (1,1,1,1);
-		glPopMatrix ();
-	}
-
-}
-
-//==================================================================================
-
-/*
-=============
-R_DrawEntitiesOnList
-=============
-*/
-void R_DrawEntitiesOnList (void)
-{
-	int		i;
-
-	if (!r_drawentities.value)
-		return;
-
-	// draw sprites seperately, because of alpha blending
-	for (i=0 ; i<cl_numvisedicts ; i++)
-	{
-		currententity = cl_visedicts[i];
-
-		switch (currententity->model->type)
-		{
-		case mod_alias:
-			R_DrawAliasModel (currententity);
-			break;
-
-		case mod_brush:
-			R_DrawBrushModel (currententity);
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	for (i=0 ; i<cl_numvisedicts ; i++)
-	{
-		currententity = cl_visedicts[i];
-
-		switch (currententity->model->type)
-		{
-		case mod_sprite:
-			R_DrawSpriteModel (currententity);
-			break;
-		}
-	}
-}
-
-/*
-=============
-R_DrawViewModel
-=============
-*/
-void R_DrawViewModel (void)
-{
-	float		ambient[4], diffuse[4];
-	int			j;
-	int			lnum;
-	vec3_t		dist;
-	float		add;
-	dlight_t	*dl;
-	int			ambientlight, shadelight;
-
-	if (!r_drawviewmodel.value)
-		return;
-
-	if (chase_active.value)
-		return;
-
-	if (envmap)
-		return;
-
-	if (!r_drawentities.value)
-		return;
-
-	if (cl.items & IT_INVISIBILITY)
-		return;
-
-	if (cl.stats[STAT_HEALTH] <= 0)
-		return;
-
-	currententity = &cl.viewent;
-	if (!currententity->model)
-		return;
-
-	j = R_LightPoint (currententity->origin);
-
-	if (j < 24)
-		j = 24;		// allways give some light on gun
-	ambientlight = j;
-	shadelight = j;
-
-// add dynamic lights		
-	for (lnum=0 ; lnum<MAX_DLIGHTS ; lnum++)
-	{
-		dl = &cl_dlights[lnum];
-		if (!dl->radius)
-			continue;
-		if (!dl->radius)
-			continue;
-		if (dl->die < cl.time)
-			continue;
-
-		VectorSubtract (currententity->origin, dl->origin, dist);
-		add = dl->radius - Length(dist);
-		if (add > 0)
-			ambientlight += add;
-	}
-
-	ambient[0] = ambient[1] = ambient[2] = ambient[3] = (float)ambientlight / 128;
-	diffuse[0] = diffuse[1] = diffuse[2] = diffuse[3] = (float)shadelight / 128;
-
-	// hack the depth range to prevent view model from poking into walls
-	glDepthRange (gldepthmin, gldepthmin + 0.3*(gldepthmax-gldepthmin));
-	R_DrawAliasModel (currententity);
-	glDepthRange (gldepthmin, gldepthmax);
-}
-
-
-/*
-============
-R_PolyBlend
-============
-*/
-void R_PolyBlend (void)
-{
-	if (!gl_polyblend.value)
-		return;
-	if (!v_blend[3])
-		return;
-
-	GL_DisableMultitexture();
-
-	glDisable (GL_ALPHA_TEST);
-	glEnable (GL_BLEND);
-	glDisable (GL_DEPTH_TEST);
-	glDisable (GL_TEXTURE_2D);
-
-    glLoadIdentity ();
-
-    glRotatef (-90,  1, 0, 0);	    // put Z going up
-    glRotatef (90,  0, 0, 1);	    // put Z going up
-
-	glColor4fv (v_blend);
-
-	glBegin (GL_QUADS);
-
-	glVertex3f (10, 100, 100);
-	glVertex3f (10, -100, 100);
-	glVertex3f (10, -100, -100);
-	glVertex3f (10, 100, -100);
-	glEnd ();
-
-	glDisable (GL_BLEND);
-	glEnable (GL_TEXTURE_2D);
-	glEnable (GL_ALPHA_TEST);
-}
-
-
-int SignbitsForPlane (mplane_t *out)
-{
-	int	bits, j;
-
-	// for fast box on planeside test
-
-	bits = 0;
-	for (j=0 ; j<3 ; j++)
-	{
-		if (out->normal[j] < 0)
-			bits |= 1<<j;
-	}
-	return bits;
-}
-
-
-void R_SetFrustum (void)
-{
-	int		i;
-
-	if (r_refdef.fov_x == 90) 
-	{
-		// front side is visible
-
-		VectorAdd (vpn, vright, frustum[0].normal);
-		VectorSubtract (vpn, vright, frustum[1].normal);
-
-		VectorAdd (vpn, vup, frustum[2].normal);
-		VectorSubtract (vpn, vup, frustum[3].normal);
-	}
-	else
-	{
-		// rotate VPN right by FOV_X/2 degrees
-		RotatePointAroundVector( frustum[0].normal, vup, vpn, -(90-r_refdef.fov_x / 2 ) );
-		// rotate VPN left by FOV_X/2 degrees
-		RotatePointAroundVector( frustum[1].normal, vup, vpn, 90-r_refdef.fov_x / 2 );
-		// rotate VPN up by FOV_X/2 degrees
-		RotatePointAroundVector( frustum[2].normal, vright, vpn, 90-r_refdef.fov_y / 2 );
-		// rotate VPN down by FOV_X/2 degrees
-		RotatePointAroundVector( frustum[3].normal, vright, vpn, -( 90 - r_refdef.fov_y / 2 ) );
-	}
-
-	for (i=0 ; i<4 ; i++)
-	{
-		frustum[i].type = PLANE_ANYZ;
-		frustum[i].dist = DotProduct (r_origin, frustum[i].normal);
-		frustum[i].signbits = SignbitsForPlane (&frustum[i]);
-	}
-}
-
-
-
-/*
-===============
-R_SetupFrame
-===============
-*/
-void R_SetupFrame (void)
-{
-	int				edgecount;
-	vrect_t			vrect;
-	float			w, h;
-
-// don't allow cheats in multiplayer
-	if (cl.maxclients > 1)
-		Cvar_Set ("r_fullbright", "0");
-
-	R_AnimateLight ();
-
-	r_framecount++;
-
-// build the transformation matrix for the given view angles
-	VectorCopy (r_refdef.vieworg, r_origin);
-
-	AngleVectors (r_refdef.viewangles, vpn, vright, vup);
-
-// current viewleaf
-	r_oldviewleaf = r_viewleaf;
-	r_viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel);
-
-	V_SetContentsColor (r_viewleaf->contents);
-	V_CalcBlend ();
-
-	r_cache_thrash = false;
-
-	c_brush_polys = 0;
-	c_alias_polys = 0;
-
-}
-
-
-void MYgluPerspective( GLdouble fovy, GLdouble aspect,
-		     GLdouble zNear, GLdouble zFar )
-{
-   GLdouble xmin, xmax, ymin, ymax;
-
-   ymax = zNear * tan( fovy * M_PI / 360.0 );
-   ymin = -ymax;
-
-   xmin = ymin * aspect;
-   xmax = ymax * aspect;
-
-   glFrustum( xmin, xmax, ymin, ymax, zNear, zFar );
-}
-
-
-/*
-=============
-R_SetupGL
-=============
-*/
-void R_SetupGL (void)
-{
-	float	screenaspect;
-	float	yfov;
-	int		i;
-	extern	int glwidth, glheight;
-	int		x, x2, y2, y, w, h;
-
-	//
-	// set up viewpoint
-	//
-	glMatrixMode(GL_PROJECTION);
-    glLoadIdentity ();
-	x = r_refdef.vrect.x * glwidth/vid.width;
-	x2 = (r_refdef.vrect.x + r_refdef.vrect.width) * glwidth/vid.width;
-	y = (vid.height-r_refdef.vrect.y) * glheight/vid.height;
-	y2 = (vid.height - (r_refdef.vrect.y + r_refdef.vrect.height)) * glheight/vid.height;
-
-	// fudge around because of frac screen scale
-	if (x > 0)
-		x--;
-	if (x2 < glwidth)
-		x2++;
-	if (y2 < 0)
-		y2--;
-	if (y < glheight)
-		y++;
-
-	w = x2 - x;
-	h = y - y2;
-
-	if (envmap)
-	{
-		x = y2 = 0;
-		w = h = 256;
-	}
-
-	glViewport (glx + x, gly + y2, w, h);
-    screenaspect = (float)r_refdef.vrect.width/r_refdef.vrect.height;
-//	yfov = 2*atan((float)r_refdef.vrect.height/r_refdef.vrect.width)*180/M_PI;
-    MYgluPerspective (r_refdef.fov_y,  screenaspect,  4,  4096);
-
-	if (mirror)
-	{
-		if (mirror_plane->normal[2])
-			glScalef (1, -1, 1);
-		else
-			glScalef (-1, 1, 1);
-		glCullFace(GL_BACK);
-	}
-	else
-		glCullFace(GL_FRONT);
-
-	glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity ();
-
-    glRotatef (-90,  1, 0, 0);	    // put Z going up
-    glRotatef (90,  0, 0, 1);	    // put Z going up
-    glRotatef (-r_refdef.viewangles[2],  1, 0, 0);
-    glRotatef (-r_refdef.viewangles[0],  0, 1, 0);
-    glRotatef (-r_refdef.viewangles[1],  0, 0, 1);
-    glTranslatef (-r_refdef.vieworg[0],  -r_refdef.vieworg[1],  -r_refdef.vieworg[2]);
-
-	glGetFloatv (GL_MODELVIEW_MATRIX, r_world_matrix);
-
-	//
-	// set drawing parms
-	//
-	if (gl_cull.value)
-		glEnable(GL_CULL_FACE);
-	else
-		glDisable(GL_CULL_FACE);
-
-	glDisable(GL_BLEND);
-	glDisable(GL_ALPHA_TEST);
-	glEnable(GL_DEPTH_TEST);
-}
-
-/*
-================
-R_RenderScene
-
-r_refdef must be set before the first call
-================
-*/
-void R_RenderScene (void)
-{
-	R_SetupFrame ();
-
-	R_SetFrustum ();
-
-	R_SetupGL ();
-
-	R_MarkLeaves ();	// done here so we know if we're in water
-
-	R_DrawWorld ();		// adds static entities to the list
-
-	S_ExtraUpdate ();	// don't let sound get messed up if going slow
-
-	R_DrawEntitiesOnList ();
-
-	GL_DisableMultitexture();
-
-	R_RenderDlights ();
-
-	R_DrawParticles ();
-
-#ifdef GLTEST
-	Test_Draw ();
-#endif
-
-}
-
-
-/*
-=============
-R_Clear
-=============
-*/
-void R_Clear (void)
-{
-	if (r_mirroralpha.value != 1.0)
-	{
-		if (gl_clear.value)
-			glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		else
-			glClear (GL_DEPTH_BUFFER_BIT);
-		gldepthmin = 0;
-		gldepthmax = 0.5;
-		glDepthFunc (GL_LEQUAL);
-	}
-	else if (gl_ztrick.value)
-	{
-		static int trickframe;
-
-		if (gl_clear.value)
-			glClear (GL_COLOR_BUFFER_BIT);
-
-		trickframe++;
-		if (trickframe & 1)
-		{
-			gldepthmin = 0;
-			gldepthmax = 0.49999;
-			glDepthFunc (GL_LEQUAL);
-		}
-		else
-		{
-			gldepthmin = 1;
-			gldepthmax = 0.5;
-			glDepthFunc (GL_GEQUAL);
-		}
-	}
-	else
-	{
-		if (gl_clear.value)
-			glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-		else
-			glClear (GL_DEPTH_BUFFER_BIT);
-		gldepthmin = 0;
-		gldepthmax = 1;
-		glDepthFunc (GL_LEQUAL);
-	}
-
-	glDepthRange (gldepthmin, gldepthmax);
-}
-
-/*
-=============
-R_Mirror
-=============
-*/
-void R_Mirror (void)
-{
-	float		d;
-	msurface_t	*s;
-	entity_t	*ent;
-
-	if (!mirror)
-		return;
-
-	memcpy (r_base_world_matrix, r_world_matrix, sizeof(r_base_world_matrix));
-
-	d = DotProduct (r_refdef.vieworg, mirror_plane->normal) - mirror_plane->dist;
-	VectorMA (r_refdef.vieworg, -2*d, mirror_plane->normal, r_refdef.vieworg);
-
-	d = DotProduct (vpn, mirror_plane->normal);
-	VectorMA (vpn, -2*d, mirror_plane->normal, vpn);
-
-	r_refdef.viewangles[0] = -asin (vpn[2])/M_PI*180;
-	r_refdef.viewangles[1] = atan2 (vpn[1], vpn[0])/M_PI*180;
-	r_refdef.viewangles[2] = -r_refdef.viewangles[2];
-
-	ent = &cl_entities[cl.viewentity];
-	if (cl_numvisedicts < MAX_VISEDICTS)
-	{
-		cl_visedicts[cl_numvisedicts] = ent;
-		cl_numvisedicts++;
-	}
-
-	gldepthmin = 0.5;
-	gldepthmax = 1;
-	glDepthRange (gldepthmin, gldepthmax);
-	glDepthFunc (GL_LEQUAL);
-
-	R_RenderScene ();
-	R_DrawWaterSurfaces ();
-
-	gldepthmin = 0;
-	gldepthmax = 0.5;
-	glDepthRange (gldepthmin, gldepthmax);
-	glDepthFunc (GL_LEQUAL);
-
-	// blend on top
-	glEnable (GL_BLEND);
-	glMatrixMode(GL_PROJECTION);
-	if (mirror_plane->normal[2])
-		glScalef (1,-1,1);
-	else
-		glScalef (-1,1,1);
-	glCullFace(GL_FRONT);
-	glMatrixMode(GL_MODELVIEW);
-
-	glLoadMatrixf (r_base_world_matrix);
-
-	glColor4f (1,1,1,r_mirroralpha.value);
-	s = cl.worldmodel->textures[mirrortexturenum]->texturechain;
-	for ( ; s ; s=s->texturechain)
-		R_RenderBrushPoly (s);
-	cl.worldmodel->textures[mirrortexturenum]->texturechain = NULL;
-	glDisable (GL_BLEND);
-	glColor4f (1,1,1,1);
-}
-
-/*
-================
-R_RenderView
-
-r_refdef must be set before the first call
-================
-*/
-void R_RenderView (void)
-{
-	double	time1, time2;
-	GLfloat colors[4] = {(GLfloat) 0.0, (GLfloat) 0.0, (GLfloat) 1, (GLfloat) 0.20};
-
-	if (r_norefresh.value)
-		return;
-
-	if (!r_worldentity.model || !cl.worldmodel)
-		Sys_Error ("R_RenderView: NULL worldmodel");
-
-	if (r_speeds.value)
-	{
-		glFinish ();
-		time1 = Sys_FloatTime ();
-		c_brush_polys = 0;
-		c_alias_polys = 0;
-	}
-
-	mirror = false;
-
-	if (gl_finish.value)
-		glFinish ();
-
-	R_Clear ();
-
-	// render normal view
-
-/***** Experimental silly looking fog ******
-****** Use r_fullbright if you enable ******
-	glFogi(GL_FOG_MODE, GL_LINEAR);
-	glFogfv(GL_FOG_COLOR, colors);
-	glFogf(GL_FOG_END, 512.0);
-	glEnable(GL_FOG);
-********************************************/
-
-	R_RenderScene ();
-	R_DrawViewModel ();
-	R_DrawWaterSurfaces ();
-
-//  More fog right here :)
-//	glDisable(GL_FOG);
-//  End of all fog code...
-
-	// render mirror view
-	R_Mirror ();
-
-	R_PolyBlend ();
-
-	if (r_speeds.value)
-	{
-//		glFinish ();
-		time2 = Sys_FloatTime ();
-		Con_Printf ("%3i ms  %4i wpoly %4i epoly\n", (int)((time2-time1)*1000), c_brush_polys, c_alias_polys); 
-	}
-}
--- a/u/gl_rmisc.c
+++ /dev/null
@@ -1,455 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// r_misc.c
-
-#include "quakedef.h"
-
-
-
-/*
-==================
-R_InitTextures
-==================
-*/
-void	R_InitTextures (void)
-{
-	int		x,y, m;
-	byte	*dest;
-
-// create a simple checkerboard texture for the default
-	r_notexture_mip = Hunk_AllocName (sizeof(texture_t) + 16*16+8*8+4*4+2*2, "notexture");
-	
-	r_notexture_mip->width = r_notexture_mip->height = 16;
-	r_notexture_mip->offsets[0] = sizeof(texture_t);
-	r_notexture_mip->offsets[1] = r_notexture_mip->offsets[0] + 16*16;
-	r_notexture_mip->offsets[2] = r_notexture_mip->offsets[1] + 8*8;
-	r_notexture_mip->offsets[3] = r_notexture_mip->offsets[2] + 4*4;
-	
-	for (m=0 ; m<4 ; m++)
-	{
-		dest = (byte *)r_notexture_mip + r_notexture_mip->offsets[m];
-		for (y=0 ; y< (16>>m) ; y++)
-			for (x=0 ; x< (16>>m) ; x++)
-			{
-				if (  (y< (8>>m) ) ^ (x< (8>>m) ) )
-					*dest++ = 0;
-				else
-					*dest++ = 0xff;
-			}
-	}	
-}
-
-byte	dottexture[8][8] =
-{
-	{0,1,1,0,0,0,0,0},
-	{1,1,1,1,0,0,0,0},
-	{1,1,1,1,0,0,0,0},
-	{0,1,1,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},
-};
-void R_InitParticleTexture (void)
-{
-	int		x,y;
-	byte	data[8][8][4];
-
-	//
-	// particle texture
-	//
-	particletexture = texture_extension_number++;
-    GL_Bind(particletexture);
-
-	for (x=0 ; x<8 ; x++)
-	{
-		for (y=0 ; y<8 ; y++)
-		{
-			data[y][x][0] = 255;
-			data[y][x][1] = 255;
-			data[y][x][2] = 255;
-			data[y][x][3] = dottexture[x][y]*255;
-		}
-	}
-	glTexImage2D (GL_TEXTURE_2D, 0, gl_alpha_format, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
-
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-}
-
-/*
-===============
-R_Envmap_f
-
-Grab six views for environment mapping tests
-===============
-*/
-void R_Envmap_f (void)
-{
-	byte	buffer[256*256*4];
-	char	name[1024];
-
-	glDrawBuffer  (GL_FRONT);
-	glReadBuffer  (GL_FRONT);
-	envmap = true;
-
-	r_refdef.vrect.x = 0;
-	r_refdef.vrect.y = 0;
-	r_refdef.vrect.width = 256;
-	r_refdef.vrect.height = 256;
-
-	r_refdef.viewangles[0] = 0;
-	r_refdef.viewangles[1] = 0;
-	r_refdef.viewangles[2] = 0;
-	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
-	R_RenderView ();
-	glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-	COM_WriteFile ("env0.rgb", buffer, sizeof(buffer));		
-
-	r_refdef.viewangles[1] = 90;
-	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
-	R_RenderView ();
-	glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-	COM_WriteFile ("env1.rgb", buffer, sizeof(buffer));		
-
-	r_refdef.viewangles[1] = 180;
-	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
-	R_RenderView ();
-	glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-	COM_WriteFile ("env2.rgb", buffer, sizeof(buffer));		
-
-	r_refdef.viewangles[1] = 270;
-	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
-	R_RenderView ();
-	glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-	COM_WriteFile ("env3.rgb", buffer, sizeof(buffer));		
-
-	r_refdef.viewangles[0] = -90;
-	r_refdef.viewangles[1] = 0;
-	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
-	R_RenderView ();
-	glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-	COM_WriteFile ("env4.rgb", buffer, sizeof(buffer));		
-
-	r_refdef.viewangles[0] = 90;
-	r_refdef.viewangles[1] = 0;
-	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
-	R_RenderView ();
-	glReadPixels (0, 0, 256, 256, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-	COM_WriteFile ("env5.rgb", buffer, sizeof(buffer));		
-
-	envmap = false;
-	glDrawBuffer  (GL_BACK);
-	glReadBuffer  (GL_BACK);
-	GL_EndRendering ();
-}
-
-/*
-===============
-R_Init
-===============
-*/
-void R_Init (void)
-{	
-	extern byte *hunk_base;
-	extern cvar_t gl_finish;
-
-	Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);	
-	Cmd_AddCommand ("envmap", R_Envmap_f);	
-	Cmd_AddCommand ("pointfile", R_ReadPointFile_f);	
-
-	Cvar_RegisterVariable (&r_norefresh);
-	Cvar_RegisterVariable (&r_lightmap);
-	Cvar_RegisterVariable (&r_fullbright);
-	Cvar_RegisterVariable (&r_drawentities);
-	Cvar_RegisterVariable (&r_drawviewmodel);
-	Cvar_RegisterVariable (&r_shadows);
-	Cvar_RegisterVariable (&r_mirroralpha);
-	Cvar_RegisterVariable (&r_wateralpha);
-	Cvar_RegisterVariable (&r_dynamic);
-	Cvar_RegisterVariable (&r_novis);
-	Cvar_RegisterVariable (&r_speeds);
-
-	Cvar_RegisterVariable (&gl_finish);
-	Cvar_RegisterVariable (&gl_clear);
-	Cvar_RegisterVariable (&gl_texsort);
-
- 	if (gl_mtexable)
-		Cvar_SetValue ("gl_texsort", 0.0);
-
-	Cvar_RegisterVariable (&gl_cull);
-	Cvar_RegisterVariable (&gl_smoothmodels);
-	Cvar_RegisterVariable (&gl_affinemodels);
-	Cvar_RegisterVariable (&gl_polyblend);
-	Cvar_RegisterVariable (&gl_flashblend);
-	Cvar_RegisterVariable (&gl_playermip);
-	Cvar_RegisterVariable (&gl_nocolors);
-
-	Cvar_RegisterVariable (&gl_keeptjunctions);
-	Cvar_RegisterVariable (&gl_reporttjunctions);
-
-	Cvar_RegisterVariable (&gl_doubleeyes);
-
-	R_InitParticles ();
-	R_InitParticleTexture ();
-
-#ifdef GLTEST
-	Test_Init ();
-#endif
-
-	playertextures = texture_extension_number;
-	texture_extension_number += 16;
-}
-
-/*
-===============
-R_TranslatePlayerSkin
-
-Translates a skin texture by the per-player color lookup
-===============
-*/
-void R_TranslatePlayerSkin (int playernum)
-{
-	int		top, bottom;
-	byte	translate[256];
-	unsigned	translate32[256];
-	int		i, j, s;
-	model_t	*model;
-	aliashdr_t *paliashdr;
-	byte	*original;
-	unsigned	pixels[512*256], *out;
-	unsigned	scaled_width, scaled_height;
-	int			inwidth, inheight;
-	byte		*inrow;
-	unsigned	frac, fracstep;
-	extern	byte		**player_8bit_texels_tbl;
-
-	GL_DisableMultitexture();
-
-	top = cl.scores[playernum].colors & 0xf0;
-	bottom = (cl.scores[playernum].colors &15)<<4;
-
-	for (i=0 ; i<256 ; i++)
-		translate[i] = i;
-
-	for (i=0 ; i<16 ; i++)
-	{
-		if (top < 128)	// the artists made some backwards ranges.  sigh.
-			translate[TOP_RANGE+i] = top+i;
-		else
-			translate[TOP_RANGE+i] = top+15-i;
-				
-		if (bottom < 128)
-			translate[BOTTOM_RANGE+i] = bottom+i;
-		else
-			translate[BOTTOM_RANGE+i] = bottom+15-i;
-	}
-
-	//
-	// locate the original skin pixels
-	//
-	currententity = &cl_entities[1+playernum];
-	model = currententity->model;
-	if (!model)
-		return;		// player doesn't have a model yet
-	if (model->type != mod_alias)
-		return; // only translate skins on alias models
-
-	paliashdr = (aliashdr_t *)Mod_Extradata (model);
-	s = paliashdr->skinwidth * paliashdr->skinheight;
-	if (currententity->skinnum < 0 || currententity->skinnum >= paliashdr->numskins) {
-		Con_Printf("(%d): Invalid player skin #%d\n", playernum, currententity->skinnum);
-		original = (byte *)paliashdr + paliashdr->texels[0];
-	} else
-		original = (byte *)paliashdr + paliashdr->texels[currententity->skinnum];
-	if (s & 3)
-		Sys_Error ("R_TranslateSkin: s&3");
-
-	inwidth = paliashdr->skinwidth;
-	inheight = paliashdr->skinheight;
-
-	// because this happens during gameplay, do it fast
-	// instead of sending it through gl_upload 8
-    GL_Bind(playertextures + playernum);
-
-#if 0
-	byte	translated[320*200];
-
-	for (i=0 ; i<s ; i+=4)
-	{
-		translated[i] = translate[original[i]];
-		translated[i+1] = translate[original[i+1]];
-		translated[i+2] = translate[original[i+2]];
-		translated[i+3] = translate[original[i+3]];
-	}
-
-
-	// don't mipmap these, because it takes too long
-	GL_Upload8 (translated, paliashdr->skinwidth, paliashdr->skinheight, false, false, true);
-#else
-	scaled_width = gl_max_size.value < 512 ? gl_max_size.value : 512;
-	scaled_height = gl_max_size.value < 256 ? gl_max_size.value : 256;
-
-	// allow users to crunch sizes down even more if they want
-	scaled_width >>= (int)gl_playermip.value;
-	scaled_height >>= (int)gl_playermip.value;
-
-	if (VID_Is8bit()) { // 8bit texture upload
-		byte *out2;
-
-		out2 = (byte *)pixels;
-		memset(pixels, 0, sizeof(pixels));
-		fracstep = inwidth*0x10000/scaled_width;
-		for (i=0 ; i<scaled_height ; i++, out2 += scaled_width)
-		{
-			inrow = original + inwidth*(i*inheight/scaled_height);
-			frac = fracstep >> 1;
-			for (j=0 ; j<scaled_width ; j+=4)
-			{
-				out2[j] = translate[inrow[frac>>16]];
-				frac += fracstep;
-				out2[j+1] = translate[inrow[frac>>16]];
-				frac += fracstep;
-				out2[j+2] = translate[inrow[frac>>16]];
-				frac += fracstep;
-				out2[j+3] = translate[inrow[frac>>16]];
-				frac += fracstep;
-			}
-		}
-
-		GL_Upload8_EXT ((byte *)pixels, scaled_width, scaled_height, false, false);
-		return;
-	}
-
-	for (i=0 ; i<256 ; i++)
-		translate32[i] = d_8to24table[translate[i]];
-
-	out = pixels;
-	fracstep = inwidth*0x10000/scaled_width;
-	for (i=0 ; i<scaled_height ; i++, out += scaled_width)
-	{
-		inrow = original + inwidth*(i*inheight/scaled_height);
-		frac = fracstep >> 1;
-		for (j=0 ; j<scaled_width ; j+=4)
-		{
-			out[j] = translate32[inrow[frac>>16]];
-			frac += fracstep;
-			out[j+1] = translate32[inrow[frac>>16]];
-			frac += fracstep;
-			out[j+2] = translate32[inrow[frac>>16]];
-			frac += fracstep;
-			out[j+3] = translate32[inrow[frac>>16]];
-			frac += fracstep;
-		}
-	}
-	glTexImage2D (GL_TEXTURE_2D, 0, gl_solid_format, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-#endif
-
-}
-
-
-/*
-===============
-R_NewMap
-===============
-*/
-void R_NewMap (void)
-{
-	int		i;
-	
-	for (i=0 ; i<256 ; i++)
-		d_lightstylevalue[i] = 264;		// normal light value
-
-	memset (&r_worldentity, 0, sizeof(r_worldentity));
-	r_worldentity.model = cl.worldmodel;
-
-// clear out efrags in case the level hasn't been reloaded
-// FIXME: is this one short?
-	for (i=0 ; i<cl.worldmodel->numleafs ; i++)
-		cl.worldmodel->leafs[i].efrags = NULL;
-		 	
-	r_viewleaf = NULL;
-	R_ClearParticles ();
-
-	GL_BuildLightmaps ();
-
-	// identify sky texture
-	skytexturenum = -1;
-	mirrortexturenum = -1;
-	for (i=0 ; i<cl.worldmodel->numtextures ; i++)
-	{
-		if (!cl.worldmodel->textures[i])
-			continue;
-		if (!Q_strncmp(cl.worldmodel->textures[i]->name,"sky",3) )
-			skytexturenum = i;
-		if (!Q_strncmp(cl.worldmodel->textures[i]->name,"window02_1",10) )
-			mirrortexturenum = i;
- 		cl.worldmodel->textures[i]->texturechain = NULL;
-	}
-#ifdef QUAKE2
-	R_LoadSkys ();
-#endif
-}
-
-
-/*
-====================
-R_TimeRefresh_f
-
-For program optimization
-====================
-*/
-void R_TimeRefresh_f (void)
-{
-	int			i;
-	float		start, stop, time;
-	int			startangle;
-	vrect_t		vr;
-
-	glDrawBuffer  (GL_FRONT);
-	glFinish ();
-
-	start = Sys_FloatTime ();
-	for (i=0 ; i<128 ; i++)
-	{
-		r_refdef.viewangles[1] = i/128.0*360.0;
-		R_RenderView ();
-	}
-
-	glFinish ();
-	stop = Sys_FloatTime ();
-	time = stop-start;
-	Con_Printf ("%f seconds (%f fps)\n", time, 128/time);
-
-	glDrawBuffer  (GL_BACK);
-	GL_EndRendering ();
-}
-
-void D_FlushCaches (void)
-{
-}
-
-
--- a/u/gl_rsurf.c
+++ /dev/null
@@ -1,1694 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// r_surf.c: surface-related refresh code
-
-#include "quakedef.h"
-
-int			skytexturenum;
-
-#ifndef GL_RGBA4
-#define	GL_RGBA4	0
-#endif
-
-
-int		lightmap_bytes;		// 1, 2, or 4
-
-int		lightmap_textures;
-
-unsigned		blocklights[18*18];
-
-#define	BLOCK_WIDTH		128
-#define	BLOCK_HEIGHT	128
-
-#define	MAX_LIGHTMAPS	64
-int			active_lightmaps;
-
-typedef struct glRect_s {
-	unsigned char l,t,w,h;
-} glRect_t;
-
-glpoly_t	*lightmap_polys[MAX_LIGHTMAPS];
-qboolean	lightmap_modified[MAX_LIGHTMAPS];
-glRect_t	lightmap_rectchange[MAX_LIGHTMAPS];
-
-int			allocated[MAX_LIGHTMAPS][BLOCK_WIDTH];
-
-// the lightmap texture data needs to be kept in
-// main memory so texsubimage can update properly
-byte		lightmaps[4*MAX_LIGHTMAPS*BLOCK_WIDTH*BLOCK_HEIGHT];
-
-// For gl_texsort 0
-msurface_t  *skychain = NULL;
-msurface_t  *waterchain = NULL;
-
-void R_RenderDynamicLightmaps (msurface_t *fa);
-
-/*
-===============
-R_AddDynamicLights
-===============
-*/
-void R_AddDynamicLights (msurface_t *surf)
-{
-	int			lnum;
-	int			sd, td;
-	float		dist, rad, minlight;
-	vec3_t		impact, local;
-	int			s, t;
-	int			i;
-	int			smax, tmax;
-	mtexinfo_t	*tex;
-
-	smax = (surf->extents[0]>>4)+1;
-	tmax = (surf->extents[1]>>4)+1;
-	tex = surf->texinfo;
-
-	for (lnum=0 ; lnum<MAX_DLIGHTS ; lnum++)
-	{
-		if ( !(surf->dlightbits & (1<<lnum) ) )
-			continue;		// not lit by this light
-
-		rad = cl_dlights[lnum].radius;
-		dist = DotProduct (cl_dlights[lnum].origin, surf->plane->normal) -
-				surf->plane->dist;
-		rad -= fabs(dist);
-		minlight = cl_dlights[lnum].minlight;
-		if (rad < minlight)
-			continue;
-		minlight = rad - minlight;
-
-		for (i=0 ; i<3 ; i++)
-		{
-			impact[i] = cl_dlights[lnum].origin[i] -
-					surf->plane->normal[i]*dist;
-		}
-
-		local[0] = DotProduct (impact, tex->vecs[0]) + tex->vecs[0][3];
-		local[1] = DotProduct (impact, tex->vecs[1]) + tex->vecs[1][3];
-
-		local[0] -= surf->texturemins[0];
-		local[1] -= surf->texturemins[1];
-		
-		for (t = 0 ; t<tmax ; t++)
-		{
-			td = local[1] - t*16;
-			if (td < 0)
-				td = -td;
-			for (s=0 ; s<smax ; s++)
-			{
-				sd = local[0] - s*16;
-				if (sd < 0)
-					sd = -sd;
-				if (sd > td)
-					dist = sd + (td>>1);
-				else
-					dist = td + (sd>>1);
-				if (dist < minlight)
-					blocklights[t*smax + s] += (rad - dist)*256;
-			}
-		}
-	}
-}
-
-
-/*
-===============
-R_BuildLightMap
-
-Combine and scale multiple lightmaps into the 8.8 format in blocklights
-===============
-*/
-void R_BuildLightMap (msurface_t *surf, byte *dest, int stride)
-{
-	int			smax, tmax;
-	int			t;
-	int			i, j, size;
-	byte		*lightmap;
-	unsigned	scale;
-	int			maps;
-	int			lightadj[4];
-	unsigned	*bl;
-
-	surf->cached_dlight = (surf->dlightframe == r_framecount);
-
-	smax = (surf->extents[0]>>4)+1;
-	tmax = (surf->extents[1]>>4)+1;
-	size = smax*tmax;
-	lightmap = surf->samples;
-
-// set to full bright if no light data
-	if (r_fullbright.value || !cl.worldmodel->lightdata)
-	{
-		for (i=0 ; i<size ; i++)
-			blocklights[i] = 255*256;
-		goto store;
-	}
-
-// clear to no light
-	for (i=0 ; i<size ; i++)
-		blocklights[i] = 0;
-
-// add all the lightmaps
-	if (lightmap)
-		for (maps = 0 ; maps < MAXLIGHTMAPS && surf->styles[maps] != 255 ;
-			 maps++)
-		{
-			scale = d_lightstylevalue[surf->styles[maps]];
-			surf->cached_light[maps] = scale;	// 8.8 fraction
-			for (i=0 ; i<size ; i++)
-				blocklights[i] += lightmap[i] * scale;
-			lightmap += size;	// skip to next lightmap
-		}
-
-// add all the dynamic lights
-	if (surf->dlightframe == r_framecount)
-		R_AddDynamicLights (surf);
-
-// bound, invert, and shift
-store:
-	switch (gl_lightmap_format)
-	{
-	case GL_RGBA:
-		stride -= (smax<<2);
-		bl = blocklights;
-		for (i=0 ; i<tmax ; i++, dest += stride)
-		{
-			for (j=0 ; j<smax ; j++)
-			{
-				t = *bl++;
-				t >>= 7;
-				if (t > 255)
-					t = 255;
-				dest[3] = 255-t;
-				dest += 4;
-			}
-		}
-		break;
-	case GL_ALPHA:
-	case GL_LUMINANCE:
-	case GL_INTENSITY:
-		bl = blocklights;
-		for (i=0 ; i<tmax ; i++, dest += stride)
-		{
-			for (j=0 ; j<smax ; j++)
-			{
-				t = *bl++;
-				t >>= 7;
-				if (t > 255)
-					t = 255;
-				dest[j] = 255-t;
-			}
-		}
-		break;
-	default:
-		Sys_Error ("Bad lightmap format");
-	}
-}
-
-
-/*
-===============
-R_TextureAnimation
-
-Returns the proper texture for a given time and base texture
-===============
-*/
-texture_t *R_TextureAnimation (texture_t *base)
-{
-	int		reletive;
-	int		count;
-
-	if (currententity->frame)
-	{
-		if (base->alternate_anims)
-			base = base->alternate_anims;
-	}
-	
-	if (!base->anim_total)
-		return base;
-
-	reletive = (int)(cl.time*10) % base->anim_total;
-
-	count = 0;	
-	while (base->anim_min > reletive || base->anim_max <= reletive)
-	{
-		base = base->anim_next;
-		if (!base)
-			Sys_Error ("R_TextureAnimation: broken cycle");
-		if (++count > 100)
-			Sys_Error ("R_TextureAnimation: infinite cycle");
-	}
-
-	return base;
-}
-
-
-/*
-=============================================================
-
-	BRUSH MODELS
-
-=============================================================
-*/
-
-
-extern	int		solidskytexture;
-extern	int		alphaskytexture;
-extern	float	speedscale;		// for top sky and bottom sky
-
-void DrawGLWaterPoly (glpoly_t *p);
-void DrawGLWaterPolyLightmap (glpoly_t *p);
-
-lpMTexFUNC qglMTexCoord2fSGIS = NULL;
-lpSelTexFUNC qglSelectTextureSGIS = NULL;
-
-qboolean mtexenabled = false;
-
-void GL_SelectTexture (GLenum target);
-
-void GL_DisableMultitexture(void) 
-{
-	if (mtexenabled) {
-		glDisable(GL_TEXTURE_2D);
-		GL_SelectTexture(TEXTURE0_SGIS);
-		mtexenabled = false;
-	}
-}
-
-void GL_EnableMultitexture(void) 
-{
-	if (gl_mtexable) {
-		GL_SelectTexture(TEXTURE1_SGIS);
-		glEnable(GL_TEXTURE_2D);
-		mtexenabled = true;
-	}
-}
-
-#if 0
-/*
-================
-R_DrawSequentialPoly
-
-Systems that have fast state and texture changes can
-just do everything as it passes with no need to sort
-================
-*/
-void R_DrawSequentialPoly (msurface_t *s)
-{
-	glpoly_t	*p;
-	float		*v;
-	int			i;
-	texture_t	*t;
-
-	//
-	// normal lightmaped poly
-	//
-	if (! (s->flags & (SURF_DRAWSKY|SURF_DRAWTURB|SURF_UNDERWATER) ) )
-	{
-		p = s->polys;
-
-		t = R_TextureAnimation (s->texinfo->texture);
-		GL_Bind (t->gl_texturenum);
-		glBegin (GL_POLYGON);
-		v = p->verts[0];
-		for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-		{
-			glTexCoord2f (v[3], v[4]);
-			glVertex3fv (v);
-		}
-		glEnd ();
-
-		GL_Bind (lightmap_textures + s->lightmaptexturenum);
-		glEnable (GL_BLEND);
-		glBegin (GL_POLYGON);
-		v = p->verts[0];
-		for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-		{
-			glTexCoord2f (v[5], v[6]);
-			glVertex3fv (v);
-		}
-		glEnd ();
-
-		glDisable (GL_BLEND);
-
-		return;
-	}
-
-	//
-	// subdivided water surface warp
-	//
-	if (s->flags & SURF_DRAWTURB)
-	{
-		GL_Bind (s->texinfo->texture->gl_texturenum);
-		EmitWaterPolys (s);
-		return;
-	}
-
-	//
-	// subdivided sky warp
-	//
-	if (s->flags & SURF_DRAWSKY)
-	{
-		GL_Bind (solidskytexture);
-		speedscale = realtime*8;
-		speedscale -= (int)speedscale;
-
-		EmitSkyPolys (s);
-
-		glEnable (GL_BLEND);
-		glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		GL_Bind (alphaskytexture);
-		speedscale = realtime*16;
-		speedscale -= (int)speedscale;
-		EmitSkyPolys (s);
-		if (gl_lightmap_format == GL_LUMINANCE)
-			glBlendFunc (GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
-
-		glDisable (GL_BLEND);
-	}
-
-	//
-	// underwater warped with lightmap
-	//
-	p = s->polys;
-
-	t = R_TextureAnimation (s->texinfo->texture);
-	GL_Bind (t->gl_texturenum);
-	DrawGLWaterPoly (p);
-
-	GL_Bind (lightmap_textures + s->lightmaptexturenum);
-	glEnable (GL_BLEND);
-	DrawGLWaterPolyLightmap (p);
-	glDisable (GL_BLEND);
-}
-#else
-/*
-================
-R_DrawSequentialPoly
-
-Systems that have fast state and texture changes can
-just do everything as it passes with no need to sort
-================
-*/
-void R_DrawSequentialPoly (msurface_t *s)
-{
-	glpoly_t	*p;
-	float		*v;
-	int			i;
-	texture_t	*t;
-	vec3_t		nv, dir;
-	float		ss, ss2, length;
-	float		s1, t1;
-	glRect_t	*theRect;
-
-	//
-	// normal lightmaped poly
-	//
-
-	if (! (s->flags & (SURF_DRAWSKY|SURF_DRAWTURB|SURF_UNDERWATER) ) )
-	{
-		R_RenderDynamicLightmaps (s);
-		if (gl_mtexable) {
-			p = s->polys;
-
-			t = R_TextureAnimation (s->texinfo->texture);
-			// Binds world to texture env 0
-			GL_SelectTexture(TEXTURE0_SGIS);
-			GL_Bind (t->gl_texturenum);
-			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-			// Binds lightmap to texenv 1
-			GL_EnableMultitexture(); // Same as SelectTexture (TEXTURE1)
-			GL_Bind (lightmap_textures + s->lightmaptexturenum);
-			i = s->lightmaptexturenum;
-			if (lightmap_modified[i])
-			{
-				lightmap_modified[i] = false;
-				theRect = &lightmap_rectchange[i];
-				glTexSubImage2D(GL_TEXTURE_2D, 0, 0, theRect->t, 
-					BLOCK_WIDTH, theRect->h, gl_lightmap_format, GL_UNSIGNED_BYTE,
-					lightmaps+(i* BLOCK_HEIGHT + theRect->t) *BLOCK_WIDTH*lightmap_bytes);
-				theRect->l = BLOCK_WIDTH;
-				theRect->t = BLOCK_HEIGHT;
-				theRect->h = 0;
-				theRect->w = 0;
-			}
-			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
-			glBegin(GL_POLYGON);
-			v = p->verts[0];
-			for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-			{
-				qglMTexCoord2fSGIS (TEXTURE0_SGIS, v[3], v[4]);
-				qglMTexCoord2fSGIS (TEXTURE1_SGIS, v[5], v[6]);
-				glVertex3fv (v);
-			}
-			glEnd ();
-			return;
-		} else {
-			p = s->polys;
-
-			t = R_TextureAnimation (s->texinfo->texture);
-			GL_Bind (t->gl_texturenum);
-			glBegin (GL_POLYGON);
-			v = p->verts[0];
-			for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-			{
-				glTexCoord2f (v[3], v[4]);
-				glVertex3fv (v);
-			}
-			glEnd ();
-
-			GL_Bind (lightmap_textures + s->lightmaptexturenum);
-			glEnable (GL_BLEND);
-			glBegin (GL_POLYGON);
-			v = p->verts[0];
-			for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-			{
-				glTexCoord2f (v[5], v[6]);
-				glVertex3fv (v);
-			}
-			glEnd ();
-
-			glDisable (GL_BLEND);
-		}
-
-		return;
-	}
-
-	//
-	// subdivided water surface warp
-	//
-
-	if (s->flags & SURF_DRAWTURB)
-	{
-		GL_DisableMultitexture();
-		GL_Bind (s->texinfo->texture->gl_texturenum);
-		EmitWaterPolys (s);
-		return;
-	}
-
-	//
-	// subdivided sky warp
-	//
-	if (s->flags & SURF_DRAWSKY)
-	{
-		GL_DisableMultitexture();
-		GL_Bind (solidskytexture);
-		speedscale = realtime*8;
-		speedscale -= (int)speedscale & ~127;
-
-		EmitSkyPolys (s);
-
-		glEnable (GL_BLEND);
-		GL_Bind (alphaskytexture);
-		speedscale = realtime*16;
-		speedscale -= (int)speedscale & ~127;
-		EmitSkyPolys (s);
-
-		glDisable (GL_BLEND);
-		return;
-	}
-
-	//
-	// underwater warped with lightmap
-	//
-	R_RenderDynamicLightmaps (s);
-	if (gl_mtexable) {
-		p = s->polys;
-
-		t = R_TextureAnimation (s->texinfo->texture);
-		GL_SelectTexture(TEXTURE0_SGIS);
-		GL_Bind (t->gl_texturenum);
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-		GL_EnableMultitexture();
-		GL_Bind (lightmap_textures + s->lightmaptexturenum);
-		i = s->lightmaptexturenum;
-		if (lightmap_modified[i])
-		{
-			lightmap_modified[i] = false;
-			theRect = &lightmap_rectchange[i];
-			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, theRect->t, 
-				BLOCK_WIDTH, theRect->h, gl_lightmap_format, GL_UNSIGNED_BYTE,
-				lightmaps+(i* BLOCK_HEIGHT + theRect->t) *BLOCK_WIDTH*lightmap_bytes);
-			theRect->l = BLOCK_WIDTH;
-			theRect->t = BLOCK_HEIGHT;
-			theRect->h = 0;
-			theRect->w = 0;
-		}
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
-		glBegin (GL_TRIANGLE_FAN);
-		v = p->verts[0];
-		for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-		{
-			qglMTexCoord2fSGIS (TEXTURE0_SGIS, v[3], v[4]);
-			qglMTexCoord2fSGIS (TEXTURE1_SGIS, v[5], v[6]);
-
-			nv[0] = v[0] + 8*sin(v[1]*0.05+realtime)*sin(v[2]*0.05+realtime);
-			nv[1] = v[1] + 8*sin(v[0]*0.05+realtime)*sin(v[2]*0.05+realtime);
-			nv[2] = v[2];
-
-			glVertex3fv (nv);
-		}
-		glEnd ();
-
-	} else {
-		p = s->polys;
-
-		t = R_TextureAnimation (s->texinfo->texture);
-		GL_Bind (t->gl_texturenum);
-		DrawGLWaterPoly (p);
-
-		GL_Bind (lightmap_textures + s->lightmaptexturenum);
-		glEnable (GL_BLEND);
-		DrawGLWaterPolyLightmap (p);
-		glDisable (GL_BLEND);
-	}
-}
-#endif
-
-
-/*
-================
-DrawGLWaterPoly
-
-Warp the vertex coordinates
-================
-*/
-void DrawGLWaterPoly (glpoly_t *p)
-{
-	int		i;
-	float	*v;
-	float	s, t, os, ot;
-	vec3_t	nv;
-
-	GL_DisableMultitexture();
-
-	glBegin (GL_TRIANGLE_FAN);
-	v = p->verts[0];
-	for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-	{
-		glTexCoord2f (v[3], v[4]);
-
-		nv[0] = v[0] + 8*sin(v[1]*0.05+realtime)*sin(v[2]*0.05+realtime);
-		nv[1] = v[1] + 8*sin(v[0]*0.05+realtime)*sin(v[2]*0.05+realtime);
-		nv[2] = v[2];
-
-		glVertex3fv (nv);
-	}
-	glEnd ();
-}
-
-void DrawGLWaterPolyLightmap (glpoly_t *p)
-{
-	int		i;
-	float	*v;
-	float	s, t, os, ot;
-	vec3_t	nv;
-
-	GL_DisableMultitexture();
-
-	glBegin (GL_TRIANGLE_FAN);
-	v = p->verts[0];
-	for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-	{
-		glTexCoord2f (v[5], v[6]);
-
-		nv[0] = v[0] + 8*sin(v[1]*0.05+realtime)*sin(v[2]*0.05+realtime);
-		nv[1] = v[1] + 8*sin(v[0]*0.05+realtime)*sin(v[2]*0.05+realtime);
-		nv[2] = v[2];
-
-		glVertex3fv (nv);
-	}
-	glEnd ();
-}
-
-/*
-================
-DrawGLPoly
-================
-*/
-void DrawGLPoly (glpoly_t *p)
-{
-	int		i;
-	float	*v;
-
-	glBegin (GL_POLYGON);
-	v = p->verts[0];
-	for (i=0 ; i<p->numverts ; i++, v+= VERTEXSIZE)
-	{
-		glTexCoord2f (v[3], v[4]);
-		glVertex3fv (v);
-	}
-	glEnd ();
-}
-
-
-/*
-================
-R_BlendLightmaps
-================
-*/
-void R_BlendLightmaps (void)
-{
-	int			i, j;
-	glpoly_t	*p;
-	float		*v;
-	glRect_t	*theRect;
-
-	if (r_fullbright.value)
-		return;
-	if (!gl_texsort.value)
-		return;
-
-	glDepthMask (0);		// don't bother writing Z
-
-	if (gl_lightmap_format == GL_LUMINANCE)
-		glBlendFunc (GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
-	else if (gl_lightmap_format == GL_INTENSITY)
-	{
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-		glColor4f (0,0,0,1);
-		glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	}
-
-	if (!r_lightmap.value)
-	{
-		glEnable (GL_BLEND);
-	}
-
-	for (i=0 ; i<MAX_LIGHTMAPS ; i++)
-	{
-		p = lightmap_polys[i];
-		if (!p)
-			continue;
-		GL_Bind(lightmap_textures+i);
-		if (lightmap_modified[i])
-		{
-			lightmap_modified[i] = false;
-			theRect = &lightmap_rectchange[i];
-//			glTexImage2D (GL_TEXTURE_2D, 0, lightmap_bytes
-//			, BLOCK_WIDTH, BLOCK_HEIGHT, 0, 
-//			gl_lightmap_format, GL_UNSIGNED_BYTE, lightmaps+i*BLOCK_WIDTH*BLOCK_HEIGHT*lightmap_bytes);
-//			glTexImage2D (GL_TEXTURE_2D, 0, lightmap_bytes
-//				, BLOCK_WIDTH, theRect->h, 0, 
-//				gl_lightmap_format, GL_UNSIGNED_BYTE, lightmaps+(i*BLOCK_HEIGHT+theRect->t)*BLOCK_WIDTH*lightmap_bytes);
-			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, theRect->t, 
-				BLOCK_WIDTH, theRect->h, gl_lightmap_format, GL_UNSIGNED_BYTE,
-				lightmaps+(i* BLOCK_HEIGHT + theRect->t) *BLOCK_WIDTH*lightmap_bytes);
-			theRect->l = BLOCK_WIDTH;
-			theRect->t = BLOCK_HEIGHT;
-			theRect->h = 0;
-			theRect->w = 0;
-		}
-		for ( ; p ; p=p->chain)
-		{
-			if (p->flags & SURF_UNDERWATER)
-				DrawGLWaterPolyLightmap (p);
-			else
-			{
-				glBegin (GL_POLYGON);
-				v = p->verts[0];
-				for (j=0 ; j<p->numverts ; j++, v+= VERTEXSIZE)
-				{
-					glTexCoord2f (v[5], v[6]);
-					glVertex3fv (v);
-				}
-				glEnd ();
-			}
-		}
-	}
-
-	glDisable (GL_BLEND);
-	if (gl_lightmap_format == GL_LUMINANCE)
-		glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	else if (gl_lightmap_format == GL_INTENSITY)
-	{
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-		glColor4f (1,1,1,1);
-	}
-
-	glDepthMask (1);		// back to normal Z buffering
-}
-
-/*
-================
-R_RenderBrushPoly
-================
-*/
-void R_RenderBrushPoly (msurface_t *fa)
-{
-	texture_t	*t;
-	byte		*base;
-	int			maps;
-	glRect_t    *theRect;
-	int smax, tmax;
-
-	c_brush_polys++;
-
-	if (fa->flags & SURF_DRAWSKY)
-	{	// warp texture, no lightmaps
-		EmitBothSkyLayers (fa);
-		return;
-	}
-		
-	t = R_TextureAnimation (fa->texinfo->texture);
-	GL_Bind (t->gl_texturenum);
-
-	if (fa->flags & SURF_DRAWTURB)
-	{	// warp texture, no lightmaps
-		EmitWaterPolys (fa);
-		return;
-	}
-
-	if (fa->flags & SURF_UNDERWATER)
-		DrawGLWaterPoly (fa->polys);
-	else
-		DrawGLPoly (fa->polys);
-
-	// add the poly to the proper lightmap chain
-
-	fa->polys->chain = lightmap_polys[fa->lightmaptexturenum];
-	lightmap_polys[fa->lightmaptexturenum] = fa->polys;
-
-	// check for lightmap modification
-	for (maps = 0 ; maps < MAXLIGHTMAPS && fa->styles[maps] != 255 ;
-		 maps++)
-		if (d_lightstylevalue[fa->styles[maps]] != fa->cached_light[maps])
-			goto dynamic;
-
-	if (fa->dlightframe == r_framecount	// dynamic this frame
-		|| fa->cached_dlight)			// dynamic previously
-	{
-dynamic:
-		if (r_dynamic.value)
-		{
-			lightmap_modified[fa->lightmaptexturenum] = true;
-			theRect = &lightmap_rectchange[fa->lightmaptexturenum];
-			if (fa->light_t < theRect->t) {
-				if (theRect->h)
-					theRect->h += theRect->t - fa->light_t;
-				theRect->t = fa->light_t;
-			}
-			if (fa->light_s < theRect->l) {
-				if (theRect->w)
-					theRect->w += theRect->l - fa->light_s;
-				theRect->l = fa->light_s;
-			}
-			smax = (fa->extents[0]>>4)+1;
-			tmax = (fa->extents[1]>>4)+1;
-			if ((theRect->w + theRect->l) < (fa->light_s + smax))
-				theRect->w = (fa->light_s-theRect->l)+smax;
-			if ((theRect->h + theRect->t) < (fa->light_t + tmax))
-				theRect->h = (fa->light_t-theRect->t)+tmax;
-			base = lightmaps + fa->lightmaptexturenum*lightmap_bytes*BLOCK_WIDTH*BLOCK_HEIGHT;
-			base += fa->light_t * BLOCK_WIDTH * lightmap_bytes + fa->light_s * lightmap_bytes;
-			R_BuildLightMap (fa, base, BLOCK_WIDTH*lightmap_bytes);
-		}
-	}
-}
-
-/*
-================
-R_RenderDynamicLightmaps
-Multitexture
-================
-*/
-void R_RenderDynamicLightmaps (msurface_t *fa)
-{
-	texture_t	*t;
-	byte		*base;
-	int			maps;
-	glRect_t    *theRect;
-	int smax, tmax;
-
-	c_brush_polys++;
-
-	if (fa->flags & ( SURF_DRAWSKY | SURF_DRAWTURB) )
-		return;
-		
-	fa->polys->chain = lightmap_polys[fa->lightmaptexturenum];
-	lightmap_polys[fa->lightmaptexturenum] = fa->polys;
-
-	// check for lightmap modification
-	for (maps = 0 ; maps < MAXLIGHTMAPS && fa->styles[maps] != 255 ;
-		 maps++)
-		if (d_lightstylevalue[fa->styles[maps]] != fa->cached_light[maps])
-			goto dynamic;
-
-	if (fa->dlightframe == r_framecount	// dynamic this frame
-		|| fa->cached_dlight)			// dynamic previously
-	{
-dynamic:
-		if (r_dynamic.value)
-		{
-			lightmap_modified[fa->lightmaptexturenum] = true;
-			theRect = &lightmap_rectchange[fa->lightmaptexturenum];
-			if (fa->light_t < theRect->t) {
-				if (theRect->h)
-					theRect->h += theRect->t - fa->light_t;
-				theRect->t = fa->light_t;
-			}
-			if (fa->light_s < theRect->l) {
-				if (theRect->w)
-					theRect->w += theRect->l - fa->light_s;
-				theRect->l = fa->light_s;
-			}
-			smax = (fa->extents[0]>>4)+1;
-			tmax = (fa->extents[1]>>4)+1;
-			if ((theRect->w + theRect->l) < (fa->light_s + smax))
-				theRect->w = (fa->light_s-theRect->l)+smax;
-			if ((theRect->h + theRect->t) < (fa->light_t + tmax))
-				theRect->h = (fa->light_t-theRect->t)+tmax;
-			base = lightmaps + fa->lightmaptexturenum*lightmap_bytes*BLOCK_WIDTH*BLOCK_HEIGHT;
-			base += fa->light_t * BLOCK_WIDTH * lightmap_bytes + fa->light_s * lightmap_bytes;
-			R_BuildLightMap (fa, base, BLOCK_WIDTH*lightmap_bytes);
-		}
-	}
-}
-
-/*
-================
-R_MirrorChain
-================
-*/
-void R_MirrorChain (msurface_t *s)
-{
-	if (mirror)
-		return;
-	mirror = true;
-	mirror_plane = s->plane;
-}
-
-
-#if 0
-/*
-================
-R_DrawWaterSurfaces
-================
-*/
-void R_DrawWaterSurfaces (void)
-{
-	int			i;
-	msurface_t	*s;
-	texture_t	*t;
-
-	if (r_wateralpha.value == 1.0)
-		return;
-
-	//
-	// go back to the world matrix
-	//
-    glLoadMatrixf (r_world_matrix);
-
-	glEnable (GL_BLEND);
-	glColor4f (1,1,1,r_wateralpha.value);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-	for (i=0 ; i<cl.worldmodel->numtextures ; i++)
-	{
-		t = cl.worldmodel->textures[i];
-		if (!t)
-			continue;
-		s = t->texturechain;
-		if (!s)
-			continue;
-		if ( !(s->flags & SURF_DRAWTURB) )
-			continue;
-
-		// set modulate mode explicitly
-		GL_Bind (t->gl_texturenum);
-
-		for ( ; s ; s=s->texturechain)
-			R_RenderBrushPoly (s);
-
-		t->texturechain = NULL;
-	}
-
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-	glColor4f (1,1,1,1);
-	glDisable (GL_BLEND);
-}
-#else
-/*
-================
-R_DrawWaterSurfaces
-================
-*/
-void R_DrawWaterSurfaces (void)
-{
-	int			i;
-	msurface_t	*s;
-	texture_t	*t;
-
-	if (r_wateralpha.value == 1.0 && gl_texsort.value)
-		return;
-
-	//
-	// go back to the world matrix
-	//
-
-    glLoadMatrixf (r_world_matrix);
-
-	if (r_wateralpha.value < 1.0) {
-		glEnable (GL_BLEND);
-		glColor4f (1,1,1,r_wateralpha.value);
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	}
-
-	if (!gl_texsort.value) {
-		if (!waterchain)
-			return;
-
-		for ( s = waterchain ; s ; s=s->texturechain) {
-			GL_Bind (s->texinfo->texture->gl_texturenum);
-			EmitWaterPolys (s);
-		}
-		
-		waterchain = NULL;
-	} else {
-
-		for (i=0 ; i<cl.worldmodel->numtextures ; i++)
-		{
-			t = cl.worldmodel->textures[i];
-			if (!t)
-				continue;
-			s = t->texturechain;
-			if (!s)
-				continue;
-			if ( !(s->flags & SURF_DRAWTURB ) )
-				continue;
-
-			// set modulate mode explicitly
-			
-			GL_Bind (t->gl_texturenum);
-
-			for ( ; s ; s=s->texturechain)
-				EmitWaterPolys (s);
-			
-			t->texturechain = NULL;
-		}
-
-	}
-
-	if (r_wateralpha.value < 1.0) {
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-		glColor4f (1,1,1,1);
-		glDisable (GL_BLEND);
-	}
-
-}
-
-#endif
-
-/*
-================
-DrawTextureChains
-================
-*/
-void DrawTextureChains (void)
-{
-	int		i;
-	msurface_t	*s;
-	texture_t	*t;
-
-	if (!gl_texsort.value) {
-		GL_DisableMultitexture();
-
-		if (skychain) {
-			R_DrawSkyChain(skychain);
-			skychain = NULL;
-		}
-
-		return;
-	} 
-
-	for (i=0 ; i<cl.worldmodel->numtextures ; i++)
-	{
-		t = cl.worldmodel->textures[i];
-		if (!t)
-			continue;
-		s = t->texturechain;
-		if (!s)
-			continue;
-		if (i == skytexturenum)
-			R_DrawSkyChain (s);
-		else if (i == mirrortexturenum && r_mirroralpha.value != 1.0)
-		{
-			R_MirrorChain (s);
-			continue;
-		}
-		else
-		{
-			if ((s->flags & SURF_DRAWTURB) && r_wateralpha.value != 1.0)
-				continue;	// draw translucent water later
-			for ( ; s ; s=s->texturechain)
-				R_RenderBrushPoly (s);
-		}
-
-		t->texturechain = NULL;
-	}
-}
-
-/*
-=================
-R_DrawBrushModel
-=================
-*/
-void R_DrawBrushModel (entity_t *e)
-{
-	int			j, k;
-	vec3_t		mins, maxs;
-	int			i, numsurfaces;
-	msurface_t	*psurf;
-	float		dot;
-	mplane_t	*pplane;
-	model_t		*clmodel;
-	qboolean	rotated;
-
-	currententity = e;
-	currenttexture = -1;
-
-	clmodel = e->model;
-
-	if (e->angles[0] || e->angles[1] || e->angles[2])
-	{
-		rotated = true;
-		for (i=0 ; i<3 ; i++)
-		{
-			mins[i] = e->origin[i] - clmodel->radius;
-			maxs[i] = e->origin[i] + clmodel->radius;
-		}
-	}
-	else
-	{
-		rotated = false;
-		VectorAdd (e->origin, clmodel->mins, mins);
-		VectorAdd (e->origin, clmodel->maxs, maxs);
-	}
-
-	if (R_CullBox (mins, maxs))
-		return;
-
-	glColor3f (1,1,1);
-	memset (lightmap_polys, 0, sizeof(lightmap_polys));
-
-	VectorSubtract (r_refdef.vieworg, e->origin, modelorg);
-	if (rotated)
-	{
-		vec3_t	temp;
-		vec3_t	forward, right, up;
-
-		VectorCopy (modelorg, temp);
-		AngleVectors (e->angles, forward, right, up);
-		modelorg[0] = DotProduct (temp, forward);
-		modelorg[1] = -DotProduct (temp, right);
-		modelorg[2] = DotProduct (temp, up);
-	}
-
-	psurf = &clmodel->surfaces[clmodel->firstmodelsurface];
-
-// calculate dynamic lighting for bmodel if it's not an
-// instanced model
-	if (clmodel->firstmodelsurface != 0 && !gl_flashblend.value)
-	{
-		for (k=0 ; k<MAX_DLIGHTS ; k++)
-		{
-			if ((cl_dlights[k].die < cl.time) ||
-				(!cl_dlights[k].radius))
-				continue;
-
-			R_MarkLights (&cl_dlights[k], 1<<k,
-				clmodel->nodes + clmodel->hulls[0].firstclipnode);
-		}
-	}
-
-    glPushMatrix ();
-e->angles[0] = -e->angles[0];	// stupid quake bug
-	R_RotateForEntity (e);
-e->angles[0] = -e->angles[0];	// stupid quake bug
-
-	//
-	// draw texture
-	//
-	for (i=0 ; i<clmodel->nummodelsurfaces ; i++, psurf++)
-	{
-	// find which side of the node we are on
-		pplane = psurf->plane;
-
-		dot = DotProduct (modelorg, pplane->normal) - pplane->dist;
-
-	// draw the polygon
-		if (((psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
-			(!(psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON)))
-		{
-			if (gl_texsort.value)
-				R_RenderBrushPoly (psurf);
-			else
-				R_DrawSequentialPoly (psurf);
-		}
-	}
-
-	R_BlendLightmaps ();
-
-	glPopMatrix ();
-}
-
-/*
-=============================================================
-
-	WORLD MODEL
-
-=============================================================
-*/
-
-/*
-================
-R_RecursiveWorldNode
-================
-*/
-void R_RecursiveWorldNode (mnode_t *node)
-{
-	int			i, c, side, *pindex;
-	vec3_t		acceptpt, rejectpt;
-	mplane_t	*plane;
-	msurface_t	*surf, **mark;
-	mleaf_t		*pleaf;
-	double		d, dot;
-	vec3_t		mins, maxs;
-
-	if (node->contents == CONTENTS_SOLID)
-		return;		// solid
-
-	if (node->visframe != r_visframecount)
-		return;
-	if (R_CullBox (node->minmaxs, node->minmaxs+3))
-		return;
-	
-// if a leaf node, draw stuff
-	if (node->contents < 0)
-	{
-		pleaf = (mleaf_t *)node;
-
-		mark = pleaf->firstmarksurface;
-		c = pleaf->nummarksurfaces;
-
-		if (c)
-		{
-			do
-			{
-				(*mark)->visframe = r_framecount;
-				mark++;
-			} while (--c);
-		}
-
-	// deal with model fragments in this leaf
-		if (pleaf->efrags)
-			R_StoreEfrags (&pleaf->efrags);
-
-		return;
-	}
-
-// node is just a decision point, so go down the apropriate sides
-
-// find which side of the node we are on
-	plane = node->plane;
-
-	switch (plane->type)
-	{
-	case PLANE_X:
-		dot = modelorg[0] - plane->dist;
-		break;
-	case PLANE_Y:
-		dot = modelorg[1] - plane->dist;
-		break;
-	case PLANE_Z:
-		dot = modelorg[2] - plane->dist;
-		break;
-	default:
-		dot = DotProduct (modelorg, plane->normal) - plane->dist;
-		break;
-	}
-
-	if (dot >= 0)
-		side = 0;
-	else
-		side = 1;
-
-// recurse down the children, front side first
-	R_RecursiveWorldNode (node->children[side]);
-
-// draw stuff
-	c = node->numsurfaces;
-
-	if (c)
-	{
-		surf = cl.worldmodel->surfaces + node->firstsurface;
-
-		if (dot < 0 -BACKFACE_EPSILON)
-			side = SURF_PLANEBACK;
-		else if (dot > BACKFACE_EPSILON)
-			side = 0;
-		{
-			for ( ; c ; c--, surf++)
-			{
-				if (surf->visframe != r_framecount)
-					continue;
-
-				// don't backface underwater surfaces, because they warp
-				if ( !(surf->flags & SURF_UNDERWATER) && ( (dot < 0) ^ !!(surf->flags & SURF_PLANEBACK)) )
-					continue;		// wrong side
-
-				// if sorting by texture, just store it out
-				if (gl_texsort.value)
-				{
-					if (!mirror
-					|| surf->texinfo->texture != cl.worldmodel->textures[mirrortexturenum])
-					{
-						surf->texturechain = surf->texinfo->texture->texturechain;
-						surf->texinfo->texture->texturechain = surf;
-					}
-				} else if (surf->flags & SURF_DRAWSKY) {
-					surf->texturechain = skychain;
-					skychain = surf;
-				} else if (surf->flags & SURF_DRAWTURB) {
-					surf->texturechain = waterchain;
-					waterchain = surf;
-				} else
-					R_DrawSequentialPoly (surf);
-
-			}
-		}
-
-	}
-
-// recurse down the back side
-	R_RecursiveWorldNode (node->children[!side]);
-}
-
-
-
-/*
-=============
-R_DrawWorld
-=============
-*/
-void R_DrawWorld (void)
-{
-	entity_t	ent;
-	int			i;
-
-	memset (&ent, 0, sizeof(ent));
-	ent.model = cl.worldmodel;
-
-	VectorCopy (r_refdef.vieworg, modelorg);
-
-	currententity = &ent;
-	currenttexture = -1;
-
-	glColor3f (1,1,1);
-	memset (lightmap_polys, 0, sizeof(lightmap_polys));
-#ifdef QUAKE2
-	R_ClearSkyBox ();
-#endif
-
-	R_RecursiveWorldNode (cl.worldmodel->nodes);
-
-	DrawTextureChains ();
-
-	R_BlendLightmaps ();
-
-#ifdef QUAKE2
-	R_DrawSkyBox ();
-#endif
-}
-
-
-/*
-===============
-R_MarkLeaves
-===============
-*/
-void R_MarkLeaves (void)
-{
-	byte	*vis;
-	mnode_t	*node;
-	int		i;
-	byte	solid[4096];
-
-	if (r_oldviewleaf == r_viewleaf && !r_novis.value)
-		return;
-	
-	if (mirror)
-		return;
-
-	r_visframecount++;
-	r_oldviewleaf = r_viewleaf;
-
-	if (r_novis.value)
-	{
-		vis = solid;
-		memset (solid, 0xff, (cl.worldmodel->numleafs+7)>>3);
-	}
-	else
-		vis = Mod_LeafPVS (r_viewleaf, cl.worldmodel);
-		
-	for (i=0 ; i<cl.worldmodel->numleafs ; i++)
-	{
-		if (vis[i>>3] & (1<<(i&7)))
-		{
-			node = (mnode_t *)&cl.worldmodel->leafs[i+1];
-			do
-			{
-				if (node->visframe == r_visframecount)
-					break;
-				node->visframe = r_visframecount;
-				node = node->parent;
-			} while (node);
-		}
-	}
-}
-
-
-
-/*
-=============================================================================
-
-  LIGHTMAP ALLOCATION
-
-=============================================================================
-*/
-
-// returns a texture number and the position inside it
-int AllocBlock (int w, int h, int *x, int *y)
-{
-	int		i, j;
-	int		best, best2;
-	int		bestx;
-	int		texnum;
-
-	for (texnum=0 ; texnum<MAX_LIGHTMAPS ; texnum++)
-	{
-		best = BLOCK_HEIGHT;
-
-		for (i=0 ; i<BLOCK_WIDTH-w ; i++)
-		{
-			best2 = 0;
-
-			for (j=0 ; j<w ; j++)
-			{
-				if (allocated[texnum][i+j] >= best)
-					break;
-				if (allocated[texnum][i+j] > best2)
-					best2 = allocated[texnum][i+j];
-			}
-			if (j == w)
-			{	// this is a valid spot
-				*x = i;
-				*y = best = best2;
-			}
-		}
-
-		if (best + h > BLOCK_HEIGHT)
-			continue;
-
-		for (i=0 ; i<w ; i++)
-			allocated[texnum][*x + i] = best + h;
-
-		return texnum;
-	}
-
-	Sys_Error ("AllocBlock: full");
-}
-
-
-mvertex_t	*r_pcurrentvertbase;
-model_t		*currentmodel;
-
-int	nColinElim;
-
-/*
-================
-BuildSurfaceDisplayList
-================
-*/
-void BuildSurfaceDisplayList (msurface_t *fa)
-{
-	int			i, lindex, lnumverts, s_axis, t_axis;
-	float		dist, lastdist, lzi, scale, u, v, frac;
-	unsigned	mask;
-	vec3_t		local, transformed;
-	medge_t		*pedges, *r_pedge;
-	mplane_t	*pplane;
-	int			vertpage, newverts, newpage, lastvert;
-	qboolean	visible;
-	float		*vec;
-	float		s, t;
-	glpoly_t	*poly;
-
-// reconstruct the polygon
-	pedges = currentmodel->edges;
-	lnumverts = fa->numedges;
-	vertpage = 0;
-
-	//
-	// draw texture
-	//
-	poly = Hunk_Alloc (sizeof(glpoly_t) + (lnumverts-4) * VERTEXSIZE*sizeof(float));
-	poly->next = fa->polys;
-	poly->flags = fa->flags;
-	fa->polys = poly;
-	poly->numverts = lnumverts;
-
-	for (i=0 ; i<lnumverts ; i++)
-	{
-		lindex = currentmodel->surfedges[fa->firstedge + i];
-
-		if (lindex > 0)
-		{
-			r_pedge = &pedges[lindex];
-			vec = r_pcurrentvertbase[r_pedge->v[0]].position;
-		}
-		else
-		{
-			r_pedge = &pedges[-lindex];
-			vec = r_pcurrentvertbase[r_pedge->v[1]].position;
-		}
-		s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3];
-		s /= fa->texinfo->texture->width;
-
-		t = DotProduct (vec, fa->texinfo->vecs[1]) + fa->texinfo->vecs[1][3];
-		t /= fa->texinfo->texture->height;
-
-		VectorCopy (vec, poly->verts[i]);
-		poly->verts[i][3] = s;
-		poly->verts[i][4] = t;
-
-		//
-		// lightmap texture coordinates
-		//
-		s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3];
-		s -= fa->texturemins[0];
-		s += fa->light_s*16;
-		s += 8;
-		s /= BLOCK_WIDTH*16; //fa->texinfo->texture->width;
-
-		t = DotProduct (vec, fa->texinfo->vecs[1]) + fa->texinfo->vecs[1][3];
-		t -= fa->texturemins[1];
-		t += fa->light_t*16;
-		t += 8;
-		t /= BLOCK_HEIGHT*16; //fa->texinfo->texture->height;
-
-		poly->verts[i][5] = s;
-		poly->verts[i][6] = t;
-	}
-
-	//
-	// remove co-linear points - Ed
-	//
-	if (!gl_keeptjunctions.value && !(fa->flags & SURF_UNDERWATER) )
-	{
-		for (i = 0 ; i < lnumverts ; ++i)
-		{
-			vec3_t v1, v2;
-			float *prev, *this, *next;
-			float f;
-
-			prev = poly->verts[(i + lnumverts - 1) % lnumverts];
-			this = poly->verts[i];
-			next = poly->verts[(i + 1) % lnumverts];
-
-			VectorSubtract( this, prev, v1 );
-			VectorNormalize( v1 );
-			VectorSubtract( next, prev, v2 );
-			VectorNormalize( v2 );
-
-			// skip co-linear points
-			#define COLINEAR_EPSILON 0.001
-			if ((fabs( v1[0] - v2[0] ) <= COLINEAR_EPSILON) &&
-				(fabs( v1[1] - v2[1] ) <= COLINEAR_EPSILON) && 
-				(fabs( v1[2] - v2[2] ) <= COLINEAR_EPSILON))
-			{
-				int j;
-				for (j = i + 1; j < lnumverts; ++j)
-				{
-					int k;
-					for (k = 0; k < VERTEXSIZE; ++k)
-						poly->verts[j - 1][k] = poly->verts[j][k];
-				}
-				--lnumverts;
-				++nColinElim;
-				// retry next vertex next time, which is now current vertex
-				--i;
-			}
-		}
-	}
-	poly->numverts = lnumverts;
-
-}
-
-/*
-========================
-GL_CreateSurfaceLightmap
-========================
-*/
-void GL_CreateSurfaceLightmap (msurface_t *surf)
-{
-	int		smax, tmax, s, t, l, i;
-	byte	*base;
-
-	if (surf->flags & (SURF_DRAWSKY|SURF_DRAWTURB))
-		return;
-
-	smax = (surf->extents[0]>>4)+1;
-	tmax = (surf->extents[1]>>4)+1;
-
-	surf->lightmaptexturenum = AllocBlock (smax, tmax, &surf->light_s, &surf->light_t);
-	base = lightmaps + surf->lightmaptexturenum*lightmap_bytes*BLOCK_WIDTH*BLOCK_HEIGHT;
-	base += (surf->light_t * BLOCK_WIDTH + surf->light_s) * lightmap_bytes;
-	R_BuildLightMap (surf, base, BLOCK_WIDTH*lightmap_bytes);
-}
-
-
-/*
-==================
-GL_BuildLightmaps
-
-Builds the lightmap texture
-with all the surfaces from all brush models
-==================
-*/
-void GL_BuildLightmaps (void)
-{
-	int		i, j;
-	model_t	*m;
-	extern qboolean isPermedia;
-
-	memset (allocated, 0, sizeof(allocated));
-
-	r_framecount = 1;		// no dlightcache
-
-	if (!lightmap_textures)
-	{
-		lightmap_textures = texture_extension_number;
-		texture_extension_number += MAX_LIGHTMAPS;
-	}
-
-	gl_lightmap_format = GL_LUMINANCE;
-	// default differently on the Permedia
-	if (isPermedia)
-		gl_lightmap_format = GL_RGBA;
-
-	if (COM_CheckParm ("-lm_1"))
-		gl_lightmap_format = GL_LUMINANCE;
-	if (COM_CheckParm ("-lm_a"))
-		gl_lightmap_format = GL_ALPHA;
-	if (COM_CheckParm ("-lm_i"))
-		gl_lightmap_format = GL_INTENSITY;
-	if (COM_CheckParm ("-lm_2"))
-		gl_lightmap_format = GL_RGBA4;
-	if (COM_CheckParm ("-lm_4"))
-		gl_lightmap_format = GL_RGBA;
-
-	switch (gl_lightmap_format)
-	{
-	case GL_RGBA:
-		lightmap_bytes = 4;
-		break;
-	case GL_RGBA4:
-		lightmap_bytes = 2;
-		break;
-	case GL_LUMINANCE:
-	case GL_INTENSITY:
-	case GL_ALPHA:
-		lightmap_bytes = 1;
-		break;
-	}
-
-	for (j=1 ; j<MAX_MODELS ; j++)
-	{
-		m = cl.model_precache[j];
-		if (!m)
-			break;
-		if (m->name[0] == '*')
-			continue;
-		r_pcurrentvertbase = m->vertexes;
-		currentmodel = m;
-		for (i=0 ; i<m->numsurfaces ; i++)
-		{
-			GL_CreateSurfaceLightmap (m->surfaces + i);
-			if ( m->surfaces[i].flags & SURF_DRAWTURB )
-				continue;
-#ifndef QUAKE2
-			if ( m->surfaces[i].flags & SURF_DRAWSKY )
-				continue;
-#endif
-			BuildSurfaceDisplayList (m->surfaces + i);
-		}
-	}
-
- 	if (!gl_texsort.value)
- 		GL_SelectTexture(TEXTURE1_SGIS);
-
-	//
-	// upload all lightmaps that were filled
-	//
-	for (i=0 ; i<MAX_LIGHTMAPS ; i++)
-	{
-		if (!allocated[i][0])
-			break;		// no more used
-		lightmap_modified[i] = false;
-		lightmap_rectchange[i].l = BLOCK_WIDTH;
-		lightmap_rectchange[i].t = BLOCK_HEIGHT;
-		lightmap_rectchange[i].w = 0;
-		lightmap_rectchange[i].h = 0;
-		GL_Bind(lightmap_textures + i);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		glTexImage2D (GL_TEXTURE_2D, 0, lightmap_bytes
-		, BLOCK_WIDTH, BLOCK_HEIGHT, 0, 
-		gl_lightmap_format, GL_UNSIGNED_BYTE, lightmaps+i*BLOCK_WIDTH*BLOCK_HEIGHT*lightmap_bytes);
-	}
-
- 	if (!gl_texsort.value)
- 		GL_SelectTexture(TEXTURE0_SGIS);
-
-}
-
--- a/u/gl_screen.c
+++ /dev/null
@@ -1,923 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-
-// screen.c -- master for refresh, status bar, console, chat, notify, etc
-
-#include "quakedef.h"
-
-/*
-
-background clear
-rendering
-turtle/net/ram icons
-sbar
-centerprint / slow centerprint
-notify lines
-intermission / finale overlay
-loading plaque
-console
-menu
-
-required background clears
-required update regions
-
-
-syncronous draw mode or async
-One off screen buffer, with updates either copied or xblited
-Need to double buffer?
-
-
-async draw will require the refresh area to be cleared, because it will be
-xblited, but sync draw can just ignore it.
-
-sync
-draw
-
-CenterPrint ()
-SlowPrint ()
-Screen_Update ();
-Con_Printf ();
-
-net 
-turn off messages option
-
-the refresh is allways rendered, unless the console is full screen
-
-
-console is:
-	notify lines
-	half
-	full
-	
-
-*/
-
-
-int			glx, gly, glwidth, glheight;
-
-// only the refresh window will be updated unless these variables are flagged 
-int			scr_copytop;
-int			scr_copyeverything;
-
-float		scr_con_current;
-float		scr_conlines;		// lines of console to display
-
-float		oldscreensize, oldfov;
-cvar_t		scr_viewsize = {"viewsize","100", true};
-cvar_t		scr_fov = {"fov","90"};	// 10 - 170
-cvar_t		scr_conspeed = {"scr_conspeed","300"};
-cvar_t		scr_centertime = {"scr_centertime","2"};
-cvar_t		scr_showram = {"showram","1"};
-cvar_t		scr_showturtle = {"showturtle","0"};
-cvar_t		scr_showpause = {"showpause","1"};
-cvar_t		scr_printspeed = {"scr_printspeed","8"};
-cvar_t		gl_triplebuffer = {"gl_triplebuffer", "1", true };
-
-extern	cvar_t	crosshair;
-
-qboolean	scr_initialized;		// ready to draw
-
-qpic_t		*scr_ram;
-qpic_t		*scr_net;
-qpic_t		*scr_turtle;
-
-int			scr_fullupdate;
-
-int			clearconsole;
-int			clearnotify;
-
-int			sb_lines;
-
-viddef_t	vid;				// global video state
-
-vrect_t		scr_vrect;
-
-qboolean	scr_disabled_for_loading;
-qboolean	scr_drawloading;
-float		scr_disabled_time;
-
-qboolean	block_drawing;
-
-void SCR_ScreenShot_f (void);
-
-/*
-===============================================================================
-
-CENTER PRINTING
-
-===============================================================================
-*/
-
-char		scr_centerstring[1024];
-float		scr_centertime_start;	// for slow victory printing
-float		scr_centertime_off;
-int			scr_center_lines;
-int			scr_erase_lines;
-int			scr_erase_center;
-
-/*
-==============
-SCR_CenterPrint
-
-Called for important messages that should stay in the center of the screen
-for a few moments
-==============
-*/
-void SCR_CenterPrint (char *str)
-{
-	strncpy (scr_centerstring, str, sizeof(scr_centerstring)-1);
-	scr_centertime_off = scr_centertime.value;
-	scr_centertime_start = cl.time;
-
-// count the number of lines for centering
-	scr_center_lines = 1;
-	while (*str)
-	{
-		if (*str == '\n')
-			scr_center_lines++;
-		str++;
-	}
-}
-
-
-void SCR_DrawCenterString (void)
-{
-	char	*start;
-	int		l;
-	int		j;
-	int		x, y;
-	int		remaining;
-
-// the finale prints the characters one at a time
-	if (cl.intermission)
-		remaining = scr_printspeed.value * (cl.time - scr_centertime_start);
-	else
-		remaining = 9999;
-
-	scr_erase_center = 0;
-	start = scr_centerstring;
-
-	if (scr_center_lines <= 4)
-		y = vid.height*0.35;
-	else
-		y = 48;
-
-	do	
-	{
-	// scan the width of the line
-		for (l=0 ; l<40 ; l++)
-			if (start[l] == '\n' || !start[l])
-				break;
-		x = (vid.width - l*8)/2;
-		for (j=0 ; j<l ; j++, x+=8)
-		{
-			Draw_Character (x, y, start[j]);	
-			if (!remaining--)
-				return;
-		}
-			
-		y += 8;
-
-		while (*start && *start != '\n')
-			start++;
-
-		if (!*start)
-			break;
-		start++;		// skip the \n
-	} while (1);
-}
-
-void SCR_CheckDrawCenterString (void)
-{
-	scr_copytop = 1;
-	if (scr_center_lines > scr_erase_lines)
-		scr_erase_lines = scr_center_lines;
-
-	scr_centertime_off -= host_frametime;
-	
-	if (scr_centertime_off <= 0 && !cl.intermission)
-		return;
-	if (key_dest != key_game)
-		return;
-
-	SCR_DrawCenterString ();
-}
-
-//=============================================================================
-
-/*
-====================
-CalcFov
-====================
-*/
-float CalcFov (float fov_x, float width, float height)
-{
-        float   a;
-        float   x;
-
-        if (fov_x < 1 || fov_x > 179)
-                Sys_Error ("Bad fov: %f", fov_x);
-
-        x = width/tan(fov_x/360*M_PI);
-
-        a = atan (height/x);
-
-        a = a*360/M_PI;
-
-        return a;
-}
-
-/*
-=================
-SCR_CalcRefdef
-
-Must be called whenever vid changes
-Internal use only
-=================
-*/
-static void SCR_CalcRefdef (void)
-{
-	vrect_t		vrect;
-	float		size;
-	int		h;
-	qboolean		full = false;
-
-
-	scr_fullupdate = 0;		// force a background redraw
-	vid.recalc_refdef = 0;
-
-// force the status bar to redraw
-	Sbar_Changed ();
-
-//========================================
-	
-// bound viewsize
-	if (scr_viewsize.value < 30)
-		Cvar_Set ("viewsize","30");
-	if (scr_viewsize.value > 120)
-		Cvar_Set ("viewsize","120");
-
-// bound field of view
-	if (scr_fov.value < 10)
-		Cvar_Set ("fov","10");
-	if (scr_fov.value > 170)
-		Cvar_Set ("fov","170");
-
-// intermission is always full screen	
-	if (cl.intermission)
-		size = 120;
-	else
-		size = scr_viewsize.value;
-
-	if (size >= 120)
-		sb_lines = 0;		// no status bar at all
-	else if (size >= 110)
-		sb_lines = 24;		// no inventory
-	else
-		sb_lines = 24+16+8;
-
-	if (scr_viewsize.value >= 100.0) {
-		full = true;
-		size = 100.0;
-	} else
-		size = scr_viewsize.value;
-	if (cl.intermission)
-	{
-		full = true;
-		size = 100;
-		sb_lines = 0;
-	}
-	size /= 100.0;
-
-	h = vid.height - sb_lines;
-
-	r_refdef.vrect.width = vid.width * size;
-	if (r_refdef.vrect.width < 96)
-	{
-		size = 96.0 / r_refdef.vrect.width;
-		r_refdef.vrect.width = 96;	// min for icons
-	}
-
-	r_refdef.vrect.height = vid.height * size;
-	if (r_refdef.vrect.height > vid.height - sb_lines)
-		r_refdef.vrect.height = vid.height - sb_lines;
-	if (r_refdef.vrect.height > vid.height)
-			r_refdef.vrect.height = vid.height;
-	r_refdef.vrect.x = (vid.width - r_refdef.vrect.width)/2;
-	if (full)
-		r_refdef.vrect.y = 0;
-	else 
-		r_refdef.vrect.y = (h - r_refdef.vrect.height)/2;
-
-	r_refdef.fov_x = scr_fov.value;
-	r_refdef.fov_y = CalcFov (r_refdef.fov_x, r_refdef.vrect.width, r_refdef.vrect.height);
-
-	scr_vrect = r_refdef.vrect;
-}
-
-
-/*
-=================
-SCR_SizeUp_f
-
-Keybinding command
-=================
-*/
-void SCR_SizeUp_f (void)
-{
-	Cvar_SetValue ("viewsize",scr_viewsize.value+10);
-	vid.recalc_refdef = 1;
-}
-
-
-/*
-=================
-SCR_SizeDown_f
-
-Keybinding command
-=================
-*/
-void SCR_SizeDown_f (void)
-{
-	Cvar_SetValue ("viewsize",scr_viewsize.value-10);
-	vid.recalc_refdef = 1;
-}
-
-//============================================================================
-
-/*
-==================
-SCR_Init
-==================
-*/
-void SCR_Init (void)
-{
-
-	Cvar_RegisterVariable (&scr_fov);
-	Cvar_RegisterVariable (&scr_viewsize);
-	Cvar_RegisterVariable (&scr_conspeed);
-	Cvar_RegisterVariable (&scr_showram);
-	Cvar_RegisterVariable (&scr_showturtle);
-	Cvar_RegisterVariable (&scr_showpause);
-	Cvar_RegisterVariable (&scr_centertime);
-	Cvar_RegisterVariable (&scr_printspeed);
-	Cvar_RegisterVariable (&gl_triplebuffer);
-
-//
-// register our commands
-//
-	Cmd_AddCommand ("screenshot",SCR_ScreenShot_f);
-	Cmd_AddCommand ("sizeup",SCR_SizeUp_f);
-	Cmd_AddCommand ("sizedown",SCR_SizeDown_f);
-
-	scr_ram = Draw_PicFromWad ("ram");
-	scr_net = Draw_PicFromWad ("net");
-	scr_turtle = Draw_PicFromWad ("turtle");
-
-	scr_initialized = true;
-}
-
-
-
-/*
-==============
-SCR_DrawRam
-==============
-*/
-void SCR_DrawRam (void)
-{
-	if (!scr_showram.value)
-		return;
-
-	if (!r_cache_thrash)
-		return;
-
-	Draw_Pic (scr_vrect.x+32, scr_vrect.y, scr_ram);
-}
-
-/*
-==============
-SCR_DrawTurtle
-==============
-*/
-void SCR_DrawTurtle (void)
-{
-	static int	count;
-	
-	if (!scr_showturtle.value)
-		return;
-
-	if (host_frametime < 0.1)
-	{
-		count = 0;
-		return;
-	}
-
-	count++;
-	if (count < 3)
-		return;
-
-	Draw_Pic (scr_vrect.x, scr_vrect.y, scr_turtle);
-}
-
-/*
-==============
-SCR_DrawNet
-==============
-*/
-void SCR_DrawNet (void)
-{
-	if (realtime - cl.last_received_message < 0.3)
-		return;
-	if (cls.demoplayback)
-		return;
-
-	Draw_Pic (scr_vrect.x+64, scr_vrect.y, scr_net);
-}
-
-/*
-==============
-DrawPause
-==============
-*/
-void SCR_DrawPause (void)
-{
-	qpic_t	*pic;
-
-	if (!scr_showpause.value)		// turn off for screenshots
-		return;
-
-	if (!cl.paused)
-		return;
-
-	pic = Draw_CachePic ("gfx/pause.lmp");
-	Draw_Pic ( (vid.width - pic->width)/2, 
-		(vid.height - 48 - pic->height)/2, pic);
-}
-
-
-
-/*
-==============
-SCR_DrawLoading
-==============
-*/
-void SCR_DrawLoading (void)
-{
-	qpic_t	*pic;
-
-	if (!scr_drawloading)
-		return;
-		
-	pic = Draw_CachePic ("gfx/loading.lmp");
-	Draw_Pic ( (vid.width - pic->width)/2, 
-		(vid.height - 48 - pic->height)/2, pic);
-}
-
-
-
-//=============================================================================
-
-
-/*
-==================
-SCR_SetUpToDrawConsole
-==================
-*/
-void SCR_SetUpToDrawConsole (void)
-{
-	Con_CheckResize ();
-	
-	if (scr_drawloading)
-		return;		// never a console with loading plaque
-		
-// decide on the height of the console
-	con_forcedup = !cl.worldmodel || cls.signon != SIGNONS;
-
-	if (con_forcedup)
-	{
-		scr_conlines = vid.height;		// full screen
-		scr_con_current = scr_conlines;
-	}
-	else if (key_dest == key_console)
-		scr_conlines = vid.height/2;	// half screen
-	else
-		scr_conlines = 0;				// none visible
-	
-	if (scr_conlines < scr_con_current)
-	{
-		scr_con_current -= scr_conspeed.value*host_frametime;
-		if (scr_conlines > scr_con_current)
-			scr_con_current = scr_conlines;
-
-	}
-	else if (scr_conlines > scr_con_current)
-	{
-		scr_con_current += scr_conspeed.value*host_frametime;
-		if (scr_conlines < scr_con_current)
-			scr_con_current = scr_conlines;
-	}
-
-	if (clearconsole++ < vid.numpages)
-	{
-		Sbar_Changed ();
-	}
-	else if (clearnotify++ < vid.numpages)
-	{
-	}
-	else
-		con_notifylines = 0;
-}
-	
-/*
-==================
-SCR_DrawConsole
-==================
-*/
-void SCR_DrawConsole (void)
-{
-	if (scr_con_current)
-	{
-		scr_copyeverything = 1;
-		Con_DrawConsole (scr_con_current, true);
-		clearconsole = 0;
-	}
-	else
-	{
-		if (key_dest == key_game || key_dest == key_message)
-			Con_DrawNotify ();	// only draw notify in game
-	}
-}
-
-
-/* 
-============================================================================== 
- 
-						SCREEN SHOTS 
- 
-============================================================================== 
-*/ 
-
-typedef struct _TargaHeader {
-	unsigned char 	id_length, colormap_type, image_type;
-	unsigned short	colormap_index, colormap_length;
-	unsigned char	colormap_size;
-	unsigned short	x_origin, y_origin, width, height;
-	unsigned char	pixel_size, attributes;
-} TargaHeader;
-
-
-/* 
-================== 
-SCR_ScreenShot_f
-================== 
-*/  
-void SCR_ScreenShot_f (void) 
-{
-	byte		*buffer;
-	char		pcxname[80]; 
-	char		checkname[MAX_OSPATH];
-	int			i, c, temp;
-// 
-// find a file name to save it to 
-// 
-	strcpy(pcxname,"quake00.tga");
-		
-	for (i=0 ; i<=99 ; i++) 
-	{ 
-		pcxname[5] = i/10 + '0'; 
-		pcxname[6] = i%10 + '0'; 
-		sprintf (checkname, "%s/%s", com_gamedir, pcxname);
-		if (Sys_FileTime(checkname) == -1)
-			break;	// file doesn't exist
-	} 
-	if (i==100) 
-	{
-		Con_Printf ("SCR_ScreenShot_f: Couldn't create a PCX file\n"); 
-		return;
- 	}
-
-
-	buffer = malloc(glwidth*glheight*3 + 18);
-	memset (buffer, 0, 18);
-	buffer[2] = 2;		// uncompressed type
-	buffer[12] = glwidth&255;
-	buffer[13] = glwidth>>8;
-	buffer[14] = glheight&255;
-	buffer[15] = glheight>>8;
-	buffer[16] = 24;	// pixel size
-
-	glReadPixels (glx, gly, glwidth, glheight, GL_RGB, GL_UNSIGNED_BYTE, buffer+18 ); 
-
-	// swap rgb to bgr
-	c = 18+glwidth*glheight*3;
-	for (i=18 ; i<c ; i+=3)
-	{
-		temp = buffer[i];
-		buffer[i] = buffer[i+2];
-		buffer[i+2] = temp;
-	}
-	COM_WriteFile (pcxname, buffer, glwidth*glheight*3 + 18 );
-
-	free (buffer);
-	Con_Printf ("Wrote %s\n", pcxname);
-} 
-
-
-//=============================================================================
-
-
-/*
-===============
-SCR_BeginLoadingPlaque
-
-================
-*/
-void SCR_BeginLoadingPlaque (void)
-{
-	S_StopAllSounds (true);
-
-	if (cls.state != ca_connected)
-		return;
-	if (cls.signon != SIGNONS)
-		return;
-	
-// redraw with no console and the loading plaque
-	Con_ClearNotify ();
-	scr_centertime_off = 0;
-	scr_con_current = 0;
-
-	scr_drawloading = true;
-	scr_fullupdate = 0;
-	Sbar_Changed ();
-	SCR_UpdateScreen ();
-	scr_drawloading = false;
-
-	scr_disabled_for_loading = true;
-	scr_disabled_time = realtime;
-	scr_fullupdate = 0;
-}
-
-/*
-===============
-SCR_EndLoadingPlaque
-
-================
-*/
-void SCR_EndLoadingPlaque (void)
-{
-	scr_disabled_for_loading = false;
-	scr_fullupdate = 0;
-	Con_ClearNotify ();
-}
-
-//=============================================================================
-
-char	*scr_notifystring;
-qboolean	scr_drawdialog;
-
-void SCR_DrawNotifyString (void)
-{
-	char	*start;
-	int		l;
-	int		j;
-	int		x, y;
-
-	start = scr_notifystring;
-
-	y = vid.height*0.35;
-
-	do	
-	{
-	// scan the width of the line
-		for (l=0 ; l<40 ; l++)
-			if (start[l] == '\n' || !start[l])
-				break;
-		x = (vid.width - l*8)/2;
-		for (j=0 ; j<l ; j++, x+=8)
-			Draw_Character (x, y, start[j]);	
-			
-		y += 8;
-
-		while (*start && *start != '\n')
-			start++;
-
-		if (!*start)
-			break;
-		start++;		// skip the \n
-	} while (1);
-}
-
-/*
-==================
-SCR_ModalMessage
-
-Displays a text string in the center of the screen and waits for a Y or N
-keypress.  
-==================
-*/
-int SCR_ModalMessage (char *text)
-{
-	if (cls.state == ca_dedicated)
-		return true;
-
-	scr_notifystring = text;
- 
-// draw a fresh screen
-	scr_fullupdate = 0;
-	scr_drawdialog = true;
-	SCR_UpdateScreen ();
-	scr_drawdialog = false;
-	
-	S_ClearBuffer ();		// so dma doesn't loop current sound
-
-	do
-	{
-		key_count = -1;		// wait for a key down and up
-		Sys_SendKeyEvents ();
-	} while (key_lastpress != 'y' && key_lastpress != 'n' && key_lastpress != K_ESCAPE);
-
-	scr_fullupdate = 0;
-	SCR_UpdateScreen ();
-
-	return key_lastpress == 'y';
-}
-
-
-//=============================================================================
-
-/*
-===============
-SCR_BringDownConsole
-
-Brings the console down and fades the palettes back to normal
-================
-*/
-void SCR_BringDownConsole (void)
-{
-	int		i;
-	
-	scr_centertime_off = 0;
-	
-	for (i=0 ; i<20 && scr_conlines != scr_con_current ; i++)
-		SCR_UpdateScreen ();
-
-	cl.cshifts[0].percent = 0;		// no area contents palette on next frame
-	VID_SetPalette (host_basepal);
-}
-
-void SCR_TileClear (void)
-{
-	if (r_refdef.vrect.x > 0) {
-		// left
-		Draw_TileClear (0, 0, r_refdef.vrect.x, vid.height - sb_lines);
-		// right
-		Draw_TileClear (r_refdef.vrect.x + r_refdef.vrect.width, 0, 
-			vid.width - r_refdef.vrect.x + r_refdef.vrect.width, 
-			vid.height - sb_lines);
-	}
-	if (r_refdef.vrect.y > 0) {
-		// top
-		Draw_TileClear (r_refdef.vrect.x, 0, 
-			r_refdef.vrect.x + r_refdef.vrect.width, 
-			r_refdef.vrect.y);
-		// bottom
-		Draw_TileClear (r_refdef.vrect.x,
-			r_refdef.vrect.y + r_refdef.vrect.height, 
-			r_refdef.vrect.width, 
-			vid.height - sb_lines - 
-			(r_refdef.vrect.height + r_refdef.vrect.y));
-	}
-}
-
-/*
-==================
-SCR_UpdateScreen
-
-This is called every frame, and can also be called explicitly to flush
-text to the screen.
-
-WARNING: be very careful calling this from elsewhere, because the refresh
-needs almost the entire 256k of stack space!
-==================
-*/
-void SCR_UpdateScreen (void)
-{
-	static float	oldscr_viewsize;
-	vrect_t		vrect;
-
-	if (block_drawing)
-		return;
-
-	vid.numpages = 2 + gl_triplebuffer.value;
-
-	scr_copytop = 0;
-	scr_copyeverything = 0;
-
-	if (scr_disabled_for_loading)
-	{
-		if (realtime - scr_disabled_time > 60)
-		{
-			scr_disabled_for_loading = false;
-			Con_Printf ("load failed.\n");
-		}
-		else
-			return;
-	}
-
-	if (!scr_initialized || !con_initialized)
-		return;				// not initialized yet
-
-
-	GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
-	
-	//
-	// determine size of refresh window
-	//
-	if (oldfov != scr_fov.value)
-	{
-		oldfov = scr_fov.value;
-		vid.recalc_refdef = true;
-	}
-
-	if (oldscreensize != scr_viewsize.value)
-	{
-		oldscreensize = scr_viewsize.value;
-		vid.recalc_refdef = true;
-	}
-
-	if (vid.recalc_refdef)
-		SCR_CalcRefdef ();
-
-//
-// do 3D refresh drawing, and then update the screen
-//
-	SCR_SetUpToDrawConsole ();
-	
-	V_RenderView ();
-
-	GL_Set2D ();
-
-	//
-	// draw any areas not covered by the refresh
-	//
-	SCR_TileClear ();
-
-	if (scr_drawdialog)
-	{
-		Sbar_Draw ();
-		Draw_FadeScreen ();
-		SCR_DrawNotifyString ();
-		scr_copyeverything = true;
-	}
-	else if (scr_drawloading)
-	{
-		SCR_DrawLoading ();
-		Sbar_Draw ();
-	}
-	else if (cl.intermission == 1 && key_dest == key_game)
-	{
-		Sbar_IntermissionOverlay ();
-	}
-	else if (cl.intermission == 2 && key_dest == key_game)
-	{
-		Sbar_FinaleOverlay ();
-		SCR_CheckDrawCenterString ();
-	}
-	else
-	{
-		if (crosshair.value)
-			Draw_Character (scr_vrect.x + scr_vrect.width/2, scr_vrect.y + scr_vrect.height/2, '+');
-		
-		SCR_DrawRam ();
-		SCR_DrawNet ();
-		SCR_DrawTurtle ();
-		SCR_DrawPause ();
-		SCR_CheckDrawCenterString ();
-		Sbar_Draw ();
-		SCR_DrawConsole ();	
-		M_Draw ();
-	}
-
-	V_UpdatePalette ();
-
-	GL_EndRendering ();
-}
-
--- a/u/gl_test.c
+++ /dev/null
@@ -1,182 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-
-#ifdef GLTEST
-
-typedef struct
-{
-	plane_t	*plane;
-	vec3_t	origin;
-	vec3_t	normal;
-	vec3_t	up;
-	vec3_t	right;
-	vec3_t	reflect;
-	float	length;
-} puff_t;
-
-#define	MAX_PUFFS	64
-
-puff_t	puffs[MAX_PUFFS];
-
-
-void Test_Init (void)
-{
-}
-
-
-
-plane_t	junk;
-plane_t	*HitPlane (vec3_t start, vec3_t end)
-{
-	trace_t		trace;
-
-// fill in a default trace
-	memset (&trace, 0, sizeof(trace_t));
-	trace.fraction = 1;
-	trace.allsolid = true;
-	VectorCopy (end, trace.endpos);
-
-	SV_RecursiveHullCheck (cl.worldmodel->hulls, 0, 0, 1, start, end, &trace);
-
-	junk = trace.plane;
-	return &junk;
-}
-
-void Test_Spawn (vec3_t origin)
-{
-	int		i;
-	puff_t	*p;
-	vec3_t	temp;
-	vec3_t	normal;
-	vec3_t	incoming;
-	plane_t	*plane;
-	float	d;
-
-	for (i=0,p=puffs ; i<MAX_PUFFS ; i++,p++)
-	{
-		if (p->length <= 0)
-			break;
-	}
-	if (i == MAX_PUFFS)
-		return;
-
-	VectorSubtract (r_refdef.vieworg, origin, incoming);
-	VectorSubtract (origin, incoming, temp);
-	plane = HitPlane (r_refdef.vieworg, temp);
-
-	VectorNormalize (incoming);
-	d = DotProduct (incoming, plane->normal);
-	VectorSubtract (vec3_origin, incoming, p->reflect);
-	VectorMA (p->reflect, d*2, plane->normal, p->reflect);
-
-	VectorCopy (origin, p->origin);
-	VectorCopy (plane->normal, p->normal);
-
-	CrossProduct (incoming, p->normal, p->up);
-
-	CrossProduct (p->up, p->normal, p->right);
-
-	p->length = 8;
-}
-
-void DrawPuff (puff_t *p)
-{
-	vec3_t	pts[2][3];
-	int		i, j;
-	float	s, d;
-
-	for (i=0 ; i<2 ; i++)
-	{
-		if (i == 1)
-		{
-			s = 6;
-			d = p->length;
-		}
-		else
-		{
-			s = 2;
-			d = 0;
-		}
-
-		for (j=0 ; j<3 ; j++)
-		{
-			pts[i][0][j] = p->origin[j] + p->up[j]*s + p->reflect[j]*d;
-			pts[i][1][j] = p->origin[j] + p->right[j]*s + p->reflect[j]*d;
-			pts[i][2][j] = p->origin[j] + -p->right[j]*s + p->reflect[j]*d;
-		}
-	}
-
-	glColor3f (1, 0, 0);
-
-#if 0
-	glBegin (GL_LINES);
-	glVertex3fv (p->origin);
-	glVertex3f (p->origin[0] + p->length*p->reflect[0],
-		p->origin[1] + p->length*p->reflect[1],
-		p->origin[2] + p->length*p->reflect[2]);
-
-	glVertex3fv (pts[0][0]);
-	glVertex3fv (pts[1][0]);
-
-	glVertex3fv (pts[0][1]);
-	glVertex3fv (pts[1][1]);
-
-	glVertex3fv (pts[0][2]);
-	glVertex3fv (pts[1][2]);
-
-	glEnd ();
-#endif
-
-	glBegin (GL_QUADS);
-	for (i=0 ; i<3 ; i++)
-	{
-		j = (i+1)%3;
-		glVertex3fv (pts[0][j]);
-		glVertex3fv (pts[1][j]);
-		glVertex3fv (pts[1][i]);
-		glVertex3fv (pts[0][i]);
-	}
-	glEnd ();
-
-	glBegin (GL_TRIANGLES);
-	glVertex3fv (pts[1][0]);
-	glVertex3fv (pts[1][1]);
-	glVertex3fv (pts[1][2]);
-	glEnd ();
-
-	p->length -= host_frametime*2;
-}
-
-
-void Test_Draw (void)
-{
-	int		i;
-	puff_t	*p;
-
-	for (i=0, p=puffs ; i<MAX_PUFFS ; i++,p++)
-	{
-		if (p->length > 0)
-			DrawPuff (p);
-	}
-}
-
-#endif
--- a/u/gl_vidlinux.c
+++ /dev/null
@@ -1,866 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <termios.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/vt.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <signal.h>
-
-#include <asm/io.h>
-#include <dlfcn.h>
-
-/*#include "vga.h" */
-#include "vgakeyboard.h"
-#include "vgamouse.h"
-
-#include "quakedef.h"
-#include "GL/fxmesa.h"
-
-#define WARP_WIDTH              320
-#define WARP_HEIGHT             200
-
-static fxMesaContext fc = NULL;
-#define stringify(m) { #m, m }
-
-unsigned short	d_8to16table[256];
-unsigned	d_8to24table[256];
-unsigned char d_15to8table[65536];
-
-int num_shades=32;
-
-struct
-{
-	char *name;
-	int num;
-} mice[] =
-{
-	stringify(MOUSE_MICROSOFT),
-	stringify(MOUSE_MOUSESYSTEMS),
-	stringify(MOUSE_MMSERIES),
-	stringify(MOUSE_LOGITECH),
-	stringify(MOUSE_BUSMOUSE),
-	stringify(MOUSE_PS2),
-};
-
-static unsigned char scantokey[128];
-
-int num_mice = sizeof (mice) / sizeof(mice[0]);
-
-int	d_con_indirect = 0;
-
-int		svgalib_inited=0;
-int		UseMouse = 1;
-int		UseKeyboard = 1;
-
-int		mouserate = MOUSE_DEFAULTSAMPLERATE;
-
-cvar_t		vid_mode = {"vid_mode","5",false};
-cvar_t		vid_redrawfull = {"vid_redrawfull","0",false};
-cvar_t		vid_waitforrefresh = {"vid_waitforrefresh","0",true};
- 
-char	*framebuffer_ptr;
-
-cvar_t  mouse_button_commands[3] =
-{
-    {"mouse1","+attack"},
-    {"mouse2","+strafe"},
-    {"mouse3","+forward"},
-};
-
-int     mouse_buttons;
-int     mouse_buttonstate;
-int     mouse_oldbuttonstate;
-float   mouse_x, mouse_y;
-float	old_mouse_x, old_mouse_y;
-int		mx, my;
-
-cvar_t	m_filter = {"m_filter","1"};
-
-int scr_width, scr_height;
-
-/*-----------------------------------------------------------------------*/
-
-//int		texture_mode = GL_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_LINEAR;
-int		texture_mode = GL_LINEAR;
-//int		texture_mode = GL_LINEAR_MIPMAP_NEAREST;
-//int		texture_mode = GL_LINEAR_MIPMAP_LINEAR;
-
-int		texture_extension_number = 1;
-
-float		gldepthmin, gldepthmax;
-
-cvar_t	gl_ztrick = {"gl_ztrick","1"};
-
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
-
-void (*qgl3DfxSetPaletteEXT) (GLuint *);
-void (*qglColorTableEXT) (int, int, int, int, int, const void *);
-
-static float vid_gamma = 1.0;
-
-qboolean is8bit = false;
-qboolean isPermedia = false;
-qboolean gl_mtexable = false;
-
-/*-----------------------------------------------------------------------*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-}
-
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-}
-
-int matchmouse(int mouse, char *name)
-{
-	int i;
-	for (i=0 ; i<num_mice ; i++)
-		if (!strcmp(mice[i].name, name))
-			return i;
-	return mouse;
-}
-
-#if 0
-
-void vtswitch(int newconsole)
-{
-
-	int fd;
-	struct vt_stat x;
-
-// switch consoles and wait until reactivated
-	fd = open("/dev/console", O_RDONLY);
-	ioctl(fd, VT_GETSTATE, &x);
-	ioctl(fd, VT_ACTIVATE, newconsole);
-	ioctl(fd, VT_WAITACTIVE, x.v_active);
-	close(fd);
-
-}
-
-#endif
-
-void keyhandler(int scancode, int state)
-{
-	
-	int sc;
-
-	sc = scancode & 0x7f;
-
-	Key_Event(scantokey[sc], state == KEY_EVENTPRESS);
-
-}
-
-void VID_Shutdown(void)
-{
-	if (!fc)
-		return;
-
-	fxMesaDestroyContext(fc);
-
-	if (UseKeyboard)
-		keyboard_close();
-}
-
-void signal_handler(int sig)
-{
-	printf("Received signal %d, exiting...\n", sig);
-	Sys_Quit();
-	exit(0);
-}
-
-void InitSig(void)
-{
-	signal(SIGHUP, signal_handler);
-	signal(SIGINT, signal_handler);
-	signal(SIGQUIT, signal_handler);
-	signal(SIGILL, signal_handler);
-	signal(SIGTRAP, signal_handler);
-	signal(SIGIOT, signal_handler);
-	signal(SIGBUS, signal_handler);
-	signal(SIGFPE, signal_handler);
-	signal(SIGSEGV, signal_handler);
-	signal(SIGTERM, signal_handler);
-}
-
-void VID_ShiftPalette(unsigned char *p)
-{
-//	VID_SetPalette(p);
-}
-
-void	VID_SetPalette (unsigned char *palette)
-{
-	byte	*pal;
-	unsigned r,g,b;
-	unsigned v;
-	int     r1,g1,b1;
-	int		j,k,l,m;
-	unsigned short i;
-	unsigned	*table;
-	FILE *f;
-	char s[255];
-	int dist, bestdist;
-	static qboolean palflag = false;
-
-//
-// 8 8 8 encoding
-//
-	pal = palette;
-	table = d_8to24table;
-	for (i=0 ; i<256 ; i++)
-	{
-		r = pal[0];
-		g = pal[1];
-		b = pal[2];
-		pal += 3;
-		
-		v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
-		*table++ = v;
-	}
-	d_8to24table[255] &= 0xffffff;	// 255 is transparent
-
-	// JACK: 3D distance calcs - k is last closest, l is the distance.
-	for (i=0; i < (1<<15); i++) {
-		/* Maps
-		000000000000000
-		000000000011111 = Red  = 0x1F
-		000001111100000 = Blue = 0x03E0
-		111110000000000 = Grn  = 0x7C00
-		*/
-		r = ((i & 0x1F) << 3)+4;
-		g = ((i & 0x03E0) >> 2)+4;
-		b = ((i & 0x7C00) >> 7)+4;
-		pal = (unsigned char *)d_8to24table;
-		for (v=0,k=0,bestdist=10000*10000; v<256; v++,pal+=4) {
-			r1 = (int)r - (int)pal[0];
-			g1 = (int)g - (int)pal[1];
-			b1 = (int)b - (int)pal[2];
-			dist = (r1*r1)+(g1*g1)+(b1*b1);
-			if (dist < bestdist) {
-				k=v;
-				bestdist = dist;
-			}
-		}
-		d_15to8table[i]=k;
-	}
-}
-
-void CheckMultiTextureExtensions(void) 
-{
-	void *prjobj;
-
-	if (strstr(gl_extensions, "GL_SGIS_multitexture ") && !COM_CheckParm("-nomtex")) {
-		Con_Printf("Found GL_SGIS_multitexture...\n");
-
-		if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) {
-			Con_Printf("Unable to open symbol list for main program.\n");
-			return;
-		}
-
-		qglMTexCoord2fSGIS = (void *) dlsym(prjobj, "glMTexCoord2fSGIS");
-		qglSelectTextureSGIS = (void *) dlsym(prjobj, "glSelectTextureSGIS");
-
-		if (qglMTexCoord2fSGIS && qglSelectTextureSGIS) {
-			Con_Printf("Multitexture extensions found.\n");
-			gl_mtexable = true;
-		} else
-			Con_Printf("Symbol not found, disabled.\n");
-
-		dlclose(prjobj);
-	}
-}
-
-/*
-===============
-GL_Init
-===============
-*/
-void GL_Init (void)
-{
-	gl_vendor = glGetString (GL_VENDOR);
-	Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
-	gl_renderer = glGetString (GL_RENDERER);
-	Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
-	gl_version = glGetString (GL_VERSION);
-	Con_Printf ("GL_VERSION: %s\n", gl_version);
-	gl_extensions = glGetString (GL_EXTENSIONS);
-	Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-
-//	Con_Printf ("%s %s\n", gl_renderer, gl_version);
-
-	CheckMultiTextureExtensions ();
-
-	glClearColor (1,0,0,0);
-	glCullFace(GL_FRONT);
-	glEnable(GL_TEXTURE_2D);
-
-	glEnable(GL_ALPHA_TEST);
-	glAlphaFunc(GL_GREATER, 0.666);
-
-	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-	glShadeModel (GL_FLAT);
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-//	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-}
-
-/*
-=================
-GL_BeginRendering
-
-=================
-*/
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
-{
-	extern cvar_t gl_clear;
-
-	*x = *y = 0;
-	*width = scr_width;
-	*height = scr_height;
-
-//    if (!wglMakeCurrent( maindc, baseRC ))
-//		Sys_Error ("wglMakeCurrent failed");
-
-//	glViewport (*x, *y, *width, *height);
-}
-
-
-void GL_EndRendering (void)
-{
-	glFlush();
-	fxMesaSwapBuffers();
-}
-
-void Init_KBD(void)
-{
-	int i;
-
-	if (COM_CheckParm("-nokbd")) UseKeyboard = 0;
-
-	if (UseKeyboard)
-	{
-		for (i=0 ; i<128 ; i++)
-			scantokey[i] = ' ';
-
-		scantokey[42] = K_SHIFT;
-		scantokey[54] = K_SHIFT;
-		scantokey[72] = K_UPARROW;
-		scantokey[103] = K_UPARROW;
-		scantokey[80] = K_DOWNARROW;
-		scantokey[108] = K_DOWNARROW;
-		scantokey[75] = K_LEFTARROW;
-		scantokey[105] = K_LEFTARROW;
-		scantokey[77] = K_RIGHTARROW;
-		scantokey[106] = K_RIGHTARROW;
-		scantokey[29] = K_CTRL;
-		scantokey[97] = K_CTRL;
-		scantokey[56] = K_ALT;
-		scantokey[100] = K_ALT;
-//		scantokey[58] = JK_CAPS;
-//		scantokey[69] = JK_NUM_LOCK;
-		scantokey[71] = K_HOME;
-		scantokey[73] = K_PGUP;
-		scantokey[79] = K_END;
-		scantokey[81] = K_PGDN;
-		scantokey[82] = K_INS;
-		scantokey[83] = K_DEL;
-		scantokey[1 ] = K_ESCAPE;
-		scantokey[28] = K_ENTER;
-		scantokey[15] = K_TAB;
-		scantokey[14] = K_BACKSPACE;
-		scantokey[119] = K_PAUSE;
-		scantokey[57] = ' ';
-
-		scantokey[102] = K_HOME;
-		scantokey[104] = K_PGUP;
-		scantokey[107] = K_END;
-		scantokey[109] = K_PGDN;
-		scantokey[110] = K_INS;
-		scantokey[111] = K_DEL;
-
-		scantokey[2] = '1';
-		scantokey[3] = '2';
-		scantokey[4] = '3';
-		scantokey[5] = '4';
-		scantokey[6] = '5';
-		scantokey[7] = '6';
-		scantokey[8] = '7';
-		scantokey[9] = '8';
-		scantokey[10] = '9';
-		scantokey[11] = '0';
-		scantokey[12] = '-';
-		scantokey[13] = '=';
-		scantokey[41] = '`';
-		scantokey[26] = '[';
-		scantokey[27] = ']';
-		scantokey[39] = ';';
-		scantokey[40] = '\'';
-		scantokey[51] = ',';
-		scantokey[52] = '.';
-		scantokey[53] = '/';
-		scantokey[43] = '\\';
-
-		scantokey[59] = K_F1;
-		scantokey[60] = K_F2;
-		scantokey[61] = K_F3;
-		scantokey[62] = K_F4;
-		scantokey[63] = K_F5;
-		scantokey[64] = K_F6;
-		scantokey[65] = K_F7;
-		scantokey[66] = K_F8;
-		scantokey[67] = K_F9;
-		scantokey[68] = K_F10;
-		scantokey[87] = K_F11;
-		scantokey[88] = K_F12;
-		scantokey[30] = 'a';
-		scantokey[48] = 'b';
-		scantokey[46] = 'c';
-		scantokey[32] = 'd';       
-		scantokey[18] = 'e';       
-		scantokey[33] = 'f';       
-		scantokey[34] = 'g';       
-		scantokey[35] = 'h';       
-		scantokey[23] = 'i';       
-		scantokey[36] = 'j';       
-		scantokey[37] = 'k';       
-		scantokey[38] = 'l';       
-		scantokey[50] = 'm';       
-		scantokey[49] = 'n';       
-		scantokey[24] = 'o';       
-		scantokey[25] = 'p';       
-		scantokey[16] = 'q';       
-		scantokey[19] = 'r';       
-		scantokey[31] = 's';       
-		scantokey[20] = 't';       
-		scantokey[22] = 'u';       
-		scantokey[47] = 'v';       
-		scantokey[17] = 'w';       
-		scantokey[45] = 'x';       
-		scantokey[21] = 'y';       
-		scantokey[44] = 'z';       
-
-		scantokey[78] = '+';
-		scantokey[74] = '-';
-
-		if (keyboard_init())
-			Sys_Error("keyboard_init() failed");
-		keyboard_seteventhandler(keyhandler);
-	}
-}
-
-#define NUM_RESOLUTIONS 16
-
-static int resolutions[NUM_RESOLUTIONS][3]={ 
-	320,200,  GR_RESOLUTION_320x200,
-	320,240,  GR_RESOLUTION_320x240,
-	400,256,  GR_RESOLUTION_400x256,
-	400,300,  GR_RESOLUTION_400x300,
-	512,384,  GR_RESOLUTION_512x384,
-	640,200,  GR_RESOLUTION_640x200,
-	640,350,  GR_RESOLUTION_640x350,
-	640,400,  GR_RESOLUTION_640x400,
-	640,480,  GR_RESOLUTION_640x480,
-	800,600,  GR_RESOLUTION_800x600,
-	960,720,  GR_RESOLUTION_960x720,
-	856,480,  GR_RESOLUTION_856x480,
-	512,256,  GR_RESOLUTION_512x256,
-	1024,768, GR_RESOLUTION_1024x768,
-	1280,1024,GR_RESOLUTION_1280x1024,
-	1600,1200,GR_RESOLUTION_1600x1200
-};
-
-int findres(int *width, int *height)
-{
-	int i;
-
-	for(i=0;i<NUM_RESOLUTIONS;i++)
-		if((*width<=resolutions[i][0]) && (*height<=resolutions[i][1])) {
-			*width = resolutions[i][0];
-			*height = resolutions[i][1];
-			return resolutions[i][2];
-		}
-        
-	*width = 640;
-	*height = 480;
-	return GR_RESOLUTION_640x480;
-}
-
-qboolean VID_Is8bit(void)
-{
-	return is8bit;
-}
-
-void VID_Init8bitPalette(void) 
-{
-	// Check for 8bit Extensions and initialize them.
-	int i;
-	void *prjobj;
-
-	if (COM_CheckParm("-no8bit"))
-		return;
-
-	if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) {
-		Con_Printf("Unable to open symbol list for main program.\n");
-		return;
-	}
-
-	if (strstr(gl_extensions, "3DFX_set_global_palette") &&
-		(qgl3DfxSetPaletteEXT = dlsym(prjobj, "gl3DfxSetPaletteEXT")) != NULL) {
-		GLubyte table[256][4];
-		char *oldpal;
-
-		Con_SafePrintf("... Using 3DFX_set_global_palette\n");
-		glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-		oldpal = (char *) d_8to24table; //d_8to24table3dfx;
-		for (i=0;i<256;i++) {
-			table[i][2] = *oldpal++;
-			table[i][1] = *oldpal++;
-			table[i][0] = *oldpal++;
-			table[i][3] = 255;
-			oldpal++;
-		}
-		qgl3DfxSetPaletteEXT((GLuint *)table);
-		is8bit = true;
-
-	} else if (strstr(gl_extensions, "GL_EXT_shared_texture_palette") &&
-		(qglColorTableEXT = dlsym(prjobj, "glColorTableEXT")) != NULL) {
-		char thePalette[256*3];
-		char *oldPalette, *newPalette;
-
-		Con_SafePrintf("... Using GL_EXT_shared_texture_palette\n");
-		glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-		oldPalette = (char *) d_8to24table; //d_8to24table3dfx;
-		newPalette = thePalette;
-		for (i=0;i<256;i++) {
-			*newPalette++ = *oldPalette++;
-			*newPalette++ = *oldPalette++;
-			*newPalette++ = *oldPalette++;
-			oldPalette++;
-		}
-		qglColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
-		is8bit = true;
-	
-	}
-
-	dlclose(prjobj);
-}
-
-static void Check_Gamma (unsigned char *pal)
-{
-	float	f, inf;
-	unsigned char	palette[768];
-	int		i;
-
-	if ((i = COM_CheckParm("-gamma")) == 0) {
-		if ((gl_renderer && strstr(gl_renderer, "Voodoo")) ||
-			(gl_vendor && strstr(gl_vendor, "3Dfx")))
-			vid_gamma = 1;
-		else
-			vid_gamma = 0.7; // default to 0.7 on non-3dfx hardware
-	} else
-		vid_gamma = Q_atof(com_argv[i+1]);
-
-	for (i=0 ; i<768 ; i++)
-	{
-		f = pow ( (pal[i]+1)/256.0 , vid_gamma );
-		inf = f*255 + 0.5;
-		if (inf < 0)
-			inf = 0;
-		if (inf > 255)
-			inf = 255;
-		palette[i] = inf;
-	}
-
-	memcpy (pal, palette, sizeof(palette));
-}
-
-void VID_Init(unsigned char *palette)
-{
-	int i;
-	GLint attribs[32];
-	char	gldir[MAX_OSPATH];
-	int width = 640, height = 480;
-
-	Init_KBD();
-
-	Cvar_RegisterVariable (&vid_mode);
-	Cvar_RegisterVariable (&vid_redrawfull);
-	Cvar_RegisterVariable (&vid_waitforrefresh);
-	Cvar_RegisterVariable (&gl_ztrick);
-	
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.colormap = host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-
-// interpret command-line params
-
-// set vid parameters
-	attribs[0] = FXMESA_DOUBLEBUFFER;
-	attribs[1] = FXMESA_ALPHA_SIZE;
-	attribs[2] = 1;
-	attribs[3] = FXMESA_DEPTH_SIZE;
-	attribs[4] = 1;
-	attribs[5] = FXMESA_NONE;
-
-	if ((i = COM_CheckParm("-width")) != 0)
-		width = atoi(com_argv[i+1]);
-	if ((i = COM_CheckParm("-height")) != 0)
-		height = atoi(com_argv[i+1]);
-
-	if ((i = COM_CheckParm("-conwidth")) != 0)
-		vid.conwidth = Q_atoi(com_argv[i+1]);
-	else
-		vid.conwidth = 640;
-
-	vid.conwidth &= 0xfff8; // make it a multiple of eight
-
-	if (vid.conwidth < 320)
-		vid.conwidth = 320;
-
-	// pick a conheight that matches with correct aspect
-	vid.conheight = vid.conwidth*3 / 4;
-
-	if ((i = COM_CheckParm("-conheight")) != 0)
-		vid.conheight = Q_atoi(com_argv[i+1]);
-	if (vid.conheight < 200)
-		vid.conheight = 200;
-
-	fc = fxMesaCreateContext(0, findres(&width, &height), GR_REFRESH_75Hz, 
-		attribs);
-	if (!fc)
-		Sys_Error("Unable to create 3DFX context.\n");
-
-	InitSig(); // trap evil signals
-
-	scr_width = width;
-	scr_height = height;
-
-	fxMesaMakeCurrent(fc);
-
-	if (vid.conheight > height)
-		vid.conheight = height;
-	if (vid.conwidth > width)
-		vid.conwidth = width;
-	vid.width = vid.conwidth;
-	vid.height = vid.conheight;
-
-	vid.aspect = ((float)vid.height / (float)vid.width) *
-				(320.0 / 240.0);
-	vid.numpages = 2;
-
-	GL_Init();
-
-	sprintf (gldir, "%s/glquake", com_gamedir);
-	Sys_mkdir (gldir);
-
-	Check_Gamma(palette);
-	VID_SetPalette(palette);
-
-	// Check for 3DFX Extensions and initialize them.
-	VID_Init8bitPalette();
-
-	Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
-
-	vid.recalc_refdef = 1;				// force a surface cache flush
-}
-
-void Sys_SendKeyEvents(void)
-{
-	if (UseKeyboard)
-		while (keyboard_update());
-}
-
-void Force_CenterView_f (void)
-{
-	cl.viewangles[PITCH] = 0;
-}
-
-
-void mousehandler(int buttonstate, int dx, int dy)
-{
-	mouse_buttonstate = buttonstate;
-	mx += dx;
-	my += dy;
-}
-
-void IN_Init(void)
-{
-
-	int mtype;
-	char *mousedev;
-	int mouserate;
-
-	if (UseMouse)
-	{
-
-		Cvar_RegisterVariable (&mouse_button_commands[0]);
-		Cvar_RegisterVariable (&mouse_button_commands[1]);
-		Cvar_RegisterVariable (&mouse_button_commands[2]);
-		Cmd_AddCommand ("force_centerview", Force_CenterView_f);
-
-		mouse_buttons = 3;
-
-		mtype = vga_getmousetype();
-
-		mousedev = "/dev/mouse";
-		if (getenv("MOUSEDEV")) mousedev = getenv("MOUSEDEV");
-		if (COM_CheckParm("-mdev"))
-			mousedev = com_argv[COM_CheckParm("-mdev")+1];
-
-		mouserate = 1200;
-		if (getenv("MOUSERATE")) mouserate = atoi(getenv("MOUSERATE"));
-		if (COM_CheckParm("-mrate"))
-			mouserate = atoi(com_argv[COM_CheckParm("-mrate")+1]);
-
-		if (mouse_init(mousedev, mtype, mouserate))
-		{
-			Con_Printf("No mouse found\n");
-			UseMouse = 0;
-		}
-		else
-			mouse_seteventhandler(mousehandler);
-
-	}
-
-}
-
-void IN_Shutdown(void)
-{
-	if (UseMouse)
-		mouse_close();
-}
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-	if (UseMouse && cls.state != ca_dedicated)
-	{
-		// poll mouse values
-		while (mouse_update())
-			;
-
-		// perform button actions
-		if ((mouse_buttonstate & MOUSE_LEFTBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_LEFTBUTTON))
-			Key_Event (K_MOUSE1, true);
-		else if (!(mouse_buttonstate & MOUSE_LEFTBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_LEFTBUTTON))
-			Key_Event (K_MOUSE1, false);
-
-		if ((mouse_buttonstate & MOUSE_RIGHTBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_RIGHTBUTTON))
-			Key_Event (K_MOUSE2, true);
-		else if (!(mouse_buttonstate & MOUSE_RIGHTBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_RIGHTBUTTON))
-			Key_Event (K_MOUSE2, false);
-
-		if ((mouse_buttonstate & MOUSE_MIDDLEBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_MIDDLEBUTTON))
-			Key_Event (K_MOUSE3, true);
-		else if (!(mouse_buttonstate & MOUSE_MIDDLEBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_MIDDLEBUTTON))
-			Key_Event (K_MOUSE3, false);
-
-		mouse_oldbuttonstate = mouse_buttonstate;
-	}
-}
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-	if (!UseMouse)
-		return;
-
-	// poll mouse values
-	while (mouse_update())
-		;
-
-	if (m_filter.value)
-	{
-		mouse_x = (mx + old_mouse_x) * 0.5;
-		mouse_y = (my + old_mouse_y) * 0.5;
-	}
-	else
-	{
-		mouse_x = mx;
-		mouse_y = my;
-	}
-	old_mouse_x = mx;
-	old_mouse_y = my;
-	mx = my = 0; // clear for next update
-
-	mouse_x *= sensitivity.value;
-	mouse_y *= sensitivity.value;
-
-// add mouse X/Y movement to cmd
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mouse_x;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-	
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-		
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
-	{
-		cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	}
-	else
-	{
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * mouse_y;
-		else
-			cmd->forwardmove -= m_forward.value * mouse_y;
-	}
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-	IN_MouseMove(cmd);
-}
-
-
--- a/u/gl_vidlinuxglx.c
+++ /dev/null
@@ -1,997 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <termios.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/vt.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <signal.h>
-
-#include <dlfcn.h>
-
-#include "quakedef.h"
-
-#include <GL/glx.h>
-
-#include <X11/keysym.h>
-#include <X11/cursorfont.h>
-
-#include <X11/extensions/xf86dga.h>
-#include <X11/extensions/xf86vmode.h>
-
-#define WARP_WIDTH              320
-#define WARP_HEIGHT             200
-
-static Display *dpy = NULL;
-static int scrnum;
-static Window win;
-static GLXContext ctx = NULL;
-
-#define KEY_MASK (KeyPressMask | KeyReleaseMask)
-#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
-		    PointerMotionMask | ButtonMotionMask )
-#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask )
-
-
-unsigned short	d_8to16table[256];
-unsigned		d_8to24table[256];
-unsigned char	d_15to8table[65536];
-
-cvar_t	vid_mode = {"vid_mode","0",false};
- 
-static qboolean        mouse_avail;
-static qboolean        mouse_active;
-static int   mx, my;
-static int	old_mouse_x, old_mouse_y;
-
-static cvar_t in_mouse = {"in_mouse", "1", false};
-static cvar_t in_dgamouse = {"in_dgamouse", "1", false};
-static cvar_t m_filter = {"m_filter", "0"};
-
-qboolean dgamouse = false;
-qboolean vidmode_ext = false;
-
-static int win_x, win_y;
-
-static int scr_width, scr_height;
-
-static XF86VidModeModeInfo **vidmodes;
-static int default_dotclock_vidmode;
-static int num_vidmodes;
-static qboolean vidmode_active = false;
-
-/*-----------------------------------------------------------------------*/
-
-//int		texture_mode = GL_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_LINEAR;
-int		texture_mode = GL_LINEAR;
-//int		texture_mode = GL_LINEAR_MIPMAP_NEAREST;
-//int		texture_mode = GL_LINEAR_MIPMAP_LINEAR;
-
-int		texture_extension_number = 1;
-
-float		gldepthmin, gldepthmax;
-
-cvar_t	gl_ztrick = {"gl_ztrick","1"};
-
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
-
-void (*qglColorTableEXT) (int, int, int, int, int, const void*);
-void (*qgl3DfxSetPaletteEXT) (GLuint *);
-
-static float vid_gamma = 1.0;
-
-qboolean is8bit = false;
-qboolean isPermedia = false;
-qboolean gl_mtexable = false;
-
-/*-----------------------------------------------------------------------*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-}
-
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-}
-
-static int XLateKey(XKeyEvent *ev)
-{
-
-	int key;
-	char buf[64];
-	KeySym keysym;
-
-	key = 0;
-
-	XLookupString(ev, buf, sizeof buf, &keysym, 0);
-
-	switch(keysym)
-	{
-		case XK_KP_Page_Up:	 
-		case XK_Page_Up:	 key = K_PGUP; break;
-
-		case XK_KP_Page_Down: 
-		case XK_Page_Down:	 key = K_PGDN; break;
-
-		case XK_KP_Home: 
-		case XK_Home:	 key = K_HOME; break;
-
-		case XK_KP_End:  
-		case XK_End:	 key = K_END; break;
-
-		case XK_KP_Left: 
-		case XK_Left:	 key = K_LEFTARROW; break;
-
-		case XK_KP_Right: 
-		case XK_Right:	key = K_RIGHTARROW;		break;
-
-		case XK_KP_Down: 
-		case XK_Down:	 key = K_DOWNARROW; break;
-
-		case XK_KP_Up:   
-		case XK_Up:		 key = K_UPARROW;	 break;
-
-		case XK_Escape: key = K_ESCAPE;		break;
-
-		case XK_KP_Enter: 
-		case XK_Return: key = K_ENTER;		 break;
-
-		case XK_Tab:		key = K_TAB;			 break;
-
-		case XK_F1:		 key = K_F1;				break;
-
-		case XK_F2:		 key = K_F2;				break;
-
-		case XK_F3:		 key = K_F3;				break;
-
-		case XK_F4:		 key = K_F4;				break;
-
-		case XK_F5:		 key = K_F5;				break;
-
-		case XK_F6:		 key = K_F6;				break;
-
-		case XK_F7:		 key = K_F7;				break;
-
-		case XK_F8:		 key = K_F8;				break;
-
-		case XK_F9:		 key = K_F9;				break;
-
-		case XK_F10:		key = K_F10;			 break;
-
-		case XK_F11:		key = K_F11;			 break;
-
-		case XK_F12:		key = K_F12;			 break;
-
-		case XK_BackSpace: key = K_BACKSPACE; break;
-
-		case XK_KP_Delete: 
-		case XK_Delete: key = K_DEL; break;
-
-		case XK_Pause:	key = K_PAUSE;		 break;
-
-		case XK_Shift_L:
-		case XK_Shift_R:	key = K_SHIFT;		break;
-
-		case XK_Execute: 
-		case XK_Control_L: 
-		case XK_Control_R:	key = K_CTRL;		 break;
-
-		case XK_Alt_L:	
-		case XK_Meta_L: 
-		case XK_Alt_R:	
-		case XK_Meta_R: key = K_ALT;			break;
-
-		case XK_KP_Begin: key = '5';	break;
-
-		case XK_KP_Insert: 
-		case XK_Insert:key = K_INS; break;
-
-		case XK_KP_Multiply: key = '*'; break;
-		case XK_KP_Add:  key = '+'; break;
-		case XK_KP_Subtract: key = '-'; break;
-		case XK_KP_Divide: key = '/'; break;
-
-#if 0
-		case 0x021: key = '1';break;/* [!] */
-		case 0x040: key = '2';break;/* [@] */
-		case 0x023: key = '3';break;/* [#] */
-		case 0x024: key = '4';break;/* [$] */
-		case 0x025: key = '5';break;/* [%] */
-		case 0x05e: key = '6';break;/* [^] */
-		case 0x026: key = '7';break;/* [&] */
-		case 0x02a: key = '8';break;/* [*] */
-		case 0x028: key = '9';;break;/* [(] */
-		case 0x029: key = '0';break;/* [)] */
-		case 0x05f: key = '-';break;/* [_] */
-		case 0x02b: key = '=';break;/* [+] */
-		case 0x07c: key = '\'';break;/* [|] */
-		case 0x07d: key = '[';break;/* [}] */
-		case 0x07b: key = ']';break;/* [{] */
-		case 0x022: key = '\'';break;/* ["] */
-		case 0x03a: key = ';';break;/* [:] */
-		case 0x03f: key = '/';break;/* [?] */
-		case 0x03e: key = '.';break;/* [>] */
-		case 0x03c: key = ',';break;/* [<] */
-#endif
-
-		default:
-			key = *(unsigned char*)buf;
-			if (key >= 'A' && key <= 'Z')
-				key = key - 'A' + 'a';
-			break;
-	} 
-
-	return key;
-}
-
-static Cursor CreateNullCursor(Display *display, Window root)
-{
-    Pixmap cursormask; 
-    XGCValues xgc;
-    GC gc;
-    XColor dummycolour;
-    Cursor cursor;
-
-    cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
-    xgc.function = GXclear;
-    gc =  XCreateGC(display, cursormask, GCFunction, &xgc);
-    XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
-    dummycolour.pixel = 0;
-    dummycolour.red = 0;
-    dummycolour.flags = 04;
-    cursor = XCreatePixmapCursor(display, cursormask, cursormask,
-          &dummycolour,&dummycolour, 0,0);
-    XFreePixmap(display,cursormask);
-    XFreeGC(display,gc);
-    return cursor;
-}
-
-static void install_grabs(void)
-{
-
-// inviso cursor
-	XDefineCursor(dpy, win, CreateNullCursor(dpy, win));
-
-	XGrabPointer(dpy, win,
-				 True,
-				 0,
-				 GrabModeAsync, GrabModeAsync,
-				 win,
-				 None,
-				 CurrentTime);
-
-	if (in_dgamouse.value) {
-		int MajorVersion, MinorVersion;
-
-		if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion)) { 
-			// unable to query, probalby not supported
-			Con_Printf( "Failed to detect XF86DGA Mouse\n" );
-			in_dgamouse.value = 0;
-		} else {
-			dgamouse = true;
-			XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse);
-			XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
-		}
-	} else {
-		XWarpPointer(dpy, None, win,
-					 0, 0, 0, 0,
-					 vid.width / 2, vid.height / 2);
-	}
-
-	XGrabKeyboard(dpy, win,
-				  False,
-				  GrabModeAsync, GrabModeAsync,
-				  CurrentTime);
-
-	mouse_active = true;
-
-//	XSync(dpy, True);
-}
-
-static void uninstall_grabs(void)
-{
-	if (!dpy || !win)
-		return;
-
-	if (dgamouse) {
-		dgamouse = false;
-		XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0);
-	}
-
-	XUngrabPointer(dpy, CurrentTime);
-	XUngrabKeyboard(dpy, CurrentTime);
-
-// inviso cursor
-	XUndefineCursor(dpy, win);
-
-	mouse_active = false;
-}
-
-static void HandleEvents(void)
-{
-	XEvent event;
-	KeySym ks;
-	int b;
-	qboolean dowarp = false;
-	int mwx = vid.width/2;
-	int mwy = vid.height/2;
-
-	if (!dpy)
-		return;
-
-	while (XPending(dpy)) {
-		XNextEvent(dpy, &event);
-
-		switch (event.type) {
-		case KeyPress:
-		case KeyRelease:
-			Key_Event(XLateKey(&event.xkey), event.type == KeyPress);
-			break;
-
-		case MotionNotify:
-			if (mouse_active) {
-				if (dgamouse) {
-					mx += (event.xmotion.x + win_x) * 2;
-					my += (event.xmotion.y + win_y) * 2;
-				} 
-				else 
-				{
-					mx += ((int)event.xmotion.x - mwx) * 2;
-					my += ((int)event.xmotion.y - mwy) * 2;
-					mwx = event.xmotion.x;
-					mwy = event.xmotion.y;
-
-					if (mx || my)
-						dowarp = true;
-				}
-			}
-			break;
-
-			break;
-
-		case ButtonPress:
-			b=-1;
-			if (event.xbutton.button == 1)
-				b = 0;
-			else if (event.xbutton.button == 2)
-				b = 2;
-			else if (event.xbutton.button == 3)
-				b = 1;
-			if (b>=0)
-				Key_Event(K_MOUSE1 + b, true);
-			break;
-
-		case ButtonRelease:
-			b=-1;
-			if (event.xbutton.button == 1)
-				b = 0;
-			else if (event.xbutton.button == 2)
-				b = 2;
-			else if (event.xbutton.button == 3)
-				b = 1;
-			if (b>=0)
-				Key_Event(K_MOUSE1 + b, false);
-			break;
-
-		case CreateNotify :
-			win_x = event.xcreatewindow.x;
-			win_y = event.xcreatewindow.y;
-			break;
-
-		case ConfigureNotify :
-			win_x = event.xconfigure.x;
-			win_y = event.xconfigure.y;
-			break;
-		}
-	}
-
-	if (dowarp) {
-		/* move the mouse to the window center again */
-		XWarpPointer(dpy, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
-	}
-
-}
-
-static void IN_DeactivateMouse( void ) 
-{
-	if (!mouse_avail || !dpy || !win)
-		return;
-
-	if (mouse_active) {
-		uninstall_grabs();
-		mouse_active = false;
-	}
-}
-
-static void IN_ActivateMouse( void ) 
-{
-	if (!mouse_avail || !dpy || !win)
-		return;
-
-	if (!mouse_active) {
-		mx = my = 0; // don't spazz
-		install_grabs();
-		mouse_active = true;
-	}
-}
-
-
-void VID_Shutdown(void)
-{
-	if (!ctx || !dpy)
-		return;
-	IN_DeactivateMouse();
-	if (dpy) {
-		if (ctx)
-			glXDestroyContext(dpy, ctx);
-		if (win)
-			XDestroyWindow(dpy, win);
-		if (vidmode_active)
-			XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[0]);
-		XCloseDisplay(dpy);
-	}
-	vidmode_active = false;
-	dpy = NULL;
-	win = 0;
-	ctx = NULL;
-}
-
-void signal_handler(int sig)
-{
-	printf("Received signal %d, exiting...\n", sig);
-	Sys_Quit();
-	exit(0);
-}
-
-void InitSig(void)
-{
-	signal(SIGHUP, signal_handler);
-	signal(SIGINT, signal_handler);
-	signal(SIGQUIT, signal_handler);
-	signal(SIGILL, signal_handler);
-	signal(SIGTRAP, signal_handler);
-	signal(SIGIOT, signal_handler);
-	signal(SIGBUS, signal_handler);
-	signal(SIGFPE, signal_handler);
-	signal(SIGSEGV, signal_handler);
-	signal(SIGTERM, signal_handler);
-}
-
-void VID_ShiftPalette(unsigned char *p)
-{
-//	VID_SetPalette(p);
-}
-
-void	VID_SetPalette (unsigned char *palette)
-{
-	byte	*pal;
-	unsigned r,g,b;
-	unsigned v;
-	int     r1,g1,b1;
-	int		j,k,l,m;
-	unsigned short i;
-	unsigned	*table;
-	FILE *f;
-	char s[255];
-	int dist, bestdist;
-
-//
-// 8 8 8 encoding
-//
-	pal = palette;
-	table = d_8to24table;
-	for (i=0 ; i<256 ; i++)
-	{
-		r = pal[0];
-		g = pal[1];
-		b = pal[2];
-		pal += 3;
-		
-		v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
-		*table++ = v;
-	}
-	d_8to24table[255] &= 0xffffff;	// 255 is transparent
-
-	for (i=0; i < (1<<15); i++) {
-		/* Maps
-		000000000000000
-		000000000011111 = Red  = 0x1F
-		000001111100000 = Blue = 0x03E0
-		111110000000000 = Grn  = 0x7C00
-		*/
-		r = ((i & 0x1F) << 3)+4;
-		g = ((i & 0x03E0) >> 2)+4;
-		b = ((i & 0x7C00) >> 7)+4;
-		pal = (unsigned char *)d_8to24table;
-		for (v=0,k=0,bestdist=10000*10000; v<256; v++,pal+=4) {
-			r1 = (int)r - (int)pal[0];
-			g1 = (int)g - (int)pal[1];
-			b1 = (int)b - (int)pal[2];
-			dist = (r1*r1)+(g1*g1)+(b1*b1);
-			if (dist < bestdist) {
-				k=v;
-				bestdist = dist;
-			}
-		}
-		d_15to8table[i]=k;
-	}
-}
-
-void CheckMultiTextureExtensions(void) 
-{
-	void *prjobj;
-
-	if (strstr(gl_extensions, "GL_SGIS_multitexture ") && !COM_CheckParm("-nomtex")) {
-		Con_Printf("Found GL_SGIS_multitexture...\n");
-
-		if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) {
-			Con_Printf("Unable to open symbol list for main program.\n");
-			return;
-		}
-
-		qglMTexCoord2fSGIS = (void *) dlsym(prjobj, "glMTexCoord2fSGIS");
-		qglSelectTextureSGIS = (void *) dlsym(prjobj, "glSelectTextureSGIS");
-
-		if (qglMTexCoord2fSGIS && qglSelectTextureSGIS) {
-			Con_Printf("Multitexture extensions found.\n");
-			gl_mtexable = true;
-		} else
-			Con_Printf("Symbol not found, disabled.\n");
-
-		dlclose(prjobj);
-	}
-}
-
-/*
-===============
-GL_Init
-===============
-*/
-void GL_Init (void)
-{
-	gl_vendor = glGetString (GL_VENDOR);
-	Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
-	gl_renderer = glGetString (GL_RENDERER);
-	Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
-	gl_version = glGetString (GL_VERSION);
-	Con_Printf ("GL_VERSION: %s\n", gl_version);
-	gl_extensions = glGetString (GL_EXTENSIONS);
-	Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-
-//	Con_Printf ("%s %s\n", gl_renderer, gl_version);
-
-	CheckMultiTextureExtensions ();
-
-	glClearColor (1,0,0,0);
-	glCullFace(GL_FRONT);
-	glEnable(GL_TEXTURE_2D);
-
-	glEnable(GL_ALPHA_TEST);
-	glAlphaFunc(GL_GREATER, 0.666);
-
-	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-	glShadeModel (GL_FLAT);
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-//	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-}
-
-/*
-=================
-GL_BeginRendering
-
-=================
-*/
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
-{
-	extern cvar_t gl_clear;
-
-	*x = *y = 0;
-	*width = scr_width;
-	*height = scr_height;
-
-//    if (!wglMakeCurrent( maindc, baseRC ))
-//		Sys_Error ("wglMakeCurrent failed");
-
-//	glViewport (*x, *y, *width, *height);
-}
-
-
-void GL_EndRendering (void)
-{
-	glFlush();
-	glXSwapBuffers(dpy, win);
-}
-
-qboolean VID_Is8bit(void)
-{
-	return is8bit;
-}
-
-void VID_Init8bitPalette(void) 
-{
-	// Check for 8bit Extensions and initialize them.
-	int i;
-	void *prjobj;
-
-	if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) {
-		Con_Printf("Unable to open symbol list for main program.\n");
-		return;
-	}
-
-	if (strstr(gl_extensions, "3DFX_set_global_palette") &&
-		(qgl3DfxSetPaletteEXT = dlsym(prjobj, "gl3DfxSetPaletteEXT")) != NULL) {
-		GLubyte table[256][4];
-		char *oldpal;
-
-		Con_SafePrintf("8-bit GL extensions enabled.\n");
-		glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-		oldpal = (char *) d_8to24table; //d_8to24table3dfx;
-		for (i=0;i<256;i++) {
-			table[i][2] = *oldpal++;
-			table[i][1] = *oldpal++;
-			table[i][0] = *oldpal++;
-			table[i][3] = 255;
-			oldpal++;
-		}
-		qgl3DfxSetPaletteEXT((GLuint *)table);
-		is8bit = true;
-
-	} else if (strstr(gl_extensions, "GL_EXT_shared_texture_palette") &&
-		(qglColorTableEXT = dlsym(prjobj, "glColorTableEXT")) != NULL) {
-		char thePalette[256*3];
-		char *oldPalette, *newPalette;
-
-		Con_SafePrintf("8-bit GL extensions enabled.\n");
-		glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-		oldPalette = (char *) d_8to24table; //d_8to24table3dfx;
-		newPalette = thePalette;
-		for (i=0;i<256;i++) {
-			*newPalette++ = *oldPalette++;
-			*newPalette++ = *oldPalette++;
-			*newPalette++ = *oldPalette++;
-			oldPalette++;
-		}
-		qglColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
-		is8bit = true;
-	}
-	
-	dlclose(prjobj);
-}
-
-static void Check_Gamma (unsigned char *pal)
-{
-	float	f, inf;
-	unsigned char	palette[768];
-	int		i;
-
-	if ((i = COM_CheckParm("-gamma")) == 0) {
-		if ((gl_renderer && strstr(gl_renderer, "Voodoo")) ||
-			(gl_vendor && strstr(gl_vendor, "3Dfx")))
-			vid_gamma = 1;
-		else
-			vid_gamma = 0.7; // default to 0.7 on non-3dfx hardware
-	} else
-		vid_gamma = Q_atof(com_argv[i+1]);
-
-	for (i=0 ; i<768 ; i++)
-	{
-		f = pow ( (pal[i]+1)/256.0 , vid_gamma );
-		inf = f*255 + 0.5;
-		if (inf < 0)
-			inf = 0;
-		if (inf > 255)
-			inf = 255;
-		palette[i] = inf;
-	}
-
-	memcpy (pal, palette, sizeof(palette));
-}
-
-void VID_Init(unsigned char *palette)
-{
-	int i;
-	int attrib[] = {
-		GLX_RGBA,
-		GLX_RED_SIZE, 1,
-		GLX_GREEN_SIZE, 1,
-		GLX_BLUE_SIZE, 1,
-		GLX_DOUBLEBUFFER,
-		GLX_DEPTH_SIZE, 1,
-		None
-	};
-	char	gldir[MAX_OSPATH];
-	int width = 640, height = 480;
-	XSetWindowAttributes attr;
-	unsigned long mask;
-	Window root;
-	XVisualInfo *visinfo;
-	qboolean fullscreen = true;
-	int MajorVersion, MinorVersion;
-	int actualWidth, actualHeight;
-
-	Cvar_RegisterVariable (&vid_mode);
-	Cvar_RegisterVariable (&in_mouse);
-	Cvar_RegisterVariable (&in_dgamouse);
-	Cvar_RegisterVariable (&m_filter);
-	Cvar_RegisterVariable (&gl_ztrick);
-	
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.colormap = host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-
-// interpret command-line params
-
-// set vid parameters
-	if ((i = COM_CheckParm("-window")) != 0)
-		fullscreen = false;
-
-	if ((i = COM_CheckParm("-width")) != 0)
-		width = atoi(com_argv[i+1]);
-
-	if ((i = COM_CheckParm("-height")) != 0)
-		height = atoi(com_argv[i+1]);
-
-	if ((i = COM_CheckParm("-conwidth")) != 0)
-		vid.conwidth = Q_atoi(com_argv[i+1]);
-	else
-		vid.conwidth = 640;
-
-	vid.conwidth &= 0xfff8; // make it a multiple of eight
-
-	if (vid.conwidth < 320)
-		vid.conwidth = 320;
-
-	// pick a conheight that matches with correct aspect
-	vid.conheight = vid.conwidth*3 / 4;
-
-	if ((i = COM_CheckParm("-conheight")) != 0)
-		vid.conheight = Q_atoi(com_argv[i+1]);
-	if (vid.conheight < 200)
-		vid.conheight = 200;
-
-	if (!(dpy = XOpenDisplay(NULL))) {
-		fprintf(stderr, "Error couldn't open the X display\n");
-		exit(1);
-	}
-
-	scrnum = DefaultScreen(dpy);
-	root = RootWindow(dpy, scrnum);
-
-	// Get video mode list
-	MajorVersion = MinorVersion = 0;
-	if (!XF86VidModeQueryVersion(dpy, &MajorVersion, &MinorVersion)) { 
-		vidmode_ext = false;
-	} else {
-		Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion);
-		vidmode_ext = true;
-	}
-
-	visinfo = glXChooseVisual(dpy, scrnum, attrib);
-	if (!visinfo) {
-		fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n");
-		exit(1);
-	}
-
-	if (vidmode_ext) {
-		int best_fit, best_dist, dist, x, y;
-		
-		XF86VidModeGetAllModeLines(dpy, scrnum, &num_vidmodes, &vidmodes);
-
-		// Are we going fullscreen?  If so, let's change video mode
-		if (fullscreen) {
-			best_dist = 9999999;
-			best_fit = -1;
-
-			for (i = 0; i < num_vidmodes; i++) {
-				if (width > vidmodes[i]->hdisplay ||
-					height > vidmodes[i]->vdisplay)
-					continue;
-
-				x = width - vidmodes[i]->hdisplay;
-				y = height - vidmodes[i]->vdisplay;
-				dist = (x * x) + (y * y);
-				if (dist < best_dist) {
-					best_dist = dist;
-					best_fit = i;
-				}
-			}
-
-			if (best_fit != -1) {
-				actualWidth = vidmodes[best_fit]->hdisplay;
-				actualHeight = vidmodes[best_fit]->vdisplay;
-
-				// change to the mode
-				XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]);
-				vidmode_active = true;
-
-				// Move the viewport to top left
-				XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
-			} else
-				fullscreen = 0;
-		}
-	}
-
-	/* window attributes */
-	attr.background_pixel = 0;
-	attr.border_pixel = 0;
-	attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
-	attr.event_mask = X_MASK;
-	if (vidmode_active) {
-		mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | 
-			CWEventMask | CWOverrideRedirect;
-		attr.override_redirect = True;
-		attr.backing_store = NotUseful;
-		attr.save_under = False;
-	} else
-		mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
-
-	win = XCreateWindow(dpy, root, 0, 0, width, height,
-						0, visinfo->depth, InputOutput,
-						visinfo->visual, mask, &attr);
-	XMapWindow(dpy, win);
-
-	if (vidmode_active) {
-		XMoveWindow(dpy, win, 0, 0);
-		XRaiseWindow(dpy, win);
-		XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
-		XFlush(dpy);
-		// Move the viewport to top left
-		XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
-	}
-
-	XFlush(dpy);
-
-	ctx = glXCreateContext(dpy, visinfo, NULL, True);
-
-	glXMakeCurrent(dpy, win, ctx);
-
-	scr_width = width;
-	scr_height = height;
-
-	if (vid.conheight > height)
-		vid.conheight = height;
-	if (vid.conwidth > width)
-		vid.conwidth = width;
-	vid.width = vid.conwidth;
-	vid.height = vid.conheight;
-
-	vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
-	vid.numpages = 2;
-
-	InitSig(); // trap evil signals
-
-	GL_Init();
-
-	sprintf (gldir, "%s/glquake", com_gamedir);
-	Sys_mkdir (gldir);
-
-	VID_SetPalette(palette);
-
-	// Check for 3DFX Extensions and initialize them.
-	VID_Init8bitPalette();
-
-	Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height);
-
-	vid.recalc_refdef = 1;				// force a surface cache flush
-}
-
-void Sys_SendKeyEvents(void)
-{
-	HandleEvents();
-}
-
-void Force_CenterView_f (void)
-{
-	cl.viewangles[PITCH] = 0;
-}
-
-void IN_Init(void)
-{
-}
-
-void IN_Shutdown(void)
-{
-}
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-	if (!dpy || !win)
-		return;
-
-	if (vidmode_active || key_dest == key_game)
-		IN_ActivateMouse();
-	else
-		IN_DeactivateMouse ();
-}
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-	if (!mouse_avail)
-		return;
-   
-	if (m_filter.value)
-	{
-		mx = (mx + old_mouse_x) * 0.5;
-		my = (my + old_mouse_y) * 0.5;
-	}
-	old_mouse_x = mx;
-	old_mouse_y = my;
-
-	mx *= sensitivity.value;
-	my *= sensitivity.value;
-
-// add mouse X/Y movement to cmd
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mx;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mx;
-	
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-		
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
-	{
-		cl.viewangles[PITCH] += m_pitch.value * my;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	}
-	else
-	{
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * my;
-		else
-			cmd->forwardmove -= m_forward.value * my;
-	}
-	mx = my = 0;
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-	IN_MouseMove(cmd);
-}
-
-
--- a/u/gl_vidnt.c
+++ /dev/null
@@ -1,1949 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// gl_vidnt.c -- NT GL vid component
-
-#include "quakedef.h"
-#include "winquake.h"
-#include "resource.h"
-#include <commctrl.h>
-
-#define MAX_MODE_LIST	30
-#define VID_ROW_SIZE	3
-#define WARP_WIDTH		320
-#define WARP_HEIGHT		200
-#define MAXWIDTH		10000
-#define MAXHEIGHT		10000
-#define BASEWIDTH		320
-#define BASEHEIGHT		200
-
-#define MODE_WINDOWED			0
-#define NO_MODE					(MODE_WINDOWED - 1)
-#define MODE_FULLSCREEN_DEFAULT	(MODE_WINDOWED + 1)
-
-typedef struct {
-	modestate_t	type;
-	int			width;
-	int			height;
-	int			modenum;
-	int			dib;
-	int			fullscreen;
-	int			bpp;
-	int			halfscreen;
-	char		modedesc[17];
-} vmode_t;
-
-typedef struct {
-	int			width;
-	int			height;
-} lmode_t;
-
-lmode_t	lowresmodes[] = {
-	{320, 200},
-	{320, 240},
-	{400, 300},
-	{512, 384},
-};
-
-const char *gl_vendor;
-const char *gl_renderer;
-const char *gl_version;
-const char *gl_extensions;
-
-qboolean		DDActive;
-qboolean		scr_skipupdate;
-
-static vmode_t	modelist[MAX_MODE_LIST];
-static int		nummodes;
-static vmode_t	*pcurrentmode;
-static vmode_t	badmode;
-
-static DEVMODE	gdevmode;
-static qboolean	vid_initialized = false;
-static qboolean	windowed, leavecurrentmode;
-static qboolean vid_canalttab = false;
-static qboolean vid_wassuspended = false;
-static int		windowed_mouse;
-extern qboolean	mouseactive;  // from in_win.c
-static HICON	hIcon;
-
-int			DIBWidth, DIBHeight;
-RECT		WindowRect;
-DWORD		WindowStyle, ExWindowStyle;
-
-HWND	mainwindow, dibwindow;
-
-int			vid_modenum = NO_MODE;
-int			vid_realmode;
-int			vid_default = MODE_WINDOWED;
-static int	windowed_default;
-unsigned char	vid_curpal[256*3];
-static qboolean fullsbardraw = false;
-
-static float vid_gamma = 1.0;
-
-HGLRC	baseRC;
-HDC		maindc;
-
-glvert_t glv;
-
-cvar_t	gl_ztrick = {"gl_ztrick","1"};
-
-HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
-
-viddef_t	vid;				// global video state
-
-unsigned short	d_8to16table[256];
-unsigned	d_8to24table[256];
-unsigned char d_15to8table[65536];
-
-float		gldepthmin, gldepthmax;
-
-modestate_t	modestate = MS_UNINIT;
-
-void VID_MenuDraw (void);
-void VID_MenuKey (int key);
-
-LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-void AppActivate(BOOL fActive, BOOL minimize);
-char *VID_GetModeDescription (int mode);
-void ClearAllStates (void);
-void VID_UpdateWindowStatus (void);
-void GL_Init (void);
-
-PROC glArrayElementEXT;
-PROC glColorPointerEXT;
-PROC glTexCoordPointerEXT;
-PROC glVertexPointerEXT;
-
-typedef void (APIENTRY *lp3DFXFUNC) (int, int, int, int, int, const void*);
-lp3DFXFUNC glColorTableEXT;
-qboolean is8bit = false;
-qboolean isPermedia = false;
-qboolean gl_mtexable = false;
-
-//====================================
-
-cvar_t		vid_mode = {"vid_mode","0", false};
-// Note that 0 is MODE_WINDOWED
-cvar_t		_vid_default_mode = {"_vid_default_mode","0", true};
-// Note that 3 is MODE_FULLSCREEN_DEFAULT
-cvar_t		_vid_default_mode_win = {"_vid_default_mode_win","3", true};
-cvar_t		vid_wait = {"vid_wait","0"};
-cvar_t		vid_nopageflip = {"vid_nopageflip","0", true};
-cvar_t		_vid_wait_override = {"_vid_wait_override", "0", true};
-cvar_t		vid_config_x = {"vid_config_x","800", true};
-cvar_t		vid_config_y = {"vid_config_y","600", true};
-cvar_t		vid_stretch_by_2 = {"vid_stretch_by_2","1", true};
-cvar_t		_windowed_mouse = {"_windowed_mouse","1", true};
-
-int			window_center_x, window_center_y, window_x, window_y, window_width, window_height;
-RECT		window_rect;
-
-// direct draw software compatability stuff
-
-void VID_HandlePause (qboolean pause)
-{
-}
-
-void VID_ForceLockState (int lk)
-{
-}
-
-void VID_LockBuffer (void)
-{
-}
-
-void VID_UnlockBuffer (void)
-{
-}
-
-int VID_ForceUnlockedAndReturnState (void)
-{
-	return 0;
-}
-
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-}
-
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-}
-
-
-void CenterWindow(HWND hWndCenter, int width, int height, BOOL lefttopjustify)
-{
-    RECT    rect;
-    int     CenterX, CenterY;
-
-	CenterX = (GetSystemMetrics(SM_CXSCREEN) - width) / 2;
-	CenterY = (GetSystemMetrics(SM_CYSCREEN) - height) / 2;
-	if (CenterX > CenterY*2)
-		CenterX >>= 1;	// dual screens
-	CenterX = (CenterX < 0) ? 0: CenterX;
-	CenterY = (CenterY < 0) ? 0: CenterY;
-	SetWindowPos (hWndCenter, NULL, CenterX, CenterY, 0, 0,
-			SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME);
-}
-
-qboolean VID_SetWindowedMode (int modenum)
-{
-	HDC				hdc;
-	int				lastmodestate, width, height;
-	RECT			rect;
-
-	lastmodestate = modestate;
-
-	WindowRect.top = WindowRect.left = 0;
-
-	WindowRect.right = modelist[modenum].width;
-	WindowRect.bottom = modelist[modenum].height;
-
-	DIBWidth = modelist[modenum].width;
-	DIBHeight = modelist[modenum].height;
-
-	WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU |
-				  WS_MINIMIZEBOX;
-	ExWindowStyle = 0;
-
-	rect = WindowRect;
-	AdjustWindowRectEx(&rect, WindowStyle, FALSE, 0);
-
-	width = rect.right - rect.left;
-	height = rect.bottom - rect.top;
-
-	// Create the DIB window
-	dibwindow = CreateWindowEx (
-		 ExWindowStyle,
-		 "WinQuake",
-		 "GLQuake",
-		 WindowStyle,
-		 rect.left, rect.top,
-		 width,
-		 height,
-		 NULL,
-		 NULL,
-		 global_hInstance,
-		 NULL);
-
-	if (!dibwindow)
-		Sys_Error ("Couldn't create DIB window");
-
-	// Center and show the DIB window
-	CenterWindow(dibwindow, WindowRect.right - WindowRect.left,
-				 WindowRect.bottom - WindowRect.top, false);
-
-	ShowWindow (dibwindow, SW_SHOWDEFAULT);
-	UpdateWindow (dibwindow);
-
-	modestate = MS_WINDOWED;
-
-// because we have set the background brush for the window to NULL
-// (to avoid flickering when re-sizing the window on the desktop),
-// we clear the window to black when created, otherwise it will be
-// empty while Quake starts up.
-	hdc = GetDC(dibwindow);
-	PatBlt(hdc,0,0,WindowRect.right,WindowRect.bottom,BLACKNESS);
-	ReleaseDC(dibwindow, hdc);
-
-	if (vid.conheight > modelist[modenum].height)
-		vid.conheight = modelist[modenum].height;
-	if (vid.conwidth > modelist[modenum].width)
-		vid.conwidth = modelist[modenum].width;
-	vid.width = vid.conwidth;
-	vid.height = vid.conheight;
-
-	vid.numpages = 2;
-
-	mainwindow = dibwindow;
-
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)TRUE, (LPARAM)hIcon);
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)FALSE, (LPARAM)hIcon);
-
-	return true;
-}
-
-
-qboolean VID_SetFullDIBMode (int modenum)
-{
-	HDC				hdc;
-	int				lastmodestate, width, height;
-	RECT			rect;
-
-	if (!leavecurrentmode)
-	{
-		gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-		gdevmode.dmBitsPerPel = modelist[modenum].bpp;
-		gdevmode.dmPelsWidth = modelist[modenum].width <<
-							   modelist[modenum].halfscreen;
-		gdevmode.dmPelsHeight = modelist[modenum].height;
-		gdevmode.dmSize = sizeof (gdevmode);
-
-		if (ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
-			Sys_Error ("Couldn't set fullscreen DIB mode");
-	}
-
-	lastmodestate = modestate;
-	modestate = MS_FULLDIB;
-
-	WindowRect.top = WindowRect.left = 0;
-
-	WindowRect.right = modelist[modenum].width;
-	WindowRect.bottom = modelist[modenum].height;
-
-	DIBWidth = modelist[modenum].width;
-	DIBHeight = modelist[modenum].height;
-
-	WindowStyle = WS_POPUP;
-	ExWindowStyle = 0;
-
-	rect = WindowRect;
-	AdjustWindowRectEx(&rect, WindowStyle, FALSE, 0);
-
-	width = rect.right - rect.left;
-	height = rect.bottom - rect.top;
-
-	// Create the DIB window
-	dibwindow = CreateWindowEx (
-		 ExWindowStyle,
-		 "WinQuake",
-		 "GLQuake",
-		 WindowStyle,
-		 rect.left, rect.top,
-		 width,
-		 height,
-		 NULL,
-		 NULL,
-		 global_hInstance,
-		 NULL);
-
-	if (!dibwindow)
-		Sys_Error ("Couldn't create DIB window");
-
-	ShowWindow (dibwindow, SW_SHOWDEFAULT);
-	UpdateWindow (dibwindow);
-
-	// Because we have set the background brush for the window to NULL
-	// (to avoid flickering when re-sizing the window on the desktop), we
-	// clear the window to black when created, otherwise it will be
-	// empty while Quake starts up.
-	hdc = GetDC(dibwindow);
-	PatBlt(hdc,0,0,WindowRect.right,WindowRect.bottom,BLACKNESS);
-	ReleaseDC(dibwindow, hdc);
-
-	if (vid.conheight > modelist[modenum].height)
-		vid.conheight = modelist[modenum].height;
-	if (vid.conwidth > modelist[modenum].width)
-		vid.conwidth = modelist[modenum].width;
-	vid.width = vid.conwidth;
-	vid.height = vid.conheight;
-
-	vid.numpages = 2;
-
-// needed because we're not getting WM_MOVE messages fullscreen on NT
-	window_x = 0;
-	window_y = 0;
-
-	mainwindow = dibwindow;
-
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)TRUE, (LPARAM)hIcon);
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)FALSE, (LPARAM)hIcon);
-
-	return true;
-}
-
-
-int VID_SetMode (int modenum, unsigned char *palette)
-{
-	int				original_mode, temp;
-	qboolean		stat;
-    MSG				msg;
-	HDC				hdc;
-
-	if ((windowed && (modenum != 0)) ||
-		(!windowed && (modenum < 1)) ||
-		(!windowed && (modenum >= nummodes)))
-	{
-		Sys_Error ("Bad video mode\n");
-	}
-
-// so Con_Printfs don't mess us up by forcing vid and snd updates
-	temp = scr_disabled_for_loading;
-	scr_disabled_for_loading = true;
-
-	CDAudio_Pause ();
-
-	if (vid_modenum == NO_MODE)
-		original_mode = windowed_default;
-	else
-		original_mode = vid_modenum;
-
-	// Set either the fullscreen or windowed mode
-	if (modelist[modenum].type == MS_WINDOWED)
-	{
-		if (_windowed_mouse.value && key_dest == key_game)
-		{
-			stat = VID_SetWindowedMode(modenum);
-			IN_ActivateMouse ();
-			IN_HideMouse ();
-		}
-		else
-		{
-			IN_DeactivateMouse ();
-			IN_ShowMouse ();
-			stat = VID_SetWindowedMode(modenum);
-		}
-	}
-	else if (modelist[modenum].type == MS_FULLDIB)
-	{
-		stat = VID_SetFullDIBMode(modenum);
-		IN_ActivateMouse ();
-		IN_HideMouse ();
-	}
-	else
-	{
-		Sys_Error ("VID_SetMode: Bad mode type in modelist");
-	}
-
-	window_width = DIBWidth;
-	window_height = DIBHeight;
-	VID_UpdateWindowStatus ();
-
-	CDAudio_Resume ();
-	scr_disabled_for_loading = temp;
-
-	if (!stat)
-	{
-		Sys_Error ("Couldn't set video mode");
-	}
-
-// now we try to make sure we get the focus on the mode switch, because
-// sometimes in some systems we don't.  We grab the foreground, then
-// finish setting up, pump all our messages, and sleep for a little while
-// to let messages finish bouncing around the system, then we put
-// ourselves at the top of the z order, then grab the foreground again,
-// Who knows if it helps, but it probably doesn't hurt
-	SetForegroundWindow (mainwindow);
-	VID_SetPalette (palette);
-	vid_modenum = modenum;
-	Cvar_SetValue ("vid_mode", (float)vid_modenum);
-
-	while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
-	{
-      	TranslateMessage (&msg);
-      	DispatchMessage (&msg);
-	}
-
-	Sleep (100);
-
-	SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0,
-				  SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW |
-				  SWP_NOCOPYBITS);
-
-	SetForegroundWindow (mainwindow);
-
-// fix the leftover Alt from any Alt-Tab or the like that switched us away
-	ClearAllStates ();
-
-	if (!msg_suppress_1)
-		Con_SafePrintf ("Video mode %s initialized.\n", VID_GetModeDescription (vid_modenum));
-
-	VID_SetPalette (palette);
-
-	vid.recalc_refdef = 1;
-
-	return true;
-}
-
-
-/*
-================
-VID_UpdateWindowStatus
-================
-*/
-void VID_UpdateWindowStatus (void)
-{
-
-	window_rect.left = window_x;
-	window_rect.top = window_y;
-	window_rect.right = window_x + window_width;
-	window_rect.bottom = window_y + window_height;
-	window_center_x = (window_rect.left + window_rect.right) / 2;
-	window_center_y = (window_rect.top + window_rect.bottom) / 2;
-
-	IN_UpdateClipCursor ();
-}
-
-
-//====================================
-
-BINDTEXFUNCPTR bindTexFunc;
-
-#define TEXTURE_EXT_STRING "GL_EXT_texture_object"
-
-
-void CheckTextureExtensions (void)
-{
-	char		*tmp;
-	qboolean	texture_ext;
-	HINSTANCE	hInstGL;
-
-	texture_ext = FALSE;
-	/* check for texture extension */
-	tmp = (unsigned char *)glGetString(GL_EXTENSIONS);
-	while (*tmp)
-	{
-		if (strncmp((const char*)tmp, TEXTURE_EXT_STRING, strlen(TEXTURE_EXT_STRING)) == 0)
-			texture_ext = TRUE;
-		tmp++;
-	}
-
-	if (!texture_ext || COM_CheckParm ("-gl11") )
-	{
-		hInstGL = LoadLibrary("opengl32.dll");
-		
-		if (hInstGL == NULL)
-			Sys_Error ("Couldn't load opengl32.dll\n");
-
-		bindTexFunc = (void *)GetProcAddress(hInstGL,"glBindTexture");
-
-		if (!bindTexFunc)
-			Sys_Error ("No texture objects!");
-		return;
-	}
-
-/* load library and get procedure adresses for texture extension API */
-	if ((bindTexFunc = (BINDTEXFUNCPTR)
-		wglGetProcAddress((LPCSTR) "glBindTextureEXT")) == NULL)
-	{
-		Sys_Error ("GetProcAddress for BindTextureEXT failed");
-		return;
-	}
-}
-
-void CheckArrayExtensions (void)
-{
-	char		*tmp;
-
-	/* check for texture extension */
-	tmp = (unsigned char *)glGetString(GL_EXTENSIONS);
-	while (*tmp)
-	{
-		if (strncmp((const char*)tmp, "GL_EXT_vertex_array", strlen("GL_EXT_vertex_array")) == 0)
-		{
-			if (
-((glArrayElementEXT = wglGetProcAddress("glArrayElementEXT")) == NULL) ||
-((glColorPointerEXT = wglGetProcAddress("glColorPointerEXT")) == NULL) ||
-((glTexCoordPointerEXT = wglGetProcAddress("glTexCoordPointerEXT")) == NULL) ||
-((glVertexPointerEXT = wglGetProcAddress("glVertexPointerEXT")) == NULL) )
-			{
-				Sys_Error ("GetProcAddress for vertex extension failed");
-				return;
-			}
-			return;
-		}
-		tmp++;
-	}
-
-	Sys_Error ("Vertex array extension not present");
-}
-
-//int		texture_mode = GL_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_NEAREST;
-//int		texture_mode = GL_NEAREST_MIPMAP_LINEAR;
-int		texture_mode = GL_LINEAR;
-//int		texture_mode = GL_LINEAR_MIPMAP_NEAREST;
-//int		texture_mode = GL_LINEAR_MIPMAP_LINEAR;
-
-int		texture_extension_number = 1;
-
-#ifdef _WIN32
-void CheckMultiTextureExtensions(void) 
-{
-	if (strstr(gl_extensions, "GL_SGIS_multitexture ") && !COM_CheckParm("-nomtex")) {
-		Con_Printf("Multitexture extensions found.\n");
-		qglMTexCoord2fSGIS = (void *) wglGetProcAddress("glMTexCoord2fSGIS");
-		qglSelectTextureSGIS = (void *) wglGetProcAddress("glSelectTextureSGIS");
-		gl_mtexable = true;
-	}
-}
-#else
-void CheckMultiTextureExtensions(void) 
-{
-		gl_mtexable = true;
-}
-#endif
-
-/*
-===============
-GL_Init
-===============
-*/
-void GL_Init (void)
-{
-	gl_vendor = glGetString (GL_VENDOR);
-	Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
-	gl_renderer = glGetString (GL_RENDERER);
-	Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
-	gl_version = glGetString (GL_VERSION);
-	Con_Printf ("GL_VERSION: %s\n", gl_version);
-	gl_extensions = glGetString (GL_EXTENSIONS);
-	Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-
-//	Con_Printf ("%s %s\n", gl_renderer, gl_version);
-
-    if (strnicmp(gl_renderer,"PowerVR",7)==0)
-         fullsbardraw = true;
-
-    if (strnicmp(gl_renderer,"Permedia",8)==0)
-         isPermedia = true;
-
-	CheckTextureExtensions ();
-	CheckMultiTextureExtensions ();
-
-	glClearColor (1,0,0,0);
-	glCullFace(GL_FRONT);
-	glEnable(GL_TEXTURE_2D);
-
-	glEnable(GL_ALPHA_TEST);
-	glAlphaFunc(GL_GREATER, 0.666);
-
-	glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-	glShadeModel (GL_FLAT);
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-//	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-
-#if 0
-	CheckArrayExtensions ();
-
-	glEnable (GL_VERTEX_ARRAY_EXT);
-	glEnable (GL_TEXTURE_COORD_ARRAY_EXT);
-	glVertexPointerEXT (3, GL_FLOAT, 0, 0, &glv.x);
-	glTexCoordPointerEXT (2, GL_FLOAT, 0, 0, &glv.s);
-	glColorPointerEXT (3, GL_FLOAT, 0, 0, &glv.r);
-#endif
-}
-
-/*
-=================
-GL_BeginRendering
-
-=================
-*/
-void GL_BeginRendering (int *x, int *y, int *width, int *height)
-{
-	extern cvar_t gl_clear;
-
-	*x = *y = 0;
-	*width = WindowRect.right - WindowRect.left;
-	*height = WindowRect.bottom - WindowRect.top;
-
-//    if (!wglMakeCurrent( maindc, baseRC ))
-//		Sys_Error ("wglMakeCurrent failed");
-
-//	glViewport (*x, *y, *width, *height);
-}
-
-
-void GL_EndRendering (void)
-{
-	if (!scr_skipupdate || block_drawing)
-		SwapBuffers(maindc);
-
-// handle the mouse state when windowed if that's changed
-	if (modestate == MS_WINDOWED)
-	{
-		if (!_windowed_mouse.value) {
-			if (windowed_mouse)	{
-				IN_DeactivateMouse ();
-				IN_ShowMouse ();
-				windowed_mouse = false;
-			}
-		} else {
-			windowed_mouse = true;
-			if (key_dest == key_game && !mouseactive && ActiveApp) {
-				IN_ActivateMouse ();
-				IN_HideMouse ();
-			} else if (mouseactive && key_dest != key_game) {
-				IN_DeactivateMouse ();
-				IN_ShowMouse ();
-			}
-		}
-	}
-	if (fullsbardraw)
-		Sbar_Changed();
-}
-
-void	VID_SetPalette (unsigned char *palette)
-{
-	byte	*pal;
-	unsigned r,g,b;
-	unsigned v;
-	int     r1,g1,b1;
-	int		j,k,l,m;
-	unsigned short i;
-	unsigned	*table;
-	FILE *f;
-	char s[255];
-	HWND hDlg, hProgress;
-	float gamma;
-
-//
-// 8 8 8 encoding
-//
-	pal = palette;
-	table = d_8to24table;
-	for (i=0 ; i<256 ; i++)
-	{
-		r = pal[0];
-		g = pal[1];
-		b = pal[2];
-		pal += 3;
-		
-//		v = (255<<24) + (r<<16) + (g<<8) + (b<<0);
-//		v = (255<<0) + (r<<8) + (g<<16) + (b<<24);
-		v = (255<<24) + (r<<0) + (g<<8) + (b<<16);
-		*table++ = v;
-	}
-	d_8to24table[255] &= 0xffffff;	// 255 is transparent
-
-	// JACK: 3D distance calcs - k is last closest, l is the distance.
-	// FIXME: Precalculate this and cache to disk.
-	for (i=0; i < (1<<15); i++) {
-		/* Maps
-			000000000000000
-			000000000011111 = Red  = 0x1F
-			000001111100000 = Blue = 0x03E0
-			111110000000000 = Grn  = 0x7C00
-		*/
-		r = ((i & 0x1F) << 3)+4;
-		g = ((i & 0x03E0) >> 2)+4;
-		b = ((i & 0x7C00) >> 7)+4;
-		pal = (unsigned char *)d_8to24table;
-		for (v=0,k=0,l=10000*10000; v<256; v++,pal+=4) {
-			r1 = r-pal[0];
-			g1 = g-pal[1];
-			b1 = b-pal[2];
-			j = (r1*r1)+(g1*g1)+(b1*b1);
-			if (j<l) {
-				k=v;
-				l=j;
-			}
-		}
-		d_15to8table[i]=k;
-	}
-}
-
-BOOL	gammaworks;
-
-void	VID_ShiftPalette (unsigned char *palette)
-{
-	extern	byte ramps[3][256];
-	
-//	VID_SetPalette (palette);
-
-//	gammaworks = SetDeviceGammaRamp (maindc, ramps);
-}
-
-
-void VID_SetDefaultMode (void)
-{
-	IN_DeactivateMouse ();
-}
-
-
-void	VID_Shutdown (void)
-{
-   	HGLRC hRC;
-   	HDC	  hDC;
-
-	if (vid_initialized)
-	{
-		vid_canalttab = false;
-		hRC = wglGetCurrentContext();
-    	hDC = wglGetCurrentDC();
-
-    	wglMakeCurrent(NULL, NULL);
-
-    	if (hRC)
-    	    wglDeleteContext(hRC);
-
-		if (hDC && dibwindow)
-			ReleaseDC(dibwindow, hDC);
-
-		if (modestate == MS_FULLDIB)
-			ChangeDisplaySettings (NULL, 0);
-
-		if (maindc && dibwindow)
-			ReleaseDC (dibwindow, maindc);
-
-		AppActivate(false, false);
-	}
-}
-
-
-//==========================================================================
-
-
-BOOL bSetupPixelFormat(HDC hDC)
-{
-    static PIXELFORMATDESCRIPTOR pfd = {
-	sizeof(PIXELFORMATDESCRIPTOR),	// size of this pfd
-	1,				// version number
-	PFD_DRAW_TO_WINDOW 		// support window
-	|  PFD_SUPPORT_OPENGL 	// support OpenGL
-	|  PFD_DOUBLEBUFFER ,	// double buffered
-	PFD_TYPE_RGBA,			// RGBA type
-	24,				// 24-bit color depth
-	0, 0, 0, 0, 0, 0,		// color bits ignored
-	0,				// no alpha buffer
-	0,				// shift bit ignored
-	0,				// no accumulation buffer
-	0, 0, 0, 0, 			// accum bits ignored
-	32,				// 32-bit z-buffer	
-	0,				// no stencil buffer
-	0,				// no auxiliary buffer
-	PFD_MAIN_PLANE,			// main layer
-	0,				// reserved
-	0, 0, 0				// layer masks ignored
-    };
-    int pixelformat;
-
-    if ( (pixelformat = ChoosePixelFormat(hDC, &pfd)) == 0 )
-    {
-        MessageBox(NULL, "ChoosePixelFormat failed", "Error", MB_OK);
-        return FALSE;
-    }
-
-    if (SetPixelFormat(hDC, pixelformat, &pfd) == FALSE)
-    {
-        MessageBox(NULL, "SetPixelFormat failed", "Error", MB_OK);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-
-
-byte        scantokey[128] = 
-					{ 
-//  0           1       2       3       4       5       6       7 
-//  8           9       A       B       C       D       E       F 
-	0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6', 
-	'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9, // 0 
-	'q',    'w',    'e',    'r',    't',    'y',    'u',    'i', 
-	'o',    'p',    '[',    ']',    13 ,    K_CTRL,'a',  's',      // 1 
-	'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';', 
-	'\'' ,    '`',    K_SHIFT,'\\',  'z',    'x',    'c',    'v',      // 2 
-	'b',    'n',    'm',    ',',    '.',    '/',    K_SHIFT,'*', 
-	K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE  ,    0  , K_HOME, 
-	K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4 
-	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
-	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         // 7 
-					}; 
-
-byte        shiftscantokey[128] = 
-					{ 
-//  0           1       2       3       4       5       6       7 
-//  8           9       A       B       C       D       E       F 
-	0  ,    27,     '!',    '@',    '#',    '$',    '%',    '^', 
-	'&',    '*',    '(',    ')',    '_',    '+',    K_BACKSPACE, 9, // 0 
-	'Q',    'W',    'E',    'R',    'T',    'Y',    'U',    'I', 
-	'O',    'P',    '{',    '}',    13 ,    K_CTRL,'A',  'S',      // 1 
-	'D',    'F',    'G',    'H',    'J',    'K',    'L',    ':', 
-	'"' ,    '~',    K_SHIFT,'|',  'Z',    'X',    'C',    'V',      // 2 
-	'B',    'N',    'M',    '<',    '>',    '?',    K_SHIFT,'*', 
-	K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE  ,    0  , K_HOME, 
-	K_UPARROW,K_PGUP,'_',K_LEFTARROW,'%',K_RIGHTARROW,'+',K_END, //4 
-	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
-	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         // 7 
-					}; 
-
-
-/*
-=======
-MapKey
-
-Map from windows to quake keynums
-=======
-*/
-int MapKey (int key)
-{
-	key = (key>>16)&255;
-	if (key > 127)
-		return 0;
-	if (scantokey[key] == 0)
-		Con_DPrintf("key 0x%02x has no translation\n", key);
-	return scantokey[key];
-}
-
-/*
-===================================================================
-
-MAIN WINDOW
-
-===================================================================
-*/
-
-/*
-================
-ClearAllStates
-================
-*/
-void ClearAllStates (void)
-{
-	int		i;
-	
-// send an up event for each key, to make sure the server clears them all
-	for (i=0 ; i<256 ; i++)
-	{
-		Key_Event (i, false);
-	}
-
-	Key_ClearStates ();
-	IN_ClearStates ();
-}
-
-void AppActivate(BOOL fActive, BOOL minimize)
-/****************************************************************************
-*
-* Function:     AppActivate
-* Parameters:   fActive - True if app is activating
-*
-* Description:  If the application is activating, then swap the system
-*               into SYSPAL_NOSTATIC mode so that our palettes will display
-*               correctly.
-*
-****************************************************************************/
-{
-	MSG msg;
-    HDC			hdc;
-    int			i, t;
-	static BOOL	sound_active;
-
-	ActiveApp = fActive;
-	Minimized = minimize;
-
-// enable/disable sound on focus gain/loss
-	if (!ActiveApp && sound_active)
-	{
-		S_BlockSound ();
-		sound_active = false;
-	}
-	else if (ActiveApp && !sound_active)
-	{
-		S_UnblockSound ();
-		sound_active = true;
-	}
-
-	if (fActive)
-	{
-		if (modestate == MS_FULLDIB)
-		{
-			IN_ActivateMouse ();
-			IN_HideMouse ();
-			if (vid_canalttab && vid_wassuspended) {
-				vid_wassuspended = false;
-				ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN);
-				ShowWindow(mainwindow, SW_SHOWNORMAL);
-			}
-		}
-		else if ((modestate == MS_WINDOWED) && _windowed_mouse.value && key_dest == key_game)
-		{
-			IN_ActivateMouse ();
-			IN_HideMouse ();
-		}
-	}
-
-	if (!fActive)
-	{
-		if (modestate == MS_FULLDIB)
-		{
-			IN_DeactivateMouse ();
-			IN_ShowMouse ();
-			if (vid_canalttab) { 
-				ChangeDisplaySettings (NULL, 0);
-				vid_wassuspended = true;
-			}
-		}
-		else if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
-		{
-			IN_DeactivateMouse ();
-			IN_ShowMouse ();
-		}
-	}
-}
-
-
-/* main window procedure */
-LONG WINAPI MainWndProc (
-    HWND    hWnd,
-    UINT    uMsg,
-    WPARAM  wParam,
-    LPARAM  lParam)
-{
-    LONG    lRet = 1;
-	int		fwKeys, xPos, yPos, fActive, fMinimized, temp;
-	extern unsigned int uiWheelMessage;
-
-	if ( uMsg == uiWheelMessage )
-		uMsg = WM_MOUSEWHEEL;
-
-    switch (uMsg)
-    {
-		case WM_KILLFOCUS:
-			if (modestate == MS_FULLDIB)
-				ShowWindow(mainwindow, SW_SHOWMINNOACTIVE);
-			break;
-
-		case WM_CREATE:
-			break;
-
-		case WM_MOVE:
-			window_x = (int) LOWORD(lParam);
-			window_y = (int) HIWORD(lParam);
-			VID_UpdateWindowStatus ();
-			break;
-
-		case WM_KEYDOWN:
-		case WM_SYSKEYDOWN:
-			Key_Event (MapKey(lParam), true);
-			break;
-			
-		case WM_KEYUP:
-		case WM_SYSKEYUP:
-			Key_Event (MapKey(lParam), false);
-			break;
-
-		case WM_SYSCHAR:
-		// keep Alt-Space from happening
-			break;
-
-	// this is complicated because Win32 seems to pack multiple mouse events into
-	// one update sometimes, so we always check all states and look for events
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_RBUTTONDOWN:
-		case WM_RBUTTONUP:
-		case WM_MBUTTONDOWN:
-		case WM_MBUTTONUP:
-		case WM_MOUSEMOVE:
-			temp = 0;
-
-			if (wParam & MK_LBUTTON)
-				temp |= 1;
-
-			if (wParam & MK_RBUTTON)
-				temp |= 2;
-
-			if (wParam & MK_MBUTTON)
-				temp |= 4;
-
-			IN_MouseEvent (temp);
-
-			break;
-
-		// JACK: This is the mouse wheel with the Intellimouse
-		// Its delta is either positive or neg, and we generate the proper
-		// Event.
-		case WM_MOUSEWHEEL: 
-			if ((short) HIWORD(wParam) > 0) {
-				Key_Event(K_MWHEELUP, true);
-				Key_Event(K_MWHEELUP, false);
-			} else {
-				Key_Event(K_MWHEELDOWN, true);
-				Key_Event(K_MWHEELDOWN, false);
-			}
-			break;
-
-    	case WM_SIZE:
-            break;
-
-   	    case WM_CLOSE:
-			if (MessageBox (mainwindow, "Are you sure you want to quit?", "Confirm Exit",
-						MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION) == IDYES)
-			{
-				Sys_Quit ();
-			}
-
-	        break;
-
-		case WM_ACTIVATE:
-			fActive = LOWORD(wParam);
-			fMinimized = (BOOL) HIWORD(wParam);
-			AppActivate(!(fActive == WA_INACTIVE), fMinimized);
-
-		// fix the leftover Alt from any Alt-Tab or the like that switched us away
-			ClearAllStates ();
-
-			break;
-
-   	    case WM_DESTROY:
-        {
-			if (dibwindow)
-				DestroyWindow (dibwindow);
-
-            PostQuitMessage (0);
-        }
-        break;
-
-		case MM_MCINOTIFY:
-            lRet = CDAudio_MessageHandler (hWnd, uMsg, wParam, lParam);
-			break;
-
-    	default:
-            /* pass all unhandled messages to DefWindowProc */
-            lRet = DefWindowProc (hWnd, uMsg, wParam, lParam);
-        break;
-    }
-
-    /* return 1 if handled message, 0 if not */
-    return lRet;
-}
-
-
-/*
-=================
-VID_NumModes
-=================
-*/
-int VID_NumModes (void)
-{
-	return nummodes;
-}
-
-	
-/*
-=================
-VID_GetModePtr
-=================
-*/
-vmode_t *VID_GetModePtr (int modenum)
-{
-
-	if ((modenum >= 0) && (modenum < nummodes))
-		return &modelist[modenum];
-	else
-		return &badmode;
-}
-
-
-/*
-=================
-VID_GetModeDescription
-=================
-*/
-char *VID_GetModeDescription (int mode)
-{
-	char		*pinfo;
-	vmode_t		*pv;
-	static char	temp[100];
-
-	if ((mode < 0) || (mode >= nummodes))
-		return NULL;
-
-	if (!leavecurrentmode)
-	{
-		pv = VID_GetModePtr (mode);
-		pinfo = pv->modedesc;
-	}
-	else
-	{
-		sprintf (temp, "Desktop resolution (%dx%d)",
-				 modelist[MODE_FULLSCREEN_DEFAULT].width,
-				 modelist[MODE_FULLSCREEN_DEFAULT].height);
-		pinfo = temp;
-	}
-
-	return pinfo;
-}
-
-
-// KJB: Added this to return the mode driver name in description for console
-
-char *VID_GetExtModeDescription (int mode)
-{
-	static char	pinfo[40];
-	vmode_t		*pv;
-
-	if ((mode < 0) || (mode >= nummodes))
-		return NULL;
-
-	pv = VID_GetModePtr (mode);
-	if (modelist[mode].type == MS_FULLDIB)
-	{
-		if (!leavecurrentmode)
-		{
-			sprintf(pinfo,"%s fullscreen", pv->modedesc);
-		}
-		else
-		{
-			sprintf (pinfo, "Desktop resolution (%dx%d)",
-					 modelist[MODE_FULLSCREEN_DEFAULT].width,
-					 modelist[MODE_FULLSCREEN_DEFAULT].height);
-		}
-	}
-	else
-	{
-		if (modestate == MS_WINDOWED)
-			sprintf(pinfo, "%s windowed", pv->modedesc);
-		else
-			sprintf(pinfo, "windowed");
-	}
-
-	return pinfo;
-}
-
-
-/*
-=================
-VID_DescribeCurrentMode_f
-=================
-*/
-void VID_DescribeCurrentMode_f (void)
-{
-	Con_Printf ("%s\n", VID_GetExtModeDescription (vid_modenum));
-}
-
-
-/*
-=================
-VID_NumModes_f
-=================
-*/
-void VID_NumModes_f (void)
-{
-
-	if (nummodes == 1)
-		Con_Printf ("%d video mode is available\n", nummodes);
-	else
-		Con_Printf ("%d video modes are available\n", nummodes);
-}
-
-
-/*
-=================
-VID_DescribeMode_f
-=================
-*/
-void VID_DescribeMode_f (void)
-{
-	int		t, modenum;
-	
-	modenum = Q_atoi (Cmd_Argv(1));
-
-	t = leavecurrentmode;
-	leavecurrentmode = 0;
-
-	Con_Printf ("%s\n", VID_GetExtModeDescription (modenum));
-
-	leavecurrentmode = t;
-}
-
-
-/*
-=================
-VID_DescribeModes_f
-=================
-*/
-void VID_DescribeModes_f (void)
-{
-	int			i, lnummodes, t;
-	char		*pinfo;
-	vmode_t		*pv;
-
-	lnummodes = VID_NumModes ();
-
-	t = leavecurrentmode;
-	leavecurrentmode = 0;
-
-	for (i=1 ; i<lnummodes ; i++)
-	{
-		pv = VID_GetModePtr (i);
-		pinfo = VID_GetExtModeDescription (i);
-		Con_Printf ("%2d: %s\n", i, pinfo);
-	}
-
-	leavecurrentmode = t;
-}
-
-
-void VID_InitDIB (HINSTANCE hInstance)
-{
-	WNDCLASS		wc;
-	HDC				hdc;
-	int				i;
-
-	/* Register the frame class */
-    wc.style         = 0;
-    wc.lpfnWndProc   = (WNDPROC)MainWndProc;
-    wc.cbClsExtra    = 0;
-    wc.cbWndExtra    = 0;
-    wc.hInstance     = hInstance;
-    wc.hIcon         = 0;
-    wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
-	wc.hbrBackground = NULL;
-    wc.lpszMenuName  = 0;
-    wc.lpszClassName = "WinQuake";
-
-    if (!RegisterClass (&wc) )
-		Sys_Error ("Couldn't register window class");
-
-	modelist[0].type = MS_WINDOWED;
-
-	if (COM_CheckParm("-width"))
-		modelist[0].width = Q_atoi(com_argv[COM_CheckParm("-width")+1]);
-	else
-		modelist[0].width = 640;
-
-	if (modelist[0].width < 320)
-		modelist[0].width = 320;
-
-	if (COM_CheckParm("-height"))
-		modelist[0].height= Q_atoi(com_argv[COM_CheckParm("-height")+1]);
-	else
-		modelist[0].height = modelist[0].width * 240/320;
-
-	if (modelist[0].height < 240)
-		modelist[0].height = 240;
-
-	sprintf (modelist[0].modedesc, "%dx%d",
-			 modelist[0].width, modelist[0].height);
-
-	modelist[0].modenum = MODE_WINDOWED;
-	modelist[0].dib = 1;
-	modelist[0].fullscreen = 0;
-	modelist[0].halfscreen = 0;
-	modelist[0].bpp = 0;
-
-	nummodes = 1;
-}
-
-
-/*
-=================
-VID_InitFullDIB
-=================
-*/
-void VID_InitFullDIB (HINSTANCE hInstance)
-{
-	DEVMODE	devmode;
-	int		i, modenum, cmodes, originalnummodes, existingmode, numlowresmodes;
-	int		j, bpp, done;
-	BOOL	stat;
-
-// enumerate >8 bpp modes
-	originalnummodes = nummodes;
-	modenum = 0;
-
-	do
-	{
-		stat = EnumDisplaySettings (NULL, modenum, &devmode);
-
-		if ((devmode.dmBitsPerPel >= 15) &&
-			(devmode.dmPelsWidth <= MAXWIDTH) &&
-			(devmode.dmPelsHeight <= MAXHEIGHT) &&
-			(nummodes < MAX_MODE_LIST))
-		{
-			devmode.dmFields = DM_BITSPERPEL |
-							   DM_PELSWIDTH |
-							   DM_PELSHEIGHT;
-
-			if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-					DISP_CHANGE_SUCCESSFUL)
-			{
-				modelist[nummodes].type = MS_FULLDIB;
-				modelist[nummodes].width = devmode.dmPelsWidth;
-				modelist[nummodes].height = devmode.dmPelsHeight;
-				modelist[nummodes].modenum = 0;
-				modelist[nummodes].halfscreen = 0;
-				modelist[nummodes].dib = 1;
-				modelist[nummodes].fullscreen = 1;
-				modelist[nummodes].bpp = devmode.dmBitsPerPel;
-				sprintf (modelist[nummodes].modedesc, "%dx%dx%d",
-						 devmode.dmPelsWidth, devmode.dmPelsHeight,
-						 devmode.dmBitsPerPel);
-
-			// if the width is more than twice the height, reduce it by half because this
-			// is probably a dual-screen monitor
-				if (!COM_CheckParm("-noadjustaspect"))
-				{
-					if (modelist[nummodes].width > (modelist[nummodes].height << 1))
-					{
-						modelist[nummodes].width >>= 1;
-						modelist[nummodes].halfscreen = 1;
-						sprintf (modelist[nummodes].modedesc, "%dx%dx%d",
-								 modelist[nummodes].width,
-								 modelist[nummodes].height,
-								 modelist[nummodes].bpp);
-					}
-				}
-
-				for (i=originalnummodes, existingmode = 0 ; i<nummodes ; i++)
-				{
-					if ((modelist[nummodes].width == modelist[i].width)   &&
-						(modelist[nummodes].height == modelist[i].height) &&
-						(modelist[nummodes].bpp == modelist[i].bpp))
-					{
-						existingmode = 1;
-						break;
-					}
-				}
-
-				if (!existingmode)
-				{
-					nummodes++;
-				}
-			}
-		}
-
-		modenum++;
-	} while (stat);
-
-// see if there are any low-res modes that aren't being reported
-	numlowresmodes = sizeof(lowresmodes) / sizeof(lowresmodes[0]);
-	bpp = 16;
-	done = 0;
-
-	do
-	{
-		for (j=0 ; (j<numlowresmodes) && (nummodes < MAX_MODE_LIST) ; j++)
-		{
-			devmode.dmBitsPerPel = bpp;
-			devmode.dmPelsWidth = lowresmodes[j].width;
-			devmode.dmPelsHeight = lowresmodes[j].height;
-			devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-
-			if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-					DISP_CHANGE_SUCCESSFUL)
-			{
-				modelist[nummodes].type = MS_FULLDIB;
-				modelist[nummodes].width = devmode.dmPelsWidth;
-				modelist[nummodes].height = devmode.dmPelsHeight;
-				modelist[nummodes].modenum = 0;
-				modelist[nummodes].halfscreen = 0;
-				modelist[nummodes].dib = 1;
-				modelist[nummodes].fullscreen = 1;
-				modelist[nummodes].bpp = devmode.dmBitsPerPel;
-				sprintf (modelist[nummodes].modedesc, "%dx%dx%d",
-						 devmode.dmPelsWidth, devmode.dmPelsHeight,
-						 devmode.dmBitsPerPel);
-
-				for (i=originalnummodes, existingmode = 0 ; i<nummodes ; i++)
-				{
-					if ((modelist[nummodes].width == modelist[i].width)   &&
-						(modelist[nummodes].height == modelist[i].height) &&
-						(modelist[nummodes].bpp == modelist[i].bpp))
-					{
-						existingmode = 1;
-						break;
-					}
-				}
-
-				if (!existingmode)
-				{
-					nummodes++;
-				}
-			}
-		}
-		switch (bpp)
-		{
-			case 16:
-				bpp = 32;
-				break;
-
-			case 32:
-				bpp = 24;
-				break;
-
-			case 24:
-				done = 1;
-				break;
-		}
-	} while (!done);
-
-	if (nummodes == originalnummodes)
-		Con_SafePrintf ("No fullscreen DIB modes found\n");
-}
-
-qboolean VID_Is8bit() {
-	return is8bit;
-}
-
-#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB
-
-void VID_Init8bitPalette() 
-{
-	// Check for 8bit Extensions and initialize them.
-	int i;
-	char thePalette[256*3];
-	char *oldPalette, *newPalette;
-
-	glColorTableEXT = (void *)wglGetProcAddress("glColorTableEXT");
-    if (!glColorTableEXT || strstr(gl_extensions, "GL_EXT_shared_texture_palette") ||
-		COM_CheckParm("-no8bit"))
-		return;
-
-	Con_SafePrintf("8-bit GL extensions enabled.\n");
-    glEnable( GL_SHARED_TEXTURE_PALETTE_EXT );
-	oldPalette = (char *) d_8to24table; //d_8to24table3dfx;
-	newPalette = thePalette;
-	for (i=0;i<256;i++) {
-		*newPalette++ = *oldPalette++;
-		*newPalette++ = *oldPalette++;
-		*newPalette++ = *oldPalette++;
-		oldPalette++;
-	}
-	glColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE,
-		(void *) thePalette);
-	is8bit = TRUE;
-}
-
-static void Check_Gamma (unsigned char *pal)
-{
-	float	f, inf;
-	unsigned char	palette[768];
-	int		i;
-
-	if ((i = COM_CheckParm("-gamma")) == 0) {
-		if ((gl_renderer && strstr(gl_renderer, "Voodoo")) ||
-			(gl_vendor && strstr(gl_vendor, "3Dfx")))
-			vid_gamma = 1;
-		else
-			vid_gamma = 0.7; // default to 0.7 on non-3dfx hardware
-	} else
-		vid_gamma = Q_atof(com_argv[i+1]);
-
-	for (i=0 ; i<768 ; i++)
-	{
-		f = pow ( (pal[i]+1)/256.0 , vid_gamma );
-		inf = f*255 + 0.5;
-		if (inf < 0)
-			inf = 0;
-		if (inf > 255)
-			inf = 255;
-		palette[i] = inf;
-	}
-
-	memcpy (pal, palette, sizeof(palette));
-}
-
-/*
-===================
-VID_Init
-===================
-*/
-void	VID_Init (unsigned char *palette)
-{
-	int		i, existingmode;
-	int		basenummodes, width, height, bpp, findbpp, done;
-	byte	*ptmp;
-	char	gldir[MAX_OSPATH];
-	HDC		hdc;
-	DEVMODE	devmode;
-
-	memset(&devmode, 0, sizeof(devmode));
-
-	Cvar_RegisterVariable (&vid_mode);
-	Cvar_RegisterVariable (&vid_wait);
-	Cvar_RegisterVariable (&vid_nopageflip);
-	Cvar_RegisterVariable (&_vid_wait_override);
-	Cvar_RegisterVariable (&_vid_default_mode);
-	Cvar_RegisterVariable (&_vid_default_mode_win);
-	Cvar_RegisterVariable (&vid_config_x);
-	Cvar_RegisterVariable (&vid_config_y);
-	Cvar_RegisterVariable (&vid_stretch_by_2);
-	Cvar_RegisterVariable (&_windowed_mouse);
-	Cvar_RegisterVariable (&gl_ztrick);
-
-	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);
-	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f);
-	Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f);
-	Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f);
-
-	hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
-
-	InitCommonControls();
-
-	VID_InitDIB (global_hInstance);
-	basenummodes = nummodes = 1;
-
-	VID_InitFullDIB (global_hInstance);
-
-	if (COM_CheckParm("-window"))
-	{
-		hdc = GetDC (NULL);
-
-		if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
-		{
-			Sys_Error ("Can't run in non-RGB mode");
-		}
-
-		ReleaseDC (NULL, hdc);
-
-		windowed = true;
-
-		vid_default = MODE_WINDOWED;
-	}
-	else
-	{
-		if (nummodes == 1)
-			Sys_Error ("No RGB fullscreen modes available");
-
-		windowed = false;
-
-		if (COM_CheckParm("-mode"))
-		{
-			vid_default = Q_atoi(com_argv[COM_CheckParm("-mode")+1]);
-		}
-		else
-		{
-			if (COM_CheckParm("-current"))
-			{
-				modelist[MODE_FULLSCREEN_DEFAULT].width =
-						GetSystemMetrics (SM_CXSCREEN);
-				modelist[MODE_FULLSCREEN_DEFAULT].height =
-						GetSystemMetrics (SM_CYSCREEN);
-				vid_default = MODE_FULLSCREEN_DEFAULT;
-				leavecurrentmode = 1;
-			}
-			else
-			{
-				if (COM_CheckParm("-width"))
-				{
-					width = Q_atoi(com_argv[COM_CheckParm("-width")+1]);
-				}
-				else
-				{
-					width = 640;
-				}
-
-				if (COM_CheckParm("-bpp"))
-				{
-					bpp = Q_atoi(com_argv[COM_CheckParm("-bpp")+1]);
-					findbpp = 0;
-				}
-				else
-				{
-					bpp = 15;
-					findbpp = 1;
-				}
-
-				if (COM_CheckParm("-height"))
-					height = Q_atoi(com_argv[COM_CheckParm("-height")+1]);
-
-			// if they want to force it, add the specified mode to the list
-				if (COM_CheckParm("-force") && (nummodes < MAX_MODE_LIST))
-				{
-					modelist[nummodes].type = MS_FULLDIB;
-					modelist[nummodes].width = width;
-					modelist[nummodes].height = height;
-					modelist[nummodes].modenum = 0;
-					modelist[nummodes].halfscreen = 0;
-					modelist[nummodes].dib = 1;
-					modelist[nummodes].fullscreen = 1;
-					modelist[nummodes].bpp = bpp;
-					sprintf (modelist[nummodes].modedesc, "%dx%dx%d",
-							 devmode.dmPelsWidth, devmode.dmPelsHeight,
-							 devmode.dmBitsPerPel);
-
-					for (i=nummodes, existingmode = 0 ; i<nummodes ; i++)
-					{
-						if ((modelist[nummodes].width == modelist[i].width)   &&
-							(modelist[nummodes].height == modelist[i].height) &&
-							(modelist[nummodes].bpp == modelist[i].bpp))
-						{
-							existingmode = 1;
-							break;
-						}
-					}
-
-					if (!existingmode)
-					{
-						nummodes++;
-					}
-				}
-
-				done = 0;
-
-				do
-				{
-					if (COM_CheckParm("-height"))
-					{
-						height = Q_atoi(com_argv[COM_CheckParm("-height")+1]);
-
-						for (i=1, vid_default=0 ; i<nummodes ; i++)
-						{
-							if ((modelist[i].width == width) &&
-								(modelist[i].height == height) &&
-								(modelist[i].bpp == bpp))
-							{
-								vid_default = i;
-								done = 1;
-								break;
-							}
-						}
-					}
-					else
-					{
-						for (i=1, vid_default=0 ; i<nummodes ; i++)
-						{
-							if ((modelist[i].width == width) && (modelist[i].bpp == bpp))
-							{
-								vid_default = i;
-								done = 1;
-								break;
-							}
-						}
-					}
-
-					if (!done)
-					{
-						if (findbpp)
-						{
-							switch (bpp)
-							{
-							case 15:
-								bpp = 16;
-								break;
-							case 16:
-								bpp = 32;
-								break;
-							case 32:
-								bpp = 24;
-								break;
-							case 24:
-								done = 1;
-								break;
-							}
-						}
-						else
-						{
-							done = 1;
-						}
-					}
-				} while (!done);
-
-				if (!vid_default)
-				{
-					Sys_Error ("Specified video mode not available");
-				}
-			}
-		}
-	}
-
-	vid_initialized = true;
-
-	if ((i = COM_CheckParm("-conwidth")) != 0)
-		vid.conwidth = Q_atoi(com_argv[i+1]);
-	else
-		vid.conwidth = 640;
-
-	vid.conwidth &= 0xfff8; // make it a multiple of eight
-
-	if (vid.conwidth < 320)
-		vid.conwidth = 320;
-
-	// pick a conheight that matches with correct aspect
-	vid.conheight = vid.conwidth*3 / 4;
-
-	if ((i = COM_CheckParm("-conheight")) != 0)
-		vid.conheight = Q_atoi(com_argv[i+1]);
-	if (vid.conheight < 200)
-		vid.conheight = 200;
-
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.colormap = host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-
-	DestroyWindow (hwnd_dialog);
-
-	Check_Gamma(palette);
-	VID_SetPalette (palette);
-
-	VID_SetMode (vid_default, palette);
-
-    maindc = GetDC(mainwindow);
-	bSetupPixelFormat(maindc);
-
-    baseRC = wglCreateContext( maindc );
-	if (!baseRC)
-		Sys_Error ("Could not initialize GL (wglCreateContext failed).\n\nMake sure you in are 65535 color mode, and try running -window.");
-    if (!wglMakeCurrent( maindc, baseRC ))
-		Sys_Error ("wglMakeCurrent failed");
-
-	GL_Init ();
-
-	sprintf (gldir, "%s/glquake", com_gamedir);
-	Sys_mkdir (gldir);
-
-	vid_realmode = vid_modenum;
-
-	// Check for 3DFX Extensions and initialize them.
-	VID_Init8bitPalette();
-
-	vid_menudrawfn = VID_MenuDraw;
-	vid_menukeyfn = VID_MenuKey;
-
-	strcpy (badmode.modedesc, "Bad mode");
-	vid_canalttab = true;
-
-	if (COM_CheckParm("-fullsbar"))
-		fullsbardraw = true;
-}
-
-
-//========================================================
-// Video menu stuff
-//========================================================
-
-extern void M_Menu_Options_f (void);
-extern void M_Print (int cx, int cy, char *str);
-extern void M_PrintWhite (int cx, int cy, char *str);
-extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawTransPic (int x, int y, qpic_t *pic);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
-
-static int	vid_line, vid_wmodes;
-
-typedef struct
-{
-	int		modenum;
-	char	*desc;
-	int		iscur;
-} modedesc_t;
-
-#define MAX_COLUMN_SIZE		9
-#define MODE_AREA_HEIGHT	(MAX_COLUMN_SIZE + 2)
-#define MAX_MODEDESCS		(MAX_COLUMN_SIZE*3)
-
-static modedesc_t	modedescs[MAX_MODEDESCS];
-
-/*
-================
-VID_MenuDraw
-================
-*/
-void VID_MenuDraw (void)
-{
-	qpic_t		*p;
-	char		*ptr;
-	int			lnummodes, i, j, k, column, row, dup, dupmode;
-	char		temp[100];
-	vmode_t		*pv;
-
-	p = Draw_CachePic ("gfx/vidmodes.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, p);
-
-	vid_wmodes = 0;
-	lnummodes = VID_NumModes ();
-	
-	for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
-	{
-		ptr = VID_GetModeDescription (i);
-		pv = VID_GetModePtr (i);
-
-		k = vid_wmodes;
-
-		modedescs[k].modenum = i;
-		modedescs[k].desc = ptr;
-		modedescs[k].iscur = 0;
-
-		if (i == vid_modenum)
-			modedescs[k].iscur = 1;
-
-		vid_wmodes++;
-
-	}
-
-	if (vid_wmodes > 0)
-	{
-		M_Print (2*8, 36+0*8, "Fullscreen Modes (WIDTHxHEIGHTxBPP)");
-
-		column = 8;
-		row = 36+2*8;
-
-		for (i=0 ; i<vid_wmodes ; i++)
-		{
-			if (modedescs[i].iscur)
-				M_PrintWhite (column, row, modedescs[i].desc);
-			else
-				M_Print (column, row, modedescs[i].desc);
-
-			column += 13*8;
-
-			if ((i % VID_ROW_SIZE) == (VID_ROW_SIZE - 1))
-			{
-				column = 8;
-				row += 8;
-			}
-		}
-	}
-
-	M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*2,
-			 "Video modes must be set from the");
-	M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*3,
-			 "command line with -width <width>");
-	M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4,
-			 "and -bpp <bits-per-pixel>");
-	M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6,
-			 "Select windowed mode with -window");
-}
-
-
-/*
-================
-VID_MenuKey
-================
-*/
-void VID_MenuKey (int key)
-{
-	switch (key)
-	{
-	case K_ESCAPE:
-		S_LocalSound ("misc/menu1.wav");
-		M_Menu_Options_f ();
-		break;
-
-	default:
-		break;
-	}
-}
--- a/u/gl_warp.c
+++ /dev/null
@@ -1,1092 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// gl_warp.c -- sky and water polygons
-
-#include "quakedef.h"
-
-extern	model_t	*loadmodel;
-
-int		skytexturenum;
-
-int		solidskytexture;
-int		alphaskytexture;
-float	speedscale;		// for top sky and bottom sky
-
-msurface_t	*warpface;
-
-extern cvar_t gl_subdivide_size;
-
-void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
-{
-	int		i, j;
-	float	*v;
-
-	mins[0] = mins[1] = mins[2] = 9999;
-	maxs[0] = maxs[1] = maxs[2] = -9999;
-	v = verts;
-	for (i=0 ; i<numverts ; i++)
-		for (j=0 ; j<3 ; j++, v++)
-		{
-			if (*v < mins[j])
-				mins[j] = *v;
-			if (*v > maxs[j])
-				maxs[j] = *v;
-		}
-}
-
-void SubdividePolygon (int numverts, float *verts)
-{
-	int		i, j, k;
-	vec3_t	mins, maxs;
-	float	m;
-	float	*v;
-	vec3_t	front[64], back[64];
-	int		f, b;
-	float	dist[64];
-	float	frac;
-	glpoly_t	*poly;
-	float	s, t;
-
-	if (numverts > 60)
-		Sys_Error ("numverts = %i", numverts);
-
-	BoundPoly (numverts, verts, mins, maxs);
-
-	for (i=0 ; i<3 ; i++)
-	{
-		m = (mins[i] + maxs[i]) * 0.5;
-		m = gl_subdivide_size.value * floor (m/gl_subdivide_size.value + 0.5);
-		if (maxs[i] - m < 8)
-			continue;
-		if (m - mins[i] < 8)
-			continue;
-
-		// cut it
-		v = verts + i;
-		for (j=0 ; j<numverts ; j++, v+= 3)
-			dist[j] = *v - m;
-
-		// wrap cases
-		dist[j] = dist[0];
-		v-=i;
-		VectorCopy (verts, v);
-
-		f = b = 0;
-		v = verts;
-		for (j=0 ; j<numverts ; j++, v+= 3)
-		{
-			if (dist[j] >= 0)
-			{
-				VectorCopy (v, front[f]);
-				f++;
-			}
-			if (dist[j] <= 0)
-			{
-				VectorCopy (v, back[b]);
-				b++;
-			}
-			if (dist[j] == 0 || dist[j+1] == 0)
-				continue;
-			if ( (dist[j] > 0) != (dist[j+1] > 0) )
-			{
-				// clip point
-				frac = dist[j] / (dist[j] - dist[j+1]);
-				for (k=0 ; k<3 ; k++)
-					front[f][k] = back[b][k] = v[k] + frac*(v[3+k] - v[k]);
-				f++;
-				b++;
-			}
-		}
-
-		SubdividePolygon (f, front[0]);
-		SubdividePolygon (b, back[0]);
-		return;
-	}
-
-	poly = Hunk_Alloc (sizeof(glpoly_t) + (numverts-4) * VERTEXSIZE*sizeof(float));
-	poly->next = warpface->polys;
-	warpface->polys = poly;
-	poly->numverts = numverts;
-	for (i=0 ; i<numverts ; i++, verts+= 3)
-	{
-		VectorCopy (verts, poly->verts[i]);
-		s = DotProduct (verts, warpface->texinfo->vecs[0]);
-		t = DotProduct (verts, warpface->texinfo->vecs[1]);
-		poly->verts[i][3] = s;
-		poly->verts[i][4] = t;
-	}
-}
-
-/*
-================
-GL_SubdivideSurface
-
-Breaks a polygon up along axial 64 unit
-boundaries so that turbulent and sky warps
-can be done reasonably.
-================
-*/
-void GL_SubdivideSurface (msurface_t *fa)
-{
-	vec3_t		verts[64];
-	int			numverts;
-	int			i;
-	int			lindex;
-	float		*vec;
-	texture_t	*t;
-
-	warpface = fa;
-
-	//
-	// convert edges back to a normal polygon
-	//
-	numverts = 0;
-	for (i=0 ; i<fa->numedges ; i++)
-	{
-		lindex = loadmodel->surfedges[fa->firstedge + i];
-
-		if (lindex > 0)
-			vec = loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position;
-		else
-			vec = loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position;
-		VectorCopy (vec, verts[numverts]);
-		numverts++;
-	}
-
-	SubdividePolygon (numverts, verts[0]);
-}
-
-//=========================================================
-
-
-
-// speed up sin calculations - Ed
-float	turbsin[] =
-{
-	#include "gl_warp_sin.h"
-};
-#define TURBSCALE (256.0 / (2 * M_PI))
-
-/*
-=============
-EmitWaterPolys
-
-Does a water warp on the pre-fragmented glpoly_t chain
-=============
-*/
-void EmitWaterPolys (msurface_t *fa)
-{
-	glpoly_t	*p;
-	float		*v;
-	int			i;
-	float		s, t, os, ot;
-
-
-	for (p=fa->polys ; p ; p=p->next)
-	{
-		glBegin (GL_POLYGON);
-		for (i=0,v=p->verts[0] ; i<p->numverts ; i++, v+=VERTEXSIZE)
-		{
-			os = v[3];
-			ot = v[4];
-
-			s = os + turbsin[(int)((ot*0.125+realtime) * TURBSCALE) & 255];
-			s *= (1.0/64);
-
-			t = ot + turbsin[(int)((os*0.125+realtime) * TURBSCALE) & 255];
-			t *= (1.0/64);
-
-			glTexCoord2f (s, t);
-			glVertex3fv (v);
-		}
-		glEnd ();
-	}
-}
-
-
-
-
-/*
-=============
-EmitSkyPolys
-=============
-*/
-void EmitSkyPolys (msurface_t *fa)
-{
-	glpoly_t	*p;
-	float		*v;
-	int			i;
-	float	s, t;
-	vec3_t	dir;
-	float	length;
-
-	for (p=fa->polys ; p ; p=p->next)
-	{
-		glBegin (GL_POLYGON);
-		for (i=0,v=p->verts[0] ; i<p->numverts ; i++, v+=VERTEXSIZE)
-		{
-			VectorSubtract (v, r_origin, dir);
-			dir[2] *= 3;	// flatten the sphere
-
-			length = dir[0]*dir[0] + dir[1]*dir[1] + dir[2]*dir[2];
-			length = sqrt (length);
-			length = 6*63/length;
-
-			dir[0] *= length;
-			dir[1] *= length;
-
-			s = (speedscale + dir[0]) * (1.0/128);
-			t = (speedscale + dir[1]) * (1.0/128);
-
-			glTexCoord2f (s, t);
-			glVertex3fv (v);
-		}
-		glEnd ();
-	}
-}
-
-/*
-===============
-EmitBothSkyLayers
-
-Does a sky warp on the pre-fragmented glpoly_t chain
-This will be called for brushmodels, the world
-will have them chained together.
-===============
-*/
-void EmitBothSkyLayers (msurface_t *fa)
-{
-	int			i;
-	int			lindex;
-	float		*vec;
-
-	GL_DisableMultitexture();
-
-	GL_Bind (solidskytexture);
-	speedscale = realtime*8;
-	speedscale -= (int)speedscale & ~127 ;
-
-	EmitSkyPolys (fa);
-
-	glEnable (GL_BLEND);
-	GL_Bind (alphaskytexture);
-	speedscale = realtime*16;
-	speedscale -= (int)speedscale & ~127 ;
-
-	EmitSkyPolys (fa);
-
-	glDisable (GL_BLEND);
-}
-
-#ifndef QUAKE2
-/*
-=================
-R_DrawSkyChain
-=================
-*/
-void R_DrawSkyChain (msurface_t *s)
-{
-	msurface_t	*fa;
-
-	GL_DisableMultitexture();
-
-	// used when gl_texsort is on
-	GL_Bind(solidskytexture);
-	speedscale = realtime*8;
-	speedscale -= (int)speedscale & ~127 ;
-
-	for (fa=s ; fa ; fa=fa->texturechain)
-		EmitSkyPolys (fa);
-
-	glEnable (GL_BLEND);
-	GL_Bind (alphaskytexture);
-	speedscale = realtime*16;
-	speedscale -= (int)speedscale & ~127 ;
-
-	for (fa=s ; fa ; fa=fa->texturechain)
-		EmitSkyPolys (fa);
-
-	glDisable (GL_BLEND);
-}
-
-#endif
-
-/*
-=================================================================
-
-  Quake 2 environment sky
-
-=================================================================
-*/
-
-#ifdef QUAKE2
-
-
-#define	SKY_TEX		2000
-
-/*
-=================================================================
-
-  PCX Loading
-
-=================================================================
-*/
-
-typedef struct
-{
-    char	manufacturer;
-    char	version;
-    char	encoding;
-    char	bits_per_pixel;
-    unsigned short	xmin,ymin,xmax,ymax;
-    unsigned short	hres,vres;
-    unsigned char	palette[48];
-    char	reserved;
-    char	color_planes;
-    unsigned short	bytes_per_line;
-    unsigned short	palette_type;
-    char	filler[58];
-    unsigned 	data;			// unbounded
-} pcx_t;
-
-byte	*pcx_rgb;
-
-/*
-============
-LoadPCX
-============
-*/
-void LoadPCX (FILE *f)
-{
-	pcx_t	*pcx, pcxbuf;
-	byte	palette[768];
-	byte	*pix;
-	int		x, y;
-	int		dataByte, runLength;
-	int		count;
-
-//
-// parse the PCX file
-//
-	fread (&pcxbuf, 1, sizeof(pcxbuf), f);
-
-	pcx = &pcxbuf;
-
-	if (pcx->manufacturer != 0x0a
-		|| pcx->version != 5
-		|| pcx->encoding != 1
-		|| pcx->bits_per_pixel != 8
-		|| pcx->xmax >= 320
-		|| pcx->ymax >= 256)
-	{
-		Con_Printf ("Bad pcx file\n");
-		return;
-	}
-
-	// seek to palette
-	fseek (f, -768, SEEK_END);
-	fread (palette, 1, 768, f);
-
-	fseek (f, sizeof(pcxbuf) - 4, SEEK_SET);
-
-	count = (pcx->xmax+1) * (pcx->ymax+1);
-	pcx_rgb = malloc( count * 4);
-
-	for (y=0 ; y<=pcx->ymax ; y++)
-	{
-		pix = pcx_rgb + 4*y*(pcx->xmax+1);
-		for (x=0 ; x<=pcx->ymax ; )
-		{
-			dataByte = fgetc(f);
-
-			if((dataByte & 0xC0) == 0xC0)
-			{
-				runLength = dataByte & 0x3F;
-				dataByte = fgetc(f);
-			}
-			else
-				runLength = 1;
-
-			while(runLength-- > 0)
-			{
-				pix[0] = palette[dataByte*3];
-				pix[1] = palette[dataByte*3+1];
-				pix[2] = palette[dataByte*3+2];
-				pix[3] = 255;
-				pix += 4;
-				x++;
-			}
-		}
-	}
-}
-
-/*
-=========================================================
-
-TARGA LOADING
-
-=========================================================
-*/
-
-typedef struct _TargaHeader {
-	unsigned char 	id_length, colormap_type, image_type;
-	unsigned short	colormap_index, colormap_length;
-	unsigned char	colormap_size;
-	unsigned short	x_origin, y_origin, width, height;
-	unsigned char	pixel_size, attributes;
-} TargaHeader;
-
-
-TargaHeader		targa_header;
-byte			*targa_rgba;
-
-int fgetLittleShort (FILE *f)
-{
-	byte	b1, b2;
-
-	b1 = fgetc(f);
-	b2 = fgetc(f);
-
-	return (short)(b1 + b2*256);
-}
-
-int fgetLittleLong (FILE *f)
-{
-	byte	b1, b2, b3, b4;
-
-	b1 = fgetc(f);
-	b2 = fgetc(f);
-	b3 = fgetc(f);
-	b4 = fgetc(f);
-
-	return b1 + (b2<<8) + (b3<<16) + (b4<<24);
-}
-
-
-/*
-=============
-LoadTGA
-=============
-*/
-void LoadTGA (FILE *fin)
-{
-	int				columns, rows, numPixels;
-	byte			*pixbuf;
-	int				row, column;
-
-	targa_header.id_length = fgetc(fin);
-	targa_header.colormap_type = fgetc(fin);
-	targa_header.image_type = fgetc(fin);
-	
-	targa_header.colormap_index = fgetLittleShort(fin);
-	targa_header.colormap_length = fgetLittleShort(fin);
-	targa_header.colormap_size = fgetc(fin);
-	targa_header.x_origin = fgetLittleShort(fin);
-	targa_header.y_origin = fgetLittleShort(fin);
-	targa_header.width = fgetLittleShort(fin);
-	targa_header.height = fgetLittleShort(fin);
-	targa_header.pixel_size = fgetc(fin);
-	targa_header.attributes = fgetc(fin);
-
-	if (targa_header.image_type!=2 
-		&& targa_header.image_type!=10) 
-		Sys_Error ("LoadTGA: Only type 2 and 10 targa RGB images supported\n");
-
-	if (targa_header.colormap_type !=0 
-		|| (targa_header.pixel_size!=32 && targa_header.pixel_size!=24))
-		Sys_Error ("Texture_LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
-
-	columns = targa_header.width;
-	rows = targa_header.height;
-	numPixels = columns * rows;
-
-	targa_rgba = malloc (numPixels*4);
-	
-	if (targa_header.id_length != 0)
-		fseek(fin, targa_header.id_length, SEEK_CUR);  // skip TARGA image comment
-	
-	if (targa_header.image_type==2) {  // Uncompressed, RGB images
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; column++) {
-				unsigned char red,green,blue,alphabyte;
-				switch (targa_header.pixel_size) {
-					case 24:
-							
-							blue = getc(fin);
-							green = getc(fin);
-							red = getc(fin);
-							*pixbuf++ = red;
-							*pixbuf++ = green;
-							*pixbuf++ = blue;
-							*pixbuf++ = 255;
-							break;
-					case 32:
-							blue = getc(fin);
-							green = getc(fin);
-							red = getc(fin);
-							alphabyte = getc(fin);
-							*pixbuf++ = red;
-							*pixbuf++ = green;
-							*pixbuf++ = blue;
-							*pixbuf++ = alphabyte;
-							break;
-				}
-			}
-		}
-	}
-	else if (targa_header.image_type==10) {   // Runlength encoded RGB images
-		unsigned char red,green,blue,alphabyte,packetHeader,packetSize,j;
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; ) {
-				packetHeader=getc(fin);
-				packetSize = 1 + (packetHeader & 0x7f);
-				if (packetHeader & 0x80) {        // run-length packet
-					switch (targa_header.pixel_size) {
-						case 24:
-								blue = getc(fin);
-								green = getc(fin);
-								red = getc(fin);
-								alphabyte = 255;
-								break;
-						case 32:
-								blue = getc(fin);
-								green = getc(fin);
-								red = getc(fin);
-								alphabyte = getc(fin);
-								break;
-					}
-	
-					for(j=0;j<packetSize;j++) {
-						*pixbuf++=red;
-						*pixbuf++=green;
-						*pixbuf++=blue;
-						*pixbuf++=alphabyte;
-						column++;
-						if (column==columns) { // run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}
-					}
-				}
-				else {                            // non run-length packet
-					for(j=0;j<packetSize;j++) {
-						switch (targa_header.pixel_size) {
-							case 24:
-									blue = getc(fin);
-									green = getc(fin);
-									red = getc(fin);
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = 255;
-									break;
-							case 32:
-									blue = getc(fin);
-									green = getc(fin);
-									red = getc(fin);
-									alphabyte = getc(fin);
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = alphabyte;
-									break;
-						}
-						column++;
-						if (column==columns) { // pixel packet run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}						
-					}
-				}
-			}
-			breakOut:;
-		}
-	}
-	
-	fclose(fin);
-}
-
-/*
-==================
-R_LoadSkys
-==================
-*/
-char	*suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
-void R_LoadSkys (void)
-{
-	int		i;
-	FILE	*f;
-	char	name[64];
-
-	for (i=0 ; i<6 ; i++)
-	{
-		GL_Bind (SKY_TEX + i);
-		sprintf (name, "gfx/env/bkgtst%s.tga", suf[i]);
-		COM_FOpenFile (name, &f);
-		if (!f)
-		{
-			Con_Printf ("Couldn't load %s\n", name);
-			continue;
-		}
-		LoadTGA (f);
-//		LoadPCX (f);
-
-		glTexImage2D (GL_TEXTURE_2D, 0, gl_solid_format, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, targa_rgba);
-//		glTexImage2D (GL_TEXTURE_2D, 0, gl_solid_format, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, pcx_rgb);
-
-		free (targa_rgba);
-//		free (pcx_rgb);
-
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	}
-}
-
-
-vec3_t	skyclip[6] = {
-	{1,1,0},
-	{1,-1,0},
-	{0,-1,1},
-	{0,1,1},
-	{1,0,1},
-	{-1,0,1} 
-};
-int	c_sky;
-
-// 1 = s, 2 = t, 3 = 2048
-int	st_to_vec[6][3] =
-{
-	{3,-1,2},
-	{-3,1,2},
-
-	{1,3,2},
-	{-1,-3,2},
-
-	{-2,-1,3},		// 0 degrees yaw, look straight up
-	{2,-1,-3}		// look straight down
-
-//	{-1,2,3},
-//	{1,2,-3}
-};
-
-// s = [0]/[2], t = [1]/[2]
-int	vec_to_st[6][3] =
-{
-	{-2,3,1},
-	{2,3,-1},
-
-	{1,3,2},
-	{-1,3,-2},
-
-	{-2,-1,3},
-	{-2,1,-3}
-
-//	{-1,2,3},
-//	{1,2,-3}
-};
-
-float	skymins[2][6], skymaxs[2][6];
-
-void DrawSkyPolygon (int nump, vec3_t vecs)
-{
-	int		i,j;
-	vec3_t	v, av;
-	float	s, t, dv;
-	int		axis;
-	float	*vp;
-
-	c_sky++;
-#if 0
-glBegin (GL_POLYGON);
-for (i=0 ; i<nump ; i++, vecs+=3)
-{
-	VectorAdd(vecs, r_origin, v);
-	glVertex3fv (v);
-}
-glEnd();
-return;
-#endif
-	// decide which face it maps to
-	VectorCopy (vec3_origin, v);
-	for (i=0, vp=vecs ; i<nump ; i++, vp+=3)
-	{
-		VectorAdd (vp, v, v);
-	}
-	av[0] = fabs(v[0]);
-	av[1] = fabs(v[1]);
-	av[2] = fabs(v[2]);
-	if (av[0] > av[1] && av[0] > av[2])
-	{
-		if (v[0] < 0)
-			axis = 1;
-		else
-			axis = 0;
-	}
-	else if (av[1] > av[2] && av[1] > av[0])
-	{
-		if (v[1] < 0)
-			axis = 3;
-		else
-			axis = 2;
-	}
-	else
-	{
-		if (v[2] < 0)
-			axis = 5;
-		else
-			axis = 4;
-	}
-
-	// project new texture coords
-	for (i=0 ; i<nump ; i++, vecs+=3)
-	{
-		j = vec_to_st[axis][2];
-		if (j > 0)
-			dv = vecs[j - 1];
-		else
-			dv = -vecs[-j - 1];
-
-		j = vec_to_st[axis][0];
-		if (j < 0)
-			s = -vecs[-j -1] / dv;
-		else
-			s = vecs[j-1] / dv;
-		j = vec_to_st[axis][1];
-		if (j < 0)
-			t = -vecs[-j -1] / dv;
-		else
-			t = vecs[j-1] / dv;
-
-		if (s < skymins[0][axis])
-			skymins[0][axis] = s;
-		if (t < skymins[1][axis])
-			skymins[1][axis] = t;
-		if (s > skymaxs[0][axis])
-			skymaxs[0][axis] = s;
-		if (t > skymaxs[1][axis])
-			skymaxs[1][axis] = t;
-	}
-}
-
-#define	MAX_CLIP_VERTS	64
-void ClipSkyPolygon (int nump, vec3_t vecs, int stage)
-{
-	float	*norm;
-	float	*v;
-	qboolean	front, back;
-	float	d, e;
-	float	dists[MAX_CLIP_VERTS];
-	int		sides[MAX_CLIP_VERTS];
-	vec3_t	newv[2][MAX_CLIP_VERTS];
-	int		newc[2];
-	int		i, j;
-
-	if (nump > MAX_CLIP_VERTS-2)
-		Sys_Error ("ClipSkyPolygon: MAX_CLIP_VERTS");
-	if (stage == 6)
-	{	// fully clipped, so draw it
-		DrawSkyPolygon (nump, vecs);
-		return;
-	}
-
-	front = back = false;
-	norm = skyclip[stage];
-	for (i=0, v = vecs ; i<nump ; i++, v+=3)
-	{
-		d = DotProduct (v, norm);
-		if (d > ON_EPSILON)
-		{
-			front = true;
-			sides[i] = SIDE_FRONT;
-		}
-		else if (d < ON_EPSILON)
-		{
-			back = true;
-			sides[i] = SIDE_BACK;
-		}
-		else
-			sides[i] = SIDE_ON;
-		dists[i] = d;
-	}
-
-	if (!front || !back)
-	{	// not clipped
-		ClipSkyPolygon (nump, vecs, stage+1);
-		return;
-	}
-
-	// clip it
-	sides[i] = sides[0];
-	dists[i] = dists[0];
-	VectorCopy (vecs, (vecs+(i*3)) );
-	newc[0] = newc[1] = 0;
-
-	for (i=0, v = vecs ; i<nump ; i++, v+=3)
-	{
-		switch (sides[i])
-		{
-		case SIDE_FRONT:
-			VectorCopy (v, newv[0][newc[0]]);
-			newc[0]++;
-			break;
-		case SIDE_BACK:
-			VectorCopy (v, newv[1][newc[1]]);
-			newc[1]++;
-			break;
-		case SIDE_ON:
-			VectorCopy (v, newv[0][newc[0]]);
-			newc[0]++;
-			VectorCopy (v, newv[1][newc[1]]);
-			newc[1]++;
-			break;
-		}
-
-		if (sides[i] == SIDE_ON || sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
-			continue;
-
-		d = dists[i] / (dists[i] - dists[i+1]);
-		for (j=0 ; j<3 ; j++)
-		{
-			e = v[j] + d*(v[j+3] - v[j]);
-			newv[0][newc[0]][j] = e;
-			newv[1][newc[1]][j] = e;
-		}
-		newc[0]++;
-		newc[1]++;
-	}
-
-	// continue
-	ClipSkyPolygon (newc[0], newv[0][0], stage+1);
-	ClipSkyPolygon (newc[1], newv[1][0], stage+1);
-}
-
-/*
-=================
-R_DrawSkyChain
-=================
-*/
-void R_DrawSkyChain (msurface_t *s)
-{
-	msurface_t	*fa;
-
-	int		i;
-	vec3_t	verts[MAX_CLIP_VERTS];
-	glpoly_t	*p;
-
-	c_sky = 0;
-	GL_Bind(solidskytexture);
-
-	// calculate vertex values for sky box
-
-	for (fa=s ; fa ; fa=fa->texturechain)
-	{
-		for (p=fa->polys ; p ; p=p->next)
-		{
-			for (i=0 ; i<p->numverts ; i++)
-			{
-				VectorSubtract (p->verts[i], r_origin, verts[i]);
-			}
-			ClipSkyPolygon (p->numverts, verts[0], 0);
-		}
-	}
-}
-
-
-/*
-==============
-R_ClearSkyBox
-==============
-*/
-void R_ClearSkyBox (void)
-{
-	int		i;
-
-	for (i=0 ; i<6 ; i++)
-	{
-		skymins[0][i] = skymins[1][i] = 9999;
-		skymaxs[0][i] = skymaxs[1][i] = -9999;
-	}
-}
-
-
-void MakeSkyVec (float s, float t, int axis)
-{
-	vec3_t		v, b;
-	int			j, k;
-
-	b[0] = s*2048;
-	b[1] = t*2048;
-	b[2] = 2048;
-
-	for (j=0 ; j<3 ; j++)
-	{
-		k = st_to_vec[axis][j];
-		if (k < 0)
-			v[j] = -b[-k - 1];
-		else
-			v[j] = b[k - 1];
-		v[j] += r_origin[j];
-	}
-
-	// avoid bilerp seam
-	s = (s+1)*0.5;
-	t = (t+1)*0.5;
-
-	if (s < 1.0/512)
-		s = 1.0/512;
-	else if (s > 511.0/512)
-		s = 511.0/512;
-	if (t < 1.0/512)
-		t = 1.0/512;
-	else if (t > 511.0/512)
-		t = 511.0/512;
-
-	t = 1.0 - t;
-	glTexCoord2f (s, t);
-	glVertex3fv (v);
-}
-
-/*
-==============
-R_DrawSkyBox
-==============
-*/
-int	skytexorder[6] = {0,2,1,3,4,5};
-void R_DrawSkyBox (void)
-{
-	int		i, j, k;
-	vec3_t	v;
-	float	s, t;
-
-#if 0
-glEnable (GL_BLEND);
-glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-glColor4f (1,1,1,0.5);
-glDisable (GL_DEPTH_TEST);
-#endif
-	for (i=0 ; i<6 ; i++)
-	{
-		if (skymins[0][i] >= skymaxs[0][i]
-		|| skymins[1][i] >= skymaxs[1][i])
-			continue;
-
-		GL_Bind (SKY_TEX+skytexorder[i]);
-#if 0
-skymins[0][i] = -1;
-skymins[1][i] = -1;
-skymaxs[0][i] = 1;
-skymaxs[1][i] = 1;
-#endif
-		glBegin (GL_QUADS);
-		MakeSkyVec (skymins[0][i], skymins[1][i], i);
-		MakeSkyVec (skymins[0][i], skymaxs[1][i], i);
-		MakeSkyVec (skymaxs[0][i], skymaxs[1][i], i);
-		MakeSkyVec (skymaxs[0][i], skymins[1][i], i);
-		glEnd ();
-	}
-#if 0
-glDisable (GL_BLEND);
-glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-glColor4f (1,1,1,0.5);
-glEnable (GL_DEPTH_TEST);
-#endif
-}
-
-
-#endif
-
-//===============================================================
-
-/*
-=============
-R_InitSky
-
-A sky texture is 256*128, with the right side being a masked overlay
-==============
-*/
-void R_InitSky (texture_t *mt)
-{
-	int			i, j, p;
-	byte		*src;
-	unsigned	trans[128*128];
-	unsigned	transpix;
-	int			r, g, b;
-	unsigned	*rgba;
-	extern	int			skytexturenum;
-
-	src = (byte *)mt + mt->offsets[0];
-
-	// make an average value for the back to avoid
-	// a fringe on the top level
-
-	r = g = b = 0;
-	for (i=0 ; i<128 ; i++)
-		for (j=0 ; j<128 ; j++)
-		{
-			p = src[i*256 + j + 128];
-			rgba = &d_8to24table[p];
-			trans[(i*128) + j] = *rgba;
-			r += ((byte *)rgba)[0];
-			g += ((byte *)rgba)[1];
-			b += ((byte *)rgba)[2];
-		}
-
-	((byte *)&transpix)[0] = r/(128*128);
-	((byte *)&transpix)[1] = g/(128*128);
-	((byte *)&transpix)[2] = b/(128*128);
-	((byte *)&transpix)[3] = 0;
-
-
-	if (!solidskytexture)
-		solidskytexture = texture_extension_number++;
-	GL_Bind (solidskytexture );
-	glTexImage2D (GL_TEXTURE_2D, 0, gl_solid_format, 128, 128, 0, GL_RGBA, GL_UNSIGNED_BYTE, trans);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-
-	for (i=0 ; i<128 ; i++)
-		for (j=0 ; j<128 ; j++)
-		{
-			p = src[i*256 + j];
-			if (p == 0)
-				trans[(i*128) + j] = transpix;
-			else
-				trans[(i*128) + j] = d_8to24table[p];
-		}
-
-	if (!alphaskytexture)
-		alphaskytexture = texture_extension_number++;
-	GL_Bind(alphaskytexture);
-	glTexImage2D (GL_TEXTURE_2D, 0, gl_alpha_format, 128, 128, 0, GL_RGBA, GL_UNSIGNED_BYTE, trans);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-}
-
--- a/u/gl_warp_sin.h
+++ /dev/null
@@ -1,51 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
- 0, 0.19633, 0.392541, 0.588517, 0.784137, 0.979285, 1.17384, 1.3677,
- 1.56072, 1.75281, 1.94384, 2.1337, 2.32228, 2.50945, 2.69512, 2.87916,
- 3.06147, 3.24193, 3.42044, 3.59689, 3.77117, 3.94319, 4.11282, 4.27998,
- 4.44456, 4.60647, 4.76559, 4.92185, 5.07515, 5.22538, 5.37247, 5.51632,
- 5.65685, 5.79398, 5.92761, 6.05767, 6.18408, 6.30677, 6.42566, 6.54068,
- 6.65176, 6.75883, 6.86183, 6.9607, 7.05537, 7.14579, 7.23191, 7.31368,
- 7.39104, 7.46394, 7.53235, 7.59623, 7.65552, 7.71021, 7.76025, 7.80562,
- 7.84628, 7.88222, 7.91341, 7.93984, 7.96148, 7.97832, 7.99036, 7.99759,
- 8, 7.99759, 7.99036, 7.97832, 7.96148, 7.93984, 7.91341, 7.88222,
- 7.84628, 7.80562, 7.76025, 7.71021, 7.65552, 7.59623, 7.53235, 7.46394,
- 7.39104, 7.31368, 7.23191, 7.14579, 7.05537, 6.9607, 6.86183, 6.75883,
- 6.65176, 6.54068, 6.42566, 6.30677, 6.18408, 6.05767, 5.92761, 5.79398,
- 5.65685, 5.51632, 5.37247, 5.22538, 5.07515, 4.92185, 4.76559, 4.60647,
- 4.44456, 4.27998, 4.11282, 3.94319, 3.77117, 3.59689, 3.42044, 3.24193,
- 3.06147, 2.87916, 2.69512, 2.50945, 2.32228, 2.1337, 1.94384, 1.75281,
- 1.56072, 1.3677, 1.17384, 0.979285, 0.784137, 0.588517, 0.392541, 0.19633,
- 9.79717e-16, -0.19633, -0.392541, -0.588517, -0.784137, -0.979285, -1.17384, -1.3677,
- -1.56072, -1.75281, -1.94384, -2.1337, -2.32228, -2.50945, -2.69512, -2.87916,
- -3.06147, -3.24193, -3.42044, -3.59689, -3.77117, -3.94319, -4.11282, -4.27998,
- -4.44456, -4.60647, -4.76559, -4.92185, -5.07515, -5.22538, -5.37247, -5.51632,
- -5.65685, -5.79398, -5.92761, -6.05767, -6.18408, -6.30677, -6.42566, -6.54068,
- -6.65176, -6.75883, -6.86183, -6.9607, -7.05537, -7.14579, -7.23191, -7.31368,
- -7.39104, -7.46394, -7.53235, -7.59623, -7.65552, -7.71021, -7.76025, -7.80562,
- -7.84628, -7.88222, -7.91341, -7.93984, -7.96148, -7.97832, -7.99036, -7.99759,
- -8, -7.99759, -7.99036, -7.97832, -7.96148, -7.93984, -7.91341, -7.88222,
- -7.84628, -7.80562, -7.76025, -7.71021, -7.65552, -7.59623, -7.53235, -7.46394,
- -7.39104, -7.31368, -7.23191, -7.14579, -7.05537, -6.9607, -6.86183, -6.75883,
- -6.65176, -6.54068, -6.42566, -6.30677, -6.18408, -6.05767, -5.92761, -5.79398,
- -5.65685, -5.51632, -5.37247, -5.22538, -5.07515, -4.92185, -4.76559, -4.60647,
- -4.44456, -4.27998, -4.11282, -3.94319, -3.77117, -3.59689, -3.42044, -3.24193,
- -3.06147, -2.87916, -2.69512, -2.50945, -2.32228, -2.1337, -1.94384, -1.75281,
- -1.56072, -1.3677, -1.17384, -0.979285, -0.784137, -0.588517, -0.392541, -0.19633,
--- a/u/glqnotes.txt
+++ /dev/null
@@ -1,171 +1,0 @@
-Glquake v0.99, Quake v1.09 release notes
-
-3dfx owners -- read the 3dfx.txt file.
-
-On a standard OpenGL system, all you should need to do to run glquake is put 
-glquake.exe in your quake directory, and run it from there.  DO NOT install 
-the opengl32.dll unless you have a 3dfx!  Glquake should change the screen 
-resolution to 640*480*32k colors and run full screen by default.
-
-If you are running win-95, your desktop must be set to 32k or 64k colors 
-before running glquake.  NT can switch automatically.
-
-Theoretically, glquake will run on any compliant OpenGL that supports the 
-texture objects extensions, but unless it is very powerfull hardware that 
-accelerates everything needed, the game play will not be acceptable.  If it 
-has to go through any software emulation paths, the performance will likely 
-by well under one frame per second.
-
-3dfx has provided an opengl32.dll that implements everything glquake needs, 
-but it is not a full opengl implementation.  Other opengl applications are 
-very unlikely to work with it, so consider it basically a "glquake driver".  
-See the encluded 3dfx.txt for specific instalation notes.  3dfx can only run 
-full screen, but you must still have your desktop set to a 16 bit color mode 
-for glquake to start.
-
-resolution options
-------------------
-We had dynamic resolution changing in glquake for a while, but every single 
-opengl driver I tried it on messed up in one way or another, so it is now 
-limited to startup time only.
-
-glquake -window
-This will start glquake in a window on your desktop instead of switching the 
-screen to lower resolution and covering everything.
-
-glquake -width 800 -height 600
-Tries to run glquake at the specified resolution.  Combined with -window, it 
-creates a desktop window that size, otherwise it tries to set a full screen 
-resolution.
-
-You can also specify the resolution of the console independant of the screen
-resolution.
-
-glquake -conwidth 320
-This will specify a console resolution of 320 by 240 (the height is
-automatically determined by the default 4:3 aspect ratio, you can also
-specify the height directly with -conheight).
-
-In higher resolution modes such as 800x600 and 1024x768, glquake will default
-to a 640x480 console, since the font becomes small enough at higher 
-resolutions to become unreadable.  If do you wish to have a higher resolution
-console and status bar, specify it as well, such as:
-glquake -width 800 -height 600 -conwidth 800
-
-texture options
----------------
-The amount of textures used in the game can have a large impact on performance.  
-There are several options that let you trade off visual quality for better 
-performance.
-
-There is no way to flush already loaded textures, so it is best to change 
-these options on the command line, or they will only take effect on some of 
-the textures when you change levels.
-
-OpenGL only allows textures to repeat on power of two boundaries (32, 64, 
-128, etc), but software quake had a number of textures that repeated at 24 
-or 96 pixel boundaries.  These need to be either stretched out to the next 
-higher size, or shrunk down to the next lower.  By default, they are filtered 
-down to the smaller size, but you can cause it to use the larger size if you 
-really want by using: 
-
-glquake +gl_round_down 0
-This will generally run well on a normal 4 MB 3dfx card, but for other cards 
-that have either worse texture management or slower texture swapping speeds, 
-there are some additional settings that can drastically lower the amount of 
-textures to be managed.
-
-glquake +gl_picmip 1
-This causes all textures to have one half the dimensions they otherwise would.  
-This makes them blurry, but very small.  You can set this to 2 to make the 
-textures one quarter the resolution on each axis for REALLY blurry textures.
-
-glquake +gl_playermip 1
-This is similar to picmip, but is only used for other players in deathmatch.  
-Each player in a deathmatch requires an individual skin texture, so this can 
-be a serious problem for texture management.  It wouldn't be unreasonable to 
-set this to 2 or even 3 if you are playing competatively (and don't care if 
-the other guys have smudged skins).  If you change this during the game, it 
-will take effect as soon as a player changes their skin colors.
-
-GLQuake also supports the following extensions for faster texture operation:
-
-GL_SGIS_multitexture
-Multitextures support allows certain hardware to render the world in one
-pass instead of two.  GLQuake uses two passes, one for the world textures
-and the second for the lightmaps that are blended on the textures.  On some
-hardware, with a GL_SIGS_multitexture supported OpenGL implementation, this
-can be done in one pass.  On hardware that supports this, you will get a
-60% to 100% increase in frame rate.  Currently, only 3DFX dual TMU cards
-(such as the Obsidian 2220) support this extension, but other hardware will
-soon follow.
-
-This extension will be autodetected and used.  If for some reason it is not
-working correctly, specify the command line option "-nomtex" to disable it.
-
-GL_EXT_shared_texture_palette
-GLQuake uses 16bit textures by default but on OpenGL implementations 
-that support the GL_EXT_shared_texture_palette extension, GLQuake will use
-8bit textures instead.  This results in using half the needed texture memory
-of 16bit texture and can improve performance.  This is very little difference
-in visual quality due to the fact that the textures are 8bit sources to
-begin with.
-
-run time options
-----------------
-At the console, you can set these values to effect drawing.
-
-gl_texturemode GL_NEAREST
-Sets texture mapping to point sampled, which may be faster on some GL systems 
-(not on 3dfx).
-
-gl_texturemode GL_LINEAR_MIPMAP
-This is the default texture mode.
-
-gl_texturemode GL_LINEAR_MIPMAP_LINEAR
-This is the highest quality texture mapping (trilinear), but only very high 
-end hardware (intergraph intense 3D / realizm) supports it.  Not that big of 
-a deal, actually.
-
-gl_finish 0
-This causes the game to not issue a glFinish() call each frame, which may make 
-some hardware run faster.  If this is cleared, the 3dfx will back up a number 
-of frames and not be very playable.
-
-gl_flashblend 0
-By default, glquake just draws a shaded ball around objects that are emiting 
-light.  Clearing this variable will cause it to properly relight the world 
-like normal quake, but it can be a significant speed hit on some systems.
-
-gl_ztrick 0
-Glquake uses a buffering method that avoids clearing the Z buffer, but some 
-hardware platforms don't like it.  If the status bar and console are flashing 
-every other frame, clear this variable.
-
-gl_keeptjunctions 0
-If you clear this, glquake will remove colinear vertexes when it reloads the 
-level.  This can give a few percent speedup, but it can leave a couple stray 
-blinking pixels on the screen.
-
-novelty features
-----------------
-These are some rendering tricks that were easy to do in glquake.  They aren't 
-very robust, but they are pretty cool to look at.
-
-r_shadows 1
-This causes every object to cast a shadow.
-
-r_wateralpha 0.7
-This sets the opacity of water textures, so you can see through it in properly 
-processed maps.  0.3 is very faint, almost like fog.  1 is completely solid 
-(the default).  Unfortunately, the standard quake maps don't contain any 
-visibility information for seeing past water surfaces, so you can't just play 
-quake with this turned on.  If you just want to see what it looks like, you 
-can set "r_novis 1", but that will make things go very slow.  When I get a 
-chance, I will probably release some maps that have been processed properly 
-for this.
-
-r_mirroralpha 0.3
-This changes one particular texture (the stained glass texture in the EASY 
-start hall) into a mirror.  The value is the opacity of the mirror surface.
-
--- a/u/glquake.h
+++ /dev/null
@@ -1,251 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// disable data conversion warnings
-
-#pragma warning(disable : 4244)     // MIPS
-#pragma warning(disable : 4136)     // X86
-#pragma warning(disable : 4051)     // ALPHA
-  
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-void GL_BeginRendering (int *x, int *y, int *width, int *height);
-void GL_EndRendering (void);
-
-
-#ifdef _WIN32
-// Function prototypes for the Texture Object Extension routines
-typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *,
-                    const GLboolean *);
-typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint);
-typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *);
-typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *);
-typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint);
-typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *,
-                    const GLclampf *);
-typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *);
-
-extern	BINDTEXFUNCPTR bindTexFunc;
-extern	DELTEXFUNCPTR delTexFunc;
-extern	TEXSUBIMAGEPTR TexSubImage2DFunc;
-#endif
-
-extern	int texture_extension_number;
-extern	int		texture_mode;
-
-extern	float	gldepthmin, gldepthmax;
-
-void GL_Upload32 (unsigned *data, int width, int height,  qboolean mipmap, qboolean alpha);
-void GL_Upload8 (byte *data, int width, int height,  qboolean mipmap, qboolean alpha);
-int GL_LoadTexture (char *identifier, int width, int height, byte *data, qboolean mipmap, qboolean alpha);
-int GL_FindTexture (char *identifier);
-
-typedef struct
-{
-	float	x, y, z;
-	float	s, t;
-	float	r, g, b;
-} glvert_t;
-
-extern glvert_t glv;
-
-extern	int glx, gly, glwidth, glheight;
-
-#ifdef _WIN32
-extern	PROC glArrayElementEXT;
-extern	PROC glColorPointerEXT;
-extern	PROC glTexturePointerEXT;
-extern	PROC glVertexPointerEXT;
-#endif
-
-// r_local.h -- private refresh defs
-
-#define ALIAS_BASE_SIZE_RATIO		(1.0 / 11.0)
-					// normalizing factor so player model works out to about
-					//  1 pixel per triangle
-#define	MAX_LBM_HEIGHT		480
-
-#define TILE_SIZE		128		// size of textures generated by R_GenTiledSurf
-
-#define SKYSHIFT		7
-#define	SKYSIZE			(1 << SKYSHIFT)
-#define SKYMASK			(SKYSIZE - 1)
-
-#define BACKFACE_EPSILON	0.01
-
-
-void R_TimeRefresh_f (void);
-void R_ReadPointFile_f (void);
-texture_t *R_TextureAnimation (texture_t *base);
-
-typedef struct surfcache_s
-{
-	struct surfcache_s	*next;
-	struct surfcache_s 	**owner;		// NULL is an empty chunk of memory
-	int					lightadj[MAXLIGHTMAPS]; // checked for strobe flush
-	int					dlight;
-	int					size;		// including header
-	unsigned			width;
-	unsigned			height;		// DEBUG only needed for debug
-	float				mipscale;
-	struct texture_s	*texture;	// checked for animating textures
-	byte				data[4];	// width*height elements
-} surfcache_t;
-
-
-typedef struct
-{
-	pixel_t		*surfdat;	// destination for generated surface
-	int			rowbytes;	// destination logical width in bytes
-	msurface_t	*surf;		// description for surface to generate
-	fixed8_t	lightadj[MAXLIGHTMAPS];
-							// adjust for lightmap levels for dynamic lighting
-	texture_t	*texture;	// corrected for animating textures
-	int			surfmip;	// mipmapped ratio of surface texels / world pixels
-	int			surfwidth;	// in mipmapped texels
-	int			surfheight;	// in mipmapped texels
-} drawsurf_t;
-
-
-typedef enum {
-	pt_static, pt_grav, pt_slowgrav, pt_fire, pt_explode, pt_explode2, pt_blob, pt_blob2
-} ptype_t;
-
-// !!! if this is changed, it must be changed in d_ifacea.h too !!!
-typedef struct particle_s
-{
-// driver-usable fields
-	vec3_t		org;
-	float		color;
-// drivers never touch the following fields
-	struct particle_s	*next;
-	vec3_t		vel;
-	float		ramp;
-	float		die;
-	ptype_t		type;
-} particle_t;
-
-
-//====================================================
-
-
-extern	entity_t	r_worldentity;
-extern	qboolean	r_cache_thrash;		// compatability
-extern	vec3_t		modelorg, r_entorigin;
-extern	entity_t	*currententity;
-extern	int			r_visframecount;	// ??? what difs?
-extern	int			r_framecount;
-extern	mplane_t	frustum[4];
-extern	int		c_brush_polys, c_alias_polys;
-
-
-//
-// view origin
-//
-extern	vec3_t	vup;
-extern	vec3_t	vpn;
-extern	vec3_t	vright;
-extern	vec3_t	r_origin;
-
-//
-// screen size info
-//
-extern	refdef_t	r_refdef;
-extern	mleaf_t		*r_viewleaf, *r_oldviewleaf;
-extern	texture_t	*r_notexture_mip;
-extern	int		d_lightstylevalue[256];	// 8.8 fraction of base light value
-
-extern	qboolean	envmap;
-extern	int	currenttexture;
-extern	int	cnttextures[2];
-extern	int	particletexture;
-extern	int	playertextures;
-
-extern	int	skytexturenum;		// index in cl.loadmodel, not gl texture object
-
-extern	cvar_t	r_norefresh;
-extern	cvar_t	r_drawentities;
-extern	cvar_t	r_drawworld;
-extern	cvar_t	r_drawviewmodel;
-extern	cvar_t	r_speeds;
-extern	cvar_t	r_waterwarp;
-extern	cvar_t	r_fullbright;
-extern	cvar_t	r_lightmap;
-extern	cvar_t	r_shadows;
-extern	cvar_t	r_mirroralpha;
-extern	cvar_t	r_wateralpha;
-extern	cvar_t	r_dynamic;
-extern	cvar_t	r_novis;
-
-extern	cvar_t	gl_clear;
-extern	cvar_t	gl_cull;
-extern	cvar_t	gl_poly;
-extern	cvar_t	gl_texsort;
-extern	cvar_t	gl_smoothmodels;
-extern	cvar_t	gl_affinemodels;
-extern	cvar_t	gl_polyblend;
-extern	cvar_t	gl_keeptjunctions;
-extern	cvar_t	gl_reporttjunctions;
-extern	cvar_t	gl_flashblend;
-extern	cvar_t	gl_nocolors;
-extern	cvar_t	gl_doubleeyes;
-
-extern	int		gl_lightmap_format;
-extern	int		gl_solid_format;
-extern	int		gl_alpha_format;
-
-extern	cvar_t	gl_max_size;
-extern	cvar_t	gl_playermip;
-
-extern	int			mirrortexturenum;	// quake texturenum, not gltexturenum
-extern	qboolean	mirror;
-extern	mplane_t	*mirror_plane;
-
-extern	float	r_world_matrix[16];
-
-extern	const char *gl_vendor;
-extern	const char *gl_renderer;
-extern	const char *gl_version;
-extern	const char *gl_extensions;
-
-void R_TranslatePlayerSkin (int playernum);
-void GL_Bind (int texnum);
-
-// Multitexture
-#define    TEXTURE0_SGIS				0x835E
-#define    TEXTURE1_SGIS				0x835F
-
-#ifndef _WIN32
-#define APIENTRY /* */
-#endif
-
-typedef void (APIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat);
-typedef void (APIENTRY *lpSelTexFUNC) (GLenum);
-extern lpMTexFUNC qglMTexCoord2fSGIS;
-extern lpSelTexFUNC qglSelectTextureSGIS;
-
-extern qboolean gl_mtexable;
-
-void GL_DisableMultitexture(void);
-void GL_EnableMultitexture(void);
--- a/u/glquake2.h
+++ /dev/null
@@ -1,209 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// disable data conversion warnings
-
-#pragma warning(disable : 4244)     // MIPS
-#pragma warning(disable : 4136)     // X86
-#pragma warning(disable : 4051)     // ALPHA
-  
-#include <windows.h>
-
-#include <gl\gl.h>
-#include <gl\glu.h>
-
-void GL_BeginRendering (int *x, int *y, int *width, int *height);
-void GL_EndRendering (void);
-
-
-// Function prototypes for the Texture Object Extension routines
-typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *,
-                    const GLboolean *);
-typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint);
-typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *);
-typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *);
-typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint);
-typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *,
-                    const GLclampf *);
-typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *);
-
-extern	BINDTEXFUNCPTR bindTexFunc;
-extern	DELTEXFUNCPTR delTexFunc;
-extern	TEXSUBIMAGEPTR TexSubImage2DFunc;
-
-extern	int texture_extension_number;
-extern	int		texture_mode;
-
-extern	float	gldepthmin, gldepthmax;
-
-void GL_Upload32 (unsigned *data, int width, int height,  qboolean mipmap, qboolean alpha, qboolean modulate);
-void GL_Upload8 (byte *data, int width, int height,  qboolean mipmap, qboolean alpha, qboolean modulate);
-int GL_LoadTexture (char *identifier, int width, int height, byte *data, int mipmap, int alpha, int modulate);
-int GL_FindTexture (char *identifier);
-
-typedef struct
-{
-	float	x, y, z;
-	float	s, t;
-	float	r, g, b;
-} glvert_t;
-
-extern glvert_t glv;
-
-extern	int glx, gly, glwidth, glheight;
-
-extern	PROC glArrayElementEXT;
-extern	PROC glColorPointerEXT;
-extern	PROC glTexturePointerEXT;
-extern	PROC glVertexPointerEXT;
-
-
-// r_local.h -- private refresh defs
-
-#define MAXALIASVERTS		2000	// TODO: tune this
-
-#define ALIAS_BASE_SIZE_RATIO		(1.0 / 11.0)
-					// normalizing factor so player model works out to about
-					//  1 pixel per triangle
-#define	MAX_LBM_HEIGHT		480
-
-#define TILE_SIZE		128		// size of textures generated by R_GenTiledSurf
-
-#define SKYSHIFT		7
-#define	SKYSIZE			(1 << SKYSHIFT)
-#define SKYMASK			(SKYSIZE - 1)
-
-#define BACKFACE_EPSILON	0.01
-
-
-void R_TimeRefresh_f (void);
-void R_ReadPointFile_f (void);
-texture_t *R_TextureAnimation (texture_t *base);
-
-typedef struct surfcache_s
-{
-	struct surfcache_s	*next;
-	struct surfcache_s 	**owner;		// NULL is an empty chunk of memory
-	int					lightadj[MAXLIGHTMAPS]; // checked for strobe flush
-	int					dlight;
-	int					size;		// including header
-	unsigned			width;
-	unsigned			height;		// DEBUG only needed for debug
-	float				mipscale;
-	struct texture_s	*texture;	// checked for animating textures
-	byte				data[4];	// width*height elements
-} surfcache_t;
-
-
-typedef struct
-{
-	pixel_t		*surfdat;	// destination for generated surface
-	int			rowbytes;	// destination logical width in bytes
-	msurface_t	*surf;		// description for surface to generate
-	fixed8_t	lightadj[MAXLIGHTMAPS];
-							// adjust for lightmap levels for dynamic lighting
-	texture_t	*texture;	// corrected for animating textures
-	int			surfmip;	// mipmapped ratio of surface texels / world pixels
-	int			surfwidth;	// in mipmapped texels
-	int			surfheight;	// in mipmapped texels
-} drawsurf_t;
-
-
-typedef enum {
-	pt_static, pt_grav, pt_slowgrav, pt_fire, pt_explode, pt_explode2, pt_blob, pt_blob2
-} ptype_t;
-
-// !!! if this is changed, it must be changed in d_ifacea.h too !!!
-typedef struct particle_s
-{
-// driver-usable fields
-	vec3_t		org;
-	float		color;
-// drivers never touch the following fields
-	struct particle_s	*next;
-	vec3_t		vel;
-	float		ramp;
-	float		die;
-	ptype_t		type;
-} particle_t;
-
-
-//====================================================
-
-
-extern	entity_t	r_worldentity;
-extern	qboolean	r_cache_thrash;		// compatability
-extern	vec3_t		modelorg, r_entorigin;
-extern	entity_t	*currententity;
-extern	int			r_visframecount;	// ??? what difs?
-extern	int			r_framecount;
-extern	mplane_t	frustum[4];
-extern	int		c_brush_polys, c_alias_polys;
-
-
-//
-// view origin
-//
-extern	vec3_t	vup;
-extern	vec3_t	vpn;
-extern	vec3_t	vright;
-extern	vec3_t	r_origin;
-
-//
-// screen size info
-//
-extern	refdef_t	r_refdef;
-extern	mleaf_t		*r_viewleaf, *r_oldviewleaf;
-extern	texture_t	*r_notexture_mip;
-extern	int		d_lightstylevalue[256];	// 8.8 fraction of base light value
-
-extern	qboolean	envmap;
-extern	int	currenttexture;
-extern	int	particletexture;
-extern	int	playertextures;
-
-extern	int	skytexturenum;		// index in cl.loadmodel, not gl texture object
-
-extern	cvar_t	r_drawentities;
-extern	cvar_t	r_drawworld;
-extern	cvar_t	r_drawviewmodel;
-extern	cvar_t	r_speeds;
-extern	cvar_t	r_waterwarp;
-extern	cvar_t	r_fullbright;
-extern	cvar_t	r_lightmap;
-extern	cvar_t	r_shadows;
-extern	cvar_t	r_dynamic;
-
-extern	cvar_t	gl_clear;
-extern	cvar_t	gl_cull;
-extern	cvar_t	gl_poly;
-extern	cvar_t	gl_texsort;
-extern	cvar_t	gl_smoothmodels;
-extern	cvar_t	gl_affinemodels;
-extern	cvar_t	gl_fogblend;
-extern	cvar_t	gl_polyblend;
-extern	cvar_t	gl_keeptjunctions;
-extern	cvar_t	gl_reporttjunctions;
-
-extern	int		gl_lightmap_format;
-extern	int		gl_solid_format;
-extern	int		gl_alpha_format;
-
-void R_TranslatePlayerSkin (int playernum);
-void GL_Bind (int texnum);
--- a/u/in_dos.c
+++ /dev/null
@@ -1,615 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// in_mouse.c -- dos mouse code
-
-#include "quakedef.h"
-#include "dosisms.h"
-
-#define AUX_FLAG_FREELOOK	0x00000001
-
-typedef struct
-{
-	long    interruptVector;
-	char    deviceName[16];
-	long    numAxes;
-	long	numButtons;
-	long	flags;
-	
-	vec3_t  viewangles;
-
-// intended velocities
-	float   forwardmove;
-	float   sidemove;
-	float   upmove;
-
-	long	buttons;
-} externControl_t;
-
-/*
-#define AUX_FLAG_FORCEFREELOOK	0x00000001	// r/o
-#define AUX_FLAG_EXTENDED		0x00000002	// r/o
-#define AUX_FLAG_RUN			0x00000004	// w/o
-#define AUX_FLAG_STRAFE			0x00000008	// w/o
-#define AUX_FLAG_FREELOOK		0x00000010	// w/o
-
-#define AUX_MAP_UNDEFINED	0
-#define AUX_MAP_PITCH		1
-#define AUX_MAP_YAW			2
-#define AUX_MAP_ROLL		3
-#define AUX_MAP_FORWARD		4
-#define AUX_MAP_SIDE		5
-#define AUX_MAP_UP			6
-
-typedef struct
-{
-	long    interruptVector;
-	// r/o
-	char    deviceName[16];
-	// r/o
-	long    numAxes;
-			// r/o	1-6
-	long	numButtons;			// r/o	0-32
-	long	flags;				// see above
-	byte	axisMapping[6];		// w/o	default = p,y,r,f,s,u
-	float	axisValue[6];		// r/w
-	float	sensitivity[6];		// w/o	default = 1.0
-	long	buttons;			// r/o
-	float	last_frame_time;	// w/o
-} externControl_t;
-*/
-
-cvar_t	m_filter = {"m_filter","1"};
-
-qboolean	mouse_avail;
-int		mouse_buttons;
-int		mouse_oldbuttonstate;
-int		mouse_buttonstate;
-float	mouse_x, mouse_y;
-float	old_mouse_x, old_mouse_y;
-
-
-cvar_t	in_joystick = {"joystick","1"};
-cvar_t	joy_numbuttons = {"joybuttons","4", true};
-
-qboolean	joy_avail;
-int		joy_oldbuttonstate;
-int		joy_buttonstate;
-
-int     joyxl, joyxh, joyyl, joyyh; 
-int		joystickx, joysticky;
-
-qboolean		need_center;
-
-qboolean		extern_avail;
-int				extern_buttons;
-int				extern_oldbuttonstate;
-int				extern_buttonstate;
-cvar_t	aux_look = {"auxlook","1", true};
-externControl_t	*extern_control;
-void IN_StartupExternal (void);
-void IN_ExternalMove (usercmd_t *cmd);
-
-void IN_StartupJoystick (void);
-qboolean IN_ReadJoystick (void);
-
-
-void Toggle_AuxLook_f (void)
-{
-	if (aux_look.value)
-		Cvar_Set ("auxlook","0");
-	else
-		Cvar_Set ("auxlook","1");
-}
-
-
-void Force_CenterView_f (void)
-{
-	cl.viewangles[PITCH] = 0;
-}
-
-
-/*
-===========
-IN_StartupMouse
-===========
-*/
-void IN_StartupMouse (void)
-{
-	if ( COM_CheckParm ("-nomouse") ) 
-		return; 
- 
-// check for mouse
-	regs.x.ax = 0;
-	dos_int86(0x33);
-	mouse_avail = regs.x.ax;
-	if (!mouse_avail)
-	{
-		Con_Printf ("No mouse found\n");
-		return;
-	}
-	
-	mouse_buttons = regs.x.bx;
-	if (mouse_buttons > 3)
-		mouse_buttons = 3;
-	Con_Printf("%d-button mouse available\n", mouse_buttons);
-}
-
-/*
-===========
-IN_Init
-===========
-*/
-void IN_Init (void)
-{
-	int i;
-
-	Cvar_RegisterVariable (&m_filter);
-	Cvar_RegisterVariable (&in_joystick);
-	Cvar_RegisterVariable (&joy_numbuttons);
-	Cvar_RegisterVariable (&aux_look);
-	Cmd_AddCommand ("toggle_auxlook", Toggle_AuxLook_f);
-	Cmd_AddCommand ("force_centerview", Force_CenterView_f);
-
-	IN_StartupMouse ();
-	IN_StartupJoystick ();
-
-	i = COM_CheckParm ("-control");
-	if (i)
-	{
-		extern_control = real2ptr(Q_atoi (com_argv[i+1]));
-		IN_StartupExternal ();
-	}
-}
-
-/*
-===========
-IN_Shutdown
-===========
-*/
-void IN_Shutdown (void)
-{
-
-}
-
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-	int		i;
-
-	if (mouse_avail)
-	{
-		regs.x.ax = 3;		// read buttons
-		dos_int86(0x33);
-		mouse_buttonstate = regs.x.bx;
-	
-	// perform button actions
-		for (i=0 ; i<mouse_buttons ; i++)
-		{
-			if ( (mouse_buttonstate & (1<<i)) &&
-			!(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, true);
-			}
-			if ( !(mouse_buttonstate & (1<<i)) &&
-			(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, false);
-			}
-		}	
-		
-		mouse_oldbuttonstate = mouse_buttonstate;
-	}
-	
-	if (joy_avail)
-	{
-		joy_buttonstate = ((dos_inportb(0x201) >> 4)&15)^15;
-	// perform button actions
-		for (i=0 ; i<joy_numbuttons.value ; i++)
-		{
-			if ( (joy_buttonstate & (1<<i)) &&
-			!(joy_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_JOY1 + i, true);
-			}
-			if ( !(joy_buttonstate & (1<<i)) &&
-			(joy_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_JOY1 + i, false);
-			}
-		}
-		
-		joy_oldbuttonstate = joy_buttonstate;
-	}
-
-	if (extern_avail)
-	{
-		extern_buttonstate = extern_control->buttons;
-	
-	// perform button actions
-		for (i=0 ; i<extern_buttons ; i++)
-		{
-			if ( (extern_buttonstate & (1<<i)) &&
-			!(extern_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_AUX1 + i, true);
-			}
-			if ( !(extern_buttonstate & (1<<i)) &&
-			(extern_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_AUX1 + i, false);
-			}
-		}	
-		
-		extern_oldbuttonstate = extern_buttonstate;
-	}
-	
-}
-
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-	int		mx, my;
-
-	if (!mouse_avail)
-		return;
-
-	regs.x.ax = 11;		// read move
-	dos_int86(0x33);
-	mx = (short)regs.x.cx;
-	my = (short)regs.x.dx;
-	
-	if (m_filter.value)
-	{
-		mouse_x = (mx + old_mouse_x) * 0.5;
-		mouse_y = (my + old_mouse_y) * 0.5;
-	}
-	else
-	{
-		mouse_x = mx;
-		mouse_y = my;
-	}
-	old_mouse_x = mx;
-	old_mouse_y = my;
-
-	mouse_x *= sensitivity.value;
-	mouse_y *= sensitivity.value;
-
-// add mouse X/Y movement to cmd
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mouse_x;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-	
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-		
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
-	{
-		cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	}
-	else
-	{
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * mouse_y;
-		else
-			cmd->forwardmove -= m_forward.value * mouse_y;
-	}
-}
-
-/*
-===========
-IN_JoyMove
-===========
-*/
-void IN_JoyMove (usercmd_t *cmd)
-{
-	float	speed, aspeed;
-
-	if (!joy_avail || !in_joystick.value) 
-		return; 
- 
-	IN_ReadJoystick (); 
-	if (joysticky > joyyh*2 || joystickx > joyxh*2)
-		return;		// assume something jumped in and messed up the joystick
-					// reading time (win 95)
-
-	if (in_speed.state & 1)
-		speed = cl_movespeedkey.value;
-	else
-		speed = 1;
-	aspeed = speed*host_frametime;
-
-	if (in_strafe.state & 1)
-	{
-		if (joystickx < joyxl)
-			cmd->sidemove -= speed*cl_sidespeed.value; 
-		else if (joystickx > joyxh) 
-			cmd->sidemove += speed*cl_sidespeed.value; 
-	}
-	else
-	{
-		if (joystickx < joyxl)
-			cl.viewangles[YAW] += aspeed*cl_yawspeed.value;
-		else if (joystickx > joyxh) 
-			cl.viewangles[YAW] -= aspeed*cl_yawspeed.value;
-		cl.viewangles[YAW] = anglemod(cl.viewangles[YAW]);
-	}
-
-	if (in_mlook.state & 1)
-	{
-		if (m_pitch.value < 0)
-			speed *= -1;
-		
-		if (joysticky < joyyl) 
-			cl.viewangles[PITCH] += aspeed*cl_pitchspeed.value;
-		else if (joysticky > joyyh) 
-			cl.viewangles[PITCH] -= aspeed*cl_pitchspeed.value;
-	}
-	else
-	{
-		if (joysticky < joyyl) 
-			cmd->forwardmove += speed*cl_forwardspeed.value; 
-		else if (joysticky > joyyh) 
-			cmd->forwardmove -= speed*cl_backspeed.value;  
-	}
-}
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_Move (usercmd_t *cmd)
-{
-	IN_MouseMove (cmd);
-	IN_JoyMove (cmd);
-	IN_ExternalMove (cmd);
-}
-
-/* 
-============================================================================ 
- 
-					JOYSTICK 
- 
-============================================================================ 
-*/
-
-
-
-qboolean IN_ReadJoystick (void)
-{
-	int		b;
-	int		count;
-
-	joystickx = 0;
-	joysticky = 0;
-
-	count = 0;
-
-	b = dos_inportb(0x201);
-	dos_outportb(0x201, b);
-
-// clear counters
-	while (++count < 10000)
-	{
-		b = dos_inportb(0x201);
-
-		joystickx += b&1;
-		joysticky += (b&2)>>1;
-		if ( !(b&3) )
-			return true;
-	}
-	
-	Con_Printf ("IN_ReadJoystick: no response\n");
-	joy_avail = false;
-	return false;
-}
-
-/*
-=============
-WaitJoyButton
-=============
-*/
-qboolean WaitJoyButton (void) 
-{ 
-	int             oldbuttons, buttons; 
- 
-	oldbuttons = 0; 
-	do 
-	{
-		key_count = -1;
-		Sys_SendKeyEvents ();
-		key_count = 0;
-		if (key_lastpress == K_ESCAPE)
-		{
-			Con_Printf ("aborted.\n");
-			return false;
-		}
-		key_lastpress = 0;
-		SCR_UpdateScreen ();
-		buttons =  ((dos_inportb(0x201) >> 4)&1)^1; 
-		if (buttons != oldbuttons) 
-		{ 
-			oldbuttons = buttons; 
-			continue; 
-		}
-	} while ( !buttons); 
- 
-	do 
-	{ 
-		key_count = -1;
-		Sys_SendKeyEvents ();
-		key_count = 0;
-		if (key_lastpress == K_ESCAPE)
-		{
-			Con_Printf ("aborted.\n");
-			return false;
-		}
-		key_lastpress = 0;
-		SCR_UpdateScreen ();
-		buttons =  ((dos_inportb(0x201) >> 4)&1)^1; 
-		if (buttons != oldbuttons) 
-		{ 
-			oldbuttons = buttons; 
-			continue; 
-		} 
-	} while ( buttons); 
- 
-	return true; 
-} 
- 
- 
- 
-/* 
-=============== 
-IN_StartupJoystick 
-=============== 
-*/  
-void IN_StartupJoystick (void) 
-{ 
-	int     centerx, centery; 
- 
- 	Con_Printf ("\n");
-
-	joy_avail = false; 
-	if ( COM_CheckParm ("-nojoy") ) 
-		return; 
- 
-	if (!IN_ReadJoystick ()) 
-	{ 
-		joy_avail = false; 
-		Con_Printf ("joystick not found\n"); 
-		return; 
-	} 
-
-	Con_Printf ("joystick found\n"); 
- 
-	Con_Printf ("CENTER the joystick\nand press button 1 (ESC to skip):\n"); 
-	if (!WaitJoyButton ()) 
-		return; 
-	IN_ReadJoystick (); 
-	centerx = joystickx; 
-	centery = joysticky; 
- 
-	Con_Printf ("Push the joystick to the UPPER LEFT\nand press button 1 (ESC to skip):\n"); 
-	if (!WaitJoyButton ()) 
-		return; 
-	IN_ReadJoystick (); 
-	joyxl = (centerx + joystickx)/2; 
-	joyyl = (centerx + joysticky)/2; 
- 
-	Con_Printf ("Push the joystick to the LOWER RIGHT\nand press button 1 (ESC to skip):\n"); 
-	if (!WaitJoyButton ()) 
-		return; 
-	IN_ReadJoystick (); 
-	joyxh = (centerx + joystickx)/2; 
-	joyyh = (centery + joysticky)/2; 
-
-	joy_avail = true; 
-	Con_Printf ("joystick configured.\n"); 
-
- 	Con_Printf ("\n");
-} 
- 
- 
-/* 
-============================================================================ 
- 
-					EXTERNAL 
- 
-============================================================================ 
-*/
-
-
-/* 
-=============== 
-IN_StartupExternal 
-=============== 
-*/  
-void IN_StartupExternal (void) 
-{ 
-	if (extern_control->numButtons > 32)
-		extern_control->numButtons = 32;
-
-	Con_Printf("%s Initialized\n", extern_control->deviceName);
-	Con_Printf("  %u axes  %u buttons\n", extern_control->numAxes, extern_control->numButtons);
-
-	extern_avail = true;
-	extern_buttons = extern_control->numButtons;
-}
-
-
-/*
-===========
-IN_ExternalMove
-===========
-*/
-void IN_ExternalMove (usercmd_t *cmd)
-{
-	qboolean freelook;
-
-	if (! extern_avail)
-		return;
-
-	extern_control->viewangles[YAW] = cl.viewangles[YAW];
-	extern_control->viewangles[PITCH] = cl.viewangles[PITCH];
-	extern_control->viewangles[ROLL] = cl.viewangles[ROLL];
-	extern_control->forwardmove = cmd->forwardmove;
-	extern_control->sidemove = cmd->sidemove;
-	extern_control->upmove = cmd->upmove;
-
-Con_DPrintf("IN:  y:%f p:%f r:%f f:%f s:%f u:%f\n", extern_control->viewangles[YAW], extern_control->viewangles[PITCH], extern_control->viewangles[ROLL], extern_control->forwardmove, extern_control->sidemove, extern_control->upmove);
-
-	dos_int86(extern_control->interruptVector);
-
-Con_DPrintf("OUT: y:%f p:%f r:%f f:%f s:%f u:%f\n", extern_control->viewangles[YAW], extern_control->viewangles[PITCH], extern_control->viewangles[ROLL], extern_control->forwardmove, extern_control->sidemove, extern_control->upmove);
-
-	cl.viewangles[YAW] = extern_control->viewangles[YAW];
-	cl.viewangles[PITCH] = extern_control->viewangles[PITCH];
-	cl.viewangles[ROLL] = extern_control->viewangles[ROLL];
-	cmd->forwardmove = extern_control->forwardmove;
-	cmd->sidemove = extern_control->sidemove;
-	cmd->upmove = extern_control->upmove;
-
-	if (cl.viewangles[PITCH] > 80)
-		cl.viewangles[PITCH] = 80;
-	if (cl.viewangles[PITCH] < -70)
-		cl.viewangles[PITCH] = -70;
-
-	freelook = (extern_control->flags & AUX_FLAG_FREELOOK || aux_look.value || in_mlook.state & 1);
-
-	if (freelook)
-		V_StopPitchDrift ();
-}
-
--- a/u/in_null.c
+++ /dev/null
@@ -1,39 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// in_null.c -- for systems without a mouse
-
-#include "quakedef.h"
-
-void IN_Init (void)
-{
-}
-
-void IN_Shutdown (void)
-{
-}
-
-void IN_Commands (void)
-{
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-}
-
--- a/u/in_sun.c
+++ /dev/null
@@ -1,245 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// in_sun.c -- SUN/X mouse input handler
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-
-#include "quakedef.h"
-
-
-//
-// typedefs and defines
-//
-
-#define MOUSE_SCALE		4
-
-//
-// externs
-//
-
-extern Display			*x_disp;
-extern int				x_screen, x_screen_width, x_screen_height;
-extern int			x_center_height, x_center_width;
-extern int				x_std_event_mask;
-extern Window			x_win, x_root_win;
-extern qboolean			x_fullscreen;
-extern qboolean			x_focus;
-extern int			global_dx, global_dy;
-//
-// globals
-//
-
-cvar_t					_windowed_mouse = {"_windowed_mouse","1", true};
-int					x_root, y_root;
-int					x_root_old, y_root_old;
-//
-// locals
-//
-
-static int				x_mouse_num, x_mouse_denom, x_mouse_thresh;
-
-
-static qboolean x_grabbed = false;
-
-//
-// IN_CenterMouse - center the mouse in the screen
-//
-
-void IN_CenterMouse( void )
-{
-	CheckMouseState();
-
-	if (!x_grabbed)
-		return;
-
-	XSelectInput( x_disp, x_win, x_std_event_mask & ~PointerMotionMask );
-	XWarpPointer( x_disp, None, x_root_win, 0, 0, 0, 0, x_center_width,
-		      x_center_height );
-	XSelectInput( x_disp, x_win, x_std_event_mask );
-}
-
-//
-// Check to see if we have grabbed the mouse or not and deal with it
-// appropriately
-//
-static void CheckMouseState(void)
-{
-	if (x_focus && _windowed_mouse.value && !x_grabbed) {
-		x_grabbed = true;
-		printf("fooling with mouse!\n");
-		if (XGetPointerControl( x_disp, &x_mouse_num, &x_mouse_denom, &x_mouse_thresh ))
-			printf( "XGetPointerControl failed!\n" );
-		//printf( "mouse %d/%d thresh %d\n", x_mouse_num, x_mouse_denom, x_mouse_thresh );
-
-		// make input rawer
-		XAutoRepeatOff(x_disp);
-		XGrabKeyboard(x_disp, x_win, True, GrabModeAsync, GrabModeAsync, CurrentTime);
-		XGrabPointer(x_disp, x_win, True, 
-			     PointerMotionMask | ButtonPressMask | ButtonReleaseMask, 
-			     GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
-
-//		if (XChangePointerControl( x_disp, True, True, 1, MOUSE_SCALE, x_mouse_thresh ))
-//			printf( "XChangePointerControl failed!\n" );
-
-		IN_CenterMouse();
-
-		// safe initial values
-		x_root = x_root_old = vid.width >> 1;
-		y_root = y_root_old = vid.height >> 1;
-	} else if (x_grabbed && (!_windowed_mouse.value || !x_focus)) {
-		printf("fooling with mouse!\n");
-		x_grabbed = false;
-		// undo mouse warp
-		if (XChangePointerControl( x_disp, True, True, x_mouse_num, x_mouse_denom, x_mouse_thresh ))
-			printf( "XChangePointerControl failed!\n" );
-
-		XUngrabPointer( x_disp, CurrentTime );
-		XUngrabKeyboard( x_disp, CurrentTime );
-		XAutoRepeatOn( x_disp );
-	}
-}
-
-
-//
-// IN_Init - setup mouse input
-//
-
-void IN_Init (void)
-{
-    if (!x_disp) Sys_Error( "X display not open!\n" );
-
-    Cvar_RegisterVariable (&_windowed_mouse);
-
-	// we really really want to clean these up...
-    atexit( IN_Shutdown );
-}
-
-//
-// IN_Shutdown - clean up mouse settings (must be done from signal handler too!)
-//
-
-void IN_Shutdown (void)
-{
-    if (!x_disp) return;
-
-	// undo mouse warp
-	if (XChangePointerControl( x_disp, True, True, x_mouse_num, x_mouse_denom, x_mouse_thresh ))
-		printf( "XChangePointerControl failed!\n" );
-
-	XUngrabPointer( x_disp, CurrentTime );
-	XUngrabKeyboard( x_disp, CurrentTime );
-	XAutoRepeatOn( x_disp );
-}
-
-//
-// IN_Commands - process buttons
-//
-
-void IN_Commands (void)
-{
-	// done in X event handler
-}
-
-//
-// IN_Move - process mouse moves
-//
-
-void
-IN_Move (usercmd_t *cmd)
-{
-	static int last_dx, last_dy;
-	static long long last_movement;
-	long long now, gethrtime();
-
-	int dx, dy;
-
-	CheckMouseState();
-
-
-	if (!x_grabbed)
-		return; // no mouse movement
-	
-
-	now = gethrtime();
-
-	dx = global_dx;
-	global_dx = 0;
-
-	dy = global_dy;
-	global_dy = 0;
-	
-//	printf("GOT: dx %d dy %d\n", dx, dy);
-
-	dx *= sensitivity.value;
-	dy *= sensitivity.value;
-
-//
-//	implement low pass filter to smooth motion a bit
-//	
-	if (now - last_movement > 100000000) {
-		dx = .6 * dx;
-		dy = .6 * dy;
-	}
-	last_movement = now;
-
-	dx = .6 * dx + .4 * last_dx;
-	dy = .6 * dy + .4 * last_dy;
-
-
-	last_dx = dx;
-	last_dy = dy;
-
-	if (!dx && !dy) {
-		if (in_mlook.state & 1) 
-			V_StopPitchDrift ();
-		return;
-	}
-	
-	// add mouse X/Y movement to cmd
-	if ((in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1)))
-		cmd->sidemove += m_side.value * dx;
-	else 
-		cl.viewangles[YAW] -= m_yaw.value * dx;
-
-	if (in_mlook.state & 1) 
-		V_StopPitchDrift ();
-	    
-	if ((in_mlook.state & 1) && !(in_strafe.state & 1)) {
-		cl.viewangles[PITCH] += m_pitch.value * dy;
-		if (cl.viewangles[PITCH] > 80) cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70) cl.viewangles[PITCH] = -70;
-	}
-	else {
-		if ((in_strafe.state & 1) && noclip_anglehack) cmd->upmove -= m_forward.value * dy;
-		else cmd->forwardmove -= m_forward.value * dy;
-	}
-}
--- a/u/in_win.c
+++ /dev/null
@@ -1,1239 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// in_win.c -- windows 95 mouse and joystick code
-// 02/21/97 JCB Added extended DirectInput code to support external controllers.
-
-#include <dinput.h>
-#include "quakedef.h"
-#include "winquake.h"
-#include "dosisms.h"
-
-#define DINPUT_BUFFERSIZE           16
-#define iDirectInputCreate(a,b,c,d)	pDirectInputCreate(a,b,c,d)
-
-HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion,
-	LPDIRECTINPUT * lplpDirectInput, LPUNKNOWN punkOuter);
-
-// mouse variables
-cvar_t	m_filter = {"m_filter","0"};
-
-int			mouse_buttons;
-int			mouse_oldbuttonstate;
-POINT		current_pos;
-int			mouse_x, mouse_y, old_mouse_x, old_mouse_y, mx_accum, my_accum;
-
-static qboolean	restore_spi;
-static int		originalmouseparms[3], newmouseparms[3] = {0, 0, 1};
-
-unsigned int uiWheelMessage;
-qboolean	mouseactive;
-qboolean		mouseinitialized;
-static qboolean	mouseparmsvalid, mouseactivatetoggle;
-static qboolean	mouseshowtoggle = 1;
-static qboolean	dinput_acquired;
-
-static unsigned int		mstate_di;
-
-// joystick defines and variables
-// where should defines be moved?
-#define JOY_ABSOLUTE_AXIS	0x00000000		// control like a joystick
-#define JOY_RELATIVE_AXIS	0x00000010		// control like a mouse, spinner, trackball
-#define	JOY_MAX_AXES		6				// X, Y, Z, R, U, V
-#define JOY_AXIS_X			0
-#define JOY_AXIS_Y			1
-#define JOY_AXIS_Z			2
-#define JOY_AXIS_R			3
-#define JOY_AXIS_U			4
-#define JOY_AXIS_V			5
-
-enum _ControlList
-{
-	AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn
-};
-
-DWORD	dwAxisFlags[JOY_MAX_AXES] =
-{
-	JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ, JOY_RETURNR, JOY_RETURNU, JOY_RETURNV
-};
-
-DWORD	dwAxisMap[JOY_MAX_AXES];
-DWORD	dwControlMap[JOY_MAX_AXES];
-PDWORD	pdwRawValue[JOY_MAX_AXES];
-
-// none of these cvars are saved over a session
-// this means that advanced controller configuration needs to be executed
-// each time.  this avoids any problems with getting back to a default usage
-// or when changing from one controller to another.  this way at least something
-// works.
-cvar_t	in_joystick = {"joystick","0", true};
-cvar_t	joy_name = {"joyname", "joystick"};
-cvar_t	joy_advanced = {"joyadvanced", "0"};
-cvar_t	joy_advaxisx = {"joyadvaxisx", "0"};
-cvar_t	joy_advaxisy = {"joyadvaxisy", "0"};
-cvar_t	joy_advaxisz = {"joyadvaxisz", "0"};
-cvar_t	joy_advaxisr = {"joyadvaxisr", "0"};
-cvar_t	joy_advaxisu = {"joyadvaxisu", "0"};
-cvar_t	joy_advaxisv = {"joyadvaxisv", "0"};
-cvar_t	joy_forwardthreshold = {"joyforwardthreshold", "0.15"};
-cvar_t	joy_sidethreshold = {"joysidethreshold", "0.15"};
-cvar_t	joy_pitchthreshold = {"joypitchthreshold", "0.15"};
-cvar_t	joy_yawthreshold = {"joyyawthreshold", "0.15"};
-cvar_t	joy_forwardsensitivity = {"joyforwardsensitivity", "-1.0"};
-cvar_t	joy_sidesensitivity = {"joysidesensitivity", "-1.0"};
-cvar_t	joy_pitchsensitivity = {"joypitchsensitivity", "1.0"};
-cvar_t	joy_yawsensitivity = {"joyyawsensitivity", "-1.0"};
-cvar_t	joy_wwhack1 = {"joywwhack1", "0.0"};
-cvar_t	joy_wwhack2 = {"joywwhack2", "0.0"};
-
-qboolean	joy_avail, joy_advancedinit, joy_haspov;
-DWORD		joy_oldbuttonstate, joy_oldpovstate;
-
-int			joy_id;
-DWORD		joy_flags;
-DWORD		joy_numbuttons;
-
-static LPDIRECTINPUT		g_pdi;
-static LPDIRECTINPUTDEVICE	g_pMouse;
-
-static JOYINFOEX	ji;
-
-static HINSTANCE hInstDI;
-
-static qboolean	dinput;
-
-typedef struct MYDATA {
-	LONG  lX;                   // X axis goes here
-	LONG  lY;                   // Y axis goes here
-	LONG  lZ;                   // Z axis goes here
-	BYTE  bButtonA;             // One button goes here
-	BYTE  bButtonB;             // Another button goes here
-	BYTE  bButtonC;             // Another button goes here
-	BYTE  bButtonD;             // Another button goes here
-} MYDATA;
-
-static DIOBJECTDATAFORMAT rgodf[] = {
-  { &GUID_XAxis,    FIELD_OFFSET(MYDATA, lX),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_YAxis,    FIELD_OFFSET(MYDATA, lY),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_ZAxis,    FIELD_OFFSET(MYDATA, lZ),       0x80000000 | DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonA), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonB), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonC), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonD), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-};
-
-#define NUM_OBJECTS (sizeof(rgodf) / sizeof(rgodf[0]))
-
-static DIDATAFORMAT	df = {
-	sizeof(DIDATAFORMAT),       // this structure
-	sizeof(DIOBJECTDATAFORMAT), // size of object data format
-	DIDF_RELAXIS,               // absolute axis coordinates
-	sizeof(MYDATA),             // device data size
-	NUM_OBJECTS,                // number of objects
-	rgodf,                      // and here they are
-};
-
-// forward-referenced functions
-void IN_StartupJoystick (void);
-void Joy_AdvancedUpdate_f (void);
-void IN_JoyMove (usercmd_t *cmd);
-
-
-/*
-===========
-Force_CenterView_f
-===========
-*/
-void Force_CenterView_f (void)
-{
-	cl.viewangles[PITCH] = 0;
-}
-
-
-/*
-===========
-IN_UpdateClipCursor
-===========
-*/
-void IN_UpdateClipCursor (void)
-{
-
-	if (mouseinitialized && mouseactive && !dinput)
-	{
-		ClipCursor (&window_rect);
-	}
-}
-
-
-/*
-===========
-IN_ShowMouse
-===========
-*/
-void IN_ShowMouse (void)
-{
-
-	if (!mouseshowtoggle)
-	{
-		ShowCursor (TRUE);
-		mouseshowtoggle = 1;
-	}
-}
-
-
-/*
-===========
-IN_HideMouse
-===========
-*/
-void IN_HideMouse (void)
-{
-
-	if (mouseshowtoggle)
-	{
-		ShowCursor (FALSE);
-		mouseshowtoggle = 0;
-	}
-}
-
-
-/*
-===========
-IN_ActivateMouse
-===========
-*/
-void IN_ActivateMouse (void)
-{
-
-	mouseactivatetoggle = true;
-
-	if (mouseinitialized)
-	{
-		if (dinput)
-		{
-			if (g_pMouse)
-			{
-				if (!dinput_acquired)
-				{
-					IDirectInputDevice_Acquire(g_pMouse);
-					dinput_acquired = true;
-				}
-			}
-			else
-			{
-				return;
-			}
-		}
-		else
-		{
-			if (mouseparmsvalid)
-				restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0);
-
-			SetCursorPos (window_center_x, window_center_y);
-			SetCapture (mainwindow);
-			ClipCursor (&window_rect);
-		}
-
-		mouseactive = true;
-	}
-}
-
-
-/*
-===========
-IN_SetQuakeMouseState
-===========
-*/
-void IN_SetQuakeMouseState (void)
-{
-	if (mouseactivatetoggle)
-		IN_ActivateMouse ();
-}
-
-
-/*
-===========
-IN_DeactivateMouse
-===========
-*/
-void IN_DeactivateMouse (void)
-{
-
-	mouseactivatetoggle = false;
-
-	if (mouseinitialized)
-	{
-		if (dinput)
-		{
-			if (g_pMouse)
-			{
-				if (dinput_acquired)
-				{
-					IDirectInputDevice_Unacquire(g_pMouse);
-					dinput_acquired = false;
-				}
-			}
-		}
-		else
-		{
-			if (restore_spi)
-				SystemParametersInfo (SPI_SETMOUSE, 0, originalmouseparms, 0);
-
-			ClipCursor (NULL);
-			ReleaseCapture ();
-		}
-
-		mouseactive = false;
-	}
-}
-
-
-/*
-===========
-IN_RestoreOriginalMouseState
-===========
-*/
-void IN_RestoreOriginalMouseState (void)
-{
-	if (mouseactivatetoggle)
-	{
-		IN_DeactivateMouse ();
-		mouseactivatetoggle = true;
-	}
-
-// try to redraw the cursor so it gets reinitialized, because sometimes it
-// has garbage after the mode switch
-	ShowCursor (TRUE);
-	ShowCursor (FALSE);
-}
-
-
-/*
-===========
-IN_InitDInput
-===========
-*/
-qboolean IN_InitDInput (void)
-{
-    HRESULT		hr;
-	DIPROPDWORD	dipdw = {
-		{
-			sizeof(DIPROPDWORD),        // diph.dwSize
-			sizeof(DIPROPHEADER),       // diph.dwHeaderSize
-			0,                          // diph.dwObj
-			DIPH_DEVICE,                // diph.dwHow
-		},
-		DINPUT_BUFFERSIZE,              // dwData
-	};
-
-	if (!hInstDI)
-	{
-		hInstDI = LoadLibrary("dinput.dll");
-		
-		if (hInstDI == NULL)
-		{
-			Con_SafePrintf ("Couldn't load dinput.dll\n");
-			return false;
-		}
-	}
-
-	if (!pDirectInputCreate)
-	{
-		pDirectInputCreate = (void *)GetProcAddress(hInstDI,"DirectInputCreateA");
-
-		if (!pDirectInputCreate)
-		{
-			Con_SafePrintf ("Couldn't get DI proc addr\n");
-			return false;
-		}
-	}
-
-// register with DirectInput and get an IDirectInput to play with.
-	hr = iDirectInputCreate(global_hInstance, DIRECTINPUT_VERSION, &g_pdi, NULL);
-
-	if (FAILED(hr))
-	{
-		return false;
-	}
-
-// obtain an interface to the system mouse device.
-	hr = IDirectInput_CreateDevice(g_pdi, &GUID_SysMouse, &g_pMouse, NULL);
-
-	if (FAILED(hr))
-	{
-		Con_SafePrintf ("Couldn't open DI mouse device\n");
-		return false;
-	}
-
-// set the data format to "mouse format".
-	hr = IDirectInputDevice_SetDataFormat(g_pMouse, &df);
-
-	if (FAILED(hr))
-	{
-		Con_SafePrintf ("Couldn't set DI mouse format\n");
-		return false;
-	}
-
-// set the cooperativity level.
-	hr = IDirectInputDevice_SetCooperativeLevel(g_pMouse, mainwindow,
-			DISCL_EXCLUSIVE | DISCL_FOREGROUND);
-
-	if (FAILED(hr))
-	{
-		Con_SafePrintf ("Couldn't set DI coop level\n");
-		return false;
-	}
-
-
-// set the buffer size to DINPUT_BUFFERSIZE elements.
-// the buffer size is a DWORD property associated with the device
-	hr = IDirectInputDevice_SetProperty(g_pMouse, DIPROP_BUFFERSIZE, &dipdw.diph);
-
-	if (FAILED(hr))
-	{
-		Con_SafePrintf ("Couldn't set DI buffersize\n");
-		return false;
-	}
-
-	return true;
-}
-
-
-/*
-===========
-IN_StartupMouse
-===========
-*/
-void IN_StartupMouse (void)
-{
-	HDC			hdc;
-
-	if ( COM_CheckParm ("-nomouse") ) 
-		return; 
-
-	mouseinitialized = true;
-
-	if (COM_CheckParm ("-dinput"))
-	{
-		dinput = IN_InitDInput ();
-
-		if (dinput)
-		{
-			Con_SafePrintf ("DirectInput initialized\n");
-		}
-		else
-		{
-			Con_SafePrintf ("DirectInput not initialized\n");
-		}
-	}
-
-	if (!dinput)
-	{
-		mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0);
-
-		if (mouseparmsvalid)
-		{
-			if ( COM_CheckParm ("-noforcemspd") ) 
-				newmouseparms[2] = originalmouseparms[2];
-
-			if ( COM_CheckParm ("-noforcemaccel") ) 
-			{
-				newmouseparms[0] = originalmouseparms[0];
-				newmouseparms[1] = originalmouseparms[1];
-			}
-
-			if ( COM_CheckParm ("-noforcemparms") ) 
-			{
-				newmouseparms[0] = originalmouseparms[0];
-				newmouseparms[1] = originalmouseparms[1];
-				newmouseparms[2] = originalmouseparms[2];
-			}
-		}
-	}
-
-	mouse_buttons = 3;
-
-// if a fullscreen video mode was set before the mouse was initialized,
-// set the mouse state appropriately
-	if (mouseactivatetoggle)
-		IN_ActivateMouse ();
-}
-
-
-/*
-===========
-IN_Init
-===========
-*/
-void IN_Init (void)
-{
-	// mouse variables
-	Cvar_RegisterVariable (&m_filter);
-
-	// joystick variables
-	Cvar_RegisterVariable (&in_joystick);
-	Cvar_RegisterVariable (&joy_name);
-	Cvar_RegisterVariable (&joy_advanced);
-	Cvar_RegisterVariable (&joy_advaxisx);
-	Cvar_RegisterVariable (&joy_advaxisy);
-	Cvar_RegisterVariable (&joy_advaxisz);
-	Cvar_RegisterVariable (&joy_advaxisr);
-	Cvar_RegisterVariable (&joy_advaxisu);
-	Cvar_RegisterVariable (&joy_advaxisv);
-	Cvar_RegisterVariable (&joy_forwardthreshold);
-	Cvar_RegisterVariable (&joy_sidethreshold);
-	Cvar_RegisterVariable (&joy_pitchthreshold);
-	Cvar_RegisterVariable (&joy_yawthreshold);
-	Cvar_RegisterVariable (&joy_forwardsensitivity);
-	Cvar_RegisterVariable (&joy_sidesensitivity);
-	Cvar_RegisterVariable (&joy_pitchsensitivity);
-	Cvar_RegisterVariable (&joy_yawsensitivity);
-	Cvar_RegisterVariable (&joy_wwhack1);
-	Cvar_RegisterVariable (&joy_wwhack2);
-
-	Cmd_AddCommand ("force_centerview", Force_CenterView_f);
-	Cmd_AddCommand ("joyadvancedupdate", Joy_AdvancedUpdate_f);
-
-	uiWheelMessage = RegisterWindowMessage ( "MSWHEEL_ROLLMSG" );
-
-	IN_StartupMouse ();
-	IN_StartupJoystick ();
-}
-
-/*
-===========
-IN_Shutdown
-===========
-*/
-void IN_Shutdown (void)
-{
-
-	IN_DeactivateMouse ();
-	IN_ShowMouse ();
-
-    if (g_pMouse)
-	{
-		IDirectInputDevice_Release(g_pMouse);
-		g_pMouse = NULL;
-	}
-
-    if (g_pdi)
-	{
-		IDirectInput_Release(g_pdi);
-		g_pdi = NULL;
-	}
-}
-
-
-/*
-===========
-IN_MouseEvent
-===========
-*/
-void IN_MouseEvent (int mstate)
-{
-	int	i;
-
-	if (mouseactive && !dinput)
-	{
-	// perform button actions
-		for (i=0 ; i<mouse_buttons ; i++)
-		{
-			if ( (mstate & (1<<i)) &&
-				!(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, true);
-			}
-
-			if ( !(mstate & (1<<i)) &&
-				(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, false);
-			}
-		}	
-			
-		mouse_oldbuttonstate = mstate;
-	}
-}
-
-
-/*
-===========
-IN_MouseMove
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-	int					mx, my;
-	HDC					hdc;
-	int					i;
-	DIDEVICEOBJECTDATA	od;
-	DWORD				dwElements;
-	HRESULT				hr;
-
-	if (!mouseactive)
-		return;
-
-	if (dinput)
-	{
-		mx = 0;
-		my = 0;
-
-		for (;;)
-		{
-			dwElements = 1;
-
-			hr = IDirectInputDevice_GetDeviceData(g_pMouse,
-					sizeof(DIDEVICEOBJECTDATA), &od, &dwElements, 0);
-
-			if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
-			{
-				dinput_acquired = true;
-				IDirectInputDevice_Acquire(g_pMouse);
-				break;
-			}
-
-			/* Unable to read data or no data available */
-			if (FAILED(hr) || dwElements == 0)
-			{
-				break;
-			}
-
-			/* Look at the element to see what happened */
-
-			switch (od.dwOfs)
-			{
-				case DIMOFS_X:
-					mx += od.dwData;
-					break;
-
-				case DIMOFS_Y:
-					my += od.dwData;
-					break;
-
-				case DIMOFS_BUTTON0:
-					if (od.dwData & 0x80)
-						mstate_di |= 1;
-					else
-						mstate_di &= ~1;
-					break;
-
-				case DIMOFS_BUTTON1:
-					if (od.dwData & 0x80)
-						mstate_di |= (1<<1);
-					else
-						mstate_di &= ~(1<<1);
-					break;
-					
-				case DIMOFS_BUTTON2:
-					if (od.dwData & 0x80)
-						mstate_di |= (1<<2);
-					else
-						mstate_di &= ~(1<<2);
-					break;
-			}
-		}
-
-	// perform button actions
-		for (i=0 ; i<mouse_buttons ; i++)
-		{
-			if ( (mstate_di & (1<<i)) &&
-				!(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, true);
-			}
-
-			if ( !(mstate_di & (1<<i)) &&
-				(mouse_oldbuttonstate & (1<<i)) )
-			{
-				Key_Event (K_MOUSE1 + i, false);
-			}
-		}	
-			
-		mouse_oldbuttonstate = mstate_di;
-	}
-	else
-	{
-		GetCursorPos (&current_pos);
-		mx = current_pos.x - window_center_x + mx_accum;
-		my = current_pos.y - window_center_y + my_accum;
-		mx_accum = 0;
-		my_accum = 0;
-	}
-
-//if (mx ||  my)
-//	Con_DPrintf("mx=%d, my=%d\n", mx, my);
-
-	if (m_filter.value)
-	{
-		mouse_x = (mx + old_mouse_x) * 0.5;
-		mouse_y = (my + old_mouse_y) * 0.5;
-	}
-	else
-	{
-		mouse_x = mx;
-		mouse_y = my;
-	}
-
-	old_mouse_x = mx;
-	old_mouse_y = my;
-
-	mouse_x *= sensitivity.value;
-	mouse_y *= sensitivity.value;
-
-// add mouse X/Y movement to cmd
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mouse_x;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-		
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
-	{
-		cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	}
-	else
-	{
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * mouse_y;
-		else
-			cmd->forwardmove -= m_forward.value * mouse_y;
-	}
-
-// if the mouse has moved, force it to the center, so there's room to move
-	if (mx || my)
-	{
-		SetCursorPos (window_center_x, window_center_y);
-	}
-}
-
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_Move (usercmd_t *cmd)
-{
-
-	if (ActiveApp && !Minimized)
-	{
-		IN_MouseMove (cmd);
-		IN_JoyMove (cmd);
-	}
-}
-
-
-/*
-===========
-IN_Accumulate
-===========
-*/
-void IN_Accumulate (void)
-{
-	int		mx, my;
-	HDC	hdc;
-
-	if (mouseactive)
-	{
-		if (!dinput)
-		{
-			GetCursorPos (&current_pos);
-
-			mx_accum += current_pos.x - window_center_x;
-			my_accum += current_pos.y - window_center_y;
-
-		// force the mouse to the center, so there's room to move
-			SetCursorPos (window_center_x, window_center_y);
-		}
-	}
-}
-
-
-/*
-===================
-IN_ClearStates
-===================
-*/
-void IN_ClearStates (void)
-{
-
-	if (mouseactive)
-	{
-		mx_accum = 0;
-		my_accum = 0;
-		mouse_oldbuttonstate = 0;
-	}
-}
-
-
-/* 
-=============== 
-IN_StartupJoystick 
-=============== 
-*/  
-void IN_StartupJoystick (void) 
-{ 
-	int			i, numdevs;
-	JOYCAPS		jc;
-	MMRESULT	mmr;
- 
- 	// assume no joystick
-	joy_avail = false; 
-
-	// abort startup if user requests no joystick
-	if ( COM_CheckParm ("-nojoy") ) 
-		return; 
- 
-	// verify joystick driver is present
-	if ((numdevs = joyGetNumDevs ()) == 0)
-	{
-		Con_Printf ("\njoystick not found -- driver not present\n\n");
-		return;
-	}
-
-	// cycle through the joystick ids for the first valid one
-	for (joy_id=0 ; joy_id<numdevs ; joy_id++)
-	{
-		memset (&ji, 0, sizeof(ji));
-		ji.dwSize = sizeof(ji);
-		ji.dwFlags = JOY_RETURNCENTERED;
-
-		if ((mmr = joyGetPosEx (joy_id, &ji)) == JOYERR_NOERROR)
-			break;
-	} 
-
-	// abort startup if we didn't find a valid joystick
-	if (mmr != JOYERR_NOERROR)
-	{
-		Con_Printf ("\njoystick not found -- no valid joysticks (%x)\n\n", mmr);
-		return;
-	}
-
-	// get the capabilities of the selected joystick
-	// abort startup if command fails
-	memset (&jc, 0, sizeof(jc));
-	if ((mmr = joyGetDevCaps (joy_id, &jc, sizeof(jc))) != JOYERR_NOERROR)
-	{
-		Con_Printf ("\njoystick not found -- invalid joystick capabilities (%x)\n\n", mmr); 
-		return;
-	}
-
-	// save the joystick's number of buttons and POV status
-	joy_numbuttons = jc.wNumButtons;
-	joy_haspov = jc.wCaps & JOYCAPS_HASPOV;
-
-	// old button and POV states default to no buttons pressed
-	joy_oldbuttonstate = joy_oldpovstate = 0;
-
-	// mark the joystick as available and advanced initialization not completed
-	// this is needed as cvars are not available during initialization
-
-	joy_avail = true; 
-	joy_advancedinit = false;
-
-	Con_Printf ("\njoystick detected\n\n"); 
-}
-
-
-/*
-===========
-RawValuePointer
-===========
-*/
-PDWORD RawValuePointer (int axis)
-{
-	switch (axis)
-	{
-	case JOY_AXIS_X:
-		return &ji.dwXpos;
-	case JOY_AXIS_Y:
-		return &ji.dwYpos;
-	case JOY_AXIS_Z:
-		return &ji.dwZpos;
-	case JOY_AXIS_R:
-		return &ji.dwRpos;
-	case JOY_AXIS_U:
-		return &ji.dwUpos;
-	case JOY_AXIS_V:
-		return &ji.dwVpos;
-	}
-}
-
-
-/*
-===========
-Joy_AdvancedUpdate_f
-===========
-*/
-void Joy_AdvancedUpdate_f (void)
-{
-
-	// called once by IN_ReadJoystick and by user whenever an update is needed
-	// cvars are now available
-	int	i;
-	DWORD dwTemp;
-
-	// initialize all the maps
-	for (i = 0; i < JOY_MAX_AXES; i++)
-	{
-		dwAxisMap[i] = AxisNada;
-		dwControlMap[i] = JOY_ABSOLUTE_AXIS;
-		pdwRawValue[i] = RawValuePointer(i);
-	}
-
-	if( joy_advanced.value == 0.0)
-	{
-		// default joystick initialization
-		// 2 axes only with joystick control
-		dwAxisMap[JOY_AXIS_X] = AxisTurn;
-		// dwControlMap[JOY_AXIS_X] = JOY_ABSOLUTE_AXIS;
-		dwAxisMap[JOY_AXIS_Y] = AxisForward;
-		// dwControlMap[JOY_AXIS_Y] = JOY_ABSOLUTE_AXIS;
-	}
-	else
-	{
-		if (Q_strcmp (joy_name.string, "joystick") != 0)
-		{
-			// notify user of advanced controller
-			Con_Printf ("\n%s configured\n\n", joy_name.string);
-		}
-
-		// advanced initialization here
-		// data supplied by user via joy_axisn cvars
-		dwTemp = (DWORD) joy_advaxisx.value;
-		dwAxisMap[JOY_AXIS_X] = dwTemp & 0x0000000f;
-		dwControlMap[JOY_AXIS_X] = dwTemp & JOY_RELATIVE_AXIS;
-		dwTemp = (DWORD) joy_advaxisy.value;
-		dwAxisMap[JOY_AXIS_Y] = dwTemp & 0x0000000f;
-		dwControlMap[JOY_AXIS_Y] = dwTemp & JOY_RELATIVE_AXIS;
-		dwTemp = (DWORD) joy_advaxisz.value;
-		dwAxisMap[JOY_AXIS_Z] = dwTemp & 0x0000000f;
-		dwControlMap[JOY_AXIS_Z] = dwTemp & JOY_RELATIVE_AXIS;
-		dwTemp = (DWORD) joy_advaxisr.value;
-		dwAxisMap[JOY_AXIS_R] = dwTemp & 0x0000000f;
-		dwControlMap[JOY_AXIS_R] = dwTemp & JOY_RELATIVE_AXIS;
-		dwTemp = (DWORD) joy_advaxisu.value;
-		dwAxisMap[JOY_AXIS_U] = dwTemp & 0x0000000f;
-		dwControlMap[JOY_AXIS_U] = dwTemp & JOY_RELATIVE_AXIS;
-		dwTemp = (DWORD) joy_advaxisv.value;
-		dwAxisMap[JOY_AXIS_V] = dwTemp & 0x0000000f;
-		dwControlMap[JOY_AXIS_V] = dwTemp & JOY_RELATIVE_AXIS;
-	}
-
-	// compute the axes to collect from DirectInput
-	joy_flags = JOY_RETURNCENTERED | JOY_RETURNBUTTONS | JOY_RETURNPOV;
-	for (i = 0; i < JOY_MAX_AXES; i++)
-	{
-		if (dwAxisMap[i] != AxisNada)
-		{
-			joy_flags |= dwAxisFlags[i];
-		}
-	}
-}
-
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-	int		i, key_index;
-	DWORD	buttonstate, povstate;
-
-	if (!joy_avail)
-	{
-		return;
-	}
-
-	
-	// loop through the joystick buttons
-	// key a joystick event or auxillary event for higher number buttons for each state change
-	buttonstate = ji.dwButtons;
-	for (i=0 ; i < joy_numbuttons ; i++)
-	{
-		if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
-		{
-			key_index = (i < 4) ? K_JOY1 : K_AUX1;
-			Key_Event (key_index + i, true);
-		}
-
-		if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
-		{
-			key_index = (i < 4) ? K_JOY1 : K_AUX1;
-			Key_Event (key_index + i, false);
-		}
-	}
-	joy_oldbuttonstate = buttonstate;
-
-	if (joy_haspov)
-	{
-		// convert POV information into 4 bits of state information
-		// this avoids any potential problems related to moving from one
-		// direction to another without going through the center position
-		povstate = 0;
-		if(ji.dwPOV != JOY_POVCENTERED)
-		{
-			if (ji.dwPOV == JOY_POVFORWARD)
-				povstate |= 0x01;
-			if (ji.dwPOV == JOY_POVRIGHT)
-				povstate |= 0x02;
-			if (ji.dwPOV == JOY_POVBACKWARD)
-				povstate |= 0x04;
-			if (ji.dwPOV == JOY_POVLEFT)
-				povstate |= 0x08;
-		}
-		// determine which bits have changed and key an auxillary event for each change
-		for (i=0 ; i < 4 ; i++)
-		{
-			if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
-			{
-				Key_Event (K_AUX29 + i, true);
-			}
-
-			if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
-			{
-				Key_Event (K_AUX29 + i, false);
-			}
-		}
-		joy_oldpovstate = povstate;
-	}
-}
-
-
-/* 
-=============== 
-IN_ReadJoystick
-=============== 
-*/  
-qboolean IN_ReadJoystick (void)
-{
-
-	memset (&ji, 0, sizeof(ji));
-	ji.dwSize = sizeof(ji);
-	ji.dwFlags = joy_flags;
-
-	if (joyGetPosEx (joy_id, &ji) == JOYERR_NOERROR)
-	{
-		// this is a hack -- there is a bug in the Logitech WingMan Warrior DirectInput Driver
-		// rather than having 32768 be the zero point, they have the zero point at 32668
-		// go figure -- anyway, now we get the full resolution out of the device
-		if (joy_wwhack1.value != 0.0)
-		{
-			ji.dwUpos += 100;
-		}
-		return true;
-	}
-	else
-	{
-		// read error occurred
-		// turning off the joystick seems too harsh for 1 read error,\
-		// but what should be done?
-		// Con_Printf ("IN_ReadJoystick: no response\n");
-		// joy_avail = false;
-		return false;
-	}
-}
-
-
-/*
-===========
-IN_JoyMove
-===========
-*/
-void IN_JoyMove (usercmd_t *cmd)
-{
-	float	speed, aspeed;
-	float	fAxisValue, fTemp;
-	int		i;
-
-	// complete initialization if first time in
-	// this is needed as cvars are not available at initialization time
-	if( joy_advancedinit != true )
-	{
-		Joy_AdvancedUpdate_f();
-		joy_advancedinit = true;
-	}
-
-	// verify joystick is available and that the user wants to use it
-	if (!joy_avail || !in_joystick.value)
-	{
-		return; 
-	}
- 
-	// collect the joystick data, if possible
-	if (IN_ReadJoystick () != true)
-	{
-		return;
-	}
-
-	if (in_speed.state & 1)
-		speed = cl_movespeedkey.value;
-	else
-		speed = 1;
-	aspeed = speed * host_frametime;
-
-	// loop through the axes
-	for (i = 0; i < JOY_MAX_AXES; i++)
-	{
-		// get the floating point zero-centered, potentially-inverted data for the current axis
-		fAxisValue = (float) *pdwRawValue[i];
-		// move centerpoint to zero
-		fAxisValue -= 32768.0;
-
-		if (joy_wwhack2.value != 0.0)
-		{
-			if (dwAxisMap[i] == AxisTurn)
-			{
-				// this is a special formula for the Logitech WingMan Warrior
-				// y=ax^b; where a = 300 and b = 1.3
-				// also x values are in increments of 800 (so this is factored out)
-				// then bounds check result to level out excessively high spin rates
-				fTemp = 300.0 * pow(abs(fAxisValue) / 800.0, 1.3);
-				if (fTemp > 14000.0)
-					fTemp = 14000.0;
-				// restore direction information
-				fAxisValue = (fAxisValue > 0.0) ? fTemp : -fTemp;
-			}
-		}
-
-		// convert range from -32768..32767 to -1..1 
-		fAxisValue /= 32768.0;
-
-		switch (dwAxisMap[i])
-		{
-		case AxisForward:
-			if ((joy_advanced.value == 0.0) && (in_mlook.state & 1))
-			{
-				// user wants forward control to become look control
-				if (fabs(fAxisValue) > joy_pitchthreshold.value)
-				{		
-					// if mouse invert is on, invert the joystick pitch value
-					// only absolute control support here (joy_advanced is false)
-					if (m_pitch.value < 0.0)
-					{
-						cl.viewangles[PITCH] -= (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
-					}
-					else
-					{
-						cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
-					}
-					V_StopPitchDrift();
-				}
-				else
-				{
-					// no pitch movement
-					// disable pitch return-to-center unless requested by user
-					// *** this code can be removed when the lookspring bug is fixed
-					// *** the bug always has the lookspring feature on
-					if(lookspring.value == 0.0)
-						V_StopPitchDrift();
-				}
-			}
-			else
-			{
-				// user wants forward control to be forward control
-				if (fabs(fAxisValue) > joy_forwardthreshold.value)
-				{
-					cmd->forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value;
-				}
-			}
-			break;
-
-		case AxisSide:
-			if (fabs(fAxisValue) > joy_sidethreshold.value)
-			{
-				cmd->sidemove += (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value;
-			}
-			break;
-
-		case AxisTurn:
-			if ((in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1)))
-			{
-				// user wants turn control to become side control
-				if (fabs(fAxisValue) > joy_sidethreshold.value)
-				{
-					cmd->sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value;
-				}
-			}
-			else
-			{
-				// user wants turn control to be turn control
-				if (fabs(fAxisValue) > joy_yawthreshold.value)
-				{
-					if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
-					{
-						cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * aspeed * cl_yawspeed.value;
-					}
-					else
-					{
-						cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * speed * 180.0;
-					}
-
-				}
-			}
-			break;
-
-		case AxisLook:
-			if (in_mlook.state & 1)
-			{
-				if (fabs(fAxisValue) > joy_pitchthreshold.value)
-				{
-					// pitch movement detected and pitch movement desired by user
-					if(dwControlMap[i] == JOY_ABSOLUTE_AXIS)
-					{
-						cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value;
-					}
-					else
-					{
-						cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * speed * 180.0;
-					}
-					V_StopPitchDrift();
-				}
-				else
-				{
-					// no pitch movement
-					// disable pitch return-to-center unless requested by user
-					// *** this code can be removed when the lookspring bug is fixed
-					// *** the bug always has the lookspring feature on
-					if(lookspring.value == 0.0)
-						V_StopPitchDrift();
-				}
-			}
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	// bounds check pitch
-	if (cl.viewangles[PITCH] > 80.0)
-		cl.viewangles[PITCH] = 80.0;
-	if (cl.viewangles[PITCH] < -70.0)
-		cl.viewangles[PITCH] = -70.0;
-}
--- a/u/kit/3DFX.TXT
+++ /dev/null
@@ -1,279 +1,0 @@
-GLQuake Drivers for Voodoo Graphics Based 3D Accelerators
-Preliminary Release 2
-
-Copyright ( 1997 3Dfx Interactive, Inc. )
-All Rights Reserved
-
-3Dfx Interactive, Inc.
-www: www.3dfx.com
-news: news.3dfx.com  
-
------------------------------------------------------------------------
-NOTE: GLQuake requires DirectX 2.0 or DirectX 3.0
-(Needed for DirectSound support)
-
-DirectX 2.0 or DirectX 3.0 can be installed from the media provided
-with your Voodoo Based 3D Accelerator.
------------------------------------------------------------------------
-
-
-
-Release Notes for GLQuake Preliminary Release 2 (Quake Version 1.07)
-
------------------------------------------------------------------------
-What's in the distribution?
------------------------------------------------------------------------
-This distribution contains GLQuake Drivers for Voodoo Graphics Based 3D
-Accelerators.  These drivers were tested on the following boards: 
-
-- Diamond Monster 3D
-- Orchid Righteous 3D
-- 3Dfx Interactive reference boards
-
-NOTE:  The enclosed drivers are not meant to replace any Direct3D or 
-Glide drivers provided by your Voodoo Graphics card manufacturer. 
-Please obtain supported drivers from:
-
-- Diamond supported drivers can be obtained from www.diamondmm.com
-- Orchid supported drivers can be obtained from www.orchid.com
-
-
-Included Files
---------------
-
-OPENGL32.DLL - QuakeGL Interface to Voodoo Graphics
-FXMEMMAP.VXD - Voodoo Graphics VXD
-GLQUAKE.EXE  - ID Software provided GLQUAKE.EXE
-README.TXT   - ID Software provided README.TXT
-READ3DFX.TXT - This File
-
-All enclosed files MUST reside in your Quake directory and not in the
-Windows\SYSTEM directory.  
-
-OEMSR2 users: Do NOT replace OPENGL32.DLL located in your
-Windows\SYSTEM directory.
-
-
-
------------------------------------------------------------------------
-Installation 
------------------------------------------------------------------------
-
-Requirements
-------------
-
-- Voodoo Graphics Based 3D Accelerator
-- Windows 95
-- A PC with a Pentium 90 or higher CPU
-- 16MB of RAM
-- 2D Video card set at 16 bit or higher color
-
-Installation
-------------
-
-Adding GLQuake Driver Support
------------------------------
-1) Install the FULL Version (Not the Shareware version!) of Quake.
-
-2) Copy the GLQUAKE.EXE and other associated files from the GLQuake
-   ZIP file to your Quake Directory.  (Use Windows Explorer)
-
-3) Copy the enclosed OPENGL32.DLL file to your Quake Directory.
-   (Use Windows Explorer)   NOTE: DO NOT COPY OPENGL32.DLL to your
-   Windows\SYSTEM directory
-
-4) Create a Desktop Shortcut for GLQuake:  Using the right mouse button
-   drag the GLQUAKE.EXE file from Windows Explorer to the Desktop.
-         When prompted choose "Create Shortcut"
-
-5) Create an autoexec.cfg file in the ID1\ directory of your quake
-   installation if you do not already have one.  Add the line
-
-   gl_playermip "2"
-
-   to the file.
-
-6) Start GLQuake by running the shortcut. 
-
-
-Troubleshooting and Frequently Asked Questions
-----------------------------------------------
-
-1. Will GLQuake work with shareware Quake?
-
-No, the full registered version of Quake is required.  
-
-
-
-2. Do I need any other drivers to run GLQuake on Voodoo Graphics?
-
-Just make sure that the FXMEMMAP.VXD file is in your Windows\SYSTEM 
-directory and that DirectX 2.0, DirectX 3.0 or DirectX 3.0a are
-installed as GLQuake uses DirectSound. The latest version of DirectX
-can be obtained from:
-	http://www.microsoft.com/mediadev/download/isdk.htm
-
-
-
-3. I installed GLQuake and try to run the GLQUAKE.EXE file but I get a 
-"no RGB fullscreen modes available"  How do I get GLQuake to run?
-
-Make sure that your 2D video card is set to 16bit color (65K colors,
-not 16 colors). In addition, do not start GLQuake from a full screen
-MS-DOS prompt.
-
-
-
-4. GLQuake comes up for a little while then drops me back to the
-Windows 95 desktop, what's wrong?
-
-Your Virtual Memory settings on your system should be increased.  Open
-Control Panel, System - click on the Performance tab and then click on
-Virtual Memory.  Adjust the settings so that the minimum swap file size
-is 80MB.   You may also want to delete all the mesh files - do this by
-deleting the quake\ID1\glquake directory.
-
-
-
-5. Why does GLQuake try to connect to my Internet connection whenever
-it starts?
-
-GLQuake uses Windows networking. Auto-Dial is likely enabled in your
-Internet Control Panel or in Internet Explorer Options.  Single
-Player users: To disable Network use in GLQuake and prevent the
-network connection screen from coming up, add "-nolan" to the
-GLQUAKE.EXE command line, example:
-	GLQUAKE.EXE -nolan
-
-
-
-
-6. I have a three button mouse, but I can't use or set the middle 
-button in GLQuake, what's wrong?
-
-To use a three button mouse with GLQuake, your Windows mouse driver
-must support three buttons.  Use the Logitech PS/2, Serial or Bus
-driver instead of the Microsoft or Standard PS/2, Serial or Bus driver.
-Also, make certain that your Mouse control panel sets the middle button
-to "middle" and not "double click".
-
-
-
-7. Mouse input seems jumpy, how do I fix that?
-
-From the console (hit the ~ tilde key), enter m_filter 1 <enter>
-This option can be added to the AUTOEXEC.CFG file (in the \ID1
-directory).  You may also add this option to the GLQUAKE.EXE command
-line, example:
-	GLQUAKE.EXE +m_filter 1
-
-
-
-8. While playing GLQuake the sound stutters, how do I fix it?
-
-If your sound card does not support DirectSound, you may encounter
-stuttering sound during game play.  Try adding the following value to
-the CONFIG.CFG file (in the quake\ID1 directory):
-		 _snd_mixahead ".14"
-
-
-
-9. When I hit ALT-TAB or the Windows start button to switch to another
-application why do I return to a 640x480 display?
-
-GLQuake by default needs to keep the 2D display at 640x480 while it is
-running. To return the display to your normal setting you must exit
-GLQuake.  To prevent this, add the following to the GLQUAKE.EXE command
-line options "+_windowed_mouse 1" and "-window"   example:
-	GLQUAKE.EXE +_windowed_mouse 1 -window
-
-
-
-10. GLQuake multiplayer can't find other games or won't connect.
-
-GLQuake uses Windows 95 Networking.  Verify that the correct networking
-components are installed and that you can connect to the other machine
-using File and print sharing or TCP/IP ping.  If you are using IPX also
-make certain that the frame type is the same on all the systems.
-
-
-
-11. GLQuake multiplayer slows down alot, how do I fix it?
-
-Add gl_playermip 2 to the AUTOEXEC.CFG file (in the \ID1 directory)
-You may however add "+gl_playermip 2" to the GLQUAKE.EXE command line,
-example:
-	GLQUAKE.EXE +gl_playermip 2
-
-
-
-12. Does the Activision(r) Scourge of Armagon add-on (Mission Pack 1)
-work with GLQuake?
-
-Yes, start GLQUAKE.EXE with a "-hipnotic" switch.   Example:
-	GLQUAKE.EXE -hipnotic
-
-
-
-13. Do other 3rd party quake levels work with GLQuake?
-
-Not all 3rd party levels have been tested, some may not work properly
-or optimally.
-
-
-
-14. Will GLQuake use a Voodoo Graphics accelerator under Windows NT?
-
-The 3Dfx GLQuake drivers currently only work under Windows 95.  
-
-
-
-15. After installing GLQuake the OpenGL screen savers in Windows 95
-(OEMSR2) don't work. What's wrong?
-
-The OpenGL Windows 95 screen savers in OEMSR2 will fail if you copied
-the OPENGL32.DLL file that comes with GLQuake to your Windows\SYSTEM
-directory.  The 3Dfx OPENGL32.DLL file only works with Quake. It will
-not run with other OpenGL applications.  If you copied the 3Dfx 
-OPENGL32.DLL to your Windows\SYSTEM directory and need to restore the
-Microsoft provided OPENGL32.DLL, follow these steps:
-
-	OEMSR2 Users
-	------------
-	1) Insert your Windows 95 CD into your CD-ROM drive
-	2) Open a MS-DOS prompt, (Click Start, Programs, MS-DOS Prompt)
-	3) Switch to the Windows\SYSTEM directory, ie:
-		C: <enter>
-		CD\Windows\system <enter>
-	4) At the command prompt, enter:
-		EXTRACT /A E:\WIN95 opengl32.dll <enter>
-		(Substitute E:\ for your CD-ROM drive letter)
-	
-	Standard Windows 95 Users
-	-------------------------
-	1) Download and reinstall OpenGL for Windows 95 from the source
-	you previously used.
-		
-
-
-16. How do I get support for GLQuake
-
-GLQuake is currently unsupported.  You may however find answers to 
-questions on various Quake dedicated websites.  3Dfx provides a GLQuake
-newsgroup on news.3dfx.com (Newsgroup name is 3dfx.games.glquake ) to
-discuss GLQuake with other users.  3Dfx also provides a regularly
-updated GLQuake FAQ at: http://www.3dfx.com/game_dev/quake_faq.html
-
-
-
-16. How do I send a bug report?
-
-If your problem is not resolved in this document or our updated FAQ
-(please see #15) and your bug is related to visual quality, performance
-or stability send an email to [email protected]   - Describe your
-system configuration  (CPU Type, CPU Speed, 2D Video Card type, Amount
-of Memory, Virtual Memory Size..etc.) and how to recreate the bug.  
-
-
-Voodoo Graphics is a trademark of 3Dfx Interactive, Inc.  All other
-trademarks are the property of their respective owners.
\ No newline at end of file
binary files a/u/kit/GLQUAKE.EXE /dev/null differ
--- a/u/kit/JOYSTICK.TXT
+++ /dev/null
@@ -1,167 +1,0 @@
-
-NEW NOTE FOR 1.08:
-Joysticks are disabled by defualt now, due to problems on some systems without joysticks installed.  Type "joystick 1" at the console, and everything will behave as documented here.  This will be saved in your config file, so you will only have to do it once.
-
-Description of Windows 95 Quake DirectInput support
-By:  FPgaming, Inc. (www.fpgaming.com) -- Creators of the Assassin 3D
-File:  JOYSTICK.TXT
-Created:  02/21/97
-(This may be more information than you ever wanted to know.)
-
-The joystick support with Windows 95 Quake has been significantly enhanced.  Standard joysticks, digital joysticks and new advanced controllers like the FPgaming Assassin 3D, the Logitech WingMan Warrior and the SpaceTec IMC SpaceOrb are all supported.
-
-To make it work, just verify that your joystick or game controller is selected in the Joystick control panel applet and has been calibrated and tested, then launch Windows 95 Quake (WinQuake.exe or glquake.exe).  For standard and new digital joysticks, WinQuake will detect the joystick and automatically configure it.  For advanced controllers, you will additionally need to run a config file (or run it from your autoexec.cfg) prior to the device operating.  This will set the advanced features for your particular device.  This config file should be obtained from your game controller company.  The config files for the comman game controllers are included below.  If you don't want your joystick or game controller enabled, add '-nojoy' to your command-line.
-
-
-Standard Joystick Support
-The standard joystick support has been enhanced to provide the following:
-1. proportional movement (the farther you move the stick, the faster you move) 
-2. support for up to 32 buttons (JOY1-JOY4 and AUX5-AUX32)
-3. sensitivity setting for each control (allows tuning and inverting the control direction)
-4. dead-zone setting for each control
-
-The default joystick setting is for joystick left/right movement to control turning and for joystick forward/backward movement to control moving forward/backward.  For optional strafing, add the 'sidestep' feature to one of your buttons (via the Customize menu).  For optional looking, add the  'mouse look' feature to one of your buttons (also via the Customize menu).  
-
-Additionally, there are several features that you can set from the Options menu.  'Always Run' allows you change your maximum speed from walking to running.  'Invert Mouse' allows you to change the direction the joystick has to move to when looking up and down.  'Lookspring' enables automatic look-forward-when-moving.  And, 'Lookstrafe' automatically enables strafing when the 'mouse look' button is pressed.
-
-The following variables control your sensititivity settings:
-	joyforwardsensitivity - controls the ramp-up speed for moving forward and backward
-	joysidesensitivity - controls the ramp-up speed for moving side to side
-	joypitchsensitivity - controls the speed that you look up and down
-	joyyawsensitivity - controls the speed that you look left to right
-You can set the sensitivity settings to negative numbers.  This inverts the direction of movement for the control.  The default sensitivity settings are 1 (or -1).  There is no limit on the range; whatever feels good.
-
-The following variables control your threshold settings:
-	joyforwardthreshold - controls the dead-zone for moving forward and backward
-	joysidethreshold - controls the dead-zone for moving side to side
-	joypitchthreshold - controls the dead-zone for looking up and down
-	joyyawthreshold - controls the dead-zone for looking left and right
-The threshold settings allow you to control your dead-zone (or no-movement zone).  The default threshold settings are .15 (meaning 15% of the full-range).  The range of the threshold settings is from 0 to 1.  Troublesome analog joysticks may need a larger number (like .2).  Premium joysticks can use a smaller number (like .1).
-
-The joystick sensitivity settings and the threshold settings are not saved after you quit your game as inadvertant settings can really hose your control.  If you want to keep any changes, add them into your autoexec.cfg file.
-
-If your joystick has a POV hat, the buttons are mapped to AUX29-AUX32.  So, you get 8 buttons with the Logitech WingMan Extreme and 12 buttons with the Microsoft SideWinder 3D Pro, etc.
-
-
-Advanced Controller Support
-The following features have been added:
-1. support for all 6 axes (X, Y, Z, R, U, V)
-2. mapping of any axis to any control (Forward, Look, Side, Turn)
-3. proportional movement for all controls
-4. sensitivity setting for any control (allows tuning and inverting the control direction)
-5. threshold setting for any control (allows dead-zone setting)
-6. support for absolute controls (like joysticks) and relative controls (like trackballs and spinners)
-7. support for up to 32 buttons (JOY1-JOY4 and AUX5-AUX32)
-
-To make an advanced controller operate, you will need to get a config file from your game controller company.  This file is typically placed in your quake\id1 directory and then it is called within your autoexec.cfg file.  For example, if your config file is named gamectrl.cfg, place that file within your quake\id1 directory and add 'exec gamectrl.cfg' in your autoexec.cfg file.  If you don't have an autoexec.cfg file, you can create one and just place this one line in it.
-
-******************************************************************************
-NOTE:  The information below is for game controller companies to integrate their device and for anyone wanting to create a custom setup.
-
-In addition to the above new variables, there are six more for axis mapping.  These are:
-	joyadvaxisx - controls mapping of DirectInput axis X (typically joystick left and right)
-	joyadvaxisy - controls mapping of DirectInput axis Y (typically joystick forward and backward)
-	joyadvaxisz - controls mapping of DirectInput axis Z (typically joystick throttle)
-	joyadvaxisr - controls mapping of DirectInput axis R (typically joystick rudder)
-	joyadvaxisu - controls mapping of DirectInput axis U (custom axis - Assassin 3D trackball left and right, WingMan Warrior SpinControl and SpaceOrb roll)
-	joyadvaxisv - controls mapping of DirectInput axis V (custom axis - Assassin 3D trackball forward and backward and SpaceOrb yaw)
-Each joyadvaxis variable can be set to the following controls:
-	0 = Axis not used
-	1 = Axis is for forward and backward movement
-	2 = Axis is for looking up and down (pitch)
-	3 = Axis is for side to side movement
-	4 = Axis is for turning left and right (yaw)
-Additionally, each axis can be designated as an absolute axis (like a joystick) or a relative axis (like the FPgaming trackball or the WingMan Warrior SpinControl).  Absolute axes are defined as having a stopping position whereas relative axes don't have a stopping position and just go around and around.  To designate an axis as a relative axis, add 16 to the above control number.  For example, to set the Assassin 3D's axis U to be looking left and right, type 'joyadvaxisu 20'.  As another example, to make your rudder pedals contol turning left and right, type 'joyadvaxisr 4'.  It's a bit complicated, but only needs to be done once.
-
-The advanced axes variables will not have any effect until joyadvanced is set to 1.0.  Additionally, any changes to the to the axes will not take effect until the joyadvancedupdate command is executed.  So, the procedure for creating an advanced mapping is:
-1.  set 'joyadvanced 1'
-2.  make any desired mapping changes
-3.  make any desired sensitivity changes
-4.  make any desired threshold changes
-3.  call 'joyadvancedupdate'
-
-Here is the config file for the FPgaming Assassin 3D:
-// ADVA3D.CFG
-// Revision 1.0 -- refer to www.fpgaming.com for updates
-joyname "FPgaming Assassin 3D"
-joyadvanced 1
-joyadvaxisx 3
-joyadvaxisy 1
-joyadvaxisz 0
-joyadvaxisr 0
-joyadvaxisu 20
-joyadvaxisv 18
-joyforwardsensitivity -1.0
-joysidesensitivity 1.0
-joypitchsensitivity -0.25
-joyyawsensitivity -0.5
-joyforwardthreshold 0.15
-joysidethreshold 0.15
-joyyawthreshold 0.0
-joypitchthreshold 0.0
-+mlook
-joyadvancedupdate
-
-Here is a config file for the Logitech WingMan Warrior:
-// ADVWW.CFG
-// Revision 0.1 -- refer to www.logitech.com for updates
-joyname "Logitech WingMan Warrior"
-joyadvanced 1.0
-joywwhack1 1.0
-joywwhack2 1.0
-joyadvaxisx 3
-joyadvaxisy 1
-joyadvaxisz 0
-joyadvaxisr 0
-joyadvaxisu 20
-joyadvaxisv 0
-joyforwardsensitivity -1.0
-joysidesensitivity 1.0
-joypitchsensitivity 0.0
-joyyawsensitivity -0.6
-joyforwardthreshold 0.15
-joysidethreshold 0.15
-joypitchthreshold 0.0
-joyyawthreshold 0.0
-joyadvancedupdate
-
-Here is a config file for the SpaceTec IMC SpaceOrb:
-// ADVSPORB.CFG
-// Revision 0.1 -- refer to www.spacetec.com for updates
-joyname "SpaceTec IMC SpaceOrb"
-joyadvanced 1.0
-joyadvaxisx 3
-joyadvaxisy 1
-joyadvaxisz 0
-joyadvaxisr 2
-joyadvaxisu 0
-joyadvaxisv 4
-joyforwardsensitivity -1.0
-joysidesensitivity 1.0
-joypitchsensitivity -0.5
-joyyawsensitivity 1
-joyforwardthreshold 0.1
-joysidethreshold 0.1
-joypitchthreshold 0.1
-joyyawthreshold 0.1
-+mlook
-joyadvancedupdate
-
-Here is a config file for making your joystick operate looking around and strafing, your rudder pedals control turning left and right and throttle control moving forward and backward:
-joyname "Joystick, Rudder & Throttle"
-joyadvanced 1.0
-joyadvaxisx 3
-joyadvaxisy 2
-joyadvaxisz 1
-joyadvaxisr 4
-joyadvaxisu 0
-joyadvaxisv 0
-joyforwardsensitivity -1.0
-joysidesensitivity -1.0
-joypitchsensitivity 1.0
-joyyawsensitivity -1.0
-joyforwardthreshold 0.15
-joysidethreshold 0.15
-joyyawthreshold 0.15
-joypitchthreshold 0.15
-joyadvancedupdate
\ No newline at end of file
binary files a/u/kit/OPENGL32.DLL /dev/null differ
--- a/u/kit/README.TXT
+++ /dev/null
@@ -1,171 +1,0 @@
-Glquake v0.97, Quake v1.09 release notes
-
-3dfx owners -- read the 3dfx.txt file.
-
-On a standard OpenGL system, all you should need to do to run glquake is put 
-glquake.exe in your quake directory, and run it from there.  DO NOT install 
-the opengl32.dll unless you have a 3dfx!  Glquake should change the screen 
-resolution to 640*480*32k colors and run full screen by default.
-
-If you are running win-95, your desktop must be set to 32k or 64k colors 
-before running glquake.  NT can switch automatically.
-
-Theoretically, glquake will run on any compliant OpenGL that supports the 
-texture objects extensions, but unless it is very powerfull hardware that 
-accelerates everything needed, the game play will not be acceptable.  If it 
-has to go through any software emulation paths, the performance will likely 
-by well under one frame per second.
-
-3dfx has provided an opengl32.dll that implements everything glquake needs, 
-but it is not a full opengl implementation.  Other opengl applications are 
-very unlikely to work with it, so consider it basically a "glquake driver".  
-See the encluded 3dfx.txt for specific instalation notes.  3dfx can only run 
-full screen, but you must still have your desktop set to a 16 bit color mode 
-for glquake to start.
-
-resolution options
-------------------
-We had dynamic resolution changing in glquake for a while, but every single 
-opengl driver I tried it on messed up in one way or another, so it is now 
-limited to startup time only.
-
-glquake -window
-This will start glquake in a window on your desktop instead of switching the 
-screen to lower resolution and covering everything.
-
-glquake -width 800 -height 600
-Tries to run glquake at the specified resolution.  Combined with -window, it 
-creates a desktop window that size, otherwise it tries to set a full screen 
-resolution.
-
-You can also specify the resolution of the console independant of the screen
-resolution.
-
-glquake -conwidth 320
-This will specify a console resolution of 320 by 240 (the height is
-automatically determined by the default 4:3 aspect ratio, you can also
-specify the height directly with -conheight).
-
-In higher resolution modes such as 800x600 and 1024x768, glquake will default
-to a 640x480 console, since the font becomes small enough at higher 
-resolutions to become unreadable.  If do you wish to have a higher resolution
-console and status bar, specify it as well, such as:
-glquake -width 800 -height 600 -conwidth 800
-
-texture options
----------------
-The amount of textures used in the game can have a large impact on performance.  
-There are several options that let you trade off visual quality for better 
-performance.
-
-There is no way to flush already loaded textures, so it is best to change 
-these options on the command line, or they will only take effect on some of 
-the textures when you change levels.
-
-OpenGL only allows textures to repeat on power of two boundaries (32, 64, 
-128, etc), but software quake had a number of textures that repeated at 24 
-or 96 pixel boundaries.  These need to be either stretched out to the next 
-higher size, or shrunk down to the next lower.  By default, they are filtered 
-down to the smaller size, but you can cause it to use the larger size if you 
-really want by using: 
-
-glquake +gl_round_down 0
-This will generally run well on a normal 4 MB 3dfx card, but for other cards 
-that have either worse texture management or slower texture swapping speeds, 
-there are some additional settings that can drastically lower the amount of 
-textures to be managed.
-
-glquake +gl_picmip 1
-This causes all textures to have one half the dimensions they otherwise would.  
-This makes them blurry, but very small.  You can set this to 2 to make the 
-textures one quarter the resolution on each axis for REALLY blurry textures.
-
-glquake +gl_playermip 1
-This is similar to picmip, but is only used for other players in deathmatch.  
-Each player in a deathmatch requires an individual skin texture, so this can 
-be a serious problem for texture management.  It wouldn't be unreasonable to 
-set this to 2 or even 3 if you are playing competatively (and don't care if 
-the other guys have smudged skins).  If you change this during the game, it 
-will take effect as soon as a player changes their skin colors.
-
-GLQuake also supports the following extensions for faster texture operation:
-
-GL_SGIS_multitexture
-Multitextures support allows certain hardware to render the world in one
-pass instead of two.  GLQuake uses two passes, one for the world textures
-and the second for the lightmaps that are blended on the textures.  On some
-hardware, with a GL_SIGS_multitexture supported OpenGL implementation, this
-can be done in one pass.  On hardware that supports this, you will get a
-60% to 100% increase in frame rate.  Currently, only 3DFX dual TMU cards
-(such as the Obsidian 2220) support this extension, but other hardware will
-soon follow.
-
-This extension will be autodetected and used.  If for some reason it is not
-working correctly, specify the command line option "-nomtex" to disable it.
-
-GL_EXT_shared_texture_palette
-GLQuake uses 16bit textures by default but on OpenGL implementations 
-that support the GL_EXT_shared_texture_palette extension, GLQuake will use
-8bit textures instead.  This results in using half the needed texture memory
-of 16bit texture and can improve performance.  This is very little difference
-in visual quality due to the fact that the textures are 8bit sources to
-begin with.
-
-run time options
-----------------
-At the console, you can set these values to effect drawing.
-
-gl_texturemode GL_NEAREST
-Sets texture mapping to point sampled, which may be faster on some GL systems 
-(not on 3dfx).
-
-gl_texturemode GL_LINEAR_MIPMAP
-This is the default texture mode.
-
-gl_texturemode GL_LINEAR_MIPMAP_LINEAR
-This is the highest quality texture mapping (trilinear), but only very high 
-end hardware (intergraph intense 3D / realizm) supports it.  Not that big of 
-a deal, actually.
-
-gl_finish 0
-This causes the game to not issue a glFinish() call each frame, which may make 
-some hardware run faster.  If this is cleared, the 3dfx will back up a number 
-of frames and not be very playable.
-
-gl_flashblend 0
-By default, glquake just draws a shaded ball around objects that are emiting 
-light.  Clearing this variable will cause it to properly relight the world 
-like normal quake, but it can be a significant speed hit on some systems.
-
-gl_ztrick 0
-Glquake uses a buffering method that avoids clearing the Z buffer, but some 
-hardware platforms don't like it.  If the status bar and console are flashing 
-every other frame, clear this variable.
-
-gl_keeptjunctions 0
-If you clear this, glquake will remove colinear vertexes when it reloads the 
-level.  This can give a few percent speedup, but it can leave a couple stray 
-blinking pixels on the screen.
-
-novelty features
-----------------
-These are some rendering tricks that were easy to do in glquake.  They aren't 
-very robust, but they are pretty cool to look at.
-
-r_shadows 1
-This causes every object to cast a shadow.
-
-r_wateralpha 0.7
-This sets the opacity of water textures, so you can see through it in properly 
-processed maps.  0.3 is very faint, almost like fog.  1 is completely solid 
-(the default).  Unfortunately, the standard quake maps don't contain any 
-visibility information for seeing past water surfaces, so you can't just play 
-quake with this turned on.  If you just want to see what it looks like, you 
-can set "r_novis 1", but that will make things go very slow.  When I get a 
-chance, I will probably release some maps that have been processed properly 
-for this.
-
-r_mirroralpha 0.3
-This changes one particular texture (the stained glass texture in the EASY 
-start hall) into a mirror.  The value is the opacity of the mirror surface.
-
--- a/u/makezip.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-zip -9 -r code * -x *.obj -x *.sbr -x *.pch -x *.pdb -x *.o -x *.exe -x *.dll -x *.map -x *.bsc -x *.lib -x *.ilk -x *.exp -x *.idb -x *.zip
--- a/u/math.s
+++ /dev/null
@@ -1,399 +1,0 @@
-//
-// math.s
-// x86 assembly-language math routines.
-
-#define GLQUAKE	1	// don't include unneeded defs
-#include "asm_i386.h"
-#include "quakeasm.h"
-
-
-#ifdef	id386
-
-	.data
-
-	.align	4
-Ljmptab:	.long	Lcase0, Lcase1, Lcase2, Lcase3
-			.long	Lcase4, Lcase5, Lcase6, Lcase7
-
-	.text
-
-// TODO: rounding needed?
-// stack parameter offset
-#define	val	4
-
-.globl C(Invert24To16)
-C(Invert24To16):
-
-	movl	val(%esp),%ecx
-	movl	$0x100,%edx		// 0x10000000000 as dividend
-	cmpl	%edx,%ecx
-	jle		LOutOfRange
-
-	subl	%eax,%eax
-	divl	%ecx
-
-	ret
-
-LOutOfRange:
-	movl	$0xFFFFFFFF,%eax
-	ret
-
-#define	in	4
-#define out	8
-
-	.align 2
-.globl C(TransformVector)
-C(TransformVector):
-	movl	in(%esp),%eax
-	movl	out(%esp),%edx
-
-	flds	(%eax)		// in[0]
-	fmuls	C(vright)		// in[0]*vright[0]
-	flds	(%eax)		// in[0] | in[0]*vright[0]
-	fmuls	C(vup)		// in[0]*vup[0] | in[0]*vright[0]
-	flds	(%eax)		// in[0] | in[0]*vup[0] | in[0]*vright[0]
-	fmuls	C(vpn)		// in[0]*vpn[0] | in[0]*vup[0] | in[0]*vright[0]
-
-	flds	4(%eax)		// in[1] | ...
-	fmuls	C(vright)+4	// in[1]*vright[1] | ...
-	flds	4(%eax)		// in[1] | in[1]*vright[1] | ...
-	fmuls	C(vup)+4		// in[1]*vup[1] | in[1]*vright[1] | ...
-	flds	4(%eax)		// in[1] | in[1]*vup[1] | in[1]*vright[1] | ...
-	fmuls	C(vpn)+4		// in[1]*vpn[1] | in[1]*vup[1] | in[1]*vright[1] | ...
-	fxch	%st(2)		// in[1]*vright[1] | in[1]*vup[1] | in[1]*vpn[1] | ...
-
-	faddp	%st(0),%st(5)	// in[1]*vup[1] | in[1]*vpn[1] | ...
-	faddp	%st(0),%st(3)	// in[1]*vpn[1] | ...
-	faddp	%st(0),%st(1)	// vpn_accum | vup_accum | vright_accum
-
-	flds	8(%eax)		// in[2] | ...
-	fmuls	C(vright)+8	// in[2]*vright[2] | ...
-	flds	8(%eax)		// in[2] | in[2]*vright[2] | ...
-	fmuls	C(vup)+8		// in[2]*vup[2] | in[2]*vright[2] | ...
-	flds	8(%eax)		// in[2] | in[2]*vup[2] | in[2]*vright[2] | ...
-	fmuls	C(vpn)+8		// in[2]*vpn[2] | in[2]*vup[2] | in[2]*vright[2] | ...
-	fxch	%st(2)		// in[2]*vright[2] | in[2]*vup[2] | in[2]*vpn[2] | ...
-
-	faddp	%st(0),%st(5)	// in[2]*vup[2] | in[2]*vpn[2] | ...
-	faddp	%st(0),%st(3)	// in[2]*vpn[2] | ...
-	faddp	%st(0),%st(1)	// vpn_accum | vup_accum | vright_accum
-
-	fstps	8(%edx)		// out[2]
-	fstps	4(%edx)		// out[1]
-	fstps	(%edx)		// out[0]
-
-	ret
-
-
-#define EMINS	4+4
-#define EMAXS	4+8
-#define P		4+12
-
-	.align 2
-.globl C(BoxOnPlaneSide)
-C(BoxOnPlaneSide):
-	pushl	%ebx
-
-	movl	P(%esp),%edx
-	movl	EMINS(%esp),%ecx
-	xorl	%eax,%eax
-	movl	EMAXS(%esp),%ebx
-	movb	pl_signbits(%edx),%al
-	cmpb	$8,%al
-	jge		Lerror
-	flds	pl_normal(%edx)		// p->normal[0]
-	fld		%st(0)				// p->normal[0] | p->normal[0]
-	jmp		Ljmptab(,%eax,4)
-
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-Lcase0:
-	fmuls	(%ebx)				// p->normal[0]*emaxs[0] | p->normal[0]
-	flds	pl_normal+4(%edx)	// p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]
-	fxch	%st(2)				// p->normal[0] | p->normal[0]*emaxs[0] |
-								//  p->normal[1]
-	fmuls	(%ecx)				// p->normal[0]*emins[0] |
-								//  p->normal[0]*emaxs[0] | p->normal[1]
-	fxch	%st(2)				// p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fld		%st(0)				// p->normal[1] | p->normal[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	4(%ebx)				// p->normal[1]*emaxs[1] | p->normal[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	flds	pl_normal+8(%edx)	// p->normal[2] | p->normal[1]*emaxs[1] |
-								//  p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(2)				// p->normal[1] | p->normal[1]*emaxs[1] |
-								//  p->normal[2] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	4(%ecx)				// p->normal[1]*emins[1] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[2] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(2)				// p->normal[2] | p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fld		%st(0)				// p->normal[2] | p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	8(%ebx)				// p->normal[2]*emaxs[2] |
-								//  p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(5)				// p->normal[0]*emins[0] |
-								//  p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[2]*emaxs[2]
-	faddp	%st(0),%st(3)		//p->normal[2] |
-								// p->normal[1]*emaxs[1] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	fmuls	8(%ecx)				//p->normal[2]*emins[2] |
-								// p->normal[1]*emaxs[1] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	fxch	%st(1)				//p->normal[1]*emaxs[1] |
-								// p->normal[2]*emins[2] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	faddp	%st(0),%st(3)		//p->normal[2]*emins[2] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0]+p->normal[1]*emaxs[1]|
-								// p->normal[2]*emaxs[2]
-	fxch	%st(3)				//p->normal[2]*emaxs[2] +
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0]+p->normal[1]*emaxs[1]|
-								// p->normal[2]*emins[2]
-	faddp	%st(0),%st(2)		//p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// dist1 | p->normal[2]*emins[2]
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-Lcase1:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-Lcase2:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-Lcase3:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-Lcase4:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-Lcase5:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-Lcase6:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-Lcase7:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-LSetSides:
-
-//	sides = 0;
-//	if (dist1 >= p->dist)
-//		sides = 1;
-//	if (dist2 < p->dist)
-//		sides |= 2;
-
-	faddp	%st(0),%st(2)		// dist1 | dist2
-	fcomps	pl_dist(%edx)
-	xorl	%ecx,%ecx
-	fnstsw	%ax
-	fcomps	pl_dist(%edx)
-	andb	$1,%ah
-	xorb	$1,%ah
-	addb	%ah,%cl
-
-	fnstsw	%ax
-	andb	$1,%ah
-	addb	%ah,%ah
-	addb	%ah,%cl
-
-//	return sides;
-
-	popl	%ebx
-	movl	%ecx,%eax	// return status
-
-	ret
-
-
-Lerror:
-	call	C(BOPS_Error)
-
-#endif	// id386
--- a/u/mpdosock.h
+++ /dev/null
@@ -1,797 +1,0 @@
-/* WINSOCK.H--definitions to be used with the WINSOCK.DLL
- * Copyright (c) 1993-1995, Microsoft Corp. All rights reserved.
- *
- * This header file corresponds to version 1.1 of the Windows Sockets specification.
- *
- * This file includes parts which are Copyright (c) 1982-1986 Regents
- * of the University of California.  All rights reserved.  The
- * Berkeley Software License Agreement specifies the terms and
- * conditions for redistribution.
- *
- */
-
-#ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_
-
-#define FAR
-#define PASCAL
-
-/*
- * Basic system type definitions, taken from the BSD file sys/types.h.
- */
-typedef unsigned char   u_char;
-typedef unsigned short  u_short;
-typedef unsigned int    u_int;
-typedef unsigned long   u_long;
-
-/*
- * The new type to be used in all
- * instances which refer to sockets.
- */
-typedef u_int           SOCKET;
-
-// FIXME
-#if 0
-/*
- * Select uses arrays of SOCKETs.  These macros manipulate such
- * arrays.  FD_SETSIZE may be defined by the user before including
- * this file, but the default here should be >= 64.
- *
- * CAVEAT IMPLEMENTOR and USER: THESE MACROS AND TYPES MUST BE
- * INCLUDED IN WINSOCK.H EXACTLY AS SHOWN HERE.
- */
-#ifndef FD_SETSIZE
-#define FD_SETSIZE      64
-#endif /* FD_SETSIZE */
-
-typedef struct fd_set {
-        u_int   fd_count;               /* how many are SET? */
-        SOCKET  fd_array[FD_SETSIZE];   /* an array of SOCKETs */
-} fd_set;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int PASCAL FAR __WSAFDIsSet(SOCKET, fd_set FAR *);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#define FD_CLR(fd, set) do { \
-    u_int __i; \
-    for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count ; __i++) { \
-        if (((fd_set FAR *)(set))->fd_array[__i] == fd) { \
-            while (__i < ((fd_set FAR *)(set))->fd_count-1) { \
-                ((fd_set FAR *)(set))->fd_array[__i] = \
-                    ((fd_set FAR *)(set))->fd_array[__i+1]; \
-                __i++; \
-            } \
-            ((fd_set FAR *)(set))->fd_count--; \
-            break; \
-        } \
-    } \
-} while(0)
-
-#define FD_SET(fd, set) do { \
-    if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) \
-        ((fd_set FAR *)(set))->fd_array[((fd_set FAR *)(set))->fd_count++]=(fd);\
-} while(0)
-
-#define FD_ZERO(set) (((fd_set FAR *)(set))->fd_count=0)
-
-#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (fd_set FAR *)(set))
-
-/*
- * Structure used in select() call, taken from the BSD file sys/time.h.
- */
-struct timeval {
-        long    tv_sec;         /* seconds */
-        long    tv_usec;        /* and microseconds */
-};
-
-/*
- * Operations on timevals.
- *
- * NB: timercmp does not work for >= or <=.
- */
-#define timerisset(tvp)         ((tvp)->tv_sec || (tvp)->tv_usec)
-#define timercmp(tvp, uvp, cmp) \
-        ((tvp)->tv_sec cmp (uvp)->tv_sec || \
-         (tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec)
-#define timerclear(tvp)         (tvp)->tv_sec = (tvp)->tv_usec = 0
-#endif
-
-/*
- * Commands for ioctlsocket(),  taken from the BSD file fcntl.h.
- *
- *
- * Ioctl's have the command encoded in the lower word,
- * and the size of any in or out parameters in the upper
- * word.  The high 2 bits of the upper word are used
- * to encode the in/out status of the parameter; for now
- * we restrict parameters to at most 128 bytes.
- */
-#define IOCPARM_MASK    0x7f            /* parameters must be < 128 bytes */
-#define IOC_VOID        0x20000000      /* no parameters */
-#define IOC_OUT         0x40000000      /* copy out parameters */
-#define IOC_IN          0x80000000      /* copy in parameters */
-#define IOC_INOUT       (IOC_IN|IOC_OUT)
-                                        /* 0x20000000 distinguishes new &
-                                           old ioctl's */
-#define _IO(x,y)        (IOC_VOID|((x)<<8)|(y))
-
-#define _IOR(x,y,t)     (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-
-#define _IOW(x,y,t)     (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-
-#define FIONREAD    _IOR('f', 127, u_long) /* get # bytes to read */
-#define FIONBIO     _IOW('f', 126, u_long) /* set/clear non-blocking i/o */
-#define FIOASYNC    _IOW('f', 125, u_long) /* set/clear async i/o */
-
-/* Socket I/O Controls */
-#define SIOCSHIWAT  _IOW('s',  0, u_long)  /* set high watermark */
-#define SIOCGHIWAT  _IOR('s',  1, u_long)  /* get high watermark */
-#define SIOCSLOWAT  _IOW('s',  2, u_long)  /* set low watermark */
-#define SIOCGLOWAT  _IOR('s',  3, u_long)  /* get low watermark */
-#define SIOCATMARK  _IOR('s',  7, u_long)  /* at oob mark? */
-
-/*
- * Structures returned by network data base library, taken from the
- * BSD file netdb.h.  All addresses are supplied in host order, and
- * returned in network order (suitable for use in system calls).
- */
-
-struct  hostent {
-        char    FAR * h_name;           /* official name of host */
-        char    FAR * FAR * h_aliases;  /* alias list */
-        short   h_addrtype;             /* host address type */
-        short   h_length;               /* length of address */
-        char    FAR * FAR * h_addr_list; /* list of addresses */
-#define h_addr  h_addr_list[0]          /* address, for backward compat */
-};
-
-/*
- * It is assumed here that a network number
- * fits in 32 bits.
- */
-struct  netent {
-        char    FAR * n_name;           /* official name of net */
-        char    FAR * FAR * n_aliases;  /* alias list */
-        short   n_addrtype;             /* net address type */
-        u_long  n_net;                  /* network # */
-};
-
-struct  servent {
-        char    FAR * s_name;           /* official service name */
-        char    FAR * FAR * s_aliases;  /* alias list */
-        short   s_port;                 /* port # */
-        char    FAR * s_proto;          /* protocol to use */
-};
-
-struct  protoent {
-        char    FAR * p_name;           /* official protocol name */
-        char    FAR * FAR * p_aliases;  /* alias list */
-        short   p_proto;                /* protocol # */
-};
-
-/*
- * Constants and structures defined by the internet system,
- * Per RFC 790, September 1981, taken from the BSD file netinet/in.h.
- */
-
-/*
- * Protocols
- */
-#define IPPROTO_IP              0               /* dummy for IP */
-#define IPPROTO_ICMP            1               /* control message protocol */
-#define IPPROTO_GGP             2               /* gateway^2 (deprecated) */
-#define IPPROTO_TCP             6               /* tcp */
-#define IPPROTO_PUP             12              /* pup */
-#define IPPROTO_UDP             17              /* user datagram protocol */
-#define IPPROTO_IDP             22              /* xns idp */
-#define IPPROTO_ND              77              /* UNOFFICIAL net disk proto */
-
-#define IPPROTO_RAW             255             /* raw IP packet */
-#define IPPROTO_MAX             256
-
-/*
- * Port/socket numbers: network standard functions
- */
-#define IPPORT_ECHO             7
-#define IPPORT_DISCARD          9
-#define IPPORT_SYSTAT           11
-#define IPPORT_DAYTIME          13
-#define IPPORT_NETSTAT          15
-#define IPPORT_FTP              21
-#define IPPORT_TELNET           23
-#define IPPORT_SMTP             25
-#define IPPORT_TIMESERVER       37
-#define IPPORT_NAMESERVER       42
-#define IPPORT_WHOIS            43
-#define IPPORT_MTP              57
-
-/*
- * Port/socket numbers: host specific functions
- */
-#define IPPORT_TFTP             69
-#define IPPORT_RJE              77
-#define IPPORT_FINGER           79
-#define IPPORT_TTYLINK          87
-#define IPPORT_SUPDUP           95
-
-/*
- * UNIX TCP sockets
- */
-#define IPPORT_EXECSERVER       512
-#define IPPORT_LOGINSERVER      513
-#define IPPORT_CMDSERVER        514
-#define IPPORT_EFSSERVER        520
-
-/*
- * UNIX UDP sockets
- */
-#define IPPORT_BIFFUDP          512
-#define IPPORT_WHOSERVER        513
-#define IPPORT_ROUTESERVER      520
-                                        /* 520+1 also used */
-
-/*
- * Ports < IPPORT_RESERVED are reserved for
- * privileged processes (e.g. root).
- */
-#define IPPORT_RESERVED         1024
-
-/*
- * Link numbers
- */
-#define IMPLINK_IP              155
-#define IMPLINK_LOWEXPER        156
-#define IMPLINK_HIGHEXPER       158
-
-/*
- * Internet address (old style... should be updated)
- */
-struct in_addr {
-        union {
-                struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
-                struct { u_short s_w1,s_w2; } S_un_w;
-                u_long S_addr;
-        } S_un;
-#define s_addr  S_un.S_addr
-                                /* can be used for most tcp & ip code */
-#define s_host  S_un.S_un_b.s_b2
-                                /* host on imp */
-#define s_net   S_un.S_un_b.s_b1
-                                /* network */
-#define s_imp   S_un.S_un_w.s_w2
-                                /* imp */
-#define s_impno S_un.S_un_b.s_b4
-                                /* imp # */
-#define s_lh    S_un.S_un_b.s_b3
-                                /* logical host */
-};
-
-/*
- * Definitions of bits in internet address integers.
- * On subnets, the decomposition of addresses to host and net parts
- * is done according to subnet mask, not the masks here.
- */
-#define IN_CLASSA(i)            (((long)(i) & 0x80000000) == 0)
-#define IN_CLASSA_NET           0xff000000
-#define IN_CLASSA_NSHIFT        24
-#define IN_CLASSA_HOST          0x00ffffff
-#define IN_CLASSA_MAX           128
-
-#define IN_CLASSB(i)            (((long)(i) & 0xc0000000) == 0x80000000)
-#define IN_CLASSB_NET           0xffff0000
-#define IN_CLASSB_NSHIFT        16
-#define IN_CLASSB_HOST          0x0000ffff
-#define IN_CLASSB_MAX           65536
-
-#define IN_CLASSC(i)            (((long)(i) & 0xe0000000) == 0xc0000000)
-#define IN_CLASSC_NET           0xffffff00
-#define IN_CLASSC_NSHIFT        8
-#define IN_CLASSC_HOST          0x000000ff
-
-#define INADDR_ANY              (u_long)0x00000000
-#define INADDR_LOOPBACK         0x7f000001
-#define INADDR_BROADCAST        (u_long)0xffffffff
-#define INADDR_NONE             0xffffffff
-
-/*
- * Socket address, internet style.
- */
-struct sockaddr_in {
-        short   sin_family;
-        u_short sin_port;
-        struct  in_addr sin_addr;
-        char    sin_zero[8];
-};
-
-#define WSADESCRIPTION_LEN      256
-#define WSASYS_STATUS_LEN       128
-
-
-/*
- * Options for use with [gs]etsockopt at the IP level.
- */
-#define IP_OPTIONS          1           /* set/get IP per-packet options    */
-#define IP_MULTICAST_IF     2           /* set/get IP multicast interface   */
-#define IP_MULTICAST_TTL    3           /* set/get IP multicast timetolive  */
-#define IP_MULTICAST_LOOP   4           /* set/get IP multicast loopback    */
-#define IP_ADD_MEMBERSHIP   5           /* add  an IP group membership      */
-#define IP_DROP_MEMBERSHIP  6           /* drop an IP group membership      */
-
-#define IP_DEFAULT_MULTICAST_TTL   1    /* normally limit m'casts to 1 hop  */
-#define IP_DEFAULT_MULTICAST_LOOP  1    /* normally hear sends if a member  */
-#define IP_MAX_MEMBERSHIPS         20   /* per socket; must fit in one mbuf */
-
-/*
- * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
- */
-struct ip_mreq {
-        struct in_addr  imr_multiaddr;  /* IP multicast address of group */
-        struct in_addr  imr_interface;  /* local IP address of interface */
-};
-
-/*
- * Definitions related to sockets: types, address families, options,
- * taken from the BSD file sys/socket.h.
- */
-
-/*
- * This is used instead of -1, since the
- * SOCKET type is unsigned.
- */
-#define INVALID_SOCKET  (SOCKET)(~0)
-#define SOCKET_ERROR            (-1)
-
-/*
- * Types
- */
-#define SOCK_STREAM     1               /* stream socket */
-#define SOCK_DGRAM      2               /* datagram socket */
-#define SOCK_RAW        3               /* raw-protocol interface */
-#define SOCK_RDM        4               /* reliably-delivered message */
-#define SOCK_SEQPACKET  5               /* sequenced packet stream */
-
-/*
- * Option flags per-socket.
- */
-#define SO_DEBUG        0x0001          /* turn on debugging info recording */
-#define SO_ACCEPTCONN   0x0002          /* socket has had listen() */
-#define SO_REUSEADDR    0x0004          /* allow local address reuse */
-#define SO_KEEPALIVE    0x0008          /* keep connections alive */
-#define SO_DONTROUTE    0x0010          /* just use interface addresses */
-#define SO_BROADCAST    0x0020          /* permit sending of broadcast msgs */
-#define SO_USELOOPBACK  0x0040          /* bypass hardware when possible */
-#define SO_LINGER       0x0080          /* linger on close if data present */
-#define SO_OOBINLINE    0x0100          /* leave received OOB data in line */
-
-#define SO_DONTLINGER   (u_int)(~SO_LINGER)
-
-/*
- * Additional options.
- */
-#define SO_SNDBUF       0x1001          /* send buffer size */
-#define SO_RCVBUF       0x1002          /* receive buffer size */
-#define SO_SNDLOWAT     0x1003          /* send low-water mark */
-#define SO_RCVLOWAT     0x1004          /* receive low-water mark */
-#define SO_SNDTIMEO     0x1005          /* send timeout */
-#define SO_RCVTIMEO     0x1006          /* receive timeout */
-#define SO_ERROR        0x1007          /* get error status and clear */
-#define SO_TYPE         0x1008          /* get socket type */
-
-/*
- * Options for connect and disconnect data and options.  Used only by
- * non-TCP/IP transports such as DECNet, OSI TP4, etc.
- */
-#define SO_CONNDATA     0x7000
-#define SO_CONNOPT      0x7001
-#define SO_DISCDATA     0x7002
-#define SO_DISCOPT      0x7003
-#define SO_CONNDATALEN  0x7004
-#define SO_CONNOPTLEN   0x7005
-#define SO_DISCDATALEN  0x7006
-#define SO_DISCOPTLEN   0x7007
-
-/*
- * Option for opening sockets for synchronous access.
- */
-#define SO_OPENTYPE     0x7008
-
-#define SO_SYNCHRONOUS_ALERT    0x10
-#define SO_SYNCHRONOUS_NONALERT 0x20
-
-/*
- * Other NT-specific options.
- */
-#define SO_MAXDG        0x7009
-#define SO_MAXPATHDG    0x700A
-
-/*
- * TCP options.
- */
-#define TCP_NODELAY     0x0001
-#define TCP_BSDURGENT   0x7000
-
-/*
- * Address families.
- */
-#define AF_UNSPEC       0               /* unspecified */
-#define AF_UNIX         1               /* local to host (pipes, portals) */
-#define AF_INET         2               /* internetwork: UDP, TCP, etc. */
-#define AF_IMPLINK      3               /* arpanet imp addresses */
-#define AF_PUP          4               /* pup protocols: e.g. BSP */
-#define AF_CHAOS        5               /* mit CHAOS protocols */
-#define AF_IPX          6               /* IPX and SPX */
-#define AF_NS           6               /* XEROX NS protocols */
-#define AF_ISO          7               /* ISO protocols */
-#define AF_OSI          AF_ISO          /* OSI is ISO */
-#define AF_ECMA         8               /* european computer manufacturers */
-#define AF_DATAKIT      9               /* datakit protocols */
-#define AF_CCITT        10              /* CCITT protocols, X.25 etc */
-#define AF_SNA          11              /* IBM SNA */
-#define AF_DECnet       12              /* DECnet */
-#define AF_DLI          13              /* Direct data link interface */
-#define AF_LAT          14              /* LAT */
-#define AF_HYLINK       15              /* NSC Hyperchannel */
-#define AF_APPLETALK    16              /* AppleTalk */
-#define AF_NETBIOS      17              /* NetBios-style addresses */
-#define AF_VOICEVIEW    18              /* VoiceView */
-
-#define AF_MAX          19
-
-/*
- * Structure used by kernel to store most
- * addresses.
- */
-struct sockaddr {
-        u_short sa_family;              /* address family */
-        char    sa_data[14];            /* up to 14 bytes of direct address */
-};
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-        u_short sp_family;              /* address family */
-        u_short sp_protocol;            /* protocol */
-};
-
-/*
- * Protocol families, same as address families for now.
- */
-#define PF_UNSPEC       AF_UNSPEC
-#define PF_UNIX         AF_UNIX
-#define PF_INET         AF_INET
-#define PF_IMPLINK      AF_IMPLINK
-#define PF_PUP          AF_PUP
-#define PF_CHAOS        AF_CHAOS
-#define PF_NS           AF_NS
-#define PF_IPX          AF_IPX
-#define PF_ISO          AF_ISO
-#define PF_OSI          AF_OSI
-#define PF_ECMA         AF_ECMA
-#define PF_DATAKIT      AF_DATAKIT
-#define PF_CCITT        AF_CCITT
-#define PF_SNA          AF_SNA
-#define PF_DECnet       AF_DECnet
-#define PF_DLI          AF_DLI
-#define PF_LAT          AF_LAT
-#define PF_HYLINK       AF_HYLINK
-#define PF_APPLETALK    AF_APPLETALK
-#define PF_VOICEVIEW    AF_VOICEVIEW
-
-#define PF_MAX          AF_MAX
-
-/*
- * Structure used for manipulating linger option.
- */
-struct  linger {
-        u_short l_onoff;                /* option on/off */
-        u_short l_linger;               /* linger time */
-};
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define SOL_SOCKET      0xffff          /* options for socket level */
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#define SOMAXCONN       5
-
-#define MSG_OOB         0x1             /* process out-of-band data */
-#define MSG_PEEK        0x2             /* peek at incoming message */
-#define MSG_DONTROUTE   0x4             /* send without using routing tables */
-
-#define MSG_MAXIOVLEN   16
-
-#define MSG_PARTIAL     0x8000          /* partial send or recv for message xport */
-
-/*
- * Define constant based on rfc883, used by gethostbyxxxx() calls.
- */
-#define MAXGETHOSTSTRUCT        1024
-
-/*
- * Define flags to be used with the WSAAsyncSelect() call.
- */
-#define FD_READ         0x01
-#define FD_WRITE        0x02
-#define FD_OOB          0x04
-#define FD_ACCEPT       0x08
-#define FD_CONNECT      0x10
-#define FD_CLOSE        0x20
-
-/*
- * All Windows Sockets error constants are biased by WSABASEERR from
- * the "normal"
- */
-#define WSABASEERR              10000
-/*
- * Windows Sockets definitions of regular Microsoft C error constants
- */
-#define WSAEINTR                (WSABASEERR+4)
-#define WSAEBADF                (WSABASEERR+9)
-#define WSAEACCES               (WSABASEERR+13)
-#define WSAEFAULT               (WSABASEERR+14)
-#define WSAEINVAL               (WSABASEERR+22)
-#define WSAEMFILE               (WSABASEERR+24)
-
-/*
- * Windows Sockets definitions of regular Berkeley error constants
- */
-#define WSAEWOULDBLOCK          (WSABASEERR+35)
-#define WSAEINPROGRESS          (WSABASEERR+36)
-#define WSAEALREADY             (WSABASEERR+37)
-#define WSAENOTSOCK             (WSABASEERR+38)
-#define WSAEDESTADDRREQ         (WSABASEERR+39)
-#define WSAEMSGSIZE             (WSABASEERR+40)
-#define WSAEPROTOTYPE           (WSABASEERR+41)
-#define WSAENOPROTOOPT          (WSABASEERR+42)
-#define WSAEPROTONOSUPPORT      (WSABASEERR+43)
-#define WSAESOCKTNOSUPPORT      (WSABASEERR+44)
-#define WSAEOPNOTSUPP           (WSABASEERR+45)
-#define WSAEPFNOSUPPORT         (WSABASEERR+46)
-#define WSAEAFNOSUPPORT         (WSABASEERR+47)
-#define WSAEADDRINUSE           (WSABASEERR+48)
-#define WSAEADDRNOTAVAIL        (WSABASEERR+49)
-#define WSAENETDOWN             (WSABASEERR+50)
-#define WSAENETUNREACH          (WSABASEERR+51)
-#define WSAENETRESET            (WSABASEERR+52)
-#define WSAECONNABORTED         (WSABASEERR+53)
-#define WSAECONNRESET           (WSABASEERR+54)
-#define WSAENOBUFS              (WSABASEERR+55)
-#define WSAEISCONN              (WSABASEERR+56)
-#define WSAENOTCONN             (WSABASEERR+57)
-#define WSAESHUTDOWN            (WSABASEERR+58)
-#define WSAETOOMANYREFS         (WSABASEERR+59)
-#define WSAETIMEDOUT            (WSABASEERR+60)
-#define WSAECONNREFUSED         (WSABASEERR+61)
-#define WSAELOOP                (WSABASEERR+62)
-#define WSAENAMETOOLONG         (WSABASEERR+63)
-#define WSAEHOSTDOWN            (WSABASEERR+64)
-#define WSAEHOSTUNREACH         (WSABASEERR+65)
-#define WSAENOTEMPTY            (WSABASEERR+66)
-#define WSAEPROCLIM             (WSABASEERR+67)
-#define WSAEUSERS               (WSABASEERR+68)
-#define WSAEDQUOT               (WSABASEERR+69)
-#define WSAESTALE               (WSABASEERR+70)
-#define WSAEREMOTE              (WSABASEERR+71)
-
-#define WSAEDISCON              (WSABASEERR+101)
-
-/*
- * Extended Windows Sockets error constant definitions
- */
-#define WSASYSNOTREADY          (WSABASEERR+91)
-#define WSAVERNOTSUPPORTED      (WSABASEERR+92)
-#define WSANOTINITIALISED       (WSABASEERR+93)
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (when using the resolver). Note that these errors are
- * retrieved via WSAGetLastError() and must therefore follow
- * the rules for avoiding clashes with error numbers from
- * specific implementations or language run-time systems.
- * For this reason the codes are based at WSABASEERR+1001.
- * Note also that [WSA]NO_ADDRESS is defined only for
- * compatibility purposes.
- */
-
-#define h_errno         WSAGetLastError()
-
-/* Authoritative Answer: Host not found */
-#define WSAHOST_NOT_FOUND       (WSABASEERR+1001)
-#define HOST_NOT_FOUND          WSAHOST_NOT_FOUND
-
-/* Non-Authoritative: Host not found, or SERVERFAIL */
-#define WSATRY_AGAIN            (WSABASEERR+1002)
-#define TRY_AGAIN               WSATRY_AGAIN
-
-/* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define WSANO_RECOVERY          (WSABASEERR+1003)
-#define NO_RECOVERY             WSANO_RECOVERY
-
-/* Valid name, no data record of requested type */
-#define WSANO_DATA              (WSABASEERR+1004)
-#define NO_DATA                 WSANO_DATA
-
-/* no address, look for MX record */
-#define WSANO_ADDRESS           WSANO_DATA
-#define NO_ADDRESS              WSANO_ADDRESS
-
-/*
- * Windows Sockets errors redefined as regular Berkeley error constants.
- * These are commented out in Windows NT to avoid conflicts with errno.h.
- * Use the WSA constants instead.
- */
-#if 0
-#define EWOULDBLOCK             WSAEWOULDBLOCK
-#define EINPROGRESS             WSAEINPROGRESS
-#define EALREADY                WSAEALREADY
-#define ENOTSOCK                WSAENOTSOCK
-#define EDESTADDRREQ            WSAEDESTADDRREQ
-#define EMSGSIZE                WSAEMSGSIZE
-#define EPROTOTYPE              WSAEPROTOTYPE
-#define ENOPROTOOPT             WSAENOPROTOOPT
-#define EPROTONOSUPPORT         WSAEPROTONOSUPPORT
-#define ESOCKTNOSUPPORT         WSAESOCKTNOSUPPORT
-#define EOPNOTSUPP              WSAEOPNOTSUPP
-#define EPFNOSUPPORT            WSAEPFNOSUPPORT
-#define EAFNOSUPPORT            WSAEAFNOSUPPORT
-#define EADDRINUSE              WSAEADDRINUSE
-#define EADDRNOTAVAIL           WSAEADDRNOTAVAIL
-#define ENETDOWN                WSAENETDOWN
-#define ENETUNREACH             WSAENETUNREACH
-#define ENETRESET               WSAENETRESET
-#define ECONNABORTED            WSAECONNABORTED
-#define ECONNRESET              WSAECONNRESET
-#define ENOBUFS                 WSAENOBUFS
-#define EISCONN                 WSAEISCONN
-#define ENOTCONN                WSAENOTCONN
-#define ESHUTDOWN               WSAESHUTDOWN
-#define ETOOMANYREFS            WSAETOOMANYREFS
-#define ETIMEDOUT               WSAETIMEDOUT
-#define ECONNREFUSED            WSAECONNREFUSED
-#define ELOOP                   WSAELOOP
-#define ENAMETOOLONG            WSAENAMETOOLONG
-#define EHOSTDOWN               WSAEHOSTDOWN
-#define EHOSTUNREACH            WSAEHOSTUNREACH
-#define ENOTEMPTY               WSAENOTEMPTY
-#define EPROCLIM                WSAEPROCLIM
-#define EUSERS                  WSAEUSERS
-#define EDQUOT                  WSAEDQUOT
-#define ESTALE                  WSAESTALE
-#define EREMOTE                 WSAEREMOTE
-#endif
-
-/* Socket function prototypes */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SOCKET PASCAL FAR accept (SOCKET s, struct sockaddr FAR *addr,
-                          int FAR *addrlen);
-
-int PASCAL FAR bind (SOCKET s, const struct sockaddr FAR *addr, int namelen);
-
-int PASCAL FAR closesocket (SOCKET s);
-
-int PASCAL FAR connect (SOCKET s, const struct sockaddr FAR *name, int namelen);
-
-int PASCAL FAR ioctlsocket (SOCKET s, long cmd, u_long FAR *argp);
-
-int PASCAL FAR getpeername (SOCKET s, struct sockaddr FAR *name,
-                            int FAR * namelen);
-
-int PASCAL FAR getsockname (SOCKET s, struct sockaddr FAR *name,
-                            int FAR * namelen);
-
-int PASCAL FAR getsockopt (SOCKET s, int level, int optname,
-                           char FAR * optval, int FAR *optlen);
-
-u_long PASCAL FAR htonl (u_long hostlong);
-
-u_short PASCAL FAR htons (u_short hostshort);
-
-unsigned long PASCAL FAR inet_addr (const char FAR * cp);
-
-char FAR * PASCAL FAR inet_ntoa (struct in_addr in);
-
-int PASCAL FAR listen (SOCKET s, int backlog);
-
-u_long PASCAL FAR ntohl (u_long netlong);
-
-u_short PASCAL FAR ntohs (u_short netshort);
-
-int PASCAL FAR recv (SOCKET s, char FAR * buf, int len, int flags);
-
-int PASCAL FAR recvfrom (SOCKET s, char FAR * buf, int len, int flags,
-                         struct sockaddr FAR *from, int FAR * fromlen);
-
-#if 0
-int PASCAL FAR select (int nfds, fd_set FAR *readfds, fd_set FAR *writefds,
-                       fd_set FAR *exceptfds, const struct timeval FAR *timeout);
-#endif
-
-int PASCAL FAR send (SOCKET s, const char FAR * buf, int len, int flags);
-
-int PASCAL FAR sendto (SOCKET s, const char FAR * buf, int len, int flags,
-                       const struct sockaddr FAR *to, int tolen);
-
-int PASCAL FAR setsockopt (SOCKET s, int level, int optname,
-                           const char FAR * optval, int optlen);
-
-int PASCAL FAR shutdown (SOCKET s, int how);
-
-SOCKET PASCAL FAR socket (int af, int type, int protocol);
-
-/* Database function prototypes */
-
-struct hostent FAR * PASCAL FAR gethostbyaddr(const char FAR * addr,
-                                              int len, int type);
-
-struct hostent FAR * PASCAL FAR gethostbyname(const char FAR * name);
-
-int PASCAL FAR gethostname (char FAR * name, int namelen);
-
-struct servent FAR * PASCAL FAR getservbyport(int port, const char FAR * proto);
-
-struct servent FAR * PASCAL FAR getservbyname(const char FAR * name,
-                                              const char FAR * proto);
-
-struct protoent FAR * PASCAL FAR getprotobynumber(int proto);
-
-struct protoent FAR * PASCAL FAR getprotobyname(const char FAR * name);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Microsoft Windows Extended data types */
-typedef struct sockaddr SOCKADDR;
-typedef struct sockaddr *PSOCKADDR;
-typedef struct sockaddr FAR *LPSOCKADDR;
-
-typedef struct sockaddr_in SOCKADDR_IN;
-typedef struct sockaddr_in *PSOCKADDR_IN;
-typedef struct sockaddr_in FAR *LPSOCKADDR_IN;
-
-typedef struct linger LINGER;
-typedef struct linger *PLINGER;
-typedef struct linger FAR *LPLINGER;
-
-typedef struct in_addr IN_ADDR;
-typedef struct in_addr *PIN_ADDR;
-typedef struct in_addr FAR *LPIN_ADDR;
-
-typedef struct fd_set FD_SET;
-typedef struct fd_set *PFD_SET;
-typedef struct fd_set FAR *LPFD_SET;
-
-typedef struct hostent HOSTENT;
-typedef struct hostent *PHOSTENT;
-typedef struct hostent FAR *LPHOSTENT;
-
-typedef struct servent SERVENT;
-typedef struct servent *PSERVENT;
-typedef struct servent FAR *LPSERVENT;
-
-typedef struct protoent PROTOENT;
-typedef struct protoent *PPROTOENT;
-typedef struct protoent FAR *LPPROTOENT;
-
-typedef struct timeval TIMEVAL;
-typedef struct timeval *PTIMEVAL;
-typedef struct timeval FAR *LPTIMEVAL;
-
-#endif  /* _WINSOCKAPI_ */
--- a/u/mplib.c
+++ /dev/null
@@ -1,222 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <dpmi.h>
-
-//#include "types.h"
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-
-//#include "mgenord.h"
-#define MGENVXD_REGISTER_ORD       1
-#define MGENVXD_GETMEM_ORD         2
-#define MGENVXD_DEREGISTER_ORD     3
-#define MGENVXD_WAKEUP_ORD         4
-#define MGENVXD_MAKEDQS_ORD        5
-
-
-// Virtual 8086 API Ordinals
-#define V86API_GETSELECTOR16_ORD (1)
-#define V86API_GETSELECTOR32_ORD (2)
-#define V86API_GETFLAT32_ORD (3)
-#define V86API_MOVERP_ORD (6)
-#define V86API_MOVEPR_ORD (7)
-#define V86API_POST_ORD   (8)
-#define V86API_INIT_ORD    (9)
-#define V86API_UNINIT_ORD  (10)
-#define V86API_INSERTKEY_ORD (11)
-#define V86API_REMOVEHOTKEY_ORD  (12)
-#define V86API_INSTALLHOTKEY_ORD (13)
-#define V86API_HOOKINT48_ORD  (14)
-#define V86API_WAKEUPDLL_ORD (15)
-
-#define DPMIAPI_GETFLAT32_ORD (1)
-#define DPMIAPI_POST_WINDOWS_ORD (2)
-// these are DPMI functions.  Make sure they don't clash with the
-// other MGENVXD_XXXX functions above, or the DPMI functions!
-#define MGENVXD_GETQUEUECTR_ORD    6
-#define MGENVXD_MOVENODE_ORD       7
-#define MGENVXD_GETNODE_ORD        8
-#define MGENVXD_FLUSHNODE_ORD      9
-#define MGENVXD_MCOUNT_ORD         10
-#define MGENVXD_MASTERNODE_ORD     11
-#define MGENVXD_SANITYCHECK_ORD    12
-#define MGENVXD_WAKEUPDLL_ORD       13
-#define MGENVXD_WAIT_ORD           14
-
-//
-#define HWND_OFFSET (0)
-#define UMSG_OFFSET (1)
-#define SIZEREQUEST_OFFSET (2)
-#define HVXD_OFFSET (3)
-#define DATUM_OFFSET (4)
-#define SLOT_OFFSET (5)
-#define SIZEGIVEN_OFFSET (6)
-#define SELECTOR32_OFFSET (7)
-#define SELECTOR16_OFFSET (8)
-
-//#include "magic.h"
-#define MGENVXD_DEVICE_ID 0x18AA
-
-//#include "rtq.h"
-#define RTQ_NODE struct rtq_node
-
-RTQ_NODE
-   {
-      RTQ_NODE *self; // Ring zero address of this node
-      RTQ_NODE *left; // Ring zero address of preceding node
-      RTQ_NODE *right; // Ring zero address of succeding node
-      BYTE *      rtqDatum;  // Ring 3 Datum of Buffer (start of preface)
-      BYTE *      rtqInsert; // Ring 3 insertion position
-      WORD     rtqLen; // Length of buffer, excluding preface
-      WORD     rtqUpCtr;  // Up Counter of bytes used so far
-      WORD     rtqQCtr;   // number of nodes attached
-      WORD     padding;   // DWORD alignment
-   };
-
-#define RTQ_PARAM_MOVENODE struct rtq_param_movenode
-RTQ_PARAM_MOVENODE
-   {
-      WORD     rtqFromDQ;
-      WORD     rtqToDQ;
-   };
-
-RTQ_NODE* rtq_fetch(RTQ_NODE*, RTQ_NODE*); // To, From
-
-int _int86(int vector, __dpmi_regs *iregs, __dpmi_regs *oregs);
-
-#define CHUNNEL_INT 0x48
-
-#define int386		_int86
-#define REGISTERS	__dpmi_regs
-
-void
-Yield(void)
-{
-	__dpmi_yield();
-}
-
-void
-PostWindowsMessage(void)
-{
-   REGISTERS regs;
-
-   regs.d.eax = DPMIAPI_POST_WINDOWS_ORD << 16 | MGENVXD_DEVICE_ID;
-   regs.d.ebx = 0;
-   regs.d.ecx = 0;
-   int386(CHUNNEL_INT, &regs, &regs);
-}
-
-int
-MGenWait(void)
-{
-   REGISTERS regs;
-
-   regs.d.eax = MGENVXD_WAIT_ORD << 16 | MGENVXD_DEVICE_ID;
-   int386(CHUNNEL_INT, &regs, &regs);
-   return regs.d.eax;
-}
-
-int MGenGetQueueCtr(int qNo)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_GETQUEUECTR_ORD << 16 | MGENVXD_DEVICE_ID;
-   regs.d.ebx = qNo;
-   int386(CHUNNEL_INT, &regs, &regs);
-
-   return regs.d.eax;
-}
-
-RTQ_NODE *MGenMoveTo(int qFrom, int qTo)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_MOVENODE_ORD << 16 | MGENVXD_DEVICE_ID;
-   regs.d.ebx = qFrom;
-   regs.d.ecx = qTo;
-   int386(CHUNNEL_INT, &regs, &regs);
-
-   return (RTQ_NODE *) regs.d.eax;
-}
-
-RTQ_NODE *MGenGetNode(int q)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_GETNODE_ORD << 16 | MGENVXD_DEVICE_ID;
-   regs.d.ebx = q;
-   int386(CHUNNEL_INT, &regs, &regs);
-
-   return (RTQ_NODE *) regs.d.eax;
-}
-
-RTQ_NODE *MGenGetMasterNode(unsigned *size)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_MASTERNODE_ORD << 16 | MGENVXD_DEVICE_ID;
-   int386(CHUNNEL_INT, &regs, &regs);
-   *size = regs.d.ecx;
-
-   return (RTQ_NODE *) regs.d.eax;
-}
-
-RTQ_NODE *MGenFlushNodes(int qFrom, int qTo)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_FLUSHNODE_ORD << 16 | MGENVXD_DEVICE_ID;
-   regs.d.ebx = qFrom;
-   regs.d.ecx = qTo;
-   int386(CHUNNEL_INT, &regs, &regs);
-
-   return (RTQ_NODE *) regs.d.eax;
-}
-
-int MGenMCount(unsigned lowerOrderBits, unsigned upperOrderBits)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_MCOUNT_ORD << 16 | MGENVXD_DEVICE_ID;
-   regs.d.ebx = lowerOrderBits;
-   regs.d.ecx = upperOrderBits;
-   int386(CHUNNEL_INT, &regs, &regs);
-
-   return regs.d.eax;
-}
-
-int MGenSanityCheck(void)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_SANITYCHECK_ORD << 16 | MGENVXD_DEVICE_ID;
-   int386(CHUNNEL_INT, &regs, &regs);
-
-   return regs.d.eax;
-}
-
-void MGenWakeupDll(void)
-{
-   REGISTERS   regs;
-
-   regs.d.eax = MGENVXD_WAKEUPDLL_ORD << 16 | MGENVXD_DEVICE_ID;
-   int386(CHUNNEL_INT, &regs, &regs);
-}
--- a/u/mplpc.c
+++ /dev/null
@@ -1,1001 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <go32.h>
-#include "mpdosock.h"
-
-//#include "types.h"
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-
-//#include "lpc.h"
-typedef struct {
-   short  version;            // version of LPC requested
-   short  sizeOfArgs;         // size of arguments
-   short  service;            // service # requested
-   char   Data[1];            // data
-} LPCData;
-
-typedef struct {
-   short version;             // LPC version
-   short sizeOfReturn;        // return data size
-   short error;               // any error codes
-   short noRet;               // number of returns
-   char  Data[1];             // data
-} LPCReturn;
-
-//#include "services.h"
-#define  MAXSOCKETS  20
-
-// services
-#define LPC_SOCKBIND        4
-#define LPC_SOCKGETHOSTBYNAME   5
-#define LPC_SOCKGETHOSTNAME     6
-#define LPC_SOCKGETHOSTBYADDR   7
-#define LPC_SOCKCLOSE           8
-#define LPC_SOCKSOCKET          9
-#define LPC_SOCKRECVFROM        10
-#define LPC_SOCKSENDTO          11
-#define LPC_SOCKIOCTL           12
-#define LPC_SOCKGETSOCKNAME     13
-#define LPC_SOCKFLUSH           14
-#define LPC_SOCKSETOPT          15
-#define LPC_SOCKGETLASTERROR    16
-#define LPC_SOCKINETADDR        17
-
-// htons, ntohs, htonl, ntohl implemented locally
-
-// errors
-#define LPC_UNRECOGNIZED_SERVICE  -1
-#define LPC_NOERROR                0
-
-// structures for support
-typedef struct {
-   SOCKET s;
-   int    namelen;
-   char   name[1];
-} BindArgs;
-
-typedef struct {
-   SOCKET s;
-   long   cmd;
-   char   data[1];
-} IoctlArgs;
-
-typedef struct {
-   int retVal;
-   int namelen;
-   char name[1];
-} GetSockNameRet;
-
-typedef GetSockNameRet GetHostNameRet;
-
-typedef struct {
-   int   retVal;
-   int   h_addr_0;    // that's the only important value
-} GetHostByNameRet;
-
-typedef struct {
-   int   len;
-   int   type;
-   char  addr[1];
-} GetHostByAddrArgs;
-
-typedef struct {
-   int   retVal;
-   char  h_name[1];  // h_name is the only important value
-} GetHostByAddrRet;
-
-typedef struct {
-   SOCKET s;
-   int flags;
-} RecvFromArgs;
-
-typedef struct {
-   int  retVal;
-   int  errCode;
-   int  len;   // message len
-   struct sockaddr    sockaddr;
-   int  sockaddrlen;
-   char Data[1];
-} RecvFromRet;
-
-typedef struct {
-   SOCKET s;
-   int    flags;
-   int    len;
-   struct sockaddr sockaddr;
-   int    sockaddrlen;
-   char   Data[1];
-} SendToArgs;
-
-typedef struct {
-   int   retVal;
-   int   errCode;
-} SendToRet;
-
-typedef struct {
-   int     bufflen;
-   SOCKET  s;
-   int     len;
-   int     sockaddrlen;
-   struct sockaddr    address;
-   char               data[1];
-} SocketChannelData;
-
-typedef struct {
-   int af;
-   int type;
-   int protocol;
-} SocketArgs;
-
-typedef struct {
-   SOCKET s;
-   int len;
-   int flags;
-   int addrlen;
-   struct sockaddr addr;
-   char data[1];
-} WinSockData;
-
-typedef struct {
-   SOCKET s;
-   int level;
-   int optname;
-   int optlen;
-   char optval[1];
-} SetSockOptArgs;
-
-typedef struct {
-   SOCKET   sock[MAXSOCKETS];
-} SocketMap;
-
-//#include "rtq.h"
-#define RTQ_NODE struct rtq_node
-
-RTQ_NODE
-   {
-      RTQ_NODE *self; // Ring zero address of this node
-      RTQ_NODE *left; // Ring zero address of preceding node
-      RTQ_NODE *right; // Ring zero address of succeding node
-      BYTE *      rtqDatum;  // Ring 3 Datum of Buffer (start of preface)
-      BYTE *      rtqInsert; // Ring 3 insertion position
-      WORD     rtqLen; // Length of buffer, excluding preface
-      WORD     rtqUpCtr;  // Up Counter of bytes used so far
-      WORD     rtqQCtr;   // number of nodes attached
-      WORD     padding;   // DWORD alignment
-   };
-
-#define RTQ_PARAM_MOVENODE struct rtq_param_movenode
-RTQ_PARAM_MOVENODE
-   {
-      WORD     rtqFromDQ;
-      WORD     rtqToDQ;
-   };
-
-RTQ_NODE* rtq_fetch(RTQ_NODE*, RTQ_NODE*); // To, From
-
-//#include "mplib.h"
-// give up time slice
-void Yield(void);
-void MGenWakeupDll(void);
-
-// post a message to win32 side
-void PostWindowsMessage(void);
-
-// get # of items on qNo
-int MGenGetQueueCtr(int qNo);
-
-// move first node from qFrom to qTo
-RTQ_NODE *MGenMoveTo(int qFrom, int qTo);
-
-// get first node from q
-RTQ_NODE *MGenGetNode(int q);
-
-// get master node, returning size of RTQ_NODE for size verification
-RTQ_NODE *MGenGetMasterNode(unsigned *size);
-
-// move all nodes from qFrom to qTo
-RTQ_NODE *MGenFlushNodes(int qFrom, int qTo);
-
-// count number of nodes in queues designated by bitmask
-// lowerOrderBits == 0..31, upperOrderBits == 32-63
-int MGenMCount(unsigned lowerOrderBits, unsigned upperOrderBits);
-
-// perform consistency check on chunnel address space
-int MGenSanityCheck(void);
-
-#include <stdio.h>
-#include <sys/farptr.h>
-
-extern short flat_selector;
-
-#define SOCKET_MAP_QUEUE  41
-
-#define IDLE_QUEUE    44
-#define REC_QUEUE     45
-#define SEND_QUEUE    46
-
-//  queue sizes
-#define FREEQBASE      58
-#define FREEQ64        58
-#define FREEQ128       59
-#define FREEQ256       60
-#define FREEQ512       61
-#define FREEQ1024      62
-#define FREEQ2048      63
-
-#define NFREEQ         6
-
-#define QLIMIT         10
-
-#define PRIVATEQ       50
-
-#define FARPKL(x)  (_farnspeekl((unsigned long) x))
-#define FARPKB(x)  (_farnspeekb((unsigned long) x))
-#define FARPKS(x)  (_farnspeekw((unsigned long) x))
-
-#define FARPOKL(x, y) (_farnspokel((unsigned long) x, (unsigned long) y))
-#define FARPOKB(x, y) (_farnspokeb((unsigned long) x, (unsigned char) y))
-
-int Qsizes[] = { 64, 128, 256, 512, 1024, 2048 };
-
-int SocketError = 0;
-
-SocketMap *SockMap;
-
-#define HOSTENT_ALIAS_LIMIT    5
-#define HOSTENT_STRLEN_LIMIT   50
-#define HOSTENT_ADDR_LIST_LIMIT   5
-
-struct hostent  HostEnt;
-
-char HostEnt_hname[HOSTENT_STRLEN_LIMIT];
-char *HostEnt_h_aliases[HOSTENT_ALIAS_LIMIT];
-char HostEnt_names[HOSTENT_ALIAS_LIMIT][HOSTENT_STRLEN_LIMIT];
-struct in_addr* HostEnt_addr_list[HOSTENT_ADDR_LIST_LIMIT];
-struct in_addr HostEnt_addrs[HOSTENT_ADDR_LIST_LIMIT];
-
-void
-fmemcpyto(void *to, const void *from, int length)
-{
-   movedata(_my_ds(), (unsigned)from, flat_selector, (unsigned)to, length);
-}
-
-void
-fmemcpyfrom(void *to, const void *from, int length)
-{
-   movedata(flat_selector, (unsigned)from, _my_ds(), (unsigned)to, length);
-}
-
-void
-fstrcpyto(char *to, const char *from)
-{
-   while (*from) {
-      FARPOKB(to, *from);
-      to++; from++;
-   }
-   FARPOKB(to, 0);
-}
-
-void
-fstrncpyto(char *to, const char *from, int len)
-{
-   while (*from && len) {
-      FARPOKB(to, *from);
-      to++; from++; len--;
-   }
-   FARPOKB(to, 0);
-}
-
-void
-fstrcpyfrom(char *to, const char *from)
-{
-   while (FARPKB(from)) {
-      *to = FARPKB(from);
-      from++; to++;
-   }
-   *to = 0;
-}
-
-void
-fstrncpyfrom(char *to, const char *from, int len)
-{
-   while (FARPKB(from) && len) {
-      *to =  FARPKB(from);
-      from++; to++; len--;
-   }
-   *to = 0;
-}
-
-void
-GetSocketMap(void)
-{
-   RTQ_NODE *n = MGenGetNode(SOCKET_MAP_QUEUE);
-
-   SockMap = (SocketMap *) FARPKL(&n->rtqDatum);
-}
-
-void *
-GetFreeBufferToQueue(int q, int bufSize)
-{
-   int i;
-
-   for (i = 0; i < NFREEQ; i++) {
-      if (Qsizes[i] >= bufSize && MGenGetQueueCtr(i+FREEQBASE)) {
-         RTQ_NODE *n = MGenMoveTo(i+FREEQBASE, q);
-         if (!n)
-            continue;
-         FARPOKL(&n->rtqUpCtr, bufSize);
-         return (void *) FARPKL(&n->rtqDatum);
-      }
-   }
-
-   return 0;
-}
-
-void
-FreeBufferFromQueue(int q)
-{
-   int i;
-   RTQ_NODE *n = MGenGetNode(q);
-
-   for (i = 0; i < NFREEQ; i++) {
-      if (Qsizes[i] == FARPKS(&n->rtqLen)) {
-         MGenMoveTo(q, i+FREEQBASE);
-         return;
-      }
-   }
-}
-
-void
-SetLPCData(LPCData *lpc)
-{
-
-   FARPOKL(&(lpc->version), 1);
-   FARPOKL(&(lpc->sizeOfArgs), 0);
-   FARPOKL(&(lpc->service), 0);
-}
-
-int
-bind(SOCKET s, const struct sockaddr *name, int namelen)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   BindArgs  *bargs;
-   int       retVal;
-
-   _farsetsel(flat_selector);
-   SocketError = 0;
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKBIND);
-   bargs = (BindArgs *) p->Data;
-   FARPOKL(&bargs->s, s);
-   FARPOKL(&bargs->namelen, namelen);
-   fmemcpyto(bargs->name, name, namelen);
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-   if (FARPKS(&r->error) != LPC_NOERROR) {
-      return -1;
-   }
-
-   retVal = FARPKL(r->Data);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-int
-closesocket(SOCKET s)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   int       retVal;
-
-   _farsetsel(flat_selector);
-   SocketError = 0;
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKCLOSE);
-   FARPOKL(p->Data, s);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-   if (FARPKS(&r->error) != LPC_NOERROR) {
-      return -1;
-   }
-
-   retVal = FARPKL(r->Data);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-void
-ZapHostEnt()
-{
-   // do nothing
-}
-
-void
-ReconstructHostEnt(struct hostent *s, void *flattened)
-{
-   struct hostent   *old = (struct hostent *) flattened;
-   int i;
-   char **ptr;
-
-
-   s->h_name = HostEnt_hname;
-   fstrncpyfrom(s->h_name, (char *) FARPKL(&old->h_name), HOSTENT_STRLEN_LIMIT-1);
-   s->h_name[HOSTENT_STRLEN_LIMIT-1] = 0;
-
-   s->h_aliases = HostEnt_h_aliases;
-   ptr = (char **) FARPKL(&old->h_aliases);
-   for (i = 0; i < (HOSTENT_ALIAS_LIMIT-1) && FARPKL(ptr); i++, ptr++) {
-      s->h_aliases[i] = HostEnt_names[i];
-      // fstrncpyfrom(s->h_aliases[i], (void *) FARPKL(ptr), HOSTENT_STRLEN_LIMIT-1);
-      s->h_aliases[i][HOSTENT_STRLEN_LIMIT-1] = 0;
-   }
-   s->h_aliases[i] = 0;
-
-   s->h_addrtype = FARPKS(&old->h_addrtype);
-   s->h_length = FARPKS(&old->h_length);
-
-   if (FARPKS(&old->h_length) != sizeof(struct in_addr)) {
-      printf("Error!\n");
-      exit(0);
-   }
-
-   s->h_addr_list = (char **) HostEnt_addr_list;
-   ptr = (char **) FARPKL(&old->h_addr_list);
-   for (i = 0; i < (HOSTENT_ADDR_LIST_LIMIT - 1) && FARPKL(ptr); i++, ptr++) {
-      s->h_addr_list[i] = (char *) &(HostEnt_addrs[i]);
-      fmemcpyfrom(s->h_addr_list[i], (void *) FARPKL(ptr), s->h_length);
-   }
-   s->h_addr_list[i] = 0;
-}
-
-
-int
-getsockname(SOCKET s, struct sockaddr *name, int *namelen)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   GetSockNameRet  *ret;
-   int       retVal;
-
-   SocketError = 0;
-   _farsetsel(flat_selector);
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKGETSOCKNAME);
-   FARPOKL(p->Data, s);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-   if (FARPKS(&r->error) != LPC_NOERROR) {
-      return -1;
-   }
-
-   ret = (GetSockNameRet *) r->Data;
-   retVal = FARPKL(&ret->retVal);
-   fmemcpyfrom(name, ret->name, FARPKL(&ret->namelen));
-   *namelen = FARPKL(&ret->namelen);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-int
-gethostname(char *name, int namelen)
-{
-   RTQ_NODE *n;
-   LPCData  *p;
-   LPCReturn *r;
-   GetHostNameRet  *ret;
-   int       retVal;
-   char  *s;
-
-   _farsetsel(flat_selector);
-   SocketError = 0;
-   n = (RTQ_NODE *) MGenGetNode(IDLE_QUEUE);
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service,LPC_SOCKGETHOSTNAME);
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = (RTQ_NODE *) (MGenGetNode(REC_QUEUE))) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-   if (FARPKS(&r->error) != LPC_NOERROR) {
-      return -1;
-   }
-
-   ret = (GetHostNameRet *) r->Data;
-
-   retVal = FARPKL(&ret->retVal);
-
-   s = ret->name;
-
-   fstrncpyfrom(name, s, namelen);
-
-#if 0
-   len = strlen(ret->name);
-
-   if (len > namelen)
-      memcpy(name, ret->name, ret->namelen);
-   else
-      strcpy(name, ret->name);
-#endif
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-struct hostent *
-gethostbyname(const char *name)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   struct hostent *retVal;
-
-   _farsetsel(flat_selector);
-   SocketError = 0;
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKGETHOSTBYNAME);
-   fstrcpyto(p->Data, name);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-   retVal = (struct hostent *) r->Data;
-
-   if (FARPKL(&retVal->h_name) == 0) {
-      retVal = 0;
-   } else {
-      ZapHostEnt();
-      ReconstructHostEnt(&HostEnt, (void *) retVal);
-      retVal = &HostEnt;
-   }
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-struct hostent *
-gethostbyaddr(const char *addr, int len, int type)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   GetHostByAddrArgs *args;
-   struct hostent *retVal;
-
-   SocketError = 0;
-   _farsetsel(flat_selector);
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKGETHOSTBYADDR);
-   args = (GetHostByAddrArgs *) p->Data;
-   FARPOKL(&args->len, len);
-   FARPOKL(&args->type, type);
-   fmemcpyto(args->addr, addr, len);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-   retVal = (struct hostent *) r->Data;
-
-   if (FARPKL(&retVal->h_name) == 0) {
-      retVal = 0;
-   } else {
-      ZapHostEnt();
-
-      ReconstructHostEnt(&HostEnt, (void *) retVal);
-      retVal = &HostEnt;
-   }
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-
-SOCKET
-socket(int af, int type, int protocol)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   SocketArgs  *args;
-   int       retVal;
-
-   _farsetsel(flat_selector);
-   SocketError = 0;
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKSOCKET);
-   args = (SocketArgs *) p->Data;
-   FARPOKL(&args->af, af);
-   FARPOKL(&args->type, type);
-   FARPOKL(&args->protocol, protocol);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-
-   if (FARPKS(&r->error) != LPC_NOERROR) {
-      return -1;
-   }
-
-   retVal = FARPKL(r->Data);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-void
-sockets_flush(void)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-
-   SocketError = 0;
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKFLUSH);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-}
-
-int
-recvfrom(SOCKET s, char *buf, int len, int flags, struct sockaddr *from,
-         int *fromlen)
-{
-   int i;
-   RTQ_NODE *n;
-   WinSockData  *data;
-   int  bytesRead;
-
-   SocketError = 0;
-   _farsetsel(flat_selector);
-   if (!SockMap)
-      GetSocketMap();
-
-   for (i = 0; i < MAXSOCKETS; i++) {
-      if (FARPKL(&(SockMap->sock[i])) == s)
-         break;
-   }
-
-   if (i == MAXSOCKETS)
-      return SOCKET_ERROR;
-
-   // pick up node
-   n = MGenGetNode(i);
-   if (n == 0) {
-      SocketError = WSAEWOULDBLOCK;
-      return -1;
-   }
-
-   data = (WinSockData *) FARPKL(&n->rtqDatum);
-   bytesRead = FARPKL(&data->len);
-
-   if (from) {
-      fmemcpyfrom(from, &data->addr, sizeof(struct sockaddr));
-   }
-
-   if (fromlen) {
-      *fromlen = FARPKL(&data->addrlen);
-   }
-
-   fmemcpyfrom(buf, data->data, len > bytesRead ? bytesRead : len);
-
-   if ((flags & MSG_PEEK) == 0) {
-      FreeBufferFromQueue(i);
-   }
-
-   return bytesRead;
-}
-
-int
-sendto(SOCKET s, const char *buf, int len, int flags, const struct sockaddr *to, int tolen)
-{
-   int i;
-   int outQ;
-   WinSockData *data;
-
-   SocketError = 0;
-   _farsetsel(flat_selector);
-   if (!SockMap)
-      GetSocketMap();
-
-   for (i = 0; i < MAXSOCKETS; i++) {
-      if (FARPKL(&SockMap->sock[i]) == s) {
-         break;
-      }
-   }
-
-   if (i == MAXSOCKETS) {
-      SocketError = WSAENOTSOCK;
-      return SOCKET_ERROR;
-   }
-
-   outQ = i + MAXSOCKETS;
-
-   if (MGenGetQueueCtr(outQ) >= QLIMIT) {
-      SocketError = WSAEWOULDBLOCK;
-      return SOCKET_ERROR;
-   }
-
-   data = GetFreeBufferToQueue(PRIVATEQ, len + sizeof(WinSockData));
-
-   if (!data) {
-      SocketError = WSAEWOULDBLOCK;
-      return SOCKET_ERROR;
-   }
-
-   FARPOKL(&data->s, s);
-   FARPOKL(&data->len, len);
-   if (to) {
-      fmemcpyto(&data->addr, to, tolen);
-      FARPOKL(&data->addrlen, tolen);
-   } else {
-      FARPOKL(&data->addrlen, 0);
-   }
-
-   FARPOKL(&data->flags, flags);
-
-   fmemcpyto(data->data, buf, len);
-
-   MGenMoveTo(PRIVATEQ, outQ);
-
-   return len;
-}
-
-int
-ioctlsocket(SOCKET s, long cmd, unsigned long *argp)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   IoctlArgs  *args;
-   int       retVal;
-
-   SocketError = 0;
-   _farsetsel(flat_selector);
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKIOCTL);
-   args = (IoctlArgs *) p->Data;
-   FARPOKL(&args->s, s);
-   FARPOKL(&args->cmd, cmd);
-
-   switch(cmd) {
-   case FIONBIO:
-      FARPOKL(args->data, *argp);
-      break;
-   default:
-      return SOCKET_ERROR;
-   }
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-
-   retVal = FARPKL(r->Data);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-int
-setsockopt(SOCKET s, int level, int optname, const char *optval, int optlen)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   SetSockOptArgs  *args;
-   int       retVal;
-
-   SocketError = 0;
-   _farsetsel(flat_selector);
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKSETOPT);
-   args = (SetSockOptArgs *) p->Data;
-   FARPOKL(&args->s, s);
-   FARPOKL(&args->level, level);
-   FARPOKL(&args->optname, optname);
-   FARPOKL(&args->optlen, optlen);
-   fmemcpyto(args->optval, optval, optlen);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-   retVal = FARPKL(r->Data);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-int
-WSAGetLastError(void)
-{
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   int       retVal;
-
-
-   _farsetsel(flat_selector);
-   if (SocketError) {
-      int err = SocketError;
-
-      SocketError = 0;
-      return err;
-   }
-
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKGETLASTERROR);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-
-   retVal = FARPKL(r->Data);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
-}
-
-unsigned long inet_addr(const char *cp)
-{
-	int ret;
-	unsigned int ha1, ha2, ha3, ha4;
-	unsigned long ipaddr;
-
-	ret = sscanf(cp, "%d.%d.%d.%d", &ha1, &ha2, &ha3, &ha4);
-	if (ret != 4)
-		return -1;
-	ipaddr = (ha1 << 24) | (ha2 << 16) | (ha3 << 8) | ha4;
-	return ipaddr;
-#if 0
-   RTQ_NODE *n = MGenGetNode(IDLE_QUEUE);
-   LPCData  *p;
-   LPCReturn *r;
-   int       retVal;
-
-   SocketError = 0;
-   _farsetsel(flat_selector);
-   p = (LPCData *) FARPKL(&n->rtqDatum);
-   SetLPCData(p);
-   FARPOKL(&p->service, LPC_SOCKINETADDR);
-
-   fstrcpyto(p->Data, cp);
-
-   MGenMoveTo(IDLE_QUEUE, SEND_QUEUE);
-   PostWindowsMessage();
-
-   while ((n = MGenGetNode(REC_QUEUE)) == 0)
-      Yield();
-
-   r = (LPCReturn *) FARPKL(&n->rtqDatum);
-
-   if (FARPKS(&r->error) != LPC_NOERROR) {
-      return -1;
-   }
-
-   retVal = FARPKL(r->Data);
-
-   // get ready for next call
-   MGenMoveTo(REC_QUEUE, IDLE_QUEUE);
-
-   return retVal;
- #endif
-}
-
-char *inet_ntoa (struct in_addr in)
-{
-	static char buf [32];
-
-	sprintf(buf, "%u.%u.%u.%u", in.S_un.S_un_b.s_b1, in.S_un.S_un_b.s_b2, in.S_un.S_un_b.s_b3, in.S_un.S_un_b.s_b4);
-	return buf;
-}
--- a/u/net_bw.c
+++ /dev/null
@@ -1,763 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_bw.c
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dpmi.h>
-
-#include "quakedef.h"
-#include "dosisms.h"
-
-
-// this section is general Unix stuff that we need
-
-#define	EIO		 		5	/* I/O error */
-#define EBADS			9
-#define EWOULDBLOCK		35	/* function would block */
-#define EMSGSIZE		40	/* message to big for buffers */
-#define	EPROTONOSUPPORT	43	/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	44	/* Socket type not supported */
-#define	EPFNOSUPPORT	46	/* Protocol family not supported */
-#define EAFNOSUPPORT	47	/* Address family not supported */
-#define ECONNABORTED	53	/* User requested hangup */
-#define ENOBUFS 		55	/* No buffers available */
-#define EISCONN 		56	/* Socket has closed */
-#define ENOTCONN		57	/* Socket is not connected */
-#define ESHUTDOWN		58	/* Socket is closed */
-#define ETOOMANYREFS	59	/* Too many sockets open */
-#define ETIMEDOUT		60	/* Connection timed out */
-#define ECONNREFUSED	61	/* Connection refused */
-
-#define AF_INET 		2	/* internet */
-
-#define PF_INET			AF_INET
-
-#define SOCK_STREAM		1		/* stream */
-#define SOCK_DGRAM		2		/* datagram */
-
-#define IPPROTO_TCP		6
-#define IPPROTO_UDP		17
-
-#define INADDR_ANY		0
-
-#define SIOCDONE		0x7300
-#define FIONREAD		0x667f
-#define FIONBIO 		0x667e
-#define FIONWIN 		0x1000
-#define FIONTIN 		0x2000
-
-#define BRDINIT 		0
-#define BRDADDR 		10
-
-#define MAXHOSTNAMELEN	256
-
-#define SOL_SOCKET		0xffff		/* options for socket level */
-
-/*
- * Option flags per-socket.
- */
-#define SO_DEBUG		0x0001		/* turn on debugging info recording */
-#define SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#define SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#define SO_LINGER		0x0080		/* linger on close if data present */
-#define SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#define SO_USEPRIV		0x4000		/* allocate from privileged port area */
-#define SO_CANTSIG		0x8000		/* prevent SIGPIPE on SS_CANTSENDMORE */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define SO_SNDBUF		0x1001		/* send buffer size */
-#define SO_RCVBUF		0x1002		/* receive buffer size */
-#define SO_SNDLOWAT		0x1003		/* send low-water mark */
-#define SO_RCVLOWAT		0x1004		/* receive low-water mark */
-#define SO_SNDTIMEO		0x1005		/* send timeout */
-#define SO_RCVTIMEO		0x1006		/* receive timeout */
-#define SO_ERROR		0x1007		/* get error status and clear */
-#define SO_TYPE			0x1008		/* get socket type */
-
-
-struct in_addr
-{
-	union
-	{
-		struct { unsigned char s_b1,s_b2,s_b3,s_b4; } S_un_b;
-		struct { unsigned short s_w1,s_w2; } S_un_w;
-		unsigned long S_addr;
-	} S_un;
-};
-#define	s_addr	S_un.S_addr	/* can be used for most tcp & ip code */
-#define	s_host	S_un.S_un_b.s_b2	/* host on imp */
-#define	s_net	S_un.S_un_b.s_b1	/* network */
-#define	s_imp	S_un.S_un_w.s_w2	/* imp */
-#define	s_impno	S_un.S_un_b.s_b4	/* imp # */
-#define	s_lh	S_un.S_un_b.s_b3	/* logical host */
-
-struct sockaddr_in
-{
-    short			sin_family;
-    unsigned short	sin_port;
-	struct in_addr	sin_addr;
-    char			sin_zero[8];
-};
-
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-#define	h_addr	h_addr_list[0]	/* address, for backward compatiblity */
-};
-
-char *inet_ntoa(struct in_addr in);
-
-
-// this section is B&W specific constants & structures
-
-#define BW_IOCTL_BIND			0
-#define BW_IOCTL_CLEAROPTIONS	5
-#define BW_IOCTL_SETOPTIONS		6
-#define BW_IOCTL_PEEK			7
-#define BW_IOCTL_SETWINMASK		8
-
-#define BW_OPTION_BLOCKING		0x01
-#define BW_OPTION_REUSEBUFFERS	0x80
-
-#define BW_ERR_USR_HANGUP		50
-#define BW_ERR_HANGUP			51
-#define BW_ERR_NET_ERR			52
-#define BW_ERR_IS_CLOSED		53
-#define BW_ERR_TIME_OUT			54
-#define BW_ERR_RESET			55
-#define BW_ERR_FULL				56
-#define BW_ERR_BLOCK			57
-#define BW_ERR_SHUTDOWN			58
-
-#pragma pack(1)
-
-typedef struct
-{
-	char			state;			// always 1
-	short			localPort;
-	struct in_addr	localAddr;
-	char			reason;			// always 0
-	char			options;
-	short			dataAvailable;
-} BW_UDPinfo_t;
-
-typedef struct
-{
-	char			reserved1 [6];
-	unsigned short	info2Offset;
-	char			reserved2 [18];
-	struct in_addr	remoteAddr;
-} BW_UDPreadInfo1_t;
-
-typedef struct
-{
-	short			remotePort;
-	char			reserved1 [2];
-	unsigned short	dataLenPlus8;
-	char			reserved2 [2];
-	char			data[1];			// actual size is <dataLenPlus8> - 8		
-} BW_UDPreadInfo2_t;
-
-typedef struct
-{
-	char			reserved1 [2];
-	short			remotePort;
-	unsigned short	dataLen;
-	struct in_addr	remoteAddr;
-	char			reserved2 [42];
-	char			data[1];			// actual size is <datalen>
-} BW_writeInfo_t;
-
-typedef struct
-{
-	short	ioport;
-	byte	dma;
-	byte	vector;
-	byte	irq;
-	short	bufferSize;
-	short	maxWindow;
-	short	timeZone;
-	byte	myType;
-	int		inetAddr;
-	short	value;
-	byte	subnetMask;
-	short	etherPointer;
-	short	logserverPointer;
-	short	nameserverPointer;
-	short	printserverPointer;
-	short	timeserverPointer;
-	short	gatewayPointer;
-	short	driverSegment;
-	byte	transferSize;
-	char	cardName [9];
-} BW_ethdevinfo_t;
-
-#pragma pack()
-
-#define LOWMEM_SIZE	4096
-
-static unsigned char *lowmem_buffer;
-static int lowmem_bufseg;
-static int lowmem_bufoff;
-static BW_ethdevinfo_t ethdevinfo;
-static int netmask;
-static struct in_addr bcastaddr;
-
-extern regs_t regs;
-
-static int net_acceptsocket = -1;		// socket for fielding new connections
-static int net_controlsocket = 0;
-
-#include "net_bw.h"
-
-//=============================================================================
-
-static int BW_ioctl(int s, char *msg, int msglen)
-{
-	Q_memcpy(lowmem_buffer, msg, msglen);
-
-	regs.x.ax = 0x4403;
-	regs.x.bx = s;
-	regs.x.cx = msglen;
-	regs.x.dx = lowmem_bufoff;
-	regs.x.ds = lowmem_bufseg;
-	if (dos_int86(0x21))
-		return regs.x.ax;
-	return 0;
-}
-
-//=============================================================================
-
-static int BW_TranslateError(int error)
-{
-	switch(error)
-	{
-		case BW_ERR_USR_HANGUP:	return ECONNABORTED;
-		case BW_ERR_HANGUP:		return EISCONN;
-		case BW_ERR_NET_ERR:	return ENOTCONN;
-		case BW_ERR_IS_CLOSED:	return ENOTCONN;
-		case BW_ERR_TIME_OUT:	return ETIMEDOUT;
-		case BW_ERR_RESET:		return ECONNREFUSED;
-		case BW_ERR_FULL:		return ETOOMANYREFS;
-		case BW_ERR_BLOCK:		return EWOULDBLOCK;
-		case BW_ERR_SHUTDOWN:	return ESHUTDOWN;
-	}
-	return EIO;
-}
-
-//=============================================================================
-
-static int GetEthdevinfo(void)
-{
-	int fd;
-
-	Q_strcpy((char *)lowmem_buffer, "ETHDEV27");
-	regs.x.ax = 0x3d42;
-	regs.x.ds = lowmem_bufseg;
-	regs.x.dx = lowmem_bufoff;
-	if (dos_int86(0x21))
-		return -1;
-	fd = regs.x.ax;
-
-	regs.x.ax = 0x4401;
-	regs.x.bx = fd;
-	regs.x.dx = 0x60;
-	dos_int86(0x21);
-
-	regs.h.ah = 0x3f;
-	regs.x.cx = sizeof(ethdevinfo);
-	regs.x.es = regs.x.ds = lowmem_bufseg;
-	regs.x.dx = lowmem_bufoff;
-	regs.x.bx = fd;
-	if (dos_int86(0x21))
-		return -1;
-	Q_memcpy(&ethdevinfo, lowmem_buffer, regs.x.ax);
-
-	regs.h.ah = 0x3e;
-	regs.x.bx = fd;
-	dos_int86(0x21);
-
-	return 0;
-}
-
-//=============================================================================
-
-int BW_Init(void)
-{
-	struct qsockaddr addr;
-	char *colon;
-
-	if (COM_CheckParm ("-noudp"))
-		return -1;
-
-	lowmem_buffer = dos_getmemory(LOWMEM_SIZE);
-	if (!lowmem_buffer)
-		Sys_Error("not enough low memory\n");
-	lowmem_bufoff = ptr2real(lowmem_buffer) & 0xf;
-	lowmem_bufseg = ptr2real(lowmem_buffer) >> 4;
-
-	if (GetEthdevinfo())
-	{
-		Con_DPrintf("Beame & Whiteside TCP/IP not detected\n");
-		dos_freememory(lowmem_buffer);
-		return -1;
-	}
-	netmask = 0xffffffff >> (32 - ethdevinfo.subnetMask);
-	bcastaddr.s_addr = (ethdevinfo.inetAddr & netmask) | (~netmask);
-
-	if ((net_controlsocket = BW_OpenSocket (0)) == -1)
-	{
-		dos_freememory(lowmem_buffer);
-		Con_DPrintf ("BW_Init unable to open control socket; disabled\n");
-		return -1;
-	}
-
-	BW_GetSocketAddr (net_controlsocket, &addr);
-	Q_strcpy(my_tcpip_address,  BW_AddrToString (&addr));
-	colon = Q_strrchr (my_tcpip_address, ':');
-	if (colon)
-		*colon = 0;
-
-	Con_Printf("BW_Init: UDP initialized\n");
-	tcpipAvailable = true;
-
-	return net_controlsocket;
-}
-
-//=============================================================================
-
-void BW_Shutdown(void)
-{
-	BW_Listen (false);
-	BW_CloseSocket (net_controlsocket);
-	dos_freememory(lowmem_buffer);
-}
-
-//=============================================================================
-
-void BW_Listen (qboolean state)
-{
-	// enable listening
-	if (state)
-	{
-		if (net_acceptsocket != -1)
-			return;
-		if ((net_acceptsocket = BW_OpenSocket (net_hostport)) == -1)
-			Sys_Error ("BW_Listen: Unable to open accept socket\n");
-		return;
-	}
-
-	// disable listening
-	if (net_acceptsocket == -1)
-		return;
-	BW_CloseSocket (net_acceptsocket);
-	net_acceptsocket = -1;
-}
-
-
-//=============================================================================
-
-/*
-OpenSocket returns a handle to a network socket that has been opened,
-set to nonblocking, and bound to <port>.  Additional socket options
-should be set here if they are needed.  -1 is returned on failure.
-*/
-
-int BW_OpenSocket(int port)
-{
-	int s;
-	int ret;
-	int deadman = 3 * 1024;
-	static int dynamic = 1024;
-	static char reuse_msg[2] = {BW_IOCTL_SETOPTIONS, BW_OPTION_REUSEBUFFERS};
-	static char bind_msg[3] = {BW_IOCTL_BIND, 0, 0};
-	static char nonblock_msg[2] = {BW_IOCTL_CLEAROPTIONS, BW_OPTION_BLOCKING};
-
-	// allocate a UDP socket
-	Q_strcpy((char *)lowmem_buffer, "UDP-IP10");
-	regs.x.ax = 0x3d42;
-	regs.x.ds = lowmem_bufseg;
-	regs.x.dx = lowmem_bufoff;
-	if (dos_int86(0x21))
-	{
-		Con_Printf("BW_OpenSocket failed: %u\n", BW_TranslateError(regs.x.ax));
-		return -1;
-	}
-	s = regs.x.ax;
-
-	// set file descriptor to raw mode
-	regs.x.ax = 0x4401;
-	regs.x.bx = s;
-	regs.x.dx = 0x60;
-	dos_int86(0x21);
-
-	if (BW_ioctl(s, reuse_msg, 2))
-	{
-		Con_Printf("BW_OpenSocket ioctl(reuse) failed\n");
-		return -1;
-	}
-
-	if (BW_ioctl(s, nonblock_msg, 2))
-	{
-		Con_Printf("BW_OpenSocket ioctl(nonblocking) failed\n");
-		return -1;
-	}
-
-	// if a socket was specified, bind to it and return
-	if (port)
-	{
-		*(short *)&bind_msg[1] = port;
-		if (BW_ioctl(s, bind_msg, 3))
-		{
-			BW_CloseSocket(s);
-			return -1;
-		}
-		return s;
-	}
-
-	// B&W does NOT do dynamic allocation, so if port == 0 we must fake it
-	do
-	{
-		port = dynamic++;
-		if (dynamic == 4096)
-			dynamic = 1024;
-		deadman--;
-		*(short *)&bind_msg[1] = port;
-		ret = BW_ioctl(s, bind_msg, 3);
-	}
-	while (ret && deadman);
-	if (ret)
-		return -1;
-	return s;
-}
-
-//=============================================================================
-
-int BW_CloseSocket(int socket)
-{
-	regs.h.ah = 0x3e;
-	regs.x.bx = socket;
-	if(dos_int86(0x21))
-		{
-			Con_Printf("BW_CloseSocket %u failed: %u\n", socket, BW_TranslateError(regs.x.ax));
-			return -1;
-		}
-	return 0;
-}
-
-//=============================================================================
-
-int BW_Connect (int socket, struct qsockaddr *hostaddr)
-{
-	return 0;
-}
-
-//=============================================================================
-
-int BW_CheckNewConnections(void)
-{
-	if (net_acceptsocket == 0)
-		return -1;
-
-	// see if there's anything waiting
-	regs.x.ax = 0x4406;
-	regs.x.bx = net_acceptsocket;
-	dos_int86(0x21);
-	if (regs.x.ax == 0)
-		return -1;
-	return net_acceptsocket;
-}
-
-//=============================================================================
-
-int BW_Read(int s, byte *buf, int len, struct qsockaddr *from)
-{
-	BW_UDPreadInfo1_t *info1;
-	BW_UDPreadInfo2_t *info2;
-
-	// ask if there's anything waiting
-	regs.x.ax = 0x4406;
-	regs.x.bx = s;
-	dos_int86(0x21);
-	if (regs.x.ax == 0)
-		return 0;
-
-	// there was, so let's get it
-	regs.h.ah = 0x3f;
-	regs.x.cx = /* len + 53 */ LOWMEM_SIZE;
-	regs.x.es = regs.x.ds = lowmem_bufseg;
-	regs.x.dx = lowmem_bufoff;
-	regs.x.bx = s;
-	if (dos_int86(0x21))
-	{
-		Con_Printf("BW UDP read error: %u\n", BW_TranslateError(regs.x.ax));
-		return -1;
-	}
-
-	info1 = (BW_UDPreadInfo1_t *)lowmem_buffer;
-	info2 = (BW_UDPreadInfo2_t *)(lowmem_buffer + info1->info2Offset);
-
-	if (from)
-	{
-		from->sa_family = AF_INET;
-		((struct sockaddr_in *)from)->sin_addr = info1->remoteAddr;
-		((struct sockaddr_in *)from)->sin_port = htons(info2->remotePort);
-	}
-
-	len = info2->dataLenPlus8 - 8;
-	if (len > NET_DATAGRAMSIZE)
-	{
-		Con_Printf("BW UDP read packet too large: %u\n", len);
-		return -1;
-	}
-	Q_memcpy(buf, info2->data, len);
-
-	return len;
-}
-
-//=============================================================================
-
-int BW_Broadcast(int s, byte *msg, int len)
-{
-	BW_writeInfo_t *writeInfo;
-
-	// ask if we're clear to send
-	regs.x.ax = 0x4407;
-	regs.x.bx = s;
-	dos_int86(0x21);
-	if (regs.x.ax == 0)
-		return 0;
-
-	// yes, let's do it
-	writeInfo = (BW_writeInfo_t *)lowmem_buffer;
-	writeInfo->remoteAddr = bcastaddr;
-	writeInfo->remotePort = net_hostport;
-	writeInfo->dataLen = len;
-	if (len > NET_DATAGRAMSIZE)
-		Sys_Error("BW UDP write packet too large: %u\n", len);
-	Q_memcpy(writeInfo->data, msg, len);
-	writeInfo->data[len] = 0;
-	regs.h.ah = 0x40;
-	regs.x.bx = s;
-	regs.x.cx = len + sizeof(BW_writeInfo_t);
-	regs.x.es = regs.x.ds = lowmem_bufseg;
-	regs.x.dx = lowmem_bufoff;
-	if (dos_int86(0x21))
-	{
-		Con_Printf("BW_Broadcast failed: %u\n", BW_TranslateError(regs.x.ax));
-		return -1;
-	}
-
-	return len;
-}
-
-//=============================================================================
-
-int BW_Write(int s, byte *msg, int len, struct qsockaddr *to)
-{
-	BW_writeInfo_t *writeInfo;
-
-	// ask if we're clear to send
-	regs.x.ax = 0x4407;
-	regs.x.bx = s;
-	dos_int86(0x21);
-	if (regs.x.ax == 0)
-		return 0;
-
-	// yes, let's do it
-	writeInfo = (BW_writeInfo_t *)lowmem_buffer;
-	writeInfo->remoteAddr = ((struct sockaddr_in *)to)->sin_addr;
-	writeInfo->remotePort = ntohs(((struct sockaddr_in *)to)->sin_port);
-	writeInfo->dataLen = len;
-	if (len > NET_DATAGRAMSIZE)
-		Sys_Error("BW UDP write packet too large: %u\n", len);
-	Q_memcpy(writeInfo->data, msg, len);
-	writeInfo->data[len] = 0;
-	regs.h.ah = 0x40;
-	regs.x.bx = s;
-	regs.x.cx = len + sizeof(BW_writeInfo_t);
-	regs.x.es = regs.x.ds = lowmem_bufseg;
-	regs.x.dx = lowmem_bufoff;
-	if (dos_int86(0x21))
-	{
-		Con_Printf("BW_Write failed: %u\n", BW_TranslateError(regs.x.ax));
-		return -1;
-	}
-
-	return len;
-}
-
-//=============================================================================
-
-
-char *BW_AddrToString (struct qsockaddr *addr)
-{
-	static char buffer[22];
-
-	sprintf(buffer, "%d.%d.%d.%d:%d",
-		((struct sockaddr_in *)addr)->sin_addr.s_net,
-		((struct sockaddr_in *)addr)->sin_addr.s_host,
-		((struct sockaddr_in *)addr)->sin_addr.s_lh,
-		((struct sockaddr_in *)addr)->sin_addr.s_impno,
-		ntohs(((struct sockaddr_in *)addr)->sin_port)
-		);
-	return buffer;
-}
-
-//=============================================================================
-
-int BW_StringToAddr (char *string, struct qsockaddr *addr)
-{
-	int ha1, ha2, ha3, ha4, hp;
-	int ipaddr;
-
-	sscanf(string, "%d.%d.%d.%d:%d", &ha1, &ha2, &ha3, &ha4, &hp);
-	ipaddr = (ha1 << 24) | (ha2 << 16) | (ha3 << 8) | ha4;
-
-	addr->sa_family = AF_INET;
-	((struct sockaddr_in *)addr)->sin_addr.s_addr = htonl(ipaddr);
-	((struct sockaddr_in *)addr)->sin_port = htons((short)hp);
-	return 0;
-}
-
-//=============================================================================
-
-int BW_GetSocketAddr (int socket, struct qsockaddr *addr)
-{
-	regs.x.ax = 0x4402;
-	regs.x.bx = socket;
-	regs.x.cx = sizeof(BW_UDPinfo_t);
-	regs.x.dx = lowmem_bufoff;
-	regs.x.ds = lowmem_bufseg;
-	dos_int86(0x21);
-
-	addr->sa_family = AF_INET;
-	((struct sockaddr_in *)addr)->sin_addr.s_addr = ((BW_UDPinfo_t *)lowmem_buffer)->localAddr.s_addr;
-	((struct sockaddr_in *)addr)->sin_port = htons(((BW_UDPinfo_t *)lowmem_buffer)->localPort);
-
-	return 0;
-}
-
-//=============================================================================
-
-int BW_GetNameFromAddr (struct qsockaddr *addr, char *name)
-{
-	Q_strcpy(name, BW_AddrToString(addr));
-	return 0;
-}
-
-///=============================================================================
-
-int BW_GetAddrFromName (char *name, struct qsockaddr *hostaddr)
-{
-	char buff[MAXHOSTNAMELEN];
-	char *b;
-	int addr;
-	int num;
-	int mask;
-	int run;
-	int port;
-
-	if (name[0] < '0' || name[0] > '9')
-		return -1;
-
-	buff[0] = '.';
-	b = buff;
-	Q_strcpy(buff+1, name);
-	if (buff[1] == '.')
-		b++;
-
-	addr = 0;
-	mask = -1;
-	while (*b == '.')
-	{
-		b++;
-		num = 0;
-		run = 0;
-		while (!( *b < '0' || *b > '9'))
-		{
-		  num = num*10 + *b++ - '0';
-		  if (++run > 3)
-		  	return -1;
-		}
-		if ((*b < '0' || *b > '9') && *b != '.' && *b != ':' && *b != 0)
-			return -1;
-		if (num < 0 || num > 255)
-			return -1;
-		mask<<=8;
-		addr = (addr<<8) + num;
-	}
-	addr = htonl(addr);
-	mask = htonl(mask);
-
-	if (*b++ == ':')
-		port = Q_atoi(b);
-	else
-		port = net_hostport;
-
-	hostaddr->sa_family = AF_INET;
-	((struct sockaddr_in *)hostaddr)->sin_port = htons((short)port);	
-	((struct sockaddr_in *)hostaddr)->sin_addr.s_addr =
-	((ethdevinfo.inetAddr & mask) | addr);
-
-	return 0;
-}
-
-//=============================================================================
-
-int BW_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
-{
-	if (addr1->sa_family != addr2->sa_family)
-		return -1;
-
-	if (((struct sockaddr_in *)addr1)->sin_addr.s_addr != ((struct sockaddr_in *)addr2)->sin_addr.s_addr)
-		return -1;
-
-	if (((struct sockaddr_in *)addr1)->sin_port != ((struct sockaddr_in *)addr2)->sin_port)
-		return 1;
-
-	return 0;
-}
-
-//=============================================================================
-
-int BW_GetSocketPort (struct qsockaddr *addr)
-{
-	return ntohs(((struct sockaddr_in *)addr)->sin_port);
-}
-
-
-int BW_SetSocketPort (struct qsockaddr *addr, int port)
-{
-	((struct sockaddr_in *)addr)->sin_port = htons(port);
-	return 0;
-}
-
-//=============================================================================
--- a/u/net_bw.h
+++ /dev/null
@@ -1,39 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_bw.h
-
-int  BW_Init (void);
-void BW_Shutdown (void);
-void BW_Listen (qboolean state);
-int  BW_OpenSocket (int port);
-int  BW_CloseSocket (int socket);
-int  BW_Connect (int socket, struct qsockaddr *addr);
-int  BW_CheckNewConnections (void);
-int  BW_Read (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  BW_Write (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  BW_Broadcast (int socket, byte *buf, int len);
-char *BW_AddrToString (struct qsockaddr *addr);
-int  BW_StringToAddr (char *string, struct qsockaddr *addr);
-int  BW_GetSocketAddr (int socket, struct qsockaddr *addr);
-int  BW_GetNameFromAddr (struct qsockaddr *addr, char *name);
-int  BW_GetAddrFromName (char *name, struct qsockaddr *addr);
-int  BW_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2);
-int  BW_GetSocketPort (struct qsockaddr *addr);
-int  BW_SetSocketPort (struct qsockaddr *addr, int port);
--- a/u/net_comx.c
+++ /dev/null
@@ -1,1285 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_comx.c
-
-#include <dos.h>
-#include <dpmi.h>
-
-#define NUM_COM_PORTS	2
-
-#define ERR_TTY_LINE_STATUS		-1
-#define ERR_TTY_MODEM_STATUS	-2
-#define ERR_TTY_NODATA			-3
-
-#define QUEUESIZE	8192
-#define QUEUEMASK	(QUEUESIZE - 1)
-
-typedef struct
-{
-	volatile int  head;
-	volatile int  tail;
-	volatile byte data[QUEUESIZE];
-} queue;
-
-#define FULL(q)			(q.head == ((q.tail-1) & QUEUEMASK))
-#define EMPTY(q)		(q.tail == q.head)
-#define ENQUEUE(q,b)	(q.data[q.head] = b, q.head = (q.head + 1) & QUEUEMASK)
-#define DEQUEUE(q,b)	(b = q.data[q.tail], q.tail = (q.tail + 1) & QUEUEMASK)
-
-extern cvar_t	config_com_port;
-extern cvar_t	config_com_irq;
-extern cvar_t	config_com_baud;
-extern cvar_t	config_com_modem;
-extern cvar_t	config_modem_dialtype;
-extern cvar_t	config_modem_clear;
-extern cvar_t	config_modem_init;
-extern cvar_t	config_modem_hangup;
-
-extern int m_return_state;
-extern int m_state;
-extern qboolean m_return_onerror;
-extern char m_return_reason[32];
-
-// 8250, 16550 definitions
-#define TRANSMIT_HOLDING_REGISTER            0x00
-#define RECEIVE_BUFFER_REGISTER              0x00
-#define INTERRUPT_ENABLE_REGISTER            0x01
-#define   IER_RX_DATA_READY                  0x01
-#define   IER_TX_HOLDING_REGISTER_EMPTY      0x02
-#define   IER_LINE_STATUS                    0x04
-#define   IER_MODEM_STATUS                   0x08
-#define INTERRUPT_ID_REGISTER                0x02
-#define   IIR_MODEM_STATUS_INTERRUPT         0x00
-#define   IIR_TX_HOLDING_REGISTER_INTERRUPT  0x02
-#define   IIR_RX_DATA_READY_INTERRUPT        0x04
-#define   IIR_LINE_STATUS_INTERRUPT          0x06
-#define   IIR_FIFO_TIMEOUT                   0x0c
-#define   IIR_FIFO_ENABLED                   0xc0
-#define FIFO_CONTROL_REGISTER                0x02
-#define   FCR_FIFO_ENABLE                    0x01
-#define   FCR_RCVR_FIFO_RESET                0x02
-#define   FCR_XMIT_FIFO_RESET                0x04
-#define   FCR_TRIGGER_01                     0x00
-#define   FCR_TRIGGER_04                     0x40
-#define   FCR_TRIGGER_08                     0x80
-#define   FCR_TRIGGER_16                     0xc0
-#define LINE_CONTROL_REGISTER                0x03
-#define   LCR_DATA_BITS_5                    0x00
-#define   LCR_DATA_BITS_6                    0x01
-#define   LCR_DATA_BITS_7                    0x02
-#define   LCR_DATA_BITS_8                    0x03
-#define   LCR_STOP_BITS_1                    0x00
-#define   LCR_STOP_BITS_2                    0x04
-#define   LCR_PARITY_NONE                    0x00
-#define   LCR_PARITY_ODD                     0x08
-#define   LCR_PARITY_EVEN                    0x18
-#define   LCR_PARITY_MARK                    0x28
-#define   LCR_PARITY_SPACE                   0x38
-#define   LCR_SET_BREAK                      0x40
-#define   LCR_DLAB                           0x80
-#define MODEM_CONTROL_REGISTER               0x04
-#define   MCR_DTR                            0x01
-#define   MCR_RTS                            0x02
-#define   MCR_OUT1                           0x04
-#define   MCR_OUT2                           0x08
-#define   MCR_LOOPBACK                       0x10
-#define LINE_STATUS_REGISTER                 0x05
-#define   LSR_DATA_READY                     0x01
-#define   LSR_OVERRUN_ERROR                  0x02
-#define   LSR_PARITY_ERROR                   0x04
-#define   LSR_FRAMING_ERROR                  0x08
-#define   LSR_BREAK_DETECT                   0x10
-#define   LSR_TRANSMITTER_BUFFER_EMPTY       0x20
-#define   LSR_TRANSMITTER_EMPTY              0x40
-#define   LSR_FIFO_DIRTY                     0x80
-#define MODEM_STATUS_REGISTER                0x06
-#define   MSR_DELTA_CTS                      0x01
-#define   MSR_DELTA_DSR                      0x02
-#define   MSR_DELTA_RI                       0x04
-#define   MSR_DELTA_CD                       0x08
-#define   MSR_CTS                            0x10
-#define   MSR_DSR                            0x20
-#define   MSR_RI                             0x40
-#define   MSR_CD                             0x80
-#define DIVISOR_LATCH_LOW                    0x00
-#define DIVISOR_LATCH_HIGH                   0x01
-
-#define MODEM_STATUS_MASK	(MSR_CTS | MSR_DSR | MSR_CD)
-
-#define UART_AUTO	0
-#define UART_8250	1
-#define UART_16550	2
-
-static int ISA_uarts[]	= {0x3f8,0x2f8,0x3e8,0x2e8};
-static int ISA_IRQs[]	= {4,3,4,3};
-
-typedef struct ComPort_s
-{
-	struct ComPort_s		*next;
-	_go32_dpmi_seginfo		protectedModeInfo;
-	_go32_dpmi_seginfo		protectedModeSaveInfo;
-	int						uart;
-	volatile byte			modemStatus;
-	byte					modemStatusIgnore;
-	byte					lineStatus;
-	byte					bufferUsed;
-	qboolean				enabled;
-	volatile qboolean		statusUpdated;
-	qboolean				useModem;
-	qboolean				modemInitialized;
-	qboolean				modemRang;
-	qboolean				modemConnected;
-	queue					inputQueue;
-	queue					outputQueue;
-	char					clear[16];
-	char					startup[32];
-	char					shutdown[16];
-	char					buffer[128];
-	PollProcedure			poll;
-	double					timestamp;
-	byte					uartType;
-	byte					irq;
-	byte					baudBits;
-	byte					lineControl;
-	byte					portNumber;
-	char					dialType;
-	char					name[4];
-} ComPort;
-
-ComPort *portList = NULL;
-ComPort *handleToPort [NUM_COM_PORTS];
-
-static int Modem_Command(ComPort *p, char *commandString);
-static char *Modem_Response(ComPort *p);
-static void Modem_Hangup(ComPort *p);
-
-int TTY_Init(void);
-void TTY_Shutdown(void);
-int TTY_Open(int serialPortNumber);
-void TTY_Close(int handle);
-int TTY_ReadByte(int handle);
-int TTY_WriteByte(int handle, byte data);
-void TTY_Flush(int handle);
-int TTY_Connect(int handle, char *host);
-void TTY_Disconnect(int handle);
-qboolean TTY_CheckForConnection(int handle);
-qboolean TTY_IsEnabled(int serialPortNumber);
-qboolean TTY_IsModem(int serialPortNumber);
-qboolean TTY_OutputQueueIsEmpty(int handle);
-
-static void ISR_8250 (ComPort *p)
-{
-	byte	source = 0;
-	byte	b;
-
-	disable();
-
-	while((source = inportb (p->uart + INTERRUPT_ID_REGISTER) & 0x07) != 1)
-	{
-		switch (source)
-		{
-			case IIR_RX_DATA_READY_INTERRUPT:
-				b = inportb (p->uart + RECEIVE_BUFFER_REGISTER);
-				if (! FULL(p->inputQueue))
-				{
-					ENQUEUE (p->inputQueue, b);
-				}
-				else
-				{
-					p->lineStatus |= LSR_OVERRUN_ERROR;
-					p->statusUpdated = true;
-				}
-				break;
-
-			case IIR_TX_HOLDING_REGISTER_INTERRUPT:
-				if (! EMPTY(p->outputQueue))
-				{
-					DEQUEUE (p->outputQueue, b);
-					outportb (p->uart + TRANSMIT_HOLDING_REGISTER, b);
-				}
-				break;
-
-			case IIR_MODEM_STATUS_INTERRUPT:
-				p->modemStatus = (inportb (p->uart + MODEM_STATUS_REGISTER) & MODEM_STATUS_MASK) | p->modemStatusIgnore;
-				p->statusUpdated = true;
-				break;
-
-			case IIR_LINE_STATUS_INTERRUPT:
-				p->lineStatus = inportb (p->uart + LINE_STATUS_REGISTER);
-				p->statusUpdated = true;
-				break;
-		}
-		source = inportb (p->uart + INTERRUPT_ID_REGISTER) & 0x07;
-	}
-	outportb (0x20, 0x20);
-}
-
-static void COM1_ISR_8250 (void)
-{
-	ISR_8250 (handleToPort[0]);
-}
-
-static void COM2_ISR_8250 (void)
-{
-	ISR_8250 (handleToPort[1]);
-}
-
-
-
-static void ISR_16550 (ComPort *p)
-{
-	int		count;
-	byte	source;
-	byte	b;
-
-	disable();
-	while((source = inportb (p->uart + INTERRUPT_ID_REGISTER) & 0x07) != 1)
-	{
-		switch (source)
-		{
-			case IIR_RX_DATA_READY_INTERRUPT:
-				do
-				{
-					b = inportb (p->uart + RECEIVE_BUFFER_REGISTER);
-					if (!FULL(p->inputQueue))
-					{
-						ENQUEUE (p->inputQueue, b);
-					}
-					else
-					{
-						p->lineStatus |= LSR_OVERRUN_ERROR;
-						p->statusUpdated = true;
-					}
-				} while (inportb (p->uart + LINE_STATUS_REGISTER) & LSR_DATA_READY);
-				break;
-
-			case IIR_TX_HOLDING_REGISTER_INTERRUPT:
-				count = 16;
-				while ((! EMPTY(p->outputQueue)) && count--)
-				{
-					DEQUEUE (p->outputQueue, b);
-					outportb (p->uart + TRANSMIT_HOLDING_REGISTER, b);
-				}
-				break;
-
-			case IIR_MODEM_STATUS_INTERRUPT:
-				p->modemStatus = (inportb (p->uart + MODEM_STATUS_REGISTER) & MODEM_STATUS_MASK) | p->modemStatusIgnore;
-				p->statusUpdated = true;
-				break;
-
-			case IIR_LINE_STATUS_INTERRUPT:
-				p->lineStatus = inportb (p->uart + LINE_STATUS_REGISTER);
-				p->statusUpdated = true;
-				break;
-		}
-		source = inportb (p->uart + INTERRUPT_ID_REGISTER) & 0x07;
-	}
-
-	// check for lost IIR_TX_HOLDING_REGISTER_INTERRUPT on 16550a!
-	if (inportb (p->uart + LINE_STATUS_REGISTER ) & LSR_TRANSMITTER_EMPTY)
-	{
-		count = 16;
-		while ((! EMPTY(p->outputQueue)) && count--)
-		{
-			DEQUEUE (p->outputQueue, b);
-			outportb (p->uart + TRANSMIT_HOLDING_REGISTER, b);
-		}
-	}
-
-	outportb (0x20, 0x20);
-}
-
-static void COM1_ISR_16550 (void)
-{
-	ISR_16550 (handleToPort[0]);
-}
-
-static void COM2_ISR_16550 (void)
-{
-	ISR_16550 (handleToPort[1]);
-}
-
-
-void TTY_GetComPortConfig (int portNumber, int *port, int *irq, int *baud, qboolean *useModem)
-{
-	ComPort	*p;
-
-	p = handleToPort[portNumber];
-	*port = p->uart;
-	*irq = p->irq;
-	*baud = 115200 / p->baudBits;
-	*useModem = p->useModem;
-}
-
-void TTY_SetComPortConfig (int portNumber, int port, int irq, int baud, qboolean useModem)
-{
-	ComPort	*p;
-	float	temp;
-
-	if (useModem)
-	{
-		if (baud == 14400)
-			baud = 19200;
-		if (baud == 28800)
-			baud = 38400;
-	}
-
-	p = handleToPort[portNumber];
-	p->uart = port;
-	p->irq = irq;
-	p->baudBits = 115200 / baud;
-	p->useModem = useModem;
-
-	if (useModem)
-		temp = 1.0;
-	else
-		temp = 0.0;
-
-	Cvar_SetValue ("_config_com_port", (float)port);
-	Cvar_SetValue ("_config_com_irq", (float)irq);
-	Cvar_SetValue ("_config_com_baud", (float)baud);
-	Cvar_SetValue ("_config_com_modem", temp);
-}
-
-void TTY_GetModemConfig (int portNumber, char *dialType, char *clear, char *init, char *hangup)
-{
-	ComPort	*p;
-
-	p = handleToPort[portNumber];
-	*dialType = p->dialType;
-	Q_strcpy(clear, p->clear);
-	Q_strcpy(init, p->startup);
-	Q_strcpy(hangup, p->shutdown);
-}
-
-void TTY_SetModemConfig (int portNumber, char *dialType, char *clear, char *init, char *hangup)
-{
-	ComPort	*p;
-
-	p = handleToPort[portNumber];
-	p->dialType = dialType[0];
-	Q_strcpy(p->clear, clear);
-	Q_strcpy(p->startup, init);
-	Q_strcpy(p->shutdown, hangup);
-
-	p->modemInitialized = false;
-
-	Cvar_Set ("_config_modem_dialtype", dialType);
-	Cvar_Set ("_config_modem_clear", clear);
-	Cvar_Set ("_config_modem_init", init);
-	Cvar_Set ("_config_modem_hangup", hangup);
-}
-
-
-static void ResetComPortConfig (ComPort *p)
-{
-	p->useModem = false;
-	p->uartType = UART_AUTO;
-	p->uart = ISA_uarts[p->portNumber];
-	p->irq = ISA_IRQs[p->portNumber];
-	p->modemStatusIgnore = MSR_CD | MSR_CTS | MSR_DSR;
-	p->baudBits = 115200 / 57600;
-	p->lineControl = LCR_DATA_BITS_8 | LCR_STOP_BITS_1 | LCR_PARITY_NONE;
-	Q_strcpy(p->clear, "ATZ");
-	Q_strcpy(p->startup, "");
-	Q_strcpy(p->shutdown, "AT H");
-	p->modemRang = false;
-	p->modemConnected = false;
-	p->statusUpdated = false;
-	p->outputQueue.head = p->outputQueue.tail = 0;
-	p->inputQueue.head = p->inputQueue.tail = 0;
-}
-
-
-static void ComPort_Enable(ComPort *p)
-{
-	void	(*isr)(void);
-	int		n;
-	byte	b;
-
-	if (p->enabled)
-	{
-		Con_Printf("Already enabled\n");
-		return;
-	}
-
-	// disable all UART interrupts
-	outportb (p->uart + INTERRUPT_ENABLE_REGISTER, 0);
-
-	// clear out any buffered uncoming data
-	while((inportb (p->uart + LINE_STATUS_REGISTER)) & LSR_DATA_READY)
-		inportb (p->uart + RECEIVE_BUFFER_REGISTER);
-
-	// get the current line and modem status
-	p->modemStatus = (inportb (p->uart + MODEM_STATUS_REGISTER) & MODEM_STATUS_MASK) | p->modemStatusIgnore;
-	p->lineStatus = inportb (p->uart + LINE_STATUS_REGISTER);
-
-	// clear any UART interrupts
-	do
-	{
-		n = inportb (p->uart + INTERRUPT_ID_REGISTER) & 7;
-		if (n == IIR_RX_DATA_READY_INTERRUPT)
-			inportb (p->uart + RECEIVE_BUFFER_REGISTER);
-	} while (!(n & 1));
-
-	if (p->uartType == UART_AUTO)
-	{
-		outportb (p->uart + FIFO_CONTROL_REGISTER, FCR_FIFO_ENABLE);
-		b = inportb (p->uart + INTERRUPT_ID_REGISTER);
-		if ((b & IIR_FIFO_ENABLED) == IIR_FIFO_ENABLED)
-			p->uartType = UART_16550;
-		else
-			p->uartType = UART_8250;
-	}
-
-	// save the old interrupt handler
-	_go32_dpmi_get_protected_mode_interrupt_vector(p->irq + 8, &p->protectedModeSaveInfo);
-
-	if (p->uartType == UART_8250)
-	{
-		outportb (p->uart + FIFO_CONTROL_REGISTER, 0);
-		if (p == handleToPort[0])
-			isr = COM1_ISR_8250;
-		else
-			isr = COM2_ISR_8250;
-	}
-	else
-	{
-		outportb (p->uart + FIFO_CONTROL_REGISTER, FCR_FIFO_ENABLE | FCR_RCVR_FIFO_RESET | FCR_XMIT_FIFO_RESET | FCR_TRIGGER_08);
-		if (p == handleToPort[0])
-			isr = COM1_ISR_16550;
-		else
-			isr = COM2_ISR_16550;
-	}
-
-	p->protectedModeInfo.pm_offset = (int)isr;
-
-	n = _go32_dpmi_allocate_iret_wrapper(&p->protectedModeInfo);
-	if (n)
-	{
-		Con_Printf("serial: protected mode callback allocation failed\n");
-		return;
-	}
-
-	// disable interrupts at the processor
-	disable();
-
-	// install our interrupt handlers now
-	_go32_dpmi_set_protected_mode_interrupt_vector(p->irq + 8, &p->protectedModeInfo);
-
-	// enable our interrupt at the PIC
-	outportb (0x21, inportb (0x21) & ~(1<<p->irq));
-
-	// enable interrupts at the processor
-	enable();
-
-	// enable interrupts at the PIC
-	outportb (0x20, 0xc2);
-
-	// set baud rate & line control
-	outportb (p->uart + LINE_CONTROL_REGISTER, LCR_DLAB | p->lineControl);
-	outportb (p->uart, p->baudBits);
-	outportb (p->uart + 1, 0);
-	outportb (p->uart + LINE_CONTROL_REGISTER, p->lineControl);
-
-	// set modem control register & enable uart interrupt generation
-	outportb(p->uart + MODEM_CONTROL_REGISTER, MCR_OUT2 | MCR_RTS | MCR_DTR);
-
-	// enable the individual interrupts at the uart
-	outportb (p->uart + INTERRUPT_ENABLE_REGISTER, IER_RX_DATA_READY | IER_TX_HOLDING_REGISTER_EMPTY | IER_LINE_STATUS | IER_MODEM_STATUS);
-
-	p->enabled = true;
-}
-
-
-static void ComPort_Disable(ComPort *p)
-{
-	if (!p->enabled)
-	{
-		Con_Printf("Already disabled\n");
-		return;
-	}
-
-	// disable interrupts at the uart
-	outportb (p->uart + INTERRUPT_ENABLE_REGISTER, 0);
-
-	// disable our interrupt at the PIC
-	outportb (0x21, inportb (0x21) | (1<<p->irq));
-
-	// disable interrupts at the processor
-	disable();
-
-	// restore the old interrupt handler
-	_go32_dpmi_set_protected_mode_interrupt_vector(p->irq + 8, &p->protectedModeSaveInfo);
-	_go32_dpmi_free_iret_wrapper(&p->protectedModeInfo);
-
-	// enable interrupts at the processor
-	enable();
-
-	p->enabled = false;
-}
-
-
-static int CheckStatus (ComPort *p)
-{
-	int		ret = 0;
-
-	if (p->statusUpdated)
-	{
-		p->statusUpdated = false;
-
-		if (p->lineStatus & (LSR_OVERRUN_ERROR | LSR_PARITY_ERROR | LSR_FRAMING_ERROR | LSR_BREAK_DETECT))
-		{
-			if (p->lineStatus & LSR_OVERRUN_ERROR)
-				Con_DPrintf ("Serial overrun error\n");
-			if (p->lineStatus & LSR_PARITY_ERROR)
-				Con_DPrintf ("Serial parity error\n");
-			if (p->lineStatus & LSR_FRAMING_ERROR)
-				Con_DPrintf ("Serial framing error\n");
-			if (p->lineStatus & LSR_BREAK_DETECT)
-				Con_DPrintf ("Serial break detect\n");
-			ret = ERR_TTY_LINE_STATUS;
-		}
-
-		if ((p->modemStatus & MODEM_STATUS_MASK) != MODEM_STATUS_MASK)
-		{
-			if (!(p->modemStatus & MSR_CTS))
-				Con_Printf ("Serial lost CTS\n");
-			if (!(p->modemStatus & MSR_DSR))
-				Con_Printf ("Serial lost DSR\n");
-			if (!(p->modemStatus & MSR_CD))
-				Con_Printf ("Serial lost Carrier\n");
-			ret = ERR_TTY_MODEM_STATUS;
-		}
-	}
-
-	return ret;
-}
-
-
-static void Modem_Init(ComPort *p)
-{
-	double	start;
-	char	*response;
-
-	Con_Printf ("Initializing modem...\n");
-
-	// write 0 to MCR, wait 1/2 sec, then write the real value back again
-	// I got this from the guys at head-to-head who say it's necessary.
-	outportb(p->uart + MODEM_CONTROL_REGISTER, 0);
-	start = Sys_FloatTime();
-	while ((Sys_FloatTime() - start) < 0.5)
-		;
-	outportb(p->uart + MODEM_CONTROL_REGISTER, MCR_OUT2 | MCR_RTS | MCR_DTR);
-	start = Sys_FloatTime();
-	while ((Sys_FloatTime() - start) < 0.25)
-		;
-
-	if (*p->clear)
-	{
-		Modem_Command (p, p->clear);
-		start = Sys_FloatTime();
-		while(1)
-		{
-			if ((Sys_FloatTime() - start) > 3.0)
-			{
-				Con_Printf("No response - clear failed\n");
-				p->enabled = false;
-				goto failed;
-			}
-			response = Modem_Response(p);
-			if (!response)
-				continue;
-			if (Q_strncmp(response, "OK", 2) == 0)
-				break;
-			if (Q_strncmp(response, "ERROR", 5) == 0)
-			{
-				p->enabled = false;
-				goto failed;
-			}
-		}
-	}
-
-	if (*p->startup)
-	{
-		Modem_Command (p, p->startup);
-		start = Sys_FloatTime();
-		while(1)
-		{
-			if ((Sys_FloatTime() - start) > 3.0)
-			{
-				Con_Printf("No response - init failed\n");
-				p->enabled = false;
-				goto failed;
-			}
-			response = Modem_Response(p);
-			if (!response)
-				continue;
-			if (Q_strncmp(response, "OK", 2) == 0)
-				break;
-			if (Q_strncmp(response, "ERROR", 5) == 0)
-			{
-				p->enabled = false;
-				goto failed;
-			}
-		}
-	}
-
-	p->modemInitialized = true;
-	return;
-
-failed:
-	if (m_return_onerror)
-	{
-		key_dest = key_menu;
-		m_state = m_return_state;
-		m_return_onerror = false;
-		Q_strcpy(m_return_reason, "Initialization Failed");
-	}
-	return;
-}
-
-
-void TTY_Enable(int handle)
-{
-	ComPort	*p;
-
-	p = handleToPort [handle];
-	if (p->enabled)
-		return;
-
-	ComPort_Enable(p);
-
-	if (p->useModem && !p->modemInitialized)
-		Modem_Init (p);
-}
-
-
-int TTY_Open(int serialPortNumber)
-{
-	return serialPortNumber;
-}
-
-
-void TTY_Close(int handle)
-{
-	ComPort	*p;
-	double		startTime;
-
-	p = handleToPort [handle];
-
-	startTime = Sys_FloatTime();
-	while ((Sys_FloatTime() - startTime) < 1.0)
-		if (EMPTY(p->outputQueue))
-			break;
-
-	if (p->useModem)
-	{
-		if (p->modemConnected)
-			Modem_Hangup(p);
-	}
-}
-
-
-int TTY_ReadByte(int handle)
-{
-	int		ret;
-	ComPort	*p;
-
-	p = handleToPort [handle];
-
-	if ((ret = CheckStatus (p)) != 0)
-		return ret;
-	
-	if (EMPTY (p->inputQueue))
-		return ERR_TTY_NODATA;
-
-	DEQUEUE (p->inputQueue, ret);
-	return (ret & 0xff);
-}
-
-
-int TTY_WriteByte(int handle, byte data)
-{
-	ComPort	*p;
-
-	p = handleToPort [handle];
-	if (FULL(p->outputQueue))
-		return -1;
-
-	ENQUEUE (p->outputQueue, data);
-	return 0;
-}
-
-
-void TTY_Flush(int handle)
-{
-	byte b;
-	ComPort	*p;
-
-	p = handleToPort [handle];
-
-	if (inportb (p->uart + LINE_STATUS_REGISTER ) & LSR_TRANSMITTER_EMPTY)
-	{
-		DEQUEUE (p->outputQueue, b);
-		outportb(p->uart, b);
-	}
-}
-
-
-int TTY_Connect(int handle, char *host)
-{
-	double	start;
-	ComPort	*p;
-	char	*response = NULL;
-	keydest_t	save_key_dest;
-	byte	dialstring[64];
-	byte	b;
-
-	p = handleToPort[handle];
-
-	if ((p->modemStatus & MODEM_STATUS_MASK) != MODEM_STATUS_MASK)
-	{
-		Con_Printf ("Serial: line not ready (");
-		if ((p->modemStatus & MSR_CTS) == 0)
-			Con_Printf(" CTS");
-		if ((p->modemStatus & MSR_DSR) == 0)
-			Con_Printf(" DSR");
-		if ((p->modemStatus & MSR_CD) == 0)
-			Con_Printf(" CD");
-		Con_Printf(" )");
-		return -1;
-	}
-
-	// discard any scraps in the input buffer
-	while (! EMPTY (p->inputQueue))
-		DEQUEUE (p->inputQueue, b);
-
-	CheckStatus (p);
-
-	if (p->useModem)
-	{
-		save_key_dest = key_dest;
-		key_dest = key_console;
-		key_count = -2;
-
-		Con_Printf ("Dialing...\n");
-		sprintf(dialstring, "AT D%c %s\r", p->dialType, host);
-		Modem_Command (p, dialstring);
-		start = Sys_FloatTime();
-		while(1)
-		{
-			if ((Sys_FloatTime() - start) > 60.0)
-			{
-				Con_Printf("Dialing failure!\n");
-				break;
-			}
-
-			Sys_SendKeyEvents ();
-			if (key_count == 0)
-			{
-				if (key_lastpress != K_ESCAPE)
-				{
-					key_count = -2;
-					continue;
-				}
-				Con_Printf("Aborting...\n");
-				while ((Sys_FloatTime() - start) < 5.0)
-					;
-				disable();
-				p->outputQueue.head = p->outputQueue.tail = 0;
-				p->inputQueue.head = p->inputQueue.tail = 0;
-				outportb(p->uart + MODEM_CONTROL_REGISTER, inportb(p->uart + MODEM_CONTROL_REGISTER) & ~MCR_DTR);
-				enable();
-				start = Sys_FloatTime();
-				while ((Sys_FloatTime() - start) < 0.75)
-					;
-				outportb(p->uart + MODEM_CONTROL_REGISTER, inportb(p->uart + MODEM_CONTROL_REGISTER) | MCR_DTR);
-				response = "Aborted";
-				break;
-			}
-
-			response = Modem_Response(p);
-			if (!response)
-				continue;
-			if (Q_strncmp(response, "CONNECT", 7) == 0)
-			{
-				disable();
-				p->modemRang = true;
-				p->modemConnected = true;
-				p->outputQueue.head = p->outputQueue.tail = 0;
-				p->inputQueue.head = p->inputQueue.tail = 0;
-				enable();
-				key_dest = save_key_dest;
-				key_count = 0;
-				m_return_onerror = false;
-				return 0;
-			}
-			if (Q_strncmp(response, "NO CARRIER", 10) == 0)
-				break;
-			if (Q_strncmp(response, "NO DIALTONE", 11) == 0)
-				break;
-			if (Q_strncmp(response, "NO DIAL TONE", 12) == 0)
-				break;
-			if (Q_strncmp(response, "NO ANSWER", 9) == 0)
-				break;
-			if (Q_strncmp(response, "BUSY", 4) == 0)
-				break;
-			if (Q_strncmp(response, "ERROR", 5) == 0)
-				break;
-		}
-		key_dest = save_key_dest;
-		key_count = 0;
-		if (m_return_onerror)
-		{
-			key_dest = key_menu;
-			m_state = m_return_state;
-			m_return_onerror = false;
-			Q_strncpy(m_return_reason, response, 31);
-		}
-		return -1;
-	}
-	m_return_onerror = false;
-	return 0;
-}
-
-
-void TTY_Disconnect(int handle)
-{
-	ComPort *p;
-
-	p = handleToPort[handle];
-
-	if (p->useModem && p->modemConnected)
-		Modem_Hangup(p);
-}
-
-
-qboolean TTY_CheckForConnection(int handle)
-{
-	ComPort	*p;
-
-	p = handleToPort[handle];
-
-	CheckStatus (p);
-
-	if (p->useModem)
-	{
-		if (!p->modemRang)
-		{
-			if (!Modem_Response(p))
-				return false;
-
-			if (Q_strncmp(p->buffer, "RING", 4) == 0)
-			{
-				Modem_Command (p, "ATA");
-				p->modemRang = true;
-				p->timestamp = net_time;
-			}
-			return false;
-		}
-		if (!p->modemConnected)
-		{
-			if ((net_time - p->timestamp) > 35.0)
-			{
-				Con_Printf("Unable to establish modem connection\n");
-				p->modemRang = false;
-				return false;
-			}
-
-			if (!Modem_Response(p))
-				return false;
-
-			if (Q_strncmp (p->buffer, "CONNECT", 7) != 0)
-				return false;
-
-			disable();
-			p->modemConnected = true;
-			p->outputQueue.head = p->outputQueue.tail = 0;
-			p->inputQueue.head = p->inputQueue.tail = 0;
-			enable();
-			Con_Printf("Modem Connect\n");
-			return true;
-		}
-		return true;
-	}
-
-	// direct connect case
-	if (EMPTY (p->inputQueue))
-		return false;
-	return true;
-}
-
-
-qboolean TTY_IsEnabled(int serialPortNumber)
-{
-	return handleToPort[serialPortNumber]->enabled;
-}
-
-
-qboolean TTY_IsModem(int serialPortNumber)
-{
-	return handleToPort[serialPortNumber]->useModem;
-}
-
-
-qboolean TTY_OutputQueueIsEmpty(int handle)
-{
-	return EMPTY(handleToPort[handle]->outputQueue);
-}
-
-
-void Com_f (void)
-{
-	ComPort	*p;
-	int		portNumber;
-	int		i;
-	int		n;
-
-	// first, determine which port they're messing with
-	portNumber = Q_atoi(Cmd_Argv (0) + 3) - 1;
-	if (portNumber > 1)
-		return;
-	p = handleToPort[portNumber];
-
-	if (Cmd_Argc() == 1)
-	{
-		Con_Printf("Settings for COM%i\n", portNumber + 1);
-		Con_Printf("enabled:   %s\n", p->enabled ? "true" : "false");
-		Con_Printf("uart:      ");
-		if (p->uartType == UART_AUTO)
-			Con_Printf("auto\n");
-		else if (p->uartType == UART_8250)
-			Con_Printf("8250\n");
-		else
-			Con_Printf("16550\n");
-		Con_Printf("port:      %x\n", p->uart);
-		Con_Printf("irq:       %i\n", p->irq);
-		Con_Printf("baud:      %i\n", 115200 / p->baudBits);	
-		Con_Printf("CTS:       %s\n", (p->modemStatusIgnore & MSR_CTS) ? "ignored" : "honored");
-		Con_Printf("DSR:       %s\n", (p->modemStatusIgnore & MSR_DSR) ? "ignored" : "honored");
-		Con_Printf("CD:        %s\n", (p->modemStatusIgnore & MSR_CD) ? "ignored" : "honored");
-		if (p->useModem)
-		{
-			Con_Printf("type:      Modem\n");
-			Con_Printf("clear:     %s\n", p->clear);
-			Con_Printf("startup:   %s\n", p->startup);
-			Con_Printf("shutdown:  %s\n", p->shutdown);
-		}
-		else
-			Con_Printf("type:      Direct connect\n");
-
-		return;
-	}
-
-
-	if (Cmd_CheckParm ("disable"))
-	{
-		if (p->enabled)
-			ComPort_Disable(p);
-		p->modemInitialized = false;
-		return;
-	}
-
-	if (Cmd_CheckParm ("reset"))
-	{
-		ComPort_Disable(p);
-		ResetComPortConfig (p);
-		return;
-	}
-
-	if ((i = Cmd_CheckParm ("port")) != 0)
-	{
-		if (p->enabled)
-			{
-				Con_Printf("COM port must be disabled to change port\n");
-				return;
-			}
-		p->uart = Q_atoi (Cmd_Argv (i+1));
-	}
-
-	if ((i = Cmd_CheckParm ("irq")) != 0)
-	{
-		if (p->enabled)
-			{
-				Con_Printf("COM port must be disabled to change irq\n");
-				return;
-			}
-		p->irq = Q_atoi (Cmd_Argv (i+1));
-	}
-
-	if ((i = Cmd_CheckParm ("baud")) != 0)
-	{
-		if (p->enabled)
-			{
-				Con_Printf("COM port must be disabled to change baud\n");
-				return;
-			}
-		n = Q_atoi (Cmd_Argv (i+1));
-		if (n == 0)
-			Con_Printf("Invalid baud rate specified\n");
-		else
-			p->baudBits = 115200 / n;
-	}
-
-	if (Cmd_CheckParm ("8250"))
-	{
-		if (p->enabled)
-			{
-				Con_Printf("COM port must be disabled to change uart\n");
-				return;
-			}
-		p->uartType = UART_8250;
-		}
-	if (Cmd_CheckParm ("16550"))
-	{
-		if (p->enabled)
-			{
-				Con_Printf("COM port must be disabled to change uart\n");
-				return;
-			}
-		p->uartType = UART_16550;
-	}
-	if (Cmd_CheckParm ("auto"))
-	{
-		if (p->enabled)
-			{
-				Con_Printf("COM port must be disabled to change uart\n");
-				return;
-			}
-		p->uartType = UART_AUTO;
-	}
-
-	if (Cmd_CheckParm ("pulse"))
-		p->dialType = 'P';
-	if (Cmd_CheckParm ("tone"))
-		p->dialType = 'T';
-
-	if (Cmd_CheckParm ("direct"))
-		p->useModem = false;
-	if (Cmd_CheckParm ("modem"))
-		p->useModem = true;
-
-	if ((i = Cmd_CheckParm ("clear")) != 0)
-	{
-		Q_strncpy (p->clear, Cmd_Argv (i+1), 16);
-	}
-
-	if ((i = Cmd_CheckParm ("startup")) != 0)
-	{
-		Q_strncpy (p->startup, Cmd_Argv (i+1), 32);
-		p->modemInitialized = false;
-	}
-
-	if ((i = Cmd_CheckParm ("shutdown")) != 0)
-	{
-		Q_strncpy (p->shutdown, Cmd_Argv (i+1), 16);
-	}
-
-	if (Cmd_CheckParm ("-cts"))
-	{
-		p->modemStatusIgnore |= MSR_CTS;
-		p->modemStatus |= MSR_CTS;
-	}
-
-	if (Cmd_CheckParm ("+cts"))
-	{
-		p->modemStatusIgnore &= (~MSR_CTS);
-		p->modemStatus = (inportb (p->uart + MODEM_STATUS_REGISTER) & MODEM_STATUS_MASK) | p->modemStatusIgnore;
-	}
-
-	if (Cmd_CheckParm ("-dsr"))
-	{
-		p->modemStatusIgnore |= MSR_DSR;
-		p->modemStatus |= MSR_DSR;
-	}
-
-	if (Cmd_CheckParm ("+dsr"))
-	{
-		p->modemStatusIgnore &= (~MSR_DSR);
-		p->modemStatus = (inportb (p->uart + MODEM_STATUS_REGISTER) & MODEM_STATUS_MASK) | p->modemStatusIgnore;
-	}
-
-	if (Cmd_CheckParm ("-cd"))
-	{
-		p->modemStatusIgnore |= MSR_CD;
-		p->modemStatus |= MSR_CD;
-	}
-
-	if (Cmd_CheckParm ("+cd"))
-	{
-		p->modemStatusIgnore &= (~MSR_CD);
-		p->modemStatus = (inportb (p->uart + MODEM_STATUS_REGISTER) & MODEM_STATUS_MASK) | p->modemStatusIgnore;
-	}
-
-	if (Cmd_CheckParm ("enable"))
-	{
-		if (!p->enabled)
-			ComPort_Enable(p);
-		if (p->useModem && !p->modemInitialized)
-			Modem_Init (p);
-	}
-}
-
-
-int TTY_Init(void)
-{
-	int		n;
-	ComPort *p;
-
-	for (n = 0; n < NUM_COM_PORTS; n++)
-	{
-		p = (ComPort *)Hunk_AllocName(sizeof(ComPort), "comport");
-		if (p == NULL)
-			Sys_Error("Hunk alloc failed for com port\n");
-		p->next = portList;
-		portList = p;
-		handleToPort[n] = p;
-		p->portNumber = n;
-		p->dialType = 'T';
-		sprintf(p->name, "com%u", n+1);
-		Cmd_AddCommand (p->name, Com_f);
-		ResetComPortConfig (p);
-	}
-
-	GetComPortConfig = TTY_GetComPortConfig;
-	SetComPortConfig = TTY_SetComPortConfig;
-	GetModemConfig = TTY_GetModemConfig;
-	SetModemConfig = TTY_SetModemConfig;
-
-	return 0;
-}
-
-
-void TTY_Shutdown(void)
-{
-	int		n;
-	ComPort *p;
-
-	for (n = 0; n < NUM_COM_PORTS; n++)
-	{
-		p = handleToPort[n];
-		if (p->enabled)
-		{
-			while (p->modemConnected)
-				NET_Poll();
-			ComPort_Disable (p);
-		}
-	}
-}
-
-
-static int Modem_Command(ComPort *p, char *commandString)
-{
-	byte	b;
-
-	if (CheckStatus (p))
-		return -1;
-
-	disable();
-	p->outputQueue.head = p->outputQueue.tail = 0;
-	p->inputQueue.head = p->inputQueue.tail = 0;
-	enable();
-	p->bufferUsed = 0;
-
-	while (*commandString)
-		ENQUEUE (p->outputQueue, *commandString++);
-	ENQUEUE (p->outputQueue, '\r');
-
-	// get the transmit rolling
-	DEQUEUE (p->outputQueue, b);
-	outportb(p->uart, b);
-
-	return 0;
-}
-
-
-static char *Modem_Response(ComPort *p)
-{
-	byte	b;
-
-	if (CheckStatus (p))
-		return NULL;
-
-	while (! EMPTY(p->inputQueue))
-	{
-		DEQUEUE (p->inputQueue, b);
-
-		if (p->bufferUsed == (sizeof(p->buffer) - 1))
-			b = '\r';
-
-		if (b == '\r' && p->bufferUsed)
-		{
-			p->buffer[p->bufferUsed] = 0;
-			Con_Printf("%s\n", p->buffer);
-			SCR_UpdateScreen ();
-			p->bufferUsed = 0;
-			return p->buffer;
-		}
-
-		if (b < ' ' || b > 'z')
-			continue;
-		p->buffer[p->bufferUsed] = b;
-		p->bufferUsed++;
-	}
-
-	return NULL;
-}
-
-
-static void Modem_Hangup2(ComPort *p);
-static void Modem_Hangup3(ComPort *p);
-static void Modem_Hangup4(ComPort *p);
-
-static void Modem_Hangup(ComPort *p)
-{
-	Con_Printf("Hanging up modem...\n");
-	disable();
-	p->modemRang = false;
-	p->outputQueue.head = p->outputQueue.tail = 0;
-	p->inputQueue.head = p->inputQueue.tail = 0;
-	outportb(p->uart + MODEM_CONTROL_REGISTER, inportb(p->uart + MODEM_CONTROL_REGISTER) & ~MCR_DTR);
-	enable();
-	p->poll.procedure = Modem_Hangup2;
-	p->poll.arg = p;
-	SchedulePollProcedure(&p->poll, 1.5);
-}
-
-static void Modem_Hangup2(ComPort *p)
-{
-	outportb(p->uart + MODEM_CONTROL_REGISTER, inportb(p->uart + MODEM_CONTROL_REGISTER) | MCR_DTR);
-	Modem_Command(p, "+++");
-	p->poll.procedure = Modem_Hangup3;
-	SchedulePollProcedure(&p->poll, 1.5);
-}
-
-static void Modem_Hangup3(ComPort *p)
-{
-	Modem_Command(p, p->shutdown);
-	p->poll.procedure = Modem_Hangup4;
-	SchedulePollProcedure(&p->poll, 1.5);
-}
-
-static void Modem_Hangup4(ComPort *p)
-{
-	Modem_Response(p);
-	Con_Printf("Hangup complete\n");
-	p->modemConnected = false;
-}
--- a/u/net_dos.c
+++ /dev/null
@@ -1,162 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-
-#include "net_loop.h"
-#include "net_dgrm.h"
-#include "net_ser.h"
-
-net_driver_t net_drivers[MAX_NET_DRIVERS] =
-{
-	{
-	"Loopback",
-	false,
-	Loop_Init,
-	Loop_Listen,
-	Loop_SearchForHosts,
-	Loop_Connect,
-	Loop_CheckNewConnections,
-	Loop_GetMessage,
-	Loop_SendMessage,
-	Loop_SendUnreliableMessage,
-	Loop_CanSendMessage,
-	Loop_CanSendUnreliableMessage,
-	Loop_Close,
-	Loop_Shutdown
-	}
-	,
-	{
-	"Datagram",
-	false,
-	Datagram_Init,
-	Datagram_Listen,
-	Datagram_SearchForHosts,
-	Datagram_Connect,
-	Datagram_CheckNewConnections,
-	Datagram_GetMessage,
-	Datagram_SendMessage,
-	Datagram_SendUnreliableMessage,
-	Datagram_CanSendMessage,
-	Datagram_CanSendUnreliableMessage,
-	Datagram_Close,
-	Datagram_Shutdown
-	}
-	,
-	{
-	"Serial",
-	false,
-	Serial_Init,
-	Serial_Listen,
-	Serial_SearchForHosts,
-	Serial_Connect,
-	Serial_CheckNewConnections,
-	Serial_GetMessage,
-	Serial_SendMessage,
-	Serial_SendUnreliableMessage,
-	Serial_CanSendMessage,
-	Serial_CanSendUnreliableMessage,
-	Serial_Close,
-	Serial_Shutdown
-	}
-};
-
-int net_numdrivers = 3;
-
-
-#include "net_bw.h"
-#include "net_ipx.h"
-#include "net_mp.h"
-
-net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
-{
-	{
-	"Beame & Whiteside TCP/IP",
-	false,
-	0,
-	BW_Init,
-	BW_Shutdown,
-	BW_Listen,
-	BW_OpenSocket,
-	BW_CloseSocket,
-	BW_Connect,
-	BW_CheckNewConnections,
-	BW_Read,
-	BW_Write,
-	BW_Broadcast,
-	BW_AddrToString,
-	BW_StringToAddr,
-	BW_GetSocketAddr,
-	BW_GetNameFromAddr,
-	BW_GetAddrFromName,
-	BW_AddrCompare,
-	BW_GetSocketPort,
-	BW_SetSocketPort
-	}
-,
-	{
-	"IPX",
-	false,
-	0,
-	IPX_Init,
-	IPX_Shutdown,
-	IPX_Listen,
-	IPX_OpenSocket,
-	IPX_CloseSocket,
-	IPX_Connect,
-	IPX_CheckNewConnections,
-	IPX_Read,
-	IPX_Write,
-	IPX_Broadcast,
-	IPX_AddrToString,
-	IPX_StringToAddr,
-	IPX_GetSocketAddr,
-	IPX_GetNameFromAddr,
-	IPX_GetAddrFromName,
-	IPX_AddrCompare,
-	IPX_GetSocketPort,
-	IPX_SetSocketPort
-	}
-,
-	{
-	"Win95 TCP/IP",
-	false,
-	0,
-	MPATH_Init,
-	MPATH_Shutdown,
-	MPATH_Listen,
-	MPATH_OpenSocket,
-	MPATH_CloseSocket,
-	MPATH_Connect,
-	MPATH_CheckNewConnections,
-	MPATH_Read,
-	MPATH_Write,
-	MPATH_Broadcast,
-	MPATH_AddrToString,
-	MPATH_StringToAddr,
-	MPATH_GetSocketAddr,
-	MPATH_GetNameFromAddr,
-	MPATH_GetAddrFromName,
-	MPATH_AddrCompare,
-	MPATH_GetSocketPort,
-	MPATH_SetSocketPort
-	}
-};
-
-int net_numlandrivers = 3;
--- a/u/net_ipx.c
+++ /dev/null
@@ -1,706 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_ipx.c
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dpmi.h>
-
-#include "quakedef.h"
-#include "dosisms.h"
-#include "net_ipx.h"
-
-#define	EIO		 		5	/* I/O error */
-
-#define AF_NETWARE 		64
-
-#define IPX_OPEN					0
-#define IPX_CLOSE					1
-#define IPX_GETROUTE				2
-#define IPX_SEND					3
-#define IPX_LISTEN					4
-#define IPX_SCHEDULEEVENT			5
-#define IPX_CANCEL					6
-#define IPX_SCHEDULESPECIALEVENT	7
-#define IPX_GETINTERVALMARKER		8
-#define IPX_GETADDRESS				9
-#define IPX_RELINQUISH				10
-
-#define PTYPE_UNKNOWN				0
-#define PTYPE_RIP					1
-#define PTYPE_ECHO					2
-#define PTYPE_ERROR					3
-#define PTYPE_IPX					4
-#define PTYPE_SPX					5
-
-#pragma pack(1)
-
-typedef struct
-{
-	byte	network[4];
-	byte	node[6];
-	short	socket;
-} IPXaddr;
-
-struct sockaddr_ipx
-{
-    short			sipx_family;
-	IPXaddr			sipx_addr;
-    char			sipx_zero[2];
-};
-#define sipx_port sipx_addr.socket
-
-typedef struct
-{
-	short			checkSum;
-	short			length;
-	byte			transportControl;
-	byte			type;
-	IPXaddr			destination;
-	IPXaddr			source;
-} IPXheader;
-
-typedef struct ECBStructure
-{
-	struct ECBStructure *link;
-	unsigned short	ESR_off;
-	unsigned short	ESR_seg;
-	byte	inUse;
-	byte	completionCode;
-	short	socket;
-	byte	IPXWorkspace[4];
-	byte	driverWorkspace[12];
-	byte	immediateAddress[6];
-	short	fragCount;
-	short	fragOff;
-	short	fragSeg;
-	short	fragSize;
-} ECB;
-
-#pragma pack()
-
-typedef struct
-{
-	ECB			ecb;
-	IPXheader	header;
-	int			sequence;
-	char		data[NET_DATAGRAMSIZE];
-} ipx_lowmem_buffer_t;
-
-#define LOWMEMSIZE		(100 * 1024)
-#define LOWMEMSAVE		256
-#define IPXBUFFERS		((LOWMEMSIZE - LOWMEMSAVE)/ sizeof(ipx_lowmem_buffer_t))
-#define IPXSOCKBUFFERS	5
-#define IPXSOCKETS		(IPXBUFFERS / IPXSOCKBUFFERS)
-
-// each socket's socketbuffer 0 is used for sending, the others for listening
-
-typedef struct
-{
-	char				reserved[LOWMEMSAVE];
-	ipx_lowmem_buffer_t	socketbuffer[IPXSOCKETS][IPXSOCKBUFFERS];
-} ipx_lowmem_area_t;
-
-
-static int ipxsocket[IPXSOCKETS];
-static ECB *readlist[IPXSOCKETS];
-static int sequence[IPXSOCKETS];
-static int handlesInUse;
-static ipx_lowmem_area_t *lma;
-static char *lowmem_buffer;
-static int lowmem_bufseg;
-static int lowmem_bufoff;
-static unsigned short ipx_cs;
-static unsigned short ipx_ip;
-static int net_acceptsocket = -1;
-static int net_controlsocket;
-
-static void IPX_PollProcedure(void);
-static PollProcedure pollProcedure = {NULL, 0.0, IPX_PollProcedure};
-
-//=============================================================================
-
-static void IPX_GetLocalAddress(IPXaddr *addr)
-{
-	regs.x.cs = ipx_cs;
-	regs.x.ip = ipx_ip;
-	regs.x.bx = IPX_GETADDRESS;
-	regs.x.es = lowmem_bufseg;
-	regs.x.si = lowmem_bufoff;
-	__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-	Q_memcpy(addr, lowmem_buffer, 10);
-}
-
-//=============================================================================
-
-static int IPX_GetLocalTarget(IPXaddr *addr, byte *localTarget)
-{
-	regs.x.cs = ipx_cs;
-	regs.x.ip = ipx_ip;
-	regs.x.bx = IPX_GETROUTE;
-	regs.x.es = lowmem_bufseg;
-	regs.x.si = lowmem_bufoff;
-	regs.x.di = lowmem_bufoff + sizeof(IPXaddr);
-	Q_memcpy(lowmem_buffer, addr, sizeof(IPXaddr));
-	__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-	if (regs.h.al)
-		return -1;
-	Q_memcpy(localTarget, lowmem_buffer + sizeof(IPXaddr), 6);
-	return 0;
-}
-
-//=============================================================================
-
-static void IPX_ListenForPacket(ECB *ecb)
-{
-	regs.x.cs = ipx_cs;
-	regs.x.ip = ipx_ip;
-	regs.x.bx = IPX_LISTEN;
-	regs.x.es = ptr2real(ecb) >> 4;
-	regs.x.si = ptr2real(ecb) & 0xf;
-	__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-}
-
-//=============================================================================
-
-static void IPX_RelinquishControl(void)
-{
-	regs.x.cs = ipx_cs;
-	regs.x.ip = ipx_ip;
-	regs.x.bx = IPX_RELINQUISH;
-	__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-}
-
-
-void IPX_PollProcedure(void)
-{
-	IPX_RelinquishControl();
-	SchedulePollProcedure(&pollProcedure, 0.01);
-}
-
-//=============================================================================
-
-static void ProcessReadyList(int s)
-{
-	int n;
-	ECB *ecb;
-	ECB *prev;
-
-	for (n = 1; n < IPXSOCKBUFFERS; n++)
-	{
-		if (lma->socketbuffer[s][n].ecb.inUse == 0)
-		{
-			for (ecb = readlist[s], prev = NULL; ecb; ecb = ecb->link)
-			{
-				if (lma->socketbuffer[s][n].sequence < ((ipx_lowmem_buffer_t *) ecb)->sequence)
-					break;
-				prev = ecb;
-			}
-			if (ecb)
-				lma->socketbuffer[s][n].ecb.link = ecb;
-			else
-				lma->socketbuffer[s][n].ecb.link = NULL;
-			if (prev)
-				prev->link = &lma->socketbuffer[s][n].ecb;
-			else
-				readlist[s] = &lma->socketbuffer[s][n].ecb;
-			lma->socketbuffer[s][n].ecb.inUse = 0xff;
-		}
-	}
-}
-
-//=============================================================================
-
-int IPX_Init(void)
-{
-	int s;
-	int n;
-	struct qsockaddr addr;
-	char *colon;
-
-	if (COM_CheckParm ("-noipx"))
-		return -1;
-
-	// find the IPX far call entry point
-	regs.x.ax = 0x7a00;
-	__dpmi_simulate_real_mode_interrupt (0x2f, (__dpmi_regs *)&regs);
-	if (regs.h.al != 0xff)
-	{
-		Con_Printf("IPX not detected\n");
-		return -1;
-	}
-	ipx_cs = regs.x.es;
-	ipx_ip = regs.x.di;
-
-	// grab a chunk of memory down in DOS land
-	lowmem_buffer = dos_getmemory(LOWMEMSIZE);
-	if (!lowmem_buffer)
-	{
-		Con_Printf("IPX_Init: Not enough low memory\n");
-		return -1;
-	}
-	lowmem_bufoff = ptr2real(lowmem_buffer) & 0xf;
-	lowmem_bufseg = ptr2real(lowmem_buffer) >> 4;
-
-	// init socket handles & buffers
-	handlesInUse = 0;
-	lma = (ipx_lowmem_area_t *)lowmem_buffer;
-	for (s = 0; s < IPXSOCKETS; s++)
-	{
-		ipxsocket[s] = 0;
-		for (n = 0; n < IPXSOCKBUFFERS; n++)
-		{
-			lma->socketbuffer[s][n].ecb.link = NULL;
-			lma->socketbuffer[s][n].ecb.ESR_off = 0;
-			lma->socketbuffer[s][n].ecb.ESR_seg = 0;
-			lma->socketbuffer[s][n].ecb.socket = 0;
-			lma->socketbuffer[s][n].ecb.inUse = 0xff;
-			lma->socketbuffer[s][n].ecb.completionCode = 0;
-			lma->socketbuffer[s][n].ecb.fragCount = 1;
-			lma->socketbuffer[s][n].ecb.fragOff = ptr2real(&lma->socketbuffer[s][n].header) & 0xf;
-			lma->socketbuffer[s][n].ecb.fragSeg = ptr2real(&lma->socketbuffer[s][n].header) >> 4;
-			lma->socketbuffer[s][n].ecb.fragSize = sizeof(IPXheader) + sizeof(int) + NET_DATAGRAMSIZE;
-		}
-	}
-
-	if ((net_controlsocket = IPX_OpenSocket (0)) == -1)
-	{
-		dos_freememory(lowmem_buffer);
-		Con_DPrintf ("IPX_Init: Unable to open control socket\n");
-		return -1;
-	}
-
-	SchedulePollProcedure(&pollProcedure, 0.01);
-
-	IPX_GetSocketAddr (net_controlsocket, &addr);
-	Q_strcpy(my_ipx_address,  IPX_AddrToString (&addr));
-	colon = Q_strrchr (my_ipx_address, ':');
-	if (colon)
-		*colon = 0;
-
-	Con_Printf("IPX initialized\n");
-	ipxAvailable = true;
-	return net_controlsocket;
-}
-
-//=============================================================================
-
-void IPX_Shutdown(void)
-{
-	IPX_Listen (false);
-	IPX_CloseSocket (net_controlsocket);
-	dos_freememory(lowmem_buffer);
-}
-
-//=============================================================================
-
-void IPX_Listen (qboolean state)
-{
-	// enable listening
-	if (state)
-	{
-		if (net_acceptsocket != -1)
-			return;
-		if ((net_acceptsocket = IPX_OpenSocket (net_hostport)) == -1)
-			Sys_Error ("IPX_Listen: Unable to open accept socket\n");
-		return;
-	}
-
-	// disable listening
-	if (net_acceptsocket == -1)
-		return;
-	IPX_CloseSocket (net_acceptsocket);
-	net_acceptsocket = -1;
-}
-
-//=============================================================================
-
-int IPX_OpenSocket(int port)
-{
-	int handle;
-	int n;
-	unsigned short socket;
-
-	if (handlesInUse == IPXSOCKETS)
-		return -1;
-
-	// open the IPX socket
-	regs.x.cs = ipx_cs;
-	regs.x.ip = ipx_ip;
-	regs.x.bx = IPX_OPEN;
-	regs.h.al = 0;
-	regs.x.dx = htons(port);
-	__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-	if (regs.h.al == 0xfe)
-	{
-		Con_DPrintf("IPX_OpenSocket: all sockets in use\n");
-		return -1;
-	}
-	if (regs.h.al == 0xff)
-	{
-		Con_DPrintf("IPX_OpenSocket: socket already open\n");
-		return -1;
-	}
-	if (regs.h.al != 0)
-	{
-		Con_DPrintf("IPX_OpenSocket: error %02x\n", regs.h.al);
-		return -1;
-	}
-	socket = regs.x.dx;
-
-// grab a handle; fill in the ECBs, and get them listening
-	for (handle = 0; handle < IPXSOCKETS; handle++)
-	{
-		if (ipxsocket[handle] == 0)
-		{
-			ipxsocket[handle] = socket;
-			readlist[handle] = NULL;
-			sequence[handle] = 0;
-			for (n = 0; n < IPXSOCKBUFFERS; n ++)
-			{
-				lma->socketbuffer[handle][n].ecb.socket = socket;
-				lma->socketbuffer[handle][n].ecb.inUse = 0;
-				if (n)
-					IPX_ListenForPacket(&lma->socketbuffer[handle][n].ecb);
-			}
-			handlesInUse++;
-			return handle;
-		}
-	}
-
-	// "this will NEVER happen"
-	Sys_Error("IPX_OpenSocket: handle allocation failed\n");
-	return -1;
-}
-
-//=============================================================================
-
-int IPX_CloseSocket(int handle)
-{
-	// if there's a send in progress, give it one last chance
-	if (lma->socketbuffer[handle][0].ecb.inUse != 0)
-		IPX_RelinquishControl();
-
-	// close the socket (all pending sends/received are cancelled)
-	regs.x.cs = ipx_cs;
-	regs.x.ip = ipx_ip;
-	regs.x.bx = IPX_CLOSE;
-	regs.x.dx = ipxsocket[handle];
-	__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-
-	ipxsocket[handle] = 0;
-	handlesInUse--;
-
-	return 0;
-}
-
-//=============================================================================
-
-int IPX_Connect (int handle, struct qsockaddr *addr)
-{
-	IPXaddr ipxaddr;
-
-	Q_memcpy(&ipxaddr, &((struct sockaddr_ipx *)addr)->sipx_addr, sizeof(IPXaddr));
-	if (IPX_GetLocalTarget(&ipxaddr, lma->socketbuffer[handle][0].ecb.immediateAddress) != 0)
-	{
-		Con_Printf("Get Local Target failed\n");
-		return -1;
-	}
-
-	return 0;
-}
-
-//=============================================================================
-
-int IPX_CheckNewConnections (void)
-{
-	int n;
-
-	if (net_acceptsocket == -1)
-		return -1;
-
-	for (n = 1; n < IPXSOCKBUFFERS; n ++)
-		if (lma->socketbuffer[net_acceptsocket][n].ecb.inUse == 0)
-			return net_acceptsocket;
-	return -1;
-}
-
-//=============================================================================
-
-int IPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
-{
-	ECB		*ecb;
-	ipx_lowmem_buffer_t *rcvbuf;
-	int		copylen;
-
-	ProcessReadyList(handle);
-tryagain:
-	if (readlist[handle] == NULL)
-		return 0;
-	ecb = readlist[handle];
-	readlist[handle] = ecb->link;
-
-	if (ecb->completionCode != 0)
-	{
-		Con_Printf("Warning: IPX_Read error %02x\n", ecb->completionCode);	
-		ecb->fragSize = sizeof(IPXheader) + sizeof(int) + NET_DATAGRAMSIZE;
-		IPX_ListenForPacket(ecb);
-		goto tryagain;
-	}
-
-	rcvbuf = (ipx_lowmem_buffer_t *)ecb;
-
-	// copy the data up to the buffer
-	copylen = ntohs(rcvbuf->header.length) - (sizeof(int) + sizeof(IPXheader));
-	if (len < copylen)
-		Sys_Error("IPX_Read: buffer too small (%d vs %d)\n", len, copylen);
-	Q_memcpy(buf, rcvbuf->data, copylen);
-
-	// fill in the addr if they want it
-	if (addr)
-	{
-		((struct sockaddr_ipx *)addr)->sipx_family = AF_NETWARE;
-		Q_memcpy(&((struct sockaddr_ipx *)addr)->sipx_addr, rcvbuf->header.source.network, sizeof(IPXaddr));
-		((struct sockaddr_ipx *)addr)->sipx_zero[0] = 0;
-		((struct sockaddr_ipx *)addr)->sipx_zero[1] = 0;
-	}
-
-	// update the send ecb's immediate address
-	Q_memcpy(lma->socketbuffer[handle][0].ecb.immediateAddress, rcvbuf->ecb.immediateAddress, 6);
-
-	// get this ecb listening again
-	rcvbuf->ecb.fragSize = sizeof(IPXheader) + sizeof(int) + NET_DATAGRAMSIZE;
-	IPX_ListenForPacket(&rcvbuf->ecb);
-	return copylen;
-}
-
-//=============================================================================
-
-int IPX_Broadcast (int handle, byte *buf, int len)
-{
-	struct sockaddr_ipx addr;
-	int ret;
-
-	Q_memset(addr.sipx_addr.network, 0x00, 4);
-	Q_memset(addr.sipx_addr.node, 0xff, 6);
-	addr.sipx_port = htons(net_hostport);
-	Q_memset(lma->socketbuffer[handle][0].ecb.immediateAddress, 0xff, 6);
-	ret = IPX_Write (handle, buf, len, (struct qsockaddr *)&addr);
-	return ret;
-}
-
-//=============================================================================
-
-int IPX_Write (int handle, byte *buf, int len, struct qsockaddr *addr)
-{
-	// has the previous send completed?
-	while (lma->socketbuffer[handle][0].ecb.inUse != 0)
-		IPX_RelinquishControl();
-
-	switch (lma->socketbuffer[handle][0].ecb.completionCode)
-	{
-		case 0x00: // success
-		case 0xfc: // request cancelled
-			break;
-
-		case 0xfd: // malformed packet
-		default:
-			Con_Printf("IPX driver send failure: %02x\n", lma->socketbuffer[handle][0].ecb.completionCode);
-			break;
-
-		case 0xfe: // packet undeliverable
-		case 0xff: // unable to send packet
-			Con_Printf("IPX lost route, trying to re-establish\n");
-
-			// look for a new route
-			if (IPX_GetLocalTarget (&lma->socketbuffer[handle][0].header.destination, lma->socketbuffer[handle][0].ecb.immediateAddress) != 0)
-				return -1;
-
-			// re-send the one that failed
-			regs.x.cs = ipx_cs;
-			regs.x.ip = ipx_ip;
-			regs.x.bx = IPX_SEND;
-			regs.x.es = ptr2real(&lma->socketbuffer[handle][0].ecb) >> 4;
-			regs.x.si = ptr2real(&lma->socketbuffer[handle][0].ecb) & 0xf;
-			__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-
-			// report that we did not send the current one
-			return 0;
-	}
-
-	// ecb : length
-	lma->socketbuffer[handle][0].ecb.fragSize = sizeof(IPXheader) + sizeof(int) + len;
-
-	// ipx header : type
-	lma->socketbuffer[handle][0].header.type = PTYPE_IPX;
-
-	// ipx header : destination
-	Q_memcpy(&lma->socketbuffer[handle][0].header.destination, &((struct sockaddr_ipx *)addr)->sipx_addr, sizeof(IPXaddr));
-
-	// sequence number
-	lma->socketbuffer[handle][0].sequence = sequence[handle];
-	sequence[handle]++;
-
-	// copy down the data
-	Q_memcpy(lma->socketbuffer[handle][0].data, buf, len);
-
-	regs.x.cs = ipx_cs;
-	regs.x.ip = ipx_ip;
-	regs.x.bx = IPX_SEND;
-	regs.x.es = ptr2real(&lma->socketbuffer[handle][0].ecb) >> 4;
-	regs.x.si = ptr2real(&lma->socketbuffer[handle][0].ecb) & 0xf;
-	__dpmi_simulate_real_mode_procedure_retf((__dpmi_regs *)&regs);
-
-	return len;
-}
-
-//=============================================================================
-
-char *IPX_AddrToString (struct qsockaddr *addr)
-{
-	static char buf[28];
-
-	sprintf(buf, "%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%u",
-		((struct sockaddr_ipx *)addr)->sipx_addr.network[0],
-		((struct sockaddr_ipx *)addr)->sipx_addr.network[1],
-		((struct sockaddr_ipx *)addr)->sipx_addr.network[2],
-		((struct sockaddr_ipx *)addr)->sipx_addr.network[3],
-		((struct sockaddr_ipx *)addr)->sipx_addr.node[0],
-		((struct sockaddr_ipx *)addr)->sipx_addr.node[1],
-		((struct sockaddr_ipx *)addr)->sipx_addr.node[2],
-		((struct sockaddr_ipx *)addr)->sipx_addr.node[3],
-		((struct sockaddr_ipx *)addr)->sipx_addr.node[4],
-		((struct sockaddr_ipx *)addr)->sipx_addr.node[5],
-		ntohs(((struct sockaddr_ipx *)addr)->sipx_port)
-		);
-	return buf;
-}
-
-//=============================================================================
-
-int IPX_StringToAddr (char *string, struct qsockaddr *addr)
-{
-	int  val;
-	char buf[3];
-
-	buf[2] = 0;
-	Q_memset(addr, 0, sizeof(struct qsockaddr));
-	addr->sa_family = AF_NETWARE;
-
-#define DO(src,dest)	\
-	buf[0] = string[src];	\
-	buf[1] = string[src + 1];	\
-	if (sscanf (buf, "%x", &val) != 1)	\
-		return -1;	\
-	((struct sockaddr_ipx *)addr)->sipx_addr.dest = val
-
-	DO(0, network[0]);
-	DO(2, network[1]);
-	DO(4, network[2]);
-	DO(6, network[3]);
-	DO(9, node[0]);
-	DO(11, node[1]);
-	DO(13, node[2]);
-	DO(15, node[3]);
-	DO(17, node[4]);
-	DO(19, node[5]);
-#undef DO
-
-	sscanf (&string[22], "%u", &val);
-	((struct sockaddr_ipx *)addr)->sipx_port = htons(val);
-
-	return 0;
-}
-
-//=============================================================================
-
-int IPX_GetSocketAddr (int handle, struct qsockaddr *addr)
-{
-	Q_memset(addr, 0, sizeof(struct qsockaddr));
-	addr->sa_family = AF_NETWARE;
-	IPX_GetLocalAddress(&((struct sockaddr_ipx *)addr)->sipx_addr);
-	((struct sockaddr_ipx *)addr)->sipx_port = ipxsocket[handle];
-	return 0;
-}
-
-//=============================================================================
-
-int IPX_GetNameFromAddr (struct qsockaddr *addr, char *name)
-{
-	Q_strcpy(name, IPX_AddrToString(addr));
-	return 0;
-}
-
-//=============================================================================
-
-int IPX_GetAddrFromName (char *name, struct qsockaddr *addr)
-{
-	int n;
-	char buf[32];
-
-	n = Q_strlen(name);
-
-	if (n == 12)
-	{
-		sprintf(buf, "00000000:%s:%u", name, net_hostport);
-		return IPX_StringToAddr (buf, addr);
-	}
-	if (n == 21)
-	{
-		sprintf(buf, "%s:%u", name, net_hostport);
-		return IPX_StringToAddr (buf, addr);
-	}
-	if (n > 21 && n <= 27)
-		return IPX_StringToAddr (name, addr);
-
-	return -1;
-}
-
-//=============================================================================
-
-int IPX_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
-{
-	if (addr1->sa_family != addr2->sa_family)
-		return -1;
-
-	if(Q_memcmp(&((struct sockaddr_ipx *)addr1)->sipx_addr, &((struct sockaddr_ipx *)addr2)->sipx_addr, 10))
-		return -1;
-
-	if (((struct sockaddr_ipx *)addr1)->sipx_port != ((struct sockaddr_ipx *)addr2)->sipx_port)
-		return 1;
-
-	return 0;
-}
-
-//=============================================================================
-
-int IPX_GetSocketPort (struct qsockaddr *addr)
-{
-	return ntohs(((struct sockaddr_ipx *)addr)->sipx_port);
-}
-
-
-int IPX_SetSocketPort (struct qsockaddr *addr, int port)
-{
-	((struct sockaddr_ipx *)addr)->sipx_port = htons(port);
-	return 0;
-}
-
-//=============================================================================
--- a/u/net_ipx.h
+++ /dev/null
@@ -1,39 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_ipx.h
-
-int  IPX_Init (void);
-void IPX_Shutdown (void);
-void IPX_Listen (qboolean state);
-int  IPX_OpenSocket (int port);
-int  IPX_CloseSocket (int socket);
-int  IPX_Connect (int socket, struct qsockaddr *addr);
-int  IPX_CheckNewConnections (void);
-int  IPX_Read (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  IPX_Write (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  IPX_Broadcast (int socket, byte *buf, int len);
-char *IPX_AddrToString (struct qsockaddr *addr);
-int  IPX_StringToAddr (char *string, struct qsockaddr *addr);
-int  IPX_GetSocketAddr (int socket, struct qsockaddr *addr);
-int  IPX_GetNameFromAddr (struct qsockaddr *addr, char *name);
-int  IPX_GetAddrFromName (char *name, struct qsockaddr *addr);
-int  IPX_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2);
-int  IPX_GetSocketPort (struct qsockaddr *addr);
-int  IPX_SetSocketPort (struct qsockaddr *addr, int port);
--- a/u/net_mp.c
+++ /dev/null
@@ -1,443 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_mpath.c
-
-#include <dpmi.h>
-#include "quakedef.h"
-#include "mpdosock.h"
-
-short flat_selector;
-
-int WSAGetLastError(void);
-void sockets_flush(void);
-
-extern cvar_t hostname;
-
-#define MAXHOSTNAMELEN		256
-
-static int net_acceptsocket = -1;		// socket for fielding new connections
-static int net_controlsocket;
-static int net_broadcastsocket = 0;
-//static qboolean ifbcastinit = false;
-static struct qsockaddr broadcastaddr;
-
-static unsigned long myAddr;
-
-#include "net_mp.h"
-
-
-//=============================================================================
-
-int MPATH_Init (void)
-{
-	int		i;
-	struct hostent *local = NULL;
-	char	buff[MAXHOSTNAMELEN];
-	struct qsockaddr addr;
-	char	*p;
-
-	if (COM_CheckParm ("-mpath") == 0)
-		return -1;
-
-   flat_selector = __dpmi_allocate_ldt_descriptors(1);
-   if (flat_selector == -1) {
-      Con_Printf("MPATH_Init: Can't get flat selector\n");
-      return -1;
-   }
-   if (__dpmi_set_segment_base_address(flat_selector, 0) == -1) {
-      Con_Printf("MPATH_Init: Can't seg flat base!\n");
-      return -1;
-   }
-   if (__dpmi_set_segment_limit(flat_selector, 0xffffffff) == -1) {
-      Con_Printf("MPATH_Init: Can't set segment limit\n");
-      return -1;
-   }
-	// determine my name & address
-	if (gethostname(buff, MAXHOSTNAMELEN) == 0)
-		local = gethostbyname(buff);
-	if (local)
-	{
-		myAddr = *(int *)local->h_addr_list[0];
-
-		// if the quake hostname isn't set, set it to the machine name
-		if (Q_strcmp(hostname.string, "UNNAMED") == 0)
-		{
-			// see if it's a text IP address (well, close enough)
-			for (p = buff; *p; p++)
-				if ((*p < '0' || *p > '9') && *p != '.')
-					break;
-
-			// if it is a real name, strip off the domain; we only want the host
-			if (*p)
-			{
-				for (i = 0; i < 15; i++)
-					if (buff[i] == '.')
-						break;
-				buff[i] = 0;
-			}
-			Cvar_Set ("hostname", buff);
-		}
-	}
-
-	if ((net_controlsocket = MPATH_OpenSocket (0)) == -1)
-		Sys_Error("MPATH_Init: Unable to open control socket\n");
-
-	((struct sockaddr_in *)&broadcastaddr)->sin_family = AF_INET;
-	((struct sockaddr_in *)&broadcastaddr)->sin_addr.s_addr = INADDR_BROADCAST;
-	((struct sockaddr_in *)&broadcastaddr)->sin_port = htons(net_hostport);
-
-	MPATH_GetSocketAddr (net_controlsocket, &addr);
-	Q_strcpy(my_tcpip_address,  MPATH_AddrToString (&addr));
-	p = Q_strrchr (my_tcpip_address, ':');
-	if (p)
-		*p = 0;
-
-	Con_Printf("MPath Initialized\n");
-	tcpipAvailable = true;
-
-	return net_controlsocket;
-}
-
-//=============================================================================
-
-void MPATH_Shutdown (void)
-{
-	MPATH_Listen (false);
-	MPATH_CloseSocket (net_controlsocket);
-}
-
-//=============================================================================
-
-void MPATH_Listen (qboolean state)
-{
-	// enable listening
-	if (state)
-	{
-		if (net_acceptsocket != -1)
-			return;
-		if ((net_acceptsocket = MPATH_OpenSocket (net_hostport)) == -1)
-			Sys_Error ("MPATH_Listen: Unable to open accept socket\n");
-		return;
-	}
-
-	// disable listening
-	if (net_acceptsocket == -1)
-		return;
-	MPATH_CloseSocket (net_acceptsocket);
-	net_acceptsocket = -1;
-}
-
-//=============================================================================
-
-int MPATH_OpenSocket (int port)
-{
-	int newsocket;
-	struct sockaddr_in address;
-	u_long _true = 1;
-
-	if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
-		return -1;
-
-	if (ioctlsocket (newsocket, FIONBIO, &_true) == -1)
-		goto ErrorReturn;
-
-	address.sin_family = AF_INET;
-	address.sin_addr.s_addr = INADDR_ANY;
-	address.sin_port = htons(port);
-	if( bind (newsocket, (void *)&address, sizeof(address)) == -1)
-		goto ErrorReturn;
-
-	return newsocket;
-
-ErrorReturn:
-	closesocket (newsocket);
-	return -1;
-}
-
-//=============================================================================
-
-int MPATH_CloseSocket (int socket)
-{
-	if (socket == net_broadcastsocket)
-		net_broadcastsocket = 0;
-	return closesocket (socket);
-}
-
-
-//=============================================================================
-/*
-============
-PartialIPAddress
-
-this lets you type only as much of the net address as required, using
-the local network components to fill in the rest
-============
-*/
-static int PartialIPAddress (char *in, struct qsockaddr *hostaddr)
-{
-	char buff[256];
-	char *b;
-	int addr;
-	int num;
-	int mask;
-	int run;
-	int port;
-	
-	buff[0] = '.';
-	b = buff;
-	strcpy(buff+1, in);
-	if (buff[1] == '.')
-		b++;
-
-	addr = 0;
-	mask=-1;
-	while (*b == '.')
-	{
-		b++;
-		num = 0;
-		run = 0;
-		while (!( *b < '0' || *b > '9'))
-		{
-		  num = num*10 + *b++ - '0';
-		  if (++run > 3)
-		  	return -1;
-		}
-		if ((*b < '0' || *b > '9') && *b != '.' && *b != ':' && *b != 0)
-			return -1;
-		if (num < 0 || num > 255)
-			return -1;
-		mask<<=8;
-		addr = (addr<<8) + num;
-	}
-	
-	if (*b++ == ':')
-		port = Q_atoi(b);
-	else
-		port = net_hostport;
-
-	hostaddr->sa_family = AF_INET;
-	((struct sockaddr_in *)hostaddr)->sin_port = htons((short)port);	
-	((struct sockaddr_in *)hostaddr)->sin_addr.s_addr = (myAddr & htonl(mask)) | htonl(addr);
-	
-	return 0;
-}
-//=============================================================================
-
-int MPATH_Connect (int socket, struct qsockaddr *addr)
-{
-	return 0;
-}
-
-//=============================================================================
-
-int MPATH_CheckNewConnections (void)
-{
-	char buf[4];
-
-	if (net_acceptsocket == -1)
-		return -1;
-
-	if (recvfrom (net_acceptsocket, buf, 4, MSG_PEEK, NULL, NULL) > 0)
-		return net_acceptsocket;
-	return -1;
-}
-
-//=============================================================================
-
-int MPATH_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
-{
-	int addrlen = sizeof (struct qsockaddr);
-	int ret;
-
-	ret = recvfrom (socket, buf, len, 0, (struct sockaddr *)addr, &addrlen);
-	if (ret == -1)
-	{
-		int errno = WSAGetLastError();
-
-		if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
-			return 0;
-
-	}
-	return ret;
-}
-
-//=============================================================================
-
-int MPATH_MakeSocketBroadcastCapable (int socket)
-{
-	int	i = 1;
-
-	// make this socket broadcast capable
-	if (setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) < 0)
-		return -1;
-	net_broadcastsocket = socket;
-
-	return 0;
-}
-
-//=============================================================================
-
-int MPATH_Broadcast (int socket, byte *buf, int len)
-{
-	int ret;
-
-	if (socket != net_broadcastsocket)
-	{
-		if (net_broadcastsocket != 0)
-			Sys_Error("Attempted to use multiple broadcasts sockets\n");
-		ret = MPATH_MakeSocketBroadcastCapable (socket);
-		if (ret == -1)
-		{
-			Con_Printf("Unable to make socket broadcast capable\n");
-			return ret;
-		}
-	}
-
-	return MPATH_Write (socket, buf, len, &broadcastaddr);
-}
-
-//=============================================================================
-
-int MPATH_Write (int socket, byte *buf, int len, struct qsockaddr *addr)
-{
-	int ret;
-
-	ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr));
-	if (ret == -1)
-		if (WSAGetLastError() == WSAEWOULDBLOCK)
-			return 0;
-
-	sockets_flush();
-
-	return ret;
-}
-
-//=============================================================================
-
-char *MPATH_AddrToString (struct qsockaddr *addr)
-{
-	static char buffer[22];
-	int haddr;
-
-	haddr = ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr);
-	sprintf(buffer, "%d.%d.%d.%d:%d", (haddr >> 24) & 0xff, (haddr >> 16) & 0xff, (haddr >> 8) & 0xff, haddr & 0xff, ntohs(((struct sockaddr_in *)addr)->sin_port));
-	return buffer;
-}
-
-//=============================================================================
-
-int MPATH_StringToAddr (char *string, struct qsockaddr *addr)
-{
-	int ha1, ha2, ha3, ha4, hp;
-	int ipaddr;
-
-	sscanf(string, "%d.%d.%d.%d:%d", &ha1, &ha2, &ha3, &ha4, &hp);
-	ipaddr = (ha1 << 24) | (ha2 << 16) | (ha3 << 8) | ha4;
-
-	addr->sa_family = AF_INET;
-	((struct sockaddr_in *)addr)->sin_addr.s_addr = htonl(ipaddr);
-	((struct sockaddr_in *)addr)->sin_port = htons(hp);
-	return 0;
-}
-
-//=============================================================================
-
-int MPATH_GetSocketAddr (int socket, struct qsockaddr *addr)
-{
-	int addrlen = sizeof(struct qsockaddr);
-	unsigned int a;
-
-	Q_memset(addr, 0, sizeof(struct qsockaddr));
-	getsockname(socket, (struct sockaddr *)addr, &addrlen);
-	a = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
-	if (a == 0 || a == inet_addr("127.0.0.1"))
-		((struct sockaddr_in *)addr)->sin_addr.s_addr = myAddr;
-
-	return 0;
-}
-
-//=============================================================================
-
-int MPATH_GetNameFromAddr (struct qsockaddr *addr, char *name)
-{
-	struct hostent *hostentry;
-
-	hostentry = gethostbyaddr ((char *)&((struct sockaddr_in *)addr)->sin_addr, sizeof(struct in_addr), AF_INET);
-	if (hostentry)
-	{
-		Q_strncpy (name, (char *)hostentry->h_name, NET_NAMELEN - 1);
-		return 0;
-	}
-
-	Q_strcpy (name, MPATH_AddrToString (addr));
-	return 0;
-}
-
-//=============================================================================
-
-int MPATH_GetAddrFromName(char *name, struct qsockaddr *addr)
-{
-	struct hostent *hostentry;
-
-	if (name[0] >= '0' && name[0] <= '9')
-		return PartialIPAddress (name, addr);
-	
-	hostentry = gethostbyname (name);
-	if (!hostentry)
-		return -1;
-
-	addr->sa_family = AF_INET;
-	((struct sockaddr_in *)addr)->sin_port = htons(net_hostport);	
-	((struct sockaddr_in *)addr)->sin_addr.s_addr = *(int *)hostentry->h_addr_list[0];
-
-	return 0;
-}
-
-//=============================================================================
-
-int MPATH_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
-{
-	if (addr1->sa_family != addr2->sa_family)
-		return -1;
-
-	if (((struct sockaddr_in *)addr1)->sin_addr.s_addr != ((struct sockaddr_in *)addr2)->sin_addr.s_addr)
-		return -1;
-
-	if (((struct sockaddr_in *)addr1)->sin_port != ((struct sockaddr_in *)addr2)->sin_port)
-		return 1;
-
-	return 0;
-}
-
-//=============================================================================
-
-int MPATH_GetSocketPort (struct qsockaddr *addr)
-{
-	return ntohs(((struct sockaddr_in *)addr)->sin_port);
-}
-
-
-int MPATH_SetSocketPort (struct qsockaddr *addr, int port)
-{
-	((struct sockaddr_in *)addr)->sin_port = htons(port);
-	return 0;
-}
-
-//=============================================================================
--- a/u/net_mp.h
+++ /dev/null
@@ -1,39 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_mpath.h
-
-int  MPATH_Init (void);
-void MPATH_Shutdown (void);
-void MPATH_Listen (qboolean state);
-int  MPATH_OpenSocket (int port);
-int  MPATH_CloseSocket (int socket);
-int  MPATH_Connect (int socket, struct qsockaddr *addr);
-int  MPATH_CheckNewConnections (void);
-int  MPATH_Read (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  MPATH_Write (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  MPATH_Broadcast (int socket, byte *buf, int len);
-char *MPATH_AddrToString (struct qsockaddr *addr);
-int  MPATH_StringToAddr (char *string, struct qsockaddr *addr);
-int  MPATH_GetSocketAddr (int socket, struct qsockaddr *addr);
-int  MPATH_GetNameFromAddr (struct qsockaddr *addr, char *name);
-int  MPATH_GetAddrFromName (char *name, struct qsockaddr *addr);
-int  MPATH_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2);
-int  MPATH_GetSocketPort (struct qsockaddr *addr);
-int  MPATH_SetSocketPort (struct qsockaddr *addr, int port);
--- a/u/net_none.c
+++ /dev/null
@@ -1,46 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-
-#include "net_loop.h"
-
-net_driver_t net_drivers[MAX_NET_DRIVERS] =
-{
-	{
-	"Loopback",
-	false,
-	Loop_Init,
-	Loop_Listen,
-	Loop_SearchForHosts,
-	Loop_Connect,
-	Loop_CheckNewConnections,
-	Loop_GetMessage,
-	Loop_SendMessage,
-	Loop_SendUnreliableMessage,
-	Loop_CanSendMessage,
-	Loop_CanSendUnreliableMessage,
-	Loop_Close,
-	Loop_Shutdown
-	}
-};
-int net_numdrivers = 1;
-
-net_landriver_t	net_landrivers[MAX_NET_DRIVERS];
-int net_numlandrivers = 0;
--- a/u/net_ser.c
+++ /dev/null
@@ -1,951 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_ser.c
-
-#include "quakedef.h"
-#include "net_ser.h"
-#include "dosisms.h"
-#include "crc.h"
-
-#include "net_comx.c"
-
-// serial protocol
-
-#define SERIAL_PROTOCOL_VERSION 3
-
-// The serial protocol is message oriented.  The high level message format is
-// a one byte message type (MTYPE_xxx), data, and a 16-bit checksum.  All
-// multi-byte fields are sent in network byte order.  There are currently 4
-// MTYPEs defined.  Their formats are as follows:
-//
-// MTYPE_RELIABLE     sequence      data_length   data       checksum   eom
-// MTYPE_UNRELIABLE   sequence      data_length   data       checksum   eom
-// MTYPE_ACK          sequence      checksum      eom
-// MTYPE_CONTROL      data_length   data          checksum   eom
-//
-// sequence is an 8-bit unsigned value starting from 0
-// data_length is a 16-bit unsigned value; it is the length of the data only
-// the checksum is a 16-bit value.  the CRC formula used is defined in crc.h.
-//              the checksum covers the entire messages, excluding itself
-// eom is a special 2 byte sequence used to mark the End Of Message.  This is
-//              needed for error recovery.
-//
-// A lot of behavior is based on knowledge of the upper level Quake network
-// layer.  For example, only one reliable message can be outstanding (pending
-// reception of an MTYPE_ACK) at a time.
-//
-// The low level routines used to communicate with the modem are not part of
-// this protocol.
-//
-// The CONTROL messages are only used for session establishment.  They are
-// not reliable or sequenced.
-
-#define MTYPE_RELIABLE			0x01
-#define MTYPE_UNRELIABLE		0x02
-#define MTYPE_CONTROL			0x03
-#define MTYPE_ACK				0x04
-#define MTYPE_CLIENT			0x80
-
-#define ESCAPE_COMMAND			0xe0
-#define ESCAPE_EOM				0x19
-
-static qboolean listening = false;
-
-
-typedef struct SerialLine_s
-{
-	struct SerialLine_s	*next;
-	qsocket_t			*sock;
-	int					lengthStated;
-	int					lengthFound;
-	int					tty;
-	qboolean			connected;
-	qboolean			connecting;
-	qboolean			client;
-	double				connect_time;
-	unsigned short		crcStated;
-	unsigned short		crcValue;
-	byte				currState;
-	byte				prevState;
-	byte				mtype;
-	byte				sequence;
-} SerialLine;
-
-#define STATE_READY		0
-#define STATE_SEQUENCE	1
-#define STATE_LENGTH1	2
-#define STATE_LENGTH2	3
-#define STATE_DATA		4
-#define STATE_CRC1		5
-#define STATE_CRC2		6
-#define STATE_EOM		7
-#define STATE_ESCAPE	8
-#define STATE_ABORT		9
-
-SerialLine serialLine[NUM_COM_PORTS];
-
-int myDriverLevel;
-
-static void Serial_SendACK (SerialLine *p, byte sequence);
-
-
-static void ResetSerialLineProtocol (SerialLine *p)
-{
-	p->connected = false;
-	p->connecting = false;
-	p->currState = STATE_READY;
-	p->prevState = STATE_READY;
-	p->lengthFound = 0;
-}
-
-
-static int ProcessInQueue(SerialLine *p)
-{
-	int	b;
-
-	while (1)
-	{
-		b = TTY_ReadByte(p->tty);
-		if (b == ERR_TTY_NODATA)
-			break;
-
-		if (b == ERR_TTY_LINE_STATUS)
-		{
-			p->currState = STATE_ABORT;
-			continue;
-		}
-		if (b == ERR_TTY_MODEM_STATUS)
-		{
-			p->currState = STATE_ABORT;
-			return -1;
-		}
-
-		if (b == ESCAPE_COMMAND)
-			if (p->currState != STATE_ESCAPE)
-			{
-				p->prevState = p->currState;
-				p->currState = STATE_ESCAPE;
-				continue;
-			}
-
-		if (p->currState == STATE_ESCAPE)
-		{
-			if (b == ESCAPE_EOM)
-			{
-				if (p->prevState == STATE_ABORT)
-				{
-					p->currState = STATE_READY;
-					p->lengthFound = 0;
-					continue;
-				}
-
-				if (p->prevState != STATE_EOM)
-				{
-					p->currState = STATE_READY;
-					p->lengthFound = 0;
-					Con_DPrintf("Serial: premature EOM\n");
-					continue;
-				}
-
-				switch (p->mtype)
-				{
-					case MTYPE_RELIABLE:
-						Con_DPrintf("Serial: sending ack %u\n", p->sequence);
-						Serial_SendACK (p, p->sequence);
-						if (p->sequence == p->sock->receiveSequence)
-						{
-							p->sock->receiveSequence = (p->sequence + 1) & 0xff;
-							p->sock->receiveMessageLength += p->lengthFound;
-						}
-						else
-							Con_DPrintf("Serial: reliable out of order; got %u wanted %u\n", p->sequence, p->sock->receiveSequence);
-						break;
-
-					case MTYPE_UNRELIABLE:
-						p->sock->unreliableReceiveSequence = (p->sequence + 1) & 0xff;
-						p->sock->receiveMessageLength += p->lengthFound;
-						break;
-
-					case MTYPE_ACK:
-						Con_DPrintf("Serial: got ack %u\n", p->sequence);
-						if (p->sequence == p->sock->sendSequence)
-						{
-							p->sock->sendSequence = (p->sock->sendSequence + 1) & 0xff;
-							p->sock->canSend = true;
-						}
-						else
-							Con_DPrintf("Serial: ack out of order; got %u wanted %u\n",p->sequence, p->sock->sendSequence);
-						break;
-
-					case MTYPE_CONTROL:
-						p->sock->receiveMessageLength += p->lengthFound;
-						break;
-					}
-
-				p->currState = STATE_READY;
-				p->lengthFound = 0;
-				continue;
-			}
-
-
-			if (b != ESCAPE_COMMAND)
-			{
-				p->currState = STATE_ABORT;
-				Con_DPrintf("Serial: Bad escape sequence\n");
-				continue;
-			}
-
-			// b == ESCAPE_COMMAND
-			p->currState = p->prevState;
-		}
-
-		p->prevState = p->currState;
-
-//DEBUG
-		if (p->sock->receiveMessageLength + p->lengthFound > NET_MAXMESSAGE)
-		{
-			Con_DPrintf("Serial blew out receive buffer: %u\n", p->sock->receiveMessageLength + p->lengthFound);
-			p->currState = STATE_ABORT;
-		}
-		if (p->sock->receiveMessageLength + p->lengthFound == NET_MAXMESSAGE)
-		{
-			Con_DPrintf("Serial hit receive buffer limit: %u\n", p->sock->receiveMessageLength + p->lengthFound);
-			p->currState = STATE_ABORT;
-		}
-//end DEBUG
-
-		switch (p->currState)
-		{
-			case STATE_READY:
-				CRC_Init(&p->crcValue);
-				CRC_ProcessByte(&p->crcValue, b);
-				if (p->client)
-				{
-					if ((b & MTYPE_CLIENT) != 0)
-					{
-						p->currState = STATE_ABORT;
-						Con_DPrintf("Serial: client got own message\n");
-						break;
-					}
-				}
-				else
-				{
-					if ((b & MTYPE_CLIENT) == 0)
-					{
-						p->currState = STATE_ABORT;
-						Con_DPrintf("Serial: server got own message\n");
-						break;
-					}
-					b &= 0x7f;
-				}
-				p->mtype = b;
-				if (b != MTYPE_CONTROL)
-					p->currState = STATE_SEQUENCE;
-				else
-					p->currState = STATE_LENGTH1;
-				if (p->mtype < MTYPE_ACK)
-				{
-					p->sock->receiveMessage[p->sock->receiveMessageLength] = b;
-					p->lengthFound++;
-				}
-				break;
-
-			case STATE_SEQUENCE:
-				p->sequence = b;
-				CRC_ProcessByte(&p->crcValue, b);
-				if (p->mtype != MTYPE_ACK)
-					p->currState = STATE_LENGTH1;
-				else
-					p->currState = STATE_CRC1;
-				break;
-
-			case STATE_LENGTH1:
-				p->lengthStated = b * 256;
-				CRC_ProcessByte(&p->crcValue, b);
-				p->currState = STATE_LENGTH2;
-				break;
-
-			case STATE_LENGTH2:
-				p->lengthStated += b;
-				CRC_ProcessByte(&p->crcValue, b);
-				if (p->mtype == MTYPE_RELIABLE && p->lengthStated > MAX_MSGLEN)
-				{
-					p->currState = STATE_ABORT;
-					Con_DPrintf("Serial: bad reliable message length %u\n", p->lengthStated);
-				}
-				else if (p->mtype == MTYPE_UNRELIABLE && p->lengthStated > MAX_DATAGRAM)
-				{
-					p->currState = STATE_ABORT;
-					Con_DPrintf("Serial: bad unreliable message length %u\n", p->lengthStated);
-				}
-				else
-				{
-					p->currState = STATE_DATA;
-					if (p->mtype < MTYPE_ACK)
-					{
-						*(short *)&p->sock->receiveMessage [p->sock->receiveMessageLength + 1] = p->lengthStated;
-						p->lengthFound += 2;
-					}
-				}
-				break;
-
-			case STATE_DATA:
-				p->sock->receiveMessage[p->sock->receiveMessageLength + p->lengthFound] = b;
-				p->lengthFound++;
-				CRC_ProcessByte(&p->crcValue, b);
-				if (p->lengthFound == p->lengthStated + 3)
-					p->currState = STATE_CRC1;
-				break;
-
-			case STATE_CRC1:
-				p->crcStated = b * 256;
-				p->currState = STATE_CRC2;
-				break;
-
-			case STATE_CRC2:
-				p->crcStated += b;
-				if (p->crcStated == CRC_Value(p->crcValue))
-				{
-					p->currState = STATE_EOM;
-				}
-				else
-				{
-					p->currState = STATE_ABORT;
-					Con_DPrintf("Serial: Bad crc\n");
-				}
-				break;
-
-			case STATE_EOM:
-				p->currState = STATE_ABORT;
-				Con_DPrintf("Serial: Bad message format\n");
-				break;
-
-			case STATE_ABORT:
-				break;
-		}
-	}
-	return 0;
-}
-
-
-int Serial_Init (void)
-{
-	int     n;
-
-// LATER do Win32 serial support
-#ifdef	_WIN32
-	return -1;
-#endif
-
-	if (COM_CheckParm("-nolan"))
-		return -1;
-	if (COM_CheckParm ("-noserial"))
-		return -1;
-
-	myDriverLevel = net_driverlevel;
-
-	if (TTY_Init())
-		return -1;
-
-	for (n = 0; n < NUM_COM_PORTS; n++)
-	{
-		serialLine[n].tty = TTY_Open(n);
-		ResetSerialLineProtocol (&serialLine[n]);
-	}
-
-	Con_Printf("Serial driver initialized\n");
-	serialAvailable = true;
-
-	return 0;
-}
-
-
-void Serial_Shutdown (void)
-{
-	int     n;
-
-	for (n = 0; n < NUM_COM_PORTS; n++)
-	{
-		if (serialLine[n].connected)
-			Serial_Close(serialLine[n].sock);
-	}
-
-	TTY_Shutdown();
-}
-
-
-void Serial_Listen (qboolean state)
-{
-	listening = state;
-}
-
-
-qboolean Serial_CanSendMessage (qsocket_t *sock)
-{
-	return sock->canSend;
-}
-
-
-qboolean Serial_CanSendUnreliableMessage (qsocket_t *sock)
-{
-	return TTY_OutputQueueIsEmpty(((SerialLine *)sock->driverdata)->tty);
-}
-
-
-int Serial_SendMessage (qsocket_t *sock, sizebuf_t *message)
-{
-	SerialLine *p;
-	int n;
-	unsigned short crc;
-	byte b;
-
-	p = (SerialLine *)sock->driverdata;
-	CRC_Init (&crc);
-
-	// message type
-	b = MTYPE_RELIABLE;
-	if (p->client)
-		b |= MTYPE_CLIENT;
-	TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// sequence
-	b = p->sock->sendSequence;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// data length
-	b = message->cursize >> 8;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-	b = message->cursize & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// data
-	for (n = 0; n < message->cursize; n++)
-	{
-		b = message->data[n];
-		TTY_WriteByte(p->tty, b);
-		if (b == ESCAPE_COMMAND)
-			TTY_WriteByte(p->tty, b);
-		CRC_ProcessByte (&crc, b);
-	}
-
-	// checksum
-	b = CRC_Value (crc) >> 8;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	b = CRC_Value (crc) & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-
-	// end of message
-	TTY_WriteByte(p->tty, ESCAPE_COMMAND);
-	TTY_WriteByte(p->tty, ESCAPE_EOM);
-
-	TTY_Flush(p->tty);
-
-	// mark sock as busy and save the message for possible retransmit
-	sock->canSend = false;
-	Q_memcpy(sock->sendMessage, message->data, message->cursize);
-	sock->sendMessageLength = message->cursize;
-	sock->lastSendTime = net_time;
-
-	return 1;
-}
-
-
-static void ReSendMessage (qsocket_t *sock)
-{
-	sizebuf_t       temp;
-
-	Con_DPrintf("Serial: re-sending reliable\n");
-	temp.data = sock->sendMessage;
-	temp.maxsize = sock->sendMessageLength;
-	temp.cursize = sock->sendMessageLength;
-	Serial_SendMessage (sock, &temp);
-}
-
-
-int Serial_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *message)
-{
-	SerialLine *p;
-	int n;
-	unsigned short crc;
-	byte b;
-
-	p = (SerialLine *)sock->driverdata;
-
-	if (!TTY_OutputQueueIsEmpty(p->tty))
-	{
-		TTY_Flush(p->tty);
-		return 1;
-	}
-
-	CRC_Init (&crc);
-
-	// message type
-	b = MTYPE_UNRELIABLE;
-	if (p->client)
-		b |= MTYPE_CLIENT;
-	TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// sequence
-	b = p->sock->unreliableSendSequence;
-	p->sock->unreliableSendSequence = (b + 1) & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// data length
-	b = message->cursize >> 8;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-	b = message->cursize & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// data
-	for (n = 0; n < message->cursize; n++)
-	{
-		b = message->data[n];
-		TTY_WriteByte(p->tty, b);
-		if (b == ESCAPE_COMMAND)
-			TTY_WriteByte(p->tty, b);
-		CRC_ProcessByte (&crc, b);
-	}
-
-	// checksum
-	b = CRC_Value (crc) >> 8;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	b = CRC_Value (crc) & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-
-	// end of message
-	TTY_WriteByte(p->tty, ESCAPE_COMMAND);
-	TTY_WriteByte(p->tty, ESCAPE_EOM);
-
-	TTY_Flush(p->tty);
-
-	return 1;
-}
-
-
-static void Serial_SendACK (SerialLine *p, byte sequence)
-{
-	unsigned short crc;
-	byte b;
-
-	CRC_Init (&crc);
-
-	// message type
-	b = MTYPE_ACK;
-	if (p->client)
-		b |= MTYPE_CLIENT;
-	TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// sequence
-	b = sequence;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// checksum
-	b = CRC_Value (crc) >> 8;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	b = CRC_Value (crc) & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-
-	// end of message
-	TTY_WriteByte(p->tty, ESCAPE_COMMAND);
-	TTY_WriteByte(p->tty, ESCAPE_EOM);
-
-	TTY_Flush(p->tty);
-}
-
-
-static void Serial_SendControlMessage (SerialLine *p, sizebuf_t *message)
-{
-	unsigned short crc;
-	int n;
-	byte b;
-
-	CRC_Init (&crc);
-
-	// message type
-	b = MTYPE_CONTROL;
-	if (p->client)
-		b |= MTYPE_CLIENT;
-	TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// data length
-	b = message->cursize >> 8;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-	b = message->cursize & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	CRC_ProcessByte (&crc, b);
-
-	// data
-	for (n = 0; n < message->cursize; n++)
-	{
-		b = message->data[n];
-		TTY_WriteByte(p->tty, b);
-		if (b == ESCAPE_COMMAND)
-			TTY_WriteByte(p->tty, b);
-		CRC_ProcessByte (&crc, b);
-	}
-
-	// checksum
-	b = CRC_Value (crc) >> 8;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-	b = CRC_Value (crc) & 0xff;
-	TTY_WriteByte(p->tty, b);
-	if (b == ESCAPE_COMMAND)
-		TTY_WriteByte(p->tty, b);
-
-	// end of message
-	TTY_WriteByte(p->tty, ESCAPE_COMMAND);
-	TTY_WriteByte(p->tty, ESCAPE_EOM);
-
-	TTY_Flush(p->tty);
-}
-
-
-static int _Serial_GetMessage (SerialLine *p)
-{
-	byte	ret;
-	short	length;
-
-	if (ProcessInQueue(p))
-		return -1;
-
-	if (p->sock->receiveMessageLength == 0)
-		return 0;
-
-	ret = p->sock->receiveMessage[0];
-	length = *(short *)&p->sock->receiveMessage[1];
-	if (ret == MTYPE_CONTROL)
-		ret = 1;
-
-	SZ_Clear (&net_message);
-	SZ_Write (&net_message, &p->sock->receiveMessage[3], length);
-
-	length += 3;
-	p->sock->receiveMessageLength -= length;
-
-	if (p->sock->receiveMessageLength + p->lengthFound)
-		Q_memcpy(p->sock->receiveMessage, &p->sock->receiveMessage[length], p->sock->receiveMessageLength + p->lengthFound);
-
-	return ret;
-}
-
-int Serial_GetMessage (qsocket_t *sock)
-{
-	SerialLine *p;
-	int		ret;
-
-	p = (SerialLine *)sock->driverdata;
-
-	ret = _Serial_GetMessage (p);
-
-	if (ret == 1)
-		messagesReceived++;
-
-	if (!sock->canSend)
-		if ((net_time - sock->lastSendTime) > 1.0)
-		{
-			ReSendMessage (sock);
-			sock->lastSendTime = net_time;
-		}
-
-	return ret;
-}
-
-
-void Serial_Close (qsocket_t *sock)
-{
-	SerialLine *p = (SerialLine *)sock->driverdata;
-	TTY_Close(p->tty);
-	ResetSerialLineProtocol (p);
-}
-
-
-char *com_types[] = {"direct", "modem"};
-unsigned com_bauds[] = {9600, 14400, 19200, 28800, 57600};
-
-void Serial_SearchForHosts (qboolean xmit)
-{
-	int		n;
-	SerialLine *p;
-
-	if (sv.active)
-		return;
-
-	if (hostCacheCount == HOSTCACHESIZE)
-		return;
-
-	// see if we've already answered
-	for (n = 0; n < hostCacheCount; n++)
-		if (Q_strcmp (hostcache[n].cname, "#") == 0)
-			return;
-
-	for (n = 0; n < NUM_COM_PORTS; n++)
-		if (TTY_IsEnabled(n))
-			break;
-	if (n == NUM_COM_PORTS)
-		return;
-	p = &serialLine[n];
-
-	if (TTY_IsModem(p->tty))
-		return;
-
-	sprintf(hostcache[hostCacheCount].name, "COM%u", n+1);
-	Q_strcpy(hostcache[hostCacheCount].map, "");
-	hostcache[hostCacheCount].users = 0;
-	hostcache[hostCacheCount].maxusers = 0;
-	hostcache[hostCacheCount].driver = net_driverlevel;
-	Q_strcpy(hostcache[hostCacheCount].cname, "#");
-	hostCacheCount++;
-
-	return;
-}
-
-
-static qsocket_t *_Serial_Connect (char *host, SerialLine *p)
-{
-	int		ret;
-	double	start_time;
-	double	last_time;
-
-	p->client = true;
-	if (TTY_Connect(p->tty, host))
-		return NULL;
-
-	p->sock = NET_NewQSocket ();
-	p->sock->driver = myDriverLevel;
-	if (p->sock == NULL)
-	{
-		Con_Printf("No sockets available\n");
-		return NULL;
-	}
-	p->sock->driverdata = p;
-
-	// send the connection request
-	start_time = SetNetTime();
-	last_time = 0.0;
-
-	SZ_Clear(&net_message);
-	MSG_WriteByte(&net_message, CCREQ_CONNECT);
-	MSG_WriteString(&net_message, "QUAKE");
-	do
-	{
-		SetNetTime();
-		if ((net_time - last_time) >= 1.0)
-		{
-			Serial_SendControlMessage (p, &net_message);
-			last_time = net_time;
-			Con_Printf("trying...\n"); SCR_UpdateScreen ();
-		}
-		ret = _Serial_GetMessage (p);
-	}
-	while (ret == 0 && (net_time - start_time) < 5.0);
-
-	if (ret == 0)
-	{
-		Con_Printf("Unable to connect, no response\n");
-		goto ErrorReturn;
-	}
-
-	if (ret == -1)
-	{
-		Con_Printf("Connection request error\n");
-		goto ErrorReturn;
-	}
-
-	MSG_BeginReading ();
-	ret = MSG_ReadByte();
-	if (ret == CCREP_REJECT)
-	{
-		Con_Printf(MSG_ReadString());
-		goto ErrorReturn;
-	}
-	if (ret != CCREP_ACCEPT)
-	{
-		Con_Printf("Unknown connection response\n");
-		goto ErrorReturn;
-	}
-
-	p->connected = true;
-	p->sock->lastMessageTime = net_time;
-
-	Con_Printf ("Connection accepted\n");
-
-	return p->sock;
-
-ErrorReturn:
-	TTY_Disconnect(p->tty);
-	return NULL;
-}
-
-qsocket_t *Serial_Connect (char *host)
-{
-	int			n;
-	qsocket_t	*ret = NULL;
-
-	// see if this looks like a phone number
-	if (*host == '#')
-		host++;
-	for (n = 0; n < Q_strlen(host); n++)
-		if (host[n] == '.' || host[n] == ':')
-			return NULL;
-
-	for (n = 0; n < NUM_COM_PORTS; n++)
-		if (TTY_IsEnabled(n) && !serialLine[n].connected)
-			if ((ret = _Serial_Connect (host, &serialLine[n])))
-				break;
-	return ret;
-}
-
-
-static qsocket_t *_Serial_CheckNewConnections (SerialLine *p)
-{
-	int	command;
-
-	p->client = false;
-	if (!TTY_CheckForConnection(p->tty))
-		return NULL;
-
-	if (TTY_IsModem(p->tty))
-	{
-		if (!p->connecting)
-		{
-			p->connecting = true;
-			p->connect_time = net_time;
-		}
-		else if ((net_time - p->connect_time) > 15.0)
-		{
-			p->connecting = false;
-			TTY_Disconnect(p->tty);
-			return NULL;
-		}
-	}
-
-	p->sock = NET_NewQSocket ();
-	p->sock->driver = myDriverLevel;
-	if (p->sock == NULL)
-	{
-		Con_Printf("No sockets available\n");
-		return NULL;
-	}
-	p->sock->driverdata = p;
-
-	SZ_Clear(&net_message);
-	if (_Serial_GetMessage(p) != 1)
-	{
-		NET_FreeQSocket(p->sock);
-		return NULL;
-	}
-
-	MSG_BeginReading ();
-	command = MSG_ReadByte();
-
-	if (command == CCREQ_SERVER_INFO)
-	{
-		if (Q_strcmp(MSG_ReadString(), "QUAKE") != 0)
-			return NULL;
-
-		if (MSG_ReadByte() != SERIAL_PROTOCOL_VERSION)
-			return NULL;
-
-		SZ_Clear(&net_message);
-		MSG_WriteByte(&net_message, CCREP_SERVER_INFO);
-		MSG_WriteString(&net_message, hostname.string);
-		MSG_WriteString(&net_message, sv.name);
-		MSG_WriteByte(&net_message, net_activeconnections);
-		MSG_WriteByte(&net_message, svs.maxclients);
-		Serial_SendControlMessage (p, &net_message);
-		SZ_Clear(&net_message);
-		return NULL;
-	}
-
-	if (command != CCREQ_CONNECT)
-		return NULL;
-
-	if (Q_strcmp(MSG_ReadString(), "QUAKE") != 0)
-		return NULL;
-
-	// send him back the info about the server connection he has been allocated
-	SZ_Clear(&net_message);
-	MSG_WriteByte(&net_message, CCREP_ACCEPT);
-	Serial_SendControlMessage (p, &net_message);
-	SZ_Clear(&net_message);
-
-	p->connected = true;
-	p->connecting = false;
-	p->sock->lastMessageTime = net_time;
-	sprintf(p->sock->address, "COM%u", (int)((p - serialLine) + 1));
-
-	return p->sock;
-}
-
-qsocket_t *Serial_CheckNewConnections (void)
-{
-	int			n;
-	qsocket_t	*ret = NULL;
-
-	for (n = 0; n < NUM_COM_PORTS; n++)
-		if (TTY_IsEnabled(n) && !serialLine[n].connected)
-			if ((ret = _Serial_CheckNewConnections (&serialLine[n])))
-				break;
-	return ret;
-}
--- a/u/net_ser.h
+++ /dev/null
@@ -1,33 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_ser.h
-
-int			Serial_Init (void);
-void		Serial_Listen (qboolean state);
-void		Serial_SearchForHosts (qboolean xmit);
-qsocket_t	*Serial_Connect (char *host);
-qsocket_t 	*Serial_CheckNewConnections (void);
-int			Serial_GetMessage (qsocket_t *sock);
-int			Serial_SendMessage (qsocket_t *sock, sizebuf_t *data);
-int			Serial_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data);
-qboolean	Serial_CanSendMessage (qsocket_t *sock);
-qboolean	Serial_CanSendUnreliableMessage (qsocket_t *sock);
-void		Serial_Close (qsocket_t *sock);
-void		Serial_Shutdown (void);
--- a/u/net_win.c
+++ /dev/null
@@ -1,120 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-
-#include "net_loop.h"
-#include "net_dgrm.h"
-#include "net_ser.h"
-
-net_driver_t net_drivers[MAX_NET_DRIVERS] =
-{
-	{
-	"Loopback",
-	false,
-	Loop_Init,
-	Loop_Listen,
-	Loop_SearchForHosts,
-	Loop_Connect,
-	Loop_CheckNewConnections,
-	Loop_GetMessage,
-	Loop_SendMessage,
-	Loop_SendUnreliableMessage,
-	Loop_CanSendMessage,
-	Loop_CanSendUnreliableMessage,
-	Loop_Close,
-	Loop_Shutdown
-	}
-	,
-	{
-	"Datagram",
-	false,
-	Datagram_Init,
-	Datagram_Listen,
-	Datagram_SearchForHosts,
-	Datagram_Connect,
-	Datagram_CheckNewConnections,
-	Datagram_GetMessage,
-	Datagram_SendMessage,
-	Datagram_SendUnreliableMessage,
-	Datagram_CanSendMessage,
-	Datagram_CanSendUnreliableMessage,
-	Datagram_Close,
-	Datagram_Shutdown
-	}
-};
-
-int net_numdrivers = 2;
-
-
-#include "net_wins.h"
-#include "net_wipx.h"
-
-net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
-{
-	{
-	"Winsock TCPIP",
-	false,
-	0,
-	WINS_Init,
-	WINS_Shutdown,
-	WINS_Listen,
-	WINS_OpenSocket,
-	WINS_CloseSocket,
-	WINS_Connect,
-	WINS_CheckNewConnections,
-	WINS_Read,
-	WINS_Write,
-	WINS_Broadcast,
-	WINS_AddrToString,
-	WINS_StringToAddr,
-	WINS_GetSocketAddr,
-	WINS_GetNameFromAddr,
-	WINS_GetAddrFromName,
-	WINS_AddrCompare,
-	WINS_GetSocketPort,
-	WINS_SetSocketPort
-	},
-	{
-	"Winsock IPX",
-	false,
-	0,
-	WIPX_Init,
-	WIPX_Shutdown,
-	WIPX_Listen,
-	WIPX_OpenSocket,
-	WIPX_CloseSocket,
-	WIPX_Connect,
-	WIPX_CheckNewConnections,
-	WIPX_Read,
-	WIPX_Write,
-	WIPX_Broadcast,
-	WIPX_AddrToString,
-	WIPX_StringToAddr,
-	WIPX_GetSocketAddr,
-	WIPX_GetNameFromAddr,
-	WIPX_GetAddrFromName,
-	WIPX_AddrCompare,
-	WIPX_GetSocketPort,
-	WIPX_SetSocketPort
-	}
-
-};
-
-int net_numlandrivers = 2;
--- a/u/net_wins.c
+++ /dev/null
@@ -1,575 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_wins.c
-
-#include "quakedef.h"
-#include "winquake.h"
-
-extern cvar_t hostname;
-
-#define MAXHOSTNAMELEN		256
-
-static int net_acceptsocket = -1;		// socket for fielding new connections
-static int net_controlsocket;
-static int net_broadcastsocket = 0;
-static struct qsockaddr broadcastaddr;
-
-static unsigned long myAddr;
-
-qboolean	winsock_lib_initialized;
-
-int (PASCAL FAR *pWSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
-int (PASCAL FAR *pWSACleanup)(void);
-int (PASCAL FAR *pWSAGetLastError)(void);
-SOCKET (PASCAL FAR *psocket)(int af, int type, int protocol);
-int (PASCAL FAR *pioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
-int (PASCAL FAR *psetsockopt)(SOCKET s, int level, int optname,
-							  const char FAR * optval, int optlen);
-int (PASCAL FAR *precvfrom)(SOCKET s, char FAR * buf, int len, int flags,
-							struct sockaddr FAR *from, int FAR * fromlen);
-int (PASCAL FAR *psendto)(SOCKET s, const char FAR * buf, int len, int flags,
-						  const struct sockaddr FAR *to, int tolen);
-int (PASCAL FAR *pclosesocket)(SOCKET s);
-int (PASCAL FAR *pgethostname)(char FAR * name, int namelen);
-struct hostent FAR * (PASCAL FAR *pgethostbyname)(const char FAR * name);
-struct hostent FAR * (PASCAL FAR *pgethostbyaddr)(const char FAR * addr,
-												  int len, int type);
-int (PASCAL FAR *pgetsockname)(SOCKET s, struct sockaddr FAR *name,
-							   int FAR * namelen);
-
-#include "net_wins.h"
-
-int winsock_initialized = 0;
-WSADATA		winsockdata;
-
-//=============================================================================
-
-static double	blocktime;
-
-BOOL PASCAL FAR BlockingHook(void)  
-{ 
-    MSG		msg;
-    BOOL	ret;
- 
-	if ((Sys_FloatTime() - blocktime) > 2.0)
-	{
-		WSACancelBlockingCall();
-		return FALSE;
-	}
-
-    /* get the next message, if any */ 
-    ret = (BOOL) PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); 
- 
-    /* if we got one, process it */ 
-    if (ret) { 
-        TranslateMessage(&msg); 
-        DispatchMessage(&msg); 
-    } 
- 
-    /* TRUE if we got a message */ 
-    return ret; 
-} 
-
-
-void WINS_GetLocalAddress()
-{
-	struct hostent	*local = NULL;
-	char			buff[MAXHOSTNAMELEN];
-	unsigned long	addr;
-
-	if (myAddr != INADDR_ANY)
-		return;
-
-	if (pgethostname(buff, MAXHOSTNAMELEN) == SOCKET_ERROR)
-		return;
-
-	blocktime = Sys_FloatTime();
-	WSASetBlockingHook(BlockingHook);
-	local = pgethostbyname(buff);
-	WSAUnhookBlockingHook();
-	if (local == NULL)
-		return;
-
-	myAddr = *(int *)local->h_addr_list[0];
-
-	addr = ntohl(myAddr);
-	sprintf(my_tcpip_address, "%d.%d.%d.%d", (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
-}
-
-
-int WINS_Init (void)
-{
-	int		i;
-	char	buff[MAXHOSTNAMELEN];
-	char	*p;
-	int		r;
-	WORD	wVersionRequested;
-	HINSTANCE hInst;
-
-// initialize the Winsock function vectors (we do this instead of statically linking
-// so we can run on Win 3.1, where there isn't necessarily Winsock)
-    hInst = LoadLibrary("wsock32.dll");
-	
-	if (hInst == NULL)
-	{
-		Con_SafePrintf ("Failed to load winsock.dll\n");
-		winsock_lib_initialized = false;
-		return -1;
-	}
-
-	winsock_lib_initialized = true;
-
-    pWSAStartup = (void *)GetProcAddress(hInst, "WSAStartup");
-    pWSACleanup = (void *)GetProcAddress(hInst, "WSACleanup");
-    pWSAGetLastError = (void *)GetProcAddress(hInst, "WSAGetLastError");
-    psocket = (void *)GetProcAddress(hInst, "socket");
-    pioctlsocket = (void *)GetProcAddress(hInst, "ioctlsocket");
-    psetsockopt = (void *)GetProcAddress(hInst, "setsockopt");
-    precvfrom = (void *)GetProcAddress(hInst, "recvfrom");
-    psendto = (void *)GetProcAddress(hInst, "sendto");
-    pclosesocket = (void *)GetProcAddress(hInst, "closesocket");
-    pgethostname = (void *)GetProcAddress(hInst, "gethostname");
-    pgethostbyname = (void *)GetProcAddress(hInst, "gethostbyname");
-    pgethostbyaddr = (void *)GetProcAddress(hInst, "gethostbyaddr");
-    pgetsockname = (void *)GetProcAddress(hInst, "getsockname");
-
-    if (!pWSAStartup || !pWSACleanup || !pWSAGetLastError ||
-		!psocket || !pioctlsocket || !psetsockopt ||
-		!precvfrom || !psendto || !pclosesocket ||
-		!pgethostname || !pgethostbyname || !pgethostbyaddr ||
-		!pgetsockname)
-	{
-		Con_SafePrintf ("Couldn't GetProcAddress from winsock.dll\n");
-		return -1;
-	}
-
-	if (COM_CheckParm ("-noudp"))
-		return -1;
-
-	if (winsock_initialized == 0)
-	{
-		wVersionRequested = MAKEWORD(1, 1); 
-
-		r = pWSAStartup (MAKEWORD(1, 1), &winsockdata);
-
-		if (r)
-		{
-			Con_SafePrintf ("Winsock initialization failed.\n");
-			return -1;
-		}
-	}
-	winsock_initialized++;
-
-	// determine my name
-	if (pgethostname(buff, MAXHOSTNAMELEN) == SOCKET_ERROR)
-	{
-		Con_DPrintf ("Winsock TCP/IP Initialization failed.\n");
-		if (--winsock_initialized == 0)
-			pWSACleanup ();
-		return -1;
-	}
-
-	// if the quake hostname isn't set, set it to the machine name
-	if (Q_strcmp(hostname.string, "UNNAMED") == 0)
-	{
-		// see if it's a text IP address (well, close enough)
-		for (p = buff; *p; p++)
-			if ((*p < '0' || *p > '9') && *p != '.')
-				break;
-
-		// if it is a real name, strip off the domain; we only want the host
-		if (*p)
-		{
-			for (i = 0; i < 15; i++)
-				if (buff[i] == '.')
-					break;
-			buff[i] = 0;
-		}
-		Cvar_Set ("hostname", buff);
-	}
-
-	i = COM_CheckParm ("-ip");
-	if (i)
-	{
-		if (i < com_argc-1)
-		{
-			myAddr = inet_addr(com_argv[i+1]);
-			if (myAddr == INADDR_NONE)
-				Sys_Error ("%s is not a valid IP address", com_argv[i+1]);
-			strcpy(my_tcpip_address, com_argv[i+1]);
-		}
-		else
-		{
-			Sys_Error ("NET_Init: you must specify an IP address after -ip");
-		}
-	}
-	else
-	{
-		myAddr = INADDR_ANY;
-		strcpy(my_tcpip_address, "INADDR_ANY");
-	}
-
-	if ((net_controlsocket = WINS_OpenSocket (0)) == -1)
-	{
-		Con_Printf("WINS_Init: Unable to open control socket\n");
-		if (--winsock_initialized == 0)
-			pWSACleanup ();
-		return -1;
-	}
-
-	((struct sockaddr_in *)&broadcastaddr)->sin_family = AF_INET;
-	((struct sockaddr_in *)&broadcastaddr)->sin_addr.s_addr = INADDR_BROADCAST;
-	((struct sockaddr_in *)&broadcastaddr)->sin_port = htons((unsigned short)net_hostport);
-
-	Con_Printf("Winsock TCP/IP Initialized\n");
-	tcpipAvailable = true;
-
-	return net_controlsocket;
-}
-
-//=============================================================================
-
-void WINS_Shutdown (void)
-{
-	WINS_Listen (false);
-	WINS_CloseSocket (net_controlsocket);
-	if (--winsock_initialized == 0)
-		pWSACleanup ();
-}
-
-//=============================================================================
-
-void WINS_Listen (qboolean state)
-{
-	// enable listening
-	if (state)
-	{
-		if (net_acceptsocket != -1)
-			return;
-		WINS_GetLocalAddress();
-		if ((net_acceptsocket = WINS_OpenSocket (net_hostport)) == -1)
-			Sys_Error ("WINS_Listen: Unable to open accept socket\n");
-		return;
-	}
-
-	// disable listening
-	if (net_acceptsocket == -1)
-		return;
-	WINS_CloseSocket (net_acceptsocket);
-	net_acceptsocket = -1;
-}
-
-//=============================================================================
-
-int WINS_OpenSocket (int port)
-{
-	int newsocket;
-	struct sockaddr_in address;
-	u_long _true = 1;
-
-	if ((newsocket = psocket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
-		return -1;
-
-	if (pioctlsocket (newsocket, FIONBIO, &_true) == -1)
-		goto ErrorReturn;
-
-	address.sin_family = AF_INET;
-	address.sin_addr.s_addr = myAddr;
-	address.sin_port = htons((unsigned short)port);
-	if( bind (newsocket, (void *)&address, sizeof(address)) == 0)
-		return newsocket;
-
-	Sys_Error ("Unable to bind to %s", WINS_AddrToString((struct qsockaddr *)&address));
-ErrorReturn:
-	pclosesocket (newsocket);
-	return -1;
-}
-
-//=============================================================================
-
-int WINS_CloseSocket (int socket)
-{
-	if (socket == net_broadcastsocket)
-		net_broadcastsocket = 0;
-	return pclosesocket (socket);
-}
-
-
-//=============================================================================
-/*
-============
-PartialIPAddress
-
-this lets you type only as much of the net address as required, using
-the local network components to fill in the rest
-============
-*/
-static int PartialIPAddress (char *in, struct qsockaddr *hostaddr)
-{
-	char buff[256];
-	char *b;
-	int addr;
-	int num;
-	int mask;
-	int run;
-	int port;
-	
-	buff[0] = '.';
-	b = buff;
-	strcpy(buff+1, in);
-	if (buff[1] == '.')
-		b++;
-
-	addr = 0;
-	mask=-1;
-	while (*b == '.')
-	{
-		b++;
-		num = 0;
-		run = 0;
-		while (!( *b < '0' || *b > '9'))
-		{
-		  num = num*10 + *b++ - '0';
-		  if (++run > 3)
-		  	return -1;
-		}
-		if ((*b < '0' || *b > '9') && *b != '.' && *b != ':' && *b != 0)
-			return -1;
-		if (num < 0 || num > 255)
-			return -1;
-		mask<<=8;
-		addr = (addr<<8) + num;
-	}
-	
-	if (*b++ == ':')
-		port = Q_atoi(b);
-	else
-		port = net_hostport;
-
-	hostaddr->sa_family = AF_INET;
-	((struct sockaddr_in *)hostaddr)->sin_port = htons((short)port);	
-	((struct sockaddr_in *)hostaddr)->sin_addr.s_addr = (myAddr & htonl(mask)) | htonl(addr);
-	
-	return 0;
-}
-//=============================================================================
-
-int WINS_Connect (int socket, struct qsockaddr *addr)
-{
-	return 0;
-}
-
-//=============================================================================
-
-int WINS_CheckNewConnections (void)
-{
-	char buf[4096];
-
-	if (net_acceptsocket == -1)
-		return -1;
-
-	if (precvfrom (net_acceptsocket, buf, sizeof(buf), MSG_PEEK, NULL, NULL) > 0)
-	{
-		return net_acceptsocket;
-	}
-	return -1;
-}
-
-//=============================================================================
-
-int WINS_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
-{
-	int addrlen = sizeof (struct qsockaddr);
-	int ret;
-
-	ret = precvfrom (socket, buf, len, 0, (struct sockaddr *)addr, &addrlen);
-	if (ret == -1)
-	{
-		int errno = pWSAGetLastError();
-
-		if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
-			return 0;
-
-	}
-	return ret;
-}
-
-//=============================================================================
-
-int WINS_MakeSocketBroadcastCapable (int socket)
-{
-	int	i = 1;
-
-	// make this socket broadcast capable
-	if (psetsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) < 0)
-		return -1;
-	net_broadcastsocket = socket;
-
-	return 0;
-}
-
-//=============================================================================
-
-int WINS_Broadcast (int socket, byte *buf, int len)
-{
-	int ret;
-
-	if (socket != net_broadcastsocket)
-	{
-		if (net_broadcastsocket != 0)
-			Sys_Error("Attempted to use multiple broadcasts sockets\n");
-		WINS_GetLocalAddress();
-		ret = WINS_MakeSocketBroadcastCapable (socket);
-		if (ret == -1)
-		{
-			Con_Printf("Unable to make socket broadcast capable\n");
-			return ret;
-		}
-	}
-
-	return WINS_Write (socket, buf, len, &broadcastaddr);
-}
-
-//=============================================================================
-
-int WINS_Write (int socket, byte *buf, int len, struct qsockaddr *addr)
-{
-	int ret;
-
-	ret = psendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr));
-	if (ret == -1)
-		if (pWSAGetLastError() == WSAEWOULDBLOCK)
-			return 0;
-
-	return ret;
-}
-
-//=============================================================================
-
-char *WINS_AddrToString (struct qsockaddr *addr)
-{
-	static char buffer[22];
-	int haddr;
-
-	haddr = ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr);
-	sprintf(buffer, "%d.%d.%d.%d:%d", (haddr >> 24) & 0xff, (haddr >> 16) & 0xff, (haddr >> 8) & 0xff, haddr & 0xff, ntohs(((struct sockaddr_in *)addr)->sin_port));
-	return buffer;
-}
-
-//=============================================================================
-
-int WINS_StringToAddr (char *string, struct qsockaddr *addr)
-{
-	int ha1, ha2, ha3, ha4, hp;
-	int ipaddr;
-
-	sscanf(string, "%d.%d.%d.%d:%d", &ha1, &ha2, &ha3, &ha4, &hp);
-	ipaddr = (ha1 << 24) | (ha2 << 16) | (ha3 << 8) | ha4;
-
-	addr->sa_family = AF_INET;
-	((struct sockaddr_in *)addr)->sin_addr.s_addr = htonl(ipaddr);
-	((struct sockaddr_in *)addr)->sin_port = htons((unsigned short)hp);
-	return 0;
-}
-
-//=============================================================================
-
-int WINS_GetSocketAddr (int socket, struct qsockaddr *addr)
-{
-	int addrlen = sizeof(struct qsockaddr);
-	unsigned int a;
-
-	Q_memset(addr, 0, sizeof(struct qsockaddr));
-	pgetsockname(socket, (struct sockaddr *)addr, &addrlen);
-	a = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
-	if (a == 0 || a == inet_addr("127.0.0.1"))
-		((struct sockaddr_in *)addr)->sin_addr.s_addr = myAddr;
-
-	return 0;
-}
-
-//=============================================================================
-
-int WINS_GetNameFromAddr (struct qsockaddr *addr, char *name)
-{
-	struct hostent *hostentry;
-
-	hostentry = pgethostbyaddr ((char *)&((struct sockaddr_in *)addr)->sin_addr, sizeof(struct in_addr), AF_INET);
-	if (hostentry)
-	{
-		Q_strncpy (name, (char *)hostentry->h_name, NET_NAMELEN - 1);
-		return 0;
-	}
-
-	Q_strcpy (name, WINS_AddrToString (addr));
-	return 0;
-}
-
-//=============================================================================
-
-int WINS_GetAddrFromName(char *name, struct qsockaddr *addr)
-{
-	struct hostent *hostentry;
-
-	if (name[0] >= '0' && name[0] <= '9')
-		return PartialIPAddress (name, addr);
-	
-	hostentry = pgethostbyname (name);
-	if (!hostentry)
-		return -1;
-
-	addr->sa_family = AF_INET;
-	((struct sockaddr_in *)addr)->sin_port = htons((unsigned short)net_hostport);	
-	((struct sockaddr_in *)addr)->sin_addr.s_addr = *(int *)hostentry->h_addr_list[0];
-
-	return 0;
-}
-
-//=============================================================================
-
-int WINS_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
-{
-	if (addr1->sa_family != addr2->sa_family)
-		return -1;
-
-	if (((struct sockaddr_in *)addr1)->sin_addr.s_addr != ((struct sockaddr_in *)addr2)->sin_addr.s_addr)
-		return -1;
-
-	if (((struct sockaddr_in *)addr1)->sin_port != ((struct sockaddr_in *)addr2)->sin_port)
-		return 1;
-
-	return 0;
-}
-
-//=============================================================================
-
-int WINS_GetSocketPort (struct qsockaddr *addr)
-{
-	return ntohs(((struct sockaddr_in *)addr)->sin_port);
-}
-
-
-int WINS_SetSocketPort (struct qsockaddr *addr, int port)
-{
-	((struct sockaddr_in *)addr)->sin_port = htons((unsigned short)port);
-	return 0;
-}
-
-//=============================================================================
--- a/u/net_wins.h
+++ /dev/null
@@ -1,39 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_wins.h
-
-int  WINS_Init (void);
-void WINS_Shutdown (void);
-void WINS_Listen (qboolean state);
-int  WINS_OpenSocket (int port);
-int  WINS_CloseSocket (int socket);
-int  WINS_Connect (int socket, struct qsockaddr *addr);
-int  WINS_CheckNewConnections (void);
-int  WINS_Read (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  WINS_Write (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  WINS_Broadcast (int socket, byte *buf, int len);
-char *WINS_AddrToString (struct qsockaddr *addr);
-int  WINS_StringToAddr (char *string, struct qsockaddr *addr);
-int  WINS_GetSocketAddr (int socket, struct qsockaddr *addr);
-int  WINS_GetNameFromAddr (struct qsockaddr *addr, char *name);
-int  WINS_GetAddrFromName (char *name, struct qsockaddr *addr);
-int  WINS_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2);
-int  WINS_GetSocketPort (struct qsockaddr *addr);
-int  WINS_SetSocketPort (struct qsockaddr *addr, int port);
--- a/u/net_wipx.c
+++ /dev/null
@@ -1,432 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_wipx.c
-
-#include "quakedef.h"
-#include "winquake.h"
-#include <wsipx.h>
-#include "net_wipx.h"
-
-extern cvar_t hostname;
-
-#define MAXHOSTNAMELEN		256
-
-static int net_acceptsocket = -1;		// socket for fielding new connections
-static int net_controlsocket;
-static struct qsockaddr broadcastaddr;
-
-extern qboolean winsock_initialized;
-extern WSADATA		winsockdata;
-
-#define IPXSOCKETS 18
-static int ipxsocket[IPXSOCKETS];
-static int sequence[IPXSOCKETS];
-
-//=============================================================================
-
-int WIPX_Init (void)
-{
-	int		i;
-	char	buff[MAXHOSTNAMELEN];
-	struct qsockaddr addr;
-	char	*p;
-	int		r;
-	WORD	wVersionRequested; 
-
-	if (COM_CheckParm ("-noipx"))
-		return -1;
-
-// make sure LoadLibrary has happened successfully
-	if (!winsock_lib_initialized)
-		return -1;
-
-	if (winsock_initialized == 0)
-	{
-		wVersionRequested = MAKEWORD(1, 1); 
-
-		r = pWSAStartup (MAKEWORD(1, 1), &winsockdata);
-
-		if (r)
-		{
-			Con_Printf ("Winsock initialization failed.\n");
-			return -1;
-		}
-	}
-	winsock_initialized++;
-
-	for (i = 0; i < IPXSOCKETS; i++)
-		ipxsocket[i] = 0;
-
-	// determine my name & address
-	if (pgethostname(buff, MAXHOSTNAMELEN) == 0)
-	{
-		// if the quake hostname isn't set, set it to the machine name
-		if (Q_strcmp(hostname.string, "UNNAMED") == 0)
-		{
-			// see if it's a text IP address (well, close enough)
-			for (p = buff; *p; p++)
-				if ((*p < '0' || *p > '9') && *p != '.')
-					break;
-
-			// if it is a real name, strip off the domain; we only want the host
-			if (*p)
-			{
-				for (i = 0; i < 15; i++)
-					if (buff[i] == '.')
-						break;
-				buff[i] = 0;
-			}
-			Cvar_Set ("hostname", buff);
-		}
-	}
-
-	if ((net_controlsocket = WIPX_OpenSocket (0)) == -1)
-	{
-		Con_Printf("WIPX_Init: Unable to open control socket\n");
-		if (--winsock_initialized == 0)
-			pWSACleanup ();
-		return -1;
-	}
-
-	((struct sockaddr_ipx *)&broadcastaddr)->sa_family = AF_IPX;
-	memset(((struct sockaddr_ipx *)&broadcastaddr)->sa_netnum, 0, 4);
-	memset(((struct sockaddr_ipx *)&broadcastaddr)->sa_nodenum, 0xff, 6);
-	((struct sockaddr_ipx *)&broadcastaddr)->sa_socket = htons((unsigned short)net_hostport);
-
-	WIPX_GetSocketAddr (net_controlsocket, &addr);
-	Q_strcpy(my_ipx_address,  WIPX_AddrToString (&addr));
-	p = Q_strrchr (my_ipx_address, ':');
-	if (p)
-		*p = 0;
-
-	Con_Printf("Winsock IPX Initialized\n");
-	ipxAvailable = true;
-
-	return net_controlsocket;
-}
-
-//=============================================================================
-
-void WIPX_Shutdown (void)
-{
-	WIPX_Listen (false);
-	WIPX_CloseSocket (net_controlsocket);
-	if (--winsock_initialized == 0)
-		pWSACleanup ();
-}
-
-//=============================================================================
-
-void WIPX_Listen (qboolean state)
-{
-	// enable listening
-	if (state)
-	{
-		if (net_acceptsocket != -1)
-			return;
-		if ((net_acceptsocket = WIPX_OpenSocket (net_hostport)) == -1)
-			Sys_Error ("WIPX_Listen: Unable to open accept socket\n");
-		return;
-	}
-
-	// disable listening
-	if (net_acceptsocket == -1)
-		return;
-	WIPX_CloseSocket (net_acceptsocket);
-	net_acceptsocket = -1;
-}
-
-//=============================================================================
-
-int WIPX_OpenSocket (int port)
-{
-	int handle;
-	int newsocket;
-	struct sockaddr_ipx address;
-	u_long _true = 1;
-
-	for (handle = 0; handle < IPXSOCKETS; handle++)
-		if (ipxsocket[handle] == 0)
-			break;
-	if (handle == IPXSOCKETS)
-		return -1;
-
-	if ((newsocket = psocket (AF_IPX, SOCK_DGRAM, NSPROTO_IPX)) == INVALID_SOCKET)
-		return -1;
-
-	if (pioctlsocket (newsocket, FIONBIO, &_true) == -1)
-		goto ErrorReturn;
-
-	if (psetsockopt(newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&_true, sizeof(_true)) < 0)
-		goto ErrorReturn;
-
-	address.sa_family = AF_IPX;
-	memset(address.sa_netnum, 0, 4);
-	memset(address.sa_nodenum, 0, 6);;
-	address.sa_socket = htons((unsigned short)port);
-	if( bind (newsocket, (void *)&address, sizeof(address)) == 0)
-	{
-		ipxsocket[handle] = newsocket;
-		sequence[handle] = 0;
-		return handle;
-	}
-
-	Sys_Error ("Winsock IPX bind failed\n");
-ErrorReturn:
-	pclosesocket (newsocket);
-	return -1;
-}
-
-//=============================================================================
-
-int WIPX_CloseSocket (int handle)
-{
-	int socket = ipxsocket[handle];
-	int ret;
-
-	ret =  pclosesocket (socket);
-	ipxsocket[handle] = 0;
-	return ret;
-}
-
-
-//=============================================================================
-
-int WIPX_Connect (int handle, struct qsockaddr *addr)
-{
-	return 0;
-}
-
-//=============================================================================
-
-int WIPX_CheckNewConnections (void)
-{
-	unsigned long	available;
-
-	if (net_acceptsocket == -1)
-		return -1;
-
-	if (pioctlsocket (ipxsocket[net_acceptsocket], FIONREAD, &available) == -1)
-		Sys_Error ("WIPX: ioctlsocket (FIONREAD) failed\n");
-	if (available)
-		return net_acceptsocket;
-	return -1;
-}
-
-//=============================================================================
-
-static byte packetBuffer[NET_DATAGRAMSIZE + 4];
-
-int WIPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
-{
-	int addrlen = sizeof (struct qsockaddr);
-	int socket = ipxsocket[handle];
-	int ret;
-
-	ret = precvfrom (socket, packetBuffer, len+4, 0, (struct sockaddr *)addr, &addrlen);
-	if (ret == -1)
-	{
-		int errno = pWSAGetLastError();
-
-		if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
-			return 0;
-
-	}
-
-	if (ret < 4)
-		return 0;
-	
-	// remove sequence number, it's only needed for DOS IPX
-	ret -= 4;
-	memcpy(buf, packetBuffer+4, ret);
-
-	return ret;
-}
-
-//=============================================================================
-
-int WIPX_Broadcast (int handle, byte *buf, int len)
-{
-	return WIPX_Write (handle, buf, len, &broadcastaddr);
-}
-
-//=============================================================================
-
-int WIPX_Write (int handle, byte *buf, int len, struct qsockaddr *addr)
-{
-	int socket = ipxsocket[handle];
-	int ret;
-
-	// build packet with sequence number
-	*(int *)(&packetBuffer[0]) = sequence[handle];
-	sequence[handle]++;
-	memcpy(&packetBuffer[4], buf, len);
-	len += 4;
-
-	ret = psendto (socket, packetBuffer, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr));
-	if (ret == -1)
-		if (pWSAGetLastError() == WSAEWOULDBLOCK)
-			return 0;
-
-	return ret;
-}
-
-//=============================================================================
-
-char *WIPX_AddrToString (struct qsockaddr *addr)
-{
-	static char buf[28];
-
-	sprintf(buf, "%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%u",
-		((struct sockaddr_ipx *)addr)->sa_netnum[0] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_netnum[1] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_netnum[2] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_netnum[3] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_nodenum[0] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_nodenum[1] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_nodenum[2] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_nodenum[3] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_nodenum[4] & 0xff,
-		((struct sockaddr_ipx *)addr)->sa_nodenum[5] & 0xff,
-		ntohs(((struct sockaddr_ipx *)addr)->sa_socket)
-		);
-	return buf;
-}
-
-//=============================================================================
-
-int WIPX_StringToAddr (char *string, struct qsockaddr *addr)
-{
-	int  val;
-	char buf[3];
-
-	buf[2] = 0;
-	Q_memset(addr, 0, sizeof(struct qsockaddr));
-	addr->sa_family = AF_IPX;
-
-#define DO(src,dest)	\
-	buf[0] = string[src];	\
-	buf[1] = string[src + 1];	\
-	if (sscanf (buf, "%x", &val) != 1)	\
-		return -1;	\
-	((struct sockaddr_ipx *)addr)->dest = val
-
-	DO(0, sa_netnum[0]);
-	DO(2, sa_netnum[1]);
-	DO(4, sa_netnum[2]);
-	DO(6, sa_netnum[3]);
-	DO(9, sa_nodenum[0]);
-	DO(11, sa_nodenum[1]);
-	DO(13, sa_nodenum[2]);
-	DO(15, sa_nodenum[3]);
-	DO(17, sa_nodenum[4]);
-	DO(19, sa_nodenum[5]);
-#undef DO
-
-	sscanf (&string[22], "%u", &val);
-	((struct sockaddr_ipx *)addr)->sa_socket = htons((unsigned short)val);
-
-	return 0;
-}
-
-//=============================================================================
-
-int WIPX_GetSocketAddr (int handle, struct qsockaddr *addr)
-{
-	int socket = ipxsocket[handle];
-	int addrlen = sizeof(struct qsockaddr);
-	unsigned int a;
-
-	Q_memset(addr, 0, sizeof(struct qsockaddr));
-	if(pgetsockname(socket, (struct sockaddr *)addr, &addrlen) != 0)
-	{
-		int errno = pWSAGetLastError();
-	}
-
-	return 0;
-}
-
-//=============================================================================
-
-int WIPX_GetNameFromAddr (struct qsockaddr *addr, char *name)
-{
-	Q_strcpy(name, WIPX_AddrToString(addr));
-	return 0;
-}
-
-//=============================================================================
-
-int WIPX_GetAddrFromName(char *name, struct qsockaddr *addr)
-{
-	int n;
-	char buf[32];
-
-	n = Q_strlen(name);
-
-	if (n == 12)
-	{
-		sprintf(buf, "00000000:%s:%u", name, net_hostport);
-		return WIPX_StringToAddr (buf, addr);
-	}
-	if (n == 21)
-	{
-		sprintf(buf, "%s:%u", name, net_hostport);
-		return WIPX_StringToAddr (buf, addr);
-	}
-	if (n > 21 && n <= 27)
-		return WIPX_StringToAddr (name, addr);
-
-	return -1;
-}
-
-//=============================================================================
-
-int WIPX_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
-{
-	if (addr1->sa_family != addr2->sa_family)
-		return -1;
-
-	if (*((struct sockaddr_ipx *)addr1)->sa_netnum && *((struct sockaddr_ipx *)addr2)->sa_netnum)
-		if (memcmp(((struct sockaddr_ipx *)addr1)->sa_netnum, ((struct sockaddr_ipx *)addr2)->sa_netnum, 4) != 0)
-			return -1;
-	if (memcmp(((struct sockaddr_ipx *)addr1)->sa_nodenum, ((struct sockaddr_ipx *)addr2)->sa_nodenum, 6) != 0)
-		return -1;
-
-	if (((struct sockaddr_ipx *)addr1)->sa_socket != ((struct sockaddr_ipx *)addr2)->sa_socket)
-		return 1;
-
-	return 0;
-}
-
-//=============================================================================
-
-int WIPX_GetSocketPort (struct qsockaddr *addr)
-{
-	return ntohs(((struct sockaddr_ipx *)addr)->sa_socket);
-}
-
-
-int WIPX_SetSocketPort (struct qsockaddr *addr, int port)
-{
-	((struct sockaddr_ipx *)addr)->sa_socket = htons((unsigned short)port);
-	return 0;
-}
-
-//=============================================================================
--- a/u/net_wipx.h
+++ /dev/null
@@ -1,39 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// net_wipx.h
-
-int  WIPX_Init (void);
-void WIPX_Shutdown (void);
-void WIPX_Listen (qboolean state);
-int  WIPX_OpenSocket (int port);
-int  WIPX_CloseSocket (int socket);
-int  WIPX_Connect (int socket, struct qsockaddr *addr);
-int  WIPX_CheckNewConnections (void);
-int  WIPX_Read (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  WIPX_Write (int socket, byte *buf, int len, struct qsockaddr *addr);
-int  WIPX_Broadcast (int socket, byte *buf, int len);
-char *WIPX_AddrToString (struct qsockaddr *addr);
-int  WIPX_StringToAddr (char *string, struct qsockaddr *addr);
-int  WIPX_GetSocketAddr (int socket, struct qsockaddr *addr);
-int  WIPX_GetNameFromAddr (struct qsockaddr *addr, char *name);
-int  WIPX_GetAddrFromName (char *name, struct qsockaddr *addr);
-int  WIPX_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2);
-int  WIPX_GetSocketPort (struct qsockaddr *addr);
-int  WIPX_SetSocketPort (struct qsockaddr *addr, int port);
--- a/u/progdefs.q2
+++ /dev/null
@@ -1,158 +1,0 @@
-
-/* file generated by qcc, do not modify */
-
-typedef struct
-{	int	pad[28];
-	int	self;
-	int	other;
-	int	world;
-	float	time;
-	float	frametime;
-	float	force_retouch;
-	string_t	mapname;
-	string_t	startspot;
-	float	deathmatch;
-	float	coop;
-	float	teamplay;
-	float	serverflags;
-	float	total_secrets;
-	float	total_monsters;
-	float	found_secrets;
-	float	killed_monsters;
-	float	parm1;
-	float	parm2;
-	float	parm3;
-	float	parm4;
-	float	parm5;
-	float	parm6;
-	float	parm7;
-	float	parm8;
-	float	parm9;
-	float	parm10;
-	float	parm11;
-	float	parm12;
-	float	parm13;
-	float	parm14;
-	float	parm15;
-	float	parm16;
-	vec3_t	v_forward;
-	vec3_t	v_up;
-	vec3_t	v_right;
-	float	trace_allsolid;
-	float	trace_startsolid;
-	float	trace_fraction;
-	vec3_t	trace_endpos;
-	vec3_t	trace_plane_normal;
-	float	trace_plane_dist;
-	int	trace_ent;
-	float	trace_inopen;
-	float	trace_inwater;
-	int	msg_entity;
-	string_t	null;
-	func_t	main;
-	func_t	StartFrame;
-	func_t	PlayerPreThink;
-	func_t	PlayerPostThink;
-	func_t	ClientKill;
-	func_t	ClientConnect;
-	func_t	PutClientInServer;
-	func_t	ClientDisconnect;
-	func_t	SetNewParms;
-	func_t	SetChangeParms;
-} globalvars_t;
-
-typedef struct
-{
-	float	modelindex;
-	vec3_t	absmin;
-	vec3_t	absmax;
-	float	ltime;
-	float	movetype;
-	float	solid;
-	vec3_t	origin;
-	vec3_t	oldorigin;
-	vec3_t	velocity;
-	vec3_t	angles;
-	vec3_t	avelocity;
-	vec3_t	basevelocity;
-	vec3_t	punchangle;
-	string_t	classname;
-	string_t	model;
-	float	frame;
-	float	skin;
-	float	effects;
-	float	drawPercent;
-	float	gravity;
-	float	mass;
-	float	light_level;
-	vec3_t	mins;
-	vec3_t	maxs;
-	vec3_t	size;
-	func_t	touch;
-	func_t	use;
-	func_t	think;
-	func_t	blocked;
-	float	nextthink;
-	int	groundentity;
-	float	health;
-	float	frags;
-	float	weapon;
-	string_t	weaponmodel;
-	float	weaponframe;
-	float	currentammo;
-	float	ammo_shells;
-	float	ammo_nails;
-	float	ammo_rockets;
-	float	ammo_cells;
-	float	items;
-	float	items2;
-	float	takedamage;
-	int	chain;
-	float	deadflag;
-	vec3_t	view_ofs;
-	float	button0;
-	float	button1;
-	float	button2;
-	float	impulse;
-	float	fixangle;
-	vec3_t	v_angle;
-	float	idealpitch;
-	float	pitch_speed;
-	string_t	netname;
-	int	enemy;
-	float	flags;
-	float	colormap;
-	float	team;
-	float	max_health;
-	float	teleport_time;
-	float	armortype;
-	float	armorvalue;
-	float	waterlevel;
-	float	watertype;
-	float	ideal_yaw;
-	float	yaw_speed;
-	int	aiment;
-	int	goalentity;
-	float	spawnflags;
-	string_t	target;
-	string_t	targetname;
-	float	dmg_take;
-	float	dmg_save;
-	int	dmg_inflictor;
-	int	owner;
-	vec3_t	movedir;
-	string_t	message;
-	float	sounds;
-	string_t	noise;
-	string_t	noise1;
-	string_t	noise2;
-	string_t	noise3;
-	float	dmg;
-	float	dmgtime;
-	float	air_finished;
-	float	pain_finished;
-	float	radsuit_finished;
-	float	speed;
-} entvars_t;
-
-#define PROGHEADER_CRC 31586
--- a/u/q.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-dos\quake -basedir /quake -game test_gjc %1 %2 %3 %4 %5 %6 %7 %8 %9
--- a/u/qa.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-dos\quake -nocdaudio -basedir /quake -game test_am %1 %2 %3 %4 %5 %6 %7 %8 %9
--- a/u/qb.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-dos\quake /quake/test_gjc;/quake/id1 %1 %2 %3 %4 %5 %6 %7 %8 %9
binary files a/u/qe3.ico /dev/null differ
--- a/u/qt.bat
+++ /dev/null
@@ -1,1 +1,0 @@
-dos\quake /quake/test_am;/quake/test_jc;/quake/id1 %1 %2 %3 %4 %5 %6 %7 %8 %9
--- a/u/quake-data.spec.sh
+++ /dev/null
@@ -1,60 +1,0 @@
-#!/bin/sh
-# Generate quake-data.spec
-# $1 is version
-# $2 is release
-# $3 is install dir (assumed to be in /var/tmp)
-cat <<EOF
-%define name quake-data
-%define version ${1}
-%define release ${2}
-%define builddir \$RPM_BUILD_DIR/%{name}-%{version}
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Vendor:		id Software
-Packager:	Dave "Zoid" Kirsch <[email protected]>
-URL:		http://www.idsoftware.com/
-Source:		quake-data-%{version}.tar.gz
-BuildArchitectures: noarch
-Group:		Games
-Copyright:	Restricted
-Icon:		quake.gif
-BuildRoot:	/var/tmp/%{name}-%{version}
-Summary:	Quake for Linux
-
-%description
-"Quake is the biggest, baddest, and bloodiest 3-D action game ever 
-conceived" - PC GAMER
-
-"The most important PC game ever" - PC ZONE
-
-""Quake": Bloody Amazing" - USA TODAY
-
-"The Vanguard of a terrifying new level of immersive interactivity" - 
-COMPUTER GAMING WORLD
-
-From the creators of DOOM and DOOM II comes the most intense, technologically
-advanced 3-D experience ever captured on CD ROM.  Features free and fluid
-motion, ambient sound and lighting, and unmatched multiplayer capabilities
-(play with up to 15 others).
-
-This package contians the Quake data files needed to play the game.
-
-%install
-
-%files
-%attr(644,root,root) $3/comexp.txt
-%attr(644,root,root) $3/help.txt
-%attr(644,root,root) $3/licinfo.txt
-%attr(644,root,root) $3/manual.txt
-%attr(644,root,root) $3/readme.txt
-%attr(644,root,root) $3/rlicnse.txt
-%attr(644,root,root) $3/techinfo.txt
-%attr(644,root,root) $3/id1/pak0.pak
-%attr(644,root,root) $3/id1/pak1.pak
-
-%post
-/sbin/ldconfig
-
-EOF
-
--- a/u/quake-hipnotic.spec.sh
+++ /dev/null
@@ -1,113 +1,0 @@
-#!/bin/sh
-# Generate quake-hipnotic.spec
-# $1 is version
-# $2 is release
-# $3 is install dir (assumed to be in /var/tmp)
-cat <<EOF
-%define name quake-hipnotic
-%define version ${1}
-%define release ${2}
-%define builddir \$RPM_BUILD_DIR/%{name}-%{version}
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Vendor:		id Software/Ritual Entertainment
-Packager:	Dave "Zoid" Kirsch <[email protected]>
-URL:		http://www.ritual.com/
-Source:		quake-hipnotic-%{version}.tar.gz
-BuildArchitectures: noarch
-Group:		Games
-Copyright:	Restricted
-Icon:		quake.gif
-BuildRoot:	/var/tmp/%{name}-%{version}
-Summary:	Quake Hipnotic Mission Pack #1: Scourge of Armagon
-
-%description
-
-The Scourge of Armagon is the highly acclaimed mission pack for id Software's 
-Quake. Scourge offers 3 new episodes that continue off where Quake ended. Add 
-some incredible new effects such as rotating doors and objects, new creatures 
-to battle, and new weapons and powerups to assist you in these battles. 
-
-Looking for a way to breath some new life into Quake? Get Mission Pack #1: 
-Scourge of Armagon.
-
-Here is a breakdown of exactly what you will get inside Scourge of Armagon:
-
-18 Beastly Levels
-Strafe and slaughter your way through 18 levels contained in three 
-monster-infested episodes. Fight your way through the intense Military 
-Base and Research Facilities, sneak around in the Ancient Realm, and dash 
-into the final domain controlled by Armagon. You�ll also be able to tear 
-your friends apart in an all-new DeathMatch level: Edge of Oblivion.
-
-All-New Flesh-Ripping Demons
-Gremlins: Small, blood-thirsty creatures that attack in swarms and can even 
-steal your weapons. Watch out or these little bastards will turn them back on 
-you!
-
-Centroids: Armor-plated scorpion cyborgs with two nail guns fused to their 
-monstrous bodies. These bad boy monsters can shred you to bits in just 
-seconds. 
-
-Armagon: This is the father of all monsters. This huge metallic behemoth will 
-rock your world with rockets and laser fire, so be prepared to die. 
-
-Never-Before-Seen Weapons
-Mjolnir: When this war hammer pounds the floor, it fires an electrical force 
-along the ground, striking and shocking several enemies with its lethal 
-current.
-
-Laser Cannon: Disintegrate scores of creatures with scorching laser blasts. 
-Use the rebounding properties of this weapon to tag your enemies around 
-corners.
-
-Proximity Mines: Gameplay reaches new heights with motion sensitive mines. 
-Plant these nasty toys on walls, floors, or even the ceiling and watch as 
-unsuspecting foes are blown into little bits.
-
-Inventive New Powerups
-Empathy Shield: This shield allows you to turn the table on those unwitting 
-opponents. Whatever damage you take they receive half of it back in kind.
-
-Horn of Conjuring: Blow this horn and out of the mystical bowels of eternity 
-a new ally will appear. This horn allows you to call upon any of the 
-creatures in the game to come to your aid in the fight against Armagon.
-
-Wet Suit: What better way to survive under water longer. Not only that, those 
-flippers help speed you along as you paddle your way through the dangers that 
-lucky deep under the surface of those calm waters.
-
-Environmental Dangers
-Undertake atmospheric nightmares like lightning traps, floating spike mines, 
-gondolas, outdoor environments and stunning architecture never seen before in 
-Quake. Travel through the dangerous and treacherous mines under the Military 
-Base. Creep through the catacombs and dark cathedrals that lie in wait for 
-you in the Ancient Realms. Swallow your fear as you wind our way through the 
-immense fortress that protect the Lair of Armagon.
-
-System Requirements
-
-Full Version of QUAKE required to operate. 
-CD ROM drive required for Installation 
-Linux 2.0
-16 MB RAM 
-Hard Disk Space: 40 MB for Mission Pack 
-VGA & SVGA graphics support 
-Mouse support (3 Button Mouse recommended) 
-Supports IP (Internet) play 
-
-%install
-
-%files
-%attr(644,root,root) $3/hipnotic/pak0.pak
-%attr(644,root,root) $3/hipnotic/config.cfg
-%attr(644,root,root) $3/hipnotic/docs/manual.doc
-%attr(644,root,root) $3/hipnotic/docs/manual.htm
-%attr(644,root,root) $3/hipnotic/docs/manual.txt
-%attr(644,root,root) $3/hipnotic/docs/readme.doc
-%attr(644,root,root) $3/hipnotic/docs/readme.htm
-%attr(644,root,root) $3/hipnotic/docs/readme.txt
-
-EOF
-
--- a/u/quake-rogue.spec.sh
+++ /dev/null
@@ -1,108 +1,0 @@
-#!/bin/sh
-# Generate quake-rogue.spec
-# $1 is version
-# $2 is release
-# $3 is install dir (assumed to be in /var/tmp)
-cat <<EOF
-%define name quake-rogue
-%define version ${1}
-%define release ${2}
-%define builddir \$RPM_BUILD_DIR/%{name}-%{version}
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Vendor:		id Software/Rogue Entertainment
-Packager:	Dave "Zoid" Kirsch <[email protected]>
-URL:		http://www.rogue-ent.com/
-Source:		quake-rogue-%{version}.tar.gz
-BuildArchitectures: noarch
-Group:		Games
-Copyright:	Restricted
-Icon:		quake.gif
-BuildRoot:	/var/tmp/%{name}-%{version}
-Summary:	Quake Rogue Mission Pack #2: Dissolution of Eternity
-
-%description
-
-16 entirely new, and totally intense levels! The environmental experience of 
-Quake is unparalleled. Dissolution of Eternity sustains the same dynamic 
-sense of reality and dramatic visuals; yet adds an impression of purpose 
-and continuity. This expansion pack is most definitely not a conglomeration 
-of clone levels! 
-
-8 new monsters! Quake is solid, hard-hitting action with a host of evil 
-enemies. We've made additions to the Quake monster roster to intensify the 
-action and fill every dimly lit and evil corner of the game. 
-
-4 new weapons! The Quake weapons are awesome, but we've pushed them beyond 
-that with the addition of extreme power-ups to make the arsenal more 
-effective, and more deadly. 
-
-Oh yeah, the Power-Ups! 
-
-Single player mode power-ups include:
-
-The Anti-Grav Belt. The theory here is simple. It counters the force of 
-gravity and allows the player to make difficult jumps. 
-
-The Power Shield. This 'little gem' significantly decreases the damage you 
-receive from most enemy attacks. If you're feelin' frisky in Deathmatch, 
-try out the ram attack. It's an added 'weapon' to send your opponents flying. 
-
-Deathmatch will introduce the player to:
-
-The Vengeance Sphere. We'd like you to experience it before we let you in on 
-what it does. Here's a hint: Ultimate retribution from the grave! 
-
-Random Respawn. This feature will toss in a bit of Deathmatch variety. Hey, 
-we can't be responsible for what awesome power up 'pops up' next. 
-
-Multi-player!
-
-Normal Deathmatch. Friend fraggin' action! 
-Team Play. Bring a friend, to kill a foe. 
-Tag. You played it as a kid, but nothin' says "Tag!" like a face full of 
-Plasma. 
-
-And, a much enhanced version of Capture the Flag! 
-Capture the Flag. You've seen it on the Internet; now it's in your hands. 
-Additional value, additional excitement, and additional Deathmatch 'down and 
-dirty' devastation. CTF is one of the most exciting team multi-player 
-directions for Quake to date; and the most popular too! 
-
-Including two brand new CTF features. 
-
-One Flag - It's a mad race for the flag, the loser gets a rocket up his 
-privates. 
-Three Team - Red, Blue, and the new Rogue (pun intended) Grey team. The good 
-news? You can take either flag and bring to it either Red or Blue base. The 
-bad news? You don't have your own base! 
-
-Also, a collection of lethal environmental hazards have been placed at every 
-turn. They are challenging, and terminal! Here are just a few of them.
-
-The Pendulums - Set to slice the player to shreds when he least expects it! 
-Lightning Shooters - Well, they shoot lightning and can be directed at any 
-angle to make some rooms extremely hazardous. 
-Lava Nail Shooters - Well, they shoot, you get the idea here! 
-Earthquakes - Earthshaking environments! Level areas that tremor with 
-seismic activity. Now the Quake player can literally quake! 
-Buzz Saws - Compact. Cordless. And completely gib-o-matic! These dreaded 
-traps are set in floors and ceilings. 
-
-%install
-
-%files
-%attr(644,root,root) $3/rogue/pak0.pak
-%attr(644,root,root) $3/rogue/docs/manual.doc
-%attr(644,root,root) $3/rogue/docs/manual.htm
-%attr(644,root,root) $3/rogue/docs/manual.txt
-%attr(644,root,root) $3/rogue/docs/readme.doc
-%attr(644,root,root) $3/rogue/docs/readme.htm
-%attr(644,root,root) $3/rogue/docs/readme.txt
-%attr(644,root,root) $3/rogue/docs/ctf.doc
-%attr(644,root,root) $3/rogue/docs/ctf.htm
-%attr(644,root,root) $3/rogue/docs/ctf.txt
-
-EOF
-
--- a/u/quake-shareware.spec.sh
+++ /dev/null
@@ -1,69 +1,0 @@
-#!/bin/sh
-# Generate quake-shareware.spec
-# $1 is version
-# $2 is release
-# $3 is install dir (assumed to be in /var/tmp)
-cat <<EOF
-%define name quake
-%define version ${1}-shareware
-%define release ${2}
-%define builddir \$RPM_BUILD_DIR/%{name}-%{version}
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Vendor:		id Software
-Packager:	Dave "Zoid" Kirsch <[email protected]>
-URL:		http://www.idsoftware.com/
-Source:		quake-%{version}.tar.gz
-Group:		Games
-Copyright:	Restricted
-Icon:		quake.gif
-BuildRoot:	/var/tmp/%{name}-%{version}
-Summary:	Quake for Linux
-
-%description
-"Quake is the biggest, baddest, and bloodiest 3-D action game ever 
-conceived" - PC GAMER
-
-"The most important PC game ever" - PC ZONE
-
-""Quake": Bloody Amazing" - USA TODAY
-
-"The Vanguard of a terrifying new level of immersive interactivity" - 
-COMPUTER GAMING WORLD
-
-From the creators of DOOM and DOOM II comes the most intense, technologically
-advanced 3-D experience ever captured on CD ROM.  Features free and fluid
-motion, ambient sound and lighting, and unmatched multiplayer capabilities
-(play with up to 15 others).
-
-Included in this archive are several different versions of Quake.
-
-- SQuake for SVGALib Console Graphics
-- GLQuake for 3DFX and other glX based hardware OpenGL
-- Quake.X11 for running Quake under X11
-
-%install
-
-%files
-%attr(644,root,root) $3/README
-%attr(4755,root,root) $3/squake
-%attr(4755,root,root) $3/glquake
-%attr(4755,root,root) $3/glquake.glx
-%attr(4755,root,root) $3/glquake.3dfxgl
-%attr(755,root,root) $3/quake.x11
-%attr(644,root,root) $3/help.txt
-%attr(644,root,root) $3/licinfo.txt
-%attr(644,root,root) $3/manual.txt
-%attr(644,root,root) $3/readme.txt
-%attr(644,root,root) $3/slicnse.txt
-%attr(644,root,root) $3/techinfo.txt
-%attr(644,root,root) $3/id1/pak0.pak
-%attr(755,root,root) /usr/lib/lib3dfxgl.so
-%attr(755,root,root) /usr/lib/libMesaGL.so.2.6
-
-%post
-/sbin/ldconfig
-
-EOF
-
binary files a/u/quake.gif /dev/null differ
binary files a/u/quake.ico /dev/null differ
--- a/u/quake.spec.sh
+++ /dev/null
@@ -1,61 +1,0 @@
-#!/bin/sh
-# Generate quake.spec
-# $1 is version
-# $2 is release
-# $3 is install dir (assumed to be in /var/tmp)
-cat <<EOF
-%define name quake
-%define version ${1}
-%define release ${2}
-%define builddir \$RPM_BUILD_DIR/%{name}-%{version}
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Vendor:		id Software
-Packager:	Dave "Zoid" Kirsch <[email protected]>
-URL:		http://www.idsoftware.com/
-Source:		quake-%{version}.tar.gz
-Group:		Games
-Copyright:	Restricted
-Icon:		quake.gif
-BuildRoot:	/var/tmp/%{name}-%{version}
-Summary:	Quake for Linux
-
-%description
-"Quake is the biggest, baddest, and bloodiest 3-D action game ever 
-conceived" - PC GAMER
-
-"The most important PC game ever" - PC ZONE
-
-""Quake": Bloody Amazing" - USA TODAY
-
-"The Vanguard of a terrifying new level of immersive interactivity" - 
-COMPUTER GAMING WORLD
-
-From the creators of DOOM and DOOM II comes the most intense, technologically
-advanced 3-D experience ever captured on CD ROM.  Features free and fluid
-motion, ambient sound and lighting, and unmatched multiplayer capabilities
-(play with up to 15 others).
-
-Included in this archive are several different versions of Quake.
-
-- SQuake for SVGALib Console Graphics
-- GLQuake for 3DFX and other glX based hardware OpenGL
-- Quake.X11 for running Quake under X11
-
-%install
-
-%files
-%attr(644,root,root) $3/README
-%attr(4755,root,root) $3/squake
-%attr(4755,root,root) $3/glquake
-%attr(4755,root,root) $3/glquake.glx
-%attr(4755,root,root) $3/glquake.3dfxgl
-%attr(755,root,root) $3/quake.x11
-%attr(755,root,root) /usr/lib/lib3dfxgl.so
-%attr(755,root,root) /usr/lib/libMesaGL.so.2.6
-
-%post
-/sbin/ldconfig
-EOF
-
--- a/u/quakeasm.h
+++ /dev/null
@@ -1,248 +1,0 @@
-//
-// quakeasm.h: general asm header file
-//
-
-//#define GLQUAKE	1
-
-#ifdef __i386__
-#define id386
-#endif
-
-// !!! must be kept the same as in d_iface.h !!!
-#define TRANSPARENT_COLOR	255
-
-#ifndef GLQUAKE
-	.extern C(d_zistepu)
-	.extern C(d_pzbuffer)
-	.extern C(d_zistepv)
-	.extern C(d_zrowbytes)
-	.extern C(d_ziorigin)
-	.extern C(r_turb_s)
-	.extern C(r_turb_t)
-	.extern C(r_turb_pdest)
-	.extern C(r_turb_spancount)
-	.extern C(r_turb_turb)
-	.extern C(r_turb_pbase)
-	.extern C(r_turb_sstep)
-	.extern C(r_turb_tstep)
-	.extern	C(r_bmodelactive)
-	.extern	C(d_sdivzstepu)
-	.extern	C(d_tdivzstepu)
-	.extern	C(d_sdivzstepv)
-	.extern	C(d_tdivzstepv)
-	.extern	C(d_sdivzorigin)
-	.extern	C(d_tdivzorigin)
-	.extern	C(sadjust)
-	.extern	C(tadjust)
-	.extern	C(bbextents)
-	.extern	C(bbextentt)
-	.extern	C(cacheblock)
-	.extern	C(d_viewbuffer)
-	.extern	C(cachewidth)
-	.extern	C(d_pzbuffer)
-	.extern	C(d_zrowbytes)
-	.extern	C(d_zwidth)
-	.extern C(d_scantable)
-	.extern C(r_lightptr)
-	.extern C(r_numvblocks)
-	.extern C(prowdestbase)
-	.extern C(pbasesource)
-	.extern C(r_lightwidth)
-	.extern C(lightright)
-	.extern C(lightrightstep)
-	.extern C(lightdeltastep)
-	.extern C(lightdelta)
-	.extern C(lightright)
-	.extern C(lightdelta)
-	.extern C(sourcetstep)
-	.extern C(surfrowbytes)
-	.extern C(lightrightstep)
-	.extern C(lightdeltastep)
-	.extern C(r_sourcemax)
-	.extern C(r_stepback)
-	.extern C(colormap)
-	.extern C(blocksize)
-	.extern C(sourcesstep)
-	.extern C(lightleft)
-	.extern C(blockdivshift)
-	.extern C(blockdivmask)
-	.extern C(lightleftstep)
-	.extern C(r_origin)
-	.extern C(r_ppn)
-	.extern C(r_pup)
-	.extern C(r_pright)
-	.extern C(ycenter)
-	.extern C(xcenter)
-	.extern C(d_vrectbottom_particle)
-	.extern C(d_vrectright_particle)
-	.extern C(d_vrecty)
-	.extern C(d_vrectx)
-	.extern C(d_pix_shift)
-	.extern C(d_pix_min)
-	.extern C(d_pix_max)
-	.extern C(d_y_aspect_shift)
-	.extern C(screenwidth)
-	.extern C(r_leftclipped)
-	.extern C(r_leftenter)
-	.extern C(r_rightclipped)
-	.extern C(r_rightenter)
-	.extern C(modelorg)
-	.extern C(xscale)
-	.extern C(r_refdef)
-	.extern C(yscale)
-	.extern C(r_leftexit)
-	.extern C(r_rightexit)
-	.extern C(r_lastvertvalid)
-	.extern C(cacheoffset)
-	.extern C(newedges)
-	.extern C(removeedges)
-	.extern C(r_pedge)
-	.extern C(r_framecount)
-	.extern C(r_u1)
-	.extern C(r_emitted)
-	.extern C(edge_p)
-	.extern C(surface_p)
-	.extern C(surfaces)
-	.extern C(r_lzi1)
-	.extern C(r_v1)
-	.extern C(r_ceilv1)
-	.extern C(r_nearzi)
-	.extern C(r_nearzionly)
-	.extern C(edge_aftertail)
-	.extern C(edge_tail)
-	.extern C(current_iv)
-	.extern C(edge_head_u_shift20)
-	.extern C(span_p)
-	.extern C(edge_head)
-	.extern C(fv)
-	.extern C(edge_tail_u_shift20)
-	.extern C(r_apverts)
-	.extern C(r_anumverts)
-	.extern C(aliastransform)
-	.extern C(r_avertexnormals)
-	.extern C(r_plightvec)
-	.extern C(r_ambientlight)
-	.extern C(r_shadelight)
-	.extern C(aliasxcenter)
-	.extern C(aliasycenter)
-	.extern C(a_sstepxfrac)
-	.extern C(r_affinetridesc)
-	.extern C(acolormap)
-	.extern C(d_pcolormap)
-	.extern C(r_affinetridesc)
-	.extern C(d_sfrac)
-	.extern C(d_ptex)
-	.extern C(d_pedgespanpackage)
-	.extern C(d_tfrac)
-	.extern C(d_light)
-	.extern C(d_zi)
-	.extern C(d_pdest)
-	.extern C(d_pz)
-	.extern C(d_aspancount)
-	.extern C(erroradjustup)
-	.extern C(errorterm)
-	.extern C(d_xdenom)
-	.extern C(r_p0)
-	.extern C(r_p1)
-	.extern C(r_p2)
-	.extern C(a_tstepxfrac)
-	.extern C(r_sstepx)
-	.extern C(r_tstepx)
-	.extern C(a_ststepxwhole)
-	.extern C(zspantable)
-	.extern C(skintable)
-	.extern C(r_zistepx)
-	.extern C(erroradjustdown)
-	.extern C(d_countextrastep)
-	.extern C(ubasestep)
-	.extern C(a_ststepxwhole)
-	.extern C(a_tstepxfrac)
-	.extern C(r_lstepx)
-	.extern C(a_spans)
-	.extern C(erroradjustdown)
-	.extern C(d_pdestextrastep)
-	.extern C(d_pzextrastep)
-	.extern C(d_sfracextrastep)
-	.extern C(d_ptexextrastep)
-	.extern C(d_countextrastep)
-	.extern C(d_tfracextrastep)
-	.extern C(d_lightextrastep)
-	.extern C(d_ziextrastep)
-	.extern C(d_pdestbasestep)
-	.extern C(d_pzbasestep)
-	.extern C(d_sfracbasestep)
-	.extern C(d_ptexbasestep)
-	.extern C(ubasestep)
-	.extern C(d_tfracbasestep)
-	.extern C(d_lightbasestep)
-	.extern C(d_zibasestep)
-	.extern C(zspantable)
-	.extern C(r_lstepy)
-	.extern C(r_sstepy)
-	.extern C(r_tstepy)
-	.extern C(r_zistepy)
-	.extern C(D_PolysetSetEdgeTable)
-	.extern C(D_RasterizeAliasPolySmooth)
-
-	.extern float_point5
-	.extern Float2ToThe31nd
-	.extern izistep
-	.extern izi
-	.extern FloatMinus2ToThe31nd
-	.extern float_1
-	.extern float_particle_z_clip
-	.extern float_minus_1
-	.extern float_0
-	.extern fp_16
-	.extern fp_64k
-	.extern fp_1m
-	.extern fp_1m_minus_1
-	.extern fp_8 
-	.extern entryvec_table
-	.extern advancetable
-	.extern sstep
-	.extern tstep
-	.extern pspantemp
-	.extern counttemp
-	.extern jumptemp
-	.extern reciprocal_table
-	.extern DP_Count
-	.extern DP_u
-	.extern DP_v
-	.extern DP_32768
-	.extern DP_Color
-	.extern DP_Pix
-	.extern DP_EntryTable
-	.extern	pbase
-	.extern s
-	.extern t
-	.extern sfracf
-	.extern tfracf
-	.extern snext
-	.extern tnext
-	.extern	spancountminus1
-	.extern zi16stepu
-	.extern sdivz16stepu
-	.extern tdivz16stepu
-	.extern	zi8stepu
-	.extern sdivz8stepu
-	.extern tdivz8stepu
-	.extern reciprocal_table_16
-	.extern entryvec_table_16
-	.extern ceil_cw
-	.extern single_cw
-	.extern fp_64kx64k
-	.extern pz
-	.extern spr8entryvec_table
-#endif
-
-	.extern C(snd_scaletable)
-	.extern C(paintbuffer)
-	.extern C(snd_linear_count)
-	.extern C(snd_p)
-	.extern C(snd_vol)
-	.extern C(snd_out)
-	.extern C(vright)
-	.extern C(vup)
-	.extern C(vpn)
-	.extern C(BOPS_Error)
--- a/u/r_aclipa.s
+++ /dev/null
@@ -1,197 +1,0 @@
-//
-// r_aliasa.s
-// x86 assembly-language Alias model transform and project code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef id386
-
-	.data
-Ltemp0:	.long	0
-Ltemp1:	.long	0
-
-	.text
-
-#define pfv0		8+4
-#define pfv1		8+8
-#define out			8+12
-
-.globl C(R_Alias_clip_bottom)
-C(R_Alias_clip_bottom):
-	pushl	%esi
-	pushl	%edi
-
-	movl	pfv0(%esp),%esi
-	movl	pfv1(%esp),%edi
-
-	movl	C(r_refdef)+rd_aliasvrectbottom,%eax
-
-LDoForwardOrBackward:
-
-	movl	fv_v+4(%esi),%edx
-	movl	fv_v+4(%edi),%ecx
-
-	cmpl	%ecx,%edx
-	jl		LDoForward
-
-	movl	fv_v+4(%esi),%ecx
-	movl	fv_v+4(%edi),%edx
-	movl	pfv0(%esp),%edi
-	movl	pfv1(%esp),%esi
-
-LDoForward:
-
-	subl	%edx,%ecx
-	subl	%edx,%eax
-	movl	%ecx,Ltemp1
-	movl	%eax,Ltemp0
-	fildl	Ltemp1
-	fildl	Ltemp0
-	movl	out(%esp),%edx
-	movl	$2,%eax
-
-	fdivp	%st(0),%st(1)					// scale
-
-LDo3Forward:
-	fildl	fv_v+0(%esi)	// fv0v0 | scale
-	fildl	fv_v+0(%edi)	// fv1v0 | fv0v0 | scale
-	fildl	fv_v+4(%esi)	// fv0v1 | fv1v0 | fv0v0 | scale
-	fildl	fv_v+4(%edi)	// fv1v1 | fv0v1 | fv1v0 | fv0v0 | scale
-	fildl	fv_v+8(%esi)	// fv0v2 | fv1v1 | fv0v1 | fv1v0 | fv0v0 | scale
-	fildl	fv_v+8(%edi)	// fv1v2 | fv0v2 | fv1v1 | fv0v1 | fv1v0 | fv0v0 |
-							//  scale
-	fxch	%st(5)			// fv0v0 | fv0v2 | fv1v1 | fv0v1 | fv1v0 | fv1v2 |
-							//  scale
-	fsubr	%st(0),%st(4)	// fv0v0 | fv0v2 | fv1v1 | fv0v1 | fv1v0-fv0v0 |
-							//  fv1v2 | scale
-	fxch	%st(3)			// fv0v1 | fv0v2 | fv1v1 | fv0v0 | fv1v0-fv0v0 |
-							//  fv1v2 | scale
-	fsubr	%st(0),%st(2)	// fv0v1 | fv0v2 | fv1v1-fv0v1 | fv0v0 |
-							//  fv1v0-fv0v0 | fv1v2 | scale
-	fxch	%st(1)			// fv0v2 | fv0v1 | fv1v1-fv0v1 | fv0v0 |
-							//  fv1v0-fv0v0 | fv1v2 | scale
-	fsubr	%st(0),%st(5)	// fv0v2 | fv0v1 | fv1v1-fv0v1 | fv0v0 |
-							//  fv1v0-fv0v0 | fv1v2-fv0v2 | scale
-	fxch	%st(6)			// scale | fv0v1 | fv1v1-fv0v1 | fv0v0 |
-							//  fv1v0-fv0v0 | fv1v2-fv0v2 | fv0v2
-	fmul	%st(0),%st(4)	// scale | fv0v1 | fv1v1-fv0v1 | fv0v0 |
-							//  (fv1v0-fv0v0)*scale | fv1v2-fv0v2 | fv0v2
-	addl	$12,%edi
-	fmul	%st(0),%st(2)	// scale | fv0v1 | (fv1v1-fv0v1)*scale | fv0v0 |
-							//  (fv1v0-fv0v0)*scale | fv1v2-fv0v2 | fv0v2
-	addl	$12,%esi
-	addl	$12,%edx
-	fmul	%st(0),%st(5)	// scale | fv0v1 | (fv1v1-fv0v1)*scale | fv0v0 |
-							//  (fv1v0-fv0v0)*scale | (fv1v2-fv0v2)*scale |
-							//  fv0v2
-	fxch	%st(3)			// fv0v0 | fv0v1 | (fv1v1-fv0v1)*scale | scale |
-							//  (fv1v0-fv0v0)*scale | (fv1v2-fv0v2)*scale |
-							//  fv0v2
-	faddp	%st(0),%st(4)	// fv0v1 | (fv1v1-fv0v1)*scale | scale |
-							//  fv0v0+(fv1v0-fv0v0)*scale |
-							//  (fv1v2-fv0v2)*scale | fv0v2
-	faddp	%st(0),%st(1)	// fv0v1+(fv1v1-fv0v1)*scale | scale |
-							//  fv0v0+(fv1v0-fv0v0)*scale |
-							//  (fv1v2-fv0v2)*scale | fv0v2
-	fxch	%st(4)			// fv0v2 | scale | fv0v0+(fv1v0-fv0v0)*scale |
-							//  (fv1v2-fv0v2)*scale | fv0v1+(fv1v1-fv0v1)*scale
-	faddp	%st(0),%st(3)	// scale | fv0v0+(fv1v0-fv0v0)*scale |
-							//  fv0v2+(fv1v2-fv0v2)*scale |
-							//  fv0v1+(fv1v1-fv0v1)*scale
-	fxch	%st(1)			// fv0v0+(fv1v0-fv0v0)*scale | scale | 
-							//  fv0v2+(fv1v2-fv0v2)*scale |
-							//  fv0v1+(fv1v1-fv0v1)*scale
-	fadds	float_point5
-	fxch	%st(3)			// fv0v1+(fv1v1-fv0v1)*scale | scale | 
-							//  fv0v2+(fv1v2-fv0v2)*scale |
-							//  fv0v0+(fv1v0-fv0v0)*scale
-	fadds	float_point5
-	fxch	%st(2)			// fv0v2+(fv1v2-fv0v2)*scale | scale | 
-							//  fv0v1+(fv1v1-fv0v1)*scale |
-							//  fv0v0+(fv1v0-fv0v0)*scale
-	fadds	float_point5
-	fxch	%st(3)			// fv0v0+(fv1v0-fv0v0)*scale | scale | 
-							//  fv0v1+(fv1v1-fv0v1)*scale |
-							//  fv0v2+(fv1v2-fv0v2)*scale
-	fistpl	fv_v+0-12(%edx)	// scale | fv0v1+(fv1v1-fv0v1)*scale |
-							//  fv0v2+(fv1v2-fv0v2)*scale
-	fxch	%st(1)			// fv0v1+(fv1v1-fv0v1)*scale | scale |
-							//  fv0v2+(fv1v2-fv0v2)*scale | scale
-	fistpl	fv_v+4-12(%edx)	// scale | fv0v2+(fv1v2-fv0v2)*scale
-	fxch	%st(1)			// fv0v2+(fv1v2-fv0v2)*sc | scale
-	fistpl	fv_v+8-12(%edx)	// scale
-
-	decl	%eax
-	jnz		LDo3Forward
-
-	fstp	%st(0)
-
-	popl	%edi
-	popl	%esi
-
-	ret
-
-
-.globl C(R_Alias_clip_top)
-C(R_Alias_clip_top):
-	pushl	%esi
-	pushl	%edi
-
-	movl	pfv0(%esp),%esi
-	movl	pfv1(%esp),%edi
-
-	movl	C(r_refdef)+rd_aliasvrect+4,%eax
-	jmp		LDoForwardOrBackward
-
-
-
-.globl C(R_Alias_clip_right)
-C(R_Alias_clip_right):
-	pushl	%esi
-	pushl	%edi
-
-	movl	pfv0(%esp),%esi
-	movl	pfv1(%esp),%edi
-
-	movl	C(r_refdef)+rd_aliasvrectright,%eax
-
-LRightLeftEntry:
-
-
-	movl	fv_v+4(%esi),%edx
-	movl	fv_v+4(%edi),%ecx
-
-	cmpl	%ecx,%edx
-	movl	fv_v+0(%esi),%edx
-
-	movl	fv_v+0(%edi),%ecx
-	jl		LDoForward2
-
-	movl	fv_v+0(%esi),%ecx
-	movl	fv_v+0(%edi),%edx
-	movl	pfv0(%esp),%edi
-	movl	pfv1(%esp),%esi
-
-LDoForward2:
-
-	jmp		LDoForward
-
-
-.globl C(R_Alias_clip_left)
-C(R_Alias_clip_left):
-	pushl	%esi
-	pushl	%edi
-
-	movl	pfv0(%esp),%esi
-	movl	pfv1(%esp),%edi
-
-	movl	C(r_refdef)+rd_aliasvrect+0,%eax
-	jmp		LRightLeftEntry
-
-
-#endif	// id386
-
--- a/u/r_aliasa.s
+++ /dev/null
@@ -1,218 +1,0 @@
-//
-// r_aliasa.s
-// x86 assembly-language Alias model transform and project code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef id386
-
-	.data
-
-Lfloat_1:	.single	1.0
-Ltemp:		.long	0
-Lcoords:	.long	0, 0, 0
-
-	.text
-
-#define fv			12+4
-#define pstverts	12+8
-
-.globl C(R_AliasTransformAndProjectFinalVerts)
-C(R_AliasTransformAndProjectFinalVerts):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-
-//	int			i, temp;
-//	float		lightcos, *plightnormal, zi;
-//	trivertx_t	*pverts;
-
-//	pverts = r_apverts;
-	movl	C(r_apverts),%esi
-
-//	for (i=0 ; i<r_anumverts ; i++, fv++, pverts++, pstverts++)
-//	{
-	movl	pstverts(%esp),%ebp
-	movl	fv(%esp),%edi
-	movl	C(r_anumverts),%ecx
-	subl	%edx,%edx
-
-Lloop:
-
-//	// transform and project
-//		zi = 1.0 / (DotProduct(pverts->v, aliastransform[2]) +
-//				aliastransform[2][3]);
-	movb	(%esi),%dl
-	movb	%dl,Lcoords
-	fildl	Lcoords				// v[0]
-	movb	1(%esi),%dl
-	movb	%dl,Lcoords+4
-	fildl	Lcoords+4			// v[1] | v[0]
-	movb	2(%esi),%dl	
-	movb	%dl,Lcoords+8
-	fildl	Lcoords+8			// v[2] | v[1] | v[0]
-
-	fld		%st(2)				// v[0] | v[2] | v[1] | v[0]
-	fmuls	C(aliastransform)+32 // accum | v[2] | v[1] | v[0]
-	fld		%st(2)				// v[1] | accum | v[2] | v[1] | v[0]
-	fmuls	C(aliastransform)+36 // accum2 | accum | v[2] | v[1] | v[0]
-	fxch	%st(1)				// accum | accum2 | v[2] | v[1] | v[0]
-	fadds	C(aliastransform)+44 // accum | accum2 | v[2] | v[1] | v[0]
-	fld		%st(2)				// v[2] | accum | accum2 | v[2] | v[1] | v[0]
-	fmuls	C(aliastransform)+40 // accum3 | accum | accum2 | v[2] | v[1] |
-								 //  v[0]
-	fxch	%st(1)				// accum | accum3 | accum2 | v[2] | v[1] | v[0]
-	faddp	%st(0),%st(2)		// accum3 | accum | v[2] | v[1] | v[0]
-	movb	tv_lightnormalindex(%esi),%dl
-	movl	stv_s(%ebp),%eax
-	movl	%eax,fv_v+8(%edi)
-	faddp	%st(0),%st(1)		// z | v[2] | v[1] | v[0]
-
-	movl	stv_t(%ebp),%eax
-	movl	%eax,fv_v+12(%edi)
-
-//	// lighting
-//		plightnormal = r_avertexnormals[pverts->lightnormalindex];
-
-	fdivrs	Lfloat_1			// zi | v[2] | v[1] | v[0]
-
-//		fv->v[2] = pstverts->s;
-//		fv->v[3] = pstverts->t;
-//		fv->flags = pstverts->onseam;
-	movl	stv_onseam(%ebp),%eax
-	movl	%eax,fv_flags(%edi)
-
-	movl	fv_size(%edi),%eax
-	movl	stv_size(%ebp),%eax
-	movl	4(%esi),%eax
-
-	leal	(%edx,%edx,2),%eax	// index*3
-
-	fxch	%st(3)				// v[0] | v[2] | v[1] | zi
-
-//		lightcos = DotProduct (plightnormal, r_plightvec);
-	flds	C(r_avertexnormals)(,%eax,4)
-	fmuls	C(r_plightvec)
-	flds	C(r_avertexnormals)+4(,%eax,4)
-	fmuls	C(r_plightvec)+4
-	flds	C(r_avertexnormals)+8(,%eax,4)
-	fmuls	C(r_plightvec)+8
-	fxch	%st(1)
-	faddp	%st(0),%st(2)
-	fld		%st(2)				 // v[0] | laccum | laccum2 | v[0] | v[2] |
-								 //  v[1] | zi
-	fmuls	C(aliastransform)+0  // xaccum | laccum | laccum2 | v[0] | v[2] |
-								 //  v[1] | zi
-	fxch	%st(2)				 // laccum2 | laccum | xaccum | v[0] | v[2] |
-								 //  v[1] | zi
-	faddp	%st(0),%st(1)		 // laccum | xaccum | v[0] | v[2] | v[1] | zi
-
-//		temp = r_ambientlight;
-//		if (lightcos < 0)
-//		{
-	fsts	Ltemp
-	movl	C(r_ambientlight),%eax
-	movb	Ltemp+3,%dl
-	testb	$0x80,%dl
-	jz		Lsavelight	// no need to clamp if only ambient lit, because
-						//  r_ambientlight is preclamped
-
-//			temp += (int)(r_shadelight * lightcos);
-	fmuls	C(r_shadelight)
-// FIXME: fast float->int conversion?
-	fistpl	Ltemp
-	addl	Ltemp,%eax
-
-//		// clamp; because we limited the minimum ambient and shading light, we
-//		// don't have to clamp low light, just bright
-//			if (temp < 0)
-//				temp = 0;
-	jns		Lp1
-	subl	%eax,%eax
-
-//		}
-
-Lp1:
-
-//		fv->v[4] = temp;
-//
-//	// x, y, and z are scaled down by 1/2**31 in the transform, so 1/z is
-//	// scaled up by 1/2**31, and the scaling cancels out for x and y in the
-//	// projection
-//		fv->v[0] = ((DotProduct(pverts->v, aliastransform[0]) +
-//				aliastransform[0][3]) * zi) + aliasxcenter;
-//		fv->v[1] = ((DotProduct(pverts->v, aliastransform[1]) +
-//				aliastransform[1][3]) * zi) + aliasycenter;
-//		fv->v[5] = zi;
-	fxch	%st(1)				 // v[0] | xaccum | v[2] | v[1] | zi
-	fmuls	C(aliastransform)+16 // yaccum | xaccum | v[2] | v[1] | zi
-	fxch	%st(3)				 // v[1] | xaccum | v[2] | yaccum | zi
-	fld		%st(0)				 // v[1] | v[1] | xaccum | v[2] | yaccum | zi
-	fmuls	C(aliastransform)+4	 // xaccum2 | v[1] | xaccum | v[2] | yaccum |zi
-	fxch	%st(1)				 // v[1] | xaccum2 | xaccum | v[2] | yaccum |zi
-	movl	%eax,fv_v+16(%edi)
-	fmuls	C(aliastransform)+20 // yaccum2 | xaccum2 | xaccum | v[2] | yaccum|
-								 //  zi
-	fxch	%st(2)				 // xaccum | xaccum2 | yaccum2 | v[2] | yaccum|
-								 //  zi
-	fadds	C(aliastransform)+12 // xaccum | xaccum2 | yaccum2 | v[2] | yaccum|
-								 //  zi
-	fxch	%st(4)				 // yaccum | xaccum2 | yaccum2 | v[2] | xaccum|
-								 //  zi
-	fadds	C(aliastransform)+28 // yaccum | xaccum2 | yaccum2 | v[2] | xaccum|
-								 //  zi
-	fxch	%st(3)				 // v[2] | xaccum2 | yaccum2 | yaccum | xaccum|
-								 //  zi
-	fld		%st(0)				 // v[2] | v[2] | xaccum2 | yaccum2 | yaccum |
-								 //  xaccum | zi
-	fmuls	C(aliastransform)+8	 // xaccum3 | v[2] | xaccum2 | yaccum2 |yaccum|
-								 //  xaccum | zi
-	fxch	%st(1)				 // v[2] | xaccum3 | xaccum2 | yaccum2 |yaccum|
-								 //  xaccum | zi
-	fmuls	C(aliastransform)+24 // yaccum3 | xaccum3 | xaccum2 | yaccum2 |
-								 // yaccum | xaccum | zi
-	fxch	%st(5)				 // xaccum | xaccum3 | xaccum2 | yaccum2 |
-								 // yaccum | yaccum3 | zi
-	faddp	%st(0),%st(2)		 // xaccum3 | xaccum | yaccum2 | yaccum |
-								 //  yaccum3 | zi
-	fxch	%st(3)				 // yaccum | xaccum | yaccum2 | xaccum3 |
-								 //  yaccum3 | zi
-	faddp	%st(0),%st(2)		 // xaccum | yaccum | xaccum3 | yaccum3 | zi
-	addl	$(tv_size),%esi
-	faddp	%st(0),%st(2)		 // yaccum | x | yaccum3 | zi
-	faddp	%st(0),%st(2)		 // x | y | zi
-	addl	$(stv_size),%ebp
-	fmul	%st(2),%st(0)		 // x/z | y | zi
-	fxch	%st(1)				 // y | x/z | zi
-	fmul	%st(2),%st(0)		 // y/z | x/z | zi
-	fxch	%st(1)				 // x/z | y/z | zi
-	fadds	C(aliasxcenter)		 // u | y/z | zi
-	fxch	%st(1)				 // y/z | u | zi
-	fadds	C(aliasycenter)		 // v | u | zi
-	fxch	%st(2)				 // zi | u | v
-// FIXME: fast float->int conversion?
-	fistpl	fv_v+20(%edi)		 // u | v
-	fistpl	fv_v+0(%edi)		 // v
-	fistpl	fv_v+4(%edi)
-
-//	}
-
-	addl	$(fv_size),%edi
-	decl	%ecx
-	jnz		Lloop
-
-	popl	%esi				// restore register variables
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-Lsavelight:
-	fstp	%st(0)
-	jmp		Lp1
-
-#endif	// id386
-
--- a/u/r_drawa.s
+++ /dev/null
@@ -1,819 +1,0 @@
-//
-// r_drawa.s
-// x86 assembly-language edge clipping and emission code
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef	id386
-
-// !!! if these are changed, they must be changed in r_draw.c too !!!
-#define FULLY_CLIPPED_CACHED	0x80000000
-#define FRAMECOUNT_MASK			0x7FFFFFFF
-
-	.data
-
-Ld0:			.single		0.0
-Ld1:			.single		0.0
-Lstack:			.long		0
-Lfp_near_clip:	.single		NEAR_CLIP
-Lceilv0:		.long		0
-Lv:				.long		0
-Lu0:			.long		0
-Lv0:			.long		0
-Lzi0:			.long		0
-
-	.text
-
-//----------------------------------------------------------------------
-// edge clipping code
-//----------------------------------------------------------------------
-
-#define pv0		4+12
-#define pv1		8+12
-#define clip	12+12
-
-	.align 4
-.globl C(R_ClipEdge)
-C(R_ClipEdge):
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-	pushl	%ebx
-	movl	%esp,Lstack			// for clearing the stack later
-
-//	float		d0, d1, f;
-//	mvertex_t	clipvert;
-
-	movl	clip(%esp),%ebx
-	movl	pv0(%esp),%esi
-	movl	pv1(%esp),%edx
-
-//	if (clip)
-//	{
-	testl	%ebx,%ebx
-	jz		Lemit
-
-//		do
-//		{
-
-Lcliploop:
-
-//			d0 = DotProduct (pv0->position, clip->normal) - clip->dist;
-//			d1 = DotProduct (pv1->position, clip->normal) - clip->dist;
-	flds	mv_position+0(%esi)
-	fmuls	cp_normal+0(%ebx)
-	flds	mv_position+4(%esi)
-	fmuls	cp_normal+4(%ebx)
-	flds	mv_position+8(%esi)
-	fmuls	cp_normal+8(%ebx)
-	fxch	%st(1)
-	faddp	%st(0),%st(2)		// d0mul2 | d0add0
-
-	flds	mv_position+0(%edx)
-	fmuls	cp_normal+0(%ebx)
-	flds	mv_position+4(%edx)
-	fmuls	cp_normal+4(%ebx)
-	flds	mv_position+8(%edx)
-	fmuls	cp_normal+8(%ebx)
-	fxch	%st(1)
-	faddp	%st(0),%st(2)		// d1mul2 | d1add0 | d0mul2 | d0add0
-	fxch	%st(3)				// d0add0 | d1add0 | d0mul2 | d1mul2
-
-	faddp	%st(0),%st(2)		// d1add0 | dot0 | d1mul2 
-	faddp	%st(0),%st(2)		// dot0 | dot1
-
-	fsubs	cp_dist(%ebx)		// d0 | dot1
-	fxch	%st(1)				// dot1 | d0
-	fsubs	cp_dist(%ebx)		// d1 | d0
-	fxch	%st(1)
-	fstps	Ld0
-	fstps	Ld1
-
-//			if (d0 >= 0)
-//			{
-	movl	Ld0,%eax
-	movl	Ld1,%ecx
-	orl		%eax,%ecx
-	js		Lp2
-
-// both points are unclipped
-
-Lcontinue:
-
-//
-//				R_ClipEdge (&clipvert, pv1, clip->next);
-//				return;
-//			}
-//		} while ((clip = clip->next) != NULL);
-	movl	cp_next(%ebx),%ebx
-	testl	%ebx,%ebx
-	jnz		Lcliploop
-
-//	}
-
-//// add the edge
-//	R_EmitEdge (pv0, pv1);
-Lemit:
-
-//
-// set integer rounding to ceil mode, set to single precision
-//
-// FIXME: do away with by manually extracting integers from floats?
-// FIXME: set less often
-	fldcw	ceil_cw
-
-//	edge_t	*edge, *pcheck;
-//	int		u_check;
-//	float	u, u_step;
-//	vec3_t	local, transformed;
-//	float	*world;
-//	int		v, v2, ceilv0;
-//	float	scale, lzi0, u0, v0;
-//	int		side;
-
-//	if (r_lastvertvalid)
-//	{
-	cmpl	$0,C(r_lastvertvalid)
-	jz		LCalcFirst
-
-//		u0 = r_u1;
-//		v0 = r_v1;
-//		lzi0 = r_lzi1;
-//		ceilv0 = r_ceilv1;
-	movl	C(r_lzi1),%eax
-	movl	C(r_u1),%ecx
-	movl	%eax,Lzi0
-	movl	%ecx,Lu0
-	movl	C(r_v1),%ecx
-	movl	C(r_ceilv1),%eax
-	movl	%ecx,Lv0
-	movl	%eax,Lceilv0
-	jmp		LCalcSecond
-
-//	}
-
-LCalcFirst:
-
-//	else
-//	{
-//		world = &pv0->position[0];
-
-	call	LTransformAndProject	// v0 | lzi0 | u0
-
-	fsts	Lv0
-	fxch	%st(2)					// u0 | lzi0 | v0
-	fstps	Lu0						// lzi0 | v0
-	fstps	Lzi0					// v0
-
-//		ceilv0 = (int)(v0 - 2000) + 2000; // ceil(v0);
-	fistpl	Lceilv0
-
-//	}
-
-LCalcSecond:
-
-//	world = &pv1->position[0];
-	movl	%edx,%esi
-
-	call	LTransformAndProject	// v1 | lzi1 | u1
-
-	flds	Lu0						// u0 | v1 | lzi1 | u1
-	fxch	%st(3)					// u1 | v1 | lzi1 | u0
-	flds	Lzi0					// lzi0 | u1 | v1 | lzi1 | u0
-	fxch	%st(3)					// lzi1 | u1 | v1 | lzi0 | u0
-	flds	Lv0						// v0 | lzi1 | u1 | v1 | lzi0 | u0
-	fxch	%st(3)					// v1 | lzi1 | u1 | v0 | lzi0 | u0
-
-//	r_ceilv1 = (int)(r_v1 - 2000) + 2000; // ceil(r_v1);
-	fistl	C(r_ceilv1)
-
-	fldcw	single_cw				// put back normal floating-point state
-
-	fsts	C(r_v1)
-	fxch	%st(4)					// lzi0 | lzi1 | u1 | v0 | v1 | u0
-
-//	if (r_lzi1 > lzi0)
-//		lzi0 = r_lzi1;
-	fcom	%st(1)
-	fnstsw	%ax
-	testb	$1,%ah
-	jz		LP0
-	fstp	%st(0)
-	fld		%st(0)
-LP0:
-
-	fxch	%st(1)					// lzi1 | lzi0 | u1 | v0 | v1 | u0
-	fstps	C(r_lzi1)				// lzi0 | u1 | v0 | v1 | u0
-	fxch	%st(1)
-	fsts	C(r_u1)
-	fxch	%st(1)
-
-//	if (lzi0 > r_nearzi)	// for mipmap finding
-//		r_nearzi = lzi0;
-	fcoms	C(r_nearzi)
-	fnstsw	%ax
-	testb	$0x45,%ah
-	jnz		LP1
-	fsts	C(r_nearzi)
-LP1:
-
-// // for right edges, all we want is the effect on 1/z
-//	if (r_nearzionly)
-//		return;
-	movl	C(r_nearzionly),%eax
-	testl	%eax,%eax
-	jz		LP2
-LPop5AndDone:
-	movl	C(cacheoffset),%eax
-	movl	C(r_framecount),%edx
-	cmpl	$0x7FFFFFFF,%eax
-	jz		LDoPop
-	andl	$(FRAMECOUNT_MASK),%edx
-	orl		$(FULLY_CLIPPED_CACHED),%edx
-	movl	%edx,C(cacheoffset)
-
-LDoPop:
-	fstp	%st(0)			// u1 | v0 | v1 | u0
-	fstp	%st(0)			// v0 | v1 | u0
-	fstp	%st(0)			// v1 | u0
-	fstp	%st(0)			// u0
-	fstp	%st(0)
-	jmp		Ldone
-
-LP2:
-
-// // create the edge
-//	if (ceilv0 == r_ceilv1)
-//		return;		// horizontal edge
-	movl	Lceilv0,%ebx
-	movl	C(edge_p),%edi
-	movl	C(r_ceilv1),%ecx
-	movl	%edi,%edx
-	movl	C(r_pedge),%esi
-	addl	$(et_size),%edx
-	cmpl	%ecx,%ebx
-	jz		LPop5AndDone
-
-	movl	C(r_pedge),%eax
-	movl	%eax,et_owner(%edi)
-
-//	side = ceilv0 > r_ceilv1;
-//
-//	edge->nearzi = lzi0;
-	fstps	et_nearzi(%edi)		// u1 | v0 | v1 | u0
-
-//	if (side == 1)
-//	{
-	jc		LSide0
-
-LSide1:
-
-//	// leading edge (go from p2 to p1)
-
-//		u_step = ((u0 - r_u1) / (v0 - r_v1));
-	fsubrp	%st(0),%st(3)		// v0 | v1 | u0-u1
-	fsub	%st(1),%st(0)		// v0-v1 | v1 | u0-u1
-	fdivrp	%st(0),%st(2)		// v1 | ustep
-
-//	r_emitted = 1;
-	movl	$1,C(r_emitted)
-
-//	edge = edge_p++;
-	movl	%edx,C(edge_p)
-
-// pretouch next edge
-	movl	(%edx),%eax
-
-//		v2 = ceilv0 - 1;
-//		v = r_ceilv1;
-	movl	%ecx,%eax
-	leal	-1(%ebx),%ecx
-	movl	%eax,%ebx
-
-//		edge->surfs[0] = 0;
-//		edge->surfs[1] = surface_p - surfaces;
-	movl	C(surface_p),%eax
-	movl	C(surfaces),%esi
-	subl	%edx,%edx
-	subl	%esi,%eax
-	shrl	$(SURF_T_SHIFT),%eax
-	movl	%edx,et_surfs(%edi)
-	movl	%eax,et_surfs+2(%edi)
-
-	subl	%esi,%esi
-
-//		u = r_u1 + ((float)v - r_v1) * u_step;
-	movl	%ebx,Lv
-	fildl	Lv					// v | v1 | ustep
-	fsubp	%st(0),%st(1)		// v-v1 | ustep
-	fmul	%st(1),%st(0)		// (v-v1)*ustep | ustep
-	fadds	C(r_u1)				// u | ustep
-
-	jmp		LSideDone
-
-//	}
-
-LSide0:
-
-//	else
-//	{
-//	// trailing edge (go from p1 to p2)
-
-//		u_step = ((r_u1 - u0) / (r_v1 - v0));
-	fsub	%st(3),%st(0)		// u1-u0 | v0 | v1 | u0
-	fxch	%st(2)				// v1 | v0 | u1-u0 | u0
-	fsub	%st(1),%st(0)		// v1-v0 | v0 | u1-u0 | u0
-	fdivrp	%st(0),%st(2)		// v0 | ustep | u0
-
-//	r_emitted = 1;
-	movl	$1,C(r_emitted)
-
-//	edge = edge_p++;
-	movl	%edx,C(edge_p)
-
-// pretouch next edge
-	movl	(%edx),%eax
-
-//		v = ceilv0;
-//		v2 = r_ceilv1 - 1;
-	decl	%ecx
-
-//		edge->surfs[0] = surface_p - surfaces;
-//		edge->surfs[1] = 0;
-	movl	C(surface_p),%eax
-	movl	C(surfaces),%esi
-	subl	%edx,%edx
-	subl	%esi,%eax
-	shrl	$(SURF_T_SHIFT),%eax
-	movl	%edx,et_surfs+2(%edi)
-	movl	%eax,et_surfs(%edi)
-
-	movl	$1,%esi
-
-//		u = u0 + ((float)v - v0) * u_step;
-	movl	%ebx,Lv
-	fildl	Lv					// v | v0 | ustep | u0
-	fsubp	%st(0),%st(1)		// v-v0 | ustep | u0
-	fmul	%st(1),%st(0)		// (v-v0)*ustep | ustep | u0
-	faddp	%st(0),%st(2)		// ustep | u
-	fxch	%st(1)				// u | ustep
-
-//	}
-
-LSideDone:
-
-//	edge->u_step = u_step*0x100000;
-//	edge->u = u*0x100000 + 0xFFFFF;
-
-	fmuls	fp_1m				// u*0x100000 | ustep
-	fxch	%st(1)				// ustep | u*0x100000
-	fmuls	fp_1m				// ustep*0x100000 | u*0x100000
-	fxch	%st(1)				// u*0x100000 | ustep*0x100000
-	fadds	fp_1m_minus_1		// u*0x100000 + 0xFFFFF | ustep*0x100000
-	fxch	%st(1)				// ustep*0x100000 | u*0x100000 + 0xFFFFF
-	fistpl	et_u_step(%edi)		// u*0x100000 + 0xFFFFF
-	fistpl	et_u(%edi)
-
-// // we need to do this to avoid stepping off the edges if a very nearly
-// // horizontal edge is less than epsilon above a scan, and numeric error
-// // causes it to incorrectly extend to the scan, and the extension of the
-// // line goes off the edge of the screen
-// // FIXME: is this actually needed?
-//	if (edge->u < r_refdef.vrect_x_adj_shift20)
-//		edge->u = r_refdef.vrect_x_adj_shift20;
-//	if (edge->u > r_refdef.vrectright_adj_shift20)
-//		edge->u = r_refdef.vrectright_adj_shift20;
-	movl	et_u(%edi),%eax
-	movl	C(r_refdef)+rd_vrect_x_adj_shift20,%edx
-	cmpl	%edx,%eax
-	jl		LP4
-	movl	C(r_refdef)+rd_vrectright_adj_shift20,%edx
-	cmpl	%edx,%eax
-	jng		LP5
-LP4:
-	movl	%edx,et_u(%edi)
-	movl	%edx,%eax
-LP5:
-
-// // sort the edge in normally
-//	u_check = edge->u;
-//
-//	if (edge->surfs[0])
-//		u_check++;	// sort trailers after leaders
-	addl	%esi,%eax
-
-//	if (!newedges[v] || newedges[v]->u >= u_check)
-//	{
-	movl	C(newedges)(,%ebx,4),%esi
-	testl	%esi,%esi
-	jz		LDoFirst
-	cmpl	%eax,et_u(%esi)
-	jl		LNotFirst
-LDoFirst:
-
-//		edge->next = newedges[v];
-//		newedges[v] = edge;
-	movl	%esi,et_next(%edi)
-	movl	%edi,C(newedges)(,%ebx,4)
-
-	jmp		LSetRemove
-
-//	}
-
-LNotFirst:
-
-//	else
-//	{
-//		pcheck = newedges[v];
-//
-//		while (pcheck->next && pcheck->next->u < u_check)
-//			pcheck = pcheck->next;
-LFindInsertLoop:
-	movl	%esi,%edx
-	movl	et_next(%esi),%esi
-	testl	%esi,%esi
-	jz		LInsertFound
-	cmpl	%eax,et_u(%esi)
-	jl		LFindInsertLoop
-
-LInsertFound:
-
-//		edge->next = pcheck->next;
-//		pcheck->next = edge;
-	movl	%esi,et_next(%edi)
-	movl	%edi,et_next(%edx)
-
-//	}
-
-LSetRemove:
-
-//	edge->nextremove = removeedges[v2];
-//	removeedges[v2] = edge;
-	movl	C(removeedges)(,%ecx,4),%eax
-	movl	%edi,C(removeedges)(,%ecx,4)
-	movl	%eax,et_nextremove(%edi)
-
-Ldone:
-	movl	Lstack,%esp			// clear temporary variables from stack
-
-	popl	%ebx				// restore register variables
-	popl	%edi
-	popl	%esi
-	ret
-
-// at least one point is clipped
-
-Lp2:
-	testl	%eax,%eax
-	jns		Lp1
-
-//			else
-//			{
-//			// point 0 is clipped
-
-//				if (d1 < 0)
-//				{
-	movl	Ld1,%eax
-	testl	%eax,%eax
-	jns		Lp3
-
-//				// both points are clipped
-//				// we do cache fully clipped edges
-//					if (!leftclipped)
-	movl	C(r_leftclipped),%eax
-	movl	C(r_pedge),%ecx
-	testl	%eax,%eax
-	jnz		Ldone
-
-//						r_pedge->framecount = r_framecount;
-	movl	C(r_framecount),%eax
-	andl	$(FRAMECOUNT_MASK),%eax
-	orl		$(FULLY_CLIPPED_CACHED),%eax
-	movl	%eax,C(cacheoffset)
-
-//					return;
-	jmp		Ldone
-
-//				}
-
-Lp1:
-
-//			// point 0 is unclipped
-//				if (d1 >= 0)
-//				{
-//				// both points are unclipped
-//					continue;
-
-//			// only point 1 is clipped
-
-//				f = d0 / (d0 - d1);
-	flds	Ld0
-	flds	Ld1
-	fsubr	%st(1),%st(0)
-
-//			// we don't cache partially clipped edges
-	movl	$0x7FFFFFFF,C(cacheoffset)
-
-	fdivrp	%st(0),%st(1)
-
-	subl	$(mv_size),%esp			// allocate space for clipvert
-
-//				clipvert.position[0] = pv0->position[0] +
-//						f * (pv1->position[0] - pv0->position[0]);
-//				clipvert.position[1] = pv0->position[1] +
-//						f * (pv1->position[1] - pv0->position[1]);
-//				clipvert.position[2] = pv0->position[2] +
-//						f * (pv1->position[2] - pv0->position[2]);
-	flds	mv_position+8(%edx)
-	fsubs	mv_position+8(%esi)
-	flds	mv_position+4(%edx)
-	fsubs	mv_position+4(%esi)
-	flds	mv_position+0(%edx)
-	fsubs	mv_position+0(%esi)		// 0 | 1 | 2
-
-// replace pv1 with the clip point
-	movl	%esp,%edx
-	movl	cp_leftedge(%ebx),%eax
-	testb	%al,%al
-
-	fmul	%st(3),%st(0)
-	fxch	%st(1)					// 1 | 0 | 2
-	fmul	%st(3),%st(0)
-	fxch	%st(2)					// 2 | 0 | 1
-	fmulp	%st(0),%st(3)			// 0 | 1 | 2
-	fadds	mv_position+0(%esi)
-	fxch	%st(1)					// 1 | 0 | 2
-	fadds	mv_position+4(%esi)
-	fxch	%st(2)					// 2 | 0 | 1
-	fadds	mv_position+8(%esi)
-	fxch	%st(1)					// 0 | 2 | 1
-	fstps	mv_position+0(%esp)		// 2 | 1
-	fstps	mv_position+8(%esp)		// 1
-	fstps	mv_position+4(%esp)
-
-//				if (clip->leftedge)
-//				{
-	jz		Ltestright
-
-//					r_leftclipped = true;
-//					r_leftexit = clipvert;
-	movl	$1,C(r_leftclipped)
-	movl	mv_position+0(%esp),%eax
-	movl	%eax,C(r_leftexit)+mv_position+0
-	movl	mv_position+4(%esp),%eax
-	movl	%eax,C(r_leftexit)+mv_position+4
-	movl	mv_position+8(%esp),%eax
-	movl	%eax,C(r_leftexit)+mv_position+8
-
-	jmp		Lcontinue
-
-//				}
-
-Ltestright:
-//				else if (clip->rightedge)
-//				{
-	testb	%ah,%ah
-	jz		Lcontinue
-
-//					r_rightclipped = true;
-//					r_rightexit = clipvert;
-	movl	$1,C(r_rightclipped)
-	movl	mv_position+0(%esp),%eax
-	movl	%eax,C(r_rightexit)+mv_position+0
-	movl	mv_position+4(%esp),%eax
-	movl	%eax,C(r_rightexit)+mv_position+4
-	movl	mv_position+8(%esp),%eax
-	movl	%eax,C(r_rightexit)+mv_position+8
-
-//				}
-//
-//				R_ClipEdge (pv0, &clipvert, clip->next);
-//				return;
-//			}
-	jmp		Lcontinue
-
-//			}
-
-Lp3:
-
-//			// only point 0 is clipped
-//				r_lastvertvalid = false;
-
-	movl	$0,C(r_lastvertvalid)
-
-//				f = d0 / (d0 - d1);
-	flds	Ld0
-	flds	Ld1
-	fsubr	%st(1),%st(0)
-
-//			// we don't cache partially clipped edges
-	movl	$0x7FFFFFFF,C(cacheoffset)
-
-	fdivrp	%st(0),%st(1)
-
-	subl	$(mv_size),%esp			// allocate space for clipvert
-
-//				clipvert.position[0] = pv0->position[0] +
-//						f * (pv1->position[0] - pv0->position[0]);
-//				clipvert.position[1] = pv0->position[1] +
-//						f * (pv1->position[1] - pv0->position[1]);
-//				clipvert.position[2] = pv0->position[2] +
-//						f * (pv1->position[2] - pv0->position[2]);
-	flds	mv_position+8(%edx)
-	fsubs	mv_position+8(%esi)
-	flds	mv_position+4(%edx)
-	fsubs	mv_position+4(%esi)
-	flds	mv_position+0(%edx)
-	fsubs	mv_position+0(%esi)		// 0 | 1 | 2
-
-	movl	cp_leftedge(%ebx),%eax
-	testb	%al,%al
-
-	fmul	%st(3),%st(0)
-	fxch	%st(1)					// 1 | 0 | 2
-	fmul	%st(3),%st(0)
-	fxch	%st(2)					// 2 | 0 | 1
-	fmulp	%st(0),%st(3)			// 0 | 1 | 2
-	fadds	mv_position+0(%esi)
-	fxch	%st(1)					// 1 | 0 | 2
-	fadds	mv_position+4(%esi)
-	fxch	%st(2)					// 2 | 0 | 1
-	fadds	mv_position+8(%esi)
-	fxch	%st(1)					// 0 | 2 | 1
-	fstps	mv_position+0(%esp)		// 2 | 1
-	fstps	mv_position+8(%esp)		// 1
-	fstps	mv_position+4(%esp)
-
-// replace pv0 with the clip point
-	movl	%esp,%esi
-
-//				if (clip->leftedge)
-//				{
-	jz		Ltestright2
-
-//					r_leftclipped = true;
-//					r_leftenter = clipvert;
-	movl	$1,C(r_leftclipped)
-	movl	mv_position+0(%esp),%eax
-	movl	%eax,C(r_leftenter)+mv_position+0
-	movl	mv_position+4(%esp),%eax
-	movl	%eax,C(r_leftenter)+mv_position+4
-	movl	mv_position+8(%esp),%eax
-	movl	%eax,C(r_leftenter)+mv_position+8
-
-	jmp		Lcontinue
-
-//				}
-
-Ltestright2:
-//				else if (clip->rightedge)
-//				{
-	testb	%ah,%ah
-	jz		Lcontinue
-
-//					r_rightclipped = true;
-//					r_rightenter = clipvert;
-	movl	$1,C(r_rightclipped)
-	movl	mv_position+0(%esp),%eax
-	movl	%eax,C(r_rightenter)+mv_position+0
-	movl	mv_position+4(%esp),%eax
-	movl	%eax,C(r_rightenter)+mv_position+4
-	movl	mv_position+8(%esp),%eax
-	movl	%eax,C(r_rightenter)+mv_position+8
-
-//				}
-	jmp		Lcontinue
-
-// %esi = vec3_t point to transform and project
-// %edx preserved
-LTransformAndProject:
-
-//	// transform and project
-//		VectorSubtract (world, modelorg, local);
-	flds	mv_position+0(%esi)
-	fsubs	C(modelorg)+0
-	flds	mv_position+4(%esi)
-	fsubs	C(modelorg)+4
-	flds	mv_position+8(%esi)	
-	fsubs	C(modelorg)+8
-	fxch	%st(2)				// local[0] | local[1] | local[2]
-
-//		TransformVector (local, transformed);
-//	
-//		if (transformed[2] < NEAR_CLIP)
-//			transformed[2] = NEAR_CLIP;
-//	
-//		lzi0 = 1.0 / transformed[2];
-	fld		%st(0)				// local[0] | local[0] | local[1] | local[2]
-	fmuls	C(vpn)+0			// zm0 | local[0] | local[1] | local[2]
-	fld		%st(1)				// local[0] | zm0 | local[0] | local[1] |
-								//  local[2]
-	fmuls	C(vright)+0			// xm0 | zm0 | local[0] | local[1] | local[2]
-	fxch	%st(2)				// local[0] | zm0 | xm0 | local[1] | local[2]
-	fmuls	C(vup)+0			// ym0 |  zm0 | xm0 | local[1] | local[2]
-	fld		%st(3)				// local[1] | ym0 |  zm0 | xm0 | local[1] |
-								//  local[2]
-	fmuls	C(vpn)+4			// zm1 | ym0 | zm0 | xm0 | local[1] |
-								//  local[2]
-	fld		%st(4)				// local[1] | zm1 | ym0 | zm0 | xm0 |
-								//  local[1] | local[2]
-	fmuls	C(vright)+4			// xm1 | zm1 | ym0 |  zm0 | xm0 |
-								//  local[1] | local[2]
-	fxch	%st(5)				// local[1] | zm1 | ym0 | zm0 | xm0 |
-								//  xm1 | local[2]
-	fmuls	C(vup)+4			// ym1 | zm1 | ym0 | zm0 | xm0 |
-								//  xm1 | local[2]
-	fxch	%st(1)				// zm1 | ym1 | ym0 | zm0 | xm0 |
-								//  xm1 | local[2]
-	faddp	%st(0),%st(3)		// ym1 | ym0 | zm2 | xm0 | xm1 | local[2]
-	fxch	%st(3)				// xm0 | ym0 | zm2 | ym1 | xm1 | local[2]
-	faddp	%st(0),%st(4)		// ym0 | zm2 | ym1 | xm2 | local[2]
-	faddp	%st(0),%st(2)		// zm2 | ym2 | xm2 | local[2]
-	fld		%st(3)				// local[2] | zm2 | ym2 | xm2 | local[2]
-	fmuls	C(vpn)+8			// zm3 | zm2 | ym2 | xm2 | local[2]
-	fld		%st(4)				// local[2] | zm3 | zm2 | ym2 | xm2 | local[2]
-	fmuls	C(vright)+8			// xm3 | zm3 | zm2 | ym2 | xm2 | local[2]
-	fxch	%st(5)				// local[2] | zm3 | zm2 | ym2 | xm2 | xm3
-	fmuls	C(vup)+8			// ym3 | zm3 | zm2 | ym2 | xm2 | xm3
-	fxch	%st(1)				// zm3 | ym3 | zm2 | ym2 | xm2 | xm3
-	faddp	%st(0),%st(2)		// ym3 | zm4 | ym2 | xm2 | xm3
-	fxch	%st(4)				// xm3 | zm4 | ym2 | xm2 | ym3
-	faddp	%st(0),%st(3)		// zm4 | ym2 | xm4 | ym3
-	fxch	%st(1)				// ym2 | zm4 | xm4 | ym3
-	faddp	%st(0),%st(3)		// zm4 | xm4 | ym4
-
-	fcoms	Lfp_near_clip
-	fnstsw	%ax
-	testb	$1,%ah
-	jz		LNoClip
-	fstp	%st(0)
-	flds	Lfp_near_clip
-
-LNoClip:
-
-	fdivrs	float_1				// lzi0 | x | y
-	fxch	%st(1)				// x | lzi0 | y
-
-//	// FIXME: build x/yscale into transform?
-//		scale = xscale * lzi0;
-//		u0 = (xcenter + scale*transformed[0]);
-	flds	C(xscale)			// xscale | x | lzi0 | y
-	fmul	%st(2),%st(0)		// scale | x | lzi0 | y
-	fmulp	%st(0),%st(1)		// scale*x | lzi0 | y
-	fadds	C(xcenter)			// u0 | lzi0 | y
-
-//		if (u0 < r_refdef.fvrectx_adj)
-//			u0 = r_refdef.fvrectx_adj;
-//		if (u0 > r_refdef.fvrectright_adj)
-//			u0 = r_refdef.fvrectright_adj;
-// FIXME: use integer compares of floats?
-	fcoms	C(r_refdef)+rd_fvrectx_adj
-	fnstsw	%ax
-	testb	$1,%ah
-	jz		LClampP0
-	fstp	%st(0)
-	flds	C(r_refdef)+rd_fvrectx_adj
-LClampP0:
-	fcoms	C(r_refdef)+rd_fvrectright_adj
-	fnstsw	%ax
-	testb	$0x45,%ah
-	jnz		LClampP1
-	fstp	%st(0)
-	flds	C(r_refdef)+rd_fvrectright_adj
-LClampP1:
-
-	fld		%st(1)				// lzi0 | u0 | lzi0 | y
-
-//		scale = yscale * lzi0;
-//		v0 = (ycenter - scale*transformed[1]);
-	fmuls	C(yscale)			// scale | u0 | lzi0 | y
-	fmulp	%st(0),%st(3)		// u0 | lzi0 | scale*y
-	fxch	%st(2)				// scale*y | lzi0 | u0
-	fsubrs	C(ycenter)			// v0 | lzi0 | u0
-
-//		if (v0 < r_refdef.fvrecty_adj)
-//			v0 = r_refdef.fvrecty_adj;
-//		if (v0 > r_refdef.fvrectbottom_adj)
-//			v0 = r_refdef.fvrectbottom_adj;
-// FIXME: use integer compares of floats?
-	fcoms	C(r_refdef)+rd_fvrecty_adj
-	fnstsw	%ax
-	testb	$1,%ah
-	jz		LClampP2
-	fstp	%st(0)
-	flds	C(r_refdef)+rd_fvrecty_adj
-LClampP2:
-	fcoms	C(r_refdef)+rd_fvrectbottom_adj
-	fnstsw	%ax
-	testb	$0x45,%ah
-	jnz		LClampP3
-	fstp	%st(0)
-	flds	C(r_refdef)+rd_fvrectbottom_adj
-LClampP3:
-	ret
-
-#endif	// id386
-
--- a/u/r_edgea.s
+++ /dev/null
@@ -1,731 +1,0 @@
-//
-// r_edgea.s
-// x86 assembly-language edge-processing code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-
-#ifdef	id386
-
-	.data
-Ltemp:					.long	0
-float_1_div_0100000h:	.long	0x35800000	// 1.0/(float)0x100000
-float_point_999:		.single	0.999
-float_1_point_001:		.single	1.001
-
-	.text
-
-//--------------------------------------------------------------------
-
-#define edgestoadd	4+8		// note odd stack offsets because of interleaving
-#define edgelist	8+12	// with pushes
-
-.globl C(R_EdgeCodeStart)
-C(R_EdgeCodeStart):
-
-.globl C(R_InsertNewEdges)
-C(R_InsertNewEdges):
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	movl	edgestoadd(%esp),%edx
-	pushl	%ebx
-	movl	edgelist(%esp),%ecx
-
-LDoNextEdge:
-	movl	et_u(%edx),%eax
-	movl	%edx,%edi
-
-LContinueSearch:
-	movl	et_u(%ecx),%ebx
-	movl	et_next(%ecx),%esi
-	cmpl	%ebx,%eax
-	jle		LAddedge
-	movl	et_u(%esi),%ebx
-	movl	et_next(%esi),%ecx
-	cmpl	%ebx,%eax
-	jle		LAddedge2
-	movl	et_u(%ecx),%ebx
-	movl	et_next(%ecx),%esi
-	cmpl	%ebx,%eax
-	jle		LAddedge
-	movl	et_u(%esi),%ebx
-	movl	et_next(%esi),%ecx
-	cmpl	%ebx,%eax
-	jg		LContinueSearch
-
-LAddedge2:
-	movl	et_next(%edx),%edx
-	movl	et_prev(%esi),%ebx
-	movl	%esi,et_next(%edi)
-	movl	%ebx,et_prev(%edi)
-	movl	%edi,et_next(%ebx)
-	movl	%edi,et_prev(%esi)
-	movl	%esi,%ecx
-
-	cmpl	$0,%edx
-	jnz		LDoNextEdge
-	jmp		LDone
-
-	.align 4
-LAddedge:
-	movl	et_next(%edx),%edx
-	movl	et_prev(%ecx),%ebx
-	movl	%ecx,et_next(%edi)
-	movl	%ebx,et_prev(%edi)
-	movl	%edi,et_next(%ebx)
-	movl	%edi,et_prev(%ecx)
-
-	cmpl	$0,%edx
-	jnz		LDoNextEdge
-
-LDone:
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-
-	ret
-
-//--------------------------------------------------------------------
-
-#define predge	4+4
-
-.globl C(R_RemoveEdges)
-C(R_RemoveEdges):
-	pushl	%ebx
-	movl	predge(%esp),%eax
-
-Lre_loop:
-	movl	et_next(%eax),%ecx
-	movl	et_nextremove(%eax),%ebx
-	movl	et_prev(%eax),%edx
-	testl	%ebx,%ebx
-	movl	%edx,et_prev(%ecx)
-	jz		Lre_done
-	movl	%ecx,et_next(%edx)
-
-	movl	et_next(%ebx),%ecx
-	movl	et_prev(%ebx),%edx
-	movl	et_nextremove(%ebx),%eax
-	movl	%edx,et_prev(%ecx)
-	testl	%eax,%eax
-	movl	%ecx,et_next(%edx)
-	jnz		Lre_loop
-
-	popl	%ebx
-	ret
-
-Lre_done:
-	movl	%ecx,et_next(%edx)
-	popl	%ebx
-
-	ret
-
-//--------------------------------------------------------------------
-
-#define pedgelist	4+4		// note odd stack offset because of interleaving
-							// with pushes
-
-.globl C(R_StepActiveU)
-C(R_StepActiveU):
-	pushl	%edi
-	movl	pedgelist(%esp),%edx
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-	movl	et_prev(%edx),%esi
-
-LNewEdge:
-	movl	et_u(%esi),%edi
-
-LNextEdge:
-	movl	et_u(%edx),%eax
-	movl	et_u_step(%edx),%ebx
-	addl	%ebx,%eax
-	movl	et_next(%edx),%esi
-	movl	%eax,et_u(%edx)
-	cmpl	%edi,%eax
-	jl		LPushBack
-
-	movl	et_u(%esi),%edi
-	movl	et_u_step(%esi),%ebx
-	addl	%ebx,%edi
-	movl	et_next(%esi),%edx
-	movl	%edi,et_u(%esi)
-	cmpl	%eax,%edi
-	jl		LPushBack2
-
-	movl	et_u(%edx),%eax
-	movl	et_u_step(%edx),%ebx
-	addl	%ebx,%eax
-	movl	et_next(%edx),%esi
-	movl	%eax,et_u(%edx)
-	cmpl	%edi,%eax
-	jl		LPushBack
-
-	movl	et_u(%esi),%edi
-	movl	et_u_step(%esi),%ebx
-	addl	%ebx,%edi
-	movl	et_next(%esi),%edx
-	movl	%edi,et_u(%esi)
-	cmpl	%eax,%edi
-	jnl		LNextEdge
-
-LPushBack2:
-	movl	%edx,%ebx
-	movl	%edi,%eax
-	movl	%esi,%edx
-	movl	%ebx,%esi
-
-LPushBack:
-// push it back to keep it sorted
-	movl	et_prev(%edx),%ecx
-	movl	et_next(%edx),%ebx
-
-// done if the -1 in edge_aftertail triggered this
-	cmpl	$(C(edge_aftertail)),%edx
-	jz		LUDone
-
-// pull the edge out of the edge list
-	movl	et_prev(%ecx),%edi
-	movl	%ecx,et_prev(%esi)
-	movl	%ebx,et_next(%ecx)
-
-// find out where the edge goes in the edge list
-LPushBackLoop:
-	movl	et_prev(%edi),%ecx
-	movl	et_u(%edi),%ebx
-	cmpl	%ebx,%eax
-	jnl		LPushBackFound
-
-	movl	et_prev(%ecx),%edi
-	movl	et_u(%ecx),%ebx
-	cmpl	%ebx,%eax
-	jl		LPushBackLoop
-
-	movl	%ecx,%edi
-
-// put the edge back into the edge list
-LPushBackFound:
-	movl	et_next(%edi),%ebx
-	movl	%edi,et_prev(%edx)
-	movl	%ebx,et_next(%edx)
-	movl	%edx,et_next(%edi)
-	movl	%edx,et_prev(%ebx)
-
-	movl	%esi,%edx
-	movl	et_prev(%esi),%esi
-
-	cmpl	$(C(edge_tail)),%edx
-	jnz		LNewEdge
-
-LUDone:
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-
-	ret
-
-//--------------------------------------------------------------------
-
-#define surf	4		// note this is loaded before any pushes
-
-	.align 4
-TrailingEdge:
-	movl	st_spanstate(%esi),%eax	// check for edge inversion
-	decl	%eax
-	jnz		LInverted
-
-	movl	%eax,st_spanstate(%esi)
-	movl	st_insubmodel(%esi),%ecx
-	movl	0x12345678,%edx		// surfaces[1].st_next
-LPatch0:
-	movl	C(r_bmodelactive),%eax
-	subl	%ecx,%eax
-	cmpl	%esi,%edx
-	movl	%eax,C(r_bmodelactive)
-	jnz		LNoEmit				// surface isn't on top, just remove
-
-// emit a span (current top going away)
-	movl	et_u(%ebx),%eax
-	shrl	$20,%eax				// iu = integral pixel u
-	movl	st_last_u(%esi),%edx
-	movl	st_next(%esi),%ecx
-	cmpl	%edx,%eax
-	jle		LNoEmit2				// iu <= surf->last_u, so nothing to emit
-
-	movl	%eax,st_last_u(%ecx)	// surf->next->last_u = iu;
-	subl	%edx,%eax
-	movl	%edx,espan_t_u(%ebp)		// span->u = surf->last_u;
-
-	movl	%eax,espan_t_count(%ebp)	// span->count = iu - span->u;
-	movl	C(current_iv),%eax
-	movl	%eax,espan_t_v(%ebp)		// span->v = current_iv;
-	movl	st_spans(%esi),%eax
-	movl	%eax,espan_t_pnext(%ebp)	// span->pnext = surf->spans;
-	movl	%ebp,st_spans(%esi)			// surf->spans = span;
-	addl	$(espan_t_size),%ebp
-
-	movl	st_next(%esi),%edx		// remove the surface from the surface
-	movl	st_prev(%esi),%esi		// stack
-
-	movl	%edx,st_next(%esi)
-	movl	%esi,st_prev(%edx)
-	ret
-
-LNoEmit2:
-	movl	%eax,st_last_u(%ecx)	// surf->next->last_u = iu;
-	movl	st_next(%esi),%edx		// remove the surface from the surface
-	movl	st_prev(%esi),%esi		// stack
-
-	movl	%edx,st_next(%esi)
-	movl	%esi,st_prev(%edx)
-	ret
-
-LNoEmit:
-	movl	st_next(%esi),%edx		// remove the surface from the surface
-	movl	st_prev(%esi),%esi		// stack
-
-	movl	%edx,st_next(%esi)
-	movl	%esi,st_prev(%edx)
-	ret
-
-LInverted:
-	movl	%eax,st_spanstate(%esi)
-	ret
-
-//--------------------------------------------------------------------
-
-// trailing edge only
-Lgs_trailing:
-	pushl	$Lgs_nextedge
-	jmp		TrailingEdge
-
-
-.globl C(R_GenerateSpans)
-C(R_GenerateSpans):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-// clear active surfaces to just the background surface
-	movl	C(surfaces),%eax
-	movl	C(edge_head_u_shift20),%edx
-	addl	$(st_size),%eax
-// %ebp = span_p throughout
-	movl	C(span_p),%ebp
-
-	movl	$0,C(r_bmodelactive)
-
-	movl	%eax,st_next(%eax)
-	movl	%eax,st_prev(%eax)
-	movl	%edx,st_last_u(%eax)
-	movl	C(edge_head)+et_next,%ebx		// edge=edge_head.next
-
-// generate spans
-	cmpl	$(C(edge_tail)),%ebx		// done if empty list
-	jz		Lgs_lastspan
-
-Lgs_edgeloop:
-
-	movl	et_surfs(%ebx),%edi
-	movl	C(surfaces),%eax
-	movl	%edi,%esi
-	andl	$0xFFFF0000,%edi
-	andl	$0xFFFF,%esi
-	jz		Lgs_leading		// not a trailing edge
-
-// it has a left surface, so a surface is going away for this span
-	shll	$(SURF_T_SHIFT),%esi
-	addl	%eax,%esi
-	testl	%edi,%edi
-	jz		Lgs_trailing
-
-// both leading and trailing
-	call	TrailingEdge
-	movl	C(surfaces),%eax
-
-// ---------------------------------------------------------------
-// handle a leading edge
-// ---------------------------------------------------------------
-
-Lgs_leading:
-	shrl	$16-SURF_T_SHIFT,%edi
-	movl	C(surfaces),%eax
-	addl	%eax,%edi
-	movl	0x12345678,%esi		// surf2 = surfaces[1].next;
-LPatch2:
-	movl	st_spanstate(%edi),%edx
-	movl	st_insubmodel(%edi),%eax
-	testl	%eax,%eax
-	jnz		Lbmodel_leading
-
-// handle a leading non-bmodel edge
-
-// don't start a span if this is an inverted span, with the end edge preceding
-// the start edge (that is, we've already seen the end edge)
-	testl	%edx,%edx
-	jnz		Lxl_done
-
-
-// if (surf->key < surf2->key)
-//		goto newtop;
-	incl	%edx
-	movl	st_key(%edi),%eax
-	movl	%edx,st_spanstate(%edi)
-	movl	st_key(%esi),%ecx
-	cmpl	%ecx,%eax
-	jl		Lnewtop
-
-// main sorting loop to search through surface stack until insertion point
-// found. Always terminates because background surface is sentinel
-// do
-// {
-// 		surf2 = surf2->next;
-// } while (surf->key >= surf2->key);
-Lsortloopnb:
-	movl	st_next(%esi),%esi
-	movl	st_key(%esi),%ecx
-	cmpl	%ecx,%eax
-	jge		Lsortloopnb
-
-	jmp		LInsertAndExit
-
-
-// handle a leading bmodel edge
-	.align	4
-Lbmodel_leading:
-
-// don't start a span if this is an inverted span, with the end edge preceding
-// the start edge (that is, we've already seen the end edge)
-	testl	%edx,%edx
-	jnz		Lxl_done
-
-	movl	C(r_bmodelactive),%ecx
-	incl	%edx
-	incl	%ecx
-	movl	%edx,st_spanstate(%edi)
-	movl	%ecx,C(r_bmodelactive)
-
-// if (surf->key < surf2->key)
-//		goto newtop;
-	movl	st_key(%edi),%eax
-	movl	st_key(%esi),%ecx
-	cmpl	%ecx,%eax
-	jl		Lnewtop
-
-// if ((surf->key == surf2->key) && surf->insubmodel)
-// {
-	jz		Lzcheck_for_newtop
-
-// main sorting loop to search through surface stack until insertion point
-// found. Always terminates because background surface is sentinel
-// do
-// {
-// 		surf2 = surf2->next;
-// } while (surf->key > surf2->key);
-Lsortloop:
-	movl	st_next(%esi),%esi
-	movl	st_key(%esi),%ecx
-	cmpl	%ecx,%eax
-	jg		Lsortloop
-
-	jne		LInsertAndExit
-
-// Do 1/z sorting to see if we've arrived in the right position
-	movl	et_u(%ebx),%eax
-	subl	$0xFFFFF,%eax
-	movl	%eax,Ltemp
-	fildl	Ltemp
-
-	fmuls	float_1_div_0100000h // fu = (float)(edge->u - 0xFFFFF) *
-								//      (1.0 / 0x100000);
-
-	fld		%st(0)				// fu | fu
-	fmuls	st_d_zistepu(%edi)	// fu*surf->d_zistepu | fu
-	flds	C(fv)					// fv | fu*surf->d_zistepu | fu
-	fmuls	st_d_zistepv(%edi)	// fv*surf->d_zistepv | fu*surf->d_zistepu | fu
-	fxch	%st(1)				// fu*surf->d_zistepu | fv*surf->d_zistepv | fu
-	fadds	st_d_ziorigin(%edi)	// fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fv*surf->d_zistepv | fu
-
-	flds	st_d_zistepu(%esi)	// surf2->d_zistepu |
-								//  fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fv*surf->d_zistepv | fu
-	fmul	%st(3),%st(0)		// fu*surf2->d_zistepu |
-								//  fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fv*surf->d_zistepv | fu
-	fxch	%st(1)				// fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fu*surf2->d_zistepu |
-								//  fv*surf->d_zistepv | fu
-	faddp	%st(0),%st(2)		// fu*surf2->d_zistepu | newzi | fu
-
-	flds	C(fv)					// fv | fu*surf2->d_zistepu | newzi | fu
-	fmuls	st_d_zistepv(%esi)	// fv*surf2->d_zistepv |
-								//  fu*surf2->d_zistepu | newzi | fu
-	fld		%st(2)				// newzi | fv*surf2->d_zistepv |
-								//  fu*surf2->d_zistepu | newzi | fu
-	fmuls	float_point_999		// newzibottom | fv*surf2->d_zistepv |
-								//  fu*surf2->d_zistepu | newzi | fu
-
-	fxch	%st(2)				// fu*surf2->d_zistepu | fv*surf2->d_zistepv |
-								//  newzibottom | newzi | fu
-	fadds	st_d_ziorigin(%esi)	// fu*surf2->d_zistepu + surf2->d_ziorigin |
-								//  fv*surf2->d_zistepv | newzibottom | newzi |
-								//  fu
-	faddp	%st(0),%st(1)		// testzi | newzibottom | newzi | fu
-	fxch	%st(1)				// newzibottom | testzi | newzi | fu
-
-// if (newzibottom >= testzi)
-//     goto Lgotposition;
-
-	fcomp	%st(1)				// testzi | newzi | fu
-
-	fxch	%st(1)				// newzi | testzi | fu
-	fmuls	float_1_point_001	// newzitop | testzi | fu
-	fxch	%st(1)				// testzi | newzitop | fu
-
-	fnstsw	%ax
-	testb	$0x01,%ah
-	jz		Lgotposition_fpop3
-
-// if (newzitop >= testzi)
-// {
-
-	fcomp	%st(1)				// newzitop | fu
-	fnstsw	%ax
-	testb	$0x45,%ah
-	jz		Lsortloop_fpop2
-
-// if (surf->d_zistepu >= surf2->d_zistepu)
-//     goto newtop;
-
-	flds	st_d_zistepu(%edi)	// surf->d_zistepu | newzitop| fu
-	fcomps	st_d_zistepu(%esi)	// newzitop | fu
-	fnstsw	%ax
-	testb	$0x01,%ah
-	jz		Lgotposition_fpop2
-
-	fstp	%st(0)				// clear the FPstack
-	fstp	%st(0)
-	movl	st_key(%edi),%eax
-	jmp		Lsortloop
-
-
-Lgotposition_fpop3:
-	fstp	%st(0)
-Lgotposition_fpop2:
-	fstp	%st(0)
-	fstp	%st(0)
-	jmp		LInsertAndExit
-
-
-// emit a span (obscures current top)
-
-Lnewtop_fpop3:
-	fstp	%st(0)
-Lnewtop_fpop2:
-	fstp	%st(0)
-	fstp	%st(0)
-	movl	st_key(%edi),%eax		// reload the sorting key
-
-Lnewtop:
-	movl	et_u(%ebx),%eax
-	movl	st_last_u(%esi),%edx
-	shrl	$20,%eax				// iu = integral pixel u
-	movl	%eax,st_last_u(%edi)	// surf->last_u = iu;
-	cmpl	%edx,%eax
-	jle		LInsertAndExit			// iu <= surf->last_u, so nothing to emit
-
-	subl	%edx,%eax
-	movl	%edx,espan_t_u(%ebp)		// span->u = surf->last_u;
-
-	movl	%eax,espan_t_count(%ebp)	// span->count = iu - span->u;
-	movl	C(current_iv),%eax
-	movl	%eax,espan_t_v(%ebp)		// span->v = current_iv;
-	movl	st_spans(%esi),%eax
-	movl	%eax,espan_t_pnext(%ebp)	// span->pnext = surf->spans;
-	movl	%ebp,st_spans(%esi)			// surf->spans = span;
-	addl	$(espan_t_size),%ebp
-
-LInsertAndExit:
-// insert before surf2
-	movl	%esi,st_next(%edi)		// surf->next = surf2;
-	movl	st_prev(%esi),%eax
-	movl	%eax,st_prev(%edi)		// surf->prev = surf2->prev;
-	movl	%edi,st_prev(%esi)		// surf2->prev = surf;
-	movl	%edi,st_next(%eax)		// surf2->prev->next = surf;
-
-// ---------------------------------------------------------------
-// leading edge done
-// ---------------------------------------------------------------
-
-// ---------------------------------------------------------------
-// see if there are any more edges
-// ---------------------------------------------------------------
-
-Lgs_nextedge:
-	movl	et_next(%ebx),%ebx
-	cmpl	$(C(edge_tail)),%ebx
-	jnz		Lgs_edgeloop
-
-// clean up at the right edge
-Lgs_lastspan:
-
-// now that we've reached the right edge of the screen, we're done with any
-// unfinished surfaces, so emit a span for whatever's on top
-	movl	0x12345678,%esi		// surfaces[1].st_next
-LPatch3:
-	movl	C(edge_tail_u_shift20),%eax
-	xorl	%ecx,%ecx
-	movl	st_last_u(%esi),%edx
-	subl	%edx,%eax
-	jle		Lgs_resetspanstate
-
-	movl	%edx,espan_t_u(%ebp)
-	movl	%eax,espan_t_count(%ebp)
-	movl	C(current_iv),%eax
-	movl	%eax,espan_t_v(%ebp)
-	movl	st_spans(%esi),%eax
-	movl	%eax,espan_t_pnext(%ebp)
-	movl	%ebp,st_spans(%esi)
-	addl	$(espan_t_size),%ebp
-
-// reset spanstate for all surfaces in the surface stack
-Lgs_resetspanstate:
-	movl	%ecx,st_spanstate(%esi)
-	movl	st_next(%esi),%esi
-	cmpl	$0x12345678,%esi		// &surfaces[1]
-LPatch4:
-	jnz		Lgs_resetspanstate
-
-// store the final span_p
-	movl	%ebp,C(span_p)
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-
-// ---------------------------------------------------------------
-// 1/z sorting for bmodels in the same leaf
-// ---------------------------------------------------------------
-	.align	4
-Lxl_done:
-	incl	%edx
-	movl	%edx,st_spanstate(%edi)
-
-	jmp		Lgs_nextedge
-
-
-	.align	4
-Lzcheck_for_newtop:
-	movl	et_u(%ebx),%eax
-	subl	$0xFFFFF,%eax
-	movl	%eax,Ltemp
-	fildl	Ltemp
-
-	fmuls	float_1_div_0100000h // fu = (float)(edge->u - 0xFFFFF) *
-								//      (1.0 / 0x100000);
-
-	fld		%st(0)				// fu | fu
-	fmuls	st_d_zistepu(%edi)	// fu*surf->d_zistepu | fu
-	flds	C(fv)				// fv | fu*surf->d_zistepu | fu
-	fmuls	st_d_zistepv(%edi)	// fv*surf->d_zistepv | fu*surf->d_zistepu | fu
-	fxch	%st(1)				// fu*surf->d_zistepu | fv*surf->d_zistepv | fu
-	fadds	st_d_ziorigin(%edi)	// fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fv*surf->d_zistepv | fu
-
-	flds	st_d_zistepu(%esi)	// surf2->d_zistepu |
-								//  fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fv*surf->d_zistepv | fu
-	fmul	%st(3),%st(0)		// fu*surf2->d_zistepu |
-								//  fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fv*surf->d_zistepv | fu
-	fxch	%st(1)				// fu*surf->d_zistepu + surf->d_ziorigin |
-								//  fu*surf2->d_zistepu |
-								//  fv*surf->d_zistepv | fu
-	faddp	%st(0),%st(2)		// fu*surf2->d_zistepu | newzi | fu
-
-	flds	C(fv)				// fv | fu*surf2->d_zistepu | newzi | fu
-	fmuls	st_d_zistepv(%esi)	// fv*surf2->d_zistepv |
-								//  fu*surf2->d_zistepu | newzi | fu
-	fld		%st(2)				// newzi | fv*surf2->d_zistepv |
-								//  fu*surf2->d_zistepu | newzi | fu
-	fmuls	float_point_999		// newzibottom | fv*surf2->d_zistepv |
-								//  fu*surf2->d_zistepu | newzi | fu
-
-	fxch	%st(2)				// fu*surf2->d_zistepu | fv*surf2->d_zistepv |
-								//  newzibottom | newzi | fu
-	fadds	st_d_ziorigin(%esi)	// fu*surf2->d_zistepu + surf2->d_ziorigin |
-								//  fv*surf2->d_zistepv | newzibottom | newzi |
-								//  fu
-	faddp	%st(0),%st(1)		// testzi | newzibottom | newzi | fu
-	fxch	%st(1)				// newzibottom | testzi | newzi | fu
-
-// if (newzibottom >= testzi)
-//     goto newtop;
-
-	fcomp	%st(1)				// testzi | newzi | fu
-
-	fxch	%st(1)				// newzi | testzi | fu
-	fmuls	float_1_point_001	// newzitop | testzi | fu
-	fxch	%st(1)				// testzi | newzitop | fu
-
-	fnstsw	%ax
-	testb	$0x01,%ah
-	jz		Lnewtop_fpop3
-
-// if (newzitop >= testzi)
-// {
-
-	fcomp	%st(1)				// newzitop | fu
-	fnstsw	%ax
-	testb	$0x45,%ah
-	jz		Lsortloop_fpop2
-
-// if (surf->d_zistepu >= surf2->d_zistepu)
-//     goto newtop;
-
-	flds	st_d_zistepu(%edi)	// surf->d_zistepu | newzitop | fu
-	fcomps	st_d_zistepu(%esi)	// newzitop | fu
-	fnstsw	%ax
-	testb	$0x01,%ah
-	jz		Lnewtop_fpop2
-
-Lsortloop_fpop2:
-	fstp	%st(0)				// clear the FP stack
-	fstp	%st(0)
-	movl	st_key(%edi),%eax
-	jmp		Lsortloop
-
-
-.globl C(R_EdgeCodeEnd)
-C(R_EdgeCodeEnd):
-
-
-//----------------------------------------------------------------------
-// Surface array address code patching routine
-//----------------------------------------------------------------------
-
-	.align 4
-.globl C(R_SurfacePatch)
-C(R_SurfacePatch):
-
-	movl	C(surfaces),%eax
-	addl	$(st_size),%eax
-	movl	%eax,LPatch4-4
-
-	addl	$(st_next),%eax
-	movl	%eax,LPatch0-4
-	movl	%eax,LPatch2-4
-	movl	%eax,LPatch3-4
-
-	ret
-
-#endif	// id386
-
--- a/u/r_varsa.s
+++ /dev/null
@@ -1,45 +1,0 @@
-//
-// r_varsa.s
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-#include "d_ifacea.h"
-
-#ifdef id386
-
-	.data
-
-//-------------------------------------------------------
-// ASM-only variables
-//-------------------------------------------------------
-.globl	float_1, float_particle_z_clip, float_point5
-.globl	float_minus_1, float_0
-float_0:		.single	0.0
-float_1:		.single	1.0
-float_minus_1:	.single	-1.0
-float_particle_z_clip:	.single	PARTICLE_Z_CLIP
-float_point5:	.single	0.5
-
-.globl	fp_16, fp_64k, fp_1m, fp_64kx64k
-.globl	fp_1m_minus_1
-.globl	fp_8 
-fp_1m:			.single	1048576.0
-fp_1m_minus_1:	.single	1048575.0
-fp_64k:			.single	65536.0
-fp_8:			.single	8.0
-fp_16:			.single	16.0
-fp_64kx64k:		.long	0x4f000000	// (float)0x8000*0x10000
-
-
-.globl	FloatZero, Float2ToThe31nd, FloatMinus2ToThe31nd
-FloatZero:				.long	0
-Float2ToThe31nd:		.long	0x4f000000
-FloatMinus2ToThe31nd:	.long	0xcf000000
-
-.globl	C(r_bmodelactive)
-C(r_bmodelactive):	.long	0
-
-#endif	// id386
-
--- a/u/resource.h
+++ /dev/null
@@ -1,20 +1,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by winquake.rc
-//
-#define IDS_STRING1                     1
-#define IDI_ICON2                       1
-#define IDD_DIALOG1                     108
-#define IDD_PROGRESS                    109
-#define IDC_PROGRESS                    1000
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        111
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1004
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
--- a/u/scitech/INCLUDE/DEBUG.H
+++ /dev/null
@@ -1,290 +1,0 @@
-/****************************************************************************
-*
-*                   Copyright (C) 1996 SciTech Software
-*                           All rights reserved.
-*
-* Filename:     $Workfile:   debug.h  $
-* Version:      $Revision:   1.17  $
-*
-* Language:     ANSI C
-* Environment:  any
-*
-* Description:  General header file for operating system portable code.
-*
-* $Date:   04 Mar 1997 11:34:08  $ $Author:   KendallB  $
-*
-****************************************************************************/
-
-#ifndef __DEBUG_H
-#define __DEBUG_H
-
-/* We have the following defines to identify the compilation environment:
- *
- *	__16BIT__		Compiling for 16 bit code (any environment)
- *  __32BIT__       Compiling for 32 bit code (any environment)
- *	__MSDOS__		Compiling for MS-DOS (includes __WINDOWS16__, __WIN386__)
- *  __REALDOS__     Compiling for MS-DOS (excludes __WINDOWS16__)
- *  __MSDOS16__ 	Compiling for 16 bit MS-DOS
- *  __MSDOS32__ 	Compiling for 32 bit MS-DOS
- *  __WINDOWS__ 	Compiling for Windows
- *	__WINDOWS16__	Compiling for 16 bit Windows (__MSDOS__ also defined)
- *	__WINDOWS32__	Compiling for 32 bit Windows
- *  __WIN386__      Compiling for Watcom C++ Win386 extended Windows
- *  __OS2__     	Compiling for OS/2
- *  __OS2_16__  	Compiling for 16 bit OS/2
- *  __OS2_32__ 		Compiling for 32 bit OS/2
- *  __UNIX__   		Compiling for Unix
- *
- */
-
-#ifdef	__SC__
-#if		__INTSIZE == 4
-#define __SC386__
-#endif
-#endif
-
-#ifdef	__GNUC__
-#define	__cdecl			/* GCC doesn't know about __cdecl modifiers		*/
-#define	__FLAT__		/* GCC is always 32 bit flat model				*/
-#define	__HAS_BOOL__	/* Latest GNU C++ has bool type					*/
-#endif
-
-#ifdef	__BORLANDC__
-#if	(__BORLANDC__ >= 0x500) || defined(CLASSLIB_DEFS_H)
-#define	__HAS_BOOL__	/* Borland C++ 5.0 and later define bool type	*/
-#endif
-#endif
-
-/* For the Metaware High C/C++ compiler, there is no _cdecl calling
- * convention. The conventions can be changed, but it is a complicated
- * process involving #pragmas, and all externally referenced functions
- * will use stack based calling conventions. We also need to change the
- * global aliasing conventions to use underscores for external function
- * and variables names, so that our assembler routines will link
- * correctly (except of course the main function - man what a PAIN!).
- */
-
-#ifdef	__HIGHC__
-#define	__cdecl
-#define	__FLAT__	/* High C is always 32 bit flat model				*/
-#pragma Global_aliasing_convention("_%r")
-extern main();
-#pragma Alias(main,"main")
-#endif
-
-#if     defined(__MSDOS__) || defined(__DOS__) || defined(__DPMI32__) || (defined(M_I86) && !defined(__SC386__))
-#ifndef __MSDOS__
-#define __MSDOS__
-#endif
-#if     defined(__386__) || defined(__FLAT__) || defined(__NT__) || defined(__SC386__)
-#ifndef	__MSDOS32__
-#define __MSDOS32__
-#endif
-#ifndef	__32BIT__
-#define __32BIT__
-#endif
-#ifndef __REALDOS__
-#define __REALDOS__
-#endif
-#elif   (defined(_Windows) || defined(_WINDOWS)) && !defined(__DPMI16__)
-#ifndef	__16BIT__
-#define	__16BIT__
-#endif
-#ifndef __WINDOWS16__
-#define	__WINDOWS16__
-#endif
-#ifndef __WINDOWS__
-#define __WINDOWS__
-#endif
-#ifndef	__MSDOS__
-#define	__MSDOS__
-#endif
-#else
-#ifndef	__16BIT__
-#define	__16BIT__
-#endif
-#ifndef __MSDOS16__
-#define __MSDOS16__
-#endif
-#ifndef __REALDOS__
-#define __REALDOS__
-#endif
-#endif
-#elif   defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-#ifndef	__32BIT__
-#define __32BIT__
-#endif
-#ifndef	__WINDOWS32__
-#define	__WINDOWS32__
-#endif
-#ifndef	_WIN32
-#define	_WIN32					/* Microsoft Win32 SDK headers use _WIN32 */
-#endif
-#ifndef	WIN32
-#define	WIN32					/* OpenGL headers use WIN32 */
-#endif
-#ifndef __WINDOWS__
-#define __WINDOWS__
-#endif
-#elif   defined(__WINDOWS_386__)
-#ifndef	__32BIT__
-#define __32BIT__
-#endif
-#ifndef __WIN386__
-#define __WIN386__
-#endif
-#ifndef __WINDOWS__
-#define __WINDOWS__
-#endif
-#ifndef	__MSDOS__
-#define	__MSDOS__
-#endif
-#elif   defined(__OS2__)
-#ifndef __OS2__                 /* TODO: to be completed */
-#define __OS2__
-#define	__OS2_32__				/* Default to 32 bit OS/2 */
-#endif
-#else
-#define __UNIX__				/* TODO: to be completed */
-#endif
-
-/* We have the following defines to define the calling conventions for
- * publicly accesible functions:
- *
- *  _PUBAPI - Compiler default calling conventions for all public 'C' functions
- *  _ASMAPI - Calling conventions for all public assembler functions
- *  _DLLAPI - Calling conventions for all DLL exported functions
- *  _DLLVAR - Modifier to export/import globals in 32 bit DLL's
- *  _EXPORT - Expands to _export when compiling a DLL
- *  _VARAPI - Modifiers for variables; Watcom C++ mangles C++ globals
- */
-
-#define _PUBAPI	
-#define _ASMAPI __cdecl
-
-#if defined(_MSC_VER) && defined(_WIN32) && !defined(__SC__)
-#define __PASCAL    __stdcall
-#define __export
-#define	__import
-#else
-#define __PASCAL    __pascal
-#endif
-
-#if defined(__WATCOMC__)
-#define	_VARAPI		__cdecl
-#else
-#define	_VARAPI
-#endif
-
-#if     defined(__WINDOWS__)
-#ifdef  BUILD_DLL
-#define _DLLASM __export __cdecl
-#define _EXPORT __export
-#ifdef  __WINDOWS32__
-#define _DLLAPI __export __PASCAL
-#define _DLLVAR __export
-#else
-#define _DLLAPI  __export __far __pascal
-#define _DLLVAR
-#endif
-#else
-#define _DLLASM __cdecl
-#define	_EXPORT
-#ifdef  __WINDOWS32__
-#define _DLLAPI __PASCAL
-#define _DLLVAR __import
-#else
-#define _DLLAPI __far __pascal
-#define _DLLVAR
-#endif
-#endif
-#else
-#define _EXPORT
-#define _DLLAPI
-#define _DLLVAR
-#endif
-
-/* Useful macros */
-
-#define PRIVATE static
-#define PUBLIC
-
-#ifdef  DEBUG
-#       define DBG(x) x
-#else
-#       define DBG(x)
-#endif
-
-#ifndef NULL
-#       define NULL 0L
-#endif
-
-#ifndef MAX
-#       define MAX(a,b) ( ((a) > (b)) ? (a) : (b))
-#endif
-#ifndef MIN
-#       define MIN(a,b) ( ((a) < (b)) ? (a) : (b))
-#endif
-#ifndef ABS
-#       define ABS(a)   ((a) >= 0 ? (a) : -(a))
-#endif
-#ifndef	SIGN
-#		define SIGN(a)	((a) > 0 ? 1 : -1)
-#endif
-
-/* General typedefs */
-
-#ifndef __GENDEFS
-#define __GENDEFS
-typedef unsigned char   uchar;
-typedef unsigned short  ushort;
-typedef unsigned int    uint;
-typedef unsigned long   ulong;
-typedef int             ibool;		/* Integer boolean type			*/
-#ifndef	__cplusplus
-#define	bool			ibool		/* Standard C					*/
-#else
-#ifndef	__HAS_BOOL__
-#define	bool			ibool		/* Older C++ compilers			*/
-#endif
-#endif	/* __cplusplus */
-#endif  /* __GENDEFS */
-
-/* Includes Windows headers, as they define TRUE and FALSE */
-
-#ifdef	__WINDOWS__
-#ifndef _WINDOWS_                   /* Dont include if already included */
-#ifndef __WIN386__
-#define STRICT
-#define	WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#endif
-#endif
-
-/* Boolean truth values */
-
-#undef	false
-#undef	true
-#undef	NO
-#undef	YES
-#undef	FALSE
-#undef	TRUE
-
-#ifdef	__cplusplus					/* Cast to bool's for C++ code		*/
-#define false       ((bool)0)
-#define true        ((bool)1)
-#define NO          ((bool)0)
-#define YES         ((bool)1)
-#define FALSE       ((bool)0)
-#define TRUE        ((bool)1)
-#else								/* Define to 0 and 1 for C code		*/
-#define false       0
-#define true        1
-#define NO          0
-#define YES         1
-#define FALSE       0
-#define TRUE        1
-#endif
-
-#endif  /* __DEBUG_H */
--- a/u/scitech/INCLUDE/MGLDOS.H
+++ /dev/null
@@ -1,83 +1,0 @@
-/****************************************************************************
-*
-*						MegaGraph Graphics Library
-*
-*                   Copyright (C) 1996 SciTech Software.
-*							All rights reserved.
-*
-* Filename:		$Workfile:   mgldos.h  $
-* Version:		$Revision:   1.9  $
-*
-* Language:		ANSI C
-* Environment:	IBM PC (MS DOS)
-*
-* Description:	Header file for the MGLDOS binding for the MSDOS environment.
-*
-* $Date:   30 Jan 1997 17:31:58  $ $Author:   KendallB  $
-*
-****************************************************************************/
-
-#ifndef	__MGLDOS_H
-#define	__MGLDOS_H
-
-#ifndef MGLDOS
-#define	MGLDOS
-#endif
-
-/*---------------------- Macros and type definitions ----------------------*/
-
-typedef void	*MGL_HWND;
-
-/*------------------------- Function Prototypes ---------------------------*/
-
-#ifdef	__cplusplus
-extern "C" {			/* Use "C" linkage when in C++ mode	*/
-#endif
-
-/* Initialise the MGL for fullscreen output */
-
-bool	MGLAPI MGL_init(m_int *driver,m_int *mode,const char *mglpath);
-
-/* Change the active display mode. You must destroy all display device
- * contexts before calling this function, and re-create them again with
- * the new display mode. Does not affect any event handling hooks.
- */
-
-bool	MGLAPI MGL_changeDisplayMode(m_int mode);
-
-/* Disable/enable event handling (call before calling MGL_init */
-
-void 	MGLAPI MGL_useEvents(bool use);
-
-/* Device context management */
-
-MGLDC	* MGLAPI MGL_createDisplayDC(m_int numBuffers);
-MGLDC	* MGLAPI MGL_createScrollingDC(m_int virtualX,m_int virtualY,m_int numBuffers);
-MGLDC	* MGLAPI MGL_createOffscreenDC(void);
-MGLDC	* MGLAPI MGL_createLinearOffscreenDC(void);
-MGLDC 	* MGLAPI MGL_createMemoryDC(m_int xSize,m_int ySize,m_int bitsPerPixel,pixel_format_t *pf);
-bool	MGLAPI MGL_destroyDC(MGLDC *dc);
-
-/* Generic helper functions */
-
-ulong	MGLAPI MGL_getTicks(void);
-ulong	MGLAPI MGL_getTickResolution(void);
-void	MGLAPI MGL_delay(m_int millseconds);
-void	MGLAPI MGL_beep(m_int freq,m_int milliseconds);
-void	MGLAPI MGL_suspend(void);
-void	MGLAPI MGL_resume(void);
-
-/* Fullscreen specific routines */
-
-void	MGLAPI MGL_setPaletteSnowLevel(MGLDC *dc,m_int level);
-m_int	MGLAPI MGL_getPaletteSnowLevel(MGLDC *dc);
-
-/* Determine if a specific scancode'ed key is held down (PC specific) */
-
-bool	MGLAPI EVT_isKeyDown(uchar scanCode);
-
-#ifdef	__cplusplus
-}						/* End of "C" linkage for C++	*/
-#endif
-
-#endif	/* __MGLDOS_H */
--- a/u/scitech/INCLUDE/MGLWIN.H
+++ /dev/null
@@ -1,152 +1,0 @@
-/****************************************************************************
-*
-*						MegaGraph Graphics Library
-*
-*                   Copyright (C) 1996 SciTech Software.
-*							All rights reserved.
-*
-* Filename:		$Workfile:   mglwin.h  $
-* Version:		$Revision:   1.14  $
-*
-* Language:		ANSI C
-* Environment:	IBM PC (MS DOS)
-*
-* Description:	Header file for the MGLWIN bindings for MS Windows using
-*				WinG in a window and WinDirect for full screen. The MGLWIN
-*				binding only targets Win32 applications, so cannot be used
-*				for 16 bit Windows development.
-*
-* $Date:   14 Mar 1997 16:09:34  $ $Author:   KendallB  $
-*
-****************************************************************************/
-
-#ifndef	__MGLWIN_H
-#define	__MGLWIN_H
-
-#ifndef MGLWIN
-#define	MGLWIN
-#endif
-
-/*---------------------- Macros and type definitions ----------------------*/
-
-typedef HWND		MGL_HWND;
-typedef	HDC			MGL_HDC;
-typedef	HINSTANCE	MGL_HINSTANCE;
-
-/*------------------------- Function Prototypes ---------------------------*/
-
-#ifdef	__cplusplus
-extern "C" {			/* Use "C" linkage when in C++ mode	*/
-#endif
-
-/* Initialise the MGL for fullscreen output */
-
-bool	MGLAPI MGL_init(m_int *driver,m_int *mode,const char *mglpath);
-
-/* Initialise the MGL just for Windowed output, not full screen */
-
-bool	MGLAPI MGL_initWindowed(const char *mglpath);
-
-/* Function to register a fullscreen window with the MGL. If you wish
- * for the MGL to use your own window for fullscreen modes, you can
- * register it with this function. Note that when the MGL goes into
- * fullscreen modes, the attributes, size and position of the window are
- * modified to make it into a fullscreen Window necessary to cover the
- * entire desktop, and the state of the window will be restore to the original
- * format on return to normal GDI mode.
- *
- * Note that if you are using a common window for Windowed mode and fullscreen
- * modes of your application, you will need to ensure that certain messages
- * that you window normally handles in windowed modes are ignored when in
- * fullscreen modes.
- */
-
-void 	MGLAPI MGL_registerFullScreenWindow(HWND hwndFullScreen);
-
-/* Function to register a fullscreen event handling window procedure.
- * If you wish to do your own event handling, you can register your window
- * procedure with the MGL using this function and it will be called
- * when there are messages to be handled. You can still call the MGL_event()
- * functions even if you have registered an event handling procedure.
- */
-
-void 	MGLAPI MGL_registerEventProc(WNDPROC userWndProc);
-
-/* Change the active display mode. You must destroy all display device
- * contexts before calling this function, and re-create them again with
- * the new display mode. Does not affect any event handling hooks.
- */
-
-bool	MGLAPI MGL_changeDisplayMode(m_int mode);
-
-/* Obtain the handle to the MGL fullscreen window when in fullscreen modes */
-
-MGL_HWND MGLAPI MGL_getFullScreenWindow(void);
-
-/* Tell the MGL what your applications main window is */
-
-void	MGLAPI MGL_setMainWindow(MGL_HWND hwnd);
-
-/* Tell the MGL your applications instance handle (call before all funcs!) */
-
-void	MGLAPI MGL_setAppInstance(MGL_HINSTANCE hInstApp);
-
-/* Device context management */
-
-MGLDC	* MGLAPI MGL_createDisplayDC(m_int numBuffers);
-MGLDC	* MGLAPI MGL_createSrollingDC(m_int virtualX,m_int virtualY,m_int numBuffers);
-MGLDC	* MGLAPI MGL_createOffscreenDC(void);
-MGLDC	* MGLAPI MGL_createLinearOffscreenDC(void);
-MGLDC	* MGLAPI MGL_createWindowedDC(MGL_HWND hwnd);
-MGLDC 	* MGLAPI MGL_createMemoryDC(m_int xSize,m_int ySize,m_int bitsPerPixel,pixel_format_t *pf);
-bool	MGLAPI MGL_destroyDC(MGLDC *dc);
-
-/* Get a Windows HDC for the MGL device context. You can use this returned
- * HDC to get GDI to draw to the device context surface, such as rendering
- * and using TrueType fonts with the MGL. If a Windows compatible HDC is not
- * available, this function will return NULL.
- */
-
-HDC		MGLAPI MGL_getWinDC(MGLDC *dc);
-
-/* Associate a Window manager DC with the MGLDC for painting */
-
-bool	MGLAPI MGL_setWinDC(MGLDC *dc,MGL_HDC hdc);
-
-/* Activate the WindowDC's palette */
-
-bool	MGLAPI MGL_activatePalette(MGLDC *dc,bool unrealize);
-
-/* Let the MGL know when your application is being activated or deactivated.
- * This function only needs to be called when running in Windowed modes and
- * you have set the system palette to SYSPAL_NOSTATIC mode, to ensure
- * that the MGL can properly re-map your application palette when your
- * app is not active and allow Windows to re-map your bitmap colors on the
- * fly. This function should be passed a pointer to the currently active
- * MGL Windowed DC and a flag to indicate whether the app is in the background
- * or not.   
- */
-
-void	MGLAPI MGL_appActivate(MGLDC *winDC,bool active);
-
-/* Generic helper functions */
-
-ulong	MGLAPI MGL_getTicks(void);
-ulong	MGLAPI MGL_getTickResolution(void);
-void	MGLAPI MGL_delay(m_int millseconds);
-void	MGLAPI MGL_beep(m_int freq,m_int milliseconds);
-
-/* Fullscreen specific routines */
-
-void	MGLAPI MGL_setPaletteSnowLevel(MGLDC *dc,m_int level);
-m_int	MGLAPI MGL_getPaletteSnowLevel(MGLDC *dc);
-
-/* Determine if a specific scancode'ed key is held down (PC specific) */
-
-bool	MGLAPI EVT_isKeyDown(uchar scanCode);
-
-#ifdef	__cplusplus
-}						/* End of "C" linkage for C++	*/
-#endif
-
-#endif	/* __MGLWIN_H */
--- a/u/scitech/INCLUDE/MGRAPH.H
+++ /dev/null
@@ -1,1951 +1,0 @@
-/****************************************************************************
-*
-*						MegaGraph Graphics Library
-*
-*                   Copyright (C) 1996 SciTech Software.
-*							All rights reserved.
-*
-* Filename:		$Workfile:   mgraph.h  $
-* Version:		$Revision:   1.29  $
-*
-* Language:		ANSI C
-* Environment:	IBM PC (MS DOS)
-*
-* Description:	Header file for the MegaGraph Graphics Library. You can
-*				defined one of the following to specify which MGL API you
-*				wish to use.
-*
-*					MGL_LITE	- Compile for the MGL/Lite API
-*					MGL_PRO		- Compile for the MGL/Pro API
-*					MGL_FIX3D	- Compile for the MGL/3D API (fixed point)
-*					MGL_FLT3D	- Compile for the MGL/3D API (floating point)
-*
-*				If you do not define any of these, MGL_FIX3D will be defined
-*				automatically for compatibility with older versions of the
-*				MGL.
-*
-* $Date:   11 Mar 1997 16:46:42  $ $Author:   KendallB  $
-*
-****************************************************************************/
-
-#ifndef	__MGRAPH_H
-#define	__MGRAPH_H
-
-#include <stdio.h>
-
-#ifndef	__DEBUG_H
-#include "debug.h"
-#endif
-
-#if	!defined(MGL_LITE) && !defined(MGL_PRO) && !defined(MGL_FIX3D) \
-	&& !defined(MGL_FLT3D)
-#define	MGL_FIX3D
-#endif
-
-#if	defined(MGL_FIX3D) || defined(MGL_FLT3D)
-#define	MGL_3D
-#endif
-
-/*---------------------- Macros and type definitions ----------------------*/
-
-#pragma pack(1)				/* Pack structures to byte granularity		*/
-
-/* Define the version number for the MGL release */
-
-#define MGL_VERSION_STR     "3.1"
-
-/* Define the calling conventions for all public MGL functions. If we
- * are compiling the MGL as a DLL, then all public functions are compiled
- * and exported with standard C calling conventions, otherwise we use
- * the default calling conventions provided by the compiler.
- *
- * Note that because Watcom C++ uses register based parameter passing
- * by default we also provide special DLL's for watcom that are compiled
- * with register parameter passing. This is necessary to work with all
- * the extra libraries provided as they are all compiled to call MGL
- * functions with arguments in registers whenever possible. You can still
- * use the standard DLL but if you do you will need to re-compile all
- * of the extra libraries with the MGL_DLL #define to change the calling
- * conventions for the MGL functions.
- */
-
-#if		defined(MGL_DLL)
-#define	MGLAPI	_EXPORT __cdecl
-#else
-#define	MGLAPI	_EXPORT _PUBAPI
-#endif
-#define	ASMAPI	_EXPORT __cdecl
-
-/* Define a type for integers used in the library. For most environments
- * we simply define it as a normal integer (16 or 32 bits), however for
- * 16 bit Windows it is defined as a 32 bit integer as all the real code
- * lives in a 32 bit DLL that uses 32 bit integers.
- */
-
-#ifndef	__M_INT_DEFINED
-#if	defined(__WINDOWS16__)
-typedef	long			m_int;
-typedef unsigned long	m_uint;
-#else
-typedef int				m_int;
-typedef	unsigned int	m_uint;
-#endif
-#define	__M_INT_DEFINED
-#endif
-
-/* Define the graphics subsystems available	*/
-
-typedef enum {
-	grDETECT		= -1,	/* Auto detect the graphics subsystem		*/
-	grNONE			= 0,	/* No graphics hardware detected			*/
-	grVGA,					/* Standard VGA								*/
-	grVESA,					/* VESA VBE compliant SuperVGA				*/
-	grSVGA,					/* Unaccelerated SuperVGA					*/
-	grACCEL,				/* Accelerated SuperVGA						*/
-	grDDRAW,				/* Unaccelerated DirectDraw					*/
-	grDDRAWACCEL,			/* Accelerated DirectDraw 					*/
-	grDDRAW3D,				/* 3D Accelerated DirectDraw 				*/
-	grMAXDRIVER,			/* Maximum driver number					*/
-	} MGL_driverType;
-
-/* Graphics modes supported	- the only video modes supported by this
- * graphics library are those that support at least 16 colors per pixel.
- */
-
-typedef enum {
-	/* 16 color VGA video modes */
-
-	grVGA_320x200x16,
-	grVGA_640x200x16,
-	grVGA_640x350x16,
-	grVGA_640x400x16,
-	grVGA_640x480x16,
-	grSVGA_800x600x16,
-
-	/* 256 color VGA ModeX video modes */
-
-	grVGAX_320x200x256,
-	grVGAX_320x240x256,
-	grVGAX_320x400x256,
-	grVGAX_320x480x256,
-
-	/* 256 color VGA video modes */
-
-	grVGA_320x200x256,
-
-	/* 256 color VGA/SuperVGA video modes */
-
-	grSVGA_320x200x256,
-	grSVGA_320x240x256,
-	grSVGA_320x400x256,
-	grSVGA_320x480x256,
-	grSVGA_400x300x256,
-	grSVGA_512x384x256,
-	grSVGA_640x350x256,
-	grSVGA_640x400x256,
-	grSVGA_640x480x256,
-	grSVGA_800x600x256,
-	grSVGA_1024x768x256,
-	grSVGA_1152x864x256,
-	grSVGA_1280x960x256,
-	grSVGA_1280x1024x256,
-	grSVGA_1600x1200x256,
-
-	/* 32,768 color Super VGA video modes */
-
-    grSVGA_320x200x32k,
-	grSVGA_320x240x32k,
-	grSVGA_320x400x32k,
-	grSVGA_320x480x32k,
-	grSVGA_400x300x32k,
-	grSVGA_512x384x32k,
-	grSVGA_640x350x32k,
-    grSVGA_640x400x32k,
-    grSVGA_640x480x32k,
-    grSVGA_800x600x32k,
-    grSVGA_1024x768x32k,
-	grSVGA_1152x864x32k,
-	grSVGA_1280x960x32k,
-	grSVGA_1280x1024x32k,
-    grSVGA_1600x1200x32k,
-
-	/* 65,536 color Super VGA video modes */
-
-    grSVGA_320x200x64k,
-	grSVGA_320x240x64k,
-	grSVGA_320x400x64k,
-	grSVGA_320x480x64k,
-	grSVGA_400x300x64k,
-	grSVGA_512x384x64k,
-	grSVGA_640x350x64k,
-	grSVGA_640x400x64k,
-	grSVGA_640x480x64k,
-	grSVGA_800x600x64k,
-	grSVGA_1024x768x64k,
-	grSVGA_1152x864x64k,
-	grSVGA_1280x960x64k,
-	grSVGA_1280x1024x64k,
-	grSVGA_1600x1200x64k,
-
-	/* 16 million color, 24 bits per pixel Super VGA video modes */
-
-	grSVGA_320x200x16m,
-	grSVGA_320x240x16m,
-	grSVGA_320x400x16m,
-	grSVGA_320x480x16m,
-	grSVGA_400x300x16m,
-	grSVGA_512x384x16m,
-	grSVGA_640x350x16m,
-	grSVGA_640x400x16m,
-	grSVGA_640x480x16m,
-	grSVGA_800x600x16m,
-	grSVGA_1024x768x16m,
-	grSVGA_1152x864x16m,
-	grSVGA_1280x960x16m,
-	grSVGA_1280x1024x16m,
-	grSVGA_1600x1200x16m,
-
-	/* 16 million color, 32 bits per pixel Super VGA video modes */
-
-	grSVGA_320x200x4G,
-	grSVGA_320x240x4G,
-	grSVGA_320x400x4G,
-	grSVGA_320x480x4G,
-	grSVGA_400x300x4G,
-	grSVGA_512x384x4G,
-	grSVGA_640x350x4G,
-	grSVGA_640x400x4G,
-	grSVGA_640x480x4G,
-	grSVGA_800x600x4G,
-	grSVGA_1024x768x4G,
-	grSVGA_1152x864x4G,
-	grSVGA_1280x960x4G,
-	grSVGA_1280x1024x4G,
-	grSVGA_1600x1200x4G,
-
-	/* Render into Windowing System DC (Windows, OS/2 PM, X11) */
-
-	grWINDOWED,
-
-	grMAXMODE,					/* Maximum mode number					*/
-	} MGL_modeType;
-
-/* MGL_result() error codes	*/
-
-typedef enum {
-	grOK			= 0,	/* No error									*/
-	grNoInit		= -1,	/* Graphics driver has not been installed	*/
-	grNotDetected	= -2,	/* Graphics hardware was not detected		*/
-	grDriverNotFound= -3,	/* Graphics driver file not found			*/
-	grBadDriver		= -4,	/* File loaded was not a graphics driver	*/
-	grLoadMem		= -5,	/* Not enough memory to load graphics driver*/
-	grInvalidMode	= -6,	/* Invalid graphics mode for selected driver*/
-	grError			= -8,	/* General graphics error					*/
-	grInvalidName	= -9,	/* Invalid driver name						*/
-	grNoMem			= -10,	/* Not enough memory to perform operation	*/
-	grNoModeSupport	= -11,	/* Select video mode not supported by hard.	*/
-	grInvalidFont	= -12,	/* Invalid font data						*/
-	grBadFontFile	= -13,	/* File loaded was not a font file			*/
-	grFontNotFound	= -14,	/* Font file was not found					*/
-	grOldDriver     = -15,	/* Driver file is an old version			*/
-	grInvalidDevice	= -16,	/* Invalid device for selected operation	*/
-	grInvalidDC		= -17,	/* Invalid device context					*/
-	grInvalidCursor	= -18,	/* Invalid cursor file						*/
-	grCursorNotFound= -19,	/* Cursor file was not found				*/
-	grInvalidIcon	= -20,	/* Invalid icon file						*/
-	grIconNotFound	= -21,	/* Icon file was not found					*/
-	grInvalidBitmap = -22,	/* Invalid bitmap file						*/
-	grBitmapNotFound= -23,	/* Bitmap file was not found				*/
-	grZbufferTooBig	= -24,	/* Zbuffer allocation is too large			*/
-	grNewFontFile	= -25,	/* Only Windows 2.x font files supported	*/
-	grNoDoubleBuff  = -26,	/* Double buffering is not available		*/
-	grNoHardwareBlt	= -28,	/* No hardware bitBlt for OffscreenDC		*/
-	grNoOffscreenMem= -29,	/* No available offscreen memory			*/
-	grInvalidPF		= -30,	/* Invalid pixel format for memory DC		*/
-
-	grLastError		= -31,	/* Last error number in list				*/
-	} MGL_errorType;
-
-#define	MGL_CLIPON		true
-#define	MGL_CLIPOFF		false
-
-/* Color mapped modes */
-
-typedef enum {
-	MGL_CMAP_MODE,					/* Normal Color mapped mode 	*/
-	MGL_DITHER_RGB_MODE,			/* 24 bit RGB halftone dithered	*/
-	} MGL_colorModes;
-
-/* Standard colors - this is the standard set of colors for the IBM PC. The
- * default palette will have been programmed to contain these values when a
- * graphics modes is started. If the palette has been changed, they will
- * not correspond to the actual colors on the screen. Under a Windowing
- * manage environment these colors will also not be setup by default.
- */
-
-enum MGL_COLORS {
-	MGL_BLACK,						/* dark colors	*/
-	MGL_BLUE,
-	MGL_GREEN,
-	MGL_CYAN,
-	MGL_RED,
-	MGL_MAGENTA,
-	MGL_BROWN,
-	MGL_LIGHTGRAY,
-	MGL_DARKGRAY,					/* light colors	*/
-	MGL_LIGHTBLUE,
-	MGL_LIGHTGREEN,
-	MGL_LIGHTCYAN,
-	MGL_LIGHTRED,
-	MGL_LIGHTMAGENTA,
-	MGL_YELLOW,
-	MGL_WHITE,
-	};
-
-/* Windows standard color indices for 256 color bitmaps. 8,9,246,247 are
- * reserved and you should not count on these colors always being the
- * same. For 16 color bitmaps, colors 248-255 map to colors 8-15.
- */
-
-enum MGL_WIN_COLORS {
-	MGL_WIN_BLACK 			= 0,
-	MGL_WIN_DARKRED			= 1,
-	MGL_WIN_DARKGREEN		= 2,
-	MGL_WIN_DARKYELLOW		= 3,
-	MGL_WIN_DARKBLUE		= 4,
-	MGL_WIN_DARKMAGENTA		= 5,
-	MGL_WIN_DARKCYAN		= 6,
-	MGL_WIN_LIGHTGRAY		= 7,
-	MGL_WIN_TURQUOISE		= 8,		/* Reserved; dont count on this	*/
-	MGL_WIN_SKYBLUE			= 9,		/* Reserved; dont count on this	*/
-	MGL_WIN_CREAM			= 246,		/* Reserved; dont count on this	*/
-	MGL_WIN_MEDIUMGRAY		= 247,		/* Reserved; dont count on this	*/
-	MGL_WIN_DARKGRAY		= 248,
-	MGL_WIN_LIGHTRED		= 249,
-	MGL_WIN_LIGHTGREEN		= 250,
-	MGL_WIN_LIGHTYELLOW		= 251,
-	MGL_WIN_LIGHTBLUE		= 252,
-	MGL_WIN_LIGHTMAGENTA	= 253,
-    MGL_WIN_LIGHTCYAN		= 254,
-	MGL_WIN_WHITE 			= 255,
-	};
-
-typedef enum {
-	MGL_MARKER_SQUARE,
-	MGL_MARKER_CIRCLE,
-	MGL_MARKER_X,
-	} MGL_markerStyleType;
-
-typedef enum {						/* Write mode operators				*/
-	MGL_REPLACE_MODE,				/* Replace mode						*/
-	MGL_AND_MODE,					/* AND mode							*/
-	MGL_OR_MODE,					/* OR mode							*/
-	MGL_XOR_MODE,					/* XOR mode							*/
-	} MGL_writeModeType;
-
-typedef enum {
-	MGL_BITMAP_SOLID,
-	MGL_BITMAP_OPAQUE,
-	MGL_BITMAP_TRANSPARENT,
-	MGL_PIXMAP,
-	} MGL_fillStyleType;
-
-typedef enum {
-	MGL_LINE_PENSTYLE,				/* Line drawn in current pen style	*/
-	MGL_LINE_STIPPLE,				/* Line drawn with current stipple	*/
-	} MGL_lineStyleType;
-
-typedef enum {
-	MGL_CONVEX_POLYGON,				/* Monotone vertical polygon		*/
-	MGL_COMPLEX_POLYGON,			/* Non-Simple polygons				*/
-	MGL_AUTO_POLYGON,				/* Auto detect the polygon type		*/
-	} MGL_polygonType;
-
-/* Text manipulation defines */
-
-typedef enum {
-	MGL_LEFT_TEXT		=	0,		/* Justify from left				*/
-	MGL_TOP_TEXT		=	0,		/* Justify from top					*/
-	MGL_CENTER_TEXT		=	1,		/* Center the text					*/
-	MGL_RIGHT_TEXT		=	2,		/* Justify from right				*/
-	MGL_BOTTOM_TEXT		=	2,		/* Justify from bottom				*/
-	MGL_BASELINE_TEXT	=	3,		/* Justify from the baseline		*/
-	} MGL_textJustType;
-
-typedef enum {
-	MGL_LEFT_DIR		=	0,		/* Text goes to left				*/
-	MGL_UP_DIR			=	1,		/* Text goes up						*/
-	MGL_RIGHT_DIR		=	2,		/* Text goes right					*/
-	MGL_DOWN_DIR		=	3,		/* Text goes down					*/
-	} MGL_textDirType;
-
-/* Font types */
-
-typedef enum {
-	MGL_VECTORFONT = 1,				/* Vector font						*/
-	MGL_FIXEDFONT,					/* Fixed width bitmap font			*/
-	MGL_PROPFONT,					/* Proportional width bitmap font	*/
-	} MGL_fontType;
-
-/* Palette rotation directions */
-
-typedef enum {
-	MGL_ROTATE_UP,					/* Rotate the palette values up		*/
-	MGL_ROTATE_DOWN,				/* Rotate the palette values down	*/
-	} MGL_palRotateType;
-
-/* Border drawing routine styles */
-
-typedef enum {
-	MGL_BDR_INSET,					/* Interior is inset into screen	*/
-	MGL_BDR_OUTSET,					/* Interior is outset from screen	*/
-	MGL_BDR_OUTLINE,				/* Border is 3d outline				*/
-	} MGL_bdrStyleType;
-
-/* Standard display driver names 	*/
-
-#define	MGL_VGA4NAME		"VGA4.DRV"		/* Standard VGA drivers			*/
-#define	MGL_VGA8NAME		"VGA8.DRV"
-#define	MGL_VGAXNAME		"VGAX.DRV"
-
-#define	MGL_SVGA4NAME		"SVGA4.DRV"		/* Generic SuperVGA drivers		*/
-#define	MGL_SVGA8NAME		"SVGA8.DRV"
-#define	MGL_SVGA16NAME		"SVGA16.DRV"
-#define	MGL_SVGA24NAME		"SVGA24.DRV"
-#define	MGL_SVGA32NAME		"SVGA32.DRV"
-
-#define	MGL_LINEAR8NAME		"LINEAR8.DRV"	/* Linear framebuffer drivers	*/
-#define	MGL_LINEAR16NAME	"LINEAR16.DRV"
-#define	MGL_LINEAR24NAME	"LINEAR24.DRV"
-#define	MGL_LINEAR32NAME	"LINEAR32.DRV"
-
-#define	MGL_ACCEL8NAME		"ACCEL8.DRV"	/* VBE/AF Accelerated drivers	*/
-#define	MGL_ACCEL16NAME		"ACCEL16.DRV"
-#define	MGL_ACCEL24NAME		"ACCEL24.DRV"
-#define	MGL_ACCEL32NAME		"ACCEL32.DRV"
-
-#define	MGL_DDRAW8NAME		"DDRAW8.DRV"	/* DirectDraw drivers			*/
-#define	MGL_DDRAW16NAME		"DDRAW16.DRV"
-#define	MGL_DDRAW24NAME		"DDRAW24.DRV"
-#define	MGL_DDRAW32NAME		"DDRAW32.DRV"
-
-/* Standard memory driver names 	*/
-
-#define	MGL_PACKED1NAME		"PACK1.DRV"
-#define	MGL_PACKED4NAME		"PACK4.DRV"
-#define	MGL_PACKED8NAME		"PACK8.DRV"
-#define	MGL_PACKED16NAME	"PACK16.DRV"
-#define	MGL_PACKED24NAME	"PACK24.DRV"
-#define	MGL_PACKED32NAME	"PACK32.DRV"
-
-/* Standard bitmap names	*/
-
-#define	MGL_EMPTY_FILL	_MGL_getEmptyPat()
-#define	MGL_GRAY_FILL	_MGL_getGrayPat()
-#define	MGL_SOLID_FILL	_MGL_getSolidPat()
-
-/* Event message masks for keyDown events */
-
-#define	EVT_ASCIIMASK	0x00FF	/* Ascii code of key pressed			*/
-#define	EVT_SCANMASK	0xFF00	/* Scan code of key pressed				*/
-#define	EVT_COUNTMASK	0x7FFF0000L		/* Count for KEYREPEAT's		*/
-
-#define	EVT_asciiCode(m)	( (uchar) (m & EVT_ASCIIMASK) )
-#define	EVT_scanCode(m)		( (uchar) ( (m & EVT_SCANMASK) >> 8 ) )
-#define	EVT_repeatCount(m)	( (short) ( (m & EVT_COUNTMASK) >> 16 ) )
-
-/* Event message masks for mouse events */
-
-#define	EVT_LEFTBMASK	0x0001	/* Left button is bit 0					*/
-#define	EVT_RIGHTBMASK	0x0004	/* Right button is bit 1				*/
-#define	EVT_BOTHBMASK	0x0005	/* Both left and right together			*/
-#define	EVT_ALLBMASK	0x0005	/* All buttons pressed					*/
-
-/* Modifier masks */
-
-#define	EVT_LEFTBUT		0x0001	/* Set if left button was down			*/
-#define	EVT_RIGHTBUT	0x0002	/* Set if right button was down			*/
-#define	EVT_RIGHTSHIFT	0x0008	/* Set if right shift down				*/
-#define	EVT_LEFTSHIFT	0x0010	/* Set if left shift down				*/
-#define	EVT_CTRLSTATE	0x0020	/* Set if ctrl key down					*/
-#define	EVT_ALTSTATE	0x0040	/* Set if alt key down					*/
-#define	EVT_LEFTCTRL	0x0080	/* Set if left ctrl key down			*/
-#define	EVT_LEFTALT		0x0100	/* Set if left alt key down				*/
-#define	EVT_SHIFTKEY	0x0018	/* Any shift key						*/
-
-/* Event codes */
-
-#define	EVT_NULLEVT		0x0000	/* A null event							*/
-#define	EVT_KEYDOWN		0x0001	/* Key down event						*/
-#define	EVT_KEYREPEAT	0x0002	/* Key repeat event						*/
-#define	EVT_KEYUP		0x0004	/* Key up event							*/
-#define	EVT_MOUSEDOWN	0x0008	/* Mouse down event						*/
-#define	EVT_MOUSEUP		0x0010	/* Mouse up event						*/
-#define	EVT_MOUSEMOVE	0x0020	/* Mouse movement event					*/
-#define	EVT_TIMERTICK	0x0040	/* Timer tick event						*/
-#define	EVT_USEREVT		0x0080	/* First user event						*/
-
-/* Event code masks */
-
-#define	EVT_KEYEVT		(EVT_KEYDOWN | EVT_KEYREPEAT | EVT_KEYUP)
-#define	EVT_MOUSEEVT	(EVT_MOUSEDOWN | EVT_MOUSEUP | EVT_MOUSEMOVE)
-#define	EVT_MOUSECLICK	(EVT_MOUSEDOWN | EVT_MOUSEUP)
-#define	EVT_EVERYEVT	0xFFFF
-
-/* Suspend Application callback type codes. This callback is called
- * when the user presses one of the corresponding keys indicating that
- * they wish to change the active application. The MGL will catch these
- * events and if you have registered a callback, will call the callback to
- * save the state of the application so that it can be properly restored
- * when the user switches back to your application. The MGL takes care of
- * all the details about saving and restoring the state of the hardware,
- * and all your application needs to do is save its own state so that you can
- * re-draw the application screen upon re-activation.
- *
- * NOTE: Your application suspend callback may get called twice with the
- *		 MGL_DEACTIVATE flag in order to test whether the switch should
- *		 occur (under both DirectDraw and WinDirect fullscreen modes).
- *
- * NOTE: When your callback is called with the MGL_DEACTIVATE flag, you
- *		 cannot assume that you have access to the display memory surfaces
- *		 as they may have been lost by the time your callback has been called. 
- */
-
-#define	MGL_DEACTIVATE	0x0001	/* Application losing active focus		*/
-#define	MGL_REACTIVATE	0x0002	/* Application regaining active focus	*/
-
-/* Return codes from the suspend application callback. The normal value
- * to be returned is MGL_SUSPEND_APP and this will cause the app to be
- * suspended while back in GDI mode until the app is re-activated again
- * by the user.
- *
- * MGL_NO_DEACTIVATE signals to WinDirect that the application does not want
- * to allow switching to occur, and the switch request will be ignored and
- * the app will remain in fullscreen mode.
- *
- * MGL_NO_SUSPEND_APP can be used to tell WinDirect to switch back to the
- * desktop, but not to suspend the application. This must be used with
- * care as the suspend application callback is then responsible for setting
- * a flag in the application that will stop the application from doing any
- * rendering to the framebuffer while the application is in GDI mode. This
- * return value is useful for games that need to maintain network
- * connectivity while the user has temporarily switched back to GDI mode.
- */
-
-#define	MGL_NO_DEACTIVATE	0	/* Dont allow app to be deactivated 	*/
-#define	MGL_SUSPEND_APP		1	/* Suspend application until restored	*/
-#define	MGL_NO_SUSPEND_APP	2	/* Dont suspend, but allow switch		*/
-
-/* Here we define the structures used to represent points and rectangles */
-
-typedef struct {
-	m_int	x,y;
-	} point_t;
-
-typedef	struct {
-	m_int	left;
-	m_int	top;
-	m_int	right;
-	m_int	bottom;
-	} rect_t;
-
-/* All colors are represented as longs by the library. This allows
- * code to work correctly with up to 24 bit color device drivers. The
- * device drivers themselves expect the color to be a color index if in
- * a color mapped mode, or a 15/16/24 bit RGB tuple in a hicolor or truecolor
- * mode. You can use the appropriate routines to pack and unpack
- * colors into the color_t format.
- */
-
-typedef	ulong		color_t;
-
-/* Define the value used to clear the software ZBuffer. The MGL always uses
- * a > operator for the z compare, and the smallest value is 0.
- */
-
-#define	MGL_ZCLEARVAL	0
-
-/* Structures for passing vertex information to polygon rendering routines.
- * All fixed point coordinates are passed in 16.16 signed fixed point
- * format, while zbuffer coordinates are passed in 4.28 signed fixed point
- * format. The sign bit is used purely for overflow and arithmetic
- * internally, and all user passed zbuffer values should be greater than
- * 0. All shaded rendering routines either take a color index in 8.16 fixed
- * point format (range 0-255.9) or separate RGB components in 8.16 fixed
- * point format (range 0-255.9).
- */
-
-#ifdef	__FX_FIXED_H
-#define	fix32_t			FXFixed
-#else
-typedef	long			fix32_t;
-#endif
-typedef	fix32_t			fxcolor_t;
-typedef	long			zfix32_t;
-
-typedef	struct {
-	fix32_t x,y;
-	} fxpoint_t;
-
-typedef	struct {
-	fxcolor_t	r,g,b;
-	} fxrgb_t;
-
-typedef struct {
-	fix32_t		w,s,t;
-	} fxtex_t;
-
-typedef	struct {
-	fxcolor_t	c;
-	fxpoint_t   p;
-	} fxpointc_t;
-
-typedef	struct {
-	fxrgb_t		c;
-	fxpoint_t	p;
-	} fxpointrgb_t;
-
-typedef	struct {
-	fxpoint_t	p;
-	zfix32_t	z;
-	} fxpointz_t;
-
-typedef	struct {
-	fxcolor_t	c;
-	fxpoint_t	p;
-	zfix32_t	z;
-	} fxpointcz_t;
-
-typedef	struct {
-	fxrgb_t		c;
-	fxpoint_t	p;
-	zfix32_t	z;
-	} fxpointrgbz_t;
-
-/* Macros to convert between integer and 32 bit fixed point format */
-
-#define	MGL_FIX_1			0x10000L
-#define	MGL_FIX_2			0x20000L
-#define	MGL_FIX_HALF		0x08000L
-#define	MGL_TOFIX(i)		((long)(i) << 16)
-#define MGL_FIXTOINT(f)		((m_int)((f) >> 16))
-#define	MGL_FIXROUND(f) 	((m_int)(((f) + MGL_FIX_HALF) >> 16))
-
-#define	MGL_ZFIX_1			0x10000000L
-#define	MGL_ZFIX_HALF		0x08000000L
-#define MGL_FIXTOZ(i)		((i) << 12)
-#define	MGL_ZTOFIX(i)		((i) >> 12)
-#define	MGL_TOZFIX(i)		((long)(i) << 28)
-#define MGL_ZFIXTOINT(f)	((m_int)((f) >> 28))
-#define	MGL_ZFIXROUND(f) 	((m_int)(((f) + MGL_ZFIX_HALF) >> 28))
-
-/* Region structure */
-
-#ifdef	BUILD_MGL
-struct _span_t;
-typedef	struct _span_t	span_t;
-#else
-typedef void		span_t;
-#endif
-
-typedef struct {
-	rect_t      rect;			/* Bounding rectangle for region		*/
-	span_t		*spans;			/* Start of span list for region		*/
-	} region_t;
-
-/* Palette entry structure	*/
-
-typedef struct {
-	uchar	blue;				/* Blue component of color				*/
-	uchar	green;				/* Green component of color				*/
-	uchar	red;				/* Blue component of color				*/
-	uchar	alpha;				/* Alpha or alignment byte				*/
-	} palette_t;
-
-/* Maximum value for each palette entry component */
-
-#define	PALMAX		255				/* Max value for palette components	*/
-
-/* Pixel format structure */
-
-typedef struct {
-	uchar	redMask,greenMask;		/* Mask values for pixels			*/
-	uchar	blueMask,rsvdMask;
-	m_int	redPos,redAdjust;		/* Red position and adjustment		*/
-	m_int	greenPos,greenAdjust;	/* Green position and adjustment	*/
-	m_int	bluePos,blueAdjust;		/* Blue position and adjustment		*/
-	m_int	rsvdPos,rsvdAdjust;		/* Reserved position and adjustment */
-	} pixel_format_t;
-
-/* Structure to hold arc coordinate information */
-
-typedef struct {
-	m_int	x,y;					/* Centre point of the arc			*/
-	m_int	startX,startY;			/* Starting point on arc			*/
-	m_int	endX,endY;				/* Ending point on arc				*/
-	} arc_coords_t;
-
-/* Mouse cursor structure */
-
-typedef	struct {
-	ulong		xorMask[32];
-	ulong		andMask[32];
-	m_int		xHotSpot;
-	m_int		yHotSpot;
-	} cursor_t;
-
-/* Bitmap structure - always packed pixel DIB format */
-
-typedef struct {
-	m_int		width;				/* Width of bitmap in pixels		*/
-	m_int		height;				/* Height of bitmap in pixels		*/
-	m_int		bitsPerPixel;		/* Pixel width						*/
-	m_int		bytesPerLine;		/* Bytes per line value for surface */
-	uchar		*surface;			/* Pointer to bitmap surface		*/
-	palette_t	*pal;				/* Palette (NULL if not loaded)		*/
-	pixel_format_t *pf;				/* Pixel format (NULL if none)		*/
-
-	/* ... palette, pixel format and bitmap data are store contiguously */
-	} bitmap_t;
-
-/* Icon structure - can be 32x23, 64x64 or in fact any size */
-
-typedef struct {
-	m_int		byteWidth;			/* Byte with for AND mask			*/
-	uchar		*andMask;			/* Hold punch mask for icon			*/
-	bitmap_t	xorMask;			/* XOR mask for the icon			*/
-
-	/* ... AND mask and bitmap structure are stored contiguously */
-	} icon_t;
-
-/* Default cursor name */
-
-#define	MGL_DEF_CURSOR		_MGL_getDefCursor()
-
-/* Generic Font structure */
-
-#define	_MGL_FNAMESIZE		58
-
-typedef struct {
-	char			name[_MGL_FNAMESIZE];/* Name of the font			*/
-	short			fontType;		/* Type of font						*/
-	short			maxWidth;		/* Maximum character width			*/
-	short			maxKern;		/* Maximum character kern			*/
-	short			fontWidth;		/* Font width						*/
-	short			fontHeight;		/* Font height						*/
-	short			ascent;			/* Font ascent value				*/
-	short			descent;		/* Font descent value				*/
-	short			leading;		/* Font leading value				*/
-	} font_t;
-
-/* Character and font metrics structure */
-
-typedef struct {
-	m_int			width;			/* Width of character or font		*/
-	m_int			fontWidth;		/* Character width (tightest fit)	*/
-	m_int			fontHeight;		/* Height of the font				*/
-	m_int			ascent;			/* Ascent value						*/
-	m_int			descent;		/* Descent value					*/
-	m_int			leading;		/* Leading value					*/
-	m_int			kern;			/* Kern value						*/
-	} metrics_t;
-
-/* Text settings structure */
-
-typedef struct {
-	m_int			horizJust;		/* Horizontal justfication			*/
-	m_int			vertJust;		/* Vertical justification			*/
-	m_int			dir;			/* Text drawing direction			*/
-	m_int 			szNumerx;		/* Text x size numerator			*/
-	m_int 			szNumery;		/* Text y size numerator			*/
-	m_int			szDenomx;		/* Text x size denominator			*/
-	m_int			szDenomy;		/* Text y size denominator			*/
-	m_int			spaceExtra;		/* Space extra term					*/
-	font_t 			*font;			/* Currently selected font			*/
-	} text_settings_t;
-
-/* Macros to access the (left,top) and (right,bottom) points of a
- * rectangle.
- */
-
-#define	MGL_leftTop(r)		(((point_t *) &(r))[0])
-#define	MGL_rightBottom(r)	(((point_t *) &(r))[1])
-
-typedef uchar	pattern_t[8];
-typedef color_t	pixpattern_t[8][8];
-
-/* Attributes structure */
-
-typedef struct {
-	color_t			color;			/* Foreground color					*/
-	color_t			backColor;		/* Background color					*/
-	m_int			colorMode;		/* Current color mode				*/
-	m_int			markerSize;		/* Size of markers in pixels		*/
-	m_int			markerStyle;	/* Style of markers					*/
-	color_t			markerColor;	/* Color to draw markers in			*/
-	color_t			bdrBright;		/* Border bright color				*/
-	color_t			bdrDark;		/* Border dark color				*/
-	point_t			CP;				/* Graphics pen position			*/
-	m_int			writeMode;		/* Scan conversion write mode op.	*/
-	m_int			penStyle;		/* Pen style						*/
-	m_int			penHeight;		/* Height of pen					*/
-	m_int			penWidth;		/* Width of pen						*/
-	pattern_t		penPat;			/* Pattern for pen					*/
-	pixpattern_t	penPixPat;		/* Pixmap pattern for pen			*/
-	m_int			lineStyle;		/* Line style						*/
-	ushort			lineStipple;	/* Line stipple						*/
-	m_uint			stippleCount;	/* Current line stipple count		*/
-	rect_t			viewPort;		/* Viewport dimensions				*/
-	point_t			viewPortOrg;	/* Logical viewport origin			*/
-	rect_t			clipRect;		/* Clipping rectangle dimensions	*/
-	m_int			clip;			/* Is clipping on?					*/
-	m_int			polyType;		/* Polygon drawing type				*/
-	text_settings_t	ts;				/* Text drawing attributes			*/
-	} attributes_t;
-
-/* Mode specific format information. This structrure can be used by
- * the device driver to build tables of values for all supported modes
- */
-
-typedef struct {
-	m_int	xRes;			/* Device x resolution - 1					*/
-	m_int	yRes;			/* Device y resolution - 1					*/
-	m_int	bitsPerPixel;	/* Number of bits per pixel					*/
-	m_int	numberOfPlanes;	/* Number of planes in image				*/
-	color_t	maxColor;		/* Maximum number of colors - 1				*/
-	m_int	maxPage;		/* Maximum number of video pages - 1		*/
-	m_int	bytesPerLine;	/* Number of bytes in a line				*/
-	m_int	aspectRatio;	/* Mode aspect ratio (horiz/vert * 1000)	*/
-	long	pageSize;		/* Number of bytes in a page				*/
-	m_int	scratch1;		/* Scratch pad value 1						*/
-	m_int	scratch2;		/* Scratch pad value 2						*/
-	char    redMaskSize;            /* Size of direct color red mask    */
-	char    redFieldPosition;       /* Bit posn of lsb of red mask      */
-	char    greenMaskSize;          /* Size of direct color green mask  */
-	char    greenFieldPosition;     /* Bit posn of lsb of green mask    */
-	char    blueMaskSize;           /* Size of direct color blue mask   */
-	char    blueFieldPosition;      /* Bit posn of lsb of blue mask     */
-	char	rsvdMaskSize;			/* Size of reserved mask			*/
-	char	rsvdFieldPosition;		/* Bit posn of reserved mask		*/
-	} gmode_t;
-
-/* Public Device Context Structure. The 'surface' member along with the
- * gmode_t information block, provides direct access to the active
- * display surface for user applications. The MGL virtualises the surface
- * in SuperVGA modes that dont have a real linear framebuffer.
- */
-
-typedef struct {
-	attributes_t a;			/* Active device attributes					*/
-	void	*surface;		/* Pointer to active device surface			*/
-	void	*zbuffer;		/* Pointer to Z-buffer if allocated			*/
-	m_int	zbits;			/* Bits per zbuffer element					*/
-	m_int   zwidth;			/* Width of the zbuffer in pixels			*/
-	gmode_t	mi;				/* Mode specific information block			*/
-	pixel_format_t pf;		/* Current pixel format for device context	*/
-	color_t	*colorTab;		/* Color lookup table cache					*/
-	color_t	*shadeTab;		/* Currently active shade table				*/
-	m_int	bankOffset;		/* Offset of starting bank number			*/
-
-	/* Remainder of Device Context structure is private and internal	*/
-	} publicDevCtx_t;
-
-#ifndef	BUILD_MGL
-typedef publicDevCtx_t			MGLDC;
-#else
-struct internalDevCtx_t;
-typedef struct internalDevCtx_t	MGLDC;
-#endif
-
-typedef	struct {
-	ulong		which;			/* Which window for window manager code	*/
-	m_uint		what;			/* Event code							*/
-	ulong		when;			/* Clock ticks since midnight			*/
-	m_int		where_x;		/* Mouse location 						*/
-	m_int		where_y;
-	ulong		message;		/* Event specific message				*/
-	ulong		modifiers;		/* Modifier flags						*/
-	m_int		next;   		/* Next event in queue					*/
-	m_int		prev;			/* Previous event in queue				*/
-	} event_t;
-
-/* Structure containing file I/O functions allowing the user application to
- * completely replace the MGL's file I/O functions with their own. This
- * allows the app to store all MGL related files in a single large file,
- * with encryption or compression is desired. By default normal file I/O
- * functions will be used.
- */
-
-typedef struct {
-	FILE *	(*fopen)(const char *filename,const char *mode);
-	int 	(*fclose)(FILE *f);
-	int 	(*fseek)(FILE *f,long offset,int whence);
-	long 	(*ftell)(FILE *f);
-	size_t	(*fread)(void *ptr,size_t size,size_t n,FILE *f);
-	size_t	(*fwrite)(const void *ptr,size_t size,size_t n,FILE *f);
-	} fileio_t;
-
-/* Define the flags for the types of direct surface access provided */
-
-#define	MGL_NO_ACCESS		0x0		/* Surface cannot be accessed		*/
-#define	MGL_VIRTUAL_ACCESS	0x1		/* Surface is virtualised 			*/
-#define	MGL_LINEAR_ACCESS	0x2		/* Surface can be linearly accessed	*/
-#define	MGL_SURFACE_FLAGS	0x3
-
-/* Define the flags for the types of direct zbuffer access provided */
-
-#define	MGL_NO_ZACCESS		0x0		/* Zbuffer cannot be accessed		*/
-#define	MGL_VIRTUAL_ZACCESS	0x4		/* Zbuffer is virtualised in 		*/
-#define	MGL_LINEAR_ZACCESS	0x8		/* Zbuffer can be linearly accessed	*/
-#define	MGL_ZBUFFER_FLAGS	0xC
-
-/* Define the flags for the types of hardware acceleration supported by
- * the device context. This will allow the application to tailor the use of
- * MGL functions depending upon whether specific hardware support is
- * available. Hence applications can use specialised software rendering
- * support if the desired hardware support is not available.
- *
- * NOTE: If the hardware flags are not MGL_HW_NONE, you *must* call
- *		 the MGL_beginDirectAccess() and MGL_endDirectAccess() functions
- *		 before and after any custom code that does direct framebuffer
- *		 rendering!!
- *
- *		 This is not necessary for non-accelerated device context, so you
- *		 might want to optimise these calls out if there is no hardware
- *		 acceleration support.
- */
-
-#define	MGL_HW_NONE			0x0000	/* No hardware acceleration			*/
-#define	MGL_HW_LINE			0x0010	/* Hardware line drawing			*/
-#define	MGL_HW_STIPPLE_LINE	0x0020	/* Hardware stippled line drawing	*/
-#define	MGL_HW_POLY			0x0040	/* Hardware polygon filling			*/
-#define	MGL_HW_RECT			0x0080	/* Hardware rectangle fill			*/
-#define	MGL_HW_PATT_RECT	0x0100	/* Hardware pattern rectangle fill	*/
-#define	MGL_HW_CLRPATT_RECT	0x0200	/* Hardware color pattern fill		*/
-#define	MGL_HW_SCR_BLT		0x0400	/* Hardware screen/screen bitBlt	*/
-#define	MGL_HW_SRCTRANS_BLT	0x0800	/* Hardware source transparent blt	*/
-#define	MGL_HW_DSTTRANS_BLT	0x1000	/* Hardware dest. transparent blt	*/
-#define	MGL_HW_MONO_BLT		0x2000	/* Hardware monochrome blt			*/
-#define	MGL_HW_CLIP			0x4000	/* Hardware clipping				*/
-#define	MGL_HW_FLAGS		0xFFF0
-
-#ifdef	__cplusplus
-extern "C" {			/* Use "C" linkage when in C++ mode	*/
-#endif
-
-/*------------------------- Function Prototypes ---------------------------*/
-
-/*---------------------------------------------------------------------------
- * Routines bound to a specific device context. These routines all take
- * an MGLDC as a parmeter for the context to work with and hence dont work
- * with the current context. If however the context passed is the currently
- * active context, all changes to that context are reflected in the
- * currently active context as well.
- *-------------------------------------------------------------------------*/
-
-/* Environment detection and initialisation */
-
-m_int 	MGLAPI MGL_registerDriver(const char *name,void *driver);
-void	MGLAPI MGL_unregisterAllDrivers(void);
-void	MGLAPI MGL_registerAllDispDrivers(bool useLinear,bool useDirectDraw,bool useWinDirect);
-void	MGLAPI MGL_registerAllMemDrivers(void);
-void 	MGLAPI MGL_detectGraph(m_int *driver,m_int *mode);
-uchar *	MGLAPI MGL_availableModes(void);
-m_int	MGLAPI MGL_availablePages(m_int mode);
-m_int	MGLAPI MGL_modeResolution(m_int mode,m_int *xRes,m_int *yRes,m_int *bitsPerPixel);
-bool	MGLAPI MGL_isDisplayDC(MGLDC *dc);
-bool	MGLAPI MGL_isWindowedDC(MGLDC *dc);
-bool	MGLAPI MGL_isMemoryDC(MGLDC *dc);
-void 	MGLAPI MGL_exit(void);
-void 	MGLAPI MGL_setBufSize(unsigned size);
-void	MGLAPI MGL_fatalError(const char *msg);
-m_int 	MGLAPI MGL_result(void);
-void	MGLAPI MGL_setResult(m_int result);
-const char * MGLAPI MGL_errorMsg(m_int err);
-const char * MGLAPI MGL_modeName(m_int mode);
-const char * MGLAPI MGL_modeDriverName(m_int mode);
-const char * MGLAPI MGL_driverName(m_int driver);
-m_int	MGLAPI MGL_getDriver(MGLDC *dc);
-m_int	MGLAPI MGL_getMode(MGLDC *dc);
-m_int	MGLAPI MGL_surfaceAccessType(MGLDC *dc);
-m_int	MGLAPI MGL_zbufferAccessType(MGLDC *dc);
-long	MGLAPI MGL_getHardwareFlags(MGLDC *dc);
-void 	MGLAPI MGL_defaultAttributes(MGLDC *dc);
-void 	MGLAPI MGL_makeSubDC(MGLDC *dc,m_int left,m_int top,m_int right,m_int bottom);
-
-/* Viewport and clip rectangle manipulation bound to a specific DC */
-
-void 	MGLAPI MGL_setViewportDC(MGLDC *dc,rect_t view);
-void	MGLAPI MGL_setRelViewportDC(MGLDC *dc,rect_t view);
-void 	MGLAPI MGL_getViewportDC(MGLDC *dc,rect_t *view);
-void 	MGLAPI MGL_setViewportOrgDC(MGLDC *dc,point_t org);
-void	MGLAPI MGL_getViewportOrgDC(MGLDC *dc,point_t *org);
-void	MGLAPI MGL_globalToLocalDC(MGLDC *dc,point_t *p);
-void	MGLAPI MGL_localToGlobalDC(MGLDC *dc,point_t *p);
-m_int 	MGLAPI MGL_maxxDC(MGLDC *dc);
-m_int 	MGLAPI MGL_maxyDC(MGLDC *dc);
-void 	MGLAPI MGL_setClipRectDC(MGLDC *dc,rect_t clip);
-void 	MGLAPI MGL_getClipRectDC(MGLDC *dc,rect_t *clip);
-void 	MGLAPI MGL_setClipModeDC(MGLDC *dc,bool mode);
-bool 	MGLAPI MGL_getClipModeDC(MGLDC *dc);
-
-/* Color and palette manipulation */
-
-color_t	MGLAPI MGL_realColor(MGLDC *dc,m_int color);
-color_t	MGLAPI MGL_rgbColor(MGLDC *dc,uchar R,uchar G,uchar B);
-void 	MGLAPI MGL_setPaletteEntry(MGLDC *dc,m_int entry,uchar red,uchar green,uchar blue);
-void 	MGLAPI MGL_getPaletteEntry(MGLDC *dc,m_int entry,uchar *red,uchar *green,uchar *blue);
-void 	MGLAPI MGL_setPalette(MGLDC *dc,palette_t *pal,m_int numColors,m_int startIndex);
-void 	MGLAPI MGL_getPalette(MGLDC *dc,palette_t *pal,m_int numColors,m_int startIndex);
-void	ASMAPI MGL_rotatePalette(MGLDC *dc,m_int numColors,m_int startIndex,m_int direction);
-bool	ASMAPI MGL_fadePalette(MGLDC *dc,palette_t *fullIntensity,m_int numColors,m_int startIndex,uchar intensity);
-void	MGLAPI MGL_realizePalette(MGLDC *dc,m_int numColors,m_int startIndex,m_int waitVRT);
-m_int	MGLAPI MGL_getPaletteSize(MGLDC *dc);
-void	MGLAPI MGL_getDefaultPalette(MGLDC *dc,palette_t *pal);
-void 	MGLAPI MGL_setDefaultPalette(MGLDC *dc);
-#ifndef	MGL_LITE
-bool	MGLAPI MGL_checkIdentityPalette(bool enable);
-void	MGLAPI MGL_mapToPalette(MGLDC *dc,palette_t *pal);
-#endif
-
-/* Generic device context information and manipulation */
-
-bool 	MGLAPI MGL_haveWidePalette(MGLDC *dc);
-m_int	MGLAPI MGL_getBitsPerPixel(MGLDC *dc);
-color_t	MGLAPI MGL_maxColor(MGLDC *dc);
-m_int	MGLAPI MGL_maxPage(MGLDC *dc);
-m_int 	MGLAPI MGL_sizex(MGLDC *dc);
-m_int 	MGLAPI MGL_sizey(MGLDC *dc);
-void 	MGLAPI MGL_getPixelFormat(MGLDC *dc,pixel_format_t *pf);
-void	* MGLAPI MGL_computePixelAddr(MGLDC *dc,int x,int y);
-
-/* Double buffering support */
-
-void	MGLAPI MGL_setActivePage(MGLDC *dc,m_int page);
-m_int	MGLAPI MGL_getActivePage(MGLDC *dc);
-void	MGLAPI MGL_setVisualPage(MGLDC *dc,m_int page,m_int waitVRT);
-m_int	MGLAPI MGL_getVisualPage(MGLDC *dc);
-void	MGLAPI MGL_setDisplayStart(MGLDC *dc,m_int x,m_int y,m_int waitFlag);
-void	MGLAPI MGL_getDisplayStart(MGLDC *dc,m_int *x,m_int *y);
-void	MGLAPI MGL_vSync(MGLDC *dc);
-bool	MGLAPI MGL_doubleBuffer(MGLDC *dc);
-void	MGLAPI MGL_singleBuffer(MGLDC *dc);
-void	MGLAPI MGL_swapBuffers(MGLDC *dc,m_int waitVRT);
-
-/* Zbuffering support */
-
-#ifdef	MGL_3D
-m_int	MGLAPI MGL_getHardwareZBufferDepth(MGLDC *dc);
-bool    ASMAPI MGL_zBegin(MGLDC *dc,m_int zbits);
-bool	MGLAPI MGL_zShareZBuffer(MGLDC *dc,MGLDC *dcShared,m_int zbits);
-#endif
-
-/* Event handling support */
-
-bool 	MGLAPI EVT_getNext(event_t *evt,m_uint mask);
-bool	MGLAPI EVT_peekNext(event_t *evt,m_uint mask);
-bool	MGLAPI EVT_post(ulong which,m_uint what,ulong message,ulong modifiers);
-void	MGLAPI EVT_flush(m_uint mask);
-void 	MGLAPI EVT_halt(event_t *evt,m_uint mask);
-m_int	MGLAPI EVT_setTimerTick(m_int ticks);
-
-/*---------------------------------------------------------------------------
- * Routines bound to the currently active context. All these routines work
- * with the currently active context and do not reflect any changes made
- * to the global context to the original user supplied context (because it
- * may be cached). The cached DC is automatically flushed back to the
- * original DC when a new context is enabled with MGL_makeCurrentDC().
- *
- * Before destroying a DC that is current, make sure you call
- * MGL_makeCurrentDC(NULL) first!
- *-------------------------------------------------------------------------*/
-
-/* Routines to change the active global device context */
-
-MGLDC *	MGLAPI MGL_makeCurrentDC(MGLDC *dc);
-bool	MGLAPI MGL_isCurrentDC(MGLDC *dc);
-
-/* Current device context information and manipulation */
-
-m_int 	MGLAPI MGL_getAspectRatio(void);
-void 	MGLAPI MGL_setAspectRatio(m_int aspectRatio);
-void 	ASMAPI MGL_setColor(color_t color);
-void	MGLAPI MGL_setColorRGB(uchar R,uchar G,uchar B);
-void	MGLAPI MGL_setColorCI(m_int index);
-color_t MGLAPI MGL_getColor(void);
-void 	ASMAPI MGL_setBackColor(color_t color);
-color_t MGLAPI MGL_getBackColor(void);
-color_t	ASMAPI MGL_packColor(pixel_format_t *pf,uchar R,uchar G,uchar B);
-void	MGLAPI MGL_unpackColor(pixel_format_t *pf,color_t color,uchar *R,uchar *G,uchar *B);
-color_t	ASMAPI MGL_packColorRGB(uchar R,uchar G,uchar B);
-void	MGLAPI MGL_unpackColorRGB(color_t color,uchar *R,uchar *G,uchar *B);
-color_t	MGLAPI MGL_defaultColor(void);
-#ifndef	MGL_LITE
-void	MGLAPI MGL_setMarkerSize(m_int size);
-m_int	MGLAPI MGL_getMarkerSize(void);
-void	MGLAPI MGL_setMarkerStyle(m_int style);
-m_int	MGLAPI MGL_getMarkerStyle(void);
-void	MGLAPI MGL_setMarkerColor(color_t color);
-color_t	MGLAPI MGL_getMarkerColor(void);
-void	MGLAPI MGL_setBorderColors(color_t bright,color_t dark);
-void	MGLAPI MGL_getBorderColors(color_t *bright,color_t *dark);
-void 	ASMAPI MGL_setWriteMode(m_int mode);
-m_int 	MGLAPI MGL_getWriteMode(void);
-void 	ASMAPI MGL_setPenStyle(m_int style);
-m_int 	MGLAPI MGL_getPenStyle(void);
-void 	MGLAPI MGL_setLineStyle(m_int style);
-m_int 	MGLAPI MGL_getLineStyle(void);
-void 	ASMAPI MGL_setLineStipple(ushort stipple);
-ushort	MGLAPI MGL_getLineStipple(void);
-void 	ASMAPI MGL_setLineStippleCount(m_uint stippleCount);
-m_uint	MGLAPI MGL_getLineStippleCount(void);
-void 	ASMAPI MGL_setPenBitmapPattern(const pattern_t *pat);
-void 	MGLAPI MGL_getPenBitmapPattern(pattern_t *pat);
-void 	ASMAPI MGL_setPenPixmapPattern(const pixpattern_t *pat);
-void 	MGLAPI MGL_getPenPixmapPattern(pixpattern_t *pat);
-void	MGLAPI MGL_setPenSize(m_int height,m_int width);
-void 	MGLAPI MGL_getPenSize(m_int *height,m_int *width);
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_setColorMapMode(m_int mode);
-m_int	MGLAPI MGL_getColorMapMode(void);
-#endif
-void	MGLAPI MGL_setPolygonType(m_int type);
-m_int	MGLAPI MGL_getPolygonType(void);
-#endif
-void 	MGLAPI MGL_getAttributes(attributes_t *attr);
-void 	MGLAPI MGL_restoreAttributes(attributes_t *attr);
-
-/* Device clearing */
-
-void	ASMAPI MGL_clearDevice(void);
-void 	MGLAPI MGL_clearViewport(void);
-
-/* Viewport and clip rectangle manipulation */
-
-void 	MGLAPI MGL_setViewport(rect_t view);
-void	MGLAPI MGL_setRelViewport(rect_t view);
-void 	MGLAPI MGL_getViewport(rect_t *view);
-void 	MGLAPI MGL_setViewportOrg(point_t org);
-void	MGLAPI MGL_getViewportOrg(point_t *org);
-void	MGLAPI MGL_globalToLocal(point_t *p);
-void	MGLAPI MGL_localToGlobal(point_t *p);
-m_int 	MGLAPI MGL_maxx(void);
-m_int 	MGLAPI MGL_maxy(void);
-void 	MGLAPI MGL_setClipRect(rect_t clip);
-void 	MGLAPI MGL_getClipRect(rect_t *clip);
-void 	MGLAPI MGL_setClipMode(bool mode);
-bool 	MGLAPI MGL_getClipMode(void);
-
-/* Pixel plotting */
-
-void 	MGLAPI MGL_pixelCoord(m_int x,m_int y);
-color_t	MGLAPI MGL_getPixelCoord(m_int x,m_int y);
-void	ASMAPI MGL_beginPixel(void);
-void 	MGLAPI MGL_pixelCoordFast(m_int x,m_int y);
-color_t	MGLAPI MGL_getPixelCoordFast(m_int x,m_int y);
-void	ASMAPI MGL_endPixel(void);
-
-/* Line drawing and clipping */
-
-void 	MGLAPI MGL_moveToCoord(m_int x,m_int y);
-void 	MGLAPI MGL_moveRelCoord(m_int dx,m_int dy);
-void 	MGLAPI MGL_lineToCoord(m_int x,m_int y);
-void 	MGLAPI MGL_lineRelCoord(m_int dx,m_int dy);
-m_int 	MGLAPI MGL_getX(void);
-m_int 	MGLAPI MGL_getY(void);
-void	MGLAPI MGL_getCP(point_t* CP);
-void 	MGLAPI MGL_lineCoord(m_int x1,m_int y1,m_int x2,m_int y2);
-void 	MGLAPI MGL_lineCoordFX(fix32_t x1,fix32_t y1,fix32_t x2,fix32_t y2);
-void	MGLAPI MGL_lineCoordFast(m_int x1,m_int y1,m_int x2,m_int y2);
-void	MGLAPI MGL_lineCoordFastFX(fix32_t x1,fix32_t y1,fix32_t x2,fix32_t y2);
-void    MGLAPI MGL_lineEngine(fix32_t x1,fix32_t y1,fix32_t x2,fix32_t y2,void (ASMAPI *plotPoint)(m_int x,m_int y));
-bool	MGLAPI MGL_clipLineFX(fix32_t *x1,fix32_t *y1,fix32_t *x2,fix32_t *y2,fix32_t left,fix32_t top,fix32_t right,fix32_t bottom);
-#ifndef	MGL_LITE
-void 	ASMAPI MGL_scanLine(m_int y,m_int x1,m_int x2);
-#endif
-
-/* Routines to perform bank switching for banked framebuffers for custom
- * rendering code. The first version is callable only from assembler and
- * requires the new bank value to be passed in the DL register. The second
- * version is callable directly from C. DO NOT CALL THESE FUNCTIONS WHEN
- * RUNNING WITH A LINEAR FRAMEBUFFER!!!
- */
-
-void	_ASMAPI SVGA_setBank(void);
-void	_ASMAPI SVGA_setBankC(int bank);
-
-/* Routines to begin/end direct framebuffer access. You must call these
- * functions is you wish to render directly to a hardware accelerated
- * device surface.
- */
-
-void 	ASMAPI MGL_beginDirectAccess(void);
-void 	ASMAPI MGL_endDirectAccess(void);
-
-/* Routines to begin/end fast rendering of flat shaded lines, scanlines
- * and polygons.
- */
-
-void 	ASMAPI MGL_beginDrawing(void);
-void 	ASMAPI MGL_endDrawing(void);
-
-/* Routines to begin/end fast rendering of smooth shaded lines, scanlines
- * and polygons.
- */
-
-#ifdef	MGL_3D
-void 	ASMAPI MGL_beginShadedDrawing(void);
-void 	ASMAPI MGL_endShadedDrawing(void);
-#endif
-
-/* Routines to begin/end fast rendering of flat shaded, zbuffered lines and
- * polygons.
- */
-
-#ifdef	MGL_3D
-void 	ASMAPI MGL_beginZDrawing(void);
-void 	ASMAPI MGL_endZDrawing(void);
-#endif
-
-/* Routines to begin/end fast rendering of smooth shaded, zbuffered lines and
- * polygons.
- */
-
-#ifdef	MGL_3D
-void 	ASMAPI MGL_beginZShadedDrawing(void);
-void 	ASMAPI MGL_endZShadedDrawing(void);
-#endif
-
-/* Polygon drawing: Note that the following fast polygon routines
- * only work with convex polygons. The integer coordinate versions are
- * provided for compatibility only, and convert the coordinates to fixed
- * point and call the appropriate fixed point routines below.
- */
-
-#ifndef	MGL_LITE
-void	MGLAPI MGL_fillPolygon(m_int count,point_t *vArray,m_int xOffset,m_int yOffset);
-void	MGLAPI MGL_fillPolygonFast(m_int count,point_t *vArray,m_int xOffset,m_int yOffset);
-void    ASMAPI MGL_fillPolygonFX(m_int count,fxpoint_t *vArray,m_int vinc,fix32_t xOffset,fix32_t yOffset);
-void    ASMAPI MGL_fillPolygonFastFX(m_int count,fxpoint_t *vArray,m_int vinc,fix32_t xOffset,fix32_t yOffset);
-#endif
-
-/* 3D rasterization routines */
-
-#ifdef	MGL_3D
-void    MGLAPI MGL_zClearCoord(m_int left,m_int top,m_int right,m_int bottom,zfix32_t clearVal);
-#endif
-
-#ifdef	MGL_FIX3D
-void	ASMAPI MGL_cLineCoordFast(fix32_t x1,fix32_t y1,fix32_t c1,fix32_t x2,fix32_t y2,fix32_t c2);
-void	ASMAPI MGL_rgbLineCoordFast(fix32_t x1,fix32_t y1,fix32_t r1,fix32_t g1,fix32_t b1,fix32_t x2,fix32_t y2,fix32_t r2,fix32_t g2,fix32_t b2);
-void	ASMAPI MGL_zLineCoordFast(fix32_t x1,fix32_t y1,zfix32_t z1,fix32_t x2,fix32_t y2,zfix32_t z2);
-void	ASMAPI MGL_czLineCoordFast(fix32_t x1,fix32_t y1,zfix32_t z1,fix32_t c1,fix32_t x2,fix32_t y2,zfix32_t z2,fix32_t c2);
-void	ASMAPI MGL_rgbzLineCoordFast(fix32_t x1,fix32_t y1,zfix32_t z1,fix32_t r1,fix32_t g1,fix32_t b1,fix32_t x2,fix32_t y2,zfix32_t z2,fix32_t r2,fix32_t g2,fix32_t b2);
-
-void	ASMAPI MGL_triFast(fxpoint_t *v1,fxpoint_t *v2,fxpoint_t *v3,fix32_t xOffset,fix32_t yOffset);
-void	ASMAPI MGL_cTriFast(fxpointc_t *v1,fxpointc_t *v2,fxpointc_t *v3,fix32_t xOffset,fix32_t yOffset);
-void	ASMAPI MGL_rgbTriFast(fxpointrgb_t *v1,fxpointrgb_t *v2,fxpointrgb_t *v3,fix32_t xOffset,fix32_t yOffset);
-void	ASMAPI MGL_zTriFast(fxpointz_t *v1,fxpointz_t *v2,fxpointz_t *v3,fix32_t xOffset,fix32_t yOffset,zfix32_t zOffset);
-void	ASMAPI MGL_czTriFast(fxpointcz_t *v1,fxpointcz_t *v2,fxpointcz_t *v3,fix32_t xOffset,fix32_t yOffset,zfix32_t zOffset);
-void	ASMAPI MGL_rgbzTriFast(fxpointrgbz_t *v1,fxpointrgbz_t *v2,fxpointrgbz_t *v3,fix32_t xOffset,fix32_t yOffset,zfix32_t zOffset);
-
-void	ASMAPI MGL_quadFast(fxpoint_t *v1,fxpoint_t *v2,fxpoint_t *v3,fxpoint_t *v4,fix32_t xOffset,fix32_t yOffset);
-void	ASMAPI MGL_cQuadFast(fxpointc_t *v1,fxpointc_t *v2,fxpointc_t *v3,fxpointc_t *v4,fix32_t xOffset,fix32_t yOffset);
-void	ASMAPI MGL_rgbQuadFast(fxpointrgb_t *v1,fxpointrgb_t *v2,fxpointrgb_t *v3,fxpointrgb_t *v4,fix32_t xOffset,fix32_t yOffset);
-void	ASMAPI MGL_zQuadFast(fxpointz_t *v1,fxpointz_t *v2,fxpointz_t *v3,fxpointz_t *v4,fix32_t xOffset,fix32_t yOffset,zfix32_t zOffset);
-void	ASMAPI MGL_czQuadFast(fxpointcz_t *v1,fxpointcz_t *v2,fxpointcz_t *v3,fxpointcz_t *v4,fix32_t xOffset,fix32_t yOffset,zfix32_t zOffset);
-void	ASMAPI MGL_rgbzQuadFast(fxpointrgbz_t *v1,fxpointrgbz_t *v2,fxpointrgbz_t *v3,fxpointrgbz_t *v4,fix32_t xOffset,fix32_t yOffset,zfix32_t zOffset);
-#endif
-
-/* Routine to set the currently active shade table. In HiColor and TrueColor
- * video modes, you must set a valid shadeTable before you call any of the
- * color index shaded rendering routines (MGL_cTri() etc). These routines
- * will interpolate an index into the current shade table rather than
- * each of the RGB color channels, and the appropriate full RGB color is
- * extracted directly from the shade table. The shade table can be any size,
- * but the application must ensure that the indices passed in are within
- * the range of the current shade table.
- */
-
-#ifdef	MGL_3D
-void	MGLAPI MGL_setShadeTable(color_t *shadeTab);
-#endif
-
-/* Polyline drawing */
-
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_marker(point_t p);
-void	MGLAPI MGL_polyPoint(m_int count,point_t *vArray);
-void 	MGLAPI MGL_polyMarker(m_int count,point_t *vArray);
-void 	MGLAPI MGL_polyLine(m_int count,point_t *vArray);
-#endif
-
-/* Rectangle drawing */
-
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_rectCoord(m_int left,m_int top,m_int right,m_int bottom);
-void 	MGLAPI MGL_fillRectCoord(m_int left,m_int top,m_int right,m_int bottom);
-#endif
-
-/* Scanline color scanning. Thee routines are primitive, and do not perform
- * any clipping or viewport mapping, so can be used to build you own
- * high performance floodfilling routines (see the example file ffill.c
- * for pre-built high speed floodfill routines).
- */
-
-#ifndef	MGL_LITE
-m_int	ASMAPI MGL_scanRightForColor(m_int x,m_int y,color_t color);
-m_int	ASMAPI MGL_scanLeftForColor(m_int x,m_int y,color_t color);
-m_int 	ASMAPI MGL_scanRightWhileColor(m_int x,m_int y,color_t color);
-m_int	ASMAPI MGL_scanLeftWhileColor(m_int x,m_int y,color_t color);
-#endif
-
-/* Psuedo 3D border drawing */
-
-#ifndef	MGL_LITE
-void	MGLAPI MGL_drawBorderCoord(m_int left,m_int top,m_int right,m_int bottom,m_int style,m_int thickness);
-void 	MGLAPI MGL_drawHDivider(m_int y,m_int x1,m_int x2);
-void 	MGLAPI MGL_drawVDivider(m_int x,m_int y1,m_int y2);
-#endif
-
-/* Ellipse drawing */
-
-#ifndef	MGL_LITE
-void	MGLAPI MGL_ellipseArc(rect_t extentRect,m_int startAngle,m_int endAngle);
-void	MGLAPI MGL_ellipseArcCoord(m_int x,m_int y,m_int xradius,m_int yradius,m_int startAngle,m_int endAngle);
-void	ASMAPI MGL_getArcCoords(arc_coords_t *coords);
-void	MGLAPI MGL_ellipse(rect_t extentRect);
-void	MGLAPI MGL_ellipseCoord(m_int x,m_int y,m_int xradius,m_int yradius);
-void	MGLAPI MGL_fillEllipseArc(rect_t extentRect,m_int startAngle,m_int endAngle);
-void	MGLAPI MGL_fillEllipseArcCoord(m_int x,m_int y,m_int xradius,m_int yradius,m_int startAngle,m_int endAngle);
-void	MGLAPI MGL_fillEllipse(rect_t extentRect);
-void	MGLAPI MGL_fillEllipseCoord(m_int x,m_int y,m_int xradius,m_int yradius);
-void	MGLAPI MGL_ellipseEngine(rect_t extentRect,void (ASMAPI *setup)(m_int topY,m_int botY,m_int left,m_int right),void (ASMAPI *set4pixels)(bool inc_x,bool inc_y,bool region1),void (ASMAPI *finished)(void));
-void 	MGLAPI MGL_ellipseArcEngine(rect_t extentRect,m_int startAngle,m_int endAngle,arc_coords_t *ac,void (ASMAPI *plotPoint)(m_int x,m_int y));
-#endif
-
-/* Text attribute manipulation */
-
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_setTextJustify(m_int horiz,m_int vert);
-void 	MGLAPI MGL_getTextJustify(m_int *horiz,m_int *vert);
-void 	MGLAPI MGL_setTextDirection(m_int direction);
-m_int   MGLAPI MGL_getTextDirection(void);
-void	MGLAPI MGL_setTextSize(m_int numerx,m_int denomx,m_int numery,m_int denomy);
-void	MGLAPI MGL_getTextSize(m_int *numerx,m_int *denomx,m_int *numery,m_int *denomy);
-void	MGLAPI MGL_setSpaceExtra(m_int extra);
-m_int	MGLAPI MGL_getSpaceExtra(void);
-void	MGLAPI MGL_setTextSettings(text_settings_t *settings);
-void	MGLAPI MGL_getTextSettings(text_settings_t *settings);
-m_int 	MGLAPI MGL_textHeight(void);
-m_int 	MGLAPI MGL_textWidth(const char *str);
-void	MGLAPI MGL_textBounds(m_int x,m_int y,const char *str,rect_t *bounds);
-m_int	MGLAPI MGL_charWidth(char ch);
-void	MGLAPI MGL_getFontMetrics(metrics_t *metrics);
-void	MGLAPI MGL_getCharMetrics(char ch,metrics_t *metrics);
-m_int	MGLAPI MGL_maxCharWidth(void);
-void	MGLAPI MGL_underScoreLocation(m_int *x,m_int *y,const char *str);
-#endif
-
-/* Text drawing */
-
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_drawStr(const char *str);
-void	MGLAPI MGL_drawStrXY(m_int x,m_int y,const char *str);
-bool	MGLAPI MGL_useFont(font_t *font);
-font_t 	* MGLAPI MGL_getFont(void);
-bool	MGLAPI MGL_vecFontEngine(m_int x,m_int y,const char *str,void (ASMAPI *move)(m_int x,m_int y),void (ASMAPI *draw)(m_int x,m_int y));
-#endif
-
-/* BitBlt support */
-
-void 	MGLAPI MGL_bitBltCoord(MGLDC *dst,MGLDC *src,m_int left,m_int top,m_int right,m_int bottom,m_int dstLeft,m_int dstTop,m_int op);
-void 	MGLAPI MGL_stretchBltCoord(MGLDC *dst,MGLDC *src,m_int left,m_int top,m_int right,m_int bottom,m_int dstLeft,m_int dstTop,m_int dstRight,m_int dstBottom);
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_getDivotCoord(MGLDC *dc,m_int left,m_int top,m_int right,m_int bottom,void *divot);
-void 	MGLAPI MGL_putDivot(MGLDC *dc,void *divot);
-long 	MGLAPI MGL_divotSizeCoord(MGLDC *dc,m_int left,m_int top,m_int right,m_int bottom);
-void 	MGLAPI MGL_putMonoImage(MGLDC *dc,m_int x,m_int y,m_int byteWidth,m_int height,void *image);
-void	MGLAPI MGL_putBitmap(MGLDC *dc,m_int x,m_int y,const bitmap_t *bitmap,m_int op);
-void	MGLAPI MGL_putBitmapSection(MGLDC *dc,m_int left,m_int top,m_int right,m_int bottom,m_int dstLeft,m_int dstTop,const bitmap_t *bitmap,m_int op);
-void	MGLAPI MGL_putBitmapTransparent(MGLDC *dc,m_int x,m_int y,const bitmap_t *bitmap,color_t transparent,bool sourceTrans);
-void	MGLAPI MGL_putBitmapTransparentSection(MGLDC *dc,m_int left,m_int top,m_int right,m_int bottom,m_int dstLeft,m_int dstTop,const bitmap_t *bitmap,color_t transparent,bool sourceTrans);
-void	MGLAPI MGL_putBitmapMask(MGLDC *dc,m_int x,m_int y,const bitmap_t *mask,color_t color);
-void	MGLAPI MGL_stretchBitmap(MGLDC *dc,m_int left,m_int top,m_int right,m_int bottom,const bitmap_t *bitmap);
-void	MGLAPI MGL_putIcon(MGLDC *dc,m_int x,m_int y,const icon_t *icon);
-void 	MGLAPI MGL_transBltCoord(MGLDC *dst,MGLDC *src,m_int left,m_int top,m_int right,m_int bottom,m_int dstLeft,m_int dstTop,color_t transparent,bool sourceTrans);
-#endif
-
-/* Linear offscreen DC BitBlt support */
-
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_bitBltLinCoord(MGLDC *dst,MGLDC *src,ulong srcOfs,m_int dstLeft,m_int dstTop,m_int dstRight,m_int dstBottom,m_int op);
-void 	MGLAPI MGL_transBltLinCoord(MGLDC *dst,MGLDC *src,ulong srcOfs,m_int dstLeft,m_int dstTop,m_int dstRight,m_int dstBottom,color_t transparent,bool sourceTrans);
-#endif
-
-/* Monochrome bitmap manipulation */
-
-#ifndef	MGL_LITE
-void	MGLAPI MGL_drawGlyph(font_t *g,m_int x,m_int y,uchar glyph);
-m_int	MGLAPI MGL_getGlyphWidth(font_t *font,uchar glyph);
-m_int	MGLAPI MGL_getGlyphHeight(font_t *font);
-void 	MGLAPI MGL_rotateGlyph(uchar *dst,uchar *src,m_int *byteWidth,m_int *height,m_int rotation);
-void 	MGLAPI MGL_mirrorGlyph(uchar *dst,uchar *src,m_int byteWidth,m_int height);
-#endif
-
-/* Region management */
-
-#ifndef	MGL_LITE
-region_t * MGLAPI MGL_newRegion(void);
-region_t * MGLAPI MGL_copyRegion(const region_t *s);
-void	MGLAPI MGL_clearRegion(region_t *r);
-void 	MGLAPI MGL_freeRegion(region_t *r);
-void 	MGLAPI MGL_drawRegion(m_int x,m_int y,const region_t *r);
-#endif
-
-/* Region generation primitives */
-
-#ifndef	MGL_LITE
-region_t * MGLAPI MGL_rgnLineCoord(m_int x1,m_int y1,m_int x2,m_int y2,const region_t *pen);
-region_t * MGLAPI MGL_rgnLineCoordFX(fix32_t x1,fix32_t y1,fix32_t x2,fix32_t y2,const region_t *pen);
-/*region_t * MGLAPI MGL_rgnPolygon(m_int count,point_t *vArray);*/
-/*region_t * MGLAPI MGL_rgnPolygonFast(m_int count,point_t *vArray);*/
-region_t * MGLAPI MGL_rgnSolidRectCoord(m_int left,m_int top,m_int right,m_int bottom);
-region_t * MGLAPI MGL_rgnEllipse(rect_t extentRect,const region_t *pen);
-region_t * MGLAPI MGL_rgnEllipseArc(rect_t extentRect,m_int startAngle,m_int endAngle,const region_t *pen);
-void	MGLAPI MGL_rgnGetArcCoords(arc_coords_t *coords);
-region_t * MGLAPI MGL_rgnSolidEllipse(rect_t extentRect);
-region_t * MGLAPI MGL_rgnSolidEllipseArc(rect_t extentRect,m_int startAngle,m_int endAngle);
-#endif
-
-/* Region alegbra */
-
-#ifndef	MGL_LITE
-region_t * MGLAPI MGL_sectRegion(const region_t *r1,const region_t *r2);
-region_t * MGLAPI MGL_sectRegionRect(const region_t *r1,const rect_t *r2);
-bool	MGLAPI MGL_unionRegion(region_t *r1,const region_t *r2);
-bool	MGLAPI MGL_unionRegionRect(region_t *r1,const rect_t *r2);
-bool 	MGLAPI MGL_unionRegionOfs(region_t *r1,const region_t *r2,m_int xOffset,m_int yOffset);
-bool	MGLAPI MGL_diffRegion(region_t *r1,const region_t *r2);
-bool	MGLAPI MGL_diffRegionRect(region_t *r1,const rect_t *r2);
-void	MGLAPI MGL_optimizeRegion(region_t *r);
-void 	MGLAPI MGL_offsetRegion(region_t *r,m_int dx,m_int dy);
-bool	MGLAPI MGL_emptyRegion(const region_t *r);
-bool	MGLAPI MGL_equalRegion(const region_t *r1,const region_t *r2);
-bool	MGLAPI MGL_ptInRegionCoord(m_int x,m_int y,const region_t *r);
-#endif
-
-/* Region traversal */
-
-#ifndef	MGL_LITE
-typedef void (ASMAPI *rgncallback_t)(const rect_t *r);
-
-void 	MGLAPI MGL_traverseRegion(region_t *rgn,rgncallback_t doRect);
-#endif
-
-/* RGB to 8 bit halftone dithering routines */
-
-#ifndef	MGL_LITE
-void 	MGLAPI MGL_getHalfTonePalette(palette_t *pal);
-uchar	MGLAPI MGL_halfTonePixel(m_int x,m_int y,uchar R,uchar G,uchar B);
-#endif
-
-/* Resource loading/unloading */
-
-font_t * MGLAPI MGL_loadFont(const char *fontname);
-bool	MGLAPI MGL_availableFont(const char *fontname);
-void	MGLAPI MGL_unloadFont(font_t *font);
-cursor_t * MGLAPI MGL_loadCursor(const char *cursorName);
-bool	MGLAPI MGL_availableCursor(const char *cursorName);
-void 	MGLAPI MGL_unloadCursor(cursor_t *cursor);
-#ifndef	MGL_LITE
-icon_t * MGLAPI MGL_loadIcon(const char *iconName,bool loadPalette);
-bool	MGLAPI MGL_availableIcon(const char *iconName);
-void	MGLAPI MGL_unloadIcon(icon_t *icon);
-#endif
-
-/* Windows BMP bitmap loading/unloading/saving */
-
-#ifndef	MGL_LITE
-bitmap_t * MGLAPI MGL_loadBitmap(const char *bitmapName,bool loadPalette);
-bool	MGLAPI MGL_availableBitmap(const char *bitmapName);
-void	MGLAPI MGL_unloadBitmap(bitmap_t *bitmap);
-bool	MGLAPI MGL_getBitmapSize(const char *bitmapName,m_int *width,m_int *height,m_int *bitsPerPixel,pixel_format_t *pf);
-bool	MGLAPI MGL_loadBitmapIntoDC(MGLDC *dc,const char *bitmapName,m_int dstLeft,m_int dstTop,bool loadPalette);
-bool	MGLAPI MGL_saveBitmapFromDC(MGLDC *dc,const char *bitmapName,m_int left,m_int top,m_int right,m_int bottom);
-bitmap_t * MGLAPI MGL_getBitmapFromDC(MGLDC *dc,m_int left,m_int top,m_int right,m_int bottom,bool savePalette);
-bitmap_t * MGLAPI MGL_buildMonoMask(bitmap_t *bitmap,color_t transparent);
-#endif
-
-/* PCX bitmap loading/unloading/saving (1/4/8 bpp only) */
-
-#ifndef	MGL_LITE
-bitmap_t * MGLAPI MGL_loadPCX(const char *bitmapName,bool loadPalette);
-bool	MGLAPI MGL_availablePCX(const char *bitmapName);
-bool	MGLAPI MGL_getPCXSize(const char *bitmapName,m_int *width,m_int *height,m_int *bitsPerPixel);
-bool	MGLAPI MGL_loadPCXIntoDC(MGLDC *dc,const char *bitmapName,m_int dstLeft,m_int dstTop,bool loadPalette);
-bool	MGLAPI MGL_savePCXFromDC(MGLDC *dc,const char *bitmapName,m_int left,m_int top,m_int right,m_int bottom);
-#endif
-
-/* Random number generation routines for shorts and longs with full range */
-
-void    ASMAPI MGL_srand(m_uint seed);
-ushort	ASMAPI MGL_random(ushort max);
-ulong	ASMAPI MGL_randoml(ulong max);
-
-/* Mouse support */
-
-bool	MGLAPI MS_available(void);
-void	MGLAPI MS_show(void);
-void	MGLAPI MS_hide(void);
-void	MGLAPI MS_obscure(void);
-void	MGLAPI MS_setCursor(cursor_t *curs);
-void	MGLAPI MS_setCursorColor(color_t color);
-void 	MGLAPI MS_moveTo(m_int x,m_int y);
-void	MGLAPI MS_getPos(m_int *x,m_int *y);
-void	MGLAPI MS_drawCursor(void);
-
-/* Rectangle and Point manipulation */
-
-rect_t 	MGLAPI MGL_defRect(m_int left,m_int top,m_int right,m_int bottom);
-rect_t 	MGLAPI MGL_defRectPt(point_t leftTop,point_t rightBottom);
-bool 	MGLAPI MGL_sectRect(rect_t s1,rect_t s2,rect_t *d);
-bool 	MGLAPI MGL_sectRectCoord(m_int left1,m_int top1,m_int right1,m_int bottom1,m_int left2,m_int top2,m_int right2,m_int bottom2,rect_t *d);
-void 	MGLAPI MGL_unionRect(rect_t s1,rect_t s2,rect_t *d);
-void 	MGLAPI MGL_unionRectCoord(m_int left1,m_int top1,m_int right1,m_int bottom1,m_int left2,m_int top2,m_int right2,m_int bottom2,rect_t *d);
-
-/* Built-in patterns and mouse cursor */
-
-#ifndef	MGL_LITE
-pattern_t	* MGLAPI _MGL_getEmptyPat(void);
-pattern_t   * MGLAPI _MGL_getGrayPat(void);
-pattern_t   * MGLAPI _MGL_getSolidPat(void);
-#endif
-cursor_t    * MGLAPI _MGL_getDefCursor(void);
-
-/* Fixed point multiplication/divide routines */
-
-#if defined(__WATCOMC__) && defined(__386__)
-
-/* For Watcom C++ we can use special inline assembler code that is much
- * faster than calling the 386 assembler functions. Currently this is the
- * the only compiler that will allow inline assembler to be expanded
- * directly as inline functions.
- */
-
-fix32_t	MGL_FixMul(fix32_t a,fix32_t b);
-#pragma aux MGL_FixMul =			\
-	"imul	edx"					\
-	"add	eax,8000h"				\
-	"adc	edx,0"					\
-	"shrd	eax,edx,16"				\
-	parm [eax] [edx]				\
-	value [eax]						\
-	modify exact [eax edx];
-
-fix32_t	MGL_FixDiv(fix32_t a,fix32_t b);
-#pragma aux MGL_FixDiv =			\
-	"xor	eax,eax"				\
-	"shrd	eax,edx,16"				\
-	"sar	edx,16"					\
-	"idiv	ebx"              		\
-	parm [edx] [ebx] 				\
-	value [eax]             		\
-	modify exact [eax edx];
-
-fix32_t	MGL_FixMulDiv(fix32_t a,fix32_t b,fix32_t c);
-#pragma aux MGL_FixMulDiv =			\
-	"imul	ebx"					\
-	"idiv	ecx"              		\
-	parm [eax] [ebx] [ecx] 			\
-	value [eax]             		\
-	modify exact [eax edx];
-
-m_int	MGL_backfacing(fix32_t dx1,fix32_t dy1,fix32_t dx2,fix32_t dy2);
-#pragma aux MGL_backfacing =		\
-	"imul	ebx"					\
-	"mov	ebx,eax"				\
-	"mov	ecx,edx"				\
-	"mov	eax,esi"				\
-	"imul	edi"					\
-	"sub	eax,ebx"				\
-	"mov	eax,1"					\
-	"sbb	edx,ecx"				\
-	"jns	@@Backfacing"			\
-	"xor	eax,eax"				\
-	"@@Backfacing:"					\
-	parm [eax] [esi] [edi] [ebx]	\
-	value [eax]             		\
-	modify exact [eax ecx edx];
-
-void MGL_memcpy(void *dst,void *src,m_int n);
-#pragma aux MGL_memcpy =            \
-	"mov	eax,ecx"				\
-	"shr    ecx,2"                  \
-	"rep    movsd"                  \
-	"mov	cl,al"					\
-	"and	cl,3"					\
-	"rep	movsb"					\
-	parm [edi] [esi] [ecx]			\
-	modify exact [eax ecx esi edi];
-
-#else
-
-fix32_t	ASMAPI MGL_FixMul(fix32_t a,fix32_t b);
-fix32_t	ASMAPI MGL_FixDiv(fix32_t a,fix32_t b);
-fix32_t	ASMAPI MGL_FixMulDiv(fix32_t a,fix32_t b,fix32_t c);
-m_int	ASMAPI MGL_backfacing(fix32_t dx1,fix32_t dy1,fix32_t dx2,fix32_t dy2);
-void 	ASMAPI MGL_memcpy(void *dst,void *src,m_int n);
-
-#endif
-
-/* The following are special memcpy routines that properly handler reading
- * and writing to virtual linear buffer memory by forcing the proper
- * alignment. Note that the copy is extended to use a DWORD copy of speed.
- */
-
-void 	ASMAPI MGL_memcpyVIRTSRC(void *dst,void *src,m_int n);
-void 	ASMAPI MGL_memcpyVIRTDST(void *dst,void *src,m_int n);
-
-/* Function to find an MGL system file's full pathname */
-
-bool	MGLAPI _MGL_findFile(char *validpath,const char *dir, const char *filename, const char *mode);
-
-/* Override the internal MGL file I/O functions */
-
-void	MGLAPI MGL_setFileIO(fileio_t *fio);
-
-/* The following dummy symbols are used to link in driver files to be used. A
- * driver is not active until it is linked in with the MGL_registerDriver
- * call. Because we dont export globals in DLLs, we provide functions to
- * get the address of the drivers. However for a static link library we
- * need to use globals so that if the driver data is unreferenced, it will
- * not be linked in with the code. 
- */
-
-#ifndef	BUILD_MGL
-#if	defined(MGL_DLL) && !defined(BUILD_MGLDLL)
-void * MGLAPI VGA4_getDriverAddr(void);
-void * MGLAPI VGAX_getDriverAddr(void);
-void * MGLAPI SVGA4_getDriverAddr(void);
-void * MGLAPI SVGA8_getDriverAddr(void);
-void * MGLAPI SVGA16_getDriverAddr(void);
-void * MGLAPI SVGA24_getDriverAddr(void);
-void * MGLAPI SVGA32_getDriverAddr(void);
-#if !defined(__16BIT__)
-void * MGLAPI VGA8_getDriverAddr(void);
-void * MGLAPI LINEAR8_getDriverAddr(void);
-void * MGLAPI LINEAR16_getDriverAddr(void);
-void * MGLAPI LINEAR24_getDriverAddr(void);
-void * MGLAPI LINEAR32_getDriverAddr(void);
-void * MGLAPI ACCEL8_getDriverAddr(void);
-void * MGLAPI ACCEL16_getDriverAddr(void);
-void * MGLAPI ACCEL24_getDriverAddr(void);
-void * MGLAPI ACCEL32_getDriverAddr(void);
-#if defined(MGLWIN) || defined(__WINDOWS__)
-void * MGLAPI DDRAW8_getDriverAddr(void);
-void * MGLAPI DDRAW16_getDriverAddr(void);
-void * MGLAPI DDRAW24_getDriverAddr(void);
-void * MGLAPI DDRAW32_getDriverAddr(void);
-#endif
-#endif
-void * MGLAPI PACKED1_getDriverAddr(void);
-void * MGLAPI PACKED4_getDriverAddr(void);
-void * MGLAPI PACKED8_getDriverAddr(void);
-void * MGLAPI PACKED16_getDriverAddr(void);
-void * MGLAPI PACKED24_getDriverAddr(void);
-void * MGLAPI PACKED32_getDriverAddr(void);
-#define VGA4_driver			VGA4_getDriverAddr()
-#define VGAX_driver			VGAX_getDriverAddr()
-#define SVGA4_driver		SVGA4_getDriverAddr()
-#define SVGA8_driver		SVGA8_getDriverAddr()
-#define SVGA16_driver		SVGA16_getDriverAddr()
-#define SVGA24_driver		SVGA24_getDriverAddr()
-#define SVGA32_driver		SVGA32_getDriverAddr()
-#if !defined(__16BIT__)
-#define VGA8_driver			VGA8_getDriverAddr()
-#define LINEAR8_driver		LINEAR8_getDriverAddr()
-#define LINEAR16_driver		LINEAR16_getDriverAddr()
-#define LINEAR24_driver     LINEAR24_getDriverAddr()
-#define LINEAR32_driver     LINEAR32_getDriverAddr()
-#define ACCEL8_driver       ACCEL8_getDriverAddr()
-#define ACCEL16_driver      ACCEL16_getDriverAddr()
-#define ACCEL24_driver      ACCEL24_getDriverAddr()
-#define ACCEL32_driver      ACCEL32_getDriverAddr()
-#if defined(MGLWIN) || defined(__WINDOWS__)
-#define DDRAW8_driver       DDRAW8_getDriverAddr()
-#define DDRAW16_driver      DDRAW16_getDriverAddr()
-#define DDRAW24_driver      DDRAW24_getDriverAddr()
-#define DDRAW32_driver      DDRAW32_getDriverAddr()
-#endif
-#endif
-#define PACKED1_driver      PACKED1_getDriverAddr()
-#define PACKED4_driver      PACKED4_getDriverAddr()
-#define PACKED8_driver      PACKED8_getDriverAddr()
-#define PACKED16_driver     PACKED16_getDriverAddr()
-#define PACKED24_driver     PACKED24_getDriverAddr()
-#define PACKED32_driver		PACKED32_getDriverAddr()
-#else
-extern m_int _VARAPI VGA4_driver[];
-extern m_int _VARAPI VGAX_driver[];
-extern m_int _VARAPI SVGA4_driver[];
-extern m_int _VARAPI SVGA8_driver[];
-extern m_int _VARAPI SVGA16_driver[];
-extern m_int _VARAPI SVGA24_driver[];
-extern m_int _VARAPI SVGA32_driver[];
-#if !defined(__16BIT__)
-extern m_int _VARAPI VGA8_driver[];
-extern m_int _VARAPI LINEAR8_driver[];
-extern m_int _VARAPI LINEAR16_driver[];
-extern m_int _VARAPI LINEAR24_driver[];
-extern m_int _VARAPI LINEAR32_driver[];
-extern m_int _VARAPI ACCEL8_driver[];
-extern m_int _VARAPI ACCEL16_driver[];
-extern m_int _VARAPI ACCEL24_driver[];
-extern m_int _VARAPI ACCEL32_driver[];
-#if defined(MGLWIN) || defined(__WINDOWS__)
-extern m_int _VARAPI DDRAW8_driver[];
-extern m_int _VARAPI DDRAW16_driver[];
-extern m_int _VARAPI DDRAW24_driver[];
-extern m_int _VARAPI DDRAW32_driver[];
-#endif
-#endif
-extern m_int _VARAPI PACKED1_driver[];
-extern m_int _VARAPI PACKED4_driver[];
-extern m_int _VARAPI PACKED8_driver[];
-extern m_int _VARAPI PACKED16_driver[];
-extern m_int _VARAPI PACKED24_driver[];
-extern m_int _VARAPI PACKED32_driver[];
-#endif
-#endif
-
-/*---------------------------------------------------------------------------
- * Memory allocation and utility functions.
- *-------------------------------------------------------------------------*/
-
-#ifndef	__16BIT__
-#define	_HUGE
-#else
-#define	_HUGE	_huge
-#endif
-
-void MGL_availableMemory(ulong *physical,ulong *total);
-void MGL_useLocalMalloc(void _HUGE * (*malloc)(long size),void (*free)(void _HUGE *p));
-void * MGLAPI MGL_malloc(long size);
-void * MGLAPI MGL_calloc(long size,long n);
-void MGLAPI MGL_free(void _HUGE *p);
-void MGLAPI MGL_memset(void _HUGE *s,m_int c,long n);
-void MGLAPI MGL_memsetw(void _HUGE *s,m_int c,long n);
-void MGLAPI MGL_memsetl(void _HUGE *s,long c,long n);
-
-/*---------------------------------------------------------------------------
- * Set a fullscreen suspend application callback function. This is used in
- * fullscreen video modes to allow switching back to the normal operating
- * system graphical shell (such as Windows GDI, OS/2 PM etc).
- *-------------------------------------------------------------------------*/
-
-typedef m_int (ASMAPI *MGL_suspend_cb_t)(MGLDC *dc,m_int flags);
-void	MGLAPI MGL_setSuspendAppCallback(MGL_suspend_cb_t staveState);
-
-/*---------------------------------------------------------------------------
- * Tell the MGL to use a pre-loaded ACCEL.DRV driver file. This allows
- * you to link with the SciTech WinDirect/Pro and WinDirect/Ultra device
- * support libraries and tell the MGL to use the device support drivers.
- * If the user has a real ACCEL.DRV driver file in the standard location
- * on their machine, this driver file will still be used.
- *-------------------------------------------------------------------------*/
-
-void	MGLAPI MGL_setACCELDriver(void *driver);
-
-/*---------------------- Inline functions as Macros -----------------------*/
-
-#define	MGL_equalPoint(p1,p2)	((p1).x == (p2).x && (p1).y == (p2).y)
-
-#define	MGL_equalRect(r1,r2)	((r1).left == (r2).left &&			\
-								 (r1).top == (r2).top &&			\
-								 (r1).right == (r2).right &&		\
-								 (r1).bottom == (r2).bottom)
-
-#define	MGL_emptyRect(r)		((r).bottom <= (r).top || 			\
-								 (r).right <= (r).left)
-
-#define	MGL_disjointRect(r1,r2)	((r1).right <= (r2).left ||			\
-								 (r1).left >= (r2).right ||			\
-								 (r1).bottom <= (r2).top ||			\
-								 (r1).top >= (r2).bottom)
-
-#define	MGL_sectRect(s1,s2,d)										\
-   ((d)->left = MAX((s1).left,(s2).left),                           \
-	(d)->right = MIN((s1).right,(s2).right),                        \
-	(d)->top = MAX((s1).top,(s2).top),                              \
-	(d)->bottom = MIN((s1).bottom,(s2).bottom),                     \
-	!MGL_emptyRect(*d))
-
-#define	MGL_sectRectFast(s1,s2,d)									\
-	(d)->left = MAX((s1).left,(s2).left);                           \
-	(d)->right = MIN((s1).right,(s2).right);                        \
-	(d)->top = MAX((s1).top,(s2).top);                              \
-	(d)->bottom = MIN((s1).bottom,(s2).bottom)
-
-#define	MGL_sectRectCoord(l1,t1,r1,b1,l2,t2,r2,b2,d)				\
-   ((d)->left = MAX(l1,l2),											\
-	(d)->right = MIN(r1,r2),										\
-	(d)->top = MAX(t1,t2),											\
-	(d)->bottom = MIN(b1,b2),										\
-	!MGL_emptyRect(*d))
-
-#define	MGL_sectRectFastCoord(l1,t1,r1,b1,l2,t2,r2,b2,d)			\
-	(d)->left = MAX(l1,l2);											\
-	(d)->right = MIN(r1,r2);										\
-	(d)->top = MAX(t1,t2);											\
-	(d)->bottom = MIN(b1,b2)
-
-#define	MGL_unionRect(s1,s2,d)										\
-	(d)->left = MIN((s1).left,(s2).left);                           \
-	(d)->right = MAX((s1).right,(s2).right);                        \
-	(d)->top = MIN((s1).top,(s2).top);                              \
-	(d)->bottom = MAX((s1).bottom,(s2).bottom)
-
-#define MGL_unionRectCoord(l1,t1,r1,b1,l2,t2,r2,b2,d)				\
-	(d)->left = MIN(l1,l2);                                 		\
-	(d)->right = MAX(r1,r2);                              			\
-	(d)->top = MIN(t1,t2);                                    		\
-	(d)->bottom = MAX(b1,b2)
-
-#define	MGL_offsetRect(r,dx,dy)										\
-	{	(r).left += dx; (r).right += dx;							\
-		(r).top += dy; (r).bottom += dy; }
-
-#define	MGL_insetRect(r,dx,dy)										\
-	{	(r).left += dx; (r).right -= dx;							\
-		(r).top += dy; (r).bottom -= dy;							\
-		if (MGL_emptyRect(r))										\
-			(r).left = (r).right = (r).top = (r).bottom = 0; }
-
-#define	MGL_ptInRect(p,r)		((p).x >= (r).left &&				\
-								 (p).x < (r).right &&				\
-								 (p).y >= (r).top &&				\
-								 (p).y < (r).bottom)
-
-#define	MGL_ptInRectCoord(x,y,r)	((x) >= (r).left &&				\
-									 (x) < (r).right &&				\
-									 (y) >= (r).top &&				\
-									 (y) < (r).bottom)
-
-#define	MGL_ptInRegion(p,r)		MGL_ptInRegionCoord((p).x,(p).y,r)
-
-#define	MGL_pixel(p)			MGL_pixelCoord((p).x,(p).y)
-#define	MGL_getPixel(p)			MGL_getPixelCoord((p).x,(p).y)
-#define	MGL_pixelFast(p)		MGL_pixelCoordFast((p).x,(p).y)
-#define	MGL_getPixelFast(p)		MGL_getPixelCoordFast((p).x,(p).y)
-#define	MGL_moveTo(p)			MGL_moveToCoord((p).x,(p).y)
-#define MGL_moveRel(p)			MGL_moveRelCoord((p).x,(p).y)
-#define	MGL_line(p1,p2)			MGL_lineCoord((p1).x,(p1).y,(p2).x,(p2).y)
-#define	MGL_lineFast(p1,p2)		MGL_lineCoordFast((p1).x,(p1).y,(p2).x,(p2).y)
-#define	MGL_lineFX(p1,p2)		MGL_lineCoordFX((p1).x,(p1).y,(p2).x,(p2).y)
-#define	MGL_lineFastFX(p1,p2)	MGL_lineCoordFastFX((p1).x,(p1).y,(p2).x,(p2).y)
-#define	MGL_cLineFast(p1,p2)	MGL_cLineCoordFast((p1).p.x,(p1).p.y,(p1).c,(p2).p.x,(p2).p.y,(p2).c)
-#define	MGL_rgbLineFast(p1,p2)	MGL_rgbLineCoordFast((p1).p.x,(p1).p.y,(p1).c.r,(p1).c.g,(p1).c.b,(p2).p.x,(p2).p.y,(p2).c.r,(p2).c.g,(p2).c.b)
-#define	MGL_zLineFast(p1,p2)	MGL_zLineCoordFast((p1).p.x,(p1).p.y,(p1).z,(p2).p.x,(p2).p.y,(p2).z)
-#define	MGL_czLineFast(p1,p2)	MGL_czLineCoordFast((p1).p.x,(p1).p.y,(p1).z,(p1).c,(p2).p.x,(p2).p.y,(p2).z,(p2).c)
-#define	MGL_rgbzLineFast(p1,p2)	MGL_rgbzLineCoordFast((p1).p.x,(p1).p.y,(p1).z,(p1).c.r,(p1).c.g,(p1).c.b,(p2).p.x,(p2).p.y,(p2).z,(p2).c.r,(p2).c.g,(p2).c.b)
-
-#define	MGL_zClearPt(lt,rb,z)	MGL_zClearCoord((lt).x,(lt).y,	\
-									(rb).x,(rb).y,z)
-#define	MGL_zClear(r,z)			MGL_zClearCoord((r).left,(r).top,	\
-									(r).right,(r).bottom,z)
-#define	MGL_lineTo(p)			MGL_lineToCoord((p).x,(p).y)
-#define	MGL_lineRel(p)			MGL_lineRelCoord((p).x,(p).y);
-#define	MGL_rectPt(lt,rb)		MGL_rectCoord((lt).x,(lt).y,(rb).x,(rb).y)
-#define	MGL_rect(r)				MGL_rectCoord((r).left,(r).top,			\
-									(r).right,(r).bottom)
-#define	MGL_drawBorder(r,s,t)	MGL_drawBorderCoord((r).left,(r).top,	\
-									(r).right,(r).bottom,(s),(t))
-#define	MGL_fillRectPt(lt,rb)	MGL_fillRectCoord((lt).x,(lt).y,	\
-									(rb).x,(rb).y)
-#define	MGL_fillRect(r)			MGL_fillRectCoord((r).left,(r).top,	\
-									(r).right,(r).bottom)
-#define	MGL_bitBlt(d,s,r,dl,dt,op) 	MGL_bitBltCoord((d),(s),(r).left,		\
-									(r).top,(r).right,(r).bottom,dl,dt,op)
-#define	MGL_bitBltLin(d,s,so,r,op) MGL_bitBltLinCoord((d),(s),so,			\
-									(r).left,(r).top,(r).right,(r).bottom,op)
-#define	MGL_stretchBlt(d,s,sr,dr) 	MGL_stretchBltCoord((d),(s),(sr).left,		\
-									(sr).top,(sr).right,(sr).bottom,	\
-									(dr).left,(dr).top,(dr).right,(dr).bottom)
-#define	MGL_transBlt(d,s,r,dl,dt,c,st)	MGL_transBltCoord((d),(s),(r).left,		\
-									(r).top,(r).right,(r).bottom,dl,dt,c,st)
-#define	MGL_transBltLin(d,s,so,r,c,st) MGL_transBltLinCoord((d),(s),so,	\
-									(r).left,(r).top,(r).right,(r).bottom,c,st)
-#define	MGL_getDivot(dc,r,divot) MGL_getDivotCoord(dc,(r).left,(r).top,	\
-									(r).right,(r).bottom,divot)
-#define	MGL_divotSize(dc,r)		MGL_divotSizeCoord(dc,(r).left,(r).top,\
-									(r).right,(r).bottom)
-#define	MGL_isSimpleRegion(r)	(((region_t*)(r))->spans == NULL)
-#define	MGL_rgnLine(p1,p2,p)	MGL_rgnLineCoord((p1).x,(p1).y,(p2).x,(p2).y,p)
-#define	MGL_rgnLineFX(p1,p2,p)	MGL_rgnLineCoordFX((p1).x,(p1).y,(p2).x,(p2).y,p)
-#define	MGL_rgnSolidRectPt(lt,rb)	MGL_rgnSolidRectCoord((lt).x,(lt).y,	\
-									(rb).x,(rb).y)
-#define	MGL_rgnSolidRect(r)			MGL_rgnSolidRectCoord((r).left,(r).top,	\
-									(r).right,(r).bottom)
-
-/* Fast color packing/unpacking routines implemented as macros */
-
-#define	MGL_packColorFast(pf,R,G,B)													\
- ((ulong)(((uchar)(R) >> (pf)->redAdjust) & (pf)->redMask) << (pf)->redPos)			\
- | ((ulong)(((uchar)(G) >> (pf)->greenAdjust) & (pf)->greenMask) << (pf)->greenPos)	\
- | ((ulong)(((uchar)(B) >> (pf)->blueAdjust) & (pf)->blueMask) << (pf)->bluePos)
-
-#define	MGL_unpackColorFast(pf,c,R,G,B)												\
-{																					\
- (R) = (uchar)((((ulong)(c) >> (pf)->redPos) & (pf)->redMask) << (pf)->redAdjust);		\
- (G) = (uchar)((((ulong)(c) >> (pf)->greenPos) & (pf)->greenMask) << (pf)->greenAdjust);\
- (B) = (uchar)((((ulong)(c) >> (pf)->bluePos) & (pf)->blueMask) << (pf)->blueAdjust);	\
-}
-
-/* Macros to access the RGB components in a packed 24 bit RGB tuple */
-
-#define	MGL_rgbRed(c)	(((uchar*)&(c))[2])
-#define	MGL_rgbGreen(c)	(((uchar*)&(c))[1])
-#define	MGL_rgbBlue(c)	(((uchar*)&(c))[0])
-
-/* Fast 24 bit color packing/unpacking routines implemented as macros */
-
-#define	MGL_packColorRGBFast(R,G,B)											\
- (((ulong)((uchar)(R)) << 16) | ((ulong)((uchar)(G)) << 8) | (uchar)(B))
-
-#define	MGL_packColorRGBFast2(c,R,G,B)										\
-{																			\
- MGL_rgbRed(c) = (uchar)(R);												\
- MGL_rgbGreen(c) = (uchar)(G);												\
- MGL_rgbBlue(c) = (uchar)(B);												\
-}
-
-#define	MGL_unpackColorRGBFast(c,R,G,B)										\
-{																			\
- (R) = MGL_rgbRed(c);														\
- (G) = MGL_rgbGreen(c);														\
- (B) = MGL_rgbBlue(c);														\
-}
-
-#ifdef	__cplusplus
-}						/* End of "C" linkage for C++	*/
-
-#include "mglrect.hpp"	/* Include C++ point/rectangle classes			*/
-
-#endif	/* __cplusplus */
-
-/* Include appropriate platform specific bindings */
-
-#if defined(MGLWIN) || defined(__WINDOWS__)
-#include "mglwin.h"
-#elif defined(MGLPM) || defined(__OS2__)
-/*#include "mglpm.h"*/
-#elif defined(MGLX) || defined(__UNIX__)
-/*#include "mglx.h"*/
-#else
-#include "mgldos.h"
-#endif
-
-#pragma pack()				/* Return to default packing				*/
-
-#endif	/* __MGRAPH_H */
binary files a/u/scitech/LIB/WIN32/VC/MGLLT.LIB /dev/null differ
--- a/u/snd_dos.c
+++ /dev/null
@@ -1,653 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-#include "dosisms.h"
-
-int BLASTER_GetDMAPos(void);
-
-/*
-===============================================================================
-GUS SUPPORT
-
-===============================================================================
-*/
-
-qboolean GUS_Init (void);
-int GUS_GetDMAPos (void);
-void GUS_Shutdown (void);
-
-
-/*
-===============================================================================
-
-BLASTER SUPPORT
-
-===============================================================================
-*/
-
-short *dma_buffer=0;
-static int dma_size;
-static	int dma;
-
-static	int dsp_port;
-static	int irq;
-static	int low_dma;
-static	int high_dma;
-static	int mixer_port;
-static	int mpu401_port;
-
-int dsp_version;
-int dsp_minor_version;
-
-int timeconstant=-1;
-
-
-void PrintBits (byte b)
-{
-	int	i;
-	char	str[9];
-	
-	for (i=0 ; i<8 ; i++)
-		str[i] = '0' + ((b & (1<<(7-i))) > 0);
-		
-	str[8] = 0;
-	Con_Printf ("%s (%i)", str, b);
-}
-
-void SB_Info_f(void)
-{
-	Con_Printf ("BLASTER=%s\n", getenv("BLASTER"));
-	Con_Printf("dsp version=%d.%d\n", dsp_version, dsp_minor_version);
-	Con_Printf("dma=%d\n", dma);
-	if (timeconstant != -1)
-		Con_Printf("timeconstant=%d\n", timeconstant);
-	Con_Printf("dma position:%i\n", BLASTER_GetDMAPos ());
-}
-
-// =======================================================================
-// Interprets BLASTER variable
-// =======================================================================
-
-int GetBLASTER(void)
-{
-	char *BLASTER;
-	char *param;
-
-	BLASTER = getenv("BLASTER");
-	if (!BLASTER)
-		return 0;
-
-	param = strchr(BLASTER, 'A');
-	if (!param)
-		param = strchr(BLASTER, 'a');
-	if (!param)
-		return 0;
-	sscanf(param+1, "%x", &dsp_port);
-
-	param = strchr(BLASTER, 'I');
-	if (!param)
-		param = strchr(BLASTER, 'i');
-	if (!param)
-		return 0;
-	sscanf(param+1, "%d", &irq);
-
-	param = strchr(BLASTER, 'D');
-	if (!param)
-		param = strchr(BLASTER, 'd');
-	if (!param)
-		return 0;
-	sscanf(param+1, "%d", &low_dma);
-
-	param = strchr(BLASTER, 'H');
-	if (!param)
-		param = strchr(BLASTER, 'h');
-	if (param)
-		sscanf(param+1, "%d", &high_dma);
-
-	param = strchr(BLASTER, 'M');
-	if (!param)
-		param = strchr(BLASTER, 'm');
-	if (param)
-		sscanf(param+1, "%x", &mixer_port);
-	else
-		mixer_port = dsp_port;
-
-	param = strchr(BLASTER, 'P');
-	if (!param)
-		param = strchr(BLASTER, 'p');
-	if (param)
-		sscanf(param+1, "%x", &mpu401_port);
-
-	return 1;
-
-}
-
-// ==================================================================
-// Resets DSP.  Returns 0 on success.
-// ==================================================================
-
-int ResetDSP(void)
-{
-	volatile int i;
-
-	dos_outportb(dsp_port + 6, 1);
-	for (i=65536 ; i ; i--) ;
-	dos_outportb(dsp_port + 6, 0);
-	for (i=65536 ; i ; i--)
-	{
-		if (!(dos_inportb(dsp_port + 0xe) & 0x80)) continue;
-		if (dos_inportb(dsp_port + 0xa) == 0xaa) break;
-	}
-	if (i) return 0;
-	else return 1;
-
-}
-
-int ReadDSP(void)
-{
-	while (!(dos_inportb(dsp_port+0xe)&0x80)) ;
-	return dos_inportb(dsp_port+0xa);
-}
-
-void WriteDSP(int val)
-{
-	while ((dos_inportb(dsp_port+0xc)&0x80)) ;
-	dos_outportb(dsp_port+0xc, val);
-}
-
-int ReadMixer(int addr)
-{
-	dos_outportb(mixer_port+4, addr);
-	return dos_inportb(mixer_port+5);
-}
-
-void WriteMixer(int addr, int val)
-{
-	dos_outportb(mixer_port+4, addr);
-	dos_outportb(mixer_port+5, val);
-}
-
-int		oldmixervalue;
-
-/*
-================
-StartSB
-
-================
-*/
-void StartSB(void)
-{
-	int		i;
-
-// version 4.xx startup code
-	if (dsp_version >= 4)
-	{
-		Con_Printf("Version 4 SB startup\n");
-		WriteDSP(0xd1); // turn on speaker
-
-		WriteDSP(0x41);
-
-		WriteDSP(shm->speed>>8);
-		WriteDSP(shm->speed&0xff);
-
-		WriteDSP(0xb6);	// 16-bit output
-		WriteDSP(0x30);	// stereo
-		WriteDSP((shm->samples-1) & 0xff);	// # of samples - 1
-		WriteDSP((shm->samples-1) >> 8);
-	}
-// version 3.xx startup code
-	else if (dsp_version == 3)
-	{
-		Con_Printf("Version 3 SB startup\n");
-		WriteDSP(0xd1); // turn on speaker
-
-		oldmixervalue = ReadMixer (0xe);
-		WriteMixer (0xe, oldmixervalue | 0x2);// turn on stereo
-
-		WriteDSP(0x14);			// send one byte
-		WriteDSP(0x0);
-		WriteDSP(0x0);
-
-		for (i=0 ; i<0x10000 ; i++)
-			dos_inportb(dsp_port+0xe);		// ack the dsp
-		
-		timeconstant = 65536-(256000000/(shm->channels*shm->speed));
-		WriteDSP(0x40);
-		WriteDSP(timeconstant>>8);
-
-		WriteMixer (0xe, ReadMixer(0xe) | 0x20);// turn off filter
-
-		WriteDSP(0x48);
-		WriteDSP((shm->samples-1) & 0xff);	// # of samples - 1
-		WriteDSP((shm->samples-1) >> 8);
-
-		WriteDSP(0x90); // high speed 8 bit stereo
-	}
-// normal speed mono
-	else
-	{
-		Con_Printf("Version 2 SB startup\n");
-		WriteDSP(0xd1); // turn on speaker
-
-		timeconstant = 65536-(256000000/(shm->channels*shm->speed));
-		WriteDSP(0x40);
-		WriteDSP(timeconstant>>8);
-
-		WriteDSP(0x48);
-		WriteDSP((shm->samples-1) & 0xff);	// # of samples - 1
-		WriteDSP((shm->samples-1) >> 8);
-
-		WriteDSP(0x1c); // normal speed 8 bit mono
-	}
-}
-
-static int page_reg[] = { 0x87, 0x83, 0x81, 0x82, 0x8f, 0x8b, 0x89, 0x8a };
-static int addr_reg[] = { 0, 2, 4, 6, 0xc0, 0xc4, 0xc8, 0xcc };
-static int count_reg[] = { 1, 3, 5, 7, 0xc2, 0xc6, 0xca, 0xce };
-
-static int mode_reg;
-static int flipflop_reg;
-static int disable_reg;
-static int clear_reg;
-
-/*
-================
-StartDMA
-
-================
-*/
-void StartDMA(void)
-{
-	int mode;
-	int realaddr;
-
-	realaddr = ptr2real(dma_buffer);
-
-// use a high dma channel if specified
-	if (high_dma && dsp_version >= 4)	// 8 bit snd can never use 16 bit dma
-		dma = high_dma;
-	else
-		dma = low_dma;
-
-	Con_Printf ("Using DMA channel %i\n", dma);
-
-	if (dma > 3)
-	{
-		mode_reg = 0xd6;
-		flipflop_reg = 0xd8;
-		disable_reg = 0xd4;
-		clear_reg = 0xdc;
-	}
-	else
-	{
-		mode_reg = 0xb;
-		flipflop_reg = 0xc;
-		disable_reg = 0xa;
-		clear_reg = 0xe;
-	}
-
-	dos_outportb(disable_reg, dma|4);	// disable channel
-	// set mode- see "undocumented pc", p.876
-	mode =	(1<<6)	// single-cycle
-		+(0<<5)		// address increment
-		+(1<<4)		// auto-init dma
-		+(2<<2)		// read
-		+(dma&3);	// channel #
-	dos_outportb(mode_reg, mode);
-	
-// set address
-	// set page
-	dos_outportb(page_reg[dma], realaddr >> 16);
-
-	if (dma > 3)
-	{	// address is in words
-		dos_outportb(flipflop_reg, 0);		// prepare to send 16-bit value
-		dos_outportb(addr_reg[dma], (realaddr>>1) & 0xff);
-		dos_outportb(addr_reg[dma], (realaddr>>9) & 0xff);
-
-		dos_outportb(flipflop_reg, 0);		// prepare to send 16-bit value
-		dos_outportb(count_reg[dma], ((dma_size>>1)-1) & 0xff);
-		dos_outportb(count_reg[dma], ((dma_size>>1)-1) >> 8);
-	}
-	else
-	{	// address is in bytes
-		dos_outportb(flipflop_reg, 0);		// prepare to send 16-bit value
-		dos_outportb(addr_reg[dma], realaddr & 0xff);
-		dos_outportb(addr_reg[dma], (realaddr>>8) & 0xff);
-
-		dos_outportb(flipflop_reg, 0);		// prepare to send 16-bit value
-		dos_outportb(count_reg[dma], (dma_size-1) & 0xff);
-		dos_outportb(count_reg[dma], (dma_size-1) >> 8);
-	}
-
-	dos_outportb(clear_reg, 0);		// clear write mask
-	dos_outportb(disable_reg, dma&~4);
-}
-
-
-/*
-==================
-BLASTER_Init
-
-Returns false if nothing is found.
-==================
-*/
-qboolean BLASTER_Init(void)
-{
-	int 	size;
-	int 	realaddr;
-	int 	rc;
-	int		p;
-	
-	shm = 0;
-	rc = 0;
-
-//
-// must have a blaster variable set
-//
-	if (!GetBLASTER())
-	{
-		Con_NotifyBox (
-		"The BLASTER environment variable\n"
-		"is not set, sound effects are\n"
-		"disabled.  See README.TXT for help.\n"
-		);			
-		return 0;
-	}
-
-	if (ResetDSP())
-	{
-		Con_Printf("Could not reset SB");
-		return 0;
-	}
-
-//
-// get dsp version
-//
-	WriteDSP(0xe1);
-	dsp_version = ReadDSP();
-	dsp_minor_version = ReadDSP();
-
-// we need at least v2 for auto-init dma
-	if (dsp_version < 2)
-	{
-		Con_Printf ("Sound blaster must be at least v2.0\n");
-		return 0;
-	}
-
-// allow command line parm to set quality down
-	p = COM_CheckParm ("-dsp");
-	if (p && p < com_argc - 1)
-	{
-		p = Q_atoi (com_argv[p+1]);
-		if (p < 2 || p > 4)
-			Con_Printf ("-dsp parameter can only be 2, 3, or 4\n");
-		else if (p > dsp_version)
-			Con_Printf ("Can't -dsp %i on v%i hardware\n", p, dsp_version);
-		else
-			dsp_version = p;
-	}	
-
-
-// everyone does 11khz sampling rate unless told otherwise
-	shm = &sn;
-	shm->speed = 11025;
-	rc = COM_CheckParm("-sspeed");
-	if (rc)
-		shm->speed = Q_atoi(com_argv[rc+1]);
-
-// version 4 cards (sb 16) do 16 bit stereo
-	if (dsp_version >= 4)
-	{
-		shm->channels = 2;
-		shm->samplebits = 16;
-	}
-// version 3 cards (sb pro) do 8 bit stereo
-	else if (dsp_version == 3)
-	{
-		shm->channels = 2;
-		shm->samplebits = 8;	
-	}
-// v2 cards do 8 bit mono
-	else
-	{
-		shm->channels = 1;
-		shm->samplebits = 8;	
-	}
-
-	
-	Cmd_AddCommand("sbinfo", SB_Info_f);
-	size = 4096;
-
-// allocate 8k and get a 4k-aligned buffer from it
-	dma_buffer = dos_getmemory(size*2);
-	if (!dma_buffer)
-	{
-		Con_Printf("Couldn't allocate sound dma buffer");
-		return false;
-	}
-
-	realaddr = ptr2real(dma_buffer);
-	realaddr = (realaddr + size) & ~(size-1);
-	dma_buffer = (short *) real2ptr(realaddr);
-	dma_size = size;
-
-	memset(dma_buffer, 0, dma_size);
-
-	shm->soundalive = true;
-	shm->splitbuffer = false;
-
-	shm->samples = size/(shm->samplebits/8);
-	shm->samplepos = 0;
-	shm->submission_chunk = 1;
-	shm->buffer = (unsigned char *) dma_buffer;
-	shm->samples = size/(shm->samplebits/8);
-
-	StartDMA();
-	StartSB();
-
-	return true;
-}
-
-
-/*
-==============
-BLASTER_GetDMAPos
-
-return the current sample position (in mono samples read)
-inside the recirculating dma buffer, so the mixing code will know
-how many sample are required to fill it up.
-===============
-*/
-int BLASTER_GetDMAPos(void)
-{
-	int count;
-
-// this function is called often.  acknowledge the transfer completions
-// all the time so that it loops
-	if (dsp_version >= 4)
-		dos_inportb(dsp_port+0xf);	// 16 bit audio
-	else
-		dos_inportb(dsp_port+0xe);	// 8 bit audio
-
-// clear 16-bit reg flip-flop
-// load the current dma count register
-	if (dma < 4)
-	{
-		dos_outportb(0xc, 0);
-		count = dos_inportb(dma*2+1);
-		count += dos_inportb(dma*2+1) << 8;
-		if (shm->samplebits == 16)
-			count /= 2;
-		count = shm->samples - (count+1);
-	}
-	else
-	{
-		dos_outportb(0xd8, 0);
-		count = dos_inportb(0xc0+(dma-4)*4+2);
-		count += dos_inportb(0xc0+(dma-4)*4+2) << 8;
-		if (shm->samplebits == 8)
-			count *= 2;
-		count = shm->samples - (count+1);
-	}
-
-//	Con_Printf("DMA pos = 0x%x\n", count);
-
-	shm->samplepos = count & (shm->samples-1);
-	return shm->samplepos;
-
-}
-
-/*
-==============
-BLASTER_Shutdown
-
-Reset the sound device for exiting
-===============
-*/
-void BLASTER_Shutdown(void)
-{
-	if (dsp_version >= 4)
-	{
-	}
-	else if (dsp_version == 3)
-	{
-		ResetDSP ();			// stop high speed mode
-		WriteMixer (0xe, oldmixervalue); // turn stereo off and filter on
-	}
-	else
-	{
-	
-	}
-	
-	WriteDSP(0xd3); // turn off speaker
-	ResetDSP ();
-
-	dos_outportb(disable_reg, dma|4);	// disable dma channel
-}
-
-
-
-/*
-===============================================================================
-
-INTERFACE
-
-===============================================================================
-*/
-
-typedef enum
-{
-	dma_none,
-	dma_blaster,
-	dma_gus
-} dmacard_t;
-
-dmacard_t	dmacard;
-
-/*
-==================
-SNDDM_Init
-
-Try to find a sound device to mix for.
-Returns false if nothing is found.
-Returns true and fills in the "shm" structure with information for the mixer.
-==================
-*/
-qboolean SNDDMA_Init(void)
-{
-	if (GUS_Init ())
-	{
-		dmacard = dma_gus;
-		return true;
-	}
-	if (BLASTER_Init ())
-	{
-		dmacard = dma_blaster;
-		return true;
-	}
-	
-	dmacard = dma_none;
-	
-	return false;
-}
-
-
-/*
-==============
-SNDDMA_GetDMAPos
-
-return the current sample position (in mono samples, not stereo)
-inside the recirculating dma buffer, so the mixing code will know
-how many sample are required to fill it up.
-===============
-*/
-int SNDDMA_GetDMAPos(void)
-{
-	switch (dmacard)
-	{
-	case dma_blaster:
-		return BLASTER_GetDMAPos ();
-	case dma_gus:
-		return GUS_GetDMAPos ();
-	case dma_none:
-		break;
-	}
-	
-	return 0;
-}
-
-/*
-==============
-SNDDMA_Shutdown
-
-Reset the sound device for exiting
-===============
-*/
-void SNDDMA_Shutdown(void)
-{
-	switch (dmacard)
-	{
-	case dma_blaster:
-		BLASTER_Shutdown ();
-		break;
-	case dma_gus:
-		GUS_Shutdown ();
-		break;
-	case dma_none:
-		break;
-	}
-
-	dmacard = dma_none;
-	return;
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-===============
-*/
-void SNDDMA_Submit(void)
-{
-}
-
--- a/u/snd_gus.c
+++ /dev/null
@@ -1,1293 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//=============================================================================
-// Routines for GUS support in QUAKE
-//
-// Author(s): Jayeson Lee-Steere
-//=============================================================================
-
-#include "quakedef.h"
-#include "dosisms.h"
-
-//=============================================================================
-// Author(s): Jayeson Lee-Steere
-
-#define INI_STRING_SIZE 0x100
-
-FILE *ini_fopen(const char *filename, const char *modes);
-int ini_fclose(FILE *f);
-void ini_fgets(FILE *f, const char *section, const char *field, char *s);
-
-// Routines for reading from .INI files
-// The read routines are fairly efficient.
-//
-// Author(s): Jayeson Lee-Steere
-
-#define MAX_SECTION_WIDTH 20
-#define MAX_FIELD_WIDTH 20
-
-#define NUM_SECTION_BUFFERS 10
-#define NUM_FIELD_BUFFERS 20
-
-struct section_buffer
-{
-   long offset;
-   char name[MAX_SECTION_WIDTH+1];
-};
-
-struct field_buffer
-{
-   long offset;
-   int  section;
-   char name[MAX_FIELD_WIDTH+1];
-};
-
-static FILE *current_file=NULL;
-static int   current_section;
-
-static int current_section_buffer=0;
-static int current_field_buffer=0;
-
-static struct section_buffer section_buffers[NUM_SECTION_BUFFERS];
-static struct field_buffer field_buffers[NUM_FIELD_BUFFERS];
-//***************************************************************************
-// Internal routines
-//***************************************************************************
-static char toupper(char c)
-{
-   if (c>='a' && c<='z')
-      c-=('a'-'A');
-   return(c);
-}
-
-static void reset_buffer(FILE *f)
-{
-   int i;
-
-   for (i=0;i<NUM_SECTION_BUFFERS;i++)
-      section_buffers[i].name[0]=0;
-   for (i=0;i<NUM_FIELD_BUFFERS;i++)
-      field_buffers[i].name[0]=0;
-
-   current_file=f;
-}
-
-// Sees if the current string is section "name" (i.e. ["name"]).
-// If "name"=="*", sees if the current string is any section
-// (i.e. [....]). Returns 1 if true else 0 if false.
-static int is_section(char *s,const char *name)
-{
-   int wild=0;
-
-   // See if wild search
-   if (strcmp("*",name)==0)
-      wild=1;
-
-   // Skip leading spaces
-   while (s[0]==' ')
-      s++;
-   // Look for leading "["
-   if (s[0]!='[')
-      return(0);
-   s++;
-   // Make sure name matches
-   while (s[0]!=']' && s[0]!=13 && s[0]!=10 && s[0]!=0 && name[0]!=0)
-   {
-      if (!wild)
-         if (toupper(s[0])!=toupper(name[0]))
-            return(0);
-      s++;
-      if (!wild)
-         name++;
-   }
-   if (!wild)
-      if (name[0]!=0)
-         return(0);
-   // Skip trailing spaces
-   while (s[0]==' ')
-      s++;
-   // Make sure we have trailing "]"
-   if (s[0]!=']')
-      return(0);
-   return(1);
-}
-
-// Sees if the current string is field "name" (i.e. "name"=...).
-// If "name"=="*", sees if the current string is any field
-// (i.e. ...=...). Returns 1 if true else 0 if false.
-static int is_field(char *s,const char *name)
-{
-   int wild=0;
-
-   // See if wild search
-   if (strcmp("*",name)==0)
-      wild=1;
-
-   // Skip leading spaces
-   while (s[0]==' ')
-      s++;
-
-   // Make sure name matches
-   while (s[0]!='=' && s[0]!=13 && s[0]!=10 && s[0]!=0 && name[0]!=0)
-   {
-      if (!wild)
-         if (toupper(s[0])!=toupper(name[0]))
-            return(0);
-      s++;
-      if (!wild)
-         name++;
-   }
-   if (!wild)
-      if (name[0]!=0)
-         return(0);
-   // Skip trailing spaces
-   while (s[0]==' ')
-      s++;
-   // Make sure we have an "="
-   if (s[0]!='=')
-      return(0);
-
-   return(1);
-}
-
-// Extracts the section name from a section heading
-// e.g. in="[hey man]" gives out="hey man"
-static void get_section_name(char *out, char *in)
-{
-   int i=0;
-
-   // Skip spaces before '['
-   while (in[0]==' ')
-      in++;
-   // Make sure there is a '['
-   if (in[0]!='[')
-   {
-      out[0]=0;
-      return;
-   }
-   // Skip past '['
-   in++;
-   // Copy string if any to output string.
-   while (in[0]!=']' && in[0]!=13 && in[0]!=10 && in[0]!=0)
-   {
-      if (i<MAX_SECTION_WIDTH)
-      {
-         out[i]=in[0];
-         i++;
-      }
-      in++;
-   }
-   // Make sure string was terminated with ']'
-   if (in[0]!=']')
-   {
-      out[0]=0;
-      return;
-   }
-   // Remove trailing spaces
-   while (i>0 && out[i-1]==' ')
-      i--;
-   // Null terminate the output string.
-   out[i]=0;
-}
-
-// Extracts the field name from a field line
-// e.g. in="sooty=life be in it" gives out="sooty"
-static void get_field_name(char *out, char *in)
-{
-   int i=0;
-
-   // Skip leading spaces
-   while (in[0]==' ')
-      in++;
-   // Copy name to output string
-   while (in[0]!='=' && in[0]!=13 && in[0]!=10 && in[0]!=0)
-   {
-      if (i<MAX_FIELD_WIDTH)
-      {
-         out[i]=in[0];
-         i++;
-      }
-      in++;
-   }
-   // Make sure we stopped on "="
-   if (in[0]!='=')
-   {
-      out[0]=0;
-      return;
-   }
-   // Remove trailing spaces
-   while (i>0 && out[i-1]==' ')
-      i--;
-   // Null terminate the output string.
-   out[i]=0;
-}
-
-// Returns the field data from string s.
-// e.g. in="wally = golly man" gives out="golly man"
-static void get_field_string(char *out, char *in)
-{
-   int i=0;
-
-   // Find '=' if it exists
-   while (in[0]!='=' && in[0]!=13 && in[0]!=10 && in[0]!=0)
-      in++;
-   // If there is an '=', skip past it.
-   if (in[0]=='=')
-      in++;
-   // Skip any spaces between the '=' and string.
-   while (in[0]==' ' || in[0]=='[')
-      in++;
-   // Copy string, if there is one, to the output string.
-   while (in[0]!=13 && in[0]!=10 && in[0]!=0 && i<(INI_STRING_SIZE-1))
-   {
-      out[i]=in[0];
-      in++;
-      i++;
-   }
-   // Null terminate the output string.
-   out[i]=0;
-}
-
-// Adds a section to the buffer
-static int add_section(char *instring, long offset)
-{
-   int i;
-   char section[MAX_SECTION_WIDTH+1];
-
-   // Extract section name
-   get_section_name(section,instring);
-   // See if section already exists.
-   for (i=0;i<NUM_SECTION_BUFFERS;i++)
-      if (stricmp(section,section_buffers[i].name)==0)
-         return(i);
-   // Increment current_section_buffer
-   current_section_buffer++;
-   if (current_section_buffer>NUM_SECTION_BUFFERS)
-      current_section_buffer=0;
-   // Delete any field buffers that correspond to this section
-   for (i=0;i<NUM_FIELD_BUFFERS;i++)
-      if (field_buffers[i].section==current_section_buffer)
-         field_buffers[i].name[0]=0;
-   // Set buffer information
-   strcpy(section_buffers[current_section_buffer].name,section);
-   section_buffers[current_section_buffer].offset=offset;
-   return(current_section_buffer);
-}
-
-// Adds a field to the buffer
-static void add_field(char *instring, int section, long offset)
-{
-   int i;
-   char field[MAX_FIELD_WIDTH+1];
-
-   // Extract field name
-   get_field_name(field,instring);
-   // See if field already exists
-   for (i=0;i<NUM_FIELD_BUFFERS;i++)
-      if (field_buffers[i].section==section)
-         if (stricmp(field_buffers[i].name,field)==0)
-            return;
-   // Increment current_field_buffer
-   current_field_buffer++;
-   if (current_field_buffer>NUM_FIELD_BUFFERS)
-      current_field_buffer=0;
-   // Set buffer information
-   strcpy(field_buffers[current_field_buffer].name,field);
-   field_buffers[current_field_buffer].section=section;
-   field_buffers[current_field_buffer].offset=offset;
-}
-
-// Identical to fgets except the string is trucated at the first ';',
-// carriage return or line feed.
-static char *stripped_fgets(char *s, int n, FILE *f)
-{
-   int i=0;
-
-   if (fgets(s,n,f)==NULL)
-      return(NULL);
-
-   while (s[i]!=';' && s[i]!=13 && s[i]!=10 && s[i]!=0)
-      i++;
-   s[i]=0;
-
-   return(s);
-}
-
-//***************************************************************************
-// Externally accessable routines
-//***************************************************************************
-// Opens an .INI file. Works like fopen
-FILE *ini_fopen(const char *filename, const char *modes)
-{
-   return(fopen(filename,modes));
-}
-
-// Closes a .INI file. Works like fclose
-int ini_fclose(FILE *f)
-{
-   if (f==current_file)
-      reset_buffer(NULL);
-   return(fclose(f));
-}
-
-// Puts "field" from "section" from .ini file "f" into "s".
-// If "section" does not exist or "field" does not exist in
-// section then s="";
-void ini_fgets(FILE *f, const char *section, const char *field, char *s)
-{
-   int i;
-   long start_pos,string_start_pos;
-   char ts[INI_STRING_SIZE*2];
-
-   if (f!=current_file)
-      reset_buffer(f);
-
-   // Default to "Not found"
-   s[0]=0;
-
-   // See if section is in buffer
-   for (i=0;i<NUM_SECTION_BUFFERS;i++)
-      if (strnicmp(section_buffers[i].name,section,MAX_SECTION_WIDTH)==0)
-         break;
-
-   // If section is in buffer, seek to it if necessary
-   if (i<NUM_SECTION_BUFFERS)
-   {
-      if (i!=current_section)
-      {
-         current_section=i;
-         fseek(f,section_buffers[i].offset,SEEK_SET);
-      }
-   }
-   // else look through .ini file for it.
-   else
-   {
-      // Make sure we are not at eof or this will cause trouble.
-      if (feof(f))
-         rewind(f);
-      start_pos=ftell(f);
-      while (1)
-      {
-         stripped_fgets(ts,INI_STRING_SIZE*2,f);
-         // If it is a section, add it to the section buffer
-         if (is_section(ts,"*"))
-            current_section=add_section(ts,ftell(f));
-         // If it is the section we are looking for, break.
-         if (is_section(ts,section))
-            break;
-         // If we reach the end of the file, rewind to the start.
-         if (feof(f))
-            rewind(f);
-         if (ftell(f)==start_pos)
-            return;
-      }
-   }
-
-   // See if field is in buffer
-   for (i=0;i<NUM_FIELD_BUFFERS;i++)
-      if (field_buffers[i].section==current_section)
-         if (strnicmp(field_buffers[i].name,field,MAX_FIELD_WIDTH)==0)
-            break;
-
-   // If field is in buffer, seek to it and read it
-   if (i<NUM_FIELD_BUFFERS)
-   {
-      fseek(f,field_buffers[i].offset,SEEK_SET);
-      stripped_fgets(ts,INI_STRING_SIZE*2,f);
-      get_field_string(s,ts);
-   }
-   else
-   // else search through section for field.
-   {
-      // Make sure we do not start at eof or this will cause problems.
-      if (feof(f))
-         fseek(f,section_buffers[current_section].offset,SEEK_SET);
-      start_pos=ftell(f);
-      while (1)
-      {
-         string_start_pos=ftell(f);
-         stripped_fgets(ts,INI_STRING_SIZE*2,f);
-         // If it is a field, add it to the buffer
-         if (is_field(ts,"*"))
-            add_field(ts,current_section,string_start_pos);
-         // If it is the field we are looking for, save it
-         if (is_field(ts,field))
-         {
-            get_field_string(s,ts);
-            break;
-         }
-         // If we reach the end of the section, start over
-         if (feof(f) || is_section(ts,"*"))
-            fseek(f,section_buffers[current_section].offset,SEEK_SET);
-         if (ftell(f)==start_pos)
-            return;
-      }
-   }
-}
-
-//=============================================================================
-
-#define BYTE unsigned char
-#define WORD unsigned short
-#define DWORD unsigned long
-
-#define BUFFER_SIZE 4096
-
-#define CODEC_ADC_INPUT_CONTROL_LEFT	0x00
-#define CODEC_ADC_INPUT_CONTROL_RIGHT	0x01
-#define CODEC_AUX1_INPUT_CONTROL_LEFT	0x02
-#define CODEC_AUX1_INPUT_CONTROL_RIGHT	0x03
-#define CODEC_AUX2_INPUT_CONTROL_LEFT	0x04
-#define CODEC_AUX2_INPUT_CONTROL_RIGHT	0x05
-#define CODEC_DAC_OUTPUT_CONTROL_LEFT	0x06
-#define CODEC_DAC_OUTPUT_CONTROL_RIGHT	0x07
-#define CODEC_FS_FORMAT			0x08
-#define CODEC_INTERFACE_CONFIG		0x09
-#define CODEC_PIN_CONTROL		0x0A
-#define CODEC_ERROR_STATUS_AND_INIT	0x0B
-#define CODEC_MODE_AND_ID		0x0C
-#define CODEC_LOOPBACK_CONTROL		0x0D
-#define CODEC_PLAYBACK_UPPER_BASE_COUNT	0x0E
-#define CODEC_PLAYBACK_LOWER_BASE_COUNT	0x0F
-
-#define SET_CONTROL			0x00
-#define SET_FREQUENCY			0x01
-#define SET_START_HIGH			0x02
-#define SET_START_LOW			0x03
-#define SET_END_HIGH			0x04
-#define SET_END_LOW			0x05
-#define SET_VOLUME_RATE			0x06
-#define SET_VOLUME_START		0x07
-#define SET_VOLUME_END			0x08
-#define SET_CURR_VOLUME			0x09
-#define SET_VOLUME			0x09
-#define SET_ACC_HIGH			0x0A
-#define SET_ACC_LOW			0x0B
-#define SET_BALANCE			0x0C
-#define SET_VOLUME_CONTROL		0x0D
-#define SET_VOICES			0x0E
-
-#define DMA_CONTROL			0x41
-#define SET_DMA_ADDRESS			0x42
-#define SET_DRAM_LOW			0x43
-#define SET_DRAM_HIGH			0x44
-#define ADLIB_CONTROL			0x45
-#define ADLIB_TIMER1			0x46
-#define ADLIB_TIMER2			0x47
-#define SET_RECORD_RATE			0x48
-#define RECORD_CONTROL			0x49
-#define SET_JOYSTICK			0x4B
-#define MASTER_RESET			0x4C
-
-#define GET_CONTROL			0x80
-#define GET_FREQUENCY			0x81
-#define GET_START_HIGH			0x82
-#define GET_START_LOW			0x83
-#define GET_END_HIGH			0x84
-#define GET_END_LOW			0x85
-#define GET_VOLUME_RATE			0x86
-#define GET_VOLUME_START		0x87
-#define GET_VOLUME_END			0x88
-#define GET_VOLUME			0x89
-#define GET_ACC_HIGH			0x8A
-#define GET_ACC_LOW			0x8B
-#define GET_BALANCE			0x8C
-#define GET_VOLUME_CONTROL		0x8D
-#define GET_VOICES			0x8E
-#define GET_IRQV                        0x8F
-
-struct CodecRateStruct
-{
-   WORD Rate;
-   BYTE FSVal;
-};
-
-struct Gf1RateStruct
-{
-   WORD Rate;
-   BYTE Voices;
-};
-
-//=============================================================================
-// Reference variables in SND_DOS.C
-//=============================================================================
-extern short *dma_buffer;
-
-//=============================================================================
-// GUS-only variables
-//=============================================================================
-static BYTE HaveCodec=0;
-
-static WORD CodecRegisterSelect;
-static WORD CodecData;
-static WORD CodecStatus;
-static WORD Gf1TimerControl;
-static WORD Gf1PageRegister;
-static WORD Gf1RegisterSelect;
-static WORD Gf1DataLow;
-static WORD Gf1DataHigh;
-
-static BYTE DmaChannel;
-
-static BYTE PageRegs[] = { 0x87, 0x83, 0x81, 0x82, 0x8f, 0x8b, 0x89, 0x8a };
-static BYTE AddrRegs[] = { 0, 2, 4, 6, 0xc0, 0xc4, 0xc8, 0xcc };
-static BYTE CountRegs[] = { 1, 3, 5, 7, 0xc2, 0xc6, 0xca, 0xce };
-
-static WORD AddrReg;
-static WORD CountReg;
-static WORD ModeReg;
-static WORD DisableReg;
-static WORD ClearReg;
-
-static struct CodecRateStruct CodecRates[]=
-{
-   { 5512,0x01},
-   { 6620,0x0F},
-   { 8000,0x00},
-   { 9600,0x0E},
-   {11025,0x03},
-   {16000,0x02},
-   {18900,0x05},
-   {22050,0x07},
-   {27420,0x04},
-   {32000,0x06},
-   {33075,0x0D},
-   {37800,0x09},
-   {44100,0x0B},
-   {48000,0x0C},
-   {    0,0x00} // End marker
-};
-
-static struct Gf1RateStruct Gf1Rates[]=
-{
-   {19293,32},
-   {19916,31},
-   {20580,30},
-   {21289,29},
-   {22050,28},
-   {22866,27},
-   {23746,26},
-   {24696,25},
-   {25725,24},
-   {26843,23},
-   {28063,22},
-   {29400,21},
-   {30870,20},
-   {32494,19},
-   {34300,18},
-   {36317,17},
-   {38587,16},
-   {41160,15},
-   {44100,14},
-   {0,0}
-};
-
-//=============================================================================
-// Basic GF1 functions
-//=============================================================================
-void SetGf18(BYTE reg,BYTE data)
-{
-   dos_outportb(Gf1RegisterSelect,reg);
-   dos_outportb(Gf1DataHigh,data);
-}
-
-void SetGf116(BYTE reg,WORD data)
-{
-   dos_outportb(Gf1RegisterSelect,reg);
-   dos_outportw(Gf1DataLow,data);
-}
-
-BYTE GetGf18(BYTE reg)
-{
-   dos_outportb(Gf1RegisterSelect,reg);
-   return(dos_inportb(Gf1DataHigh));
-}
-
-WORD GetGf116(BYTE reg)
-{
-   dos_outportb(Gf1RegisterSelect,reg);
-   return(dos_inportw(Gf1DataLow));
-}
-
-void Gf1Delay(void)
-{
-   int i;
-
-   for (i=0;i<27;i++)
-      dos_inportb(Gf1TimerControl);
-}
-
-DWORD ConvertTo16(DWORD Address)
-{
-   return( ((Address>>1) & 0x0001FFFF) | (Address & 0x000C0000L) );
-}
-
-void ClearGf1Ints(void)
-{
-   int i;
-
-   SetGf18(DMA_CONTROL,0x00);
-   SetGf18(ADLIB_CONTROL,0x00);
-   SetGf18(RECORD_CONTROL,0x00);
-		
-   GetGf18(DMA_CONTROL);
-   GetGf18(RECORD_CONTROL);
-   for (i=0;i<32;i++);
-      GetGf18(GET_IRQV);
-}
-
-
-//=============================================================================
-// Get Interwave (UltraSound PnP) configuration if any
-//=============================================================================
-static qboolean GUS_GetIWData(void)
-{
-   char *Interwave,s[INI_STRING_SIZE];
-   FILE *IwFile;
-   int  CodecBase,CodecDma,i;
-
-   Interwave=getenv("INTERWAVE");
-   if (Interwave==NULL)
-      return(false);
-
-   // Open IW.INI
-   IwFile=ini_fopen(Interwave,"rt");
-   if (IwFile==NULL)
-      return(false);
-
-   // Read codec base and codec DMA
-   ini_fgets(IwFile,"setup 0","CodecBase",s);
-   sscanf(s,"%X",&CodecBase);
-   ini_fgets(IwFile,"setup 0","DMA2",s);
-   sscanf(s,"%i",&CodecDma);
-
-   ini_fclose(IwFile);
-
-   // Make sure numbers OK
-   if (CodecBase==0 || CodecDma==0)
-      return(false);
-
-   CodecRegisterSelect=CodecBase;
-   CodecData=CodecBase+1;
-   CodecStatus=CodecBase+2;
-   DmaChannel=CodecDma;
-
-   // Make sure there is a CODEC at the CODEC base
-
-   // Clear any pending IRQs
-   dos_inportb(CodecStatus);
-   dos_outportb(CodecStatus,0);
-
-   // Wait for 'INIT' bit to clear
-   for (i=0;i<0xFFFF;i++)
-      if ((dos_inportb(CodecRegisterSelect) & 0x80) == 0)
-         break;
-   if (i==0xFFFF)
-      return(false);
-
-   // Get chip revision - can not be zero
-   dos_outportb(CodecRegisterSelect,CODEC_MODE_AND_ID);
-   if ((dos_inportb(CodecRegisterSelect) & 0x7F) != CODEC_MODE_AND_ID)
-      return(false);
-   if ((dos_inportb(CodecData) & 0x0F) == 0)
-      return(false);
-
-   HaveCodec=1;
-   Con_Printf("Sound Card is UltraSound PnP\n");
-   return(true);
-}
-
-//=============================================================================
-// Get UltraSound MAX configuration if any
-//=============================================================================
-static qboolean GUS_GetMAXData(void)
-{
-   char *Ultrasnd,*Ultra16;
-   int  i;
-   int  GusBase,Dma1,Dma2,Irq1,Irq2;
-   int  CodecBase,CodecDma,CodecIrq,CodecType;
-   BYTE MaxVal;
-
-   Ultrasnd=getenv("ULTRASND");
-   Ultra16=getenv("ULTRA16");
-   if (Ultrasnd==NULL || Ultra16==NULL)
-      return(false);
-
-   sscanf(Ultrasnd,"%x,%i,%i,%i,%i",&GusBase,&Dma1,&Dma2,&Irq1,&Irq2);
-   sscanf(Ultra16,"%x,%i,%i,%i",&CodecBase,&CodecDma,&CodecIrq,&CodecType);
-
-   if (CodecType==0 && CodecDma!=0)
-      DmaChannel=CodecDma & 0x07;
-   else
-      DmaChannel=Dma2 & 0x07;
-
-   // Make sure there is a GUS at GUS base
-   dos_outportb(GusBase+0x08,0x55);
-   if (dos_inportb(GusBase+0x0A)!=0x55)
-      return(false);
-   dos_outportb(GusBase+0x08,0xAA);
-   if (dos_inportb(GusBase+0x0A)!=0xAA)
-      return(false);
-
-   // Program CODEC control register
-   MaxVal=((CodecBase & 0xF0)>>4) | 0x40;
-   if (Dma1 > 3)
-      MaxVal|=0x10;
-   if (Dma2 > 3)
-      MaxVal|=0x20;
-   dos_outportb(GusBase+0x106,MaxVal);
-
-   CodecRegisterSelect=CodecBase;
-   CodecData=CodecBase+1;
-   CodecStatus=CodecBase+2;
-
-   // Make sure there is a CODEC at the CODEC base
-
-   // Clear any pending IRQs
-   dos_inportb(CodecStatus);
-   dos_outportb(CodecStatus,0);
-
-   // Wait for 'INIT' bit to clear
-   for (i=0;i<0xFFFF;i++)
-      if ((dos_inportb(CodecRegisterSelect) & 0x80) == 0)
-         break;
-   if (i==0xFFFF)
-      return(false);
-
-   // Get chip revision - can not be zero
-   dos_outportb(CodecRegisterSelect,CODEC_MODE_AND_ID);
-   if ((dos_inportb(CodecRegisterSelect) & 0x7F) != CODEC_MODE_AND_ID)
-      return(false);
-   if ((dos_inportb(CodecData) & 0x0F) == 0)
-      return(false);
-
-   HaveCodec=1;
-   Con_Printf("Sound Card is UltraSound MAX\n");
-   return(true);
-}
-
-//=============================================================================
-// Get regular UltraSound configuration if any
-//=============================================================================
-static qboolean GUS_GetGUSData(void)
-{
-   char *Ultrasnd;
-   int  GusBase,Dma1,Dma2,Irq1,Irq2,i;
-
-   Ultrasnd=getenv("ULTRASND");
-   if (Ultrasnd==NULL)
-      return(false);
-
-   sscanf(Ultrasnd,"%x,%i,%i,%i,%i",&GusBase,&Dma1,&Dma2,&Irq1,&Irq2);
-
-   DmaChannel=Dma1 & 0x07;
-
-   // Make sure there is a GUS at GUS base
-   dos_outportb(GusBase+0x08,0x55);
-   if (dos_inportb(GusBase+0x0A)!=0x55)
-      return(false);
-   dos_outportb(GusBase+0x08,0xAA);
-   if (dos_inportb(GusBase+0x0A)!=0xAA)
-      return(false);
-
-   Gf1TimerControl   = GusBase+0x008;
-   Gf1PageRegister   = GusBase+0x102;
-   Gf1RegisterSelect = GusBase+0x103;
-   Gf1DataLow        = GusBase+0x104;
-   Gf1DataHigh       = GusBase+0x105;
-
-   // Reset the GUS
-   SetGf18(MASTER_RESET,0x00);
-   Gf1Delay();
-   Gf1Delay();
-   SetGf18(MASTER_RESET,0x01);
-   Gf1Delay();
-   Gf1Delay();
-
-   // Set to max (32) voices
-   SetGf18(SET_VOICES,0xDF);
-
-   // Clear any pending IRQ's
-   ClearGf1Ints();
-
-   // Set all registers to known values
-   for (i=0;i<32;i++)
-   {
-      dos_outportb(Gf1PageRegister,i);
-      SetGf18(SET_CONTROL,0x03);
-      SetGf18(SET_VOLUME_CONTROL,0x03);
-      Gf1Delay();
-      SetGf18(SET_CONTROL,0x03);
-      SetGf18(SET_VOLUME_CONTROL,0x03);
-      SetGf116(SET_START_HIGH,0);
-      SetGf116(SET_START_LOW,0);
-      SetGf116(SET_END_HIGH,0);
-      SetGf116(SET_END_LOW,0);
-      SetGf116(SET_ACC_HIGH,0);
-      SetGf116(SET_ACC_LOW,0);
-      SetGf18(SET_VOLUME_RATE,63);
-      SetGf18(SET_VOLUME_START,5);
-      SetGf18(SET_VOLUME_END,251);
-      SetGf116(SET_VOLUME,5<<8);
-   }
-
-   // Clear any pending IRQ's
-   ClearGf1Ints();
-
-   // Enable DAC etc.
-   SetGf18(MASTER_RESET,0x07);
-
-   // Enable line output so we can hear something
-   dos_outportb(GusBase,0x08);
-
-   HaveCodec=0;
-   Con_Printf("Sound Card is UltraSound\n");
-   return(true);
-}
-
-
-//=============================================================================
-// Programs the DMA controller to start DMAing in Auto-init mode
-//=============================================================================
-static void GUS_StartDMA(BYTE DmaChannel,short *dma_buffer,int count)
-{
-   int mode;
-   int RealAddr;
-
-   RealAddr = ptr2real(dma_buffer);
-
-   if (DmaChannel <= 3)
-   {
-      ModeReg = 0x0B;
-      DisableReg = 0x0A;
-      ClearReg = 0x0E;
-   }
-   else
-   {
-      ModeReg = 0xD6;
-      DisableReg = 0xD4;
-      ClearReg = 0xDC;
-   }
-   CountReg=CountRegs[DmaChannel];
-   AddrReg=AddrRegs[DmaChannel];
-
-   dos_outportb(DisableReg, DmaChannel | 4);	// disable channel
-
-   // set mode- see "undocumented pc", p.876
-   mode = (1<<6)	        // single-cycle
-          +(0<<5)	        // address increment
-	  +(1<<4)	        // auto-init dma
-	  +(2<<2)	        // read
-	  +(DmaChannel & 0x03);	// channel #
-   dos_outportb(ModeReg, mode);
-
-   // set page
-   dos_outportb(PageRegs[DmaChannel], RealAddr >> 16);
-
-   if (DmaChannel <= 3)
-   {	// address is in bytes
-      dos_outportb(0x0C, 0);		// prepare to send 16-bit value
-      dos_outportb(AddrReg, RealAddr & 0xff);
-      dos_outportb(AddrReg, (RealAddr>>8) & 0xff);
-
-      dos_outportb(0x0C, 0);		// prepare to send 16-bit value
-      dos_outportb(CountReg, (count-1) & 0xff);
-      dos_outportb(CountReg, (count-1) >> 8);
-   }
-   else
-   {	// address is in words
-      dos_outportb(0xD8, 0);	        // prepare to send 16-bit value
-      dos_outportb(AddrReg, (RealAddr>>1) & 0xff);
-      dos_outportb(AddrReg, (RealAddr>>9) & 0xff);
-
-      dos_outportb(0xD8, 0);		// prepare to send 16-bit value
-      dos_outportb(CountReg, ((count>>1)-1) & 0xff);
-      dos_outportb(CountReg, ((count>>1)-1) >> 8);
-   }
-
-   dos_outportb(ClearReg, 0);		// clear write mask
-   dos_outportb(DisableReg, DmaChannel & ~4);
-}
-
-//=============================================================================
-// Starts the CODEC playing
-//=============================================================================
-static void GUS_StartCODEC(int count,BYTE FSVal)
-{
-   int i,j;
-
-   // Clear any pending IRQs
-   dos_inportb(CodecStatus);
-   dos_outportb(CodecStatus,0);
-
-   // Set mode to 2
-   dos_outportb(CodecRegisterSelect,CODEC_MODE_AND_ID);
-   dos_outportb(CodecData,0xC0);
-
-   // Stop any playback or capture which may be happening
-   dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG);
-   dos_outportb(CodecData,dos_inportb(CodecData) & 0xFC);
-
-   // Set FS
-   dos_outportb(CodecRegisterSelect,CODEC_FS_FORMAT | 0x40);
-   dos_outportb(CodecData,FSVal | 0x50); // Or in stereo and 16 bit bits
-
-   // Wait a bit
-   for (i=0;i<10;i++)
-      dos_inportb(CodecData);
-
-   // Routine 1 to counter CODEC bug - wait for init bit to clear and then a
-   // bit longer (i=min loop count, j=timeout
-   for (i=0,j=0;i<1000 && j<0x7FFFF;j++)
-      if ((dos_inportb(CodecRegisterSelect) & 0x80)==0)
-         i++;
-
-   // Routine 2 to counter CODEC bug - this is from Forte's code. For me it
-   // does not seem to cure the problem, but is added security
-   // Waits till we can modify index register
-   for (j=0;j<0x7FFFF;j++)
-   {
-      dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG | 0x40);
-      if (dos_inportb(CodecRegisterSelect)==(CODEC_INTERFACE_CONFIG | 0x40))
-         break;
-   }
-
-   // Perform ACAL
-   dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG | 0x40);
-   dos_outportb(CodecData,0x08);
-
-   // Clear MCE bit - this makes ACAL happen
-   dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG);
-
-   // Wait for ACAL to finish
-   for (j=0;j<0x7FFFF;j++)
-   {
-      if ((dos_inportb(CodecRegisterSelect) & 0x80) != 0)
-         continue;
-      dos_outportb(CodecRegisterSelect,CODEC_ERROR_STATUS_AND_INIT);
-      if ((dos_inportb(CodecData) & 0x20) == 0)
-         break;
-   }
-
-   // Clear ACAL bit
-   dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG | 0x40);
-   dos_outportb(CodecData,0x00);
-   dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG);
-
-   // Set some other junk
-   dos_outportb(CodecRegisterSelect,CODEC_LOOPBACK_CONTROL);
-   dos_outportb(CodecData,0x00);
-   dos_outportb(CodecRegisterSelect,CODEC_PIN_CONTROL);
-   dos_outportb(CodecData,0x08); // IRQ is disabled in PIN control
-
-   // Set count (it doesn't really matter what value we stuff in here
-   dos_outportb(CodecRegisterSelect,CODEC_PLAYBACK_LOWER_BASE_COUNT);
-   dos_outportb(CodecData,count & 0xFF);
-   dos_outportb(CodecRegisterSelect,CODEC_PLAYBACK_UPPER_BASE_COUNT);
-   dos_outportb(CodecData,count >> 8);
-
-   // Start playback
-   dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG);
-   dos_outportb(CodecData,0x01);
-}
-
-//=============================================================================
-// Starts the GF1 playing
-//=============================================================================
-static void GUS_StartGf1(int count,BYTE Voices)
-{
-   DWORD StartAddressL,EndAddressL,StartAddressR,EndAddressR;
-
-   // Set number of voices to give us the sampling rate we want
-   SetGf18(SET_VOICES,0xC0 | (Voices-1));
-
-   // Figure out addresses
-   StartAddressL=ConvertTo16(0);
-   EndAddressL=ConvertTo16(count-2-2);
-   StartAddressR=ConvertTo16(2);
-   EndAddressR=ConvertTo16(count-2);
-
-   // Set left voice addresses
-   dos_outportb(Gf1PageRegister,0);
-   SetGf116(SET_START_LOW,StartAddressL<<9);
-   SetGf116(SET_START_HIGH,StartAddressL>>7);
-   SetGf116(SET_ACC_LOW,StartAddressL<<9);
-   SetGf116(SET_ACC_HIGH,StartAddressL>>7);
-   SetGf116(SET_END_LOW,EndAddressL<<9);
-   SetGf116(SET_END_HIGH,EndAddressL>>7);
-   // Set balance to full left
-   SetGf18(SET_BALANCE,0);
-   // Set volume to full
-   SetGf116(SET_VOLUME,0xFFF0);
-   // Set FC to 2 (so we play every second sample)
-   SetGf116(SET_FREQUENCY,0x0800);
-
-   // Set right voice addresses
-   dos_outportb(Gf1PageRegister,1);
-   SetGf116(SET_START_LOW,StartAddressR<<9);
-   SetGf116(SET_START_HIGH,StartAddressR>>7);
-   SetGf116(SET_ACC_LOW,StartAddressR<<9);
-   SetGf116(SET_ACC_HIGH,StartAddressR>>7);
-   SetGf116(SET_END_LOW,EndAddressR<<9);
-   SetGf116(SET_END_HIGH,EndAddressR>>7);
-   // Set balance to full right
-   SetGf18(SET_BALANCE,15);
-   // Set volume to full
-   SetGf116(SET_VOLUME,0xFFF0);
-   // Set FC to 2 (so we play every second sample)
-   SetGf116(SET_FREQUENCY,0x0800);
-
-   // Start voices
-   dos_outportb(Gf1PageRegister,0);
-   SetGf18(SET_CONTROL,0x0C);
-   dos_outportb(Gf1PageRegister,1);
-   SetGf18(SET_CONTROL,0x0C);
-   Gf1Delay();
-   dos_outportb(Gf1PageRegister,0);
-   SetGf18(SET_CONTROL,0x0C);
-   dos_outportb(Gf1PageRegister,1);
-   SetGf18(SET_CONTROL,0x0C);
-}
-
-
-//=============================================================================
-// Figures out what kind of UltraSound we have, if any, and starts it playing
-//=============================================================================
-qboolean GUS_Init(void)
-{
-	int rc;
-	int RealAddr;
-	BYTE FSVal,Voices;
-	struct CodecRateStruct *CodecRate;
-	struct Gf1RateStruct *Gf1Rate;
-
-	// See what kind of UltraSound we have, if any
-	if (GUS_GetIWData()==false)
-		if (GUS_GetMAXData()==false)
-			if (GUS_GetGUSData()==false)
-				return(false);
-
-	shm = &sn;
-
-	if (HaveCodec)
-	{
-		// do 11khz sampling rate unless command line parameter wants different
-		shm->speed = 11025;
-		FSVal = 0x03;
-		rc = COM_CheckParm("-sspeed");
-		if (rc)
-		{
-			shm->speed = Q_atoi(com_argv[rc+1]);
-	
-			// Make sure rate not too high
-			if (shm->speed>48000)
-				shm->speed=48000;
-	
-			// Adjust speed to match one of the possible CODEC rates
-			for (CodecRate=CodecRates;CodecRate->Rate!=0;CodecRate++)
-			{
-				if (shm->speed <= CodecRate->Rate)
-				{
-					shm->speed=CodecRate->Rate;
-					FSVal=CodecRate->FSVal;
-					break;
-				}
-			}
-		}
-
-	
-		// Always do 16 bit stereo
-		shm->channels = 2;
-		shm->samplebits = 16;
-	
-		// allocate buffer twice the size we need so we can get aligned buffer
-		dma_buffer = dos_getmemory(BUFFER_SIZE*2);
-		if (dma_buffer==NULL)
-		{
-			Con_Printf("Couldn't allocate sound dma buffer");
-			return false;
-		}
-
-		RealAddr = ptr2real(dma_buffer);
-		RealAddr = (RealAddr + BUFFER_SIZE) & ~(BUFFER_SIZE-1);
-		dma_buffer = (short *) real2ptr(RealAddr);
-
-		// Zero off DMA buffer
-		memset(dma_buffer, 0, BUFFER_SIZE);
-
-		shm->soundalive = true;
-		shm->splitbuffer = false;
-
-		shm->samplepos = 0;
-		shm->submission_chunk = 1;
-		shm->buffer = (unsigned char *) dma_buffer;
-		shm->samples = BUFFER_SIZE/(shm->samplebits/8);
-
-		GUS_StartDMA(DmaChannel,dma_buffer,BUFFER_SIZE);
-		GUS_StartCODEC(BUFFER_SIZE,FSVal);
-	}
-	else
-	{
-		// do 19khz sampling rate unless command line parameter wants different
-		shm->speed = 19293;
-		Voices=32;
-		rc = COM_CheckParm("-sspeed");
-		if (rc)
-		{
-			shm->speed = Q_atoi(com_argv[rc+1]);
-
-			// Make sure rate not too high
-			if (shm->speed>44100)
-				shm->speed=44100;
-
-			// Adjust speed to match one of the possible GF1 rates
-			for (Gf1Rate=Gf1Rates;Gf1Rate->Rate!=0;Gf1Rate++)
-			{
-				if (shm->speed <= Gf1Rate->Rate)
-				{
-					shm->speed=Gf1Rate->Rate;
-					Voices=Gf1Rate->Voices;
-					break;
-				}
-			}
-		}
-
-		// Always do 16 bit stereo
-		shm->channels = 2;
-		shm->samplebits = 16;
-
-		// allocate buffer twice the size we need so we can get aligned buffer
-		dma_buffer = dos_getmemory(BUFFER_SIZE*2);
-		if (dma_buffer==NULL)
-		{
-			Con_Printf("Couldn't allocate sound dma buffer");
-			return false;
-		}
-
-		RealAddr = ptr2real(dma_buffer);
-		RealAddr = (RealAddr + BUFFER_SIZE) & ~(BUFFER_SIZE-1);
-		dma_buffer = (short *) real2ptr(RealAddr);
-
-		// Zero off DMA buffer
-		memset(dma_buffer, 0, BUFFER_SIZE);
-
-		shm->soundalive = true;
-		shm->splitbuffer = false;
-
-		shm->samplepos = 0;
-		shm->submission_chunk = 1;
-		shm->buffer = (unsigned char *) dma_buffer;
-		shm->samples = BUFFER_SIZE/(shm->samplebits/8);
-
-		GUS_StartDMA(DmaChannel,dma_buffer,BUFFER_SIZE);
-		SetGf116(SET_DMA_ADDRESS,0x0000);
-		if (DmaChannel<=3)
-			SetGf18(DMA_CONTROL,0x41);
-		else
-			SetGf18(DMA_CONTROL,0x45);
-		GUS_StartGf1(BUFFER_SIZE,Voices);
-	}
-	return(true);
-}
-
-//=============================================================================
-// Returns the current playback position
-//=============================================================================
-int GUS_GetDMAPos(void)
-{
-   int count;
-
-	if (HaveCodec)
-	{
-	   // clear 16-bit reg flip-flop
- 	  // load the current dma count register
- 	  if (DmaChannel < 4)
- 	  {
- 	     dos_outportb(0x0C, 0);
- 	     count = dos_inportb(CountReg);
- 	     count += dos_inportb(CountReg) << 8;
- 	     if (shm->samplebits == 16)
- 	        count /= 2;
- 	     count = shm->samples - (count+1);
- 	  }
- 	  else
- 	  {
- 	     dos_outportb(0xD8, 0);
- 	     count = dos_inportb(CountReg);
- 	     count += dos_inportb(CountReg) << 8;
- 	     if (shm->samplebits == 8)
- 	        count *= 2;
- 	     count = shm->samples - (count+1);
- 	  }
-
-	}
-	else
-	{
-		// Read current position from GF1
-		dos_outportb(Gf1PageRegister,0);
-		count=(GetGf116(GET_ACC_HIGH)<<7) & 0xFFFF;
-		// See which half of buffer we are in. Note that since this is 16 bit
-		// data we are playing, position is in 16 bit samples
-		if (GetGf18(DMA_CONTROL) & 0x40)
-		{
-			GUS_StartDMA(DmaChannel,dma_buffer,BUFFER_SIZE);
-			SetGf116(SET_DMA_ADDRESS,0x0000);
-			if (DmaChannel<=3)
-				SetGf18(DMA_CONTROL,0x41);
-			else
-				SetGf18(DMA_CONTROL,0x45);
-		}
-	}
-
-   shm->samplepos = count & (shm->samples-1);
-   return(shm->samplepos);
-}
-
-//=============================================================================
-// Stops the UltraSound playback
-//=============================================================================
-void GUS_Shutdown (void)
-{
-	if (HaveCodec)
-	{
-		// Stop CODEC
-		dos_outportb(CodecRegisterSelect,CODEC_INTERFACE_CONFIG);
-		dos_outportb(CodecData,0x01);
-	}
-	else
-	{
-		// Stop Voices
-		dos_outportb(Gf1PageRegister,0);
-		SetGf18(SET_CONTROL,0x03);
-		dos_outportb(Gf1PageRegister,1);
-		SetGf18(SET_CONTROL,0x03);
-		Gf1Delay();
-		dos_outportb(Gf1PageRegister,0);
-		SetGf18(SET_CONTROL,0x03);
-		dos_outportb(Gf1PageRegister,1);
-		SetGf18(SET_CONTROL,0x03);
-
-		// Stop any DMA
-		SetGf18(DMA_CONTROL,0x00);
-		GetGf18(DMA_CONTROL);
-	}
-
-	dos_outportb(DisableReg, DmaChannel | 4); // disable dma channel
-}
--- a/u/snd_mixa.s
+++ /dev/null
@@ -1,199 +1,0 @@
-//
-// snd_mixa.s
-// x86 assembly-language sound code
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-
-#ifdef	id386
-
-	.text
-
-//----------------------------------------------------------------------
-// 8-bit sound-mixing code
-//----------------------------------------------------------------------
-
-#define ch		4+16
-#define sc		8+16
-#define count	12+16
-
-.globl C(SND_PaintChannelFrom8)
-C(SND_PaintChannelFrom8):
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-	pushl	%ebx
-	pushl	%ebp
-
-//	int 	data;
-//	short	*lscale, *rscale;
-//	unsigned char *sfx;
-//	int		i;
-
-	movl	ch(%esp),%ebx
-	movl	sc(%esp),%esi
-
-//	if (ch->leftvol > 255)
-//		ch->leftvol = 255;
-//	if (ch->rightvol > 255)
-//		ch->rightvol = 255;
-	movl	ch_leftvol(%ebx),%eax
-	movl	ch_rightvol(%ebx),%edx
-	cmpl	$255,%eax
-	jna		LLeftSet
-	movl	$255,%eax
-LLeftSet:
-	cmpl	$255,%edx
-	jna		LRightSet
-	movl	$255,%edx
-LRightSet:
-
-//	lscale = snd_scaletable[ch->leftvol >> 3];
-//	rscale = snd_scaletable[ch->rightvol >> 3];
-//	sfx = (signed char *)sc->data + ch->pos;
-//	ch->pos += count;
-	andl	$0xF8,%eax
-	addl	$(sfxc_data),%esi
-	andl	$0xF8,%edx
-	movl	ch_pos(%ebx),%edi
-	movl	count(%esp),%ecx
-	addl	%edi,%esi
-	shll	$7,%eax
-	addl	%ecx,%edi
-	shll	$7,%edx
-	movl	%edi,ch_pos(%ebx)
-	addl	$(C(snd_scaletable)),%eax
-	addl	$(C(snd_scaletable)),%edx
-	subl	%ebx,%ebx
-	movb	-1(%esi,%ecx,1),%bl
-
-	testl	$1,%ecx
-	jz		LMix8Loop
-
-	movl	(%eax,%ebx,4),%edi
-	movl	(%edx,%ebx,4),%ebp
-	addl	C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size),%edi
-	addl	C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size),%ebp
-	movl	%edi,C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size)
-	movl	%ebp,C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size)
-	movb	-2(%esi,%ecx,1),%bl
-
-	decl	%ecx
-	jz		LDone
-
-//	for (i=0 ; i<count ; i++)
-//	{
-LMix8Loop:
-
-//		data = sfx[i];
-//		paintbuffer[i].left += lscale[data];
-//		paintbuffer[i].right += rscale[data];
-	movl	(%eax,%ebx,4),%edi
-	movl	(%edx,%ebx,4),%ebp
-	addl	C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size),%edi
-	addl	C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size),%ebp
-	movb	-2(%esi,%ecx,1),%bl
-	movl	%edi,C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size)
-	movl	%ebp,C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size)
-
-	movl	(%eax,%ebx,4),%edi
-	movl	(%edx,%ebx,4),%ebp
-	movb	-3(%esi,%ecx,1),%bl
-	addl	C(paintbuffer)+psp_left-psp_size*2(,%ecx,psp_size),%edi
-	addl	C(paintbuffer)+psp_right-psp_size*2(,%ecx,psp_size),%ebp
-	movl	%edi,C(paintbuffer)+psp_left-psp_size*2(,%ecx,psp_size)
-	movl	%ebp,C(paintbuffer)+psp_right-psp_size*2(,%ecx,psp_size)
-
-//	}
-	subl	$2,%ecx
-	jnz		LMix8Loop
-
-LDone:
-	popl	%ebp
-	popl	%ebx
-	popl	%edi
-	popl	%esi
-
-	ret
-
-
-//----------------------------------------------------------------------
-// Transfer of stereo buffer to 16-bit DMA buffer code
-//----------------------------------------------------------------------
-
-.globl C(Snd_WriteLinearBlastStereo16)
-C(Snd_WriteLinearBlastStereo16):
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-	pushl	%ebx
-
-//	int		i;
-//	int		val;
-	movl	C(snd_linear_count),%ecx
-	movl	C(snd_p),%ebx
-	movl	C(snd_vol),%esi
-	movl	C(snd_out),%edi
-
-//	for (i=0 ; i<snd_linear_count ; i+=2)
-//	{
-LWLBLoopTop:
-
-//		val = (snd_p[i]*snd_vol)>>8;
-//		if (val > 0x7fff)
-//			snd_out[i] = 0x7fff;
-//		else if (val < (short)0x8000)
-//			snd_out[i] = (short)0x8000;
-//		else
-//			snd_out[i] = val;
-	movl	-8(%ebx,%ecx,4),%eax
-	imull	%esi,%eax
-	sarl	$8,%eax
-	cmpl	$0x7FFF,%eax
-	jg		LClampHigh
-	cmpl	$0xFFFF8000,%eax
-	jnl		LClampDone
-	movl	$0xFFFF8000,%eax
-	jmp		LClampDone
-LClampHigh:
-	movl	$0x7FFF,%eax
-LClampDone:
-
-//		val = (snd_p[i+1]*snd_vol)>>8;
-//		if (val > 0x7fff)
-//			snd_out[i+1] = 0x7fff;
-//		else if (val < (short)0x8000)
-//			snd_out[i+1] = (short)0x8000;
-//		else
-//			snd_out[i+1] = val;
-	movl	-4(%ebx,%ecx,4),%edx
-	imull	%esi,%edx
-	sarl	$8,%edx
-	cmpl	$0x7FFF,%edx
-	jg		LClampHigh2
-	cmpl	$0xFFFF8000,%edx
-	jnl		LClampDone2
-	movl	$0xFFFF8000,%edx
-	jmp		LClampDone2
-LClampHigh2:
-	movl	$0x7FFF,%edx
-LClampDone2:
-	shll	$16,%edx
-	andl	$0xFFFF,%eax
-	orl		%eax,%edx
-	movl	%edx,-4(%edi,%ecx,2)
-
-//	}
-	subl	$2,%ecx
-	jnz		LWLBLoopTop
-
-//	snd_p += snd_linear_count;
-
-	popl	%ebx
-	popl	%edi
-	popl	%esi
-
-	ret
-
-
-#endif	// id386
-
--- a/u/snd_next.c
+++ /dev/null
@@ -1,55 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-
-extern int desired_speed;
-extern int desired_bits;
-
-qboolean SNDDMA_Init(void)
-{
-	int size;
-
-	size = 16384 + sizeof(dma_t);
-	shm = malloc (size);
-	memset((void*)shm, 0, size);
-
-	shm->buffer = (char*)shm + sizeof(dma_t);
-	shm->channels = 2;
-	shm->speed = desired_speed;
-	shm->samplebits = desired_bits;
-	shm->samples = 16384 / (desired_bits / 8);
-	shm->submission_chunk = 1;
-
-	return true;
-}
-
-// return the current sample position (in mono samples read)
-// inside the recirculating dma buffer
-int SNDDMA_GetDMAPos(void)
-{
-	shm->samplepos = (int)(realtime*shm->speed*shm->channels) & (shm->samples-1);
-	
-	return shm->samplepos;
-}
-
-void SNDDMA_Shutdown(void)
-{
-}
--- a/u/snd_null.c
+++ /dev/null
@@ -1,97 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// snd_null.c -- include this instead of all the other snd_* files to have
-// no sound code whatsoever
-
-#include "quakedef.h"
-
-cvar_t bgmvolume = {"bgmvolume", "1", true};
-cvar_t volume = {"volume", "0.7", true};
-
- 
-void S_Init (void)
-{
-}
-
-void S_AmbientOff (void)
-{
-}
-
-void S_AmbientOn (void)
-{
-}
-
-void S_Shutdown (void)
-{
-}
-
-void S_TouchSound (char *sample)
-{
-}
-
-void S_ClearBuffer (void)
-{
-}
-
-void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
-{
-}
-
-void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol,  float attenuation)
-{
-}
-
-void S_StopSound (int entnum, int entchannel)
-{
-}
-
-sfx_t *S_PrecacheSound (char *sample)
-{
-	return NULL;
-}
-
-void S_ClearPrecache (void)
-{
-}
-
-void S_Update (vec3_t origin, vec3_t v_forward, vec3_t v_right, vec3_t v_up)
-{	
-}
-
-void S_StopAllSounds (qboolean clear)
-{
-}
-
-void S_BeginPrecaching (void)
-{
-}
-
-void S_EndPrecaching (void)
-{
-}
-
-void S_ExtraUpdate (void)
-{
-}
-
-void S_LocalSound (char *s)
-{
-}
-
--- a/u/snd_sun.c
+++ /dev/null
@@ -1,218 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/shm.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <sys/audioio.h>
-#include <errno.h>
-#include "quakedef.h"
-
-int audio_fd;
-int snd_inited;
-
-static int bufpos;
-static int wbufp;
-static audio_info_t info;
-
-#define BUFFER_SIZE		8192
-
-unsigned char dma_buffer[BUFFER_SIZE];
-unsigned char pend_buffer[BUFFER_SIZE];
-int pending;
-
-static int lastwrite = 0;
-
-qboolean SNDDMA_Init(void)
-{
-	int rc;
-	int fmt;
-	int tmp;
-	int i;
-	char *s;
-	int caps;
-
-	if (snd_inited) {
-		printf("Sound already init'd\n");
-		return;
-	}
-
-	shm = &sn;
-	shm->splitbuffer = 0;
-
-	audio_fd = open("/dev/audio", O_WRONLY|O_NDELAY);
-
-	if (audio_fd < 0) {
-		if (errno == EBUSY) {
-			Con_Printf("Audio device is being used by another process\n");
-		}
-		perror("/dev/audio");
-		Con_Printf("Could not open /dev/audio\n");
-		return (0);
-	}
-
-	if (ioctl(audio_fd, AUDIO_GETINFO, &info) < 0) {
-		perror("/dev/audio");
-		Con_Printf("Could not communicate with audio device.\n");
-		close(audio_fd);
-		return 0;
-	}
-
-	//
-	// set to nonblock
-	//
-	if (fcntl(audio_fd, F_SETFL, O_NONBLOCK) < 0) {
-		perror("/dev/audio");
-		close(audio_fd);
-		return 0;
-	}
-
-	AUDIO_INITINFO(&info);
-
-	shm->speed = 11025;
-
-	// try 16 bit stereo
-	info.play.encoding = AUDIO_ENCODING_LINEAR;
-	info.play.sample_rate = 11025;
-	info.play.channels = 2;
-	info.play.precision = 16;
-
-	if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0) {
-		info.play.encoding = AUDIO_ENCODING_LINEAR;
-		info.play.sample_rate = 11025;
-		info.play.channels = 1;
-		info.play.precision = 16;
-		if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0) {
-			Con_Printf("Incapable sound hardware.\n");
-			close(audio_fd);
-			return 0;
-		}
-		Con_Printf("16 bit mono sound initialized\n");
-		shm->samplebits = 16;
-		shm->channels = 1;
-	} else { // 16 bit stereo
-		Con_Printf("16 bit stereo sound initialized\n");
-		shm->samplebits = 16;
-		shm->channels = 2;
-	}
-
-	shm->soundalive = true;
-	shm->samples = sizeof(dma_buffer) / (shm->samplebits/8);
-	shm->samplepos = 0;
-	shm->submission_chunk = 1;
-	shm->buffer = (unsigned char *)dma_buffer;
-
-	snd_inited = 1;
-
-	return 1;
-}
-
-int SNDDMA_GetDMAPos(void)
-{
-	if (!snd_inited)
-		return (0);
-
-	if (ioctl(audio_fd, AUDIO_GETINFO, &info) < 0) {
-		perror("/dev/audio");
-		Con_Printf("Could not communicate with audio device.\n");
-		close(audio_fd);
-		snd_inited = 0;
-		return (0);
-	}
-
-	return ((info.play.samples*shm->channels) % shm->samples);
-}
-
-int SNDDMA_GetSamples(void)
-{
-	if (!snd_inited)
-		return (0);
-
-	if (ioctl(audio_fd, AUDIO_GETINFO, &info) < 0) {
-		perror("/dev/audio");
-		Con_Printf("Could not communicate with audio device.\n");
-		close(audio_fd);
-		snd_inited = 0;
-		return (0);
-	}
-
-	return info.play.samples;
-}
-
-void SNDDMA_Shutdown(void)
-{
-	if (snd_inited) {
-		close(audio_fd);
-		snd_inited = 0;
-	}
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-===============
-*/
-void SNDDMA_Submit(void)
-{
-	int samps;
-	int bsize;
-	int bytes, b;
-	static unsigned char writebuf[1024];
-	unsigned char *p;
-	int idx;
-	int stop = paintedtime;
-	extern int soundtime;
-
-	if (paintedtime < wbufp)
-		wbufp = 0; // reset
-
-	bsize = shm->channels * (shm->samplebits/8);
-	bytes = (paintedtime - wbufp) * bsize;
-
-	if (!bytes)
-		return;
-
-	if (bytes > sizeof(writebuf)) {
-		bytes = sizeof(writebuf);
-		stop = wbufp + bytes/bsize;
-	}
-
-	p = writebuf;
-	idx = (wbufp*bsize) & (BUFFER_SIZE - 1);
-
-	for (b = bytes; b; b--) {
-		*p++ = dma_buffer[idx];
-		idx = (idx + 1) & (BUFFER_SIZE - 1);
-	}
-
-	wbufp = stop;
-
-	if (write(audio_fd, writebuf, bytes) < bytes)
-		printf("audio can't keep up!\n");
-
-}
-
--- a/u/snd_win.c
+++ /dev/null
@@ -1,729 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 "quakedef.h"
-#include "winquake.h"
-
-#define iDirectSoundCreate(a,b,c)	pDirectSoundCreate(a,b,c)
-
-HRESULT (WINAPI *pDirectSoundCreate)(GUID FAR *lpGUID, LPDIRECTSOUND FAR *lplpDS, IUnknown FAR *pUnkOuter);
-
-// 64K is > 1 second at 16-bit, 22050 Hz
-#define	WAV_BUFFERS				64
-#define	WAV_MASK				0x3F
-#define	WAV_BUFFER_SIZE			0x0400
-#define SECONDARY_BUFFER_SIZE	0x10000
-
-typedef enum {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat;
-
-static qboolean	wavonly;
-static qboolean	dsound_init;
-static qboolean	wav_init;
-static qboolean	snd_firsttime = true, snd_isdirect, snd_iswave;
-static qboolean	primary_format_set;
-
-static int	sample16;
-static int	snd_sent, snd_completed;
-
-
-/* 
- * Global variables. Must be visible to window-procedure function 
- *  so it can unlock and free the data block after it has been played. 
- */ 
-
-HANDLE		hData;
-HPSTR		lpData, lpData2;
-
-HGLOBAL		hWaveHdr;
-LPWAVEHDR	lpWaveHdr;
-
-HWAVEOUT    hWaveOut; 
-
-WAVEOUTCAPS	wavecaps;
-
-DWORD	gSndBufSize;
-
-MMTIME		mmstarttime;
-
-LPDIRECTSOUND pDS;
-LPDIRECTSOUNDBUFFER pDSBuf, pDSPBuf;
-
-HINSTANCE hInstDS;
-
-qboolean SNDDMA_InitDirect (void);
-qboolean SNDDMA_InitWav (void);
-
-
-/*
-==================
-S_BlockSound
-==================
-*/
-void S_BlockSound (void)
-{
-
-// DirectSound takes care of blocking itself
-	if (snd_iswave)
-	{
-		snd_blocked++;
-
-		if (snd_blocked == 1)
-		{
-			waveOutReset (hWaveOut);
-		}
-	}
-}
-
-
-/*
-==================
-S_UnblockSound
-==================
-*/
-void S_UnblockSound (void)
-{
-
-// DirectSound takes care of blocking itself
-	if (snd_iswave)
-	{
-		snd_blocked--;
-	}
-}
-
-
-/*
-==================
-FreeSound
-==================
-*/
-void FreeSound (void)
-{
-	int		i;
-
-	if (pDSBuf)
-	{
-		pDSBuf->lpVtbl->Stop(pDSBuf);
-		pDSBuf->lpVtbl->Release(pDSBuf);
-	}
-
-// only release primary buffer if it's not also the mixing buffer we just released
-	if (pDSPBuf && (pDSBuf != pDSPBuf))
-	{
-		pDSPBuf->lpVtbl->Release(pDSPBuf);
-	}
-
-	if (pDS)
-	{
-		pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_NORMAL);
-		pDS->lpVtbl->Release(pDS);
-	}
-
-	if (hWaveOut)
-	{
-		waveOutReset (hWaveOut);
-
-		if (lpWaveHdr)
-		{
-			for (i=0 ; i< WAV_BUFFERS ; i++)
-				waveOutUnprepareHeader (hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR));
-		}
-
-		waveOutClose (hWaveOut);
-
-		if (hWaveHdr)
-		{
-			GlobalUnlock(hWaveHdr); 
-			GlobalFree(hWaveHdr);
-		}
-
-		if (hData)
-		{
-			GlobalUnlock(hData);
-			GlobalFree(hData);
-		}
-
-	}
-
-	pDS = NULL;
-	pDSBuf = NULL;
-	pDSPBuf = NULL;
-	hWaveOut = 0;
-	hData = 0;
-	hWaveHdr = 0;
-	lpData = NULL;
-	lpWaveHdr = NULL;
-	dsound_init = false;
-	wav_init = false;
-}
-
-
-/*
-==================
-SNDDMA_InitDirect
-
-Direct-Sound support
-==================
-*/
-sndinitstat SNDDMA_InitDirect (void)
-{
-	DSBUFFERDESC	dsbuf;
-	DSBCAPS			dsbcaps;
-	DWORD			dwSize, dwWrite;
-	DSCAPS			dscaps;
-	WAVEFORMATEX	format, pformat; 
-	HRESULT			hresult;
-	int				reps;
-
-	memset ((void *)&sn, 0, sizeof (sn));
-
-	shm = &sn;
-
-	shm->channels = 2;
-	shm->samplebits = 16;
-	shm->speed = 11025;
-
-	memset (&format, 0, sizeof(format));
-	format.wFormatTag = WAVE_FORMAT_PCM;
-    format.nChannels = shm->channels;
-    format.wBitsPerSample = shm->samplebits;
-    format.nSamplesPerSec = shm->speed;
-    format.nBlockAlign = format.nChannels
-		*format.wBitsPerSample / 8;
-    format.cbSize = 0;
-    format.nAvgBytesPerSec = format.nSamplesPerSec
-		*format.nBlockAlign; 
-
-	if (!hInstDS)
-	{
-		hInstDS = LoadLibrary("dsound.dll");
-		
-		if (hInstDS == NULL)
-		{
-			Con_SafePrintf ("Couldn't load dsound.dll\n");
-			return SIS_FAILURE;
-		}
-
-		pDirectSoundCreate = (void *)GetProcAddress(hInstDS,"DirectSoundCreate");
-
-		if (!pDirectSoundCreate)
-		{
-			Con_SafePrintf ("Couldn't get DS proc addr\n");
-			return SIS_FAILURE;
-		}
-	}
-
-	while ((hresult = iDirectSoundCreate(NULL, &pDS, NULL)) != DS_OK)
-	{
-		if (hresult != DSERR_ALLOCATED)
-		{
-			Con_SafePrintf ("DirectSound create failed\n");
-			return SIS_FAILURE;
-		}
-
-		if (MessageBox (NULL,
-						"The sound hardware is in use by another app.\n\n"
-					    "Select Retry to try to start sound again or Cancel to run Quake with no sound.",
-						"Sound not available",
-						MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
-		{
-			Con_SafePrintf ("DirectSoundCreate failure\n"
-							"  hardware already in use\n");
-			return SIS_NOTAVAIL;
-		}
-	}
-
-	dscaps.dwSize = sizeof(dscaps);
-
-	if (DS_OK != pDS->lpVtbl->GetCaps (pDS, &dscaps))
-	{
-		Con_SafePrintf ("Couldn't get DS caps\n");
-	}
-
-	if (dscaps.dwFlags & DSCAPS_EMULDRIVER)
-	{
-		Con_SafePrintf ("No DirectSound driver installed\n");
-		FreeSound ();
-		return SIS_FAILURE;
-	}
-
-	if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE))
-	{
-		Con_SafePrintf ("Set coop level failed\n");
-		FreeSound ();
-		return SIS_FAILURE;
-	}
-
-// get access to the primary buffer, if possible, so we can set the
-// sound hardware format
-	memset (&dsbuf, 0, sizeof(dsbuf));
-	dsbuf.dwSize = sizeof(DSBUFFERDESC);
-	dsbuf.dwFlags = DSBCAPS_PRIMARYBUFFER;
-	dsbuf.dwBufferBytes = 0;
-	dsbuf.lpwfxFormat = NULL;
-
-	memset(&dsbcaps, 0, sizeof(dsbcaps));
-	dsbcaps.dwSize = sizeof(dsbcaps);
-	primary_format_set = false;
-
-	if (!COM_CheckParm ("-snoforceformat"))
-	{
-		if (DS_OK == pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSPBuf, NULL))
-		{
-			pformat = format;
-
-			if (DS_OK != pDSPBuf->lpVtbl->SetFormat (pDSPBuf, &pformat))
-			{
-				if (snd_firsttime)
-					Con_SafePrintf ("Set primary sound buffer format: no\n");
-			}
-			else
-			{
-				if (snd_firsttime)
-					Con_SafePrintf ("Set primary sound buffer format: yes\n");
-
-				primary_format_set = true;
-			}
-		}
-	}
-
-	if (!primary_format_set || !COM_CheckParm ("-primarysound"))
-	{
-	// create the secondary buffer we'll actually work with
-		memset (&dsbuf, 0, sizeof(dsbuf));
-		dsbuf.dwSize = sizeof(DSBUFFERDESC);
-		dsbuf.dwFlags = DSBCAPS_CTRLFREQUENCY | DSBCAPS_LOCSOFTWARE;
-		dsbuf.dwBufferBytes = SECONDARY_BUFFER_SIZE;
-		dsbuf.lpwfxFormat = &format;
-
-		memset(&dsbcaps, 0, sizeof(dsbcaps));
-		dsbcaps.dwSize = sizeof(dsbcaps);
-
-		if (DS_OK != pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL))
-		{
-			Con_SafePrintf ("DS:CreateSoundBuffer Failed");
-			FreeSound ();
-			return SIS_FAILURE;
-		}
-
-		shm->channels = format.nChannels;
-		shm->samplebits = format.wBitsPerSample;
-		shm->speed = format.nSamplesPerSec;
-
-		if (DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps))
-		{
-			Con_SafePrintf ("DS:GetCaps failed\n");
-			FreeSound ();
-			return SIS_FAILURE;
-		}
-
-		if (snd_firsttime)
-			Con_SafePrintf ("Using secondary sound buffer\n");
-	}
-	else
-	{
-		if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY))
-		{
-			Con_SafePrintf ("Set coop level failed\n");
-			FreeSound ();
-			return SIS_FAILURE;
-		}
-
-		if (DS_OK != pDSPBuf->lpVtbl->GetCaps (pDSPBuf, &dsbcaps))
-		{
-			Con_Printf ("DS:GetCaps failed\n");
-			return SIS_FAILURE;
-		}
-
-		pDSBuf = pDSPBuf;
-		Con_SafePrintf ("Using primary sound buffer\n");
-	}
-
-	// Make sure mixer is active
-	pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
-
-	if (snd_firsttime)
-		Con_SafePrintf("   %d channel(s)\n"
-		               "   %d bits/sample\n"
-					   "   %d bytes/sec\n",
-					   shm->channels, shm->samplebits, shm->speed);
-	
-	gSndBufSize = dsbcaps.dwBufferBytes;
-
-// initialize the buffer
-	reps = 0;
-
-	while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &lpData, &dwSize, NULL, NULL, 0)) != DS_OK)
-	{
-		if (hresult != DSERR_BUFFERLOST)
-		{
-			Con_SafePrintf ("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n");
-			FreeSound ();
-			return SIS_FAILURE;
-		}
-
-		if (++reps > 10000)
-		{
-			Con_SafePrintf ("SNDDMA_InitDirect: DS: couldn't restore buffer\n");
-			FreeSound ();
-			return SIS_FAILURE;
-		}
-
-	}
-
-	memset(lpData, 0, dwSize);
-//		lpData[4] = lpData[5] = 0x7f;	// force a pop for debugging
-
-	pDSBuf->lpVtbl->Unlock(pDSBuf, lpData, dwSize, NULL, 0);
-
-	/* we don't want anyone to access the buffer directly w/o locking it first. */
-	lpData = NULL; 
-
-	pDSBuf->lpVtbl->Stop(pDSBuf);
-	pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmstarttime.u.sample, &dwWrite);
-	pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
-
-	shm->soundalive = true;
-	shm->splitbuffer = false;
-	shm->samples = gSndBufSize/(shm->samplebits/8);
-	shm->samplepos = 0;
-	shm->submission_chunk = 1;
-	shm->buffer = (unsigned char *) lpData;
-	sample16 = (shm->samplebits/8) - 1;
-
-	dsound_init = true;
-
-	return SIS_SUCCESS;
-}
-
-
-/*
-==================
-SNDDM_InitWav
-
-Crappy windows multimedia base
-==================
-*/
-qboolean SNDDMA_InitWav (void)
-{
-	WAVEFORMATEX  format; 
-	int				i;
-	HRESULT			hr;
-	
-	snd_sent = 0;
-	snd_completed = 0;
-
-	shm = &sn;
-
-	shm->channels = 2;
-	shm->samplebits = 16;
-	shm->speed = 11025;
-
-	memset (&format, 0, sizeof(format));
-	format.wFormatTag = WAVE_FORMAT_PCM;
-	format.nChannels = shm->channels;
-	format.wBitsPerSample = shm->samplebits;
-	format.nSamplesPerSec = shm->speed;
-	format.nBlockAlign = format.nChannels
-		*format.wBitsPerSample / 8;
-	format.cbSize = 0;
-	format.nAvgBytesPerSec = format.nSamplesPerSec
-		*format.nBlockAlign; 
-	
-	/* Open a waveform device for output using window callback. */ 
-	while ((hr = waveOutOpen((LPHWAVEOUT)&hWaveOut, WAVE_MAPPER, 
-					&format, 
-					0, 0L, CALLBACK_NULL)) != MMSYSERR_NOERROR)
-	{
-		if (hr != MMSYSERR_ALLOCATED)
-		{
-			Con_SafePrintf ("waveOutOpen failed\n");
-			return false;
-		}
-
-		if (MessageBox (NULL,
-						"The sound hardware is in use by another app.\n\n"
-					    "Select Retry to try to start sound again or Cancel to run Quake with no sound.",
-						"Sound not available",
-						MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY)
-		{
-			Con_SafePrintf ("waveOutOpen failure;\n"
-							"  hardware already in use\n");
-			return false;
-		}
-	} 
-
-	/* 
-	 * Allocate and lock memory for the waveform data. The memory 
-	 * for waveform data must be globally allocated with 
-	 * GMEM_MOVEABLE and GMEM_SHARE flags. 
-
-	*/ 
-	gSndBufSize = WAV_BUFFERS*WAV_BUFFER_SIZE;
-	hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize); 
-	if (!hData) 
-	{ 
-		Con_SafePrintf ("Sound: Out of memory.\n");
-		FreeSound ();
-		return false; 
-	}
-	lpData = GlobalLock(hData);
-	if (!lpData)
-	{ 
-		Con_SafePrintf ("Sound: Failed to lock.\n");
-		FreeSound ();
-		return false; 
-	} 
-	memset (lpData, 0, gSndBufSize);
-
-	/* 
-	 * Allocate and lock memory for the header. This memory must 
-	 * also be globally allocated with GMEM_MOVEABLE and 
-	 * GMEM_SHARE flags. 
-	 */ 
-	hWaveHdr = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, 
-		(DWORD) sizeof(WAVEHDR) * WAV_BUFFERS); 
-
-	if (hWaveHdr == NULL)
-	{ 
-		Con_SafePrintf ("Sound: Failed to Alloc header.\n");
-		FreeSound ();
-		return false; 
-	} 
-
-	lpWaveHdr = (LPWAVEHDR) GlobalLock(hWaveHdr); 
-
-	if (lpWaveHdr == NULL)
-	{ 
-		Con_SafePrintf ("Sound: Failed to lock header.\n");
-		FreeSound ();
-		return false; 
-	}
-
-	memset (lpWaveHdr, 0, sizeof(WAVEHDR) * WAV_BUFFERS);
-
-	/* After allocation, set up and prepare headers. */ 
-	for (i=0 ; i<WAV_BUFFERS ; i++)
-	{
-		lpWaveHdr[i].dwBufferLength = WAV_BUFFER_SIZE; 
-		lpWaveHdr[i].lpData = lpData + i*WAV_BUFFER_SIZE;
-
-		if (waveOutPrepareHeader(hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)) !=
-				MMSYSERR_NOERROR)
-		{
-			Con_SafePrintf ("Sound: failed to prepare wave headers\n");
-			FreeSound ();
-			return false;
-		}
-	}
-
-	shm->soundalive = true;
-	shm->splitbuffer = false;
-	shm->samples = gSndBufSize/(shm->samplebits/8);
-	shm->samplepos = 0;
-	shm->submission_chunk = 1;
-	shm->buffer = (unsigned char *) lpData;
-	sample16 = (shm->samplebits/8) - 1;
-
-	wav_init = true;
-
-	return true;
-}
-
-/*
-==================
-SNDDMA_Init
-
-Try to find a sound device to mix for.
-Returns false if nothing is found.
-==================
-*/
-
-int SNDDMA_Init(void)
-{
-	sndinitstat	stat;
-
-	if (COM_CheckParm ("-wavonly"))
-		wavonly = true;
-
-	dsound_init = wav_init = 0;
-
-	stat = SIS_FAILURE;	// assume DirectSound won't initialize
-
-	/* Init DirectSound */
-	if (!wavonly)
-	{
-		if (snd_firsttime || snd_isdirect)
-		{
-			stat = SNDDMA_InitDirect ();;
-
-			if (stat == SIS_SUCCESS)
-			{
-				snd_isdirect = true;
-
-				if (snd_firsttime)
-					Con_SafePrintf ("DirectSound initialized\n");
-			}
-			else
-			{
-				snd_isdirect = false;
-				Con_SafePrintf ("DirectSound failed to init\n");
-			}
-		}
-	}
-
-// if DirectSound didn't succeed in initializing, try to initialize
-// waveOut sound, unless DirectSound failed because the hardware is
-// already allocated (in which case the user has already chosen not
-// to have sound)
-	if (!dsound_init && (stat != SIS_NOTAVAIL))
-	{
-		if (snd_firsttime || snd_iswave)
-		{
-
-			snd_iswave = SNDDMA_InitWav ();
-
-			if (snd_iswave)
-			{
-				if (snd_firsttime)
-					Con_SafePrintf ("Wave sound initialized\n");
-			}
-			else
-			{
-				Con_SafePrintf ("Wave sound failed to init\n");
-			}
-		}
-	}
-
-	snd_firsttime = false;
-
-	if (!dsound_init && !wav_init)
-	{
-		if (snd_firsttime)
-			Con_SafePrintf ("No sound device initialized\n");
-
-		return 0;
-	}
-
-	return 1;
-}
-
-/*
-==============
-SNDDMA_GetDMAPos
-
-return the current sample position (in mono samples read)
-inside the recirculating dma buffer, so the mixing code will know
-how many sample are required to fill it up.
-===============
-*/
-int SNDDMA_GetDMAPos(void)
-{
-	MMTIME	mmtime;
-	int		s;
-	DWORD	dwWrite;
-
-	if (dsound_init) 
-	{
-		mmtime.wType = TIME_SAMPLES;
-		pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmtime.u.sample, &dwWrite);
-		s = mmtime.u.sample - mmstarttime.u.sample;
-	}
-	else if (wav_init)
-	{
-		s = snd_sent * WAV_BUFFER_SIZE;
-	}
-
-
-	s >>= sample16;
-
-	s &= (shm->samples-1);
-
-	return s;
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-===============
-*/
-void SNDDMA_Submit(void)
-{
-	LPWAVEHDR	h;
-	int			wResult;
-
-	if (!wav_init)
-		return;
-
-	//
-	// find which sound blocks have completed
-	//
-	while (1)
-	{
-		if ( snd_completed == snd_sent )
-		{
-			Con_DPrintf ("Sound overrun\n");
-			break;
-		}
-
-		if ( ! (lpWaveHdr[ snd_completed & WAV_MASK].dwFlags & WHDR_DONE) )
-		{
-			break;
-		}
-
-		snd_completed++;	// this buffer has been played
-	}
-
-	//
-	// submit two new sound blocks
-	//
-	while (((snd_sent - snd_completed) >> sample16) < 4)
-	{
-		h = lpWaveHdr + ( snd_sent&WAV_MASK );
-
-		snd_sent++;
-		/* 
-		 * Now the data block can be sent to the output device. The 
-		 * waveOutWrite function returns immediately and waveform 
-		 * data is sent to the output device in the background. 
-		 */ 
-		wResult = waveOutWrite(hWaveOut, h, sizeof(WAVEHDR)); 
-
-		if (wResult != MMSYSERR_NOERROR)
-		{ 
-			Con_SafePrintf ("Failed to write block to device\n");
-			FreeSound ();
-			return; 
-		} 
-	}
-}
-
-/*
-==============
-SNDDMA_Shutdown
-
-Reset the sound device for exiting
-===============
-*/
-void SNDDMA_Shutdown(void)
-{
-	FreeSound ();
-}
-
--- a/u/surf16.s
+++ /dev/null
@@ -1,153 +1,0 @@
-//
-// surf16.s
-// x86 assembly-language 16 bpp surface block drawing code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-
-#ifdef id386
-
-//----------------------------------------------------------------------
-// Surface block drawer
-//----------------------------------------------------------------------
-
-	.data
-
-k:			.long	0
-loopentry:	.long	0
-
-	.align	4
-blockjumptable16:
-	.long	LEnter2_16
-	.long	LEnter4_16
-	.long	0, LEnter8_16
-	.long	0, 0, 0, LEnter16_16
-
-
-	.text
-
-	.align 4
-.globl C(R_Surf16Start)
-C(R_Surf16Start):
-
-	.align 4
-.globl C(R_DrawSurfaceBlock16)
-C(R_DrawSurfaceBlock16):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-	movl	C(blocksize),%eax
-	movl	C(prowdestbase),%edi
-	movl	C(pbasesource),%esi
-	movl	C(sourcesstep),%ebx
-	movl	blockjumptable16-4(,%eax,2),%ecx
-	movl	%eax,k
-	movl	%ecx,loopentry
-	movl	C(lightleft),%edx
-	movl	C(lightright),%ebp
-
-Lblockloop16:
-
-	subl	%edx,%ebp
-	movb	C(blockdivshift),%cl
-	sarl	%cl,%ebp
-	jns		Lp1_16
-	testl	C(blockdivmask),%ebp
-	jz		Lp1_16
-	incl	%ebp
-Lp1_16:
-
-	subl	%eax,%eax
-	subl	%ecx,%ecx	// high words must be 0 in loop for addressing
-
-	jmp		*loopentry
-
-	.align	4
-
-#include "block16.h"
-
-	movl	C(pbasesource),%esi
-	movl	C(lightleft),%edx
-	movl	C(lightright),%ebp
-	movl	C(sourcetstep),%eax
-	movl	C(lightrightstep),%ecx
-	movl	C(prowdestbase),%edi
-
-	addl	%eax,%esi
-	addl	%ecx,%ebp
-
-	movl	C(lightleftstep),%eax
-	movl	C(surfrowbytes),%ecx
-
-	addl	%eax,%edx
-	addl	%ecx,%edi
-
-	movl	%esi,C(pbasesource)
-	movl	%ebp,C(lightright)
-	movl	k,%eax
-	movl	%edx,C(lightleft)
-	decl	%eax
-	movl	%edi,C(prowdestbase)
-	movl	%eax,k
-	jnz		Lblockloop16
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-.globl C(R_Surf16End)
-C(R_Surf16End):
-
-//----------------------------------------------------------------------
-// Code patching routines
-//----------------------------------------------------------------------
-	.data
-
-	.align 4
-LPatchTable16:
-	.long	LBPatch0-4
-	.long	LBPatch1-4
-	.long	LBPatch2-4
-	.long	LBPatch3-4
-	.long	LBPatch4-4
-	.long	LBPatch5-4
-	.long	LBPatch6-4
-	.long	LBPatch7-4
-	.long	LBPatch8-4
-	.long	LBPatch9-4
-	.long	LBPatch10-4
-	.long	LBPatch11-4
-	.long	LBPatch12-4
-	.long	LBPatch13-4
-	.long	LBPatch14-4
-	.long	LBPatch15-4
-
-	.text
-
-	.align 4
-.globl C(R_Surf16Patch)
-C(R_Surf16Patch):
-	pushl	%ebx
-
-	movl	C(colormap),%eax
-	movl	$LPatchTable16,%ebx
-	movl	$16,%ecx
-LPatchLoop16:
-	movl	(%ebx),%edx
-	addl	$4,%ebx
-	movl	%eax,(%edx)
-	decl	%ecx
-	jnz		LPatchLoop16
-
-	popl	%ebx
-
-	ret
-
-
-#endif	// id386
--- a/u/surf8.s
+++ /dev/null
@@ -1,764 +1,0 @@
-//
-// surf8.s
-// x86 assembly-language 8 bpp surface block drawing code.
-//
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "asm_draw.h"
-
-#ifdef	id386
-
-	.data
-
-sb_v:		.long	0
-
-	.text
-
-	.align 4
-.globl C(R_Surf8Start)
-C(R_Surf8Start):
-
-//----------------------------------------------------------------------
-// Surface block drawer for mip level 0
-//----------------------------------------------------------------------
-
-	.align 4
-.globl C(R_DrawSurfaceBlock8_mip0)
-C(R_DrawSurfaceBlock8_mip0):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-//		for (v=0 ; v<numvblocks ; v++)
-//		{
-	movl	C(r_lightptr),%ebx
-	movl	C(r_numvblocks),%eax
-
-	movl	%eax,sb_v
-	movl	C(prowdestbase),%edi
-
-	movl	C(pbasesource),%esi
-
-Lv_loop_mip0:
-
-//			lightleft = lightptr[0];
-//			lightright = lightptr[1];
-//			lightdelta = (lightleft - lightright) & 0xFFFFF;
-	movl	(%ebx),%eax			// lightleft
-	movl	4(%ebx),%edx		// lightright
-
-	movl	%eax,%ebp
-	movl	C(r_lightwidth),%ecx
-
-	movl	%edx,C(lightright)
-	subl	%edx,%ebp
-
-	andl	$0xFFFFF,%ebp
-	leal	(%ebx,%ecx,4),%ebx
-
-//			lightptr += lightwidth;
-	movl	%ebx,C(r_lightptr)
-
-//			lightleftstep = (lightptr[0] - lightleft) >> blockdivshift;
-//			lightrightstep = (lightptr[1] - lightright) >> blockdivshift;
-//			lightdeltastep = ((lightleftstep - lightrightstep) & 0xFFFFF) |
-//					0xF0000000;
-	movl	4(%ebx),%ecx	// lightptr[1]
-	movl	(%ebx),%ebx		// lightptr[0]
-
-	subl	%eax,%ebx
-	subl	%edx,%ecx
-
-	sarl	$4,%ecx
-	orl		$0xF0000000,%ebp
-
-	sarl	$4,%ebx
-	movl	%ecx,C(lightrightstep)
-
-	subl	%ecx,%ebx
-	andl	$0xFFFFF,%ebx
-
-	orl		$0xF0000000,%ebx
-	subl	%ecx,%ecx	// high word must be 0 in loop for addressing
-
-	movl	%ebx,C(lightdeltastep)
-	subl	%ebx,%ebx	// high word must be 0 in loop for addressing
-
-Lblockloop8_mip0:
-	movl	%ebp,C(lightdelta)
-	movb	14(%esi),%cl
-
-	sarl	$4,%ebp
-	movb	%dh,%bh
-
-	movb	15(%esi),%bl
-	addl	%ebp,%edx
-
-	movb	%dh,%ch
-	addl	%ebp,%edx
-
-	movb	0x12345678(%ebx),%ah
-LBPatch0:
-	movb	13(%esi),%bl
-
-	movb	0x12345678(%ecx),%al
-LBPatch1:
-	movb	12(%esi),%cl
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	rorl	$16,%eax
-	movb	%dh,%ch
-
-	addl	%ebp,%edx
-	movb	0x12345678(%ebx),%ah
-LBPatch2:
-
-	movb	11(%esi),%bl
-	movb	0x12345678(%ecx),%al
-LBPatch3:
-
-	movb	10(%esi),%cl
-	movl	%eax,12(%edi)
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	movb	%dh,%ch
-	addl	%ebp,%edx
-
-	movb	0x12345678(%ebx),%ah
-LBPatch4:
-	movb	9(%esi),%bl
-
-	movb	0x12345678(%ecx),%al
-LBPatch5:
-	movb	8(%esi),%cl
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	rorl	$16,%eax
-	movb	%dh,%ch
-
-	addl	%ebp,%edx
-	movb	0x12345678(%ebx),%ah
-LBPatch6:
-
-	movb	7(%esi),%bl
-	movb	0x12345678(%ecx),%al
-LBPatch7:
-
-	movb	6(%esi),%cl
-	movl	%eax,8(%edi)
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	movb	%dh,%ch
-	addl	%ebp,%edx
-
-	movb	0x12345678(%ebx),%ah
-LBPatch8:
-	movb	5(%esi),%bl
-
-	movb	0x12345678(%ecx),%al
-LBPatch9:
-	movb	4(%esi),%cl
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	rorl	$16,%eax
-	movb	%dh,%ch
-
-	addl	%ebp,%edx
-	movb	0x12345678(%ebx),%ah
-LBPatch10:
-
-	movb	3(%esi),%bl
-	movb	0x12345678(%ecx),%al
-LBPatch11:
-
-	movb	2(%esi),%cl
-	movl	%eax,4(%edi)
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	movb	%dh,%ch
-	addl	%ebp,%edx
-
-	movb	0x12345678(%ebx),%ah
-LBPatch12:
-	movb	1(%esi),%bl
-
-	movb	0x12345678(%ecx),%al
-LBPatch13:
-	movb	(%esi),%cl
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	rorl	$16,%eax
-	movb	%dh,%ch
-
-	movb	0x12345678(%ebx),%ah
-LBPatch14:
-	movl	C(lightright),%edx
-
-	movb	0x12345678(%ecx),%al
-LBPatch15:
-	movl	C(lightdelta),%ebp
-
-	movl	%eax,(%edi)
-
-	addl	C(sourcetstep),%esi
-	addl	C(surfrowbytes),%edi
-
-	addl	C(lightrightstep),%edx
-	addl	C(lightdeltastep),%ebp
-
-	movl	%edx,C(lightright)
-	jc		Lblockloop8_mip0
-
-//			if (pbasesource >= r_sourcemax)
-//				pbasesource -= stepback;
-
-	cmpl	C(r_sourcemax),%esi
-	jb		LSkip_mip0
-	subl	C(r_stepback),%esi
-LSkip_mip0:
-
-	movl	C(r_lightptr),%ebx
-	decl	sb_v
-
-	jnz		Lv_loop_mip0
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-
-//----------------------------------------------------------------------
-// Surface block drawer for mip level 1
-//----------------------------------------------------------------------
-
-	.align 4
-.globl C(R_DrawSurfaceBlock8_mip1)
-C(R_DrawSurfaceBlock8_mip1):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-//		for (v=0 ; v<numvblocks ; v++)
-//		{
-	movl	C(r_lightptr),%ebx
-	movl	C(r_numvblocks),%eax
-
-	movl	%eax,sb_v
-	movl	C(prowdestbase),%edi
-
-	movl	C(pbasesource),%esi
-
-Lv_loop_mip1:
-
-//			lightleft = lightptr[0];
-//			lightright = lightptr[1];
-//			lightdelta = (lightleft - lightright) & 0xFFFFF;
-	movl	(%ebx),%eax			// lightleft
-	movl	4(%ebx),%edx		// lightright
-
-	movl	%eax,%ebp
-	movl	C(r_lightwidth),%ecx
-
-	movl	%edx,C(lightright)
-	subl	%edx,%ebp
-
-	andl	$0xFFFFF,%ebp
-	leal	(%ebx,%ecx,4),%ebx
-
-//			lightptr += lightwidth;
-	movl	%ebx,C(r_lightptr)
-
-//			lightleftstep = (lightptr[0] - lightleft) >> blockdivshift;
-//			lightrightstep = (lightptr[1] - lightright) >> blockdivshift;
-//			lightdeltastep = ((lightleftstep - lightrightstep) & 0xFFFFF) |
-//					0xF0000000;
-	movl	4(%ebx),%ecx	// lightptr[1]
-	movl	(%ebx),%ebx		// lightptr[0]
-
-	subl	%eax,%ebx
-	subl	%edx,%ecx
-
-	sarl	$3,%ecx
-	orl		$0x70000000,%ebp
-
-	sarl	$3,%ebx
-	movl	%ecx,C(lightrightstep)
-
-	subl	%ecx,%ebx
-	andl	$0xFFFFF,%ebx
-
-	orl		$0xF0000000,%ebx
-	subl	%ecx,%ecx	// high word must be 0 in loop for addressing
-
-	movl	%ebx,C(lightdeltastep)
-	subl	%ebx,%ebx	// high word must be 0 in loop for addressing
-
-Lblockloop8_mip1:
-	movl	%ebp,C(lightdelta)
-	movb	6(%esi),%cl
-
-	sarl	$3,%ebp
-	movb	%dh,%bh
-
-	movb	7(%esi),%bl
-	addl	%ebp,%edx
-
-	movb	%dh,%ch
-	addl	%ebp,%edx
-
-	movb	0x12345678(%ebx),%ah
-LBPatch22:
-	movb	5(%esi),%bl
-
-	movb	0x12345678(%ecx),%al
-LBPatch23:
-	movb	4(%esi),%cl
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	rorl	$16,%eax
-	movb	%dh,%ch
-
-	addl	%ebp,%edx
-	movb	0x12345678(%ebx),%ah
-LBPatch24:
-
-	movb	3(%esi),%bl
-	movb	0x12345678(%ecx),%al
-LBPatch25:
-
-	movb	2(%esi),%cl
-	movl	%eax,4(%edi)
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	movb	%dh,%ch
-	addl	%ebp,%edx
-
-	movb	0x12345678(%ebx),%ah
-LBPatch26:
-	movb	1(%esi),%bl
-
-	movb	0x12345678(%ecx),%al
-LBPatch27:
-	movb	(%esi),%cl
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	rorl	$16,%eax
-	movb	%dh,%ch
-
-	movb	0x12345678(%ebx),%ah
-LBPatch28:
-	movl	C(lightright),%edx
-
-	movb	0x12345678(%ecx),%al
-LBPatch29:
-	movl	C(lightdelta),%ebp
-
-	movl	%eax,(%edi)
-	movl	C(sourcetstep),%eax
-
-	addl	%eax,%esi
-	movl	C(surfrowbytes),%eax
-
-	addl	%eax,%edi
-	movl	C(lightrightstep),%eax
-
-	addl	%eax,%edx
-	movl	C(lightdeltastep),%eax
-
-	addl	%eax,%ebp
-	movl	%edx,C(lightright)
-
-	jc		Lblockloop8_mip1
-
-//			if (pbasesource >= r_sourcemax)
-//				pbasesource -= stepback;
-
-	cmpl	C(r_sourcemax),%esi
-	jb		LSkip_mip1
-	subl	C(r_stepback),%esi
-LSkip_mip1:
-
-	movl	C(r_lightptr),%ebx
-	decl	sb_v
-
-	jnz		Lv_loop_mip1
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-
-//----------------------------------------------------------------------
-// Surface block drawer for mip level 2
-//----------------------------------------------------------------------
-
-	.align 4
-.globl C(R_DrawSurfaceBlock8_mip2)
-C(R_DrawSurfaceBlock8_mip2):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-//		for (v=0 ; v<numvblocks ; v++)
-//		{
-	movl	C(r_lightptr),%ebx
-	movl	C(r_numvblocks),%eax
-
-	movl	%eax,sb_v
-	movl	C(prowdestbase),%edi
-
-	movl	C(pbasesource),%esi
-
-Lv_loop_mip2:
-
-//			lightleft = lightptr[0];
-//			lightright = lightptr[1];
-//			lightdelta = (lightleft - lightright) & 0xFFFFF;
-	movl	(%ebx),%eax			// lightleft
-	movl	4(%ebx),%edx		// lightright
-
-	movl	%eax,%ebp
-	movl	C(r_lightwidth),%ecx
-
-	movl	%edx,C(lightright)
-	subl	%edx,%ebp
-
-	andl	$0xFFFFF,%ebp
-	leal	(%ebx,%ecx,4),%ebx
-
-//			lightptr += lightwidth;
-	movl	%ebx,C(r_lightptr)
-
-//			lightleftstep = (lightptr[0] - lightleft) >> blockdivshift;
-//			lightrightstep = (lightptr[1] - lightright) >> blockdivshift;
-//			lightdeltastep = ((lightleftstep - lightrightstep) & 0xFFFFF) |
-//					0xF0000000;
-	movl	4(%ebx),%ecx	// lightptr[1]
-	movl	(%ebx),%ebx		// lightptr[0]
-
-	subl	%eax,%ebx
-	subl	%edx,%ecx
-
-	sarl	$2,%ecx
-	orl		$0x30000000,%ebp
-
-	sarl	$2,%ebx
-	movl	%ecx,C(lightrightstep)
-
-	subl	%ecx,%ebx
-
-	andl	$0xFFFFF,%ebx
-
-	orl		$0xF0000000,%ebx
-	subl	%ecx,%ecx	// high word must be 0 in loop for addressing
-
-	movl	%ebx,C(lightdeltastep)
-	subl	%ebx,%ebx	// high word must be 0 in loop for addressing
-
-Lblockloop8_mip2:
-	movl	%ebp,C(lightdelta)
-	movb	2(%esi),%cl
-
-	sarl	$2,%ebp
-	movb	%dh,%bh
-
-	movb	3(%esi),%bl
-	addl	%ebp,%edx
-
-	movb	%dh,%ch
-	addl	%ebp,%edx
-
-	movb	0x12345678(%ebx),%ah
-LBPatch18:
-	movb	1(%esi),%bl
-
-	movb	0x12345678(%ecx),%al
-LBPatch19:
-	movb	(%esi),%cl
-
-	movb	%dh,%bh
-	addl	%ebp,%edx
-
-	rorl	$16,%eax
-	movb	%dh,%ch
-
-	movb	0x12345678(%ebx),%ah
-LBPatch20:
-	movl	C(lightright),%edx
-
-	movb	0x12345678(%ecx),%al
-LBPatch21:
-	movl	C(lightdelta),%ebp
-
-	movl	%eax,(%edi)
-	movl	C(sourcetstep),%eax
-
-	addl	%eax,%esi
-	movl	C(surfrowbytes),%eax
-
-	addl	%eax,%edi
-	movl	C(lightrightstep),%eax
-
-	addl	%eax,%edx
-	movl	C(lightdeltastep),%eax
-
-	addl	%eax,%ebp
-	movl	%edx,C(lightright)
-
-	jc		Lblockloop8_mip2
-
-//			if (pbasesource >= r_sourcemax)
-//				pbasesource -= stepback;
-
-	cmpl	C(r_sourcemax),%esi
-	jb		LSkip_mip2
-	subl	C(r_stepback),%esi
-LSkip_mip2:
-
-	movl	C(r_lightptr),%ebx
-	decl	sb_v
-
-	jnz		Lv_loop_mip2
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-
-//----------------------------------------------------------------------
-// Surface block drawer for mip level 3
-//----------------------------------------------------------------------
-
-	.align 4
-.globl C(R_DrawSurfaceBlock8_mip3)
-C(R_DrawSurfaceBlock8_mip3):
-	pushl	%ebp				// preserve caller's stack frame
-	pushl	%edi
-	pushl	%esi				// preserve register variables
-	pushl	%ebx
-
-//		for (v=0 ; v<numvblocks ; v++)
-//		{
-	movl	C(r_lightptr),%ebx
-	movl	C(r_numvblocks),%eax
-
-	movl	%eax,sb_v
-	movl	C(prowdestbase),%edi
-
-	movl	C(pbasesource),%esi
-
-Lv_loop_mip3:
-
-//			lightleft = lightptr[0];
-//			lightright = lightptr[1];
-//			lightdelta = (lightleft - lightright) & 0xFFFFF;
-	movl	(%ebx),%eax			// lightleft
-	movl	4(%ebx),%edx		// lightright
-
-	movl	%eax,%ebp
-	movl	C(r_lightwidth),%ecx
-
-	movl	%edx,C(lightright)
-	subl	%edx,%ebp
-
-	andl	$0xFFFFF,%ebp
-	leal	(%ebx,%ecx,4),%ebx
-
-	movl	%ebp,C(lightdelta)
-//			lightptr += lightwidth;
-	movl	%ebx,C(r_lightptr)
-
-//			lightleftstep = (lightptr[0] - lightleft) >> blockdivshift;
-//			lightrightstep = (lightptr[1] - lightright) >> blockdivshift;
-//			lightdeltastep = ((lightleftstep - lightrightstep) & 0xFFFFF) |
-//					0xF0000000;
-	movl	4(%ebx),%ecx	// lightptr[1]
-	movl	(%ebx),%ebx		// lightptr[0]
-
-	subl	%eax,%ebx
-	subl	%edx,%ecx
-
-	sarl	$1,%ecx
-
-	sarl	$1,%ebx
-	movl	%ecx,C(lightrightstep)
-
-	subl	%ecx,%ebx
-	andl	$0xFFFFF,%ebx
-
-	sarl	$1,%ebp
-	orl		$0xF0000000,%ebx
-
-	movl	%ebx,C(lightdeltastep)
-	subl	%ebx,%ebx	// high word must be 0 in loop for addressing
-
-	movb	1(%esi),%bl
-	subl	%ecx,%ecx	// high word must be 0 in loop for addressing
-
-	movb	%dh,%bh
-	movb	(%esi),%cl
-
-	addl	%ebp,%edx
-	movb	%dh,%ch
-
-	movb	0x12345678(%ebx),%al
-LBPatch16:
-	movl	C(lightright),%edx
-
-	movb	%al,1(%edi)
-	movb	0x12345678(%ecx),%al
-LBPatch17:
-
-	movb	%al,(%edi)
-	movl	C(sourcetstep),%eax
-
-	addl	%eax,%esi
-	movl	C(surfrowbytes),%eax
-
-	addl	%eax,%edi
-	movl	C(lightdeltastep),%eax
-
-	movl	C(lightdelta),%ebp
-	movb	(%esi),%cl
-
-	addl	%eax,%ebp
-	movl	C(lightrightstep),%eax
-
-	sarl	$1,%ebp
-	addl	%eax,%edx
-
-	movb	%dh,%bh
-	movb	1(%esi),%bl
-
-	addl	%ebp,%edx
-	movb	%dh,%ch
-
-	movb	0x12345678(%ebx),%al
-LBPatch30:
-	movl	C(sourcetstep),%edx
-
-	movb	%al,1(%edi)
-	movb	0x12345678(%ecx),%al
-LBPatch31:
-
-	movb	%al,(%edi)
-	movl	C(surfrowbytes),%ebp
-
-	addl	%edx,%esi
-	addl	%ebp,%edi
-
-//			if (pbasesource >= r_sourcemax)
-//				pbasesource -= stepback;
-
-	cmpl	C(r_sourcemax),%esi
-	jb		LSkip_mip3
-	subl	C(r_stepback),%esi
-LSkip_mip3:
-
-	movl	C(r_lightptr),%ebx
-	decl	sb_v
-
-	jnz		Lv_loop_mip3
-
-	popl	%ebx				// restore register variables
-	popl	%esi
-	popl	%edi
-	popl	%ebp				// restore the caller's stack frame
-	ret
-
-
-.globl C(R_Surf8End)
-C(R_Surf8End):
-
-//----------------------------------------------------------------------
-// Code patching routines
-//----------------------------------------------------------------------
-	.data
-
-	.align 4
-LPatchTable8:
-	.long	LBPatch0-4
-	.long	LBPatch1-4
-	.long	LBPatch2-4
-	.long	LBPatch3-4
-	.long	LBPatch4-4
-	.long	LBPatch5-4
-	.long	LBPatch6-4
-	.long	LBPatch7-4
-	.long	LBPatch8-4
-	.long	LBPatch9-4
-	.long	LBPatch10-4
-	.long	LBPatch11-4
-	.long	LBPatch12-4
-	.long	LBPatch13-4
-	.long	LBPatch14-4
-	.long	LBPatch15-4
-	.long	LBPatch16-4
-	.long	LBPatch17-4
-	.long	LBPatch18-4
-	.long	LBPatch19-4
-	.long	LBPatch20-4
-	.long	LBPatch21-4
-	.long	LBPatch22-4
-	.long	LBPatch23-4
-	.long	LBPatch24-4
-	.long	LBPatch25-4
-	.long	LBPatch26-4
-	.long	LBPatch27-4
-	.long	LBPatch28-4
-	.long	LBPatch29-4
-	.long	LBPatch30-4
-	.long	LBPatch31-4
-
-	.text
-
-	.align 4
-.globl C(R_Surf8Patch)
-C(R_Surf8Patch):
-	pushl	%ebx
-
-	movl	C(colormap),%eax
-	movl	$LPatchTable8,%ebx
-	movl	$32,%ecx
-LPatchLoop8:
-	movl	(%ebx),%edx
-	addl	$4,%ebx
-	movl	%eax,(%edx)
-	decl	%ecx
-	jnz		LPatchLoop8
-
-	popl	%ebx
-
-	ret
-
-#endif	// id386
--- a/u/sys_dos.c
+++ /dev/null
@@ -1,953 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <dir.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <dpmi.h>
-#include <sys/nearptr.h>
-#include <conio.h>
-
-#include "quakedef.h"
-#include "dosisms.h"
-
-#define MINIMUM_WIN_MEMORY			0x800000
-#define MINIMUM_WIN_MEMORY_LEVELPAK	(MINIMUM_WIN_MEMORY + 0x100000)
-
-int			end_of_memory;
-qboolean	lockmem, lockunlockmem, unlockmem;
-static int	win95;
-
-#define STDOUT	1
-
-#define	KEYBUF_SIZE	256
-static unsigned char	keybuf[KEYBUF_SIZE];
-static int				keybuf_head=0;
-static int				keybuf_tail=0;
-
-static quakeparms_t	quakeparms;
-int					sys_checksum;
-static double		curtime = 0.0;
-static double		lastcurtime = 0.0;
-static double		oldtime = 0.0;
-
-static qboolean		isDedicated;
-
-static int			minmem;
-
-float				fptest_temp;
-
-extern char	start_of_memory __asm__("start");
-
-//=============================================================================
-
-// this is totally dependent on cwsdpmi putting the stack right after tge
-// global data
-
-// This does evil things in a Win95 DOS box!!!
-#if 0
-extern byte end;
-#define	CHECKBYTE	0xed
-void Sys_InitStackCheck (void)
-{
-	int		i;
-	
-	for (i=0 ; i<128*1024 ; i++)
-		(&end)[i] = CHECKBYTE;
-}
-
-void Sys_StackCheck (void)
-{
-	int		i;
-	
-	for (i=0 ; i<128*1024 ; i++)
-		if ( (&end)[i] != CHECKBYTE )
-			break;
-	
-	Con_Printf ("%i undisturbed stack bytes\n", i);
-	if (end != CHECKBYTE)
-		Sys_Error ("System stack overflow!");
-}
-#endif
-
-//=============================================================================
-
-byte        scantokey[128] = 
-					{ 
-//  0           1       2       3       4       5       6       7 
-//  8           9       A       B       C       D       E       F 
-	0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6', 
-	'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9, // 0 
-	'q',    'w',    'e',    'r',    't',    'y',    'u',    'i', 
-	'o',    'p',    '[',    ']',    13 ,    K_CTRL,'a',  's',      // 1 
-	'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';', 
-	'\'' ,    '`',    K_SHIFT,'\\',  'z',    'x',    'c',    'v',      // 2 
-	'b',    'n',    'm',    ',',    '.',    '/',    K_SHIFT,'*', 
-	K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10,0  ,    0  , K_HOME, 
-	K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4 
-	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
-	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         // 7 
-					}; 
-
-byte        shiftscantokey[128] = 
-					{ 
-//  0           1       2       3       4       5       6       7 
-//  8           9       A       B       C       D       E       F 
-	0  ,    27,     '!',    '@',    '#',    '$',    '%',    '^', 
-	'&',    '*',    '(',    ')',    '_',    '+',    K_BACKSPACE, 9, // 0 
-	'Q',    'W',    'E',    'R',    'T',    'Y',    'U',    'I', 
-	'O',    'P',    '{',    '}',    13 ,    K_CTRL,'A',  'S',      // 1 
-	'D',    'F',    'G',    'H',    'J',    'K',    'L',    ':', 
-	'"' ,    '~',    K_SHIFT,'|',  'Z',    'X',    'C',    'V',      // 2 
-	'B',    'N',    'M',    '<',    '>',    '?',    K_SHIFT,'*', 
-	K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10,0  ,    0  , K_HOME, 
-	K_UPARROW,K_PGUP,'_',K_LEFTARROW,'%',K_RIGHTARROW,'+',K_END, //4 
-	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5 
-	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         // 7 
-					}; 
-
-void TrapKey(void)
-{
-//	static int ctrl=0;
-	keybuf[keybuf_head] = dos_inportb(0x60);
-	dos_outportb(0x20, 0x20);
-	/*
-	if (scantokey[keybuf[keybuf_head]&0x7f] == K_CTRL)
-		ctrl=keybuf[keybuf_head]&0x80;
-	if (ctrl && scantokey[keybuf[keybuf_head]&0x7f] == 'c')
-		Sys_Error("ctrl-c hit\n");
-	*/
-	keybuf_head = (keybuf_head + 1) & (KEYBUF_SIZE-1);
-}
-
-#define SC_UPARROW              0x48
-#define SC_DOWNARROW    0x50
-#define SC_LEFTARROW            0x4b
-#define SC_RIGHTARROW   0x4d
-#define SC_LEFTSHIFT   0x2a
-#define SC_RIGHTSHIFT   0x36
-#define SC_RIGHTARROW   0x4d
-
-void MaskExceptions (void);
-void Sys_InitFloatTime (void);
-void Sys_PushFPCW_SetHigh (void);
-void Sys_PopFPCW (void);
-
-#define LEAVE_FOR_CACHE (512*1024)		//FIXME: tune
-#define LOCKED_FOR_MALLOC (128*1024)	//FIXME: tune
-
-
-void Sys_DetectWin95 (void)
-{
-	__dpmi_regs				r;
-
-	r.x.ax = 0x160a;		/* Get Windows Version */
-	__dpmi_int(0x2f, &r);
-
-	if(r.x.ax || r.h.bh < 4)	/* Not windows or earlier than Win95 */
-	{
-		win95 = 0;
-		lockmem = true;
-		lockunlockmem = false;
-		unlockmem = true;
-	}
-	else
-	{
-		win95 = 1;
-		lockunlockmem = COM_CheckParm ("-winlockunlock");
-
-		if (lockunlockmem)
-			lockmem = true;
-		else
-			lockmem = COM_CheckParm ("-winlock");
-
-		unlockmem = lockmem && !lockunlockmem;
-	}
-}
-
-
-void *dos_getmaxlockedmem(int *size)
-{
-	__dpmi_free_mem_info	meminfo;
-	__dpmi_meminfo			info;
-	int						working_size;
-	void					*working_memory;
-	int						last_locked;
-	int						extra, 	i, j, allocsize;
-	static char				*msg = "Locking data...";
-	int						m, n;
-	byte					*x;
- 
-// first lock all the current executing image so the locked count will
-// be accurate.  It doesn't hurt to lock the memory multiple times
-	last_locked = __djgpp_selector_limit + 1;
-	info.size = last_locked - 4096;
-	info.address = __djgpp_base_address + 4096;
-
-	if (lockmem)
-	{
-		if(__dpmi_lock_linear_region(&info))
-		{
-			Sys_Error ("Lock of current memory at 0x%lx for %ldKb failed!\n",
-						info.address, info.size/1024);
-		}
-	}
-
-	__dpmi_get_free_memory_information(&meminfo);
-
-	if (!win95)		/* Not windows or earlier than Win95 */
-	{
-		working_size = meminfo.maximum_locked_page_allocation_in_pages * 4096;
-	}
-	else
-	{
-		working_size = meminfo.largest_available_free_block_in_bytes -
-				LEAVE_FOR_CACHE;
-	}
-
-	working_size &= ~0xffff;		/* Round down to 64K */
-	working_size += 0x10000;
-
-	do
-	{
-		working_size -= 0x10000;		/* Decrease 64K and try again */
-		working_memory = sbrk(working_size);
-	} while (working_memory == (void *)-1);
-
-	extra = 0xfffc - ((unsigned)sbrk(0) & 0xffff);
-
-	if (extra > 0)
-	{
-		sbrk(extra);
-		working_size += extra;
-	}
-
-// now grab the memory
-	info.address = last_locked + __djgpp_base_address;
-
-	if (!win95)
-	{
-	    info.size = __djgpp_selector_limit + 1 - last_locked;
-
-		while (info.size > 0 && __dpmi_lock_linear_region(&info))
-		{
-			info.size -= 0x1000;
-			working_size -= 0x1000;
-			sbrk(-0x1000);
-		}
-	}
-	else
-	{			/* Win95 section */
-		j = COM_CheckParm("-winmem");
-
-		if (standard_quake)
-			minmem = MINIMUM_WIN_MEMORY;
-		else
-			minmem = MINIMUM_WIN_MEMORY_LEVELPAK;
-
-		if (j)
-		{
-			allocsize = ((int)(Q_atoi(com_argv[j+1]))) * 0x100000 +
-					LOCKED_FOR_MALLOC;
-
-			if (allocsize < (minmem + LOCKED_FOR_MALLOC))
-				allocsize = minmem + LOCKED_FOR_MALLOC;
-		}
-		else
-		{
-			allocsize = minmem + LOCKED_FOR_MALLOC;
-		}
-
-		if (!lockmem)
-		{
-		// we won't lock, just sbrk the memory
-			info.size = allocsize;
-			goto UpdateSbrk;
-		}
-
-		// lock the memory down
-		write (STDOUT, msg, strlen (msg));
-
-		for (j=allocsize ; j>(minmem + LOCKED_FOR_MALLOC) ;
-			 j -= 0x100000)
-		{
-			info.size = j;
-	
-			if (!__dpmi_lock_linear_region(&info))
-				goto Locked;
-	
-			write (STDOUT, ".", 1);
-		}
-
-	// finally, try with the absolute minimum amount
-		for (i=0 ; i<10 ; i++)
-		{
-			info.size = minmem + LOCKED_FOR_MALLOC;
-
-			if (!__dpmi_lock_linear_region(&info))
-				goto Locked;
-		}
-
-		Sys_Error ("Can't lock memory; %d Mb lockable RAM required. "
-				   "Try shrinking smartdrv.", info.size / 0x100000);
-
-Locked:
-
-UpdateSbrk:
-
-		info.address += info.size;
-		info.address -= __djgpp_base_address + 4; // ending point, malloc align
-		working_size = info.address - (int)working_memory;
-		sbrk(info.address-(int)sbrk(0));		// negative adjustment
-	}
-
-
-	if (lockunlockmem)
-	{
-		__dpmi_unlock_linear_region (&info);
-		printf ("Locked and unlocked %d Mb data\n", working_size / 0x100000);
-	}
-	else if (lockmem)
-	{
-		printf ("Locked %d Mb data\n", working_size / 0x100000);
-	}
-	else
-	{
-		printf ("Allocated %d Mb data\n", working_size / 0x100000);
-	}
-
-// touch all the memory to make sure it's there. The 16-page skip is to
-// keep Win 95 from thinking we're trying to page ourselves in (we are
-// doing that, of course, but there's no reason we shouldn't)
-	x = (byte *)working_memory;
-
-	for (n=0 ; n<4 ; n++)
-	{
-		for (m=0 ; m<(working_size - 16 * 0x1000) ; m += 4)
-		{
-			sys_checksum += *(int *)&x[m];
-			sys_checksum += *(int *)&x[m + 16 * 0x1000];
-		}
-	}
-
-// give some of what we locked back for malloc before returning.  Done
-// by cheating and passing a negative value to sbrk
-	working_size -= LOCKED_FOR_MALLOC;
-	sbrk( -(LOCKED_FOR_MALLOC));
-	*size = working_size;
-	return working_memory;
-}
-
-
-/*
-============
-Sys_FileTime
-
-returns -1 if not present
-============
-*/
-int	Sys_FileTime (char *path)
-{
-	struct	stat	buf;
-	
-	if (stat (path,&buf) == -1)
-		return -1;
-	
-	return buf.st_mtime;
-}
-
-void Sys_mkdir (char *path)
-{
-	mkdir (path, 0777);
-}
-
-
-void Sys_Sleep(void)
-{
-}
-
-
-char *Sys_ConsoleInput(void)
-{
-	static char	text[256];
-	static int	len = 0;
-	char		ch;
-
-	if (!isDedicated)
-		return NULL;
-
-	if (! kbhit())
-		return NULL;
-
-	ch = getche();
-
-	switch (ch)
-	{
-		case '\r':
-			putch('\n');
-			if (len)
-			{
-				text[len] = 0;
-				len = 0;
-				return text;
-			}
-			break;
-
-		case '\b':
-			putch(' ');
-			if (len)
-			{
-				len--;
-				putch('\b');
-			}
-			break;
-
-		default:
-			text[len] = ch;
-			len = (len + 1) & 0xff;
-			break;
-	}
-
-	return NULL;
-}
-
-void Sys_Init(void)
-{
-
-	MaskExceptions ();
-
-	Sys_SetFPCW ();
-
-    dos_outportb(0x43, 0x34); // set system timer to mode 2
-    dos_outportb(0x40, 0);    // for the Sys_FloatTime() function
-    dos_outportb(0x40, 0);
-
-	Sys_InitFloatTime ();
-
-	_go32_interrupt_stack_size = 4 * 1024;;
-	_go32_rmcb_stack_size = 4 * 1024;
-}
-
-void Sys_Shutdown(void)
-{
-	if (!isDedicated)
-		dos_restoreintr(9);
-
-	if (unlockmem)
-	{
-		dos_unlockmem (&start_of_memory,
-					   end_of_memory - (int)&start_of_memory);
-		dos_unlockmem (quakeparms.membase, quakeparms.memsize);
-	}
-}
-
-
-#define SC_RSHIFT       0x36 
-#define SC_LSHIFT       0x2a 
-void Sys_SendKeyEvents (void)
-{
-	int k, next;
-	int outkey;
-
-// get key events
-
-	while (keybuf_head != keybuf_tail)
-	{
-
-		k = keybuf[keybuf_tail++];
-		keybuf_tail &= (KEYBUF_SIZE-1);
-
-		if (k==0xe0)
-			continue;               // special / pause keys
-		next = keybuf[(keybuf_tail-2)&(KEYBUF_SIZE-1)];
-		if (next == 0xe1)
-			continue;                               // pause key bullshit
-		if (k==0xc5 && next == 0x9d) 
-		{ 
-			Key_Event (K_PAUSE, true);
-			continue; 
-		} 
-
-		// extended keyboard shift key bullshit 
-		if ( (k&0x7f)==SC_LSHIFT || (k&0x7f)==SC_RSHIFT ) 
-		{ 
-			if ( keybuf[(keybuf_tail-2)&(KEYBUF_SIZE-1)]==0xe0 ) 
-				continue; 
-			k &= 0x80; 
-			k |= SC_RSHIFT; 
-		} 
-
-		if (k==0xc5 && keybuf[(keybuf_tail-2)&(KEYBUF_SIZE-1)] == 0x9d)
-			continue; // more pause bullshit
-
-		outkey = scantokey[k & 0x7f];
-
-		if (k & 0x80)
-			Key_Event (outkey, false);
-		else
-			Key_Event (outkey, true);
-
-	}
-
-}
-
-
-// =======================================================================
-// General routines
-// =======================================================================
-
-/*
-================
-Sys_Printf
-================
-*/
-
-void Sys_Printf (char *fmt, ...)
-{
-	va_list		argptr;
-	char		text[1024];
-	
-	va_start (argptr,fmt);
-	vsprintf (text,fmt,argptr);
-	va_end (argptr);
-
-	if (cls.state == ca_dedicated)
-		fprintf(stderr, "%s", text);
-}
-
-void Sys_AtExit (void)
-{
-
-// shutdown only once (so Sys_Error can call this function to shutdown, then
-// print the error message, then call exit without exit calling this function
-// again)
-	Sys_Shutdown();
-}
-
-
-void Sys_Quit (void)
-{
-	byte	screen[80*25*2];
-	byte	*d;
-	char			ver[6];
-	int			i;
-	
-
-// load the sell screen before shuting everything down
-	if (registered.value)
-		d = COM_LoadHunkFile ("end2.bin"); 
-	else
-		d = COM_LoadHunkFile ("end1.bin"); 
-	if (d)
-		memcpy (screen, d, sizeof(screen));
-
-// write the version number directly to the end screen
-	sprintf (ver, " v%4.2f", VERSION);
-	for (i=0 ; i<6 ; i++)
-		screen[0*80*2 + 72*2 + i*2] = ver[i];
-
-	Host_Shutdown();
-
-// do the text mode sell screen
-	if (d)
-	{
-		memcpy ((void *)real2ptr(0xb8000), screen,80*25*2); 
-	
-	// set text pos
-		regs.x.ax = 0x0200; 
-		regs.h.bh = 0; 
-		regs.h.dl = 0; 
-		regs.h.dh = 22;
-		dos_int86 (0x10); 
-	}
-	else
-		printf ("couldn't load endscreen.\n");
-
-	exit(0);
-}
-
-void Sys_Error (char *error, ...)
-{ 
-    va_list     argptr;
-    char        string[1024];
-    
-    va_start (argptr,error);
-    vsprintf (string,error,argptr);
-    va_end (argptr);
-
-	Host_Shutdown();
-	fprintf(stderr, "Error: %s\n", string);
-// Sys_AtExit is called by exit to shutdown the system
-	exit(0);
-} 
-
-
-int Sys_FileOpenRead (char *path, int *handle)
-{
-	int	h;
-	struct stat	fileinfo;
-    
-	h = open (path, O_RDONLY|O_BINARY, 0666);
-	*handle = h;
-	if (h == -1)
-		return -1;
-	
-	if (fstat (h,&fileinfo) == -1)
-		Sys_Error ("Error fstating %s", path);
-
-	return fileinfo.st_size;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	int     handle;
-
-	umask (0);
-	
-	handle = open(path,O_RDWR | O_BINARY | O_CREAT | O_TRUNC
-	, 0666);
-
-	if (handle == -1)
-		Sys_Error ("Error opening %s: %s", path,strerror(errno));
-
-	return handle;
-}
-
-void Sys_FileClose (int handle)
-{
-	close (handle);
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-	lseek (handle, position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-   return read (handle, dest, count);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-	return write (handle, data, count);
-}
-
-/*
-================
-Sys_MakeCodeWriteable
-================
-*/
-void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
-{
-	// it's always writeable
-}
-
-
-/*
-================
-Sys_FloatTime
-================
-*/
-double Sys_FloatTime (void)
-{
-    int				r;
-    unsigned		t, tick;
-	double			ft, time;
-	static int		sametimecount;
-
-	Sys_PushFPCW_SetHigh ();
-
-//{static float t = 0; t=t+0.05; return t;}	// DEBUG
-
-    t = *(unsigned short*)real2ptr(0x46c) * 65536;
-
-    dos_outportb(0x43, 0); // latch time
-    r = dos_inportb(0x40);
-    r |= dos_inportb(0x40) << 8;
-    r = (r-1) & 0xffff;
-
-    tick = *(unsigned short*)real2ptr(0x46c) * 65536;
-    if ((tick != t) && (r & 0x8000))
-		t = tick;
-
-	ft = (double) (t+(65536-r)) / 1193200.0;
-	time = ft - oldtime;
-	oldtime = ft;
-
-	if (time < 0)
-	{
-		if (time > -3000.0)
-			time = 0.0;
-		else
-			time += 3600.0;
-	}
-
-	curtime += time;
-
-	if (curtime == lastcurtime)
-	{
-		sametimecount++;
-
-		if (sametimecount > 100000)
-		{
-			curtime += 1.0;
-			sametimecount = 0;
-		}
-	}
-	else
-	{
-		sametimecount = 0;
-	}
-
-	lastcurtime = curtime;
-
-	Sys_PopFPCW ();
-
-    return curtime;
-}
-
-
-/*
-================
-Sys_InitFloatTime
-================
-*/
-void Sys_InitFloatTime (void)
-{
-	int		j;
-
-	Sys_FloatTime ();
-
-	oldtime = curtime;
-
-	j = COM_CheckParm("-starttime");
-
-	if (j)
-	{
-		curtime = (double) (Q_atof(com_argv[j+1]));
-	}
-	else
-	{
-		curtime = 0.0;
-	}
-	lastcurtime = curtime;
-}
-
-
-/*
-================
-Sys_GetMemory
-================
-*/
-void Sys_GetMemory(void)
-{
-	int		j, tsize;
-
-	j = COM_CheckParm("-mem");
-	if (j)
-	{
-		quakeparms.memsize = (int) (Q_atof(com_argv[j+1]) * 1024 * 1024);
-		quakeparms.membase = malloc (quakeparms.memsize);
-	}
-	else
-	{
-		quakeparms.membase = dos_getmaxlockedmem (&quakeparms.memsize);
-	}
-
-	fprintf(stderr, "malloc'd: %d\n", quakeparms.memsize);
-
-	if (COM_CheckParm ("-heapsize"))
-	{
-		tsize = Q_atoi (com_argv[COM_CheckParm("-heapsize") + 1]) * 1024;
-
-		if (tsize < quakeparms.memsize)
-			quakeparms.memsize = tsize;
-	}
-}
-
-
-/*
-================
-Sys_PageInProgram
-
-walks the text, data, and bss to make sure it's all paged in so that the
-actual physical memory detected by Sys_GetMemory is correct.
-================
-*/
-void Sys_PageInProgram(void)
-{
-	int		i, j;
-
-	end_of_memory = (int)sbrk(0);
-
-	if (lockmem)
-	{
-		if (dos_lockmem ((void *)&start_of_memory,
-						 end_of_memory - (int)&start_of_memory))
-			Sys_Error ("Couldn't lock text and data");
-	}
-
-	if (lockunlockmem)
-	{
-		dos_unlockmem((void *)&start_of_memory,
-						 end_of_memory - (int)&start_of_memory);
-		printf ("Locked and unlocked %d Mb image\n",
-				(end_of_memory - (int)&start_of_memory) / 0x100000);
-	}
-	else if (lockmem)
-	{
-		printf ("Locked %d Mb image\n",
-				(end_of_memory - (int)&start_of_memory) / 0x100000);
-	}
-	else
-	{
-		printf ("Loaded %d Mb image\n",
-				(end_of_memory - (int)&start_of_memory) / 0x100000);
-	}
-
-// touch the entire image, doing the 16-page skip so Win95 doesn't think we're
-// trying to page ourselves in
-	for (j=0 ; j<4 ; j++)
-	{
-		for(i=(int)&start_of_memory ; i<(end_of_memory - 16 * 0x1000) ; i += 4)
-		{
-			sys_checksum += *(int *)i;
-			sys_checksum += *(int *)(i + 16 * 0x1000);
-		}
-	}
-}
-
-
-/*
-================
-Sys_NoFPUExceptionHandler
-================
-*/
-void Sys_NoFPUExceptionHandler(int whatever)
-{
-	printf ("\nError: Quake requires a floating-point processor\n");
-	exit (0);
-}
-
-
-/*
-================
-Sys_DefaultExceptionHandler
-================
-*/
-void Sys_DefaultExceptionHandler(int whatever)
-{
-}
-
-
-/*
-================
-main
-================
-*/
-int main (int c, char **v)
-{
-	double			time, oldtime, newtime;
-	extern void (*dos_error_func)(char *, ...);
-	static	char	cwd[1024];
-
-	printf ("Quake v%4.2f\n", VERSION);
-	
-// make sure there's an FPU
-	signal(SIGNOFP, Sys_NoFPUExceptionHandler);
-	signal(SIGABRT, Sys_DefaultExceptionHandler);
-	signal(SIGALRM, Sys_DefaultExceptionHandler);
-	signal(SIGKILL, Sys_DefaultExceptionHandler);
-	signal(SIGQUIT, Sys_DefaultExceptionHandler);
-	signal(SIGINT, Sys_DefaultExceptionHandler);
-
-	if (fptest_temp >= 0.0)
-		fptest_temp += 0.1;
-
-	COM_InitArgv (c, v);
-
-	quakeparms.argc = com_argc;
-	quakeparms.argv = com_argv;
-
-	dos_error_func = Sys_Error;
-
-	Sys_DetectWin95 ();
-	Sys_PageInProgram ();
-	Sys_GetMemory ();
-
-	atexit (Sys_AtExit);	// in case we crash
-
-	getwd (cwd);
-	if (cwd[Q_strlen(cwd)-1] == '/') cwd[Q_strlen(cwd)-1] = 0;
-	quakeparms.basedir = cwd; //"f:/quake";
-
-	isDedicated = (COM_CheckParm ("-dedicated") != 0);
-
-	Sys_Init ();
-
-	if (!isDedicated)
-		dos_registerintr(9, TrapKey);
-
-//Sys_InitStackCheck ();
-	
-	Host_Init(&quakeparms);
-
-//Sys_StackCheck ();
-
-//Con_Printf ("Top of stack: 0x%x\n", &time);
-	oldtime = Sys_FloatTime ();
-	while (1)
-	{
-		newtime = Sys_FloatTime ();
-		time = newtime - oldtime;
-
-		if (cls.state == ca_dedicated && (time<sys_ticrate.value))
-			continue;
-
-		Host_Frame (time);
-
-//Sys_StackCheck ();
-
-		oldtime = newtime;
-	}
-}
-
-
--- a/u/sys_dosa.s
+++ /dev/null
@@ -1,95 +1,0 @@
-//
-// sys_dosa.s
-// x86 assembly-language DOS-dependent routines.
-
-#include "asm_i386.h"
-#include "quakeasm.h"
-
-
-	.data
-
-	.align	4
-fpenv:
-	.long	0, 0, 0, 0, 0, 0, 0, 0
-
-	.text
-
-.globl C(MaskExceptions)
-C(MaskExceptions):
-	fnstenv	fpenv
-	orl		$0x3F,fpenv
-	fldenv	fpenv
-
-	ret
-
-/*
-.globl C(unmaskexceptions)
-C(unmaskexceptions):
-	fnstenv	fpenv
-	andl		$0xFFFFFFE0,fpenv
-	fldenv	fpenv
-
-	ret
-*/
-
-	.data
-
-	.align	4
-.globl	ceil_cw, single_cw, full_cw, cw, pushed_cw
-ceil_cw:	.long	0
-single_cw:	.long	0
-full_cw:	.long	0
-cw:			.long	0
-pushed_cw:	.long	0
-
-	.text
-
-.globl C(Sys_LowFPPrecision)
-C(Sys_LowFPPrecision):
-	fldcw	single_cw
-
-	ret
-
-.globl C(Sys_HighFPPrecision)
-C(Sys_HighFPPrecision):
-	fldcw	full_cw
-
-	ret
-
-.globl C(Sys_PushFPCW_SetHigh)
-C(Sys_PushFPCW_SetHigh):
-	fnstcw	pushed_cw
-	fldcw	full_cw
-
-	ret
-
-.globl C(Sys_PopFPCW)
-C(Sys_PopFPCW):
-	fldcw	pushed_cw
-
-	ret
-
-.globl C(Sys_SetFPCW)
-C(Sys_SetFPCW):
-	fnstcw	cw
-	movl	cw,%eax
-#ifdef	id386
-	andb	$0xF0,%ah
-	orb		$0x03,%ah	// round mode, 64-bit precision
-#endif
-	movl	%eax,full_cw
-
-#ifdef	id386
-	andb	$0xF0,%ah
-	orb		$0x0C,%ah	// chop mode, single precision
-#endif
-	movl	%eax,single_cw
-
-#ifdef	id386
-	andb	$0xF0,%ah
-	orb		$0x08,%ah	// ceil mode, single precision
-#endif
-	movl	%eax,ceil_cw
-
-	ret
-
--- a/u/sys_null.c
+++ /dev/null
@@ -1,232 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// sys_null.h -- null system driver to aid porting efforts
-
-#include "quakedef.h"
-#include "errno.h"
-
-/*
-===============================================================================
-
-FILE IO
-
-===============================================================================
-*/
-
-#define MAX_HANDLES             10
-FILE    *sys_handles[MAX_HANDLES];
-
-int             findhandle (void)
-{
-	int             i;
-	
-	for (i=1 ; i<MAX_HANDLES ; i++)
-		if (!sys_handles[i])
-			return i;
-	Sys_Error ("out of handles");
-	return -1;
-}
-
-/*
-================
-filelength
-================
-*/
-int filelength (FILE *f)
-{
-	int             pos;
-	int             end;
-
-	pos = ftell (f);
-	fseek (f, 0, SEEK_END);
-	end = ftell (f);
-	fseek (f, pos, SEEK_SET);
-
-	return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-	FILE    *f;
-	int             i;
-	
-	i = findhandle ();
-
-	f = fopen(path, "rb");
-	if (!f)
-	{
-		*hndl = -1;
-		return -1;
-	}
-	sys_handles[i] = f;
-	*hndl = i;
-	
-	return filelength(f);
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	FILE    *f;
-	int             i;
-	
-	i = findhandle ();
-
-	f = fopen(path, "wb");
-	if (!f)
-		Sys_Error ("Error opening %s: %s", path,strerror(errno));
-	sys_handles[i] = f;
-	
-	return i;
-}
-
-void Sys_FileClose (int handle)
-{
-	fclose (sys_handles[handle]);
-	sys_handles[handle] = NULL;
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-	fseek (sys_handles[handle], position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-	return fread (dest, 1, count, sys_handles[handle]);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-	return fwrite (data, 1, count, sys_handles[handle]);
-}
-
-int     Sys_FileTime (char *path)
-{
-	FILE    *f;
-	
-	f = fopen(path, "rb");
-	if (f)
-	{
-		fclose(f);
-		return 1;
-	}
-	
-	return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-}
-
-
-/*
-===============================================================================
-
-SYSTEM IO
-
-===============================================================================
-*/
-
-void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
-{
-}
-
-
-void Sys_Error (char *error, ...)
-{
-	va_list         argptr;
-
-	printf ("Sys_Error: ");   
-	va_start (argptr,error);
-	vprintf (error,argptr);
-	va_end (argptr);
-	printf ("\n");
-
-	exit (1);
-}
-
-void Sys_Printf (char *fmt, ...)
-{
-	va_list         argptr;
-	
-	va_start (argptr,fmt);
-	vprintf (fmt,argptr);
-	va_end (argptr);
-}
-
-void Sys_Quit (void)
-{
-	exit (0);
-}
-
-double Sys_FloatTime (void)
-{
-	static double t;
-	
-	t += 0.1;
-	
-	return t;
-}
-
-char *Sys_ConsoleInput (void)
-{
-	return NULL;
-}
-
-void Sys_Sleep (void)
-{
-}
-
-void Sys_SendKeyEvents (void)
-{
-}
-
-void Sys_HighFPPrecision (void)
-{
-}
-
-void Sys_LowFPPrecision (void)
-{
-}
-
-//=============================================================================
-
-void main (int argc, char **argv)
-{
-	static quakeparms_t    parms;
-
-	parms.memsize = 8*1024*1024;
-	parms.membase = malloc (parms.memsize);
-	parms.basedir = ".";
-
-	COM_InitArgv (argc, argv);
-
-	parms.argc = com_argc;
-	parms.argv = com_argv;
-
-	printf ("Host_Init\n");
-	Host_Init (&parms);
-	while (1)
-	{
-		Host_Frame (0.1);
-	}
-}
-
-
--- a/u/sys_sun.c
+++ /dev/null
@@ -1,352 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// sys_sun.h -- Sun system driver
-
-#include "quakedef.h"
-#include "errno.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <stdio.h>
-
-qboolean			isDedicated;
-
-/*
-===============================================================================
-
-FILE IO
-
-===============================================================================
-*/
-
-#define MAX_HANDLES             10
-
-typedef struct 
-{
-    FILE	    *hFile;
-    char	    *pMap;
-    int		    nLen;
-    int		    nPos;
-} MEMFILE;
-
-MEMFILE		    sys_handles[MAX_HANDLES];
-
-int findhandle (void)
-{
-    int             i;
-    
-    for (i=1 ; i<MAX_HANDLES ; i++)
-	    if (!sys_handles[i].hFile)
-		    return i;
-    Sys_Error ("out of handles");
-    return -1;
-}
-
-/*
-================
-filelength
-================
-*/
-int filelength (FILE *f)
-{
-    int             pos;
-    int             end;
-
-    pos = ftell (f);
-    fseek (f, 0, SEEK_END);
-    end = ftell (f);
-    fseek (f, pos, SEEK_SET);
-
-    return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-    FILE    *f;
-    int             i;
-    
-    i = findhandle ();
-    
-    f = fopen(path, "rb");
-    if (!f)
-    {
-	*hndl = -1;
-	return -1;
-    }
-    sys_handles[i].hFile = f;
-    sys_handles[i].nLen = filelength(f);
-    sys_handles[i].nPos = 0;
-    sys_handles[i].pMap = mmap( 0, sys_handles[i].nLen, PROT_READ, MAP_SHARED, fileno( sys_handles[i].hFile ), 0 );
-    if (!sys_handles[i].pMap || (sys_handles[i].pMap == (char *)-1))
-    {
-	printf( "mmap %s failed!", path );
-	sys_handles[i].pMap = NULL;
-    }
-
-    *hndl = i;
-    
-    return( sys_handles[i].nLen );
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-    FILE    *f;
-    int             i;
-    
-    i = findhandle ();
-
-    f = fopen(path, "wb");
-    if (!f)
-	Sys_Error ("Error opening %s: %s", path,strerror(errno));
-    sys_handles[i].hFile = f;
-    sys_handles[i].nLen = 0;
-    sys_handles[i].nPos = 0;
-    sys_handles[i].pMap = NULL;
-    
-    return i;
-}
-
-void Sys_FileClose (int handle)
-{
-    if (sys_handles[handle].pMap)
-	if (munmap( sys_handles[handle].pMap, sys_handles[handle].nLen ) != 0)
-	    printf( "failed to unmap handle %d\n", handle );
-
-    fclose (sys_handles[handle].hFile);
-    sys_handles[handle].hFile = NULL;
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-    if (sys_handles[handle].pMap)
-    {
-	sys_handles[handle].nPos = position;
-    }
-    else fseek (sys_handles[handle].hFile, position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-    if (sys_handles[handle].pMap)
-    {
-	int nPos = sys_handles[handle].nPos;
-	if (count < 0) count = 0;
-	if (nPos + count > sys_handles[handle].nLen)
-	    count = sys_handles[handle].nLen - nPos;
-	memcpy( dest, &sys_handles[handle].pMap[nPos], count );
-	sys_handles[handle].nPos = nPos + count;
-	return( count );
-    }
-    else return fread (dest, 1, count, sys_handles[handle].hFile);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-    if (sys_handles[handle].pMap)
-	Sys_Error( "Attempted to write to read-only file %d!\n", handle );
-    return fwrite (data, 1, count, sys_handles[handle].hFile);
-}
-
-int Sys_FileTime (char *path)
-{
-    FILE    *f;
-    
-    f = fopen(path, "rb");
-    if (f)
-    {
-	fclose(f);
-	return 1;
-    }
-    
-    return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-    mkdir( path, 0777 );
-}
-
-/*
-===============================================================================
-
-SYSTEM IO
-
-===============================================================================
-*/
-
-void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
-{
-
-	int r;
-	unsigned long addr;
-	int psize = getpagesize();
-
-	addr = (startaddr & ~(psize-1)) - psize;
-
-//	fprintf(stderr, "writable code %lx(%lx)-%lx, length=%lx\n", startaddr,
-//			addr, startaddr+length, length);
-
-	r = mprotect((char*)addr, length + startaddr - addr + psize, 7);
-
-	if (r < 0)
-    		Sys_Error("Protection change failed\n");
-
-}
-
-
-void Sys_Error (char *error, ...)
-{
-    va_list         argptr;
-
-    printf ("Sys_Error: ");   
-    va_start (argptr,error);
-    vprintf (error,argptr);
-    va_end (argptr);
-    printf ("\n");
-    Host_Shutdown();
-    exit (1);
-}
-
-void Sys_Printf (char *fmt, ...)
-{
-    va_list         argptr;
-    
-    va_start (argptr,fmt);
-    vprintf (fmt,argptr);
-    va_end (argptr);
-}
-
-void Sys_Quit (void)
-{
-    Host_Shutdown();
-    exit (0);
-}
-
-double Sys_FloatTime (void)
-{
-    struct timeval tp;
-    struct timezone tzp; 
-    static int      secbase; 
-    
-    gettimeofday(&tp, &tzp);  
-
-    if (!secbase)
-    {
-        secbase = tp.tv_sec;
-        return tp.tv_usec/1000000.0;
-    }
-
-    return (tp.tv_sec - secbase) + tp.tv_usec/1000000.0;
-}
-
-char *Sys_ConsoleInput (void)
-{
-    static char	text[256];
-    int		len;
-    fd_set	readfds;
-    int		ready;
-    struct timeval timeout;
-    
-    timeout.tv_sec = 0;
-    timeout.tv_usec = 0;
-    FD_ZERO(&readfds);
-    FD_SET(0, &readfds);
-    ready = select(1, &readfds, 0, 0, &timeout);
-    
-    if (ready>0)
-    {
-	len = read (0, text, sizeof(text));
-	if (len >= 1)
-	{
-		text[len-1] = 0;	// rip off the /n and terminate
-		return text;
-	}
-    }
-    
-    return 0;
-}
-
-void Sys_Sleep (void)
-{
-}
-
-#if !id386
-void Sys_HighFPPrecision (void)
-{
-}
-
-void Sys_LowFPPrecision (void)
-{
-}
-#endif
-
-void Sys_Init(void)
-{
-#if id386
-	Sys_SetFPCW();
-#endif
-}
-
-//=============================================================================
-
-int main (int argc, char **argv)
-{
-    static quakeparms_t    parms;
-    float time, oldtime, newtime;
-    
-    parms.memsize = 16*1024*1024;
-    parms.membase = malloc (parms.memsize);
-    parms.basedir = ".";
-    parms.cachedir = NULL;
-
-    COM_InitArgv (argc, argv);
-
-    parms.argc = com_argc;
-    parms.argv = com_argv;
-
-    printf ("Host_Init\n");
-    Host_Init (&parms);
-
-	Sys_Init();
-
-    // unroll the simulation loop to give the video side a chance to see _vid_default_mode
-    Host_Frame( 0.1 );
-    VID_SetDefaultMode();
-
-    oldtime = Sys_FloatTime();
-    while (1)
-    {
-		newtime = Sys_FloatTime();
-		Host_Frame (newtime - oldtime);
-		oldtime = newtime;
-    }
-	return 0;
-}
-
-
-
-
--- a/u/sys_win.c
+++ /dev/null
@@ -1,893 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// sys_win.c -- Win32 system interface code
-
-#include "quakedef.h"
-#include "winquake.h"
-#include "errno.h"
-#include "resource.h"
-#include "conproc.h"
-
-#define MINIMUM_WIN_MEMORY		0x0880000
-#define MAXIMUM_WIN_MEMORY		0x1000000
-
-#define CONSOLE_ERROR_TIMEOUT	60.0	// # of seconds to wait on Sys_Error running
-										//  dedicated before exiting
-#define PAUSE_SLEEP		50				// sleep time on pause or minimization
-#define NOT_FOCUS_SLEEP	20				// sleep time when not focus
-
-int			starttime;
-qboolean	ActiveApp, Minimized;
-qboolean	WinNT;
-
-static double		pfreq;
-static double		curtime = 0.0;
-static double		lastcurtime = 0.0;
-static int			lowshift;
-qboolean			isDedicated;
-static qboolean		sc_return_on_enter = false;
-HANDLE				hinput, houtput;
-
-static char			*tracking_tag = "Clams & Mooses";
-
-static HANDLE	tevent;
-static HANDLE	hFile;
-static HANDLE	heventParent;
-static HANDLE	heventChild;
-
-void MaskExceptions (void);
-void Sys_InitFloatTime (void);
-void Sys_PushFPCW_SetHigh (void);
-void Sys_PopFPCW (void);
-
-volatile int					sys_checksum;
-
-
-/*
-================
-Sys_PageIn
-================
-*/
-void Sys_PageIn (void *ptr, int size)
-{
-	byte	*x;
-	int		j, m, n;
-
-// touch all the memory to make sure it's there. The 16-page skip is to
-// keep Win 95 from thinking we're trying to page ourselves in (we are
-// doing that, of course, but there's no reason we shouldn't)
-	x = (byte *)ptr;
-
-	for (n=0 ; n<4 ; n++)
-	{
-		for (m=0 ; m<(size - 16 * 0x1000) ; m += 4)
-		{
-			sys_checksum += *(int *)&x[m];
-			sys_checksum += *(int *)&x[m + 16 * 0x1000];
-		}
-	}
-}
-
-
-/*
-===============================================================================
-
-FILE IO
-
-===============================================================================
-*/
-
-#define	MAX_HANDLES		10
-FILE	*sys_handles[MAX_HANDLES];
-
-int		findhandle (void)
-{
-	int		i;
-	
-	for (i=1 ; i<MAX_HANDLES ; i++)
-		if (!sys_handles[i])
-			return i;
-	Sys_Error ("out of handles");
-	return -1;
-}
-
-/*
-================
-filelength
-================
-*/
-int filelength (FILE *f)
-{
-	int		pos;
-	int		end;
-	int		t;
-
-	t = VID_ForceUnlockedAndReturnState ();
-
-	pos = ftell (f);
-	fseek (f, 0, SEEK_END);
-	end = ftell (f);
-	fseek (f, pos, SEEK_SET);
-
-	VID_ForceLockState (t);
-
-	return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-	FILE	*f;
-	int		i, retval;
-	int		t;
-
-	t = VID_ForceUnlockedAndReturnState ();
-
-	i = findhandle ();
-
-	f = fopen(path, "rb");
-
-	if (!f)
-	{
-		*hndl = -1;
-		retval = -1;
-	}
-	else
-	{
-		sys_handles[i] = f;
-		*hndl = i;
-		retval = filelength(f);
-	}
-
-	VID_ForceLockState (t);
-
-	return retval;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	FILE	*f;
-	int		i;
-	int		t;
-
-	t = VID_ForceUnlockedAndReturnState ();
-	
-	i = findhandle ();
-
-	f = fopen(path, "wb");
-	if (!f)
-		Sys_Error ("Error opening %s: %s", path,strerror(errno));
-	sys_handles[i] = f;
-	
-	VID_ForceLockState (t);
-
-	return i;
-}
-
-void Sys_FileClose (int handle)
-{
-	int		t;
-
-	t = VID_ForceUnlockedAndReturnState ();
-	fclose (sys_handles[handle]);
-	sys_handles[handle] = NULL;
-	VID_ForceLockState (t);
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-	int		t;
-
-	t = VID_ForceUnlockedAndReturnState ();
-	fseek (sys_handles[handle], position, SEEK_SET);
-	VID_ForceLockState (t);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-	int		t, x;
-
-	t = VID_ForceUnlockedAndReturnState ();
-	x = fread (dest, 1, count, sys_handles[handle]);
-	VID_ForceLockState (t);
-	return x;
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-	int		t, x;
-
-	t = VID_ForceUnlockedAndReturnState ();
-	x = fwrite (data, 1, count, sys_handles[handle]);
-	VID_ForceLockState (t);
-	return x;
-}
-
-int	Sys_FileTime (char *path)
-{
-	FILE	*f;
-	int		t, retval;
-
-	t = VID_ForceUnlockedAndReturnState ();
-	
-	f = fopen(path, "rb");
-
-	if (f)
-	{
-		fclose(f);
-		retval = 1;
-	}
-	else
-	{
-		retval = -1;
-	}
-	
-	VID_ForceLockState (t);
-	return retval;
-}
-
-void Sys_mkdir (char *path)
-{
-	_mkdir (path);
-}
-
-
-/*
-===============================================================================
-
-SYSTEM IO
-
-===============================================================================
-*/
-
-/*
-================
-Sys_MakeCodeWriteable
-================
-*/
-void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
-{
-	DWORD  flOldProtect;
-
-	if (!VirtualProtect((LPVOID)startaddr, length, PAGE_READWRITE, &flOldProtect))
-   		Sys_Error("Protection change failed\n");
-}
-
-
-#ifndef _M_IX86
-
-void Sys_SetFPCW (void)
-{
-}
-
-void Sys_PushFPCW_SetHigh (void)
-{
-}
-
-void Sys_PopFPCW (void)
-{
-}
-
-void MaskExceptions (void)
-{
-}
-
-#endif
-
-/*
-================
-Sys_Init
-================
-*/
-void Sys_Init (void)
-{
-	LARGE_INTEGER	PerformanceFreq;
-	unsigned int	lowpart, highpart;
-	OSVERSIONINFO	vinfo;
-
-	MaskExceptions ();
-	Sys_SetFPCW ();
-
-	if (!QueryPerformanceFrequency (&PerformanceFreq))
-		Sys_Error ("No hardware timer available");
-
-// get 32 out of the 64 time bits such that we have around
-// 1 microsecond resolution
-	lowpart = (unsigned int)PerformanceFreq.LowPart;
-	highpart = (unsigned int)PerformanceFreq.HighPart;
-	lowshift = 0;
-
-	while (highpart || (lowpart > 2000000.0))
-	{
-		lowshift++;
-		lowpart >>= 1;
-		lowpart |= (highpart & 1) << 31;
-		highpart >>= 1;
-	}
-
-	pfreq = 1.0 / (double)lowpart;
-
-	Sys_InitFloatTime ();
-
-	vinfo.dwOSVersionInfoSize = sizeof(vinfo);
-
-	if (!GetVersionEx (&vinfo))
-		Sys_Error ("Couldn't get OS info");
-
-	if ((vinfo.dwMajorVersion < 4) ||
-		(vinfo.dwPlatformId == VER_PLATFORM_WIN32s))
-	{
-		Sys_Error ("WinQuake requires at least Win95 or NT 4.0");
-	}
-
-	if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
-		WinNT = true;
-	else
-		WinNT = false;
-}
-
-
-void Sys_Error (char *error, ...)
-{
-	va_list		argptr;
-	char		text[1024], text2[1024];
-	char		*text3 = "Press Enter to exit\n";
-	char		*text4 = "***********************************\n";
-	char		*text5 = "\n";
-	DWORD		dummy;
-	double		starttime;
-	static int	in_sys_error0 = 0;
-	static int	in_sys_error1 = 0;
-	static int	in_sys_error2 = 0;
-	static int	in_sys_error3 = 0;
-
-	if (!in_sys_error3)
-	{
-		in_sys_error3 = 1;
-		VID_ForceUnlockedAndReturnState ();
-	}
-
-	va_start (argptr, error);
-	vsprintf (text, error, argptr);
-	va_end (argptr);
-
-	if (isDedicated)
-	{
-		va_start (argptr, error);
-		vsprintf (text, error, argptr);
-		va_end (argptr);
-
-		sprintf (text2, "ERROR: %s\n", text);
-		WriteFile (houtput, text5, strlen (text5), &dummy, NULL);
-		WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-		WriteFile (houtput, text2, strlen (text2), &dummy, NULL);
-		WriteFile (houtput, text3, strlen (text3), &dummy, NULL);
-		WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-
-
-		starttime = Sys_FloatTime ();
-		sc_return_on_enter = true;	// so Enter will get us out of here
-
-		while (!Sys_ConsoleInput () &&
-				((Sys_FloatTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-		{
-		}
-	}
-	else
-	{
-	// switch to windowed so the message box is visible, unless we already
-	// tried that and failed
-		if (!in_sys_error0)
-		{
-			in_sys_error0 = 1;
-			VID_SetDefaultMode ();
-			MessageBox(NULL, text, "Quake Error",
-					   MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-		}
-		else
-		{
-			MessageBox(NULL, text, "Double Quake Error",
-					   MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-		}
-	}
-
-	if (!in_sys_error1)
-	{
-		in_sys_error1 = 1;
-		Host_Shutdown ();
-	}
-
-// shut down QHOST hooks if necessary
-	if (!in_sys_error2)
-	{
-		in_sys_error2 = 1;
-		DeinitConProc ();
-	}
-
-	exit (1);
-}
-
-void Sys_Printf (char *fmt, ...)
-{
-	va_list		argptr;
-	char		text[1024];
-	DWORD		dummy;
-	
-	if (isDedicated)
-	{
-		va_start (argptr,fmt);
-		vsprintf (text, fmt, argptr);
-		va_end (argptr);
-
-		WriteFile(houtput, text, strlen (text), &dummy, NULL);	
-	}
-}
-
-void Sys_Quit (void)
-{
-
-	VID_ForceUnlockedAndReturnState ();
-
-	Host_Shutdown();
-
-	if (tevent)
-		CloseHandle (tevent);
-
-	if (isDedicated)
-		FreeConsole ();
-
-// shut down QHOST hooks if necessary
-	DeinitConProc ();
-
-	exit (0);
-}
-
-
-/*
-================
-Sys_FloatTime
-================
-*/
-double Sys_FloatTime (void)
-{
-	static int			sametimecount;
-	static unsigned int	oldtime;
-	static int			first = 1;
-	LARGE_INTEGER		PerformanceCount;
-	unsigned int		temp, t2;
-	double				time;
-
-	Sys_PushFPCW_SetHigh ();
-
-	QueryPerformanceCounter (&PerformanceCount);
-
-	temp = ((unsigned int)PerformanceCount.LowPart >> lowshift) |
-		   ((unsigned int)PerformanceCount.HighPart << (32 - lowshift));
-
-	if (first)
-	{
-		oldtime = temp;
-		first = 0;
-	}
-	else
-	{
-	// check for turnover or backward time
-		if ((temp <= oldtime) && ((oldtime - temp) < 0x10000000))
-		{
-			oldtime = temp;	// so we can't get stuck
-		}
-		else
-		{
-			t2 = temp - oldtime;
-
-			time = (double)t2 * pfreq;
-			oldtime = temp;
-
-			curtime += time;
-
-			if (curtime == lastcurtime)
-			{
-				sametimecount++;
-
-				if (sametimecount > 100000)
-				{
-					curtime += 1.0;
-					sametimecount = 0;
-				}
-			}
-			else
-			{
-				sametimecount = 0;
-			}
-
-			lastcurtime = curtime;
-		}
-	}
-
-	Sys_PopFPCW ();
-
-    return curtime;
-}
-
-
-/*
-================
-Sys_InitFloatTime
-================
-*/
-void Sys_InitFloatTime (void)
-{
-	int		j;
-
-	Sys_FloatTime ();
-
-	j = COM_CheckParm("-starttime");
-
-	if (j)
-	{
-		curtime = (double) (Q_atof(com_argv[j+1]));
-	}
-	else
-	{
-		curtime = 0.0;
-	}
-
-	lastcurtime = curtime;
-}
-
-
-char *Sys_ConsoleInput (void)
-{
-	static char	text[256];
-	static int		len;
-	INPUT_RECORD	recs[1024];
-	int		count;
-	int		i, dummy;
-	int		ch, numread, numevents;
-
-	if (!isDedicated)
-		return NULL;
-
-
-	for ( ;; )
-	{
-		if (!GetNumberOfConsoleInputEvents (hinput, &numevents))
-			Sys_Error ("Error getting # of console events");
-
-		if (numevents <= 0)
-			break;
-
-		if (!ReadConsoleInput(hinput, recs, 1, &numread))
-			Sys_Error ("Error reading console input");
-
-		if (numread != 1)
-			Sys_Error ("Couldn't read console input");
-
-		if (recs[0].EventType == KEY_EVENT)
-		{
-			if (!recs[0].Event.KeyEvent.bKeyDown)
-			{
-				ch = recs[0].Event.KeyEvent.uChar.AsciiChar;
-
-				switch (ch)
-				{
-					case '\r':
-						WriteFile(houtput, "\r\n", 2, &dummy, NULL);	
-
-						if (len)
-						{
-							text[len] = 0;
-							len = 0;
-							return text;
-						}
-						else if (sc_return_on_enter)
-						{
-						// special case to allow exiting from the error handler on Enter
-							text[0] = '\r';
-							len = 0;
-							return text;
-						}
-
-						break;
-
-					case '\b':
-						WriteFile(houtput, "\b \b", 3, &dummy, NULL);	
-						if (len)
-						{
-							len--;
-						}
-						break;
-
-					default:
-						if (ch >= ' ')
-						{
-							WriteFile(houtput, &ch, 1, &dummy, NULL);	
-							text[len] = ch;
-							len = (len + 1) & 0xff;
-						}
-
-						break;
-
-				}
-			}
-		}
-	}
-
-	return NULL;
-}
-
-void Sys_Sleep (void)
-{
-	Sleep (1);
-}
-
-
-void Sys_SendKeyEvents (void)
-{
-    MSG        msg;
-
-	while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
-	{
-	// we always update if there are any event, even if we're paused
-		scr_skipupdate = 0;
-
-		if (!GetMessage (&msg, NULL, 0, 0))
-			Sys_Quit ();
-
-      	TranslateMessage (&msg);
-      	DispatchMessage (&msg);
-	}
-}
-
-
-/*
-==============================================================================
-
- WINDOWS CRAP
-
-==============================================================================
-*/
-
-
-/*
-==================
-WinMain
-==================
-*/
-void SleepUntilInput (int time)
-{
-
-	MsgWaitForMultipleObjects(1, &tevent, FALSE, time, QS_ALLINPUT);
-}
-
-
-/*
-==================
-WinMain
-==================
-*/
-HINSTANCE	global_hInstance;
-int			global_nCmdShow;
-char		*argv[MAX_NUM_ARGVS];
-static char	*empty_string = "";
-HWND		hwnd_dialog;
-
-
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-{
-    MSG				msg;
-	quakeparms_t	parms;
-	double			time, oldtime, newtime;
-	MEMORYSTATUS	lpBuffer;
-	static	char	cwd[1024];
-	int				t;
-	RECT			rect;
-
-    /* previous instances do not exist in Win32 */
-    if (hPrevInstance)
-        return 0;
-
-	global_hInstance = hInstance;
-	global_nCmdShow = nCmdShow;
-
-	lpBuffer.dwLength = sizeof(MEMORYSTATUS);
-	GlobalMemoryStatus (&lpBuffer);
-
-	if (!GetCurrentDirectory (sizeof(cwd), cwd))
-		Sys_Error ("Couldn't determine current directory");
-
-	if (cwd[Q_strlen(cwd)-1] == '/')
-		cwd[Q_strlen(cwd)-1] = 0;
-
-	parms.basedir = cwd;
-	parms.cachedir = NULL;
-
-	parms.argc = 1;
-	argv[0] = empty_string;
-
-	while (*lpCmdLine && (parms.argc < MAX_NUM_ARGVS))
-	{
-		while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
-			lpCmdLine++;
-
-		if (*lpCmdLine)
-		{
-			argv[parms.argc] = lpCmdLine;
-			parms.argc++;
-
-			while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-				lpCmdLine++;
-
-			if (*lpCmdLine)
-			{
-				*lpCmdLine = 0;
-				lpCmdLine++;
-			}
-			
-		}
-	}
-
-	parms.argv = argv;
-
-	COM_InitArgv (parms.argc, parms.argv);
-
-	parms.argc = com_argc;
-	parms.argv = com_argv;
-
-	isDedicated = (COM_CheckParm ("-dedicated") != 0);
-
-	if (!isDedicated)
-	{
-		hwnd_dialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DIALOG1), NULL, NULL);
-
-		if (hwnd_dialog)
-		{
-			if (GetWindowRect (hwnd_dialog, &rect))
-			{
-				if (rect.left > (rect.top * 2))
-				{
-					SetWindowPos (hwnd_dialog, 0,
-						(rect.left / 2) - ((rect.right - rect.left) / 2),
-						rect.top, 0, 0,
-						SWP_NOZORDER | SWP_NOSIZE);
-				}
-			}
-
-			ShowWindow (hwnd_dialog, SW_SHOWDEFAULT);
-			UpdateWindow (hwnd_dialog);
-			SetForegroundWindow (hwnd_dialog);
-		}
-	}
-
-// take the greater of all the available memory or half the total memory,
-// but at least 8 Mb and no more than 16 Mb, unless they explicitly
-// request otherwise
-	parms.memsize = lpBuffer.dwAvailPhys;
-
-	if (parms.memsize < MINIMUM_WIN_MEMORY)
-		parms.memsize = MINIMUM_WIN_MEMORY;
-
-	if (parms.memsize < (lpBuffer.dwTotalPhys >> 1))
-		parms.memsize = lpBuffer.dwTotalPhys >> 1;
-
-	if (parms.memsize > MAXIMUM_WIN_MEMORY)
-		parms.memsize = MAXIMUM_WIN_MEMORY;
-
-	if (COM_CheckParm ("-heapsize"))
-	{
-		t = COM_CheckParm("-heapsize") + 1;
-
-		if (t < com_argc)
-			parms.memsize = Q_atoi (com_argv[t]) * 1024;
-	}
-
-	parms.membase = malloc (parms.memsize);
-
-	if (!parms.membase)
-		Sys_Error ("Not enough memory free; check disk space\n");
-
-	Sys_PageIn (parms.membase, parms.memsize);
-
-	tevent = CreateEvent(NULL, FALSE, FALSE, NULL);
-
-	if (!tevent)
-		Sys_Error ("Couldn't create event");
-
-	if (isDedicated)
-	{
-		if (!AllocConsole ())
-		{
-			Sys_Error ("Couldn't create dedicated server console");
-		}
-
-		hinput = GetStdHandle (STD_INPUT_HANDLE);
-		houtput = GetStdHandle (STD_OUTPUT_HANDLE);
-
-	// give QHOST a chance to hook into the console
-		if ((t = COM_CheckParm ("-HFILE")) > 0)
-		{
-			if (t < com_argc)
-				hFile = (HANDLE)Q_atoi (com_argv[t+1]);
-		}
-			
-		if ((t = COM_CheckParm ("-HPARENT")) > 0)
-		{
-			if (t < com_argc)
-				heventParent = (HANDLE)Q_atoi (com_argv[t+1]);
-		}
-			
-		if ((t = COM_CheckParm ("-HCHILD")) > 0)
-		{
-			if (t < com_argc)
-				heventChild = (HANDLE)Q_atoi (com_argv[t+1]);
-		}
-
-		InitConProc (hFile, heventParent, heventChild);
-	}
-
-	Sys_Init ();
-
-// because sound is off until we become active
-	S_BlockSound ();
-
-	Sys_Printf ("Host_Init\n");
-	Host_Init (&parms);
-
-	oldtime = Sys_FloatTime ();
-
-    /* main window message loop */
-	while (1)
-	{
-		if (isDedicated)
-		{
-			newtime = Sys_FloatTime ();
-			time = newtime - oldtime;
-
-			while (time < sys_ticrate.value )
-			{
-				Sys_Sleep();
-				newtime = Sys_FloatTime ();
-				time = newtime - oldtime;
-			}
-		}
-		else
-		{
-		// yield the CPU for a little while when paused, minimized, or not the focus
-			if ((cl.paused && (!ActiveApp && !DDActive)) || Minimized || block_drawing)
-			{
-				SleepUntilInput (PAUSE_SLEEP);
-				scr_skipupdate = 1;		// no point in bothering to draw
-			}
-			else if (!ActiveApp && !DDActive)
-			{
-				SleepUntilInput (NOT_FOCUS_SLEEP);
-			}
-
-			newtime = Sys_FloatTime ();
-			time = newtime - oldtime;
-		}
-
-		Host_Frame (time);
-		oldtime = newtime;
-	}
-
-    /* return success of application */
-    return TRUE;
-}
-
--- a/u/sys_wina.s
+++ /dev/null
@@ -1,116 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// sys_wina.s
-// x86 assembly-language Win-dependent routines.
-
-#define GLQUAKE	1	// don't include unneeded defs
-#include "asm_i386.h"
-#include "quakeasm.h"
-
-// LATER should be id386-dependent, and have an equivalent C path
-
-	.data
-
-	.align	4
-fpenv:
-	.long	0, 0, 0, 0, 0, 0, 0, 0
-
-	.text
-
-.globl C(MaskExceptions)
-C(MaskExceptions):
-	fnstenv	fpenv
-	orl		$0x3F,fpenv
-	fldenv	fpenv
-
-	ret
-
-#if 0
-.globl C(unmaskexceptions)
-C(unmaskexceptions):
-	fnstenv	fpenv
-	andl		$0xFFFFFFE0,fpenv
-	fldenv	fpenv
-
-	ret
-#endif
-
-	.data
-
-	.align	4
-.globl	ceil_cw, single_cw, full_cw, cw, pushed_cw
-ceil_cw:	.long	0
-single_cw:	.long	0
-full_cw:	.long	0
-cw:			.long	0
-pushed_cw:	.long	0
-
-	.text
-
-.globl C(Sys_LowFPPrecision)
-C(Sys_LowFPPrecision):
-	fldcw	single_cw
-
-	ret
-
-.globl C(Sys_HighFPPrecision)
-C(Sys_HighFPPrecision):
-	fldcw	full_cw
-
-	ret
-
-.globl C(Sys_PushFPCW_SetHigh)
-C(Sys_PushFPCW_SetHigh):
-	fnstcw	pushed_cw
-	fldcw	full_cw
-
-	ret
-
-.globl C(Sys_PopFPCW)
-C(Sys_PopFPCW):
-	fldcw	pushed_cw
-
-	ret
-
-.globl C(Sys_SetFPCW)
-C(Sys_SetFPCW):
-	fnstcw	cw
-	movl	cw,%eax
-#if	id386
-	andb	$0xF0,%ah
-	orb		$0x03,%ah	// round mode, 64-bit precision
-#endif
-	movl	%eax,full_cw
-
-#if	id386
-	andb	$0xF0,%ah
-	orb		$0x0C,%ah	// chop mode, single precision
-#endif
-	movl	%eax,single_cw
-
-#if	id386
-	andb	$0xF0,%ah
-	orb		$0x08,%ah	// ceil mode, single precision
-#endif
-	movl	%eax,ceil_cw
-
-	ret
-
--- a/u/sys_wind.c
+++ /dev/null
@@ -1,325 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// sys_null.h -- null system driver to aid porting efforts
-
-#include "quakedef.h"
-#include "winquake.h"
-#include "errno.h"
-#include <sys\types.h>
-#include <sys\timeb.h>
-
-
-/*
-===============================================================================
-
-FILE IO
-
-===============================================================================
-*/
-
-#define	MAX_HANDLES		10
-FILE	*sys_handles[MAX_HANDLES];
-
-int		findhandle (void)
-{
-	int		i;
-	
-	for (i=1 ; i<MAX_HANDLES ; i++)
-		if (!sys_handles[i])
-			return i;
-	Sys_Error ("out of handles");
-	return -1;
-}
-
-/*
-================
-filelength
-================
-*/
-int filelength (FILE *f)
-{
-	int		pos;
-	int		end;
-
-	pos = ftell (f);
-	fseek (f, 0, SEEK_END);
-	end = ftell (f);
-	fseek (f, pos, SEEK_SET);
-
-	return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-	FILE	*f;
-	int		i;
-	
-	i = findhandle ();
-
-	f = fopen(path, "rb");
-	if (!f)
-	{
-		*hndl = -1;
-		return -1;
-	}
-	sys_handles[i] = f;
-	*hndl = i;
-	
-	return filelength(f);
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	FILE	*f;
-	int		i;
-	
-	i = findhandle ();
-
-	f = fopen(path, "wb");
-	if (!f)
-		Sys_Error ("Error opening %s: %s", path,strerror(errno));
-	sys_handles[i] = f;
-	
-	return i;
-}
-
-void Sys_FileClose (int handle)
-{
-	fclose (sys_handles[handle]);
-	sys_handles[handle] = NULL;
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-	fseek (sys_handles[handle], position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-	return fread (dest, 1, count, sys_handles[handle]);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-	return fwrite (data, 1, count, sys_handles[handle]);
-}
-
-int	Sys_FileTime (char *path)
-{
-	FILE	*f;
-	
-	f = fopen(path, "rb");
-	if (f)
-	{
-		fclose(f);
-		return 1;
-	}
-	
-	return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-}
-
-
-/*
-===============================================================================
-
-SYSTEM IO
-
-===============================================================================
-*/
-
-void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length)
-{
-}
-
-
-void Sys_DebugLog(char *file, char *fmt, ...)
-{
-}
-
-void Sys_Error (char *error, ...)
-{
-	va_list		argptr;
-	char		text[1024];
-
-	va_start (argptr,error);
-	vsprintf (text, error,argptr);
-	va_end (argptr);
-
-//    MessageBox(NULL, text, "Error", 0 /* MB_OK */ );
-	printf ("ERROR: %s\n", text);
-
-	exit (1);
-}
-
-void Sys_Printf (char *fmt, ...)
-{
-	va_list		argptr;
-	
-	va_start (argptr,fmt);
-	vprintf (fmt,argptr);
-	va_end (argptr);
-}
-
-void Sys_Quit (void)
-{
-	exit (0);
-}
-
-double Sys_FloatTime (void)
-{
-	double t;
-    struct _timeb tstruct;
-	static int	starttime;
-
-	_ftime( &tstruct );
- 
-	if (!starttime)
-		starttime = tstruct.time;
-	t = (tstruct.time-starttime) + tstruct.millitm*0.001;
-	
-	return t;
-}
-
-void Sys_Sleep (void)
-{
-}
-
-
-void Sys_SendKeyEvents (void)
-{
-}
-
-void Sys_HighFPPrecision (void)
-{
-}
-
-void Sys_LowFPPrecision (void)
-{
-}
-
-char *Sys_ConsoleInput (void)
-{
-	static char	text[256];
-	static int		len;
-	INPUT_RECORD	recs[1024];
-	int		count;
-	int		i;
-	int		c;
-
-	// read a line out
-	while (_kbhit())
-	{
-		c = _getch();
-		putch (c);
-		if (c == '\r')
-		{
-			text[len] = 0;
-			putch ('\n');
-			len = 0;
-			return text;
-		}
-		if (c == 8)
-		{
-			putch (' ');
-			putch (c);
-			len--;
-			text[len] = 0;
-			continue;
-		}
-		text[len] = c;
-		len++;
-		text[len] = 0;
-		if (len == sizeof(text))
-			len = 0;
-	}
-
-	return NULL;
-}
-
-
-
-/*
-==================
-main
-
-==================
-*/
-char	*newargv[256];
-
-int main (int argc, char **argv)
-{
-    MSG        msg;
-	quakeparms_t	parms;
-	double			time, oldtime;
-	static	char	cwd[1024];
-
-	memset (&parms, 0, sizeof(parms));
-
-	parms.memsize = 16384*1024;
-	parms.membase = malloc (parms.memsize);
-
-	_getcwd (cwd, sizeof(cwd));
-	if (cwd[Q_strlen(cwd)-1] == '\\')
-		cwd[Q_strlen(cwd)-1] = 0;
-	parms.basedir = cwd; //"f:/quake";
-//	parms.basedir = "f:\\quake";
-
-	COM_InitArgv (argc, argv);
-
-	// dedicated server ONLY!
-	if (!COM_CheckParm ("-dedicated"))
-	{
-		memcpy (newargv, argv, argc*4);
-		newargv[argc] = "-dedicated";
-		argc++;
-		argv = newargv;
-		COM_InitArgv (argc, argv);
-	}
-
-	parms.argc = argc;
-	parms.argv = argv;
-
-	printf ("Host_Init\n");
-	Host_Init (&parms);
-
-	oldtime = Sys_FloatTime ();
-
-    /* main window message loop */
-	while (1)
-	{
-		time = Sys_FloatTime();
-		if (time - oldtime < sys_ticrate.value )
-		{
-			Sleep(1);
-			continue;
-		}
-
-		Host_Frame ( time - oldtime );
-		oldtime = time;
-	}
-
-    /* return success of application */
-    return TRUE;
-}
-
--- a/u/vgamodes.h
+++ /dev/null
@@ -1,599 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// vgamodes.h: VGA mode set tables
-//
-
-#include "vregset.h"
-
-int		VGA_InitMode (viddef_t *vid, vmode_t *pcurrentmode);
-void	VGA_SwapBuffers (viddef_t *vid, vmode_t *pcurrentmode, vrect_t *rects);
-void	VGA_SetPalette (viddef_t *vid, vmode_t *pcurrentmode,
-						unsigned char *pal);
-
-///////////////////////////////////////////////////////////////////////////
-// the following base mode descriptors plus extra data together provide all
-// the data needed to do VGA mode sets
-///////////////////////////////////////////////////////////////////////////
-
-typedef struct {
-	int		vidbuffer;
-	int		*pregset;
-} vextra_t;
-
-int	vrsnull[] = {
-	VRS_END,
-};
-
-int vrs320x200x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_BYTE_OUT, SC_INDEX, MEMORY_MODE,
-	VRS_BYTE_RMW, SC_DATA, ~0x08, 0x04,
-	VRS_BYTE_OUT, GC_INDEX, GRAPHICS_MODE,
-	VRS_BYTE_RMW, GC_DATA, ~0x13, 0x00,
-	VRS_BYTE_OUT, GC_INDEX, MISCELLANOUS,
-	VRS_BYTE_RMW, GC_DATA, ~0x02, 0x00,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// change the CRTC from doubleword to byte mode
-//
-	VRS_BYTE_OUT, CRTC_INDEX, UNDERLINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x40, 0x00,
-	VRS_BYTE_OUT, CRTC_INDEX, MODE_CONTROL,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x00, 0x40,
-
-	VRS_END,
-};
-
-int vrs360x200x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_WORD_OUT, SC_INDEX, 0x0604,
-	VRS_BYTE_OUT, MISC_OUTPUT, 0x67,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// change the CRTC from doubleword to byte mode
-//
-	VRS_BYTE_OUT, CRTC_INDEX, UNDERLINE,
-	VRS_BYTE_RMW, CRTC_DATA,  ~0x40, 0x00,
-	VRS_BYTE_OUT, CRTC_INDEX, MODE_CONTROL,
-	VRS_BYTE_RMW, CRTC_DATA,  ~0x00, 0x40,
-
-//
-// set up the CRT Controller
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0x6B00,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5901,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5A02,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8E03,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5E04,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8A05,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3013,
-
-	VRS_END,
-};
-
-int vrs320x240x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_BYTE_OUT, SC_INDEX, MEMORY_MODE,
-	VRS_BYTE_RMW, SC_DATA, ~0x08, 0x04,
-	VRS_BYTE_OUT, GC_INDEX, GRAPHICS_MODE,
-	VRS_BYTE_RMW, GC_DATA, ~0x13, 0x00,
-	VRS_BYTE_OUT, GC_INDEX, MISCELLANOUS,
-	VRS_BYTE_RMW, GC_DATA, ~0x02, 0x00,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// set up the CRT Controller
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0x0D06,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3E07,
-	VRS_WORD_OUT, CRTC_INDEX, 0x4109,
-	VRS_WORD_OUT, CRTC_INDEX, 0xEA10,
-	VRS_WORD_OUT, CRTC_INDEX, 0xAC11,
-	VRS_WORD_OUT, CRTC_INDEX, 0xDF12,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0014,
-	VRS_WORD_OUT, CRTC_INDEX, 0xE715,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0616,
-	VRS_WORD_OUT, CRTC_INDEX, 0xE317,
-
-	VRS_END,
-};
-
-int vrs360x240x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_WORD_OUT, SC_INDEX, 0x0604,
-	VRS_BYTE_OUT, MISC_OUTPUT, 0xE7,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// set up the CRT Controller
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0x6B00,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5901,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5A02,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8E03,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5E04,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8A05,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0D06,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3E07,
-	VRS_WORD_OUT, CRTC_INDEX, 0x4109,
-	VRS_WORD_OUT, CRTC_INDEX, 0xEA10,
-	VRS_WORD_OUT, CRTC_INDEX, 0xAC11,
-	VRS_WORD_OUT, CRTC_INDEX, 0xDF12,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3013,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0014,
-	VRS_WORD_OUT, CRTC_INDEX, 0xE715,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0616,
-	VRS_WORD_OUT, CRTC_INDEX, 0xE317,
-
-	VRS_END,
-};
-
-int vrs320x350x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_BYTE_OUT, SC_INDEX, MEMORY_MODE,
-	VRS_BYTE_RMW, SC_DATA, ~0x08, 0x04,
-	VRS_BYTE_OUT, GC_INDEX, GRAPHICS_MODE,
-	VRS_BYTE_RMW, GC_DATA, ~0x10, 0x00,
-	VRS_BYTE_OUT, GC_INDEX, MISCELLANOUS,
-	VRS_BYTE_RMW, GC_DATA, ~0x02, 0x00,
-	VRS_BYTE_OUT, MISC_OUTPUT, 0xA3,	// 350-scan-line scan rate
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// stop scanning each line twice
-//
-	VRS_BYTE_OUT, CRTC_INDEX, MAX_SCAN_LINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x1F, 0x00,
-
-//
-// change the CRTC from doubleword to byte mode
-//
-	VRS_BYTE_OUT, CRTC_INDEX, UNDERLINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x40, 0x00,
-	VRS_BYTE_OUT, CRTC_INDEX, MODE_CONTROL,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x00, 0x40,
-
-//
-// set the vertical counts for 350-scan-line mode
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0xBF06,
-	VRS_WORD_OUT, CRTC_INDEX, 0x1F07,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8310,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8511,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5D12,
-	VRS_WORD_OUT, CRTC_INDEX, 0x6315,
-	VRS_WORD_OUT, CRTC_INDEX, 0xBA16,
-
-	VRS_END,
-};
-
-int vrs360x350x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_WORD_OUT, SC_INDEX, 0x0604,
-	VRS_BYTE_OUT, MISC_OUTPUT, 0xA7,	// 350-scan-line scan rate
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// stop scanning each line twice
-//
-	VRS_BYTE_OUT, CRTC_INDEX, MAX_SCAN_LINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x1F, 0x00,
-
-//
-// change the CRTC from doubleword to byte mode
-//
-	VRS_BYTE_OUT, CRTC_INDEX, UNDERLINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x40, 0x00,
-	VRS_BYTE_OUT, CRTC_INDEX, MODE_CONTROL,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x00, 0x40,
-
-//
-// set the vertical counts for 350-scan-line mode and 360 pixels across
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0x6B00,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5901,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5A02,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8E03,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5E04,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8A05,
-	VRS_WORD_OUT, CRTC_INDEX, 0xBF06,
-	VRS_WORD_OUT, CRTC_INDEX, 0x1F07,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8310,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8511,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5D12,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3013,
-	VRS_WORD_OUT, CRTC_INDEX, 0x6315,
-	VRS_WORD_OUT, CRTC_INDEX, 0xBA16,
-
-	VRS_END,
-};
-
-int vrs320x400x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-
-	VRS_BYTE_OUT, SC_INDEX, MEMORY_MODE,
-	VRS_BYTE_RMW, SC_DATA, ~0x08, 0x04,
-	VRS_BYTE_OUT, GC_INDEX, GRAPHICS_MODE,
-	VRS_BYTE_RMW, GC_DATA, ~0x10, 0x00,
-	VRS_BYTE_OUT, GC_INDEX, MISCELLANOUS,
-	VRS_BYTE_RMW, GC_DATA, ~0x02, 0x00,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// stop scanning each line twice
-//
-	VRS_BYTE_OUT, CRTC_INDEX, MAX_SCAN_LINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x1F, 0x00,
-
-//
-// change the CRTC from doubleword to byte mode
-//
-	VRS_BYTE_OUT, CRTC_INDEX, UNDERLINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x40, 0x00,
-	VRS_BYTE_OUT, CRTC_INDEX, MODE_CONTROL,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x00, 0x40,
-
-	VRS_END,
-};
-
-int vrs360x400x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_WORD_OUT, SC_INDEX, 0x0604,
-	VRS_BYTE_OUT, MISC_OUTPUT, 0x67,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// stop scanning each line twice
-//
-	VRS_BYTE_OUT, CRTC_INDEX, MAX_SCAN_LINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x1F, 0x00,
-
-//
-// change the CRTC from doubleword to byte mode
-//
-	VRS_BYTE_OUT, CRTC_INDEX, UNDERLINE,
-	VRS_BYTE_RMW, CRTC_DATA,  ~0x40, 0x00,
-	VRS_BYTE_OUT, CRTC_INDEX, MODE_CONTROL,
-	VRS_BYTE_RMW, CRTC_DATA,  ~0x00, 0x40,
-
-//
-// set up the CRT Controller
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0x6B00,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5901,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5A02,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8E03,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5E04,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8A05,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3013,
-
-	VRS_END,
-};
-
-int vrs320x480x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_BYTE_OUT, SC_INDEX, MEMORY_MODE,
-	VRS_BYTE_RMW, SC_DATA, ~0x08, 0x04,
-	VRS_BYTE_OUT, GC_INDEX, GRAPHICS_MODE,
-	VRS_BYTE_RMW, GC_DATA, ~0x10, 0x00,
-	VRS_BYTE_OUT, GC_INDEX, MISCELLANOUS,
-	VRS_BYTE_RMW, GC_DATA, ~0x02, 0x00,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// stop scanning each line twice
-//
-	VRS_BYTE_OUT, CRTC_INDEX, MAX_SCAN_LINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x1F, 0x00,
-
-//
-// change the CRTC from doubleword to byte mode
-//
-	VRS_BYTE_OUT, CRTC_INDEX, UNDERLINE,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x40, 0x00,
-	VRS_BYTE_OUT, CRTC_INDEX, MODE_CONTROL,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x00, 0x40,
-
-//
-// set up the CRT Controller
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0x0D06,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3E07,
-	VRS_WORD_OUT, CRTC_INDEX, 0xEA10,
-	VRS_WORD_OUT, CRTC_INDEX, 0xAC11,
-	VRS_WORD_OUT, CRTC_INDEX, 0xDF12,
-	VRS_WORD_OUT, CRTC_INDEX, 0xE715,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0616,
-
-	VRS_END,
-};
-
-int vrs360x480x256planar[] = {
-//
-// switch to linear, non-chain4 mode
-//
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  1,
-
-	VRS_WORD_OUT, SC_INDEX, 0x0604,
-	VRS_BYTE_OUT, MISC_OUTPUT, 0xE7,
-
-	VRS_BYTE_OUT, SC_INDEX, SYNC_RESET,
-	VRS_BYTE_OUT, SC_DATA,  3,
-
-//
-// unprotect CRTC0 through CRTC0
-//
-	VRS_BYTE_OUT, CRTC_INDEX, 0x11,
-	VRS_BYTE_RMW, CRTC_DATA, ~0x80, 0x00,
-
-//
-// set up the CRT Controller
-//
-	VRS_WORD_OUT, CRTC_INDEX, 0x6B00,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5901,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5A02,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8E03,
-	VRS_WORD_OUT, CRTC_INDEX, 0x5E04,
-	VRS_WORD_OUT, CRTC_INDEX, 0x8A05,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0D06,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3E07,
-	VRS_WORD_OUT, CRTC_INDEX, 0x4009,
-	VRS_WORD_OUT, CRTC_INDEX, 0xEA10,
-	VRS_WORD_OUT, CRTC_INDEX, 0xAC11,
-	VRS_WORD_OUT, CRTC_INDEX, 0xDF12,
-	VRS_WORD_OUT, CRTC_INDEX, 0x3013,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0014,
-	VRS_WORD_OUT, CRTC_INDEX, 0xE715,
-	VRS_WORD_OUT, CRTC_INDEX, 0x0616,
-	VRS_WORD_OUT, CRTC_INDEX, 0xE317,
-
-	VRS_END,
-};
-
-//
-// extra VGA-specific data for vgavidmodes
-//
-vextra_t	extra320x200x256linear = {
-	1, vrsnull
-};
-vextra_t	extra320x200x256planar = {
-	1, vrs320x200x256planar
-};
-vextra_t	extra360x200x256planar = {
-	1, vrs360x200x256planar
-};
-vextra_t	extra320x240x256planar = {
-	1, vrs320x240x256planar
-};
-vextra_t	extra360x240x256planar = {
-	1, vrs360x240x256planar
-};
-vextra_t	extra320x350x256planar = {
-	1, vrs320x350x256planar
-};
-vextra_t	extra360x350x256planar = {
-	1, vrs360x350x256planar
-};
-vextra_t	extra320x400x256planar = {
-	1, vrs320x400x256planar
-};
-vextra_t	extra360x400x256planar = {
-	1, vrs360x400x256planar
-};
-vextra_t	extra320x480x256planar = {
-	1, vrs320x480x256planar
-};
-vextra_t	extra360x480x256planar = {
-	1, vrs360x480x256planar
-};
-
-//
-// base mode descriptors, in ascending order of number of pixels
-//
-
-vmode_t	vgavidmodes[] = {
-{
-	NULL,
-	"320x200", "    ***** standard VGA modes *****    ",
-	320, 200, (200.0/320.0)*(320.0/240.0), 320, 0, 1, &extra320x200x256linear,
-	VGA_InitMode, VGA_SwapBuffers, VGA_SetPalette,
-	VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"320x200", "    ***** Mode X-style modes *****    ",
-	320, 200, (200.0/320.0)*(320.0/240.0), 320, 1, 1, &extra320x200x256planar,
-	VGA_InitMode, VGA_SwapBuffers, VGA_SetPalette,
-	VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"360x200", NULL, 360, 200, (200.0/360.0)*(320.0/240.0),
-	384, 1, 1, &extra360x200x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"320x240", NULL, 320, 240, (240.0/320.0)*(320.0/240.0),
-	320, 1, 1, &extra320x240x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"360x240", NULL, 360, 240, (240.0/360.0)*(320.0/240.0),
-	384, 1, 1, &extra360x240x256planar,
-	VGA_InitMode, VGA_SwapBuffers, VGA_SetPalette,
-	VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"320x350", NULL, 320, 350, (350.0/320.0)*(320.0/240.0),
-	320, 1, 1, &extra320x350x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"360x350", NULL, 360, 350, (350.0/360.0)*(320.0/240.0),
-	384, 1, 1, &extra360x350x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"320x400", NULL, 320, 400, (400.0/320.0)*(320.0/240.0), 320,
-	1, 1, &extra320x400x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"360x400", NULL, 360, 400, (400.0/360.0)*(320.0/240.0),
-	384, 1, 1, &extra360x400x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"320x480", NULL, 320, 480, (480.0/320.0)*(320.0/240.0),
-	320, 1, 1, &extra320x480x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-{
-	NULL,
-	"360x480", NULL, 360, 480, (480.0/360.0)*(320.0/240.0),
-	384, 1, 1, &extra360x480x256planar, VGA_InitMode,
-	VGA_SwapBuffers, 
-	VGA_SetPalette, VGA_BeginDirectRect, VGA_EndDirectRect
-},
-};
-
--- a/u/vid_dos.c
+++ /dev/null
@@ -1,778 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// vid_dos.c: DOS-specific video routines
-//
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <dos.h>
-#include <dpmi.h>
-#include <go32.h>
-
-#include "quakedef.h"
-#include "d_local.h"
-#include "dosisms.h"
-#include "vid_dos.h"
-
-int			vid_modenum;
-vmode_t		*pcurrentmode = NULL;
-int			vid_testingmode, vid_realmode;
-double		vid_testendtime;
-
-cvar_t		vid_mode = {"vid_mode","0", false};
-cvar_t		vid_wait = {"vid_wait","0"};
-cvar_t		vid_nopageflip = {"vid_nopageflip","0", true};
-cvar_t		_vid_wait_override = {"_vid_wait_override", "0", true};
-cvar_t		_vid_default_mode = {"_vid_default_mode","0", true};
-cvar_t		_vid_default_mode_win = {"_vid_default_mode_win","1", true};
-cvar_t		vid_config_x = {"vid_config_x","800", true};
-cvar_t		vid_config_y = {"vid_config_y","600", true};
-cvar_t		vid_stretch_by_2 = {"vid_stretch_by_2","1", true};
-cvar_t		_windowed_mouse = {"_windowed_mouse","0", true};
-cvar_t		vid_fullscreen_mode = {"vid_fullscreen_mode","3", true};
-cvar_t		vid_windowed_mode = {"vid_windowed_mode","0", true};
-cvar_t		block_switch = {"block_switch","0", true};
-cvar_t		vid_window_x = {"vid_window_x", "0", true};
-cvar_t		vid_window_y = {"vid_window_y", "0", true};
-
-int	d_con_indirect = 0;
-
-int		numvidmodes;
-vmode_t	*pvidmodes;
-
-static int	firstupdate = 1;
-
-extern regs_t regs;
-
-void VID_TestMode_f (void);
-void VID_NumModes_f (void);
-void VID_DescribeCurrentMode_f (void);
-void VID_DescribeMode_f (void);
-void VID_DescribeModes_f (void);
-
-byte	vid_current_palette[768];	// save for mode changes
-
-
-static qboolean	nomodecheck = false;
-
-unsigned short	d_8to16table[256];	// not used in 8 bpp mode
-unsigned		d_8to24table[256];	// not used in 8 bpp mode
-
-void VID_MenuDraw (void);
-void VID_MenuKey (int key);
-
-
-/*
-================
-VID_Init
-================
-*/
-void    VID_Init (unsigned char *palette)
-{
-	Cvar_RegisterVariable (&vid_mode);
-	Cvar_RegisterVariable (&vid_wait);
-	Cvar_RegisterVariable (&vid_nopageflip);
-	Cvar_RegisterVariable (&_vid_wait_override);
-	Cvar_RegisterVariable (&_vid_default_mode);
-	Cvar_RegisterVariable (&_vid_default_mode_win);
-	Cvar_RegisterVariable (&vid_config_x);
-	Cvar_RegisterVariable (&vid_config_y);
-	Cvar_RegisterVariable (&vid_stretch_by_2);
-	Cvar_RegisterVariable (&_windowed_mouse);
-	Cvar_RegisterVariable (&vid_fullscreen_mode);
-	Cvar_RegisterVariable (&vid_windowed_mode);
-	Cvar_RegisterVariable (&block_switch);
-
-	Cmd_AddCommand ("vid_testmode", VID_TestMode_f);
-	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);
-	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f);
-	Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f);
-	Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f);
-
-// set up the mode list; note that later inits link in their modes ahead of
-// earlier ones, so the standard VGA modes are always first in the list. This
-// is important because mode 0 must always be VGA mode 0x13
-	if (!COM_CheckParm ("-stdvid"))
-		VID_InitExtra ();
-	VGA_Init ();
-
-	vid_testingmode = 0;
-
-	vid_modenum = vid_mode.value;
-
-	VID_SetMode (vid_modenum, palette);
-
-	vid_realmode = vid_modenum;
-	
-	vid_menudrawfn = VID_MenuDraw;
-	vid_menukeyfn = VID_MenuKey;
-}
-
-
-/*
-=================
-VID_GetModePtr
-=================
-*/
-vmode_t *VID_GetModePtr (int modenum)
-{
-	vmode_t	*pv;
-
-	pv = pvidmodes;
-	if (!pv)
-		Sys_Error ("VID_GetModePtr: empty vid mode list");
-
-	while (modenum--)
-	{
-		pv = pv->pnext;
-		if (!pv)
-			Sys_Error ("VID_GetModePtr: corrupt vid mode list");
-	}
-
-	return pv;
-}
-
-/*
-================
-VID_NumModes
-================
-*/
-int VID_NumModes ()
-{
-	return (numvidmodes);
-}
-
-
-/*
-================
-VID_ModeInfo
-================
-*/
-char *VID_ModeInfo (int modenum, char **ppheader)
-{
-	static char	*badmodestr = "Bad mode number";
-	vmode_t		*pv;
-
-	pv = VID_GetModePtr (modenum);
-
-	if (!pv)
-	{
-		if (ppheader)
-			*ppheader = NULL;
-		return badmodestr;
-	}
-	else
-	{
-		if (ppheader)
-			*ppheader = pv->header;
-		return pv->name;
-	}
-}
-
-
-/*
-================
-VID_SetMode 
-================
-*/
-int VID_SetMode (int modenum, unsigned char *palette)
-{
-	int		stat;
-	vmode_t	*pnewmode, *poldmode;
-
-	if ((modenum >= numvidmodes) || (modenum < 0))
-	{
-		Cvar_SetValue ("vid_mode", (float)vid_modenum);
-
-		nomodecheck = true;
-		Con_Printf ("No such video mode: %d\n", modenum);
-		nomodecheck = false;
-
-		if (pcurrentmode == NULL)
-		{
-			modenum = 0;	// mode hasn't been set yet, so initialize to base
-							//  mode since they gave us an invalid initial mode
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	pnewmode = VID_GetModePtr (modenum);
-
-	if (pnewmode == pcurrentmode)
-		return 1;	// already in the desired mode
-
-// initialize the new mode
-	poldmode = pcurrentmode;
-	pcurrentmode = pnewmode;
-
-	vid.width = pcurrentmode->width;
-	vid.height = pcurrentmode->height;
-	vid.aspect = pcurrentmode->aspect;
-	vid.rowbytes = pcurrentmode->rowbytes;
-
-	stat = (*pcurrentmode->setmode) (&vid, pcurrentmode);
-
-	if (stat < 1)
-	{
-		if (stat == 0)
-		{
-		// real, hard failure that requires resetting the mode
-			if (!VID_SetMode (vid_modenum, palette))	// restore prior mode
-				Sys_Error ("VID_SetMode: Unable to set any mode, probably "
-						   "because there's not enough memory available");
-			Con_Printf ("Failed to set mode %d\n", modenum);
-			return 0;
-		}
-		else if (stat == -1)
-		{
-		// not enough memory; just put things back the way they were
-			pcurrentmode = poldmode;
-			vid.width = pcurrentmode->width;
-			vid.height = pcurrentmode->height;
-			vid.aspect = pcurrentmode->aspect;
-			vid.rowbytes = pcurrentmode->rowbytes;
-			return 0;
-		}
-		else
-		{
-			Sys_Error ("VID_SetMode: invalid setmode return code %d");
-		}
-	}
-
-	(*pcurrentmode->setpalette) (&vid, pcurrentmode, palette);
-
-	vid_modenum = modenum;
-	Cvar_SetValue ("vid_mode", (float)vid_modenum);
-
-	nomodecheck = true;
-	Con_Printf ("%s\n", VID_ModeInfo (vid_modenum, NULL));
-	nomodecheck = false;
-
-	vid.recalc_refdef = 1;
-
-	return 1;
-}
-
-
-/*
-================
-VID_SetPalette
-================
-*/
-void    VID_SetPalette (unsigned char *palette)
-{
-	if (palette != vid_current_palette)
-		Q_memcpy(vid_current_palette, palette, 768);
-	(*pcurrentmode->setpalette)(&vid, pcurrentmode, vid_current_palette);
-}
-
-
-/*
-================
-VID_ShiftPalette
-================
-*/
-void    VID_ShiftPalette (unsigned char *palette)
-{
-
-	VID_SetPalette (palette);
-}
-
-
-/*
-================
-VID_Shutdown
-================
-*/
-void VID_Shutdown (void)
-{
-
-	regs.h.ah = 0;
-	regs.h.al = 0x3;
-	dos_int86(0x10);
-
-	vid_testingmode = 0;
-}
-
-
-/*
-================
-VID_Update
-================
-*/
-void    VID_Update (vrect_t *rects)
-{
-	if (firstupdate && _vid_default_mode.value)
-	{
-		if(_vid_default_mode.value >= numvidmodes)
-			Cvar_SetValue ("_vid_default_mode", 0);
-
-		firstupdate = 0;
-		Cvar_SetValue ("vid_mode", _vid_default_mode.value);
-	}
-
-	(*pcurrentmode->swapbuffers)(&vid, pcurrentmode, rects);
-
-	if (!nomodecheck)
-	{
-		if (vid_testingmode)
-		{
-			if (realtime >= vid_testendtime)
-			{
-				VID_SetMode (vid_realmode, vid_current_palette);
-				vid_testingmode = 0;
-			}
-		}
-		else
-		{
-			if (vid_mode.value != vid_realmode)
-			{
-				VID_SetMode ((int)vid_mode.value, vid_current_palette);
-				Cvar_SetValue ("vid_mode", (float)vid_modenum);
-									// so if mode set fails, we don't keep on
-									//  trying to set that mode
-				vid_realmode = vid_modenum;
-			}
-		}
-	}
-}
-
-
-/*
-=================
-VID_NumModes_f
-=================
-*/
-void VID_NumModes_f (void)
-{
-	int		nummodes;
-
-	nummodes = VID_NumModes ();
-	if (nummodes == 1)
-		Con_Printf ("%d video mode is available\n", VID_NumModes ());
-	else
-		Con_Printf ("%d video modes are available\n", VID_NumModes ());
-}
-
-
-/*
-=================
-VID_DescribeCurrentMode_f
-=================
-*/
-void VID_DescribeCurrentMode_f (void)
-{
-	Con_Printf ("%s\n", VID_ModeInfo (vid_modenum, NULL));
-}
-
-
-/*
-=================
-VID_DescribeMode_f
-=================
-*/
-void VID_DescribeMode_f (void)
-{
-	int		modenum;
-	
-	modenum = Q_atoi (Cmd_Argv(1));
-
-	Con_Printf ("%s\n", VID_ModeInfo (modenum, NULL));
-}
-
-
-/*
-=================
-VID_DescribeModes_f
-=================
-*/
-void VID_DescribeModes_f (void)
-{
-	int			i, nummodes;
-	char		*pinfo, *pheader;
-	vmode_t		*pv;
-	qboolean	na;
-
-	na = false;
-
-	nummodes = VID_NumModes ();
-	for (i=0 ; i<nummodes ; i++)
-	{
-		pv = VID_GetModePtr (i);
-		pinfo = VID_ModeInfo (i, &pheader);
-		if (pheader)
-			Con_Printf ("\n%s\n", pheader);
-
-		if (VGA_CheckAdequateMem (pv->width, pv->height, pv->rowbytes,
-			(pv->numpages == 1) || vid_nopageflip.value))
-		{
-			Con_Printf ("%2d: %s\n", i, pinfo);
-		}
-		else
-		{
-			Con_Printf ("**: %s\n", pinfo);
-			na = true;
-		}
-	}
-
-	if (na)
-	{
-		Con_Printf ("\n[**: not enough system RAM for mode]\n");
-	}
-}
-
-
-/*
-=================
-VID_GetModeDescription
-=================
-*/
-char *VID_GetModeDescription (int mode)
-{
-	char		*pinfo, *pheader;
-	vmode_t		*pv;
-
-	pv = VID_GetModePtr (mode);
-	pinfo = VID_ModeInfo (mode, &pheader);
-
-	if (VGA_CheckAdequateMem (pv->width, pv->height, pv->rowbytes,
-		(pv->numpages == 1) || vid_nopageflip.value))
-	{
-		return pinfo;
-	}
-	else
-	{
-		return NULL;
-	}
-}
-
-
-/*
-=================
-VID_TestMode_f
-=================
-*/
-void VID_TestMode_f (void)
-{
-	int		modenum;
-	double	testduration;
-
-	if (!vid_testingmode)
-	{
-		modenum = Q_atoi (Cmd_Argv(1));
-
-		if (VID_SetMode (modenum, vid_current_palette))
-		{
-			vid_testingmode = 1;
-			testduration = Q_atof (Cmd_Argv(2));
-			if (testduration == 0)
-				testduration = 5.0;
-			vid_testendtime = realtime + testduration;
-		}
-	}
-}
-
-
-/*
-================
-D_BeginDirectRect
-================
-*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-
-	if (!vid.direct || !pcurrentmode)
-		return;
-
-	if ((width > 24) || (height > 24) || (width < 1) || (height < 1))
-		return;
-
-	if (width & 0x03)
-		return;
-
-	(*pcurrentmode->begindirectrect) (&vid, pcurrentmode, x, y, pbitmap, width,
-									  height);
-}
-
-
-/*
-================
-D_EndDirectRect
-================
-*/
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-
-	if (!vid.direct || !pcurrentmode)
-		return;
-
-	if ((width > 24) || (height > 24) || (width < 1) || (height < 1))
-		return;
-
-	if ((width & 0x03) || (height & 0x03))
-		return;
-
-	(*pcurrentmode->enddirectrect) (&vid, pcurrentmode, x, y, width, height);
-}
-
-
-//===========================================================================
-
-extern void M_Menu_Options_f (void);
-extern void M_Print (int cx, int cy, char *str);
-extern void M_PrintWhite (int cx, int cy, char *str);
-extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawTransPic (int x, int y, qpic_t *pic);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
-
-static int	vid_line, vid_wmodes, vid_column_size;
-
-typedef struct
-{
-	int		modenum;
-	char	*desc;
-	int		iscur;
-} modedesc_t;
-
-#define MAX_COLUMN_SIZE	11
-
-#define MAX_MODEDESCS	(MAX_COLUMN_SIZE*3)
-
-static modedesc_t	modedescs[MAX_MODEDESCS];
-
-/*
-================
-VID_MenuDraw
-================
-*/
-void VID_MenuDraw (void)
-{
-	qpic_t		*p;
-	char		*ptr;
-	int			nummodes, i, j, column, row, dup;
-	char		temp[100];
-
-	vid_wmodes = 0;
-	nummodes = VID_NumModes ();
-	
-	p = Draw_CachePic ("gfx/vidmodes.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, p);
-
-	for (i=0 ; i<nummodes ; i++)
-	{
-		if (vid_wmodes < MAX_MODEDESCS)
-		{
-			if (i != 1)
-			{
-				ptr = VID_GetModeDescription (i);
-
-				if (ptr)
-				{
-					dup = 0;
-
-					for (j=0 ; j<vid_wmodes ; j++)
-					{
-						if (!strcmp (modedescs[j].desc, ptr))
-						{
-							if (modedescs[j].modenum != 0)
-							{
-								modedescs[j].modenum = i;
-								dup = 1;
-
-								if (i == vid_modenum)
-									modedescs[j].iscur = 1;
-							}
-							else
-							{
-								dup = 1;
-							}
-
-							break;
-						}
-					}
-
-					if (!dup)
-					{
-						modedescs[vid_wmodes].modenum = i;
-						modedescs[vid_wmodes].desc = ptr;
-						modedescs[vid_wmodes].iscur = 0;
-
-						if (i == vid_modenum)
-							modedescs[vid_wmodes].iscur = 1;
-
-						vid_wmodes++;
-					}
-				}
-			}
-		}
-	}
-
-	vid_column_size = (vid_wmodes + 2) / 3;
-
-	column = 16;
-	row = 36;
-
-	for (i=0 ; i<vid_wmodes ; i++)
-	{
-		if (modedescs[i].iscur)
-			M_PrintWhite (column, row, modedescs[i].desc);
-		else
-			M_Print (column, row, modedescs[i].desc);
-
-		row += 8;
-
-		if ((i % vid_column_size) == (vid_column_size - 1))
-		{
-			column += 13*8;
-			row = 36;
-		}
-	}
-
-// line cursor
-	if (vid_testingmode)
-	{
-		sprintf (temp, "TESTING %s",
-				modedescs[vid_line].desc);
-		M_Print (13*8, 36 + MAX_COLUMN_SIZE * 8 + 8*4, temp);
-		M_Print (9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6,
-				"Please wait 5 seconds...");
-	}
-	else
-	{
-		M_Print (9*8, 36 + MAX_COLUMN_SIZE * 8 + 8,
-				"Press Enter to set mode");
-		M_Print (6*8, 36 + MAX_COLUMN_SIZE * 8 + 8*3,
-				"T to test mode for 5 seconds");
-		ptr = VID_GetModeDescription (vid_modenum);
-		sprintf (temp, "D to make %s the default", ptr);
-		M_Print (6*8, 36 + MAX_COLUMN_SIZE * 8 + 8*5, temp);
-		ptr = VID_GetModeDescription ((int)_vid_default_mode.value);
-
-		if (ptr)
-		{
-			sprintf (temp, "Current default is %s", ptr);
-			M_Print (7*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, temp);
-		}
-
-		M_Print (15*8, 36 + MAX_COLUMN_SIZE * 8 + 8*8,
-				"Esc to exit");
-
-		row = 36 + (vid_line % vid_column_size) * 8;
-		column = 8 + (vid_line / vid_column_size) * 13*8;
-
-		M_DrawCharacter (column, row, 12+((int)(realtime*4)&1));
-	}
-}
-
-
-/*
-================
-VID_MenuKey
-================
-*/
-void VID_MenuKey (int key)
-{
-	if (vid_testingmode)
-		return;
-
-	switch (key)
-	{
-	case K_ESCAPE:
-		S_LocalSound ("misc/menu1.wav");
-		M_Menu_Options_f ();
-		break;
-
-	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line--;
-
-		if (vid_line < 0)
-			vid_line = vid_wmodes - 1;
-		break;
-
-	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line++;
-
-		if (vid_line >= vid_wmodes)
-			vid_line = 0;
-		break;
-
-	case K_LEFTARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line -= vid_column_size;
-
-		if (vid_line < 0)
-		{
-			vid_line += ((vid_wmodes + (vid_column_size - 1)) /
-					vid_column_size) * vid_column_size;
-
-			while (vid_line >= vid_wmodes)
-				vid_line -= vid_column_size;
-		}
-		break;
-
-	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line += vid_column_size;
-
-		if (vid_line >= vid_wmodes)
-		{
-			vid_line -= ((vid_wmodes + (vid_column_size - 1)) /
-					vid_column_size) * vid_column_size;
-
-			while (vid_line < 0)
-				vid_line += vid_column_size;
-		}
-		break;
-
-	case K_ENTER:
-		S_LocalSound ("misc/menu1.wav");
-		VID_SetMode (modedescs[vid_line].modenum, vid_current_palette);
-		break;
-
-	case 'T':
-	case 't':
-		S_LocalSound ("misc/menu1.wav");
-		if (VID_SetMode (modedescs[vid_line].modenum, vid_current_palette))
-		{
-			vid_testingmode = 1;
-			vid_testendtime = realtime + 5.0;
-		}
-		break;
-
-	case 'D':
-	case 'd':
-		S_LocalSound ("misc/menu1.wav");
-		firstupdate = 0;
-		Cvar_SetValue ("_vid_default_mode", vid_modenum);
-		break;
-
-	default:
-		break;
-	}
-}
-
--- a/u/vid_dos.h
+++ /dev/null
@@ -1,83 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// vid_dos.h: header file for DOS-specific video stuff
-
-typedef struct vmode_s {
-	struct vmode_s	*pnext;
-	char		*name;
-	char		*header;
-	unsigned	width;
-	unsigned	height;
-	float		aspect;
-	unsigned	rowbytes;
-	int			planar;
-	int			numpages;
-	void		*pextradata;
-	int			(*setmode)(viddef_t *vid, struct vmode_s *pcurrentmode);
-	void		(*swapbuffers)(viddef_t *vid, struct vmode_s *pcurrentmode,
-							   vrect_t *rects);
-	void		(*setpalette)(viddef_t *vid, struct vmode_s *pcurrentmode,
-							  unsigned char *palette);
-	void		(*begindirectrect)(viddef_t *vid, struct vmode_s *pcurrentmode,
-								   int x, int y, byte *pbitmap, int width,
-								   int height);
-	void		(*enddirectrect)(viddef_t *vid, struct vmode_s *pcurrentmode,
-								 int x, int y, int width, int height);
-} vmode_t;
-
-// vid_wait settings
-#define VID_WAIT_NONE			0
-#define VID_WAIT_VSYNC			1
-#define VID_WAIT_DISPLAY_ENABLE	2
-
-extern int		numvidmodes;
-extern vmode_t	*pvidmodes;
-
-extern int		VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes;
-extern byte		*VGA_pagebase;
-extern vmode_t	*VGA_pcurmode;
-
-extern cvar_t	vid_wait;
-extern cvar_t	vid_nopageflip;
-extern cvar_t	_vid_wait_override;
-
-extern unsigned char colormap256[32][256];
-
-extern void	*vid_surfcache;
-extern int	vid_surfcachesize;
-
-void VGA_Init (void);
-void VID_InitVESA (void);
-void VID_InitExtra (void);
-void VGA_WaitVsync (void);
-void VGA_ClearVideoMem (int planar);
-void VGA_SetPalette(viddef_t *vid, vmode_t *pcurrentmode, unsigned char *pal);
-void VGA_SwapBuffersCopy (viddef_t *vid, vmode_t *pcurrentmode,
-	vrect_t *rects);
-qboolean VGA_FreeAndAllocVidbuffer (viddef_t *vid, int allocnewbuffer);
-qboolean VGA_CheckAdequateMem (int width, int height, int rowbytes,
-	int allocnewbuffer);
-void VGA_BeginDirectRect (viddef_t *vid, struct vmode_s *pcurrentmode, int x,
-	int y, byte *pbitmap, int width, int height);
-void VGA_EndDirectRect (viddef_t *vid, struct vmode_s *pcurrentmode, int x,
-	int y, int width, int height);
-void VGA_UpdateLinearScreen (void *srcptr, void *destptr, int width,
-	int height, int srcrowbytes, int destrowbytes);
-
--- a/u/vid_ext.c
+++ /dev/null
@@ -1,795 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// vid_ext.c: extended video modes
-// in this implementation, VESA-specific DOS video stuff
-//
-
-// TODO: make dependencies on vid_vga.c explicit or eliminate them
-
-#include <stdlib.h>
-#include <dos.h>
-
-#include "quakedef.h"
-#include "d_local.h"
-#include "dosisms.h"
-#include "vid_dos.h"
-#include <dpmi.h>
-
-#define MODE_SUPPORTED_IN_HW	0x0001
-#define COLOR_MODE				0x0008
-#define GRAPHICS_MODE			0x0010
-#define VGA_INCOMPATIBLE		0x0020
-#define LINEAR_FRAME_BUFFER		0x0080
-
-#define LINEAR_MODE				0x4000
-
-#define VESA_DONT_WAIT_VSYNC	0		// when page flipping
-#define VESA_WAIT_VSYNC			0x80
-
-#define MAX_VESA_MODES			30	// we'll just take the first 30 if there
-									//  are more
-typedef struct {
-	int			pages[3];			// either 2 or 3 is valid
-	int			vesamode;			// LINEAR_MODE set if linear mode
-	void		*plinearmem;		// linear address of start of frame buffer
-	qboolean	vga_incompatible;
-} vesa_extra_t;
-
-static vmode_t		vesa_modes[MAX_VESA_MODES] =
-	{{NULL, NULL, "    ********* VESA modes *********    "}};
-static vesa_extra_t	vesa_extra[MAX_VESA_MODES];
-static char			names[MAX_VESA_MODES][10];
-
-extern regs_t regs;
-
-static int		VID_currentpage;
-static int		VID_displayedpage;
-static int		*VID_pagelist;
-static byte		*VID_membase;
-static int		VID_banked;
-
-typedef struct
-{
-	int modenum;
-	int mode_attributes;
-	int	winasegment;
-	int	winbsegment;
-	int	bytes_per_scanline; // bytes per logical scanline (+16)
-	int win; // window number (A=0, B=1)
-	int win_size; // window size (+6)
-	int granularity; // how finely i can set the window in vid mem (+4)
-	int width, height; // displayed width and height (+18, +20)
-	int bits_per_pixel; // er, better be 8, 15, 16, 24, or 32 (+25)
-	int bytes_per_pixel; // er, better be 1, 2, or 4
-	int memory_model; // and better be 4 or 6, packed or direct color (+27)
-	int num_pages; // number of complete frame buffer pages (+29)
-	int red_width; // the # of bits in the red component (+31)
-	int red_pos; // the bit position of the red component (+32)
-	int green_width; // etc.. (+33)
-	int green_pos; // (+34)
-	int blue_width; // (+35)
-	int blue_pos; // (+36)
-	int pptr;
-	int	pagesize;
-	int	numpages;
-} modeinfo_t;
-
-static modeinfo_t modeinfo;
-
-// all bytes to avoid problems with compiler field packing
-typedef struct vbeinfoblock_s {
-     byte			VbeSignature[4];
-     byte			VbeVersion[2];
-     byte			OemStringPtr[4];
-     byte			Capabilities[4];
-     byte			VideoModePtr[4];
-     byte			TotalMemory[2];
-     byte			OemSoftwareRev[2];
-     byte			OemVendorNamePtr[4];
-     byte			OemProductNamePtr[4];
-     byte			OemProductRevPtr[4];
-     byte			Reserved[222];
-     byte			OemData[256];
-} vbeinfoblock_t;
-
-static int	totalvidmem;
-static byte	*ppal;
-qboolean	vsync_exists, de_exists;
-
-qboolean VID_ExtraGetModeInfo(int modenum);
-int VID_ExtraInitMode (viddef_t *vid, vmode_t *pcurrentmode);
-void VID_ExtraSwapBuffers (viddef_t *vid, vmode_t *pcurrentmode,
-	vrect_t *rects);
-
-
-/*
-================
-VGA_BankedBeginDirectRect
-================
-*/
-void VGA_BankedBeginDirectRect (viddef_t *lvid, struct vmode_s *pcurrentmode,
-	int x, int y, byte *pbitmap, int width, int height)
-{
-
-	if (!lvid->direct)
-		return;
-
-	regs.x.ax = 0x4f05;
-	regs.x.bx = 0;
-	regs.x.dx = VID_displayedpage;
-	dos_int86(0x10);
-
-	VGA_BeginDirectRect (lvid, pcurrentmode, x, y, pbitmap, width, height);
-
-	regs.x.ax = 0x4f05;
-	regs.x.bx = 0;
-	regs.x.dx = VID_currentpage;
-	dos_int86(0x10);
-}
-
-
-/*
-================
-VGA_BankedEndDirectRect
-================
-*/
-void VGA_BankedEndDirectRect (viddef_t *lvid, struct vmode_s *pcurrentmode,
-	int x, int y, int width, int height)
-{
-
-	if (!lvid->direct)
-		return;
-
-	regs.x.ax = 0x4f05;
-	regs.x.bx = 0;
-	regs.x.dx = VID_displayedpage;
-	dos_int86(0x10);
-
-	VGA_EndDirectRect (lvid, pcurrentmode, x, y, width, height);
-
-	regs.x.ax = 0x4f05;
-	regs.x.bx = 0;
-	regs.x.dx = VID_currentpage;
-	dos_int86(0x10);
-}
-
-
-/*
-================
-VID_SetVESAPalette
-================
-*/
-void VID_SetVESAPalette (viddef_t *lvid, vmode_t *pcurrentmode,
-	unsigned char *pal)
-{
-	int		i;
-	byte	*pp;
-
-	UNUSED(lvid);
-	UNUSED(pcurrentmode);
-
-	pp = ppal;
-
-	for (i=0 ; i<256 ; i++)
-	{
-		pp[2] = pal[0] >> 2;
-		pp[1] = pal[1] >> 2;
-		pp[0] = pal[2] >> 2;
-		pp += 4;
-		pal += 3;
-	}
-
-	regs.x.ax = 0x4F09;
-	regs.x.bx = 0;
-	regs.x.cx = 256;
-	regs.x.dx = 0;
-	regs.x.es = ptr2real(ppal) >> 4;
-	regs.x.di = ptr2real(ppal) & 0xf;
-	dos_int86(0x10);
-
-	if (regs.x.ax != 0x4f)
-		Sys_Error ("Unable to load VESA palette\n");
-}
-
-
-
-
-/*
-================
-VID_ExtraFarToLinear
-================
-*/
-void *VID_ExtraFarToLinear (void *ptr)
-{
-	int		temp;
-
-	temp = (int)ptr;
-	return real2ptr(((temp & 0xFFFF0000) >> 12) + (temp & 0xFFFF));
-}
-
-
-/*
-================
-VID_ExtraWaitDisplayEnable
-================
-*/
-void VID_ExtraWaitDisplayEnable ()
-{
-	while ((inportb (0x3DA) & 0x01) == 1)
-		;
-}
-
-
-/*
-================
-VID_ExtraVidLookForState
-================
-*/
-qboolean VID_ExtraVidLookForState (unsigned state, unsigned mask)
-{
-	int		i;
-	double	starttime, time;
-
-	starttime = Sys_FloatTime ();
-
-	do
-	{
-		for (i=0 ; i<100000 ; i++)
-		{
-			if ((inportb (0x3DA) & mask) == state)
-				return true;
-		}
-
-		time = Sys_FloatTime ();
-	} while ((time - starttime) < 0.1);
-
-	return false;
-}
-
-
-/*
-================
-VID_ExtraStateFound
-================
-*/
-qboolean VID_ExtraStateFound (unsigned state)
-{
-	int		i, workingstate;
-
-	workingstate = 0;
-
-	for (i=0 ; i<10 ; i++)
-	{
-		if (!VID_ExtraVidLookForState(workingstate, state))
-		{
-			return false;
-		}
-
-		workingstate ^= state;
-	}
-
-	return true;
-}
-
-
-/*
-================
-VID_InitExtra
-================
-*/
-void VID_InitExtra (void)
-{
-	int				nummodes;
-	short			*pmodenums;
-	vbeinfoblock_t	*pinfoblock;
-	__dpmi_meminfo	phys_mem_info;
-
-	pinfoblock = dos_getmemory(sizeof(vbeinfoblock_t));
-
-	*(long *)pinfoblock->VbeSignature = 'V' + ('B'<<8) + ('E'<<16) + ('2'<<24);
-
-// see if VESA support is available
-	regs.x.ax = 0x4f00;
-	regs.x.es = ptr2real(pinfoblock) >> 4;
-	regs.x.di = ptr2real(pinfoblock) & 0xf;
-	dos_int86(0x10);
-
-	if (regs.x.ax != 0x4f)
-		return;		// no VESA support
-
-	if (pinfoblock->VbeVersion[1] < 0x02)
-		return;		// not VESA 2.0 or greater
-
-	Con_Printf ("VESA 2.0 compliant adapter:\n%s\n",
-				VID_ExtraFarToLinear (*(byte **)&pinfoblock->OemStringPtr[0]));
-
-	totalvidmem = *(unsigned short *)&pinfoblock->TotalMemory[0] << 16;
-
-	pmodenums = (short *)
-			VID_ExtraFarToLinear (*(byte **)&pinfoblock->VideoModePtr[0]);
-
-// find 8 bit modes until we either run out of space or run out of modes
-	nummodes = 0;
-
-	while ((*pmodenums != -1) && (nummodes < MAX_VESA_MODES))
-	{
-		if (VID_ExtraGetModeInfo (*pmodenums))
-		{
-			vesa_modes[nummodes].pnext = &vesa_modes[nummodes+1];
-			if (modeinfo.width > 999)
-			{
-				if (modeinfo.height > 999)
-				{
-					sprintf (&names[nummodes][0], "%4dx%4d", modeinfo.width,
-							 modeinfo.height);
-					names[nummodes][9] = 0;
-				}
-				else
-				{
-					sprintf (&names[nummodes][0], "%4dx%3d", modeinfo.width,
-							 modeinfo.height);
-					names[nummodes][8] = 0;
-				}
-			}
-			else
-			{
-				if (modeinfo.height > 999)
-				{
-					sprintf (&names[nummodes][0], "%3dx%4d", modeinfo.width,
-							 modeinfo.height);
-					names[nummodes][8] = 0;
-				}
-				else
-				{
-					sprintf (&names[nummodes][0], "%3dx%3d", modeinfo.width,
-							 modeinfo.height);
-					names[nummodes][7] = 0;
-				}
-			}
-
-			vesa_modes[nummodes].name = &names[nummodes][0];
-			vesa_modes[nummodes].width = modeinfo.width;
-			vesa_modes[nummodes].height = modeinfo.height;
-			vesa_modes[nummodes].aspect =
-					((float)modeinfo.height / (float)modeinfo.width) *
-					(320.0 / 240.0);
-			vesa_modes[nummodes].rowbytes = modeinfo.bytes_per_scanline;
-			vesa_modes[nummodes].planar = 0;
-			vesa_modes[nummodes].pextradata = &vesa_extra[nummodes];
-			vesa_modes[nummodes].setmode = VID_ExtraInitMode;
-			vesa_modes[nummodes].swapbuffers = VID_ExtraSwapBuffers;
-			vesa_modes[nummodes].setpalette = VID_SetVESAPalette;
-
-			if (modeinfo.mode_attributes & LINEAR_FRAME_BUFFER)
-			{
-			// add linear bit to mode for linear modes
-				vesa_extra[nummodes].vesamode = modeinfo.modenum | LINEAR_MODE;
-				vesa_extra[nummodes].pages[0] = 0;
-				vesa_extra[nummodes].pages[1] = modeinfo.pagesize;
-				vesa_extra[nummodes].pages[2] = modeinfo.pagesize * 2;
-				vesa_modes[nummodes].numpages = modeinfo.numpages;
-
-				vesa_modes[nummodes].begindirectrect = VGA_BeginDirectRect;
-				vesa_modes[nummodes].enddirectrect = VGA_EndDirectRect;
-
-				phys_mem_info.address = (int)modeinfo.pptr;
-				phys_mem_info.size = 0x400000;
-
-				if (__dpmi_physical_address_mapping(&phys_mem_info))
-					goto NextMode;
-
-				vesa_extra[nummodes].plinearmem =
-						 real2ptr (phys_mem_info.address);
-			}
-			else
-			{
-			// banked at 0xA0000
-				vesa_extra[nummodes].vesamode = modeinfo.modenum;
-				vesa_extra[nummodes].pages[0] = 0;
-				vesa_extra[nummodes].plinearmem =
-						real2ptr(modeinfo.winasegment<<4);
-
-				vesa_modes[nummodes].begindirectrect =
-						VGA_BankedBeginDirectRect;
-				vesa_modes[nummodes].enddirectrect = VGA_BankedEndDirectRect;
-				vesa_extra[nummodes].pages[1] = modeinfo.pagesize;
-				vesa_extra[nummodes].pages[2] = modeinfo.pagesize * 2;
-				vesa_modes[nummodes].numpages = modeinfo.numpages;
-			}
-
-			vesa_extra[nummodes].vga_incompatible =
-					modeinfo.mode_attributes & VGA_INCOMPATIBLE;
-
-			nummodes++;
-		}
-NextMode:
-		pmodenums++;
-	}
-
-// add the VESA modes at the start of the mode list (if there are any)
-	if (nummodes)
-	{
-		vesa_modes[nummodes-1].pnext = pvidmodes;
-		pvidmodes = &vesa_modes[0];
-		numvidmodes += nummodes;
-		ppal = dos_getmemory(256*4);
-	}
-
-	dos_freememory(pinfoblock);
-}
-
-
-/*
-================
-VID_ExtraGetModeInfo
-================
-*/
-qboolean VID_ExtraGetModeInfo(int modenum)
-{
-	char	*infobuf;
-	int		numimagepages;
-
-	infobuf = dos_getmemory(256);
-
-	regs.x.ax = 0x4f01;
-	regs.x.cx = modenum;
-	regs.x.es = ptr2real(infobuf) >> 4;
-	regs.x.di = ptr2real(infobuf) & 0xf;
-	dos_int86(0x10);
-	if (regs.x.ax != 0x4f)
-	{
-		return false;
-	}
-	else
-	{
-		modeinfo.modenum = modenum;
-		modeinfo.bits_per_pixel = *(char*)(infobuf+25);
-		modeinfo.bytes_per_pixel = (modeinfo.bits_per_pixel+1)/8;
-		modeinfo.width = *(short*)(infobuf+18);
-		modeinfo.height = *(short*)(infobuf+20);
-
-	// we do only 8-bpp in software
-		if ((modeinfo.bits_per_pixel != 8) ||
-			(modeinfo.bytes_per_pixel != 1) ||
-			(modeinfo.width > MAXWIDTH) ||
-			(modeinfo.height > MAXHEIGHT))
-		{
-			return false;
-		}
-
-		modeinfo.mode_attributes = *(short*)infobuf;
-
-	// we only want color graphics modes that are supported by the hardware
-		if ((modeinfo.mode_attributes &
-			 (MODE_SUPPORTED_IN_HW | COLOR_MODE | GRAPHICS_MODE)) !=
-			(MODE_SUPPORTED_IN_HW | COLOR_MODE | GRAPHICS_MODE))
-		{
-			return false;
-		}
-
-	// we only work with linear frame buffers, except for 320x200, which can
-	// effectively be linear when banked at 0xA000
-		if (!(modeinfo.mode_attributes & LINEAR_FRAME_BUFFER))
-		{
-			if ((modeinfo.width != 320) || (modeinfo.height != 200))
-				return false;
-		}
-
-		modeinfo.bytes_per_scanline = *(short*)(infobuf+16);
-
-		modeinfo.pagesize = modeinfo.bytes_per_scanline * modeinfo.height;
-
-		if (modeinfo.pagesize > totalvidmem)
-			return false;
-
-	// force to one page if the adapter reports it doesn't support more pages
-	// than that, no matter how much memory it has--it may not have hardware
-	// support for page flipping
-		numimagepages = *(unsigned char *)(infobuf+29);
-
-		if (numimagepages <= 0)
-		{
-		// wrong, but there seems to be an ATI VESA driver that reports 0
-			modeinfo.numpages = 1;
-		}
-		else if (numimagepages < 3)
-		{
-			modeinfo.numpages = numimagepages;
-		}
-		else
-		{
-			modeinfo.numpages = 3;
-		}
-
-		if (*(char*)(infobuf+2) & 5)
-		{
-			modeinfo.winasegment = *(unsigned short*)(infobuf+8);
-			modeinfo.win = 0;
-		}
-		else if (*(char*)(infobuf+3) & 5)
-		{
-			modeinfo.winbsegment = *(unsigned short*)(infobuf+8);
-			modeinfo.win = 1;
-		}
-		modeinfo.granularity = *(short*)(infobuf+4) * 1024;
-		modeinfo.win_size = *(short*)(infobuf+6) * 1024;
-		modeinfo.bits_per_pixel = *(char*)(infobuf+25);
-		modeinfo.bytes_per_pixel = (modeinfo.bits_per_pixel+1)/8;
-		modeinfo.memory_model = *(unsigned char*)(infobuf+27);
-		modeinfo.num_pages = *(char*)(infobuf+29) + 1;
-
-		modeinfo.red_width = *(char*)(infobuf+31);
-		modeinfo.red_pos = *(char*)(infobuf+32);
-		modeinfo.green_width = *(char*)(infobuf+33);
-		modeinfo.green_pos = *(char*)(infobuf+34);
-		modeinfo.blue_width = *(char*)(infobuf+35);
-		modeinfo.blue_pos = *(char*)(infobuf+36);
-
-		modeinfo.pptr = *(long *)(infobuf+40);
-
-#if 0
-		printf("VID: (VESA) info for mode 0x%x\n", modeinfo.modenum);
-		printf("  mode attrib = 0x%0x\n", modeinfo.mode_attributes);
-		printf("  win a attrib = 0x%0x\n", *(unsigned char*)(infobuf+2));
-		printf("  win b attrib = 0x%0x\n", *(unsigned char*)(infobuf+3));
-		printf("  win a seg 0x%0x\n", (int) modeinfo.winasegment);
-		printf("  win b seg 0x%0x\n", (int) modeinfo.winbsegment);
-		printf("  bytes per scanline = %d\n",
-				modeinfo.bytes_per_scanline);
-		printf("  width = %d, height = %d\n", modeinfo.width,
-				modeinfo.height);
-		printf("  win = %c\n", 'A' + modeinfo.win);
-		printf("  win granularity = %d\n", modeinfo.granularity);
-		printf("  win size = %d\n", modeinfo.win_size);
-		printf("  bits per pixel = %d\n", modeinfo.bits_per_pixel);
-		printf("  bytes per pixel = %d\n", modeinfo.bytes_per_pixel);
-		printf("  memory model = 0x%x\n", modeinfo.memory_model);
-		printf("  num pages = %d\n", modeinfo.num_pages);
-		printf("  red width = %d\n", modeinfo.red_width);
-		printf("  red pos = %d\n", modeinfo.red_pos);
-		printf("  green width = %d\n", modeinfo.green_width);
-		printf("  green pos = %d\n", modeinfo.green_pos);
-		printf("  blue width = %d\n", modeinfo.blue_width);
-		printf("  blue pos = %d\n", modeinfo.blue_pos);
-		printf("  phys mem = %x\n", modeinfo.pptr);
-#endif
-	}
-
-	dos_freememory(infobuf);
-
-	return true;
-}
-
-
-/*
-================
-VID_ExtraInitMode
-================
-*/
-int VID_ExtraInitMode (viddef_t *lvid, vmode_t *pcurrentmode)
-{
-	vesa_extra_t	*pextra;
-	int				pageoffset;
-
-	pextra = pcurrentmode->pextradata;
-
-	if (vid_nopageflip.value)
-		lvid->numpages = 1;
-	else
-		lvid->numpages = pcurrentmode->numpages;
-
-// clean up any old vid buffer lying around, alloc new if needed
-	if (!VGA_FreeAndAllocVidbuffer (lvid, lvid->numpages == 1))
-		return -1;	// memory alloc failed
-
-// clear the screen and wait for the next frame. VGA_pcurmode, which
-// VGA_ClearVideoMem relies on, is guaranteed to be set because mode 0 is
-// always the first mode set in a session
-	if (VGA_pcurmode)
-		VGA_ClearVideoMem (VGA_pcurmode->planar);
-
-// set the mode
-	regs.x.ax = 0x4f02;
-	regs.x.bx = pextra->vesamode;
-	dos_int86(0x10);
-
-	if (regs.x.ax != 0x4f)
-		return 0;
-
-	VID_banked = !(pextra->vesamode & LINEAR_MODE);
-	VID_membase = pextra->plinearmem;
-	VGA_width = lvid->width;
-	VGA_height = lvid->height;
-	VGA_rowbytes = lvid->rowbytes;
-
-	lvid->colormap = host_colormap;
-
-	VID_pagelist = &pextra->pages[0];
-
-// wait for display enable by default only when triple-buffering on a VGA-
-// compatible machine that actually has a functioning display enable status
-	vsync_exists = VID_ExtraStateFound (0x08);
-	de_exists = VID_ExtraStateFound (0x01);
-
-	if (!pextra->vga_incompatible  &&
-		(lvid->numpages == 3)      &&
-		de_exists                  &&
-		(_vid_wait_override.value == 0.0))
-	{
-		Cvar_SetValue ("vid_wait", (float)VID_WAIT_DISPLAY_ENABLE);
-
-		VID_displayedpage = 0;
-		VID_currentpage = 1;
-	}
-	else
-	{
-		if ((lvid->numpages == 1) && (_vid_wait_override.value == 0.0))
-		{
-			Cvar_SetValue ("vid_wait", (float)VID_WAIT_NONE);
-			VID_displayedpage = VID_currentpage = 0;
-		}
-		else
-		{
-			Cvar_SetValue ("vid_wait", (float)VID_WAIT_VSYNC);
-
-			VID_displayedpage = 0;
-
-			if (lvid->numpages > 1)
-				VID_currentpage = 1;
-			else
-				VID_currentpage = 0;
-		}
-	}
-
-// TODO: really should be a call to a function
-	pageoffset = VID_pagelist[VID_displayedpage];
-
-	regs.x.ax = 0x4f07;
-	regs.x.bx = 0x80;	// wait for vsync so we know page 0 is visible
-	regs.x.cx = pageoffset % VGA_rowbytes;
-	regs.x.dx = pageoffset / VGA_rowbytes;
-	dos_int86(0x10);
-
-	if (VID_banked)
-	{
-		regs.x.ax = 0x4f05;
-		regs.x.bx = 0;
-		regs.x.dx = VID_currentpage;
-		dos_int86(0x10);
-
-		VGA_pagebase = VID_membase;
-	}
-	else
-	{
-		VGA_pagebase = VID_membase + VID_pagelist[VID_currentpage];
-	}
-
-	if (lvid->numpages > 1)
-	{
-		lvid->buffer = VGA_pagebase;
-		lvid->conbuffer = lvid->buffer;
-	}
-	else
-	{
-		lvid->rowbytes = lvid->width;
-	}
-
-	lvid->direct = VGA_pagebase;
-	lvid->conrowbytes = lvid->rowbytes;
-	lvid->conwidth = lvid->width;
-	lvid->conheight = lvid->height;
-
-	lvid->maxwarpwidth = WARP_WIDTH;
-	lvid->maxwarpheight = WARP_HEIGHT;
-
-	VGA_pcurmode = pcurrentmode;
-
-	D_InitCaches (vid_surfcache, vid_surfcachesize);
-
-	return 1;
-}
-
-
-/*
-================
-VID_ExtraSwapBuffers
-================
-*/
-void VID_ExtraSwapBuffers (viddef_t *lvid, vmode_t *pcurrentmode,
-	vrect_t *rects)
-{
-	int	pageoffset;
-
-	UNUSED(rects);
-	UNUSED(pcurrentmode);
-
-	pageoffset = VID_pagelist[VID_currentpage];
-
-// display the newly finished page
-	if (lvid->numpages > 1)
-	{
-	// page flipped
-		regs.x.ax = 0x4f07;
-	
-		if (vid_wait.value != VID_WAIT_VSYNC)
-		{
-			if ((vid_wait.value == VID_WAIT_DISPLAY_ENABLE) && de_exists)
-				VID_ExtraWaitDisplayEnable ();
-	
-			regs.x.bx = VESA_DONT_WAIT_VSYNC;
-		}
-		else
-		{
-			regs.x.bx = VESA_WAIT_VSYNC;	// double buffered has to wait
-		}
-
-		regs.x.cx = pageoffset % VGA_rowbytes;
-		regs.x.dx = pageoffset / VGA_rowbytes;
-		dos_int86(0x10);
-	
-		VID_displayedpage = VID_currentpage;
-		if (++VID_currentpage >= lvid->numpages)
-			VID_currentpage = 0;
-	
-	//
-	// set the new write window if this is a banked mode; otherwise, set the
-	// new address to which to write
-	//
-		if (VID_banked)
-		{
-			regs.x.ax = 0x4f05;
-			regs.x.bx = 0;
-			regs.x.dx = VID_currentpage;
-			dos_int86(0x10);
-		}
-		else
-		{
-			lvid->direct = lvid->buffer;	// direct drawing goes to the
-											//  currently displayed page
-			lvid->buffer = VID_membase + VID_pagelist[VID_currentpage];
-			lvid->conbuffer = lvid->buffer;
-		}
-	
-		VGA_pagebase = lvid->buffer;
-	}
-	else
-	{
-	// non-page-flipped
-		if (vsync_exists && (vid_wait.value == VID_WAIT_VSYNC))
-		{
-			VGA_WaitVsync ();
-		}
-
-		while (rects)
-		{
-			VGA_UpdateLinearScreen (
-					lvid->buffer + rects->x + (rects->y * lvid->rowbytes),
-		 			VGA_pagebase + rects->x + (rects->y * VGA_rowbytes),
-					rects->width,
-					rects->height,
-					lvid->rowbytes,
-					VGA_rowbytes);
-
-			rects = rects->pnext;
-		}
-	}
-}
-
--- a/u/vid_null.c
+++ /dev/null
@@ -1,87 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// vid_null.c -- null video driver to aid porting efforts
-
-#include "quakedef.h"
-#include "d_local.h"
-
-viddef_t	vid;				// global video state
-
-#define	BASEWIDTH	320
-#define	BASEHEIGHT	200
-
-byte	vid_buffer[BASEWIDTH*BASEHEIGHT];
-short	zbuffer[BASEWIDTH*BASEHEIGHT];
-byte	surfcache[256*1024];
-
-unsigned short	d_8to16table[256];
-unsigned	d_8to24table[256];
-
-void	VID_SetPalette (unsigned char *palette)
-{
-}
-
-void	VID_ShiftPalette (unsigned char *palette)
-{
-}
-
-void	VID_Init (unsigned char *palette)
-{
-	vid.maxwarpwidth = vid.width = vid.conwidth = BASEWIDTH;
-	vid.maxwarpheight = vid.height = vid.conheight = BASEHEIGHT;
-	vid.aspect = 1.0;
-	vid.numpages = 1;
-	vid.colormap = host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-	vid.buffer = vid.conbuffer = vid_buffer;
-	vid.rowbytes = vid.conrowbytes = BASEWIDTH;
-	
-	d_pzbuffer = zbuffer;
-	D_InitCaches (surfcache, sizeof(surfcache));
-}
-
-void	VID_Shutdown (void)
-{
-}
-
-void	VID_Update (vrect_t *rects)
-{
-}
-
-/*
-================
-D_BeginDirectRect
-================
-*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-}
-
-
-/*
-================
-D_EndDirectRect
-================
-*/
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-}
-
-
--- a/u/vid_sunx.c
+++ /dev/null
@@ -1,1257 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// vid_x.c -- general x video driver
-
-#define _BSD
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XShm.h>
-
-#include "quakedef.h"
-#include "d_local.h"
-
-cvar_t		m_filter = {"m_filter","0", true};
-
-qboolean        mouse_avail;
-int             mouse_buttons=3;
-int             mouse_oldbuttonstate;
-int             mouse_buttonstate;
-float   mouse_x, mouse_y;
-float   old_mouse_x, old_mouse_y;
-int p_mouse_x;
-int p_mouse_y;
-qboolean	mouse_grabbed = false; // we grab it when console is up
-
-int		VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes, VGA_planar;
-byte	*VGA_pagebase;
-
-// The following X property format is defined in Motif 1.1's
-// Xm/MwmUtils.h, but QUAKE should not depend on that header
-// file. Note: Motif 1.2 expanded this structure with
-// uninteresting fields (to QUAKE) so just stick with the
-// smaller Motif 1.1 structure.
-
-#define MWM_HINTS_DECORATIONS   2
-typedef struct
-{
-	long flags;
-	long functions;
-	long decorations;
-	long input_mode;
-} MotifWmHints;
-
-#define MAX_COLUMN_SIZE	11
-
-#define MAX_MODEDESCS	(MAX_COLUMN_SIZE*3)
-
-typedef struct
-{
-    int		modenum;
-    int		iscur;
-    char	desc[256];
-} modedesc_t;
-
-extern void M_Menu_Options_f (void);
-extern void M_Print (int cx, int cy, char *str);
-extern void M_PrintWhite (int cx, int cy, char *str);
-extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawTransPic (int x, int y, qpic_t *pic);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
-
-extern int sb_updates;
-extern int x_root, y_root; // root window relative mouse coords
-
-typedef struct
-{
-	int input;
-	int output;
-} keymap_t;
-
-viddef_t vid; // global video state
-unsigned short       d_8to16table[256];
-
-int		num_shades=32;
-
-int	d_con_indirect = 0;
-
-int		vid_buffersize;
-
-#define STD_EVENT_MASK \
-( KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | \
-PointerMotionMask | EnterWindowMask | LeaveWindowMask | VisibilityChangeMask | \
-ExposureMask | StructureNotifyMask )
-
-qboolean				x_fullscreen = true;
-Display					*x_disp = NULL;
-int						x_screen, x_screen_width, x_screen_height;
-int				x_center_width, x_center_height;
-int						x_std_event_mask = STD_EVENT_MASK;
-Window					x_win, x_root_win;
-qboolean				mouse_in_window = false;
-int				global_dx, global_dy;
-
-static qboolean			doShm;
-static Colormap			x_cmap;
-static GC				x_gc;
-static Visual			*x_vis;
-static XVisualInfo		*x_visinfo;
-static Atom				aHints = 0;
-static Atom				aWMDelete = 0;
-
-static int				x_shmeventtype;
-//static XShmSegmentInfo	x_shminfo;
-
-static qboolean			oktodraw = false;
-
-int XShmQueryExtension(Display *);
-int XShmGetEventBase(Display *);
-
-int current_framebuffer;
-static XImage			*x_framebuffer[2] = { 0, 0 };
-static XShmSegmentInfo	x_shminfo[2];
-
-static int verbose=1;
-
-static byte current_palette[768];
-
-typedef unsigned short PIXEL16;
-typedef unsigned long PIXEL24;
-static PIXEL16 st2d_8to16table[256];
-static PIXEL24 st2d_8to24table[256];
-static int shiftmask_fl=0;
-static long r_shift,g_shift,b_shift;
-static unsigned long r_mask,g_mask,b_mask;
-
-void shiftmask_init()
-{
-    unsigned int x;
-    r_mask=x_vis->red_mask;
-    g_mask=x_vis->green_mask;
-    b_mask=x_vis->blue_mask;
-    for(r_shift=-8,x=1;x<r_mask;x=x<<1)r_shift++;
-    for(g_shift=-8,x=1;x<g_mask;x=x<<1)g_shift++;
-    for(b_shift=-8,x=1;x<b_mask;x=x<<1)b_shift++;
-    shiftmask_fl=1;
-}
-
-PIXEL16 xlib_rgb16(int r,int g,int b)
-{
-    PIXEL16 p;
-    if(shiftmask_fl==0) shiftmask_init();
-    p=0;
-
-    if(r_shift>0) {
-        p=(r<<(r_shift))&r_mask;
-    } else if(r_shift<0) {
-        p=(r>>(-r_shift))&r_mask;
-    } else p|=(r&r_mask);
-
-    if(g_shift>0) {
-        p|=(g<<(g_shift))&g_mask;
-    } else if(g_shift<0) {
-        p|=(g>>(-g_shift))&g_mask;
-    } else p|=(g&g_mask);
-
-    if(b_shift>0) {
-        p|=(b<<(b_shift))&b_mask;
-    } else if(b_shift<0) {
-        p|=(b>>(-b_shift))&b_mask;
-    } else p|=(b&b_mask);
-
-    return p;
-}
-
-PIXEL24 xlib_rgb24(int r,int g,int b)
-{
-    PIXEL24 p;
-    if(shiftmask_fl==0) shiftmask_init();
-    p=0;
-
-    if(r_shift>0) {
-        p=(r<<(r_shift))&r_mask;
-    } else if(r_shift<0) {
-        p=(r>>(-r_shift))&r_mask;
-    } else p|=(r&r_mask);
-
-    if(g_shift>0) {
-        p|=(g<<(g_shift))&g_mask;
-    } else if(g_shift<0) {
-        p|=(g>>(-g_shift))&g_mask;
-    } else p|=(g&g_mask);
-
-    if(b_shift>0) {
-        p|=(b<<(b_shift))&b_mask;
-    } else if(b_shift<0) {
-        p|=(b>>(-b_shift))&b_mask;
-    } else p|=(b&b_mask);
-
-    return p;
-}
-
-void st2_fixup( XImage *framebuf, int x, int y, int width, int height)
-{
-	int xi,yi;
-	unsigned char *src;
-	PIXEL16 *dest;
-	register int count, n;
-
-	if( (x<0)||(y<0) )return;
-
-	for (yi = y; yi < (y+height); yi++) {
-		src = &framebuf->data [yi * framebuf->bytes_per_line];
-
-		// Duff's Device
-		count = width;
-		n = (count + 7) / 8;
-		dest = ((PIXEL16 *)src) + x+width - 1;
-		src += x+width - 1;
-
-		switch (count % 8) {
-		case 0:	do {	*dest-- = st2d_8to16table[*src--];
-		case 7:			*dest-- = st2d_8to16table[*src--];
-		case 6:			*dest-- = st2d_8to16table[*src--];
-		case 5:			*dest-- = st2d_8to16table[*src--];
-		case 4:			*dest-- = st2d_8to16table[*src--];
-		case 3:			*dest-- = st2d_8to16table[*src--];
-		case 2:			*dest-- = st2d_8to16table[*src--];
-		case 1:			*dest-- = st2d_8to16table[*src--];
-				} while (--n > 0);
-		}
-
-//		for(xi = (x+width-1); xi >= x; xi--) {
-//			dest[xi] = st2d_8to16table[src[xi]];
-//		}
-	}
-}
-
-void st3_fixup( XImage *framebuf, int x, int y, int width, int height)
-{
-	int xi,yi;
-	unsigned char *src;
-	PIXEL24 *dest;
-	register int count, n;
-
-	if( (x<0)||(y<0) )return;
-
-	for (yi = y; yi < (y+height); yi++) {
-		src = &framebuf->data [yi * framebuf->bytes_per_line];
-
-		// Duff's Device
-		count = width;
-		n = (count + 7) / 8;
-		dest = ((PIXEL24 *)src) + x+width - 1;
-		src += x+width - 1;
-
-		switch (count % 8) {
-		case 0:	do {	*dest-- = st2d_8to24table[*src--];
-		case 7:			*dest-- = st2d_8to24table[*src--];
-		case 6:			*dest-- = st2d_8to24table[*src--];
-		case 5:			*dest-- = st2d_8to24table[*src--];
-		case 4:			*dest-- = st2d_8to24table[*src--];
-		case 3:			*dest-- = st2d_8to24table[*src--];
-		case 2:			*dest-- = st2d_8to24table[*src--];
-		case 1:			*dest-- = st2d_8to24table[*src--];
-				} while (--n > 0);
-		}
-
-//		for(xi = (x+width-1); xi >= x; xi--) {
-//			dest[xi] = st2d_8to16table[src[xi]];
-//		}
-	}
-}
-
-/*
-================
-D_BeginDirectRect
-================
-*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-// direct drawing of the "accessing disk" icon isn't supported under Nextstep
-}
-
-
-/*
-================
-D_EndDirectRect
-================
-*/
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-// direct drawing of the "accessing disk" icon isn't supported under Nextstep
-}
-
-
-/*
-=================
-VID_Gamma_f
-
-Keybinding command
-=================
-*/
-
-byte vid_gamma[256];
-
-void VID_Gamma_f (void)
-{
-
-	float	g, f, inf;
-	int		i;
-
-	if (Cmd_Argc () == 2)
-	{
-		g = Q_atof (Cmd_Argv(1));
-
-		for (i=0 ; i<255 ; i++)
-		{
-			f = pow ((i+1)/256.0, g);
-			inf = f*255 + 0.5;
-			if (inf < 0)
-				inf = 0;
-			if (inf > 255)
-				inf = 255;
-			vid_gamma[i] = inf;
-		}
-
-		VID_SetPalette (current_palette);
-
-		vid.recalc_refdef = 1;				// force a surface cache flush
-	}
-
-}
-
-// ========================================================================
-// Tragic death handler
-// ========================================================================
-
-void TragicDeath(int signal_num)
-{
-	//XAutoRepeatOn(x_disp);
-	VID_Shutdown();
-	Sys_Error("This death brought to you by the number %d\n", signal_num);
-}
-
-// ========================================================================
-// makes a null cursor
-// ========================================================================
-
-static Cursor CreateNullCursor(Display *display, Window root)
-{
-    Pixmap cursormask; 
-    XGCValues xgc;
-    GC gc;
-    XColor dummycolour;
-    Cursor cursor;
-
-    cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
-    xgc.function = GXclear;
-    gc =  XCreateGC(display, cursormask, GCFunction, &xgc);
-    XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
-    dummycolour.pixel = 0;
-    dummycolour.red = 0;
-    dummycolour.flags = 04;
-    cursor = XCreatePixmapCursor(display, cursormask, cursormask,
-          &dummycolour,&dummycolour, 0,0);
-    XFreePixmap(display,cursormask);
-    XFreeGC(display,gc);
-    return cursor;
-}
-
-void ResetFrameBuffer(void)
-{
-
-	int mem;
-	int pwidth;
-
-	if (x_framebuffer[0])
-	{
-		Z_Free(x_framebuffer[0]->data);
-//		Z_Free(d_pzbuffer);
-		free(x_framebuffer[0]);
-	}
-
-	pwidth = x_visinfo->depth / 8;
-	if (pwidth == 3) pwidth = 4;
-	mem = ((vid.width*pwidth+3)&~3) * vid.height;
-
-//	d_pzbuffer = (unsigned short *) Z_Malloc(vid.width*vid.height*
-//		sizeof(*d_pzbuffer));
-	d_pzbuffer = (short *) Hunk_HighAllocName(vid.width*vid.height*
-		sizeof(*d_pzbuffer), "zbuff");
-
-	x_framebuffer[0] = XCreateImage(	x_disp,
-		x_vis,
-		x_visinfo->depth,
-		ZPixmap,
-		0,
-		Z_Malloc(mem),
-		vid.width, vid.height,
-		32,
-		0);
-
-	if (!x_framebuffer[0])
-		Sys_Error("VID: XCreateImage failed\n");
-
-}
-
-void ResetSharedFrameBuffers(void)
-{
-
-	int size;
-	int key;
-	int minsize = getpagesize();
-	int frm;
-
-//	if (d_pzbuffer)
-//		Z_Free(d_pzbuffer);
-	d_pzbuffer = Hunk_HighAllocName(vid.width*vid.height*sizeof(*d_pzbuffer),"zbuff");
-
-	for (frm=0 ; frm<2 ; frm++)
-	{
-
-	// free up old frame buffer memory
-
-		if (x_framebuffer[frm])
-		{
-			XShmDetach(x_disp, &x_shminfo[frm]);
-			free(x_framebuffer[frm]);
-			shmdt(x_shminfo[frm].shmaddr);
-		}
-
-	// create the image
-
-		x_framebuffer[frm] = XShmCreateImage(	x_disp,
-						x_vis,
-						x_visinfo->depth,
-						ZPixmap,
-						0,
-						&x_shminfo[frm],
-						vid.width,
-						vid.height );
-
-	// grab shared memory
-
-		size = x_framebuffer[frm]->bytes_per_line
-			* x_framebuffer[frm]->height;
-		if (size < minsize)
-			Sys_Error("VID: Window must use at least %d bytes\n", minsize);
-
-		key = random();
-		x_shminfo[frm].shmid = shmget((key_t)key, size, IPC_CREAT|0777);
-		if (x_shminfo[frm].shmid==-1)
-			Sys_Error("VID: Could not get any shared memory\n");
-
-		// attach to the shared memory segment
-		x_shminfo[frm].shmaddr =
-			(void *) shmat(x_shminfo[frm].shmid, 0, 0);
-
-		printf("VID: shared memory id=%d, addr=0x%x\n", x_shminfo[frm].shmid,
-			(int) x_shminfo[frm].shmaddr);
-
-		x_framebuffer[frm]->data = x_shminfo[frm].shmaddr;
-
-	// get the X server to attach to it
-
-		if (!XShmAttach(x_disp, &x_shminfo[frm]))
-			Sys_Error("VID: XShmAttach() failed\n");
-		XSync(x_disp, 0);
-		shmctl(x_shminfo[frm].shmid, IPC_RMID, 0);
-
-	}
-
-}
-
-void VID_MenuDraw( void )
-{
-    qpic_t		*p;
-    char		*ptr;
-    int			i, j, column, row, dup;
-    char		temp[100];
-
-    p = Draw_CachePic ("gfx/vidmodes.lmp");
-    M_DrawPic ( (320-p->width)/2, 4, p);
-	M_Print (4*8, 36 + MAX_COLUMN_SIZE * 8 + 8, "Video mode switching unavailable");
-	M_Print (9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, "Press any key...");
-}
-
-void VID_MenuKey( int key ) { M_Menu_Options_f (); }
-
-// Called at startup to set up translation tables, takes 256 8 bit RGB values
-// the palette data will go away after the call, so it must be copied off if
-// the video driver will need it again
-
-byte	surfcache[1024*1024];
-
-//
-// VID_SetWindowTitle - set the window and icon titles
-//
-
-void VID_SetWindowTitle( Window win, char *pszName )
-{
-    XTextProperty	textprop;
-    XWMHints		*wmHints;
-
-    // Setup ICCCM properties
-    textprop.value = (unsigned char *)pszName;
-    textprop.encoding = XA_STRING;
-    textprop.format = 8;
-    textprop.nitems = strlen(pszName);
-    wmHints = XAllocWMHints();
-    wmHints->initial_state = NormalState;
-    wmHints->flags = StateHint;
-    XSetWMProperties( x_disp, win, &textprop, &textprop,
-					  // Only put WM_COMMAND property on first window.
-					  com_argv, com_argc, NULL, NULL, NULL );
-    XFree( wmHints );
-
-    aWMDelete = XInternAtom( x_disp, "WM_DELETE_WINDOW", False );
-    XSetWMProtocols( x_disp, win, &aWMDelete, 1 );
-}
-
-//
-// VID_FullScreen - open the window in full screen mode
-//
-
-qboolean VID_FullScreen( Window win )
-{
-    MotifWmHints    hints;
-    XWindowChanges  changes;
-
-    aHints = XInternAtom( x_disp, "_MOTIF_WM_HINTS", 0 );
-    if (aHints == None)
-    {
-		Con_Printf( "Could not intern X atom for _MOTIF_WM_HINTS." );
-		return( false );
-    }
-
-    hints.flags = MWM_HINTS_DECORATIONS;
-    hints.decorations = 0; // Absolutely no decorations.
-    XChangeProperty( x_disp, win, aHints, aHints, 32, PropModeReplace, (unsigned char *)&hints, 4 );
-
-    changes.x = 0;
-    changes.y = 0;
-    changes.width = x_screen_width;
-    changes.height = x_screen_height;
-    changes.stack_mode = TopIf;
-    XConfigureWindow( x_disp, win, CWX | CWY | CWWidth | CWHeight | CWStackMode, &changes);
-    return( true );
-}
-
-void	VID_Init (unsigned char *palette)
-{
-
-	int pnum, i;
-	XVisualInfo template;
-	int num_visuals;
-	int template_mask;
-
-	Cmd_AddCommand ("gamma", VID_Gamma_f);
-	for (i=0 ; i<256 ; i++)
-		vid_gamma[i] = i;
-
-	vid.width = 320;
-	vid.height = 200;
-	vid.aspect = 1.0;
-	vid.numpages = 2;
-	vid.colormap = host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-	//vid.cbits = VID_CBITS;
-	//vid.grades = VID_GRADES;
-
-	srandom(getpid());
-
-	verbose=COM_CheckParm("-verbose");
-
-// open the display
-	x_disp = XOpenDisplay(0);
-	if (!x_disp)
-	{
-		if (getenv("DISPLAY"))
-			Sys_Error("VID: Could not open display [%s]\n",
-				getenv("DISPLAY"));
-		else
-			Sys_Error("VID: Could not open local display\n");
-	}
-
-    x_screen = XDefaultScreen( x_disp );
-    x_screen_width = WidthOfScreen( ScreenOfDisplay( x_disp, x_screen ) );
-    x_screen_height = HeightOfScreen( ScreenOfDisplay( x_disp, x_screen ) );
-
-	x_center_width  = x_screen_width/2;
-
-	x_center_height = x_screen_height/2;
-
-    Con_Printf( "Using screen %d: %dx%d\n", x_screen, x_screen_width, x_screen_height );
-
-    x_root_win = XRootWindow( x_disp, x_screen );
-
-// catch signals so i can turn on auto-repeat
-// we never run full-screen, so no auto-repeat nukage
-	if (0)
-	{
-		struct sigaction sa;
-		sigaction(SIGINT, 0, &sa);
-		sa.sa_handler = TragicDeath;
-		sigaction(SIGINT, &sa, 0);
-		sigaction(SIGTERM, &sa, 0);
-	}
-
-	//XAutoRepeatOff(x_disp);
-
-// for debugging only
-//	XSynchronize(x_disp, True);
-
-// check for command-line window size
-	if ((pnum=COM_CheckParm("-winsize")))
-	{
-		if (pnum >= com_argc-2)
-			Sys_Error("VID: -winsize <width> <height>\n");
-		vid.width = Q_atoi(com_argv[pnum+1]);
-		vid.height = Q_atoi(com_argv[pnum+2]);
-		if (!vid.width || !vid.height)
-			Sys_Error("VID: Bad window width/height\n");
-	}
-
-	template_mask = 0;
-
-// specify a visual id
-	if ((pnum=COM_CheckParm("-visualid")))
-	{
-		if (pnum >= com_argc-1)
-			Sys_Error("VID: -visualid <id#>\n");
-		template.visualid = Q_atoi(com_argv[pnum+1]);
-		template_mask = VisualIDMask;
-	}
-
-// If not specified, use default visual
-	else
-	{
-		int screen;
-		screen = XDefaultScreen(x_disp);
-		template.visualid =
-			XVisualIDFromVisual(XDefaultVisual(x_disp, screen));
-		template_mask = VisualIDMask;
-	}
-
-// pick a visual- warn if more than one was available
-	x_visinfo = XGetVisualInfo(x_disp, template_mask, &template, &num_visuals);
-	if (num_visuals > 1)
-	{
-		printf("Found more than one visual id at depth %d:\n", template.depth);
-		for (i=0 ; i<num_visuals ; i++)
-			printf("	-visualid %d\n", (int)(x_visinfo[i].visualid));
-	}
-	else if (num_visuals == 0)
-	{
-		if (template_mask == VisualIDMask)
-			Sys_Error("VID: Bad visual id %d\n", template.visualid);
-		else
-			Sys_Error("VID: No visuals at depth %d\n", template.depth);
-	}
-
-	if (verbose)
-	{
-		printf("Using visualid %d:\n", (int)(x_visinfo->visualid));
-		printf("	class %d\n", x_visinfo->class);
-		printf("	screen %d\n", x_visinfo->screen);
-		printf("	depth %d\n", x_visinfo->depth);
-		printf("	red_mask 0x%x\n", (int)(x_visinfo->red_mask));
-		printf("	green_mask 0x%x\n", (int)(x_visinfo->green_mask));
-		printf("	blue_mask 0x%x\n", (int)(x_visinfo->blue_mask));
-		printf("	colormap_size %d\n", x_visinfo->colormap_size);
-		printf("	bits_per_rgb %d\n", x_visinfo->bits_per_rgb);
-	}
-
-	x_vis = x_visinfo->visual;
-
-// setup attributes for main window
-	{
-		int attribmask = CWEventMask  | CWColormap | CWBorderPixel;
-		XSetWindowAttributes attribs;
-		Colormap tmpcmap;
-
-		tmpcmap = XCreateColormap(x_disp, XRootWindow(x_disp,
-			x_visinfo->screen), x_vis, AllocNone);
-
-		attribs.event_mask = x_std_event_mask;
-		attribs.border_pixel = 0;
-		attribs.colormap = tmpcmap;
-
-// create the main window
-		x_win = XCreateWindow(	x_disp,
-			XRootWindow(x_disp, x_visinfo->screen),
-			0, 0,	// x, y
-			vid.width, vid.height,
-			0, // borderwidth
-			x_visinfo->depth,
-			InputOutput,
-			x_vis,
-			attribmask,
-			&attribs );
-
-		if (x_visinfo->class != TrueColor)
-			XFreeColormap(x_disp, tmpcmap);
-
-	}
-
-	if (x_visinfo->depth == 8)
-	{
-
-	// create and upload the palette
-		if (x_visinfo->class == PseudoColor)
-		{
-			x_cmap = XCreateColormap(x_disp, x_win, x_vis, AllocAll);
-			VID_SetPalette(palette);
-			XSetWindowColormap(x_disp, x_win, x_cmap);
-		}
-
-	}
-
-    VID_SetWindowTitle( x_win, "Quake" );
-
-// create the GC
-	{
-		XGCValues xgcvalues;
-		int valuemask = GCGraphicsExposures;
-		xgcvalues.graphics_exposures = False;
-		x_gc = XCreateGC(x_disp, x_win, valuemask, &xgcvalues );
-	}
-
-// map the window
-	XMapWindow(x_disp, x_win);
-
-// wait for first exposure event
-	{
-		XEvent event;
-		do
-		{
-			XNextEvent(x_disp, &event);
-			if (event.type == Expose && !event.xexpose.count)
-				oktodraw = true;
-		} while (!oktodraw);
-	}
-// now safe to draw
-
-// even if MITSHM is available, make sure it's a local connection
-	if (XShmQueryExtension(x_disp))
-	{
-		char *displayname;
-		doShm = true;
-		displayname = (char *) getenv("DISPLAY");
-		if (displayname)
-		{
-			char *d = displayname;
-			while (*d && (*d != ':')) d++;
-			if (*d) *d = 0;
-			if (!(!strcasecmp(displayname, "unix") || !*displayname))
-				doShm = false;
-		}
-	}
-
-	if (doShm)
-	{
-		x_shmeventtype = XShmGetEventBase(x_disp) + ShmCompletion;
-		ResetSharedFrameBuffers();
-	}
-	else
-		ResetFrameBuffer();
-
-	current_framebuffer = 0;
-	vid.rowbytes = x_framebuffer[0]->bytes_per_line;
-	vid.buffer = x_framebuffer[0]->data;
-	vid.conbuffer = x_framebuffer[0]->data;
-	vid.conrowbytes = vid.rowbytes;
-	vid.conwidth = vid.width;
-	vid.conheight = vid.height;
-
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-
-	D_InitCaches (surfcache, sizeof(surfcache));
-	
-//	XSynchronize(x_disp, False);
-
-	vid_menudrawfn = VID_MenuDraw;
-	vid_menukeyfn = VID_MenuKey;
-
-}
-
-void VID_ShiftPalette(unsigned char *p)
-{
-	VID_SetPalette(p);
-}
-
-void VID_SetPalette(unsigned char *palette)
-{
-
-	int i;
-	XColor colors[256];
-
-	for(i=0;i<256;i++) {
-		st2d_8to16table[i]= xlib_rgb16(palette[i*3], palette[i*3+1],palette[i*3+2]);
-		st2d_8to24table[i]= xlib_rgb24(palette[i*3], palette[i*3+1],palette[i*3+2]);
-	}
-
-	if (x_visinfo->class == PseudoColor && x_visinfo->depth == 8)
-	{
-		if (palette != current_palette)
-			memcpy(current_palette, palette, 768);
-		for (i=0 ; i<256 ; i++)
-		{
-			colors[i].pixel = i;
-			colors[i].flags = DoRed|DoGreen|DoBlue;
-			colors[i].red = vid_gamma[palette[i*3]] * 257;
-			colors[i].green = vid_gamma[palette[i*3+1]] * 257;
-			colors[i].blue = vid_gamma[palette[i*3+2]] * 257;
-		}
-		XStoreColors(x_disp, x_cmap, colors, 256);
-	}
-
-}
-
-// Called at shutdown
-
-void	VID_Shutdown (void)
-{
-	Con_Printf("VID_Shutdown\n");
-	//XAutoRepeatOn(x_disp);
-	if (mouse_grabbed) {
-		/* ungrab the pointer */
-		XUngrabPointer(x_disp, CurrentTime);
-		XUndefineCursor(x_disp, x_win);
-	}
-	XCloseDisplay(x_disp);
-}
-
-int XLateKey(XKeyEvent *ev)
-{
-
-	int key;
-	char buf[64];
-	KeySym keysym;
-
-	XLookupString(ev, buf, sizeof buf, &keysym, 0);
-
-	switch(keysym)
-	{
-		case XK_Page_Up:	 key = K_PGUP; break;
-		case XK_Page_Down:	 key = K_PGDN; break;
-		case XK_Home:	 key = K_HOME; break;
-		case XK_End:	 key = K_END; break;
-		case XK_Left:	 key = K_LEFTARROW; break;
-		case XK_Right:	key = K_RIGHTARROW;		break;
-		case XK_Down:	 key = K_DOWNARROW; break;
-		case XK_Up:		 key = K_UPARROW;	 break;
-		case XK_Escape: key = K_ESCAPE;		break;
-		case XK_Return: key = K_ENTER;		 break;
-		case XK_Tab:		key = K_TAB;			 break;
-		case XK_F1:		 key = K_F1;				break;
-		case XK_F2:		 key = K_F2;				break;
-		case XK_F3:		 key = K_F3;				break;
-		case XK_F4:		 key = K_F4;				break;
-		case XK_F5:		 key = K_F5;				break;
-		case XK_F6:		 key = K_F6;				break;
-		case XK_F7:		 key = K_F7;				break;
-		case XK_F8:		 key = K_F8;				break;
-		case XK_F9:		 key = K_F9;				break;
-		case XK_F10:		key = K_F10;			 break;
-		case XK_F11:		key = K_F11;			 break;
-		case XK_F12:		key = K_F12;			 break;
-		case XK_BackSpace:
-		case XK_Delete: key = K_BACKSPACE; break;
-		case XK_Pause:	key = K_PAUSE;		 break;
-		case XK_Shift_L:
-		case XK_Shift_R:		key = K_SHIFT;		break;
-		case XK_Control_L: 
-		case XK_Control_R:	key = K_CTRL;		 break;
-		case XK_Alt_L:	
-		case XK_Meta_L: 
-		case XK_Alt_R:	
-		case XK_Meta_R: key = K_ALT;			break;
-// various other keys on the keyboard
-		case XK_F27: key = K_HOME; break;
-		case XK_F29: key = K_PGUP; break;
-		case XK_F33: key = K_END; break;
-		case XK_F35: key = K_PGDN; break;
-		case XK_KP_Insert: key = K_INS; break;
-
-		default:
-			key = *buf;
-			break;
-	} 
-
-	return key;
-
-}
-
-struct
-{
-	int key;
-	int down;
-} keyq[64];
-int keyq_head=0;
-int keyq_tail=0;
-
-int config_notify=0;
-int config_notify_width;
-int config_notify_height;
-
-void GetEvent(void)
-{
-	XEvent x_event;
-
-	XNextEvent(x_disp, &x_event);
-	switch(x_event.type)
-	{
-		case KeyPress:
-			Key_Event(XLateKey(&x_event.xkey), true);
-			break;
-		case KeyRelease:
-			Key_Event(XLateKey(&x_event.xkey), false);
-			break;
-		case ButtonPress:
-			//printf( "button %d down\n", x_event.xbutton.button );
-			Key_Event( K_MOUSE1 + x_event.xbutton.button - 1, true );
-			break;
-		case ButtonRelease:
-			//printf( "button %d up\n", x_event.xbutton.button );
-			Key_Event( K_MOUSE1 + x_event.xbutton.button - 1, false );
-			break;
-		case MotionNotify:
-			if (mouse_avail && mouse_grabbed) {
-				mouse_x = (float) ((int)x_event.xmotion.x - (int)(vid.width/2));
-				mouse_y = (float) ((int)x_event.xmotion.y - (int)(vid.height/2));
-	//printf("m: x=%d,y=%d, mx=%3.2f,my=%3.2f\n", 
-	//	x_event.xmotion.x, x_event.xmotion.y, mouse_x, mouse_y);
-
-				/* move the mouse to the window center again */
-				XSelectInput(x_disp,x_win, STD_EVENT_MASK & ~PointerMotionMask);
-				XWarpPointer(x_disp,None,x_win,0,0,0,0, (vid.width/2),(vid.height/2));
-				XSelectInput(x_disp,x_win, STD_EVENT_MASK);
-			} else {
-				mouse_x = (float) (x_event.xmotion.x-p_mouse_x);
-				mouse_y = (float) (x_event.xmotion.y-p_mouse_y);
-				p_mouse_x=x_event.xmotion.x;
-				p_mouse_y=x_event.xmotion.y;
-			}
-			break;
-
-		case ConfigureNotify:
-//			printf("config notify\n");
-			config_notify_width = x_event.xconfigure.width;
-			config_notify_height = x_event.xconfigure.height;
-			config_notify = 1;
-			sb_updates = 0;
-			break;
-		case Expose:	
-			sb_updates = 0;
-			break;
-		case ClientMessage:
-			if (x_event.xclient.data.l[0] == aWMDelete) Host_Quit_f();
-			break;
-		case EnterNotify:
-			mouse_in_window = true;
-			break;
-		case LeaveNotify:
-			mouse_in_window = false;
-			break;
-
-		default:
-			if (doShm && x_event.type == x_shmeventtype)
-				oktodraw = true;
-	}
-   
-	if (mouse_avail) {
-		if (key_dest == key_game && !mouse_grabbed && mouse_in_window) {
-			mouse_grabbed = true;
-			/* grab the pointer */
-			XGrabPointer(x_disp,x_win,True,0,GrabModeAsync,
-				GrabModeAsync,x_win,None,CurrentTime);
-			// inviso cursor
-			XDefineCursor(x_disp, x_win, CreateNullCursor(x_disp, x_win));
-		} else if ((key_dest != key_game || !mouse_in_window) && mouse_grabbed) {
-			mouse_grabbed = false;
-			/* ungrab the pointer */
-			XUngrabPointer(x_disp, CurrentTime);
-			XUndefineCursor(x_disp, x_win);
-		}
-	}
-}
-
-// flushes the given rectangles from the view buffer to the screen
-
-void	VID_Update (vrect_t *rects)
-{
-#if 0
-	static int count;
-	static long long s;
-	long long gethrtime();
-
-	if (count == 0)
-		s = gethrtime();
-
-	if (count++ == 50) {
-		count = 1;
-		printf("%lf frames/secs\n", 50.0/((double)(gethrtime()-s) / 1e9));
-		s = gethrtime();
-	}
-#endif
-
-// if the window changes dimension, skip this frame
-
-	if (config_notify)
-	{
-		printf("config notify\n");
-		config_notify = 0;
-		vid.width = config_notify_width & ~3;
-		vid.height = config_notify_height;
-
-		printf("w = %d, h = %d\n", vid.width, vid.height);
-
-		if (doShm)
-			ResetSharedFrameBuffers();
-		else
-			ResetFrameBuffer();
-		vid.rowbytes = x_framebuffer[0]->bytes_per_line;
-		vid.buffer = x_framebuffer[current_framebuffer]->data;
-		vid.conbuffer = vid.buffer;
-		vid.conwidth = vid.width;
-		vid.conheight = vid.height;
-		vid.conrowbytes = vid.rowbytes;
-		vid.recalc_refdef = 1;				// force a surface cache flush
-		return;
-	}
-
-	if (doShm)
-	{
-//		long long s, gethrtime();
-//		s = gethrtime();
-
-		while (rects)
-		{
-printf("update: %d,%d (%d,%d)\n", rects->x, rects->y, rects->width, rects->height);
-			if (x_visinfo->depth == 16)
-				st2_fixup( x_framebuffer[current_framebuffer], 
-					rects->x, rects->y, rects->width,
-					rects->height);
-			else if (x_visinfo->depth == 24)
-				st3_fixup( x_framebuffer[current_framebuffer], 
-					rects->x, rects->y, rects->width,
-					rects->height);
-			if (!XShmPutImage(x_disp, x_win, x_gc,
-				x_framebuffer[current_framebuffer], rects->x, rects->y,
-				rects->x, rects->y, rects->width, rects->height, True))
-					Sys_Error("VID_Update: XShmPutImage failed\n");
-			oktodraw = false;
-			while (!oktodraw) GetEvent();
-			rects = rects->pnext;
-		}
-//		printf("%lf\n", (double)(gethrtime()-s)/1.0e9);
-		current_framebuffer = !current_framebuffer;
-		vid.buffer = x_framebuffer[current_framebuffer]->data;
-		vid.conbuffer = vid.buffer;
-		XSync(x_disp, False);
-		
-	}
-	else
-	{
-		while (rects)
-		{
-			if (x_visinfo->depth == 16)
-				st2_fixup( x_framebuffer[current_framebuffer], 
-					rects->x, rects->y, rects->width,
-					rects->height);
-			else if (x_visinfo->depth == 24)
-				st3_fixup( x_framebuffer[current_framebuffer], 
-					rects->x, rects->y, rects->width,
-					rects->height);
-			XPutImage(x_disp, x_win, x_gc, x_framebuffer[0], rects->x,
-				rects->y, rects->x, rects->y, rects->width, rects->height);
-			rects = rects->pnext;
-		}
-		XSync(x_disp, False);
-	}
-}
-
-static int dither;
-
-void VID_DitherOn(void)
-{
-    if (dither == 0)
-    {
-		vid.recalc_refdef = 1;
-        dither = 1;
-    }
-}
-
-void VID_DitherOff(void)
-{
-    if (dither)
-    {
-		vid.recalc_refdef = 1;
-        dither = 0;
-    }
-}
-
-void VID_SetDefaultMode( void )
-{
-}
-
-int I_OpenWindow(void)
-{
-	return 0;
-}
-
-void I_EraseWindow(int window)
-{
-}
-
-void I_DrawCircle(int window, int x, int y, int r)
-{
-}
-
-void I_DisplayWindow(int window)
-{
-}
-
-void Sys_SendKeyEvents(void)
-{
-// get events from x server
-	if (x_disp)
-	{
-		while (XPending(x_disp)) GetEvent();
-		while (keyq_head != keyq_tail)
-		{
-			Key_Event(keyq[keyq_tail].key, keyq[keyq_tail].down);
-			keyq_tail = (keyq_tail + 1) & 63;
-		}
-	}
-}
-
-#if 0
-char *Sys_ConsoleInput (void)
-{
-
-	static char	text[256];
-	int		len;
-	fd_set  readfds;
-	int		ready;
-	struct timeval timeout;
-
-	timeout.tv_sec = 0;
-	timeout.tv_usec = 0;
-	FD_ZERO(&readfds);
-	FD_SET(0, &readfds);
-	ready = select(1, &readfds, 0, 0, &timeout);
-
-	if (ready>0)
-	{
-		len = read (0, text, sizeof(text));
-		if (len >= 1)
-		{
-			text[len-1] = 0;	// rip off the /n and terminate
-			return text;
-		}
-	}
-
-	return 0;
-	
-}
-#endif
-
-void IN_Init (void)
-{
-	Cvar_RegisterVariable (&m_filter);
-	if ( COM_CheckParm ("-nomouse") )
-		return;
-	mouse_x = mouse_y = 0.0;
-	mouse_avail = 1;
-}
-
-void IN_Shutdown (void)
-{
-	mouse_avail = 0;
-}
-
-void IN_Commands (void)
-{
-	int i;
-   
-	if (!mouse_avail) return;
-   
-	for (i=0 ; i<mouse_buttons ; i++) {
-		if ( (mouse_buttonstate & (1<<i)) && !(mouse_oldbuttonstate & (1<<i)) )
-			Key_Event (K_MOUSE1 + i, true);
-
-		if ( !(mouse_buttonstate & (1<<i)) && (mouse_oldbuttonstate & (1<<i)) )
-			Key_Event (K_MOUSE1 + i, false);
-	}
-	mouse_oldbuttonstate = mouse_buttonstate;
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-	if (!mouse_avail)
-		return;
-   
-	if (m_filter.value) {
-		mouse_x = (mouse_x + old_mouse_x) * 0.5;
-		mouse_y = (mouse_y + old_mouse_y) * 0.5;
-	}
-
-	old_mouse_x = mouse_x;
-	old_mouse_y = mouse_y;
-   
-	mouse_x *= sensitivity.value;
-	mouse_y *= sensitivity.value;
-   
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mouse_x;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-   
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1)) {
-		cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	} else {
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * mouse_y;
-		else
-			cmd->forwardmove -= m_forward.value * mouse_y;
-	}
-	mouse_x = mouse_y = 0.0;
-}
--- a/u/vid_sunxil.c
+++ /dev/null
@@ -1,1288 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// vid_sunxil.c -- uses X to setup windows and XIL to copy images (scaled as needed) 
-// 		   to screen
-
-#define _BSD
-#define BYTE_DEFINED 1
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <thread.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <xil/xil.h>
-
-#include "quakedef.h"
-#include "d_local.h"
-
-#define MIN_WIDTH 320
-#define MIN_HEIGHT 200
-
-cvar_t		_windowed_mouse = {"_windowed_mouse","0", true};
-cvar_t		m_filter = {"m_filter","0", true};
-float old_windowed_mouse;
-
-// The following X property format is defined in Motif 1.1's
-// Xm/MwmUtils.h, but QUAKE should not depend on that header
-// file. Note: Motif 1.2 expanded this structure with
-// uninteresting fields (to QUAKE) so just stick with the
-// smaller Motif 1.1 structure.
-
-#define MWM_HINTS_DECORATIONS   2
-typedef struct
-{
-	long flags;
-	long functions;
-	long decorations;
-	long input_mode;
-} MotifWmHints;
-
-#define MAX_COLUMN_SIZE	11
-
-#define MAX_MODEDESCS	(MAX_COLUMN_SIZE*3)
-
-typedef struct
-{
-    int		modenum;
-    int		iscur;
-    char	desc[256];
-} modedesc_t;
-
-extern void M_Menu_Options_f (void);
-extern void M_Print (int cx, int cy, char *str);
-extern void M_PrintWhite (int cx, int cy, char *str);
-extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawTransPic (int x, int y, qpic_t *pic);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
-
-extern int sb_updates;
-
-qboolean        mouse_avail;
-int             mouse_buttons=3;
-int             mouse_oldbuttonstate;
-int             mouse_buttonstate;
-float   mouse_x, mouse_y;
-float   old_mouse_x, old_mouse_y;
-int p_mouse_x;
-int p_mouse_y;
-
-typedef struct
-{
-	int input;
-	int output;
-} keymap_t;
-
-viddef_t vid; // global video state
-unsigned short       d_8to16table[256];
-
-int		num_shades=32;
-
-int	d_con_indirect = 0;
-
-int		vid_buffersize;
-
-#define STD_EVENT_MASK \
-( \
-	StructureNotifyMask | \
-	KeyPressMask | \
-	KeyReleaseMask | \
-	ButtonPressMask | \
-	ButtonReleaseMask | \
-	ExposureMask | \
-	PointerMotionMask | \
-	FocusChangeMask \
-)
-
-int		VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes, VGA_planar;
-byte	*VGA_pagebase;
-
-qboolean			x_fullscreen = true;
-Display				*x_disp = NULL;
-int				x_screen, x_screen_width, x_screen_height;
-int				x_center_width, x_center_height;
-int				x_std_event_mask = STD_EVENT_MASK;
-Window				x_win, x_root_win;
-qboolean			x_focus = true;
-int				global_dx, global_dy;
-
-
-static Colormap			x_cmap;
-static GC			x_gc;
-static Visual			*x_vis;
-static XVisualInfo		*x_visinfo;
-static Atom			aHints = NULL;
-static Atom			aWMDelete = NULL;
-
-static qboolean			oktodraw = false;
-static qboolean			X11_active = false;
-
-
-static int verbose=1;
-
-static byte current_palette[768];
-
-cvar_t pixel_multiply = {"pixel_multiply", "2", true};
-int current_pixel_multiply = 2;
-
-#define PM(a) (int)((current_pixel_multiply)?((a)*current_pixel_multiply):(a))
-#define MP(a) (int)((current_pixel_multiply)?((a)/current_pixel_multiply):(a))
-
-static int 				render_pipeline[2];
-static XilSystemState 			state;
-static XilImage				display_image  = NULL;
-static XilImage				quake_image  = NULL;
-static int				use_mt = 0;
-static int				count_frames = 0;
-
-/*
-================
-D_BeginDirectRect
-================
-*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-// direct drawing of the "accessing disk" icon isn't supported under Nextstep
-}
-
-
-/*
-================
-D_EndDirectRect
-================
-*/
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-// direct drawing of the "accessing disk" icon isnt supported under Nextstep
-}
-
-
-/*
-=================
-VID_Gamma_f
-
-Keybinding command
-=================
-*/
-
-byte vid_gamma[256];
-
-void VID_Gamma_f (void)
-{
-
-	float	g, f, inf;
-	int		i;
-
-	if (Cmd_Argc () == 2) {
-		g = Q_atof (Cmd_Argv(1));
-
-		for (i=0 ; i<255 ; i++)	{
-			f = pow ((i+1)/256.0, g);
-			inf = f*255 + 0.5;
-			if (inf < 0)
-				inf = 0;
-			if (inf > 255)
-				inf = 255;
-			vid_gamma[i] = inf;
-		}
-
-		VID_SetPalette (current_palette);
-
-		vid.recalc_refdef = 1;				// force a surface cache flush
-	}
-
-}
-
-qboolean CheckPixelMultiply (void)
-{
-	int m;
-	int w, h;
-	XWindowAttributes wattr;   
-	XWindowChanges chg;
-	unsigned int value_mask;
-	int old_pixel;
-
-	if ((m = (int)pixel_multiply.value) != current_pixel_multiply) {
-		if (m < 1)
-			m = 1;
-		if (m > 4)
-			m = 4;
-
-		old_pixel = current_pixel_multiply;
-		current_pixel_multiply = m;
-		Cvar_SetValue("pixel_multiply", m);
-		
-		if(XGetWindowAttributes(x_disp, x_win, & wattr) == 0)
-			return true; // ???
-
-		memset(&chg, 0, sizeof(chg));
-		chg.width = wattr.width/old_pixel * current_pixel_multiply;
-		chg.height = wattr.height/old_pixel * current_pixel_multiply;
-
-		if (chg.width < MIN_WIDTH*current_pixel_multiply)
-			chg.width = MIN_WIDTH*current_pixel_multiply;
-		if (chg.height < MIN_HEIGHT*current_pixel_multiply)
-			chg.height = MIN_HEIGHT*current_pixel_multiply;
-
-		XConfigureWindow(x_disp, x_win, CWWidth | CWHeight, &chg);
-
-		vid.width = MP(wattr.width) & ~3;
-		vid.height = MP(wattr.height);
-
-		if (vid.width < 320) 
-			vid.width = 320;
-		if (vid.height < 200)
-			vid.height = 200;
-		VID_ResetFramebuffer();
-
-		return true;
-	}
-	return false;
-}
-
-// ========================================================================
-// Tragic death handler
-// ========================================================================
-
-void TragicDeath(int signal_num)
-{
-	//XAutoRepeatOn(x_disp);
-	XCloseDisplay(x_disp);
-	Sys_Error("This death brought to you by the number %d\n", signal_num);
-}
-
-// ========================================================================
-// makes a null cursor
-// ========================================================================
-
-static Cursor CreateNullCursor(Display *display, Window root)
-{
-	Pixmap cursormask; 
-	XGCValues xgc;
-	GC gc;
-	XColor dummycolour;
-	Cursor cursor;
-
-	cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
-	xgc.function = GXclear;
-	gc =  XCreateGC(display, cursormask, GCFunction, &xgc);
-	XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
-	dummycolour.pixel = 0;
-	dummycolour.red = 0;
-	dummycolour.flags = 04;
-	cursor = XCreatePixmapCursor(display, cursormask, cursormask,
-				     &dummycolour,&dummycolour, 0,0);
-	XFreePixmap(display,cursormask);
-	XFreeGC(display,gc);
-	return cursor;
-}
-
-
-void VID_MenuDraw( void )
-{
-	qpic_t		*p;
-    char		*ptr;
-    int			i, j, column, row, dup;
-    char		temp[100];
-
-    p = Draw_CachePic ("gfx/vidmodes.lmp");
-    M_DrawPic ( (320-p->width)/2, 4, p);
-	M_Print (4*8, 36 + MAX_COLUMN_SIZE * 8 + 8, "Video mode switching unavailable");
-	M_Print (9*8, 36 + MAX_COLUMN_SIZE * 8 + 8*6, "Press any key...");
-}
-
-void VID_MenuKey( int key ) { M_Menu_Options_f (); }
-
-// Called at startup to set up translation tables, takes 256 8 bit RGB values
-// the palette data will go away after the call, so it must be copied off if
-// the video driver will need it again
-
-byte	surfcache[1024*1024];
-
-//
-// VID_SetWindowTitle - set the window and icon titles
-//
-
-void VID_SetWindowTitle( Window win, char *pszName )
-{
-	XTextProperty	textprop;
-	XWMHints		*wmHints;
-
-    // Setup ICCCM properties
-    textprop.value = (unsigned char *)pszName;
-    textprop.encoding = XA_STRING;
-    textprop.format = 8;
-    textprop.nitems = strlen(pszName);
-    wmHints = XAllocWMHints();
-    wmHints->initial_state = NormalState;
-    wmHints->flags = StateHint;
-    XSetWMProperties( x_disp, win, &textprop, &textprop,
-					  // Only put WM_COMMAND property on first window.
-					  com_argv, com_argc, NULL, NULL, NULL );
-    XFree( wmHints );
-
-    aWMDelete = XInternAtom( x_disp, "WM_DELETE_WINDOW", False );
-    XSetWMProtocols( x_disp, win, &aWMDelete, 1 );
-}
-
-//
-// VID_FullScreen - open the window in full screen mode
-//
-
-qboolean VID_FullScreen( Window win )
-{
-	MotifWmHints    hints;
-	XWindowChanges  changes;
-
-	aHints = XInternAtom( x_disp, "_MOTIF_WM_HINTS", 0 );
-	if (aHints == None) {
-		Con_Printf( "Could not intern X atom for _MOTIF_WM_HINTS." );
-		return( false );
-    }
-
-	hints.flags = MWM_HINTS_DECORATIONS;
-	hints.decorations = 0; // Absolutely no decorations.
-	XChangeProperty( x_disp, win, aHints, aHints, 32, PropModeReplace, (unsigned char *)&hints, 4 );
-
-	changes.x = 0;
-	changes.y = 0;
-	changes.width = x_screen_width;
-	changes.height = x_screen_height;
-	changes.stack_mode = TopIf;
-	XConfigureWindow( x_disp, win, CWX | CWY | CWWidth | CWHeight | CWStackMode, &changes);
-	return( true );
-}
-
-void	VID_Init (unsigned char *palette)
-{
-
-	int pnum, i;
-	XVisualInfo template;
-	int num_visuals;
-	int template_mask;
-	int w, h;
-
-	int desired_width=320, desired_height=200;
-	
-	Cmd_AddCommand ("gamma", VID_Gamma_f);
-
-	Cvar_RegisterVariable (&pixel_multiply);
-
-	if (pipe(render_pipeline) < 0) 
-		Sys_Error("VID_Init: pipe");
-	
-	for (i=0 ; i<256 ; i++)
-		vid_gamma[i] = i;
-
-	vid.width = 320;
-	vid.height = 200;
-	vid.aspect = 1.0;
-	vid.numpages = 2;
-	vid.colormap = host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-	//vid.cbits = VID_CBITS;
-	//vid.grades = VID_GRADES;
-
-	srandom(getpid());
-
-	verbose = COM_CheckParm("-verbose");
-	count_frames = COM_CheckParm("-count_frames");
-
-//
-// open the display
-//
-	x_disp = XOpenDisplay(0);
-
-	if (!x_disp) {
-		if (getenv("DISPLAY"))
-			Sys_Error("VID: Could not open display [%s]\n",
-				getenv("DISPLAY"));
-		else
-			Sys_Error("VID: Could not open local display\n");
-	}
-
-	x_screen = DefaultScreen( x_disp );
-	x_screen_width = WidthOfScreen( ScreenOfDisplay( x_disp, x_screen ) );
-	x_screen_height = HeightOfScreen( ScreenOfDisplay( x_disp, x_screen ) );
-
-	x_center_width  = x_screen_width/2;
-
-	x_center_height = x_screen_height/2;
-
-	Con_Printf( "Using screen %d: %dx%d\n", x_screen, x_screen_width, x_screen_height );
-
-	x_root_win = DefaultRootWindow( x_disp);
-
-	//XAutoRepeatOff(x_disp);
-
-// for debugging only
-	if (verbose)
-		XSynchronize(x_disp, True);
-
-//
-// check for command-line window size
-//
-	if ((pnum=COM_CheckParm("-winsize"))) {
-		if (pnum >= com_argc-2)
-			Sys_Error("VID: -winsize <width> <height>\n");
-		desired_width = Q_atoi(com_argv[pnum+1]);
-		desired_height = Q_atoi(com_argv[pnum+2]);
-		if (desired_width < 1 || desired_height < 1)
-			Sys_Error("VID: Bad window width/height\n");		
-	}
-
-	template_mask = VisualScreenMask; // make sure we get the right one	
-	template.screen = x_screen;
-//
-// specify a visual id
-//
-	if ((pnum=COM_CheckParm("-visualid"))) {
-		if (pnum >= com_argc-1)
-			Sys_Error("VID: -visualid <id#>\n");
-		template.visualid = Q_atoi(com_argv[pnum+1]);
-		template_mask |= VisualIDMask;
-	} else	{
-		// If not specified, find an 8 bit visual since others don't work
-//		template.depth = 8;
-//		template_mask |= VisualDepthMask;
-		int screen;
-		screen = XDefaultScreen(x_disp);
-		template.visualid =
-			XVisualIDFromVisual(XDefaultVisual(x_disp, screen));
-		template_mask = VisualIDMask;
-	}
-//
-// pick a visual- warn if more than one was available
-//
-	x_visinfo = XGetVisualInfo(x_disp, template_mask, &template, &num_visuals);
-	if (num_visuals > 1) {
-		printf("Found more than one visual id at depth %d:\n", template.depth);
-		for (i=0 ; i<num_visuals ; i++)
-			printf("	-visualid %d\n", (int)(x_visinfo[i].visualid));
-	}
-	else if (num_visuals == 0) {
-		if (template_mask == VisualIDMask)
-			Sys_Error("VID: Bad visual id %d\n", template.visualid);
-		else
-			Sys_Error("VID: No visuals at depth %d\n", template.depth);
-	}
-
-	if (verbose) {
-		printf("Using visualid %d:\n", (int)(x_visinfo->visualid));
-		printf("	screen %d\n", x_visinfo->screen);
-		printf("	red_mask 0x%x\n", (int)(x_visinfo->red_mask));
-		printf("	green_mask 0x%x\n", (int)(x_visinfo->green_mask));
-		printf("	blue_mask 0x%x\n", (int)(x_visinfo->blue_mask));
-		printf("	colormap_size %d\n", x_visinfo->colormap_size);
-		printf("	bits_per_rgb %d\n", x_visinfo->bits_per_rgb);
-	}
-
-	x_vis = x_visinfo->visual;
-//
-// See if we're going to do pixel multiply
-//
-	if (pixel_multiply.value < 1 || pixel_multiply.value > 4)
-		Cvar_SetValue("pixel_multiply", 2);
-	current_pixel_multiply = pixel_multiply.value;
-
-	w = 320*current_pixel_multiply; // minimum width
-	h = 200*current_pixel_multiply; // minimum height
-	if (desired_width < w)
-		desired_width = w;
-	if (desired_height < h)
-		desired_height = h;
-
-	vid.width = MP(desired_width);
-	vid.height = MP(desired_height);
-
-	//
-	// patch things up so game doesn't fail if window is too small
-	//
-
-	if (vid.width < 320) 
-		vid.width = 320;
-	if (vid.height < 200)
-		vid.height = 200;
-
-//
-// see if we're going to use threads
-//
-	if(((sysconf(_SC_NPROCESSORS_ONLN) > 1) || COM_CheckParm("-mt")) &&  
-		(COM_CheckParm("-no_mt") == 0)) {
-		use_mt = 1;
-		printf("VID: Using multiple threads!\n");
-	}
-
-// setup attributes for main window
-	{
-		int attribmask = CWEventMask  | CWColormap | CWBorderPixel;
-		XSetWindowAttributes attribs;
-		Colormap tmpcmap;
-
-		tmpcmap = XCreateColormap(x_disp, XRootWindow(x_disp,
-			x_visinfo->screen), x_vis, AllocNone);
-
-		attribs.event_mask = x_std_event_mask;
-		attribs.border_pixel = 0;
-		attribs.colormap = tmpcmap;
-
-// create the main window
-		x_win = XCreateWindow(	x_disp,
-			XRootWindow(x_disp, x_visinfo->screen),
-			0, 0,	// x, y
-			desired_width, desired_height,
-			0, // borderwidth
-			x_visinfo->depth,
-			InputOutput,
-			x_vis,
-			attribmask,
-			&attribs );
-
-		if (x_visinfo->class != TrueColor)
-			XFreeColormap(x_disp, tmpcmap);
-
-	}
-
-	if (x_visinfo->depth == 8) {
-
-	// create and upload the palette
-		if (x_visinfo->class == PseudoColor) {
-			x_cmap = XCreateColormap(x_disp, x_win, x_vis, AllocAll);
-			VID_SetPalette(palette);
-			XSetWindowColormap(x_disp, x_win, x_cmap);
-		}
-
-	}
-
-	VID_SetWindowTitle( x_win, "Quake" );
-
-// inviso cursor
-	XDefineCursor(x_disp, x_win, CreateNullCursor(x_disp, x_win));
-
-// create the GC
-	{
-		XGCValues xgcvalues;
-		int valuemask = GCGraphicsExposures;
-		xgcvalues.graphics_exposures = False;
-		x_gc = XCreateGC(x_disp, x_win, valuemask, &xgcvalues );
-	}
-
-// map the window
-	XMapWindow(x_disp, x_win);
-	XSync(x_disp, True) ;        /* wait for map */
-//
-// wait for first exposure event
-//
-	{
-		XEvent event;
-		do{
-			XNextEvent(x_disp, &event);
-			if (event.type == Expose && !event.xexpose.count)
-				oktodraw = true;
-		} while (!oktodraw);
-	}
-//
-// initialize XIL
-//
-	
-	state = xil_open();
-	
-	if(state == NULL) {
-		//
-		//  XIL's default error handler will print an error msg on stderr
-		//
-		Sys_Error("xil_open failed\n");
-	}
-	
-	X11_active = true;
-
-	VID_ResetFramebuffer();
-
-	D_InitCaches (surfcache, sizeof(surfcache));
-	
-	vid_menudrawfn = VID_MenuDraw;
-	vid_menukeyfn = VID_MenuKey;
-}
-
-VID_ResetFramebuffer()
-{
-	XilMemoryStorage storage;
-
-	if (use_mt) {
-		VID_ResetFramebuffer_MT();
-		return;
-	}
-
-//printf("VID_ResetFramebuffer: vid.width %d, vid.height %d\n", vid.width, vid.height);
-
-	xil_destroy(display_image);
-
-	xil_destroy(quake_image);
-
-	display_image = xil_create_from_window(state, x_disp, x_win);
-	quake_image = xil_create(state, vid.width, vid.height, 1, XIL_BYTE);
-
-	xil_export(quake_image);
-	
-	if (xil_get_memory_storage(quake_image, &storage) == FALSE)
-		Sys_Error("xil_get_memory_storage");
-	
-	xil_import(quake_image, TRUE);
-	xil_export(quake_image);
-
-	if (xil_get_memory_storage(quake_image, &storage) == FALSE)
-		Sys_Error("xil_get_memory_storage");
-
-	vid.rowbytes = storage.byte.scanline_stride;
-	vid.buffer =   storage.byte.data;
-	vid.conbuffer = vid.buffer;
-	vid.conrowbytes = vid.rowbytes;
-	vid.conwidth = vid.width;
-	vid.conheight = vid.height;
-	
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.recalc_refdef = 1;				// force a surface cache flush
-
-	free(d_pzbuffer);
-
-	d_pzbuffer = malloc(PM(vid.width)*PM(vid.height)*sizeof(*d_pzbuffer));
-        //Hunk_HighAllocName(PM(vid.width)*PM(vid.height)*sizeof(*d_pzbuffer),"zbuff");
-}
-
-VID_ResetFramebuffer_MT()
-{
-	XilMemoryStorage storage;
-	XilImage drain_renderpipeline();
-	XilImage old_display_image;
-
-	void * update_thread();
-
-	printf("VID_ResetFramebuffer: vid.width %d, vid.height %d\n", vid.width, vid.height);
-
-	old_display_image = display_image;
-
-	display_image = xil_create_from_window(state, x_disp, x_win);
-	
-	if (quake_image == NULL) 
-		if (thr_create(NULL, NULL, update_thread, NULL, THR_NEW_LWP, NULL) != 0)
-			Sys_Error("VID: thr_create");	
-	
-	quake_image = drain_renderpipeline(quake_image);
-
-	xil_destroy(old_display_image);
-
-	free(d_pzbuffer);
-
-	d_pzbuffer = malloc(PM(vid.width)*PM(vid.height)*sizeof(*d_pzbuffer));
-}
-
-void VID_ShiftPalette(unsigned char *p)
-{
-	VID_SetPalette(p);
-}
-
-void VID_SetPalette(unsigned char *palette)
-{
-
-	int i;
-	XColor colors[256];
-
-	if (x_visinfo->class == PseudoColor && x_visinfo->depth == 8) {
-			if (palette != current_palette)
-				memcpy(current_palette, palette, 768);
-			for (i=0 ; i<256 ; i++)
-				{
-					colors[i].pixel = i;
-					colors[i].flags = DoRed|DoGreen|DoBlue;
-					colors[i].red = vid_gamma[palette[i*3]] * 257;
-					colors[i].green = vid_gamma[palette[i*3+1]] * 257;
-					colors[i].blue = vid_gamma[palette[i*3+2]] * 257;
-				}
-			XStoreColors(x_disp, x_cmap, colors, 256);
-		}
-
-}
-
-// Called at shutdown
-
-void	VID_Shutdown (void)
-{
-	X11_active = false;
-	Con_Printf("VID_Shutdown\n");
-	//XAutoRepeatOn(x_disp);
-	xil_destroy(display_image);
-	xil_destroy(quake_image);
-	display_image = NULL;
-	quake_image = NULL;
-	XCloseDisplay(x_disp);
-}
-
-int XLateKey(XKeyEvent *ev)
-{
-
-	int key;
-	char buf[64];
-	KeySym keysym;
-
-	XLookupString(ev, buf, sizeof buf, &keysym, 0);
-
-	switch(keysym) {
-		case XK_Page_Up:	 key = K_PGUP; break;
-		case XK_Page_Down:	 key = K_PGDN; break;
-		case XK_Home:	 key = K_HOME; break;
-		case XK_End:	 key = K_END; break;
-		case XK_Left:	 key = K_LEFTARROW; break;
-		case XK_Right:	key = K_RIGHTARROW;		break;
-		case XK_Down:	 key = K_DOWNARROW; break;
-		case XK_Up:		 key = K_UPARROW;	 break;
-		case XK_Escape: key = K_ESCAPE;		break;
-		case XK_Return: key = K_ENTER;		 break;
-		case XK_Tab:		key = K_TAB;			 break;
-		case XK_Help:
-		case XK_F1:		 key = K_F1;				break;
-		case XK_F2:		 key = K_F2;				break;
-		case XK_F3:		 key = K_F3;				break;
-		case XK_F4:		 key = K_F4;				break;
-		case XK_F5:		 key = K_F5;				break;
-		case XK_F6:		 key = K_F6;				break;
-		case XK_F7:		 key = K_F7;				break;
-		case XK_F8:		 key = K_F8;				break;
-		case XK_F9:		 key = K_F9;				break;
-		case XK_F10:		key = K_F10;			 break;
-		case XK_F11:		key = K_F11;			 break;
-		case XK_F12:		key = K_F12;			 break;
-		case XK_BackSpace:
-		case XK_Delete: key = K_BACKSPACE; break;
-		case XK_Pause:	key = K_PAUSE;		 break;
-		case XK_Shift_L:
-		case XK_Shift_R:		key = K_SHIFT;		break;
-		case XK_Control_L: 
-		case XK_Control_R:	key = K_CTRL;		 break;
-		case XK_Alt_L:	
-		case XK_Meta_L: 
-		case XK_Alt_R:	
-		case XK_Meta_R: key = K_ALT;			break;
-			// various other keys on the keyboard
-				   case XK_F27: key = K_HOME; break;
-		case XK_F29: key = K_PGUP; break;
-		case XK_F33: key = K_END; break;
-		case XK_F35: key = K_PGDN; break;
-		case XK_Insert:
-		case XK_KP_Insert: key = K_INS; break;
-		case XK_F24: key = '-'; break;
-		case XK_KP_Add: key = '+'; break;
-		case XK_KP_Subtract: key = '-'; break;
-		case XK_F25: key = '/'; break;
-		case XK_F26: key = '*'; break;
-
-		default:
-			key = (unsigned char)*buf;
-			break;
-		} 
-
-	return key;
-
-}
-
-struct {
-	int key;
-	int down;
-} keyq[64];
-
-int keyq_head=0;
-int keyq_tail=0;
-
-int config_notify=0;
-int config_notify_width;
-int config_notify_height;
-
-void GetEvent(void)
-{
-	XEvent x_event;
-	int b;
-
-	XNextEvent(x_disp, &x_event);
-	switch(x_event.type) {
-		case KeyPress:
-			Key_Event(XLateKey(&x_event.xkey), true);
-			break;
-		case KeyRelease:
-			Key_Event(XLateKey(&x_event.xkey), false);
-			break;
-
-		case MotionNotify:
-
-			if (_windowed_mouse.value) {
-				mouse_x = (float) ((int)x_event.xmotion.x - (int)(vid.width/2));
-				mouse_y = (float) ((int)x_event.xmotion.y - (int)(vid.height/2));
-	//printf("m: x=%d,y=%d, mx=%3.2f,my=%3.2f\n", 
-	//	x_event.xmotion.x, x_event.xmotion.y, mouse_x, mouse_y);
-
-				/* move the mouse to the window center again */
-				XSelectInput( x_disp, x_win, x_std_event_mask & ~PointerMotionMask );
-				XWarpPointer(x_disp,None,x_win,0,0,0,0, 
-					(vid.width/2),(vid.height/2));
-				XSelectInput( x_disp, x_win, x_std_event_mask );
-			} else {
-				mouse_x = (float) (x_event.xmotion.x-p_mouse_x);
-				mouse_y = (float) (x_event.xmotion.y-p_mouse_y);
-				p_mouse_x=x_event.xmotion.x;
-				p_mouse_y=x_event.xmotion.y;
-			}
-			break;
-
-		case ButtonPress:
-			b=-1;
-			if (x_event.xbutton.button == 1)
-				b = 0;
-			else if (x_event.xbutton.button == 2)
-				b = 2;
-			else if (x_event.xbutton.button == 3)
-				b = 1;
-			if (b>=0)
-				mouse_buttonstate |= 1<<b;
-			break;
-
-		case ButtonRelease:
-			b=-1;
-			if (x_event.xbutton.button == 1)
-				b = 0;
-			else if (x_event.xbutton.button == 2)
-				b = 2;
-			else if (x_event.xbutton.button == 3)
-				b = 1;
-			if (b>=0)
-				mouse_buttonstate &= ~(1<<b);
-			break;
-		
-		case ConfigureNotify:
-			//			printf("config notify\n");
-			config_notify_width = x_event.xconfigure.width;
-			config_notify_height = x_event.xconfigure.height;
-			config_notify = 1;
-			sb_updates = 0;
-			break;
-		case Expose:	
-			sb_updates = 0;
-			break;
-		case ClientMessage:
-			if (x_event.xclient.data.l[0] == aWMDelete) Host_Quit_f();
-			break;
-#if 0
-		case FocusIn:
-			printf("FocusIn...\n");
-			x_focus = true;
-			break;
-		case FocusOut:
-			printf("FocusOut...\n");
-			x_focus = false;
-			break;
-#endif
-	}
-
-	if (old_windowed_mouse != _windowed_mouse.value) {
-		old_windowed_mouse = _windowed_mouse.value;
-
-		if (!_windowed_mouse.value) {
-			/* ungrab the pointer */
-			XUngrabPointer(x_disp,CurrentTime);
-		} else {
-			/* grab the pointer */
-			XGrabPointer(x_disp,x_win,True,0,GrabModeAsync,
-				GrabModeAsync,x_win,None,CurrentTime);
-		}
-	}
-}
-
-// flushes the given rectangles from the view buffer to the screen
-
-void
-VID_Update (vrect_t *rects)
-{
-	void VID_Update_MT(vrect_t *);
-
-
-	if (count_frames) {
-		static int count;
-		static long long s;
-		long long gethrtime();
-
-		if (count == 0)
-			s = gethrtime();
-
-		if (count++ == 200) {
-			long long n = gethrtime();
-			count = 1;
-			printf("%lf frames/secs\n", 200.0/((double)(n-s) / 1e9));
-			s = n;
-		}
-	}
-
-	if (use_mt) {
-		VID_Update_MT(rects);
-		return;
-	}
-
-	// if the window changes dimension, skip this frame
-
-	if (config_notify) {
-		int w, h;
-		XWindowChanges chg;
-		unsigned int value_mask;
-
-		w = 320*current_pixel_multiply; // minimum width
-		h = 200*current_pixel_multiply; // minimum height
-			
-		if (config_notify_width < w || config_notify_height < h) {
-			// We must resize the window
-			memset(&chg, 0, sizeof(chg));
-			value_mask = 0;
-			if (config_notify_width < w) {
-				config_notify_width = chg.width = w;
-				value_mask |= CWWidth;
-			}
-			if (config_notify_height < h) {
-				config_notify_height = chg.height = h;
-				value_mask |= CWHeight;
-			}
-			if (value_mask)
-				XConfigureWindow(x_disp, x_win, value_mask, &chg);
-		}
-
-		config_notify = 0;
-
-		vid.width = MP(config_notify_width) & ~3;
-		vid.height = MP(config_notify_height);
-
-		if (vid.width < 320) 
-			vid.width = 320;
-		if (vid.height < 200)
-			vid.height = 200;
-		
-		VID_ResetFramebuffer();
-
-		return;
-	}
-	// if pixel multiply changed, skip this frame
-	if (CheckPixelMultiply())
-		return;
-
-	while (rects) { // I've never seen more than one rect?
-		XilMemoryStorage storage;
-
-		xil_import(quake_image, TRUE); // let xil control the image
-
-		if (current_pixel_multiply < 2)
-			xil_copy(quake_image, display_image);
-		else
-			xil_scale(quake_image, display_image, "nearest",
-				  (float)current_pixel_multiply, (float)current_pixel_multiply);
-
-		xil_export(quake_image);  // back to quake
-
-		if (xil_get_memory_storage(quake_image, &storage) == FALSE)
-			Sys_Error("xil_get_memory_storage");
-
-		vid.buffer =   storage.byte.data;
-		vid.conbuffer = vid.buffer;
-
-		rects = rects->pnext;
-	}
-}
-
-void
-VID_Update_MT (vrect_t *rects)
-{
-	XilImage sched_update();
-
-	// if the window changes dimension, skip this frame
-
-	if (config_notify) {
-		int w, h;
-		XWindowChanges chg;
-		unsigned int value_mask;
-
-		w = 320*current_pixel_multiply; // minimum width
-		h = 200*current_pixel_multiply; // minimum height
-			
-		if (config_notify_width < w || config_notify_height < h) {
-			// We must resize the window
-			memset(&chg, 0, sizeof(chg));
-			value_mask = 0;
-			if (config_notify_width < w) {
-				config_notify_width = chg.width = w;
-				value_mask |= CWWidth;
-			}
-			if (config_notify_height < h) {
-				config_notify_height = chg.height = h;
-				value_mask |= CWHeight;
-			}
-			if (value_mask)
-				XConfigureWindow(x_disp, x_win, value_mask, &chg);
-		}
-
-		config_notify = 0;
-
-		vid.width = MP(config_notify_width) & ~3;
-		vid.height = MP(config_notify_height);
-
-		if (vid.width < 320) 
-			vid.width = 320;
-		if (vid.height < 200)
-			vid.height = 200;
-		
-		VID_ResetFramebuffer_MT();
-
-		return;
-	}
-	// if pixel multiply changed, skip this frame
-	if (CheckPixelMultiply())
-		return;
-
-	quake_image = sched_update(quake_image);
-}
-
-XilImage
-drain_renderpipeline(XilImage old)
-{
-	XilImage new;
-
-	XilMemoryStorage storage;
-	
-	if (old) 
-		if (read(render_pipeline[1], &new, sizeof(new)) != sizeof (new)) {
-			Sys_Error("drain_renderpipeline: read");
-			xil_destroy(new);
-		}
-
-	xil_destroy(old);
-
-
-	new = xil_create(state, vid.width, vid.height, 1, XIL_BYTE);
-	
-	if (write(render_pipeline[0], &new, sizeof (new)) != sizeof(new)) 
-		Sys_Error("drain_renderpipeline: write");
-
-	new = xil_create(state, vid.width, vid.height, 1, XIL_BYTE);
-
-	xil_export(new);
-
-	if (xil_get_memory_storage(new, &storage) == FALSE)
-		Sys_Error("xil_get_memory_storage");
-
-	vid.rowbytes = storage.byte.scanline_stride;
-	vid.buffer =   storage.byte.data;
-	vid.conbuffer = vid.buffer;
-	vid.conrowbytes = vid.rowbytes;
-	vid.conwidth = vid.width;
-	vid.conheight = vid.height;
-	
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.recalc_refdef = 1;				// force a surface cache flush
-
-	return(new);
-
-}
-
-XilImage
-sched_update(XilImage image)
-{
-	XilImage new;
-	XilMemoryStorage storage;
-
-	if (write(render_pipeline[1], &image, sizeof(image)) != sizeof (image)) 
-		Sys_Error("sched_update:write");
-
-	if (read(render_pipeline[1], &new, sizeof(new)) != sizeof (new))
-		Sys_Error("sched_update:read");
-
-	xil_export(new);
-
-	if (xil_get_memory_storage(new, &storage) == FALSE)
-		Sys_Error("xil_get_memory_storage");
-
-	vid.buffer =   storage.byte.data;
-	vid.conbuffer = vid.buffer;
-
-	return (new);
-}
-
-void *update_thread()
-{
-	XilImage image;
-
-	if (!X11_active)
-		return;
-
-	while (read(render_pipeline[0], &image, sizeof (image)) == sizeof(image)) {
-
-		xil_import(image, TRUE); // let xil control the image
-
-		if (!display_image)
-			return;
-
-		if (current_pixel_multiply < 2)
-			xil_copy(image, display_image);
-		else
-			xil_scale(image, display_image, "nearest",
-				  (float)current_pixel_multiply, (float)current_pixel_multiply);
-
-		if (write(render_pipeline[0], &image, sizeof (image)) != sizeof(image)) 
-			Sys_Error("update_thread: write");
-	}
-}
-
-
-static int dither;
-
-void VID_DitherOn(void)
-{
-	if (dither == 0) {
-		vid.recalc_refdef = 1;
-		dither = 1;
-	}
-}
-
-void VID_DitherOff(void)
-{
-	if (dither) {
-		vid.recalc_refdef = 1;
-		dither = 0;
-	}
-}
-
-void VID_SetDefaultMode( void )
-{
-}
-
-int I_OpenWindow(void)
-{
-	return 0;
-}
-
-void I_EraseWindow(int window)
-{
-
-}
-
-void I_DrawCircle(int window, int x, int y, int r)
-{
-}
-
-void I_DisplayWindow(int window)
-{
-}
-
-void Sys_SendKeyEvents(void)
-{
-	// get events from x server
-		   if (x_disp) {
-				   while (XPending(x_disp)) GetEvent();
-				   while (keyq_head != keyq_tail) {
-						   Key_Event(keyq[keyq_tail].key, keyq[keyq_tail].down);
-						   keyq_tail = (keyq_tail + 1) & 63;
-					   }
-			   }
-}
-
-void IN_Init (void)
-{
-	Cvar_RegisterVariable (&_windowed_mouse);
-	Cvar_RegisterVariable (&m_filter);
-   if ( COM_CheckParm ("-nomouse") )
-     return;
-   mouse_x = mouse_y = 0.0;
-   mouse_avail = 1;
-}
-
-void IN_Shutdown (void)
-{
-   mouse_avail = 0;
-}
-
-void IN_Commands (void)
-{
-	int i;
-   
-	if (!mouse_avail) return;
-   
-	for (i=0 ; i<mouse_buttons ; i++) {
-		if ( (mouse_buttonstate & (1<<i)) && !(mouse_oldbuttonstate & (1<<i)) )
-			Key_Event (K_MOUSE1 + i, true);
-
-		if ( !(mouse_buttonstate & (1<<i)) && (mouse_oldbuttonstate & (1<<i)) )
-			Key_Event (K_MOUSE1 + i, false);
-	}
-	mouse_oldbuttonstate = mouse_buttonstate;
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-	if (!mouse_avail)
-		return;
-   
-	if (m_filter.value) {
-		mouse_x = (mouse_x + old_mouse_x) * 0.5;
-		mouse_y = (mouse_y + old_mouse_y) * 0.5;
-	}
-
-	old_mouse_x = mouse_x;
-	old_mouse_y = mouse_y;
-   
-	mouse_x *= sensitivity.value;
-	mouse_y *= sensitivity.value;
-   
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mouse_x;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-   
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1)) {
-		cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	} else {
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * mouse_y;
-		else
-			cmd->forwardmove -= m_forward.value * mouse_y;
-	}
-	mouse_x = mouse_y = 0.0;
-}
-
-//void VID_UnlockBuffer(void) { }
-//void VID_LockBuffer(void) { }
-
--- a/u/vid_svgalib.c
+++ /dev/null
@@ -1,1003 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 <termios.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/vt.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <signal.h>
-
-#include <asm/io.h>
-
-#include "vga.h"
-#include "vgakeyboard.h"
-#include "vgamouse.h"
-
-#include "quakedef.h"
-#include "d_local.h"
-
-#define stringify(m) { #m, m }
-
-unsigned short       d_8to16table[256];
-static byte		*vid_surfcache;
-static int		VID_highhunkmark;
-
-int num_modes;
-vga_modeinfo *modes;
-int current_mode;
-
-int num_shades=32;
-
-struct
-{
-	char *name;
-	int num;
-} mice[] =
-{
-	stringify(MOUSE_MICROSOFT),
-	stringify(MOUSE_MOUSESYSTEMS),
-	stringify(MOUSE_MMSERIES),
-	stringify(MOUSE_LOGITECH),
-	stringify(MOUSE_BUSMOUSE),
-	stringify(MOUSE_PS2),
-};
-
-static unsigned char scantokey[128];
-static byte vid_current_palette[768];
-
-int num_mice = sizeof (mice) / sizeof(mice[0]);
-
-int	d_con_indirect = 0;
-
-int		svgalib_inited=0;
-int		UseMouse = 1;
-int		UseDisplay = 1;
-int		UseKeyboard = 1;
-
-int		mouserate = MOUSE_DEFAULTSAMPLERATE;
-
-cvar_t		vid_mode = {"vid_mode","5",false};
-cvar_t		vid_redrawfull = {"vid_redrawfull","0",false};
-cvar_t		vid_waitforrefresh = {"vid_waitforrefresh","0",true};
- 
-char	*framebuffer_ptr;
-
-cvar_t  mouse_button_commands[3] =
-{
-    {"mouse1","+attack"},
-    {"mouse2","+strafe"},
-    {"mouse3","+forward"},
-};
-
-int     mouse_buttons;
-int     mouse_buttonstate;
-int     mouse_oldbuttonstate;
-float   mouse_x, mouse_y;
-float	old_mouse_x, old_mouse_y;
-int		mx, my;
-
-cvar_t	m_filter = {"m_filter","0"};
-
-static byte     backingbuf[48*24];
-
-int		VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes, VGA_planar;
-byte	*VGA_pagebase;
-
-void VGA_UpdatePlanarScreen (void *srcbuffer);
-
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-	int i, j, k, plane, reps, repshift, offset, vidpage, off;
-
-	if (!svgalib_inited || !vid.direct || !vga_oktowrite()) return;
-
-	if (vid.aspect > 1.5)
-	{
-		reps = 2;
-		repshift = 1;
-	} else {
-		reps = 1;
-		repshift = 0;
-	}
-
-	vidpage = 0;
-	vga_setpage(0);
-
-	if (VGA_planar)
-	{
-		for (plane=0 ; plane<4 ; plane++)
-		{
-		// select the correct plane for reading and writing
-			outb(0x02, 0x3C4);
-			outb(1 << plane, 0x3C5);
-			outb(4, 0x3CE);
-			outb(plane, 0x3CF);
-
-			for (i=0 ; i<(height << repshift) ; i += reps)
-			{
-				for (k=0 ; k<reps ; k++)
-				{
-					for (j=0 ; j<(width >> 2) ; j++)
-					{
-						backingbuf[(i + k) * 24 + (j << 2) + plane] =
-								vid.direct[(y + i + k) * VGA_rowbytes +
-								(x >> 2) + j];
-						vid.direct[(y + i + k) * VGA_rowbytes + (x>>2) + j] =
-								pbitmap[(i >> repshift) * 24 +
-								(j << 2) + plane];
-					}
-				}
-			}
-		}
-	} else {
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				offset = x + ((y << repshift) + i + j) * vid.rowbytes;
-				off = offset % 0x10000;
-				if ((offset / 0x10000) != vidpage) {
-					vidpage=offset / 0x10000;
-					vga_setpage(vidpage);
-				}
-				memcpy (&backingbuf[(i + j) * 24],
-						vid.direct + off, width);
-				memcpy (vid.direct + off,
-						&pbitmap[(i >> repshift)*width], width);
-			}
-		}
-	}
-}
-
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-	int i, j, k, plane, reps, repshift, offset, vidpage, off;
-
-	if (!svgalib_inited || !vid.direct || !vga_oktowrite()) return;
-
-	if (vid.aspect > 1.5)
-	{
-		reps = 2;
-		repshift = 1;
-	} else {
-		reps = 1;
-		repshift = 0;
-	}
-
-	vidpage = 0;
-	vga_setpage(0);
-
-	if (VGA_planar)
-	{
-		for (plane=0 ; plane<4 ; plane++)
-		{
-		// select the correct plane for writing
-			outb(2, 0x3C4);
-			outb(1 << plane, 0x3C5);
-			outb(4, 0x3CE);
-			outb(plane, 0x3CF);
-
-			for (i=0 ; i<(height << repshift) ; i += reps)
-			{
-				for (k=0 ; k<reps ; k++)
-				{
-					for (j=0 ; j<(width >> 2) ; j++)
-					{
-						vid.direct[(y + i + k) * VGA_rowbytes + (x>>2) + j] =
-								backingbuf[(i + k) * 24 + (j << 2) + plane];
-					}
-				}
-			}
-		}
-	} else {
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				offset = x + ((y << repshift) + i + j) * vid.rowbytes;
-				off = offset % 0x10000;
-				if ((offset / 0x10000) != vidpage) {
-					vidpage=offset / 0x10000;
-					vga_setpage(vidpage);
-				}
-				memcpy (vid.direct + off, 
-						&backingbuf[(i +j)*24],
-						width);
-			}
-		}
-	}
-}
-
-/*
-=================
-VID_Gamma_f
-
-Keybinding command
-=================
-*/
-void VID_Gamma_f (void)
-{
-	float	gamma, f, inf;
-	unsigned char	palette[768];
-	int		i;
-
-	if (Cmd_Argc () == 2)
-	{
-		gamma = Q_atof (Cmd_Argv(1));
-
-		for (i=0 ; i<768 ; i++)
-		{
-			f = pow ( (host_basepal[i]+1)/256.0 , gamma );
-			inf = f*255 + 0.5;
-			if (inf < 0)
-				inf = 0;
-			if (inf > 255)
-				inf = 255;
-			palette[i] = inf;
-		}
-
-		VID_SetPalette (palette);
-
-		vid.recalc_refdef = 1;				// force a surface cache flush
-	}
-}
-
-void VID_DescribeMode_f (void)
-{
-	int modenum;
-	
-	modenum = Q_atoi (Cmd_Argv(1));
-	if ((modenum >= num_modes) || (modenum < 0 ) || !modes[modenum].width)
-		Con_Printf("Invalid video mode: %d!\n",modenum);
-	Con_Printf("%d: %d x %d - ",modenum,modes[modenum].width,modes[modenum].height);
-	if (modes[modenum].bytesperpixel == 0)
-		Con_Printf("ModeX\n");
-	else
-		Con_Printf("%d bpp\n", modes[modenum].bytesperpixel<<3);
-}
-
-void VID_DescribeModes_f (void)
-{
-	int i;
-	
-	for (i=0;i<num_modes;i++)
-		if (modes[i].width) {
-			Con_Printf("%d: %d x %d - ", i, modes[i].width,modes[i].height);
-			if (modes[i].bytesperpixel == 0)
-				Con_Printf("ModeX\n");
-			else
-				Con_Printf("%d bpp\n", modes[i].bytesperpixel<<3);
-		}
-}
-
-/*
-================
-VID_NumModes
-================
-*/
-int VID_NumModes ()
-{
-	int i,i1=0;
-	
-	for (i=0;i<num_modes;i++)
-		i1+=(modes[i].width?1:0);
-	return (i1);
-}
-
-void VID_NumModes_f (void)
-{
-	Con_Printf("%d modes\n",VID_NumModes());
-}
-
-void VID_Debug_f (void)
-{
-	Con_Printf("mode: %d\n",current_mode);
-	Con_Printf("height x width: %d x %d\n",vid.height,vid.width);
-	Con_Printf("bpp: %d\n",modes[current_mode].bytesperpixel*8);
-	Con_Printf("vid.aspect: %f\n",vid.aspect);
-}
-
-
-
-void VID_InitModes(void)
-{
-
-	int i;
-
-// get complete information on all modes
-
-	num_modes = vga_lastmodenumber()+1;
-	modes = Z_Malloc(num_modes * sizeof(vga_modeinfo));
-	for (i=0 ; i<num_modes ; i++)
-	{
-		if (vga_hasmode(i))
-			Q_memcpy(&modes[i], vga_getmodeinfo(i), sizeof (vga_modeinfo));
-		else
-			modes[i].width = 0; // means not available
-	}
-
-// filter for modes i don't support
-
-	for (i=0 ; i<num_modes ; i++)
-	{
-		if (modes[i].bytesperpixel != 1 && modes[i].colors != 256) 
-			modes[i].width = 0;
-	}
-
-}
-
-int get_mode(char *name, int width, int height, int depth)
-{
-
-	int i;
-	int ok, match;
-
-	match = (!!width) + (!!height)*2 + (!!depth)*4;
-
-	if (name)
-	{
-		i = vga_getmodenumber(name);
-		if (!modes[i].width)
-		{
-			Sys_Printf("Mode [%s] not supported\n", name);
-			i = G320x200x256;
-		}
-	}
-	else
-	{
-		for (i=0 ; i<num_modes ; i++)
-			if (modes[i].width)
-			{
-				ok = (modes[i].width == width)
-					+ (modes[i].height == height)*2
-					+ (modes[i].bytesperpixel == depth/8)*4;
-				if ((ok & match) == ok)
-					break;
-			}
-		if (i==num_modes)
-		{
-			Sys_Printf("Mode %dx%d (%d bits) not supported\n",
-				width, height, depth);
-			i = G320x200x256;
-		}
-	}
-
-	return i;
-
-}
-
-int matchmouse(int mouse, char *name)
-{
-	int i;
-	for (i=0 ; i<num_mice ; i++)
-		if (!strcmp(mice[i].name, name))
-			return i;
-	return mouse;
-}
-
-#if 0
-
-void vtswitch(int newconsole)
-{
-
-	int fd;
-	struct vt_stat x;
-
-// switch consoles and wait until reactivated
-	fd = open("/dev/console", O_RDONLY);
-	ioctl(fd, VT_GETSTATE, &x);
-	ioctl(fd, VT_ACTIVATE, newconsole);
-	ioctl(fd, VT_WAITACTIVE, x.v_active);
-	close(fd);
-
-}
-
-#endif
-
-void keyhandler(int scancode, int state)
-{
-	
-	int sc;
-
-	sc = scancode & 0x7f;
-//	Con_Printf("scancode=%x (%d%s)\n", scancode, sc, scancode&0x80?"+128":"");
-	Key_Event(scantokey[sc], state == KEY_EVENTPRESS);
-
-}
-
-void VID_Shutdown(void)
-{
-
-	if (!svgalib_inited) return;
-
-//	printf("shutdown graphics called\n");
-	if (UseKeyboard)
-		keyboard_close();
-	if (UseDisplay)
-		vga_setmode(TEXT);
-//	printf("shutdown graphics finished\n");
-
-	svgalib_inited = 0;
-
-}
-
-void VID_ShiftPalette(unsigned char *p)
-{
-	VID_SetPalette(p);
-}
-
-void VID_SetPalette(byte *palette)
-{
-
-	static int tmppal[256*3];
-	int *tp;
-	int i;
-
-	if (!svgalib_inited)
-		return;
-
-	memcpy(vid_current_palette, palette, sizeof(vid_current_palette));
-
-	if (vga_getcolors() == 256)
-	{
-
-		tp = tmppal;
-		for (i=256*3 ; i ; i--)
-			*(tp++) = *(palette++) >> 2;
-
-		if (UseDisplay && vga_oktowrite())
-			vga_setpalvec(0, 256, tmppal);
-
-	}
-}
-
-int VID_SetMode (int modenum, unsigned char *palette)
-{
-	int bsize, zsize, tsize;
-
-	if ((modenum >= num_modes) || (modenum < 0) || !modes[modenum].width)
-	{
-		Cvar_SetValue ("vid_mode", (float)current_mode);
-		
-		Con_Printf("No such video mode: %d\n",modenum);
-		
-		return 0;
-	}
-
-	Cvar_SetValue ("vid_mode", (float)modenum);
-	
-	current_mode=modenum;
-
-	vid.width = modes[current_mode].width;
-	vid.height = modes[current_mode].height;
-
-	VGA_width = modes[current_mode].width;
-	VGA_height = modes[current_mode].height;
-	VGA_planar = modes[current_mode].bytesperpixel == 0;
-	VGA_rowbytes = modes[current_mode].linewidth;
-	vid.rowbytes = modes[current_mode].linewidth;
-	if (VGA_planar) {
-		VGA_bufferrowbytes = modes[current_mode].linewidth * 4;
-		vid.rowbytes = modes[current_mode].linewidth*4;
-	}
-
-	vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
-	vid.colormap = (pixel_t *) host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-	vid.conrowbytes = vid.rowbytes;
-	vid.conwidth = vid.width;
-	vid.conheight = vid.height;
-	vid.numpages = 1;
-	
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-
-	// alloc zbuffer and surface cache
-	if (d_pzbuffer) {
-		D_FlushCaches();
-		Hunk_FreeToHighMark (VID_highhunkmark);
-		d_pzbuffer = NULL;
-		vid_surfcache = NULL;
-	}
-
-	bsize = vid.rowbytes * vid.height;
-	tsize = D_SurfaceCacheForRes (vid.width, vid.height);
-	zsize = vid.width * vid.height * sizeof(*d_pzbuffer);
-
-	VID_highhunkmark = Hunk_HighMark ();
-
-	d_pzbuffer = Hunk_HighAllocName (bsize+tsize+zsize, "video");
-
-	vid_surfcache = ((byte *)d_pzbuffer) + zsize;
-
-	vid.conbuffer = vid.buffer = (pixel_t *)(((byte *)d_pzbuffer) + zsize + tsize);
-
-	D_InitCaches (vid_surfcache, tsize);
-
-// get goin'
-
-	vga_setmode(current_mode);
-	VID_SetPalette(palette);
-
-	VGA_pagebase = vid.direct = framebuffer_ptr = (char *) vga_getgraphmem();
-//		if (vga_setlinearaddressing()>0)
-//			framebuffer_ptr = (char *) vga_getgraphmem();
-	if (!framebuffer_ptr)
-		Sys_Error("This mode isn't hapnin'\n");
-
-	vga_setpage(0);
-
-	svgalib_inited=1;
-
-	vid.recalc_refdef = 1;				// force a surface cache flush
-
-	return 0;
-}
-
-void VID_Init(unsigned char *palette)
-{
-
-	int i;
-	int w, h, d;
-
-	if (svgalib_inited)
-		return;
-
-//	Cmd_AddCommand ("gamma", VID_Gamma_f);
-
-	if (UseDisplay)
-	{
-		vga_init();
-
-		VID_InitModes();
-
-		Cvar_RegisterVariable (&vid_mode);
-		Cvar_RegisterVariable (&vid_redrawfull);
-		Cvar_RegisterVariable (&vid_waitforrefresh);
-		
-		Cmd_AddCommand("vid_nummodes", VID_NumModes_f);
-		Cmd_AddCommand("vid_describemode", VID_DescribeMode_f);
-		Cmd_AddCommand("vid_describemodes", VID_DescribeModes_f);
-		Cmd_AddCommand("vid_debug", VID_Debug_f);
-
-	// interpret command-line params
-
-		w = h = d = 0;
-		if (getenv("GSVGAMODE"))
-			current_mode = get_mode(getenv("GSVGAMODE"), w, h, d);
-		else if (COM_CheckParm("-mode"))
-			current_mode = get_mode(com_argv[COM_CheckParm("-mode")+1], w, h, d);
-		else if (COM_CheckParm("-w") || COM_CheckParm("-h")
-			|| COM_CheckParm("-d"))
-		{
-			if (COM_CheckParm("-w"))
-				w = Q_atoi(com_argv[COM_CheckParm("-w")+1]);
-			if (COM_CheckParm("-h"))
-				h = Q_atoi(com_argv[COM_CheckParm("-h")+1]);
-			if (COM_CheckParm("-d"))
-				d = Q_atoi(com_argv[COM_CheckParm("-d")+1]);
-			current_mode = get_mode(0, w, h, d);
-		}
-		else
-			current_mode = G320x200x256;
-
-	// set vid parameters
-		VID_SetMode(current_mode, palette);
-
-		VID_SetPalette(palette);
-
-		// we do want to run in the background when switched away
-		vga_runinbackground(1);	
-	}
-
-	if (COM_CheckParm("-nokbd")) UseKeyboard = 0;
-
-	if (UseKeyboard)
-	{
-		for (i=0 ; i<128 ; i++)
-			scantokey[i] = ' ';
-
-		scantokey[42] = K_SHIFT;
-		scantokey[54] = K_SHIFT;
-		scantokey[72] = K_UPARROW;
-		scantokey[103] = K_UPARROW;
-		scantokey[80] = K_DOWNARROW;
-		scantokey[108] = K_DOWNARROW;
-		scantokey[75] = K_LEFTARROW;
-		scantokey[105] = K_LEFTARROW;
-		scantokey[77] = K_RIGHTARROW;
-		scantokey[106] = K_RIGHTARROW;
-		scantokey[29] = K_CTRL;
-		scantokey[97] = K_CTRL;
-		scantokey[56] = K_ALT;
-		scantokey[100] = K_ALT;
-//		scantokey[58] = JK_CAPS;
-//		scantokey[69] = JK_NUM_LOCK;
-		scantokey[71] = K_HOME;
-		scantokey[73] = K_PGUP;
-		scantokey[79] = K_END;
-		scantokey[81] = K_PGDN;
-		scantokey[82] = K_INS;
-		scantokey[83] = K_DEL;
-		scantokey[1 ] = K_ESCAPE;
-		scantokey[28] = K_ENTER;
-		scantokey[15] = K_TAB;
-		scantokey[14] = K_BACKSPACE;
-		scantokey[119] = K_PAUSE;
-    	scantokey[57] = ' ';
-
-		scantokey[102] = K_HOME;
-		scantokey[104] = K_PGUP;
-		scantokey[107] = K_END;
-		scantokey[109] = K_PGDN;
-		scantokey[110] = K_INS;
-		scantokey[111] = K_DEL;
-
-		scantokey[2] = '1';
-		scantokey[3] = '2';
-		scantokey[4] = '3';
-		scantokey[5] = '4';
-		scantokey[6] = '5';
-		scantokey[7] = '6';
-		scantokey[8] = '7';
-		scantokey[9] = '8';
-		scantokey[10] = '9';
-		scantokey[11] = '0';
-		scantokey[12] = '-';
-		scantokey[13] = '=';
-		scantokey[41] = '`';
-		scantokey[26] = '[';
-		scantokey[27] = ']';
-		scantokey[39] = ';';
-		scantokey[40] = '\'';
-		scantokey[51] = ',';
-		scantokey[52] = '.';
-		scantokey[53] = '/';
-		scantokey[43] = '\\';
-
-		scantokey[59] = K_F1;
-		scantokey[60] = K_F2;
-		scantokey[61] = K_F3;
-		scantokey[62] = K_F4;
-		scantokey[63] = K_F5;
-		scantokey[64] = K_F6;
-		scantokey[65] = K_F7;
-		scantokey[66] = K_F8;
-		scantokey[67] = K_F9;
-		scantokey[68] = K_F10;
-		scantokey[87] = K_F11;
-		scantokey[88] = K_F12;
-		scantokey[30] = 'a';
-		scantokey[48] = 'b';
-		scantokey[46] = 'c';
-        scantokey[32] = 'd';       
-        scantokey[18] = 'e';       
-        scantokey[33] = 'f';       
-        scantokey[34] = 'g';       
-        scantokey[35] = 'h';       
-        scantokey[23] = 'i';       
-        scantokey[36] = 'j';       
-        scantokey[37] = 'k';       
-        scantokey[38] = 'l';       
-        scantokey[50] = 'm';       
-        scantokey[49] = 'n';       
-        scantokey[24] = 'o';       
-        scantokey[25] = 'p';       
-        scantokey[16] = 'q';       
-        scantokey[19] = 'r';       
-        scantokey[31] = 's';       
-        scantokey[20] = 't';       
-        scantokey[22] = 'u';       
-        scantokey[47] = 'v';       
-        scantokey[17] = 'w';       
-        scantokey[45] = 'x';       
-        scantokey[21] = 'y';       
-        scantokey[44] = 'z';       
-
-		if (keyboard_init())
-			Sys_Error("keyboard_init() failed");
-		keyboard_seteventhandler(keyhandler);
-	}
-
-}
-
-void VID_Update(vrect_t *rects)
-{
-	if (!svgalib_inited)
-		return;
-
-	if (!vga_oktowrite())
-		return; // can't update screen if it's not active
-
-	if (vid_waitforrefresh.value)
-		vga_waitretrace();
-
-	if (VGA_planar)
-		VGA_UpdatePlanarScreen (vid.buffer);
-
-	else if (vid_redrawfull.value) {
-		int total = vid.rowbytes * vid.height;
-		int offset;
-
-		for (offset=0;offset<total;offset+=0x10000) {
-			vga_setpage(offset/0x10000);
-			memcpy(framebuffer_ptr,
-					vid.buffer + offset,
-					((total-offset>0x10000)?0x10000:(total-offset)));
-		}
-	} else {
-		int ycount;
-		int offset;
-		int vidpage=0;
-
-		vga_setpage(0);
-
-		while (rects)
-		{
-			ycount = rects->height;
-			offset = rects->y * vid.rowbytes + rects->x;
-			while (ycount--)
-			{
-				register int i = offset % 0x10000;
-	
-				if ((offset / 0x10000) != vidpage) {
-					vidpage=offset / 0x10000;
-					vga_setpage(vidpage);
-				}
-				if (rects->width + i > 0x10000) {
-					memcpy(framebuffer_ptr + i, 
-							vid.buffer + offset, 
-							0x10000 - i);
-					vga_setpage(++vidpage);
-					memcpy(framebuffer_ptr,
-							vid.buffer + offset + 0x10000 - i, 
-							rects->width - 0x10000 + i);
-				} else
-					memcpy(framebuffer_ptr + i, 
-							vid.buffer + offset, 
-							rects->width);
-				offset += vid.rowbytes;
-			}
-	
-			rects = rects->pnext;
-		}
-	}
-	
-	if (vid_mode.value != current_mode)
-		VID_SetMode ((int)vid_mode.value, vid_current_palette);
-}
-
-static int dither;
-
-void VID_DitherOn(void)
-{
-    if (dither == 0)
-    {
-//		R_ViewChanged (&vrect, sb_lines, vid.aspect);
-        dither = 1;
-    }
-}
-
-void VID_DitherOff(void)
-{
-    if (dither)
-    {
-//		R_ViewChanged (&vrect, sb_lines, vid.aspect);
-        dither = 0;
-    }
-}
-
-void Sys_SendKeyEvents(void)
-{
-	if (!svgalib_inited)
-		return;
-
-	if (UseKeyboard)
-		while (keyboard_update());
-}
-
-void Force_CenterView_f (void)
-{
-	cl.viewangles[PITCH] = 0;
-}
-
-
-void mousehandler(int buttonstate, int dx, int dy)
-{
-	mouse_buttonstate = buttonstate;
-	mx += dx;
-	my += dy;
-}
-
-void IN_Init(void)
-{
-
-	int mtype;
-	char *mousedev;
-	int mouserate;
-
-	if (UseMouse)
-	{
-
-		Cvar_RegisterVariable (&mouse_button_commands[0]);
-		Cvar_RegisterVariable (&mouse_button_commands[1]);
-		Cvar_RegisterVariable (&mouse_button_commands[2]);
-		Cvar_RegisterVariable (&m_filter);
-		Cmd_AddCommand ("force_centerview", Force_CenterView_f);
-
-		mouse_buttons = 3;
-
-		mtype = vga_getmousetype();
-
-		mousedev = "/dev/mouse";
-		if (getenv("MOUSEDEV")) mousedev = getenv("MOUSEDEV");
-		if (COM_CheckParm("-mdev"))
-			mousedev = com_argv[COM_CheckParm("-mdev")+1];
-
-		mouserate = 1200;
-		if (getenv("MOUSERATE")) mouserate = atoi(getenv("MOUSERATE"));
-		if (COM_CheckParm("-mrate"))
-			mouserate = atoi(com_argv[COM_CheckParm("-mrate")+1]);
-
-//		printf("Mouse: dev=%s,type=%s,speed=%d\n",
-//			mousedev, mice[mtype].name, mouserate);
-		if (mouse_init(mousedev, mtype, mouserate))
-		{
-			Con_Printf("No mouse found\n");
-			UseMouse = 0;
-		}
-		else
-			mouse_seteventhandler(mousehandler);
-
-	}
-
-}
-
-void IN_Shutdown(void)
-{
-	if (UseMouse)
-		mouse_close();
-}
-
-/*
-===========
-IN_Commands
-===========
-*/
-void IN_Commands (void)
-{
-	if (UseMouse && cls.state != ca_dedicated)
-	{
-		// poll mouse values
-		while (mouse_update())
-			;
-
-		// perform button actions
-		if ((mouse_buttonstate & MOUSE_LEFTBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_LEFTBUTTON))
-			Key_Event (K_MOUSE1, true);
-		else if (!(mouse_buttonstate & MOUSE_LEFTBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_LEFTBUTTON))
-			Key_Event (K_MOUSE1, false);
-
-		if ((mouse_buttonstate & MOUSE_RIGHTBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_RIGHTBUTTON))
-			Key_Event (K_MOUSE2, true);
-		else if (!(mouse_buttonstate & MOUSE_RIGHTBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_RIGHTBUTTON))
-			Key_Event (K_MOUSE2, false);
-
-		if ((mouse_buttonstate & MOUSE_MIDDLEBUTTON) &&
-			!(mouse_oldbuttonstate & MOUSE_MIDDLEBUTTON))
-			Key_Event (K_MOUSE3, true);
-		else if (!(mouse_buttonstate & MOUSE_MIDDLEBUTTON) &&
-			(mouse_oldbuttonstate & MOUSE_MIDDLEBUTTON))
-			Key_Event (K_MOUSE3, false);
-
-		mouse_oldbuttonstate = mouse_buttonstate;
-	}
-}
-
-/*
-===========
-IN_Move
-===========
-*/
-void IN_MouseMove (usercmd_t *cmd)
-{
-	if (!UseMouse)
-		return;
-
-	// poll mouse values
-	while (mouse_update())
-		;
-
-	if (m_filter.value)
-	{
-		mouse_x = (mx + old_mouse_x) * 0.5;
-		mouse_y = (my + old_mouse_y) * 0.5;
-	}
-	else
-	{
-		mouse_x = mx;
-		mouse_y = my;
-	}
-	old_mouse_x = mx;
-	old_mouse_y = my;
-	mx = my = 0; // clear for next update
-
-	mouse_x *= sensitivity.value;
-	mouse_y *= sensitivity.value;
-
-// add mouse X/Y movement to cmd
-	if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) ))
-		cmd->sidemove += m_side.value * mouse_x;
-	else
-		cl.viewangles[YAW] -= m_yaw.value * mouse_x;
-	
-	if (in_mlook.state & 1)
-		V_StopPitchDrift ();
-		
-	if ( (in_mlook.state & 1) && !(in_strafe.state & 1))
-	{
-		cl.viewangles[PITCH] += m_pitch.value * mouse_y;
-		if (cl.viewangles[PITCH] > 80)
-			cl.viewangles[PITCH] = 80;
-		if (cl.viewangles[PITCH] < -70)
-			cl.viewangles[PITCH] = -70;
-	}
-	else
-	{
-		if ((in_strafe.state & 1) && noclip_anglehack)
-			cmd->upmove -= m_forward.value * mouse_y;
-		else
-			cmd->forwardmove -= m_forward.value * mouse_y;
-	}
-}
-
-void IN_Move (usercmd_t *cmd)
-{
-	IN_MouseMove(cmd);
-}
-
-
-/*
-================
-VID_ModeInfo
-================
-*/
-char *VID_ModeInfo (int modenum)
-{
-	static char	*badmodestr = "Bad mode number";
-	static char modestr[40];
-
-	if (modenum == 0)
-	{
-		sprintf (modestr, "%d x %d, %d bpp",
-				 vid.width, vid.height, modes[current_mode].bytesperpixel*8);
-		return (modestr);
-	}
-	else
-	{
-		return (badmodestr);
-	}
-}
-
--- a/u/vid_vga.c
+++ /dev/null
@@ -1,478 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// vid_vga.c: VGA-specific DOS video stuff
-//
-
-// TODO: proper handling of page-swap failure
-
-#include <dos.h>
-
-#include "quakedef.h"
-#include "d_local.h"
-#include "dosisms.h"
-#include "vid_dos.h"
-#include <dpmi.h>
-
-extern regs_t regs;
-
-int		VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes;
-byte	*VGA_pagebase;
-vmode_t	*VGA_pcurmode;
-
-static int		VGA_planar;
-static int		VGA_numpages;
-static int		VGA_buffersize;
-
-void	*vid_surfcache;
-int		vid_surfcachesize;
-
-int		VGA_highhunkmark;
-
-#include "vgamodes.h"
-
-#define NUMVIDMODES		(sizeof(vgavidmodes) / sizeof(vgavidmodes[0]))
-
-void VGA_UpdatePlanarScreen (void *srcbuffer);
-
-static byte	backingbuf[48*24];
-
-/*
-================
-VGA_BeginDirectRect
-================
-*/
-void VGA_BeginDirectRect (viddef_t *lvid, struct vmode_s *pcurrentmode, int x,
-	int y, byte *pbitmap, int width, int height)
-{
-	int		i, j, k, plane, reps, repshift;
-
-	if (!lvid->direct)
-		return;
-
-	if (lvid->aspect > 1.5)
-	{
-		reps = 2;
-		repshift = 1;
-	}
-	else
-	{
-		reps = 1;
-		repshift = 0;
-	}
-
-	if (pcurrentmode->planar)
-	{
-		for (plane=0 ; plane<4 ; plane++)
-		{
-		// select the correct plane for reading and writing
-			outportb (SC_INDEX, MAP_MASK);
-			outportb (SC_DATA, 1 << plane);
-			outportb (GC_INDEX, READ_MAP);
-			outportb (GC_DATA, plane);
-
-			for (i=0 ; i<(height << repshift) ; i += reps)
-			{
-				for (k=0 ; k<reps ; k++)
-				{
-					for (j=0 ; j<(width >> 2) ; j++)
-					{
-						backingbuf[(i + k) * 24 + (j << 2) + plane] =
-								lvid->direct[(y + i + k) * VGA_rowbytes +
-								(x >> 2) + j];
-						lvid->direct[(y + i + k) * VGA_rowbytes + (x>>2) + j] =
-								pbitmap[(i >> repshift) * 24 +
-								(j << 2) + plane];
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				memcpy (&backingbuf[(i + j) * 24],
-						lvid->direct + x + ((y << repshift) + i + j) *
-						 VGA_rowbytes,
-						width);
-				memcpy (lvid->direct + x + ((y << repshift) + i + j) *
-						 VGA_rowbytes,
-						&pbitmap[(i >> repshift) * width],
-						width);
-			}
-		}
-	}
-}
-
-
-/*
-================
-VGA_EndDirectRect
-================
-*/
-void VGA_EndDirectRect (viddef_t *lvid, struct vmode_s *pcurrentmode, int x,
-	int y, int width, int height)
-{
-	int		i, j, k, plane, reps, repshift;
-
-	if (!lvid->direct)
-		return;
-
-	if (lvid->aspect > 1.5)
-	{
-		reps = 2;
-		repshift = 1;
-	}
-	else
-	{
-		reps = 1;
-		repshift = 0;
-	}
-
-	if (pcurrentmode->planar)
-	{
-		for (plane=0 ; plane<4 ; plane++)
-		{
-		// select the correct plane for writing
-			outportb (SC_INDEX, MAP_MASK);
-			outportb (SC_DATA, 1 << plane);
-
-			for (i=0 ; i<(height << repshift) ; i += reps)
-			{
-				for (k=0 ; k<reps ; k++)
-				{
-					for (j=0 ; j<(width >> 2) ; j++)
-					{
-						lvid->direct[(y + i + k) * VGA_rowbytes + (x>>2) + j] =
-								backingbuf[(i + k) * 24 + (j << 2) + plane];
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				memcpy (lvid->direct + x + ((y << repshift) + i + j) *
-						 VGA_rowbytes,
-						&backingbuf[(i + j) * 24],
-						width);
-			}
-		}
-	}
-}
-
-
-/*
-================
-VGA_Init
-================
-*/
-void VGA_Init (void)
-{
-	int		i;
-
-// link together all the VGA modes
-	for (i=0 ; i<(NUMVIDMODES - 1) ; i++)
-	{
-		vgavidmodes[i].pnext = &vgavidmodes[i+1];
-	}
-
-// add the VGA modes at the start of the mode list
-	vgavidmodes[NUMVIDMODES-1].pnext = pvidmodes;
-	pvidmodes = &vgavidmodes[0];
-
-	numvidmodes += NUMVIDMODES;
-}
-
-
-/*
-================
-VGA_WaitVsync
-================
-*/
-void VGA_WaitVsync (void)
-{
-	while ((inportb (0x3DA) & 0x08) == 0)
-		;
-}
-
-
-/*
-================
-VGA_ClearVideoMem
-================
-*/
-void VGA_ClearVideoMem (int planar)
-{
-
-	if (planar)
-	{
-	// enable all planes for writing
-		outportb (SC_INDEX, MAP_MASK);
-		outportb (SC_DATA, 0x0F);
-	}
-
-	Q_memset (VGA_pagebase, 0, VGA_rowbytes * VGA_height);
-}
-
-/*
-================
-VGA_FreeAndAllocVidbuffer
-================
-*/
-qboolean VGA_FreeAndAllocVidbuffer (viddef_t *lvid, int allocnewbuffer)
-{
-	int		tsize, tbuffersize;
-
-	if (allocnewbuffer)
-	{
-	// alloc an extra line in case we want to wrap, and allocate the z-buffer
-		tbuffersize = (lvid->rowbytes * (lvid->height + 1)) +
-				(lvid->width * lvid->height * sizeof (*d_pzbuffer));
-	}
-	else
-	{
-	// just allocate the z-buffer
-		tbuffersize = lvid->width * lvid->height * sizeof (*d_pzbuffer);
-	}
-
-	tsize = D_SurfaceCacheForRes (lvid->width, lvid->height);
-
-	tbuffersize += tsize;
-
-// see if there's enough memory, allowing for the normal mode 0x13 pixel,
-// z, and surface buffers
-	if ((host_parms.memsize - tbuffersize + SURFCACHE_SIZE_AT_320X200 +
-		 0x10000 * 3) < minimum_memory)
-	{
-		Con_Printf ("Not enough memory for video mode\n");
-		VGA_pcurmode = NULL;	// so no further accesses to the buffer are
-								//  attempted, particularly when clearing
-		return false;		// not enough memory for mode
-	}
-
-	VGA_buffersize = tbuffersize;
-	vid_surfcachesize = tsize;
-
-	if (d_pzbuffer)
-	{
-		D_FlushCaches ();
-		Hunk_FreeToHighMark (VGA_highhunkmark);
-		d_pzbuffer = NULL;
-	}
-
-	VGA_highhunkmark = Hunk_HighMark ();
-
-	d_pzbuffer = Hunk_HighAllocName (VGA_buffersize, "video");
-
-	vid_surfcache = (byte *)d_pzbuffer
-		+ lvid->width * lvid->height * sizeof (*d_pzbuffer);
-	
-	if (allocnewbuffer)
-	{
-		lvid->buffer = (void *)( (byte *)vid_surfcache + vid_surfcachesize);
-		lvid->conbuffer = lvid->buffer;
-	}
-
-	return true;
-}
-
-
-/*
-================
-VGA_CheckAdequateMem
-================
-*/
-qboolean VGA_CheckAdequateMem (int width, int height, int rowbytes,
-	int allocnewbuffer)
-{
-	int		tbuffersize;
-
-	tbuffersize = width * height * sizeof (*d_pzbuffer);
-
-	if (allocnewbuffer)
-	{
-	// alloc an extra line in case we want to wrap, and allocate the z-buffer
-		tbuffersize += (rowbytes * (height + 1));
-	}
-
-	tbuffersize += D_SurfaceCacheForRes (width, height);
-
-// see if there's enough memory, allowing for the normal mode 0x13 pixel,
-// z, and surface buffers
-	if ((host_parms.memsize - tbuffersize + SURFCACHE_SIZE_AT_320X200 +
-		 0x10000 * 3) < minimum_memory)
-	{
-		return false;		// not enough memory for mode
-	}
-
-	return true;
-}
-
-
-/*
-================
-VGA_InitMode
-================
-*/
-int VGA_InitMode (viddef_t *lvid, vmode_t *pcurrentmode)
-{
-	vextra_t		*pextra;
-
-	pextra = pcurrentmode->pextradata;
-
-	if (!VGA_FreeAndAllocVidbuffer (lvid, pextra->vidbuffer))
-		return -1;	// memory alloc failed
-
-	if (VGA_pcurmode)
-		VGA_ClearVideoMem (VGA_pcurmode->planar);
-
-// mode 0x13 is the base for all the Mode X-class mode sets
-	regs.h.ah = 0;
-	regs.h.al = 0x13;
-	dos_int86(0x10);
-
-	VGA_pagebase = (void *)real2ptr(0xa0000);
-	lvid->direct = (pixel_t *)VGA_pagebase;
-
-// set additional registers as needed
-	VideoRegisterSet (pextra->pregset);
-
-	VGA_numpages = 1;
-	lvid->numpages = VGA_numpages;
-
-	VGA_width = (lvid->width + 0x1F) & ~0x1F;
-	VGA_height = lvid->height;
-	VGA_planar = pcurrentmode->planar;
-	if (VGA_planar)
-		VGA_rowbytes = lvid->rowbytes / 4;
-	else
-		VGA_rowbytes = lvid->rowbytes;
-	VGA_bufferrowbytes = lvid->rowbytes;
-	lvid->colormap = host_colormap;
-	lvid->fullbright = 256 - LittleLong (*((int *)lvid->colormap + 2048));
-
-	lvid->maxwarpwidth = WARP_WIDTH;
-	lvid->maxwarpheight = WARP_HEIGHT;
-
-	lvid->conbuffer = lvid->buffer;
-	lvid->conrowbytes = lvid->rowbytes;
-	lvid->conwidth = lvid->width;
-	lvid->conheight = lvid->height;
-
-	VGA_pcurmode = pcurrentmode;
-
-	VGA_ClearVideoMem (pcurrentmode->planar);
-
-	if (_vid_wait_override.value)
-	{
-		Cvar_SetValue ("vid_wait", (float)VID_WAIT_VSYNC);
-	}
-	else
-	{
-		Cvar_SetValue ("vid_wait", (float)VID_WAIT_NONE);
-	}
-
-	D_InitCaches (vid_surfcache, vid_surfcachesize);
-
-	return 1;
-}
-
-
-/*
-================
-VGA_SetPalette
-================
-*/
-void VGA_SetPalette(viddef_t *lvid, vmode_t *pcurrentmode, unsigned char *pal)
-{
-	int shiftcomponents=2;
-	int i;
-
-	UNUSED(lvid);
-	UNUSED(pcurrentmode);
-
-	dos_outportb(0x3c8, 0);
-	for (i=0 ; i<768 ; i++)
-		outportb(0x3c9, pal[i]>>shiftcomponents);
-}
-
-
-/*
-================
-VGA_SwapBuffersCopy
-================
-*/
-void VGA_SwapBuffersCopy (viddef_t *lvid, vmode_t *pcurrentmode,
-	vrect_t *rects)
-{
-
-	UNUSED(pcurrentmode);
-
-// TODO: can write a dword at a time
-// TODO: put in ASM
-// TODO: copy only specified rectangles
-	if (VGA_planar)
-	{
-
-	// TODO: copy only specified rectangles
-
-		VGA_UpdatePlanarScreen (lvid->buffer);
-	}
-	else
-	{
-		while (rects)
-		{
-			VGA_UpdateLinearScreen (
-					lvid->buffer + rects->x + (rects->y * lvid->rowbytes),
-		 			VGA_pagebase + rects->x + (rects->y * VGA_rowbytes),
-					rects->width,
-					rects->height,
-					lvid->rowbytes,
-					VGA_rowbytes);
-
-			rects = rects->pnext;
-		}
-	}
-}
-
-
-/*
-================
-VGA_SwapBuffers
-================
-*/
-void VGA_SwapBuffers (viddef_t *lvid, vmode_t *pcurrentmode, vrect_t *rects)
-{
-	UNUSED(lvid);
-
-	if (vid_wait.value == VID_WAIT_VSYNC)
-		VGA_WaitVsync ();
-
-	VGA_SwapBuffersCopy (lvid, pcurrentmode, rects);
-}
-
--- a/u/vid_win.c
+++ /dev/null
@@ -1,3343 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// vid_win.c -- Win32 video driver
-
-#include "quakedef.h"
-#include "winquake.h"
-#include "d_local.h"
-#include "resource.h"
-
-#define MAX_MODE_LIST	30
-#define VID_ROW_SIZE	3
-
-qboolean	dibonly;
-
-extern int		Minimized;
-
-HWND		mainwindow;
-
-HWND WINAPI InitializeWindow (HINSTANCE hInstance, int nCmdShow);
-
-int			DIBWidth, DIBHeight;
-qboolean	DDActive;
-RECT		WindowRect;
-DWORD		WindowStyle, ExWindowStyle;
-
-int			window_center_x, window_center_y, window_x, window_y, window_width, window_height;
-RECT		window_rect;
-
-static DEVMODE	gdevmode;
-static qboolean	startwindowed = 0, windowed_mode_set;
-static int		firstupdate = 1;
-static qboolean	vid_initialized = false, vid_palettized;
-static int		lockcount;
-static int		vid_fulldib_on_focus_mode;
-static qboolean	force_minimized, in_mode_set, is_mode0x13, force_mode_set;
-static int		vid_stretched, windowed_mouse;
-static qboolean	palette_changed, syscolchg, vid_mode_set, hide_window, pal_is_nostatic;
-static HICON	hIcon;
-
-viddef_t	vid;				// global video state
-
-#define MODE_WINDOWED			0
-#define MODE_SETTABLE_WINDOW	2
-#define NO_MODE					(MODE_WINDOWED - 1)
-#define MODE_FULLSCREEN_DEFAULT	(MODE_WINDOWED + 3)
-
-// Note that 0 is MODE_WINDOWED
-cvar_t		vid_mode = {"vid_mode","0", false};
-// Note that 0 is MODE_WINDOWED
-cvar_t		_vid_default_mode = {"_vid_default_mode","0", true};
-// Note that 3 is MODE_FULLSCREEN_DEFAULT
-cvar_t		_vid_default_mode_win = {"_vid_default_mode_win","3", true};
-cvar_t		vid_wait = {"vid_wait","0"};
-cvar_t		vid_nopageflip = {"vid_nopageflip","0", true};
-cvar_t		_vid_wait_override = {"_vid_wait_override", "0", true};
-cvar_t		vid_config_x = {"vid_config_x","800", true};
-cvar_t		vid_config_y = {"vid_config_y","600", true};
-cvar_t		vid_stretch_by_2 = {"vid_stretch_by_2","1", true};
-cvar_t		_windowed_mouse = {"_windowed_mouse","0", true};
-cvar_t		vid_fullscreen_mode = {"vid_fullscreen_mode","3", true};
-cvar_t		vid_windowed_mode = {"vid_windowed_mode","0", true};
-cvar_t		block_switch = {"block_switch","0", true};
-cvar_t		vid_window_x = {"vid_window_x", "0", true};
-cvar_t		vid_window_y = {"vid_window_y", "0", true};
-
-typedef struct {
-	int		width;
-	int		height;
-} lmode_t;
-
-lmode_t	lowresmodes[] = {
-	{320, 200},
-	{320, 240},
-	{400, 300},
-	{512, 384},
-};
-
-int			vid_modenum = NO_MODE;
-int			vid_testingmode, vid_realmode;
-double		vid_testendtime;
-int			vid_default = MODE_WINDOWED;
-static int	windowed_default;
-
-modestate_t	modestate = MS_UNINIT;
-
-static byte		*vid_surfcache;
-static int		vid_surfcachesize;
-static int		VID_highhunkmark;
-
-unsigned char	vid_curpal[256*3];
-
-unsigned short	d_8to16table[256];
-unsigned	d_8to24table[256];
-
-int     driver = grDETECT,mode;
-bool    useWinDirect = true, useDirectDraw = true;
-MGLDC	*mgldc = NULL,*memdc = NULL,*dibdc = NULL,*windc = NULL;
-
-typedef struct {
-	modestate_t	type;
-	int			width;
-	int			height;
-	int			modenum;
-	int			mode13;
-	int			stretched;
-	int			dib;
-	int			fullscreen;
-	int			bpp;
-	int			halfscreen;
-	char		modedesc[13];
-} vmode_t;
-
-static vmode_t	modelist[MAX_MODE_LIST];
-static int		nummodes;
-static vmode_t	*pcurrentmode;
-
-int		aPage;					// Current active display page
-int		vPage;					// Current visible display page
-int		waitVRT = true;			// True to wait for retrace on flip
-
-static vmode_t	badmode;
-
-static byte	backingbuf[48*24];
-
-void VID_MenuDraw (void);
-void VID_MenuKey (int key);
-
-LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-void AppActivate(BOOL fActive, BOOL minimize);
-
-
-/*
-================
-VID_RememberWindowPos
-================
-*/
-void VID_RememberWindowPos (void)
-{
-	RECT	rect;
-
-	if (GetWindowRect (mainwindow, &rect))
-	{
-		if ((rect.left < GetSystemMetrics (SM_CXSCREEN)) &&
-			(rect.top < GetSystemMetrics (SM_CYSCREEN))  &&
-			(rect.right > 0)                             &&
-			(rect.bottom > 0))
-		{
-			Cvar_SetValue ("vid_window_x", (float)rect.left);
-			Cvar_SetValue ("vid_window_y", (float)rect.top);
-		}
-	}
-}
-
-
-/*
-================
-VID_CheckWindowXY
-================
-*/
-void VID_CheckWindowXY (void)
-{
-
-	if (((int)vid_window_x.value > (GetSystemMetrics (SM_CXSCREEN) - 160)) ||
-		((int)vid_window_y.value > (GetSystemMetrics (SM_CYSCREEN) - 120)) ||
-		((int)vid_window_x.value < 0)									   ||
-		((int)vid_window_y.value < 0))
-	{
-		Cvar_SetValue ("vid_window_x", 0.0);
-		Cvar_SetValue ("vid_window_y", 0.0 );
-	}
-}
-
-
-/*
-================
-VID_UpdateWindowStatus
-================
-*/
-void VID_UpdateWindowStatus (void)
-{
-
-	window_rect.left = window_x;
-	window_rect.top = window_y;
-	window_rect.right = window_x + window_width;
-	window_rect.bottom = window_y + window_height;
-	window_center_x = (window_rect.left + window_rect.right) / 2;
-	window_center_y = (window_rect.top + window_rect.bottom) / 2;
-
-	IN_UpdateClipCursor ();
-}
-
-
-/*
-================
-ClearAllStates
-================
-*/
-void ClearAllStates (void)
-{
-	int		i;
-	
-// send an up event for each key, to make sure the server clears them all
-	for (i=0 ; i<256 ; i++)
-	{
-		Key_Event (i, false);
-	}
-
-	Key_ClearStates ();
-	IN_ClearStates ();
-}
-
-
-/*
-================
-VID_CheckAdequateMem
-================
-*/
-qboolean VID_CheckAdequateMem (int width, int height)
-{
-	int		tbuffersize;
-
-	tbuffersize = width * height * sizeof (*d_pzbuffer);
-
-	tbuffersize += D_SurfaceCacheForRes (width, height);
-
-// see if there's enough memory, allowing for the normal mode 0x13 pixel,
-// z, and surface buffers
-	if ((host_parms.memsize - tbuffersize + SURFCACHE_SIZE_AT_320X200 +
-		 0x10000 * 3) < minimum_memory)
-	{
-		return false;		// not enough memory for mode
-	}
-
-	return true;
-}
-
-
-/*
-================
-VID_AllocBuffers
-================
-*/
-qboolean VID_AllocBuffers (int width, int height)
-{
-	int		tsize, tbuffersize;
-
-	tbuffersize = width * height * sizeof (*d_pzbuffer);
-
-	tsize = D_SurfaceCacheForRes (width, height);
-
-	tbuffersize += tsize;
-
-// see if there's enough memory, allowing for the normal mode 0x13 pixel,
-// z, and surface buffers
-	if ((host_parms.memsize - tbuffersize + SURFCACHE_SIZE_AT_320X200 +
-		 0x10000 * 3) < minimum_memory)
-	{
-		Con_SafePrintf ("Not enough memory for video mode\n");
-		return false;		// not enough memory for mode
-	}
-
-	vid_surfcachesize = tsize;
-
-	if (d_pzbuffer)
-	{
-		D_FlushCaches ();
-		Hunk_FreeToHighMark (VID_highhunkmark);
-		d_pzbuffer = NULL;
-	}
-
-	VID_highhunkmark = Hunk_HighMark ();
-
-	d_pzbuffer = Hunk_HighAllocName (tbuffersize, "video");
-
-	vid_surfcache = (byte *)d_pzbuffer +
-			width * height * sizeof (*d_pzbuffer);
-	
-	return true;
-}
-
-
-void initFatalError(void)
-{
-	MGL_exit();
-	MGL_fatalError(MGL_errorMsg(MGL_result()));
-	exit(EXIT_FAILURE);
-}
-
-
-int VID_Suspend (MGLDC *dc,m_int flags)
-{
-
-	if (flags & MGL_DEACTIVATE)
-	{
-	// FIXME: this doesn't currently work on NT
-		if (block_switch.value && !WinNT)
-		{
-			return MGL_NO_DEACTIVATE;
-		}
-
-		S_BlockSound ();
-		S_ClearBuffer ();
-
-		IN_RestoreOriginalMouseState ();
-		CDAudio_Pause ();
-
-	// keep WM_PAINT from trying to redraw
-		in_mode_set = true;
-
-		block_drawing = true;	// so we don't try to draw while switched away
-
-		return MGL_NO_SUSPEND_APP;
-	}
-	else if (flags & MGL_REACTIVATE)
-	{
-		IN_SetQuakeMouseState ();
-	// fix the leftover Alt from any Alt-Tab or the like that switched us away
-		ClearAllStates ();
-		CDAudio_Resume ();
-		S_UnblockSound ();
-
-		in_mode_set = false;
-
-		vid.recalc_refdef = 1;
-
-		block_drawing = false;
-
-		return MGL_NO_SUSPEND_APP;
-	}
-
-}
-
-
-void registerAllDispDrivers(void)
-{
-	/* Event though these driver require WinDirect, we register
-	 * them so that they will still be available even if DirectDraw
-	 * is present and the user has disable the high performance
-	 * WinDirect modes.
-	 */
-	MGL_registerDriver(MGL_VGA8NAME,VGA8_driver);
-//	MGL_registerDriver(MGL_VGAXNAME,VGAX_driver);
-
-	/* Register display drivers */
-	if (useWinDirect)
-	{
-//we don't want VESA 1.X drivers		MGL_registerDriver(MGL_SVGA8NAME,SVGA8_driver);
-		MGL_registerDriver(MGL_LINEAR8NAME,LINEAR8_driver);
-
-		if (!COM_CheckParm ("-novbeaf"))
-			MGL_registerDriver(MGL_ACCEL8NAME,ACCEL8_driver);
-	}
-
-	if (useDirectDraw)
-	{
-		MGL_registerDriver(MGL_DDRAW8NAME,DDRAW8_driver);
-	}
-}
-
-
-void registerAllMemDrivers(void)
-{
-	/* Register memory context drivers */
-	MGL_registerDriver(MGL_PACKED8NAME,PACKED8_driver);
-}
-
-
-void VID_InitMGLFull (HINSTANCE hInstance)
-{
-	int			i, xRes, yRes, bits, vMode, lowres, curmode, temp;
-	int			lowstretchedres, stretchedmode, lowstretched;
-    uchar		*m;
-
-// FIXME: NT is checked for because MGL currently has a bug that causes it
-// to try to use WinDirect modes even on NT
-	if (COM_CheckParm("-nowindirect") ||
-		COM_CheckParm("-nowd") ||
-		COM_CheckParm("-novesa") ||
-		WinNT)
-	{
-		useWinDirect = false;
-	}
-
-	if (COM_CheckParm("-nodirectdraw") || COM_CheckParm("-noddraw") || COM_CheckParm("-nodd"))
-		useDirectDraw = false;
-
-	// Initialise the MGL
-	MGL_unregisterAllDrivers();
-	registerAllDispDrivers();
-	registerAllMemDrivers();
-	MGL_detectGraph(&driver,&mode);
-	m = MGL_availableModes();
-
-	if (m[0] != 0xFF)
-	{
-		lowres = lowstretchedres = 99999;
-		lowstretched = 0;
-		curmode = 0;
-
-	// find the lowest-res mode, or a mode we can stretch up to and get
-	// lowest-res that way
-		for (i = 0; m[i] != 0xFF; i++)
-		{
-			MGL_modeResolution(m[i], &xRes, &yRes,&bits);
-
-			if ((bits == 8) &&
-				(xRes <= MAXWIDTH) &&
-				(yRes <= MAXHEIGHT) &&
-				(curmode < MAX_MODE_LIST))
-			{
-				if (m[i] == grVGA_320x200x256)
-					is_mode0x13 = true;
-
-				if (!COM_CheckParm("-noforcevga"))
-				{
-					if (m[i] == grVGA_320x200x256)
-					{
-						mode = i;
-						break;
-					}
-				}
-
-				if (xRes < lowres)
-				{
-					lowres = xRes;
-					mode = i;
-				}
-
-				if ((xRes < lowstretchedres) && ((xRes >> 1) >= 320))
-				{
-					lowstretchedres = xRes >> 1;
-					stretchedmode = i;
-				}
-			}
-
-			curmode++;
-		}
-
-	// if there's a mode we can stretch by 2 up to, thereby effectively getting
-	// a lower-res mode than the lowest-res real but still at least 320x200, that
-	// will be our default mode
-		if (lowstretchedres < lowres)
-		{
-			mode = stretchedmode;
-			lowres = lowstretchedres;
-			lowstretched = 1;
-		}
-
-	// build the mode list, leaving room for the low-res stretched mode, if any
-		nummodes++;		// leave room for default mode
-
-		for (i = 0; m[i] != 0xFF; i++)
-		{
-			MGL_modeResolution(m[i], &xRes, &yRes,&bits);
-
-			if ((bits == 8) &&
-				(xRes <= MAXWIDTH) &&
-				(yRes <= MAXHEIGHT) &&
-				(nummodes < MAX_MODE_LIST))
-			{
-				if (i == mode)
-				{
-					if (lowstretched)
-					{
-						stretchedmode = nummodes;
-						curmode = nummodes++;
-					}
-					else
-					{
-						curmode = MODE_FULLSCREEN_DEFAULT;
-					}
-				}
-				else
-				{
-					curmode = nummodes++;
-				}
-
-				modelist[curmode].type = MS_FULLSCREEN;
-				modelist[curmode].width = xRes;
-				modelist[curmode].height = yRes;
-				sprintf (modelist[curmode].modedesc, "%dx%d", xRes, yRes);
-
-				if (m[i] == grVGA_320x200x256)
-					modelist[curmode].mode13 = 1;
-				else
-					modelist[curmode].mode13 = 0;
-
-				modelist[curmode].modenum = m[i];
-				modelist[curmode].stretched = 0;
-				modelist[curmode].dib = 0;
-				modelist[curmode].fullscreen = 1;
-				modelist[curmode].halfscreen = 0;
-				modelist[curmode].bpp = 8;
-			}
-		}
-
-		if (lowstretched)
-		{
-			modelist[MODE_FULLSCREEN_DEFAULT] = modelist[stretchedmode];
-			modelist[MODE_FULLSCREEN_DEFAULT].stretched = 1;
-			modelist[MODE_FULLSCREEN_DEFAULT].width >>= 1;
-			modelist[MODE_FULLSCREEN_DEFAULT].height >>= 1;
-			sprintf (modelist[MODE_FULLSCREEN_DEFAULT].modedesc, "%dx%d",
-					 modelist[MODE_FULLSCREEN_DEFAULT].width,
-					 modelist[MODE_FULLSCREEN_DEFAULT].height);
-		}
-
-		vid_default = MODE_FULLSCREEN_DEFAULT;
-
-		temp = m[0];
-
-		if (!MGL_init(&driver, &temp, ""))
-		{
-			initFatalError();
-		}
-	}
-
-	MGL_setSuspendAppCallback(VID_Suspend);
-}
-
-
-MGLDC *createDisplayDC(int forcemem)
-/****************************************************************************
-*
-* Function:     createDisplayDC
-* Returns:      Pointer to the MGL device context to use for the application
-*
-* Description:  Initialises the MGL and creates an appropriate display
-*               device context to be used by the GUI. This creates and
-*               apropriate device context depending on the system being
-*               compile for, and should be the only place where system
-*               specific code is required.
-*
-****************************************************************************/
-{
-    MGLDC			*dc;
-	pixel_format_t	pf;
-	int				npages;
-
-	// Start the specified video mode
-	if (!MGL_changeDisplayMode(mode))
-        initFatalError();
-
-	npages = MGL_availablePages(mode);
-
-	if (npages > 3)
-		npages = 3;
-
-	if (!COM_CheckParm ("-notriplebuf"))
-	{
-		if (npages > 2)
-		{
-			npages = 2;
-		}
-	}
-
-	if ((dc = MGL_createDisplayDC(npages)) == NULL)
-		return NULL;
-
-	if (!forcemem && (MGL_surfaceAccessType(dc)) == MGL_LINEAR_ACCESS && (dc->mi.maxPage > 0))
-	{
-		MGL_makeCurrentDC(dc);
-		memdc = NULL;
-	}
-	else
-	{
-		// Set up for blitting from a memory buffer
-		memdc = MGL_createMemoryDC(MGL_sizex(dc)+1,MGL_sizey(dc)+1,8,&pf);
-		MGL_makeCurrentDC(memdc);
-	}
-
-	// Enable page flipping even for even for blitted surfaces
-	if (forcemem)
-	{
-		vid.numpages = 1;
-	}
-	else
-	{
-		vid.numpages = dc->mi.maxPage + 1;
-
-		if (vid.numpages > 1)
-		{
-			// Set up for page flipping
-			MGL_setActivePage(dc, aPage = 1);
-			MGL_setVisualPage(dc, vPage = 0, false);
-		}
-
-		if (vid.numpages > 3)
-			vid.numpages = 3;
-	}
-
-	if (vid.numpages == 2)
-		waitVRT = true;
-	else
-		waitVRT = false;
-
-	return dc;
-}
-
-
-void VID_InitMGLDIB (HINSTANCE hInstance)
-{
-	WNDCLASS		wc;
-	HDC				hdc;
-	int				i;
-
-	hIcon = LoadIcon (hInstance, MAKEINTRESOURCE (IDI_ICON2));
-
-	/* Register the frame class */
-    wc.style         = 0;
-    wc.lpfnWndProc   = (WNDPROC)MainWndProc;
-    wc.cbClsExtra    = 0;
-    wc.cbWndExtra    = 0;
-    wc.hInstance     = hInstance;
-    wc.hIcon         = 0;
-    wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
-	wc.hbrBackground = NULL;
-    wc.lpszMenuName  = 0;
-    wc.lpszClassName = "WinQuake";
-
-    if (!RegisterClass (&wc) )
-		Sys_Error ("Couldn't register window class");
-
-	/* Find the size for the DIB window */
-	/* Initialise the MGL for windowed operation */
-	MGL_setAppInstance(hInstance);
-	registerAllMemDrivers();
-	MGL_initWindowed("");
-
-	modelist[0].type = MS_WINDOWED;
-	modelist[0].width = 320;
-	modelist[0].height = 240;
-	strcpy (modelist[0].modedesc, "320x240");
-	modelist[0].mode13 = 0;
-	modelist[0].modenum = MODE_WINDOWED;
-	modelist[0].stretched = 0;
-	modelist[0].dib = 1;
-	modelist[0].fullscreen = 0;
-	modelist[0].halfscreen = 0;
-	modelist[0].bpp = 8;
-
-	modelist[1].type = MS_WINDOWED;
-	modelist[1].width = 640;
-	modelist[1].height = 480;
-	strcpy (modelist[1].modedesc, "640x480");
-	modelist[1].mode13 = 0;
-	modelist[1].modenum = MODE_WINDOWED + 1;
-	modelist[1].stretched = 1;
-	modelist[1].dib = 1;
-	modelist[1].fullscreen = 0;
-	modelist[1].halfscreen = 0;
-	modelist[1].bpp = 8;
-
-	modelist[2].type = MS_WINDOWED;
-	modelist[2].width = 800;
-	modelist[2].height = 600;
-	strcpy (modelist[2].modedesc, "800x600");
-	modelist[2].mode13 = 0;
-	modelist[2].modenum = MODE_WINDOWED + 2;
-	modelist[2].stretched = 1;
-	modelist[2].dib = 1;
-	modelist[2].fullscreen = 0;
-	modelist[2].halfscreen = 0;
-	modelist[2].bpp = 8;
-
-// automatically stretch the default mode up if > 640x480 desktop resolution
-	hdc = GetDC(NULL);
-
-	if ((GetDeviceCaps(hdc, HORZRES) > 640) && !COM_CheckParm("-noautostretch"))
-	{
-		vid_default = MODE_WINDOWED + 1;
-	}
-	else
-	{
-		vid_default = MODE_WINDOWED;
-	}
-
-	windowed_default = vid_default;
-
-	ReleaseDC(NULL,hdc);
-
-	nummodes = 3;	// reserve space for windowed mode
-
-	DDActive = 0;
-}
-
-
-/*
-=================
-VID_InitFullDIB
-=================
-*/
-void VID_InitFullDIB (HINSTANCE hInstance)
-{
-	DEVMODE	devmode;
-	int		i, j, modenum, cmodes, existingmode, originalnummodes, lowestres;
-	int		numlowresmodes, bpp, done;
-	int		cstretch, istretch, mstretch;
-	BOOL	stat;
-
-// enumerate 8 bpp modes
-	originalnummodes = nummodes;
-	modenum = 0;
-	lowestres = 99999;
-
-	do
-	{
-		stat = EnumDisplaySettings (NULL, modenum, &devmode);
-
-		if ((devmode.dmBitsPerPel == 8) &&
-			(devmode.dmPelsWidth <= MAXWIDTH) &&
-			(devmode.dmPelsHeight <= MAXHEIGHT) &&
-			(nummodes < MAX_MODE_LIST))
-		{
-			devmode.dmFields = DM_BITSPERPEL |
-							   DM_PELSWIDTH |
-							   DM_PELSHEIGHT;
-
-			if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-					DISP_CHANGE_SUCCESSFUL)
-			{
-				modelist[nummodes].type = MS_FULLDIB;
-				modelist[nummodes].width = devmode.dmPelsWidth;
-				modelist[nummodes].height = devmode.dmPelsHeight;
-				modelist[nummodes].modenum = 0;
-				modelist[nummodes].mode13 = 0;
-				modelist[nummodes].stretched = 0;
-				modelist[nummodes].halfscreen = 0;
-				modelist[nummodes].dib = 1;
-				modelist[nummodes].fullscreen = 1;
-				modelist[nummodes].bpp = devmode.dmBitsPerPel;
-				sprintf (modelist[nummodes].modedesc, "%dx%d",
-						 devmode.dmPelsWidth, devmode.dmPelsHeight);
-
-			// if the width is more than twice the height, reduce it by half because this
-			// is probably a dual-screen monitor
-				if (!COM_CheckParm("-noadjustaspect"))
-				{
-					if (modelist[nummodes].width > (modelist[nummodes].height << 1))
-					{
-						modelist[nummodes].width >>= 1;
-						modelist[nummodes].halfscreen = 1;
-						sprintf (modelist[nummodes].modedesc, "%dx%d",
-								 modelist[nummodes].width,
-								 modelist[nummodes].height);
-					}
-				}
-
-				for (i=originalnummodes, existingmode = 0 ; i<nummodes ; i++)
-				{
-					if ((modelist[nummodes].width == modelist[i].width) &&
-						(modelist[nummodes].height == modelist[i].height))
-					{
-						existingmode = 1;
-						break;
-					}
-				}
-
-				if (!existingmode)
-				{
-					if (modelist[nummodes].width < lowestres)
-						lowestres = modelist[nummodes].width;
-
-					nummodes++;
-				}
-			}
-		}
-
-		modenum++;
-	} while (stat);
-
-// see if any of them were actually settable; if so, this is our mode list,
-// else enumerate all modes; our mode list is whichever ones are settable
-// with > 8 bpp
-	if (nummodes == originalnummodes)
-	{
-		modenum = 0;
-		lowestres = 99999;
-
-		Con_SafePrintf ("No 8-bpp fullscreen DIB modes found\n");
-
-		do
-		{
-			stat = EnumDisplaySettings (NULL, modenum, &devmode);
-
-			if ((((devmode.dmPelsWidth <= MAXWIDTH) &&
-				  (devmode.dmPelsHeight <= MAXHEIGHT)) ||
-				 (!COM_CheckParm("-noadjustaspect") &&
-				  (devmode.dmPelsWidth <= (MAXWIDTH*2)) &&
-				  (devmode.dmPelsWidth > (devmode.dmPelsHeight*2)))) &&
-				(nummodes < MAX_MODE_LIST) &&
-				(devmode.dmBitsPerPel > 8))
-			{
-				devmode.dmFields = DM_BITSPERPEL |
-								   DM_PELSWIDTH |
-								   DM_PELSHEIGHT;
-
-				if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-						DISP_CHANGE_SUCCESSFUL)
-				{
-					modelist[nummodes].type = MS_FULLDIB;
-					modelist[nummodes].width = devmode.dmPelsWidth;
-					modelist[nummodes].height = devmode.dmPelsHeight;
-					modelist[nummodes].modenum = 0;
-					modelist[nummodes].mode13 = 0;
-					modelist[nummodes].stretched = 0;
-					modelist[nummodes].halfscreen = 0;
-					modelist[nummodes].dib = 1;
-					modelist[nummodes].fullscreen = 1;
-					modelist[nummodes].bpp = devmode.dmBitsPerPel;
-					sprintf (modelist[nummodes].modedesc, "%dx%d",
-							 devmode.dmPelsWidth, devmode.dmPelsHeight);
-
-				// if the width is more than twice the height, reduce it by half because this
-				// is probably a dual-screen monitor
-					if (!COM_CheckParm("-noadjustaspect"))
-					{
-						if (modelist[nummodes].width > (modelist[nummodes].height*2))
-						{
-							modelist[nummodes].width >>= 1;
-							modelist[nummodes].halfscreen = 1;
-							sprintf (modelist[nummodes].modedesc, "%dx%d",
-									 modelist[nummodes].width,
-									 modelist[nummodes].height);
-						}
-					}
-
-					for (i=originalnummodes, existingmode = 0 ; i<nummodes ; i++)
-					{
-						if ((modelist[nummodes].width == modelist[i].width) &&
-							(modelist[nummodes].height == modelist[i].height))
-						{
-						// pick the lowest available bpp
-							if (modelist[nummodes].bpp < modelist[i].bpp)
-								modelist[i] = modelist[nummodes];
-
-							existingmode = 1;
-							break;
-						}
-					}
-
-					if (!existingmode)
-					{
-						if (modelist[nummodes].width < lowestres)
-							lowestres = modelist[nummodes].width;
-
-						nummodes++;
-					}
-				}
-			}
-
-			modenum++;
-		} while (stat);
-	}
-
-// see if there are any low-res modes that aren't being reported
-	numlowresmodes = sizeof(lowresmodes) / sizeof(lowresmodes[0]);
-	bpp = 8;
-	done = 0;
-
-// first make sure the driver doesn't just answer yes to all tests
-	devmode.dmBitsPerPel = 8;
-	devmode.dmPelsWidth = 42;
-	devmode.dmPelsHeight = 37;
-	devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-
-	if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-			DISP_CHANGE_SUCCESSFUL)
-	{
-		done = 1;
-	}
-
-	while (!done)
-	{
-		for (j=0 ; (j<numlowresmodes) && (nummodes < MAX_MODE_LIST) ; j++)
-		{
-			devmode.dmBitsPerPel = bpp;
-			devmode.dmPelsWidth = lowresmodes[j].width;
-			devmode.dmPelsHeight = lowresmodes[j].height;
-			devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-
-			if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
-					DISP_CHANGE_SUCCESSFUL)
-			{
-					modelist[nummodes].type = MS_FULLDIB;
-					modelist[nummodes].width = devmode.dmPelsWidth;
-					modelist[nummodes].height = devmode.dmPelsHeight;
-					modelist[nummodes].modenum = 0;
-					modelist[nummodes].mode13 = 0;
-					modelist[nummodes].stretched = 0;
-					modelist[nummodes].halfscreen = 0;
-					modelist[nummodes].dib = 1;
-					modelist[nummodes].fullscreen = 1;
-					modelist[nummodes].bpp = devmode.dmBitsPerPel;
-					sprintf (modelist[nummodes].modedesc, "%dx%d",
-							 devmode.dmPelsWidth, devmode.dmPelsHeight);
-
-			// we only want the lowest-bpp version of each mode
-				for (i=originalnummodes, existingmode = 0 ; i<nummodes ; i++)
-				{
-					if ((modelist[nummodes].width == modelist[i].width)   &&
-						(modelist[nummodes].height == modelist[i].height) &&
-						(modelist[nummodes].bpp >= modelist[i].bpp))
-					{
-						existingmode = 1;
-						break;
-					}
-				}
-
-				if (!existingmode)
-				{
-					if (modelist[nummodes].width < lowestres)
-						lowestres = modelist[nummodes].width;
-
-					nummodes++;
-				}
-			}
-		}
-
-		switch (bpp)
-		{
-			case 8:
-				bpp = 16;
-				break;
-
-			case 16:
-				bpp = 32;
-				break;
-
-			case 32:
-				done = 1;
-				break;
-		}
-	}
-
-// now add the lowest stretch-by-2 pseudo-modes between 320-wide
-// (inclusive) and lowest real res (not inclusive)
-// don't bother if we have a real VGA mode 0x13 mode
-	if (!is_mode0x13)
-	{
-		for (i=originalnummodes, cstretch=0 ; i<nummodes ; i++)
-		{
-			if (((modelist[i].width >> 1) < lowestres) &&
-				((modelist[i].width >> 1) >= 320))
-			{
-				lowestres = modelist[i].width >> 1;
-				cstretch = 1;
-				mstretch = i;
-			}
-		}
-
-		if ((nummodes + cstretch) > MAX_MODE_LIST)
-			cstretch = MAX_MODE_LIST - nummodes;
-
-		if (cstretch > 0)
-		{
-			for (i=(nummodes-1) ; i>=originalnummodes ; i--)
-				modelist[i+cstretch] = modelist[i];
-
-			nummodes += cstretch;
-			istretch = originalnummodes;
-
-			modelist[istretch] = modelist[mstretch];
-			modelist[istretch].width >>= 1;
-			modelist[istretch].height >>= 1;
-			modelist[istretch].stretched = 1;
-			sprintf (modelist[istretch].modedesc, "%dx%d",
-					 modelist[istretch].width, modelist[istretch].height);
-		}
-	}
-
-	if (nummodes != originalnummodes)
-		vid_default = MODE_FULLSCREEN_DEFAULT;
-	else
-		Con_SafePrintf ("No fullscreen DIB modes found\n");
-}
-
-
-/*
-=================
-VID_NumModes
-=================
-*/
-int VID_NumModes (void)
-{
-	return nummodes;
-}
-
-	
-/*
-=================
-VID_GetModePtr
-=================
-*/
-vmode_t *VID_GetModePtr (int modenum)
-{
-
-	if ((modenum >= 0) && (modenum < nummodes))
-		return &modelist[modenum];
-	else
-		return &badmode;
-}
-
-
-/*
-=================
-VID_CheckModedescFixup
-=================
-*/
-void VID_CheckModedescFixup (int mode)
-{
-	int		x, y, stretch;
-
-	if (mode == MODE_SETTABLE_WINDOW)
-	{
-		modelist[mode].stretched = (int)vid_stretch_by_2.value;
-		stretch = modelist[mode].stretched;
-
-		if (vid_config_x.value < (320 << stretch))
-			vid_config_x.value = 320 << stretch;
-
-		if (vid_config_y.value < (200 << stretch))
-			vid_config_y.value = 200 << stretch;
-
-		x = (int)vid_config_x.value;
-		y = (int)vid_config_y.value;
-		sprintf (modelist[mode].modedesc, "%dx%d", x, y);
-		modelist[mode].width = x;
-		modelist[mode].height = y;
-	}
-}
-
-
-/*
-=================
-VID_GetModeDescriptionMemCheck
-=================
-*/
-char *VID_GetModeDescriptionMemCheck (int mode)
-{
-	char		*pinfo;
-	vmode_t		*pv;
-
-	if ((mode < 0) || (mode >= nummodes))
-		return NULL;
-
-	VID_CheckModedescFixup (mode);
-
-	pv = VID_GetModePtr (mode);
-	pinfo = pv->modedesc;
-
-	if (VID_CheckAdequateMem (pv->width, pv->height))
-	{
-		return pinfo;
-	}
-	else
-	{
-		return NULL;
-	}
-}
-
-
-/*
-=================
-VID_GetModeDescription
-=================
-*/
-char *VID_GetModeDescription (int mode)
-{
-	char		*pinfo;
-	vmode_t		*pv;
-
-	if ((mode < 0) || (mode >= nummodes))
-		return NULL;
-
-	VID_CheckModedescFixup (mode);
-
-	pv = VID_GetModePtr (mode);
-	pinfo = pv->modedesc;
-	return pinfo;
-}
-
-
-/*
-=================
-VID_GetModeDescription2
-
-Tacks on "windowed" or "fullscreen"
-=================
-*/
-char *VID_GetModeDescription2 (int mode)
-{
-	static char	pinfo[40];
-	vmode_t		*pv;
-
-	if ((mode < 0) || (mode >= nummodes))
-		return NULL;
-
-	VID_CheckModedescFixup (mode);
-
-	pv = VID_GetModePtr (mode);
-
-	if (modelist[mode].type == MS_FULLSCREEN)
-	{
-		sprintf(pinfo,"%s fullscreen", pv->modedesc);
-	}
-	else if (modelist[mode].type == MS_FULLDIB)
-	{
-		sprintf(pinfo,"%s fullscreen", pv->modedesc);
-	}
-	else
-	{
-		sprintf(pinfo, "%s windowed", pv->modedesc);
-	}
-
-	return pinfo;
-}
-
-
-// KJB: Added this to return the mode driver name in description for console
-
-char *VID_GetExtModeDescription (int mode)
-{
-	static char	pinfo[40];
-	vmode_t		*pv;
-
-	if ((mode < 0) || (mode >= nummodes))
-		return NULL;
-
-	VID_CheckModedescFixup (mode);
-
-	pv = VID_GetModePtr (mode);
-	if (modelist[mode].type == MS_FULLSCREEN)
-	{
-		sprintf(pinfo,"%s fullscreen %s",pv->modedesc,
-				MGL_modeDriverName(pv->modenum));
-	}
-	else if (modelist[mode].type == MS_FULLDIB)
-	{
-		sprintf(pinfo,"%s fullscreen DIB", pv->modedesc);
-	}
-	else
-	{
-		sprintf(pinfo, "%s windowed", pv->modedesc);
-	}
-
-	return pinfo;
-}
-
-
-void DestroyDIBWindow (void)
-{
-
-	if (modestate == MS_WINDOWED)
-	{
-	// destroy the associated MGL DC's; the window gets reused
-		if (windc)
-			MGL_destroyDC(windc);
-		if (dibdc)
-			MGL_destroyDC(dibdc);
-		windc = dibdc = NULL;
-	}
-}
-
-
-void DestroyFullscreenWindow (void)
-{
-
-	if (modestate == MS_FULLSCREEN)
-	{
-	// destroy the existing fullscreen mode and DC's
-		if (mgldc)
-			MGL_destroyDC (mgldc);
-		if (memdc)
-			MGL_destroyDC (memdc);
-		mgldc = memdc = NULL;
-	}
-}
-
-
-
-void DestroyFullDIBWindow (void)
-{
-	if (modestate == MS_FULLDIB)
-	{
-		ChangeDisplaySettings (NULL, CDS_FULLSCREEN);
-
-	// Destroy the fullscreen DIB window and associated MGL DC's
-		if (windc)
-			MGL_destroyDC(windc);
-		if (dibdc)
-			MGL_destroyDC(dibdc);
-		windc = dibdc = NULL;
-	}
-}
-
-
-qboolean VID_SetWindowedMode (int modenum)
-{
-	HDC				hdc;
-	pixel_format_t	pf;
-	qboolean		stretched;
-	int				lastmodestate;
-	LONG			wlong;
-
-	if (!windowed_mode_set)
-	{
-		if (COM_CheckParm ("-resetwinpos"))
-		{
-			Cvar_SetValue ("vid_window_x", 0.0);
-			Cvar_SetValue ("vid_window_y", 0.0);
-		}
-
-		windowed_mode_set;
-	}
-
-	VID_CheckModedescFixup (modenum);
-
-	DDActive = 0;
-	lastmodestate = modestate;
-
-	DestroyFullscreenWindow ();
-	DestroyFullDIBWindow ();
-
-	if (windc)
-		MGL_destroyDC(windc);
-	if (dibdc)
-		MGL_destroyDC(dibdc);
-	windc = dibdc = NULL;
-
-// KJB: Signal to the MGL that we are going back to windowed mode
-	if (!MGL_changeDisplayMode(grWINDOWED))
-		initFatalError();
-
-	WindowRect.top = WindowRect.left = 0;
-
-	WindowRect.right = modelist[modenum].width;
-	WindowRect.bottom = modelist[modenum].height;
-	stretched = modelist[modenum].stretched;
-
-	DIBWidth = modelist[modenum].width;
-	DIBHeight = modelist[modenum].height;
-
-	if (stretched)
-	{
-		DIBWidth >>= 1;
-		DIBHeight >>= 1;
-	}
-
-	WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU |
-				  WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPSIBLINGS |
-				  WS_CLIPCHILDREN;
-	ExWindowStyle = 0;
-	AdjustWindowRectEx(&WindowRect, WindowStyle, FALSE, 0);
-
-// the first time we're called to set the mode, create the window we'll use
-// for the rest of the session
-	if (!vid_mode_set)
-	{
-		mainwindow = CreateWindowEx (
-			 ExWindowStyle,
-			 "WinQuake",
-			 "WinQuake",
-			 WindowStyle,
-			 0, 0,
-			 WindowRect.right - WindowRect.left,
-			 WindowRect.bottom - WindowRect.top,
-			 NULL,
-			 NULL,
-			 global_hInstance,
-			 NULL);
-
-		if (!mainwindow)
-			Sys_Error ("Couldn't create DIB window");
-
-	// tell MGL to use this window for fullscreen modes
-		MGL_registerFullScreenWindow (mainwindow);
-
-		vid_mode_set = true;
-	}
-	else
-	{
-		SetWindowLong(mainwindow, GWL_STYLE, WindowStyle | WS_VISIBLE);
-		SetWindowLong(mainwindow, GWL_EXSTYLE, ExWindowStyle);
-	}
-
-	if (!SetWindowPos (mainwindow,
-					   NULL,
-					   0, 0,
-					   WindowRect.right - WindowRect.left,
-					   WindowRect.bottom - WindowRect.top,
-					   SWP_NOCOPYBITS | SWP_NOZORDER |
-						SWP_HIDEWINDOW))
-	{
-		Sys_Error ("Couldn't resize DIB window");
-	}
-
-	if (hide_window)
-		return true;
-
-// position and show the DIB window
-	VID_CheckWindowXY ();
-	SetWindowPos (mainwindow, NULL, (int)vid_window_x.value,
-				  (int)vid_window_y.value, 0, 0,
-				  SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME);
-
-	if (force_minimized)
-		ShowWindow (mainwindow, SW_MINIMIZE);
-	else
-		ShowWindow (mainwindow, SW_SHOWDEFAULT);
-
-	UpdateWindow (mainwindow);
-
-	modestate = MS_WINDOWED;
-	vid_fulldib_on_focus_mode = 0;
-
-// because we have set the background brush for the window to NULL
-// (to avoid flickering when re-sizing the window on the desktop),
-// we clear the window to black when created, otherwise it will be
-// empty while Quake starts up.
-	hdc = GetDC(mainwindow);
-	PatBlt(hdc,0,0,WindowRect.right,WindowRect.bottom,BLACKNESS);
-	ReleaseDC(mainwindow, hdc);
-
-	/* Create the MGL window DC and the MGL memory DC */
-	if ((windc = MGL_createWindowedDC(mainwindow)) == NULL)
-		MGL_fatalError("Unable to create Windowed DC!");
-
-	if ((dibdc = MGL_createMemoryDC(DIBWidth,DIBHeight,8,&pf)) == NULL)
-		MGL_fatalError("Unable to create Memory DC!");
-
-	MGL_makeCurrentDC(dibdc);
-
-	vid.buffer = vid.conbuffer = vid.direct = dibdc->surface;
-	vid.rowbytes = vid.conrowbytes = dibdc->mi.bytesPerLine;
-	vid.numpages = 1;
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.height = vid.conheight = DIBHeight;
-	vid.width = vid.conwidth = DIBWidth;
-	vid.aspect = ((float)vid.height / (float)vid.width) *
-				(320.0 / 240.0);
-
-	vid_stretched = stretched;
-
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)TRUE, (LPARAM)hIcon);
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)FALSE, (LPARAM)hIcon);
-
-	return true;
-}
-
-
-qboolean VID_SetFullscreenMode (int modenum)
-{
-
-	DDActive = 1;
-
-	DestroyDIBWindow ();
-	DestroyFullDIBWindow ();
-
-	mode = modelist[modenum].modenum;
-
-	// Destroy old DC's, resetting back to fullscreen mode
-	if (mgldc)
-		MGL_destroyDC (mgldc);
-	if (memdc)
-		MGL_destroyDC (memdc);
-	mgldc = memdc = NULL;
-
-	if ((mgldc = createDisplayDC (modelist[modenum].stretched ||
-		 (int)vid_nopageflip.value)) == NULL)
-	{
-		return false;
-	}
-
-	modestate = MS_FULLSCREEN;
-	vid_fulldib_on_focus_mode = 0;
-
-	vid.buffer = vid.conbuffer = vid.direct = NULL;
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	DIBHeight = vid.height = vid.conheight = modelist[modenum].height;
-	DIBWidth = vid.width = vid.conwidth = modelist[modenum].width;
-	vid.aspect = ((float)vid.height / (float)vid.width) *
-				(320.0 / 240.0);
-
-	vid_stretched = modelist[modenum].stretched;
-
-// needed because we're not getting WM_MOVE messages fullscreen on NT
-	window_x = 0;
-	window_y = 0;
-
-// set the large icon, so the Quake icon will show up in the taskbar
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)1, (LPARAM)hIcon);
-	SendMessage (mainwindow, WM_SETICON, (WPARAM)0, (LPARAM)hIcon);
-
-// shouldn't be needed, but Kendall needs to let us get the activation
-// message for this not to be needed on NT
-	AppActivate (true, false);
-
-	return true;
-}
-
-
-qboolean VID_SetFullDIBMode (int modenum)
-{
-	HDC				hdc;
-	pixel_format_t	pf;
-	int				lastmodestate;
-
-	DDActive = 0;
-
-	DestroyFullscreenWindow ();
-	DestroyDIBWindow ();
-
-	if (windc)
-		MGL_destroyDC(windc);
-	if (dibdc)
-		MGL_destroyDC(dibdc);
-	windc = dibdc = NULL;
-
-// KJB: Signal to the MGL that we are going back to windowed mode
-	if (!MGL_changeDisplayMode(grWINDOWED))
-		initFatalError();
-
-	gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-	gdevmode.dmBitsPerPel = modelist[modenum].bpp;
-	gdevmode.dmPelsWidth = modelist[modenum].width << modelist[modenum].stretched <<
-						   modelist[modenum].halfscreen;
-	gdevmode.dmPelsHeight = modelist[modenum].height << modelist[modenum].stretched;
-	gdevmode.dmSize = sizeof (gdevmode);
-
-	if (ChangeDisplaySettings (&gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
-		Sys_Error ("Couldn't set fullscreen DIB mode");
-
-	lastmodestate = modestate;
-	modestate = MS_FULLDIB;
-	vid_fulldib_on_focus_mode = modenum;
-
-	WindowRect.top = WindowRect.left = 0;
-
-	hdc = GetDC(NULL);
-
-	WindowRect.right = modelist[modenum].width << modelist[modenum].stretched;
-	WindowRect.bottom = modelist[modenum].height << modelist[modenum].stretched;
-
-	ReleaseDC(NULL,hdc);
-
-	DIBWidth = modelist[modenum].width;
-	DIBHeight = modelist[modenum].height;
-
-	WindowStyle = WS_POPUP | WS_SYSMENU | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
-	ExWindowStyle = 0;
-	AdjustWindowRectEx(&WindowRect, WindowStyle, FALSE, 0);
-
-	SetWindowLong(mainwindow, GWL_STYLE, WindowStyle | WS_VISIBLE);
-	SetWindowLong(mainwindow, GWL_EXSTYLE, ExWindowStyle);
-
-	if (!SetWindowPos (mainwindow,
-					   NULL,
-					   0, 0,
-					   WindowRect.right - WindowRect.left,
-					   WindowRect.bottom - WindowRect.top,
-					   SWP_NOCOPYBITS | SWP_NOZORDER))
-	{
-		Sys_Error ("Couldn't resize DIB window");
-	}
-
-// position and show the DIB window
-	SetWindowPos (mainwindow, HWND_TOPMOST, 0, 0, 0, 0,
-				  SWP_NOSIZE | SWP_SHOWWINDOW | SWP_DRAWFRAME);
-	ShowWindow (mainwindow, SW_SHOWDEFAULT);
-	UpdateWindow (mainwindow);
-
-	// Because we have set the background brush for the window to NULL
-	// (to avoid flickering when re-sizing the window on the desktop), we
-	// clear the window to black when created, otherwise it will be
-	// empty while Quake starts up.
-	hdc = GetDC(mainwindow);
-	PatBlt(hdc,0,0,WindowRect.right,WindowRect.bottom,BLACKNESS);
-	ReleaseDC(mainwindow, hdc);
-
-	/* Create the MGL window DC and the MGL memory DC */
-	if ((windc = MGL_createWindowedDC(mainwindow)) == NULL)
-		MGL_fatalError("Unable to create Fullscreen DIB DC!");
-
-	if ((dibdc = MGL_createMemoryDC(DIBWidth,DIBHeight,8,&pf)) == NULL)
-		MGL_fatalError("Unable to create Memory DC!");
-
-	MGL_makeCurrentDC(dibdc);
-
-	vid.buffer = vid.conbuffer = vid.direct = dibdc->surface;
-	vid.rowbytes = vid.conrowbytes = dibdc->mi.bytesPerLine;
-	vid.numpages = 1;
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.height = vid.conheight = DIBHeight;
-	vid.width = vid.conwidth = DIBWidth;
-	vid.aspect = ((float)vid.height / (float)vid.width) *
-				(320.0 / 240.0);
-
-	vid_stretched = modelist[modenum].stretched;
-
-// needed because we're not getting WM_MOVE messages fullscreen on NT
-	window_x = 0;
-	window_y = 0;
-
-	return true;
-}
-
-
-void VID_RestoreOldMode (int original_mode)
-{
-	static qboolean	inerror = false;
-
-	if (inerror)
-		return;
-
-	in_mode_set = false;
-	inerror = true;
-
-// make sure mode set happens (video mode changes)
-	vid_modenum = original_mode - 1;
-
-	if (!VID_SetMode (original_mode, vid_curpal))
-	{
-		vid_modenum = MODE_WINDOWED - 1;
-
-		if (!VID_SetMode (windowed_default, vid_curpal))
-			Sys_Error ("Can't set any video mode");
-	}
-
-	inerror = false;
-}
-
-
-void VID_SetDefaultMode (void)
-{
-
-	if (vid_initialized)
-		VID_SetMode (0, vid_curpal);
-
-	IN_DeactivateMouse ();
-}
-
-
-int VID_SetMode (int modenum, unsigned char *palette)
-{
-	int				original_mode, temp, dummy;
-	qboolean		stat;
-    MSG				msg;
-	HDC				hdc;
-
-	while ((modenum >= nummodes) || (modenum < 0))
-	{
-		if (vid_modenum == NO_MODE)
-		{
-			if (modenum == vid_default)
-			{
-				modenum = windowed_default;
-			}
-			else
-			{
-				modenum = vid_default;
-			}
-
-			Cvar_SetValue ("vid_mode", (float)modenum);
-		}
-		else
-		{
-			Cvar_SetValue ("vid_mode", (float)vid_modenum);
-			return 0;
-		}
-	}
-
-	if (!force_mode_set && (modenum == vid_modenum))
-		return true;
-
-// so Con_Printfs don't mess us up by forcing vid and snd updates
-	temp = scr_disabled_for_loading;
-	scr_disabled_for_loading = true;
-	in_mode_set = true;
-
-	CDAudio_Pause ();
-	S_ClearBuffer ();
-
-	if (vid_modenum == NO_MODE)
-		original_mode = windowed_default;
-	else
-		original_mode = vid_modenum;
-
-	// Set either the fullscreen or windowed mode
-	if (modelist[modenum].type == MS_WINDOWED)
-	{
-		if (_windowed_mouse.value)
-		{
-			stat = VID_SetWindowedMode(modenum);
-			IN_ActivateMouse ();
-			IN_HideMouse ();
-		}
-		else
-		{
-			IN_DeactivateMouse ();
-			IN_ShowMouse ();
-			stat = VID_SetWindowedMode(modenum);
-		}
-	}
-	else if (modelist[modenum].type == MS_FULLDIB)
-	{
-		stat = VID_SetFullDIBMode(modenum);
-		IN_ActivateMouse ();
-		IN_HideMouse ();
-	}
-	else
-	{
-		stat = VID_SetFullscreenMode(modenum);
-		IN_ActivateMouse ();
-		IN_HideMouse ();
-	}
-
-	window_width = vid.width << vid_stretched;
-	window_height = vid.height << vid_stretched;
-	VID_UpdateWindowStatus ();
-
-	CDAudio_Resume ();
-	scr_disabled_for_loading = temp;
-
-	if (!stat)
-	{
-		VID_RestoreOldMode (original_mode);
-		return false;
-	}
-
-	if (hide_window)
-		return true;
-
-// now we try to make sure we get the focus on the mode switch, because
-// sometimes in some systems we don't.  We grab the foreground, then
-// finish setting up, pump all our messages, and sleep for a little while
-// to let messages finish bouncing around the system, then we put
-// ourselves at the top of the z order, then grab the foreground again,
-// Who knows if it helps, but it probably doesn't hurt
-	if (!force_minimized)
-		SetForegroundWindow (mainwindow);
-
-	hdc = GetDC(NULL);
-
-	if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
-		vid_palettized = true;
-	else
-		vid_palettized = false;
-
-	VID_SetPalette (palette);
-
-	ReleaseDC(NULL,hdc);
-
-	vid_modenum = modenum;
-	Cvar_SetValue ("vid_mode", (float)vid_modenum);
-
-	if (!VID_AllocBuffers (vid.width, vid.height))
-	{
-	// couldn't get memory for this mode; try to fall back to previous mode
-		VID_RestoreOldMode (original_mode);
-		return false;
-	}
-
-	D_InitCaches (vid_surfcache, vid_surfcachesize);
-
-	while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
-	{
-      	TranslateMessage (&msg);
-      	DispatchMessage (&msg);
-	}
-
-	Sleep (100);
-
-	if (!force_minimized)
-	{
-		SetWindowPos (mainwindow, HWND_TOP, 0, 0, 0, 0,
-				  SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW |
-				  SWP_NOCOPYBITS);
-
-		SetForegroundWindow (mainwindow);
-	}
-
-// fix the leftover Alt from any Alt-Tab or the like that switched us away
-	ClearAllStates ();
-
-	if (!msg_suppress_1)
-		Con_SafePrintf ("%s\n", VID_GetModeDescription (vid_modenum));
-
-	VID_SetPalette (palette);
-
-	in_mode_set = false;
-	vid.recalc_refdef = 1;
-
-	return true;
-}
-
-void VID_LockBuffer (void)
-{
-
-	if (dibdc)
-		return;
-
-	lockcount++;
-
-	if (lockcount > 1)
-		return;
-
-	MGL_beginDirectAccess();
-
-	if (memdc)
-	{
-		// Update surface pointer for linear access modes
-		vid.buffer = vid.conbuffer = vid.direct = memdc->surface;
-		vid.rowbytes = vid.conrowbytes = memdc->mi.bytesPerLine;
-	}
-	else if (mgldc)
-	{
-		// Update surface pointer for linear access modes
-		vid.buffer = vid.conbuffer = vid.direct = mgldc->surface;
-		vid.rowbytes = vid.conrowbytes = mgldc->mi.bytesPerLine;
-	}
-
-	if (r_dowarp)
-		d_viewbuffer = r_warpbuffer;
-	else
-		d_viewbuffer = (void *)(byte *)vid.buffer;
-
-	if (r_dowarp)
-		screenwidth = WARP_WIDTH;
-	else
-		screenwidth = vid.rowbytes;
-
-	if (lcd_x.value)
-		screenwidth <<= 1;
-}
-		
-		
-void VID_UnlockBuffer (void)
-{
-	if (dibdc)
-		return;
-
-	lockcount--;
-
-	if (lockcount > 0)
-		return;
-
-	if (lockcount < 0)
-		Sys_Error ("Unbalanced unlock");
-
-	MGL_endDirectAccess();
-
-// to turn up any unlocked accesses
-	vid.buffer = vid.conbuffer = vid.direct = d_viewbuffer = NULL;
-
-}
-
-
-int VID_ForceUnlockedAndReturnState (void)
-{
-	int	lk;
-
-	if (!lockcount)
-		return 0;
-
-	lk = lockcount;
-
-	if (dibdc)
-	{
-		lockcount = 0;
-	}
-	else
-	{
-		lockcount = 1;
-		VID_UnlockBuffer ();
-	}
-
-	return lk;
-}
-
-
-void VID_ForceLockState (int lk)
-{
-
-	if (!dibdc && lk)
-	{
-		lockcount = 0;
-		VID_LockBuffer ();
-	}
-
-	lockcount = lk;
-}
-
-
-void	VID_SetPalette (unsigned char *palette)
-{
-	INT			i;
-	palette_t	pal[256];
-    HDC			hdc;
-
-	if (!Minimized)
-	{
-		palette_changed = true;
-
-	// make sure we have the static colors if we're the active app
-		hdc = GetDC(NULL);
-
-		if (vid_palettized && ActiveApp)
-		{
-			if (GetSystemPaletteUse(hdc) == SYSPAL_STATIC)
-			{
-			// switch to SYSPAL_NOSTATIC and remap the colors
-				SetSystemPaletteUse(hdc, SYSPAL_NOSTATIC);
-				syscolchg = true;
-				pal_is_nostatic = true;
-			}
-		}
-
-		ReleaseDC(NULL,hdc);
-
-		// Translate the palette values to an MGL palette array and
-		// set the values.
-		for (i = 0; i < 256; i++)
-		{
-			pal[i].red = palette[i*3];
-			pal[i].green = palette[i*3+1];
-			pal[i].blue = palette[i*3+2];
-		}
-
-		if (DDActive)
-		{
-			if (!mgldc)
-				return;
-
-			MGL_setPalette(mgldc,pal,256,0);
-			MGL_realizePalette(mgldc,256,0,false);
-			if (memdc)
-				MGL_setPalette(memdc,pal,256,0);
-		}
-		else
-		{
-			if (!windc)
-				return;
-
-			MGL_setPalette(windc,pal,256,0);
-			MGL_realizePalette(windc,256,0,false);
-			if (dibdc)
-			{
-				MGL_setPalette(dibdc,pal,256,0);
-				MGL_realizePalette(dibdc,256,0,false);
-			}
-		}
-	}
-
-	memcpy (vid_curpal, palette, sizeof(vid_curpal));
-
-	if (syscolchg)
-	{
-		PostMessage (HWND_BROADCAST, WM_SYSCOLORCHANGE, (WPARAM)0, (LPARAM)0);
-		syscolchg = false;
-	}
-}
-
-
-void	VID_ShiftPalette (unsigned char *palette)
-{
-	VID_SetPalette (palette);
-}
-
-
-/*
-=================
-VID_DescribeCurrentMode_f
-=================
-*/
-void VID_DescribeCurrentMode_f (void)
-{
-	Con_Printf ("%s\n", VID_GetExtModeDescription (vid_modenum));
-}
-
-
-/*
-=================
-VID_NumModes_f
-=================
-*/
-void VID_NumModes_f (void)
-{
-
-	if (nummodes == 1)
-		Con_Printf ("%d video mode is available\n", nummodes);
-	else
-		Con_Printf ("%d video modes are available\n", nummodes);
-}
-
-
-/*
-=================
-VID_DescribeMode_f
-=================
-*/
-void VID_DescribeMode_f (void)
-{
-	int		modenum;
-	
-	modenum = Q_atoi (Cmd_Argv(1));
-
-	Con_Printf ("%s\n", VID_GetExtModeDescription (modenum));
-}
-
-
-/*
-=================
-VID_DescribeModes_f
-=================
-*/
-void VID_DescribeModes_f (void)
-{
-	int			i, lnummodes;
-	char		*pinfo;
-	qboolean	na;
-	vmode_t		*pv;
-
-	na = false;
-
-	lnummodes = VID_NumModes ();
-
-	for (i=0 ; i<lnummodes ; i++)
-	{
-		pv = VID_GetModePtr (i);
-		pinfo = VID_GetExtModeDescription (i);
-
-		if (VID_CheckAdequateMem (pv->width, pv->height))
-		{
-			Con_Printf ("%2d: %s\n", i, pinfo);
-		}
-		else
-		{
-			Con_Printf ("**: %s\n", pinfo);
-			na = true;
-		}
-	}
-
-	if (na)
-	{
-		Con_Printf ("\n[**: not enough system RAM for mode]\n");
-	}
-}
-
-
-/*
-=================
-VID_TestMode_f
-=================
-*/
-void VID_TestMode_f (void)
-{
-	int		modenum;
-	double	testduration;
-
-	if (!vid_testingmode)
-	{
-		modenum = Q_atoi (Cmd_Argv(1));
-
-		if (VID_SetMode (modenum, vid_curpal))
-		{
-			vid_testingmode = 1;
-			testduration = Q_atof (Cmd_Argv(2));
-			if (testduration == 0)
-				testduration = 5.0;
-			vid_testendtime = realtime + testduration;
-		}
-	}
-}
-
-
-/*
-=================
-VID_Windowed_f
-=================
-*/
-void VID_Windowed_f (void)
-{
-
-	VID_SetMode ((int)vid_windowed_mode.value, vid_curpal);
-}
-
-
-/*
-=================
-VID_Fullscreen_f
-=================
-*/
-void VID_Fullscreen_f (void)
-{
-
-	VID_SetMode ((int)vid_fullscreen_mode.value, vid_curpal);
-}
-
-
-/*
-=================
-VID_Minimize_f
-=================
-*/
-void VID_Minimize_f (void)
-{
-
-// we only support minimizing windows; if you're fullscreen,
-// switch to windowed first
-	if (modestate == MS_WINDOWED)
-		ShowWindow (mainwindow, SW_MINIMIZE);
-}
-
-
-
-/*
-=================
-VID_ForceMode_f
-=================
-*/
-void VID_ForceMode_f (void)
-{
-	int		modenum;
-	double	testduration;
-
-	if (!vid_testingmode)
-	{
-		modenum = Q_atoi (Cmd_Argv(1));
-
-		force_mode_set = 1;
-		VID_SetMode (modenum, vid_curpal);
-		force_mode_set = 0;
-	}
-}
-
-
-void	VID_Init (unsigned char *palette)
-{
-	int		i, bestmatch, bestmatchmetric, t, dr, dg, db;
-	int		basenummodes;
-	byte	*ptmp;
-
-	Cvar_RegisterVariable (&vid_mode);
-	Cvar_RegisterVariable (&vid_wait);
-	Cvar_RegisterVariable (&vid_nopageflip);
-	Cvar_RegisterVariable (&_vid_wait_override);
-	Cvar_RegisterVariable (&_vid_default_mode);
-	Cvar_RegisterVariable (&_vid_default_mode_win);
-	Cvar_RegisterVariable (&vid_config_x);
-	Cvar_RegisterVariable (&vid_config_y);
-	Cvar_RegisterVariable (&vid_stretch_by_2);
-	Cvar_RegisterVariable (&_windowed_mouse);
-	Cvar_RegisterVariable (&vid_fullscreen_mode);
-	Cvar_RegisterVariable (&vid_windowed_mode);
-	Cvar_RegisterVariable (&block_switch);
-	Cvar_RegisterVariable (&vid_window_x);
-	Cvar_RegisterVariable (&vid_window_y);
-
-	Cmd_AddCommand ("vid_testmode", VID_TestMode_f);
-	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f);
-	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f);
-	Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f);
-	Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f);
-	Cmd_AddCommand ("vid_forcemode", VID_ForceMode_f);
-	Cmd_AddCommand ("vid_windowed", VID_Windowed_f);
-	Cmd_AddCommand ("vid_fullscreen", VID_Fullscreen_f);
-	Cmd_AddCommand ("vid_minimize", VID_Minimize_f);
-
-	if (COM_CheckParm ("-dibonly"))
-		dibonly = true;
-
-	VID_InitMGLDIB (global_hInstance);
-
-	basenummodes = nummodes;
-
-	if (!dibonly)
-		VID_InitMGLFull (global_hInstance);
-
-// if there are no non-windowed modes, or only windowed and mode 0x13, then use
-// fullscreen DIBs as well
-	if (((nummodes == basenummodes) ||
-		 ((nummodes == (basenummodes + 1)) && is_mode0x13)) &&
-		!COM_CheckParm ("-nofulldib"))
-
-	{
-		VID_InitFullDIB (global_hInstance);
-	}
-
-	vid.maxwarpwidth = WARP_WIDTH;
-	vid.maxwarpheight = WARP_HEIGHT;
-	vid.colormap = host_colormap;
-	vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
-	vid_testingmode = 0;
-
-// GDI doesn't let us remap palette index 0, so we'll remap color
-// mappings from that black to another one
-	bestmatchmetric = 256*256*3;
-
-	for (i=1 ; i<256 ; i++)
-	{
-		dr = palette[0] - palette[i*3];
-		dg = palette[1] - palette[i*3+1];
-		db = palette[2] - palette[i*3+2];
-
-		t = (dr * dr) + (dg * dg) + (db * db);
-
-		if (t < bestmatchmetric)
-		{
-			bestmatchmetric = t;
-			bestmatch = i;
-
-			if (t == 0)
-				break;
-		}
-	}
-
-	for (i=0, ptmp = vid.colormap ; i<(1<<(VID_CBITS+8)) ; i++, ptmp++)
-	{
-		if (*ptmp == 0)
-			*ptmp = bestmatch;
-	}
-
-	if (COM_CheckParm("-startwindowed"))
-	{
-		startwindowed = 1;
-		vid_default = windowed_default;
-	}
-
-	if (hwnd_dialog)
-		DestroyWindow (hwnd_dialog);
-
-// sound initialization has to go here, preceded by a windowed mode set,
-// so there's a window for DirectSound to work with but we're not yet
-// fullscreen so the "hardware already in use" dialog is visible if it
-// gets displayed
-
-// keep the window minimized until we're ready for the first real mode set
-	hide_window = true;
-	VID_SetMode (MODE_WINDOWED, palette);
-	hide_window = false;
-	S_Init ();
-
-	vid_initialized = true;
-
-	force_mode_set = true;
-	VID_SetMode (vid_default, palette);
-	force_mode_set = false;
-
-	vid_realmode = vid_modenum;
-
-	VID_SetPalette (palette);
-
-	vid_menudrawfn = VID_MenuDraw;
-	vid_menukeyfn = VID_MenuKey;
-
-	strcpy (badmode.modedesc, "Bad mode");
-}
-
-
-void	VID_Shutdown (void)
-{
-	HDC				hdc;
-	int				dummy;
-
-	if (vid_initialized)
-	{
-		if (modestate == MS_FULLDIB)
-			ChangeDisplaySettings (NULL, CDS_FULLSCREEN);
-
-		PostMessage (HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)mainwindow, (LPARAM)0);
-		PostMessage (HWND_BROADCAST, WM_SYSCOLORCHANGE, (WPARAM)0, (LPARAM)0);
-
-		AppActivate(false, false);
-		DestroyDIBWindow ();
-		DestroyFullscreenWindow ();
-		DestroyFullDIBWindow ();
-
-		if (hwnd_dialog)
-			DestroyWindow (hwnd_dialog);
-
-		if (mainwindow)
-			DestroyWindow(mainwindow);
-
-		MGL_exit();
-
-		vid_testingmode = 0;
-		vid_initialized = 0;
-	}
-}
-
-
-/*
-================
-FlipScreen
-================
-*/
-void FlipScreen(vrect_t *rects)
-{
-	HRESULT		ddrval;
-
-	// Flip the surfaces
-
-	if (DDActive)
-	{
-		if (mgldc)
-		{
-			if (memdc)
-			{
-				while (rects)
-				{
-					if (vid_stretched)
-					{
-						MGL_stretchBltCoord(mgldc, memdc,
-									rects->x,
-									rects->y,
-									rects->x + rects->width,
-									rects->y + rects->height,
-									rects->x << 1,
-									rects->y << 1,
-									(rects->x + rects->width) << 1,
-									(rects->y + rects->height) << 1);
-					}
-					else
-					{
-						MGL_bitBltCoord(mgldc, memdc,
-									rects->x, rects->y,
-									(rects->x + rects->width),
-									(rects->y + rects->height),
-									rects->x, rects->y, MGL_REPLACE_MODE);
-					}
-
-					rects = rects->pnext;
-				}
-			}
-
-			if (vid.numpages > 1)
-			{
-				// We have a flipping surface, so do a hard page flip
-				aPage = (aPage+1) % vid.numpages;
-				vPage = (vPage+1) % vid.numpages;
-				MGL_setActivePage(mgldc,aPage);
-				MGL_setVisualPage(mgldc,vPage,waitVRT);
-			}
-		}
-	}
-	else
-	{
-		HDC hdcScreen;
-
-		hdcScreen = GetDC(mainwindow);
-
-		if (windc && dibdc)
-		{
-			MGL_setWinDC(windc,hdcScreen);
-
-			while (rects)
-			{
-				if (vid_stretched)
-				{
-					MGL_stretchBltCoord(windc,dibdc,
-						rects->x, rects->y,
-						rects->x + rects->width, rects->y + rects->height,
-						rects->x << 1, rects->y << 1,
-						(rects->x + rects->width) << 1,
-						(rects->y + rects->height) << 1);
-				}
-				else
-				{
-					MGL_bitBltCoord(windc,dibdc,
-						rects->x, rects->y,
-						rects->x + rects->width, rects->y + rects->height,
-						rects->x, rects->y, MGL_REPLACE_MODE);
-				}
-
-				rects = rects->pnext;
-			}
-		}
-
-		ReleaseDC(mainwindow, hdcScreen);
-	}
-}
-
-
-void	VID_Update (vrect_t *rects)
-{
-	vrect_t	rect;
-	RECT	trect;
-
-	if (!vid_palettized && palette_changed)
-	{
-		palette_changed = false;
-		rect.x = 0;
-		rect.y = 0;
-		rect.width = vid.width;
-		rect.height = vid.height;
-		rect.pnext = NULL;
-		rects = &rect;
-	}
-
-	if (firstupdate)
-	{
-		if (modestate == MS_WINDOWED)
-		{
-			GetWindowRect (mainwindow, &trect);
-
-			if ((trect.left != (int)vid_window_x.value) ||
-				(trect.top  != (int)vid_window_y.value))
-			{
-				if (COM_CheckParm ("-resetwinpos"))
-				{
-					Cvar_SetValue ("vid_window_x", 0.0);
-					Cvar_SetValue ("vid_window_y", 0.0);
-				}
-
-				VID_CheckWindowXY ();
-				SetWindowPos (mainwindow, NULL, (int)vid_window_x.value,
-				  (int)vid_window_y.value, 0, 0,
-				  SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME);
-			}
-		}
-
-		if ((_vid_default_mode_win.value != vid_default) &&
-			(!startwindowed || (_vid_default_mode_win.value < MODE_FULLSCREEN_DEFAULT)))
-		{
-			firstupdate = 0;
-
-			if (COM_CheckParm ("-resetwinpos"))
-			{
-				Cvar_SetValue ("vid_window_x", 0.0);
-				Cvar_SetValue ("vid_window_y", 0.0);
-			}
-
-			if ((_vid_default_mode_win.value < 0) ||
-				(_vid_default_mode_win.value >= nummodes))
-			{
-				Cvar_SetValue ("_vid_default_mode_win", windowed_default);
-			}
-
-			Cvar_SetValue ("vid_mode", _vid_default_mode_win.value);
-		}
-	}
-
-	// We've drawn the frame; copy it to the screen
-	FlipScreen (rects);
-
-	if (vid_testingmode)
-	{
-		if (realtime >= vid_testendtime)
-		{
-			VID_SetMode (vid_realmode, vid_curpal);
-			vid_testingmode = 0;
-		}
-	}
-	else
-	{
-		if ((int)vid_mode.value != vid_realmode)
-		{
-			VID_SetMode ((int)vid_mode.value, vid_curpal);
-			Cvar_SetValue ("vid_mode", (float)vid_modenum);
-								// so if mode set fails, we don't keep on
-								//  trying to set that mode
-			vid_realmode = vid_modenum;
-		}
-	}
-
-// handle the mouse state when windowed if that's changed
-	if (modestate == MS_WINDOWED)
-	{
-		if ((int)_windowed_mouse.value != windowed_mouse)
-		{
-			if (_windowed_mouse.value)
-			{
-				IN_ActivateMouse ();
-				IN_HideMouse ();
-			}
-			else
-			{
-				IN_DeactivateMouse ();
-				IN_ShowMouse ();
-			}
-
-			windowed_mouse = (int)_windowed_mouse.value;
-		}
-	}
-}
-
-
-/*
-================
-D_BeginDirectRect
-================
-*/
-void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
-{
-	int		i, j, reps, repshift;
-	vrect_t	rect;
-
-	if (!vid_initialized)
-		return;
-
-	if (vid.aspect > 1.5)
-	{
-		reps = 2;
-		repshift = 1;
-	}
-	else
-	{
-		reps = 1;
-		repshift = 0;
-	}
-
-	if (vid.numpages == 1)
-	{
-		VID_LockBuffer ();
-
-		if (!vid.direct)
-			Sys_Error ("NULL vid.direct pointer");
-
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				memcpy (&backingbuf[(i + j) * 24],
-						vid.direct + x + ((y << repshift) + i + j) * vid.rowbytes,
-						width);
-				memcpy (vid.direct + x + ((y << repshift) + i + j) * vid.rowbytes,
-						&pbitmap[(i >> repshift) * width],
-						width);
-			}
-		}
-
-		VID_UnlockBuffer ();
-
-		rect.x = x;
-		rect.y = y;
-		rect.width = width;
-		rect.height = height << repshift;
-		rect.pnext = NULL;
-
-		FlipScreen (&rect);
-	}
-	else
-	{
-	// unlock if locked
-		if (lockcount > 0)
-			MGL_endDirectAccess();
-
-	// set the active page to the displayed page
-		MGL_setActivePage (mgldc, vPage);
-
-	// lock the screen
-		MGL_beginDirectAccess ();
-
-	// save from and draw to screen
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				memcpy (&backingbuf[(i + j) * 24],
-						(byte *)mgldc->surface + x +
-						 ((y << repshift) + i + j) * mgldc->mi.bytesPerLine,
-						width);
-				memcpy ((byte *)mgldc->surface + x +
-						 ((y << repshift) + i + j) * mgldc->mi.bytesPerLine,
-						&pbitmap[(i >> repshift) * width],
-						width);
-			}
-		}
-
-	// unlock the screen
-		MGL_endDirectAccess ();
-
-	// restore the original active page
-		MGL_setActivePage (mgldc, aPage);
-
-	// relock the screen if it was locked
-		if (lockcount > 0)
-			MGL_beginDirectAccess();
-	}
-}
-
-
-/*
-================
-D_EndDirectRect
-================
-*/
-void D_EndDirectRect (int x, int y, int width, int height)
-{
-	int		i, j, reps, repshift;
-	vrect_t	rect;
-
-	if (!vid_initialized)
-		return;
-
-	if (vid.aspect > 1.5)
-	{
-		reps = 2;
-		repshift = 1;
-	}
-	else
-	{
-		reps = 1;
-		repshift = 0;
-	}
-
-	if (vid.numpages == 1)
-	{
-		VID_LockBuffer ();
-
-		if (!vid.direct)
-			Sys_Error ("NULL vid.direct pointer");
-
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				memcpy (vid.direct + x + ((y << repshift) + i + j) * vid.rowbytes,
-						&backingbuf[(i + j) * 24],
-						width);
-			}
-		}
-
-		VID_UnlockBuffer ();
-
-		rect.x = x;
-		rect.y = y;
-		rect.width = width;
-		rect.height = height << repshift;
-		rect.pnext = NULL;
-
-		FlipScreen (&rect);
-	}
-	else
-	{
-	// unlock if locked
-		if (lockcount > 0)
-			MGL_endDirectAccess();
-
-	// set the active page to the displayed page
-		MGL_setActivePage (mgldc, vPage);
-
-	// lock the screen
-		MGL_beginDirectAccess ();
-
-	// restore to the screen
-		for (i=0 ; i<(height << repshift) ; i += reps)
-		{
-			for (j=0 ; j<reps ; j++)
-			{
-				memcpy ((byte *)mgldc->surface + x +
-						 ((y << repshift) + i + j) * mgldc->mi.bytesPerLine,
-						&backingbuf[(i + j) * 24],
-						width);
-			}
-		}
-
-	// unlock the screen
-		MGL_endDirectAccess ();
-
-	// restore the original active page
-		MGL_setActivePage (mgldc, aPage);
-
-	// relock the screen if it was locked
-		if (lockcount > 0)
-			MGL_beginDirectAccess();
-	}
-}
-
-
-//==========================================================================
-
-byte        scantokey[128] = 
-					{ 
-//  0           1       2       3       4       5       6       7 
-//  8           9       A       B       C       D       E       F 
-	0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6', 
-	'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9, // 0 
-	'q',    'w',    'e',    'r',    't',    'y',    'u',    'i', 
-	'o',    'p',    '[',    ']',    13 ,    K_CTRL,'a',  's',      // 1 
-	'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';', 
-	'\'' ,    '`',    K_SHIFT,'\\',  'z',    'x',    'c',    'v',      // 2 
-	'b',    'n',    'm',    ',',    '.',    '/',    K_SHIFT,'*', 
-	K_ALT,' ',   0  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10,  K_PAUSE,    0  , K_HOME, 
-	K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4 
-	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5
-	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         // 7 
-}; 
-
-/*
-=======
-MapKey
-
-Map from windows to quake keynums
-=======
-*/
-int MapKey (int key)
-{
-	key = (key>>16)&255;
-	if (key > 127)
-		return 0;
-
-	return scantokey[key];
-}
-
-void AppActivate(BOOL fActive, BOOL minimize)
-/****************************************************************************
-*
-* Function:     AppActivate
-* Parameters:   fActive - True if app is activating
-*
-* Description:  If the application is activating, then swap the system
-*               into SYSPAL_NOSTATIC mode so that our palettes will display
-*               correctly.
-*
-****************************************************************************/
-{
-    HDC			hdc;
-    int			i, t;
-	static BOOL	sound_active;
-
-	ActiveApp = fActive;
-
-// messy, but it seems to work
-	if (vid_fulldib_on_focus_mode)
-	{
-		Minimized = minimize;
-
-		if (Minimized)
-			ActiveApp = false;
-	}
-
-	MGL_appActivate(windc, ActiveApp);
-
-	if (vid_initialized)
-	{
-	// yield the palette if we're losing the focus
-		hdc = GetDC(NULL);
-
-		if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
-		{
-			if (ActiveApp)
-			{
-				if ((modestate == MS_WINDOWED) || (modestate == MS_FULLDIB))
-				{
-					if (GetSystemPaletteUse(hdc) == SYSPAL_STATIC)
-					{
-					// switch to SYSPAL_NOSTATIC and remap the colors
-						SetSystemPaletteUse(hdc, SYSPAL_NOSTATIC);
-						syscolchg = true;
-						pal_is_nostatic = true;
-					}
-				}
-			}
-			else if (pal_is_nostatic)
-			{
-				if (GetSystemPaletteUse(hdc) == SYSPAL_NOSTATIC)
-				{
-				// switch back to SYSPAL_STATIC and the old mapping
-					SetSystemPaletteUse(hdc, SYSPAL_STATIC);
-					syscolchg = true;
-				}
-
-				pal_is_nostatic = false;
-			}
-		}
-
-		if (!Minimized)
-			VID_SetPalette (vid_curpal);
-
-		scr_fullupdate = 0;
-
-		ReleaseDC(NULL,hdc);
-	}
-
-// enable/disable sound on focus gain/loss
-	if (!ActiveApp && sound_active)
-	{
-		S_BlockSound ();
-		S_ClearBuffer ();
-		sound_active = false;
-	}
-	else if (ActiveApp && !sound_active)
-	{
-		S_UnblockSound ();
-		S_ClearBuffer ();
-		sound_active = true;
-	}
-
-// minimize/restore fulldib windows/mouse-capture normal windows on demand
-	if (!in_mode_set)
-	{
-		if (ActiveApp)
-		{
-			if (vid_fulldib_on_focus_mode)
-			{
-				if (vid_initialized)
-				{
-					msg_suppress_1 = true;	// don't want to see normal mode set message
-					VID_SetMode (vid_fulldib_on_focus_mode, vid_curpal);
-					msg_suppress_1 = false;
-
-					t = in_mode_set;
-					in_mode_set = true;
-					AppActivate (true, false);
-					in_mode_set = t;
-				}
-
-				IN_ActivateMouse ();
-				IN_HideMouse ();
-			}
-			else if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
-			{
-				IN_ActivateMouse ();
-				IN_HideMouse ();
-			}
-		}
-
-		if (!ActiveApp)
-		{
-			if (modestate == MS_FULLDIB)
-			{
-				if (vid_initialized)
-				{
-					force_minimized = true;
-					i = vid_fulldib_on_focus_mode;
-					msg_suppress_1 = true;	// don't want to see normal mode set message
-					VID_SetMode (windowed_default, vid_curpal);
-					msg_suppress_1 = false;
-					vid_fulldib_on_focus_mode = i;
-					force_minimized = false;
-
-				// we never seem to get WM_ACTIVATE inactive from this mode set, so we'll
-				// do it manually
-					t = in_mode_set;
-					in_mode_set = true;
-					AppActivate (false, true);
-					in_mode_set = t;
-				}
-
-				IN_DeactivateMouse ();
-				IN_ShowMouse ();
-			}
-			else if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
-			{
-				IN_DeactivateMouse ();
-				IN_ShowMouse ();
-			}
-		}
-	}
-}
-
-
-/*
-================
-VID_HandlePause
-================
-*/
-void VID_HandlePause (qboolean pause)
-{
-
-	if ((modestate == MS_WINDOWED) && _windowed_mouse.value)
-	{
-		if (pause)
-		{
-			IN_DeactivateMouse ();
-			IN_ShowMouse ();
-		}
-		else
-		{
-			IN_ActivateMouse ();
-			IN_HideMouse ();
-		}
-	}
-}
-
-
-/*
-===================================================================
-
-MAIN WINDOW
-
-===================================================================
-*/
-
-LONG CDAudio_MessageHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-/* main window procedure */
-LONG WINAPI MainWndProc (
-    HWND    hWnd,
-    UINT    uMsg,
-    WPARAM  wParam,
-    LPARAM  lParam)
-{
-	LONG			lRet = 0;
-	int				fwKeys, xPos, yPos, fActive, fMinimized, temp;
-	HDC				hdc;
-	PAINTSTRUCT		ps;
-	static int		recursiveflag;
-
-	switch (uMsg)
-	{
-		case WM_CREATE:
-			break;
-
-		case WM_SYSCOMMAND:
-
-		// Check for maximize being hit
-			switch (wParam & ~0x0F)
-			{
-				case SC_MAXIMIZE:
-				// if minimized, bring up as a window before going fullscreen,
-				// so MGL will have the right state to restore
-					if (Minimized)
-					{
-						force_mode_set = true;
-						VID_SetMode (vid_modenum, vid_curpal);
-						force_mode_set = false;
-					}
-
-					VID_SetMode ((int)vid_fullscreen_mode.value, vid_curpal);
-					break;
-
-                case SC_SCREENSAVE:
-                case SC_MONITORPOWER:
-					if (modestate != MS_WINDOWED)
-					{
-					// don't call DefWindowProc() because we don't want to start
-					// the screen saver fullscreen
-						break;
-					}
-
-				// fall through windowed and allow the screen saver to start
-
-				default:
-					if (!in_mode_set)
-					{
-						S_BlockSound ();
-						S_ClearBuffer ();
-					}
-
-					lRet = DefWindowProc (hWnd, uMsg, wParam, lParam);
-
-					if (!in_mode_set)
-					{
-						S_UnblockSound ();
-					}
-			}
-			break;
-
-		case WM_MOVE:
-			window_x = (int) LOWORD(lParam);
-			window_y = (int) HIWORD(lParam);
-			VID_UpdateWindowStatus ();
-
-			if ((modestate == MS_WINDOWED) && !in_mode_set && !Minimized)
-				VID_RememberWindowPos ();
-
-			break;
-
-		case WM_SIZE:
-			Minimized = false;
-			
-			if (!(wParam & SIZE_RESTORED))
-			{
-				if (wParam & SIZE_MINIMIZED)
-					Minimized = true;
-			}
-			break;
-
-		case WM_SYSCHAR:
-		// keep Alt-Space from happening
-			break;
-
-		case WM_ACTIVATE:
-			fActive = LOWORD(wParam);
-			fMinimized = (BOOL) HIWORD(wParam);
-			AppActivate(!(fActive == WA_INACTIVE), fMinimized);
-
-		// fix the leftover Alt from any Alt-Tab or the like that switched us away
-			ClearAllStates ();
-
-			if (!in_mode_set)
-			{
-				if (windc)
-					MGL_activatePalette(windc,true);
-
-				VID_SetPalette(vid_curpal);
-			}
-
-			break;
-
-		case WM_PAINT:
-			hdc = BeginPaint(hWnd, &ps);
-
-			if (!in_mode_set && host_initialized)
-				SCR_UpdateWholeScreen ();
-
-			EndPaint(hWnd, &ps);
-			break;
-
-		case WM_KEYDOWN:
-		case WM_SYSKEYDOWN:
-			if (!in_mode_set)
-				Key_Event (MapKey(lParam), true);
-			break;
-
-		case WM_KEYUP:
-		case WM_SYSKEYUP:
-			if (!in_mode_set)
-				Key_Event (MapKey(lParam), false);
-			break;
-
-	// this is complicated because Win32 seems to pack multiple mouse events into
-	// one update sometimes, so we always check all states and look for events
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_RBUTTONDOWN:
-		case WM_RBUTTONUP:
-		case WM_MBUTTONDOWN:
-		case WM_MBUTTONUP:
-		case WM_MOUSEMOVE:
-			if (!in_mode_set)
-			{
-				temp = 0;
-
-				if (wParam & MK_LBUTTON)
-					temp |= 1;
-
-				if (wParam & MK_RBUTTON)
-					temp |= 2;
-
-				if (wParam & MK_MBUTTON)
-					temp |= 4;
-
-				IN_MouseEvent (temp);
-			}
-			break;
-
-		// JACK: This is the mouse wheel with the Intellimouse
-		// Its delta is either positive or neg, and we generate the proper
-		// Event.
-		case WM_MOUSEWHEEL: 
-			if ((short) HIWORD(wParam) > 0) {
-				Key_Event(K_MWHEELUP, true);
-				Key_Event(K_MWHEELUP, false);
-			} else {
-				Key_Event(K_MWHEELDOWN, true);
-				Key_Event(K_MWHEELDOWN, false);
-			}
-			break;
-		// KJB: Added these new palette functions
-		case WM_PALETTECHANGED:
-			if ((HWND)wParam == hWnd)
-				break;
-			/* Fall through to WM_QUERYNEWPALETTE */
-		case WM_QUERYNEWPALETTE:
-			hdc = GetDC(NULL);
-
-			if (GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE)
-				vid_palettized = true;
-			else
-				vid_palettized = false;
-
-			ReleaseDC(NULL,hdc);
-
-			scr_fullupdate = 0;
-
-			if (vid_initialized && !in_mode_set && windc && MGL_activatePalette(windc,false) && !Minimized)
-			{
-				VID_SetPalette (vid_curpal);
-				InvalidateRect (mainwindow, NULL, false);
-
-			// specifically required if WM_QUERYNEWPALETTE realizes a new palette
-				lRet = TRUE;
-			}
-			break;
-
-		case WM_DISPLAYCHANGE:
-			if (!in_mode_set && (modestate == MS_WINDOWED) && !vid_fulldib_on_focus_mode)
-			{
-				force_mode_set = true;
-				VID_SetMode (vid_modenum, vid_curpal);
-				force_mode_set = false;
-			}
-			break;
-
-   	    case WM_CLOSE:
-		// this causes Close in the right-click task bar menu not to work, but right
-		// now bad things happen if Close is handled in that case (garbage and a
-		// crash on Win95)
-			if (!in_mode_set)
-			{
-				if (MessageBox (mainwindow, "Are you sure you want to quit?", "Confirm Exit",
-							MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION) == IDYES)
-				{
-					Sys_Quit ();
-				}
-			}
-			break;
-
-		case MM_MCINOTIFY:
-            lRet = CDAudio_MessageHandler (hWnd, uMsg, wParam, lParam);
-			break;
-
-		default:
-            /* pass all unhandled messages to DefWindowProc */
-            lRet = DefWindowProc (hWnd, uMsg, wParam, lParam);
-	        break;
-    }
-
-    /* return 0 if handled message, 1 if not */
-    return lRet;
-}
-
-
-extern void M_Menu_Options_f (void);
-extern void M_Print (int cx, int cy, char *str);
-extern void M_PrintWhite (int cx, int cy, char *str);
-extern void M_DrawCharacter (int cx, int line, int num);
-extern void M_DrawTransPic (int x, int y, qpic_t *pic);
-extern void M_DrawPic (int x, int y, qpic_t *pic);
-
-static int	vid_line, vid_wmodes;
-
-typedef struct
-{
-	int		modenum;
-	char	*desc;
-	int		iscur;
-	int		ismode13;
-	int		width;
-} modedesc_t;
-
-#define MAX_COLUMN_SIZE		5
-#define MODE_AREA_HEIGHT	(MAX_COLUMN_SIZE + 6)
-#define MAX_MODEDESCS		(MAX_COLUMN_SIZE*3)
-
-static modedesc_t	modedescs[MAX_MODEDESCS];
-
-/*
-================
-VID_MenuDraw
-================
-*/
-void VID_MenuDraw (void)
-{
-	qpic_t		*p;
-	char		*ptr;
-	int			lnummodes, i, j, k, column, row, dup, dupmode;
-	char		temp[100];
-	vmode_t		*pv;
-	modedesc_t	tmodedesc;
-
-	p = Draw_CachePic ("gfx/vidmodes.lmp");
-	M_DrawPic ( (320-p->width)/2, 4, p);
-
-	for (i=0 ; i<3 ; i++)
-	{
-		ptr = VID_GetModeDescriptionMemCheck (i);
-		modedescs[i].modenum = modelist[i].modenum;
-		modedescs[i].desc = ptr;
-		modedescs[i].ismode13 = 0;
-		modedescs[i].iscur = 0;
-
-		if (vid_modenum == i)
-			modedescs[i].iscur = 1;
-	}
-
-	vid_wmodes = 3;
-	lnummodes = VID_NumModes ();
-	
-	for (i=3 ; i<lnummodes ; i++)
-	{
-		ptr = VID_GetModeDescriptionMemCheck (i);
-		pv = VID_GetModePtr (i);
-
-	// we only have room for 15 fullscreen modes, so don't allow
-	// 360-wide modes, because if there are 5 320-wide modes and
-	// 5 360-wide modes, we'll run out of space
-		if (ptr && ((pv->width != 360) || COM_CheckParm("-allow360")))
-		{
-			dup = 0;
-
-			for (j=3 ; j<vid_wmodes ; j++)
-			{
-				if (!strcmp (modedescs[j].desc, ptr))
-				{
-					dup = 1;
-					dupmode = j;
-					break;
-				}
-			}
-
-			if (dup || (vid_wmodes < MAX_MODEDESCS))       
-			{
-				if (!dup || !modedescs[dupmode].ismode13 || COM_CheckParm("-noforcevga"))
-				{
-					if (dup)
-					{
-						k = dupmode;
-					}
-					else
-					{
-						k = vid_wmodes;
-					}
-
-					modedescs[k].modenum = i;
-					modedescs[k].desc = ptr;
-					modedescs[k].ismode13 = pv->mode13;
-					modedescs[k].iscur = 0;
-					modedescs[k].width = pv->width;
-
-					if (i == vid_modenum)
-						modedescs[k].iscur = 1;
-
-					if (!dup)
-						vid_wmodes++;
-				}
-			}
-		}
-	}
-
-// sort the modes on width (to handle picking up oddball dibonly modes
-// after all the others)
-	for (i=3 ; i<(vid_wmodes-1) ; i++)
-	{
-		for (j=(i+1) ; j<vid_wmodes ; j++)
-		{
-			if (modedescs[i].width > modedescs[j].width)
-			{
-				tmodedesc = modedescs[i];
-				modedescs[i] = modedescs[j];
-				modedescs[j] = tmodedesc;
-			}
-		}
-	}
-
-
-	M_Print (13*8, 36, "Windowed Modes");
-
-	column = 16;
-	row = 36+2*8;
-
-	for (i=0 ; i<3; i++)
-	{
-		if (modedescs[i].iscur)
-			M_PrintWhite (column, row, modedescs[i].desc);
-		else
-			M_Print (column, row, modedescs[i].desc);
-
-		column += 13*8;
-	}
-
-	if (vid_wmodes > 3)
-	{
-		M_Print (12*8, 36+4*8, "Fullscreen Modes");
-
-		column = 16;
-		row = 36+6*8;
-
-		for (i=3 ; i<vid_wmodes ; i++)
-		{
-			if (modedescs[i].iscur)
-				M_PrintWhite (column, row, modedescs[i].desc);
-			else
-				M_Print (column, row, modedescs[i].desc);
-
-			column += 13*8;
-
-			if (((i - 3) % VID_ROW_SIZE) == (VID_ROW_SIZE - 1))
-			{
-				column = 16;
-				row += 8;
-			}
-		}
-	}
-
-// line cursor
-	if (vid_testingmode)
-	{
-		sprintf (temp, "TESTING %s",
-				modedescs[vid_line].desc);
-		M_Print (13*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4, temp);
-		M_Print (9*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6,
-				"Please wait 5 seconds...");
-	}
-	else
-	{
-		M_Print (9*8, 36 + MODE_AREA_HEIGHT * 8 + 8,
-				"Press Enter to set mode");
-		M_Print (6*8, 36 + MODE_AREA_HEIGHT * 8 + 8*3,
-				"T to test mode for 5 seconds");
-		ptr = VID_GetModeDescription2 (vid_modenum);
-
-		if (ptr)
-		{
-			sprintf (temp, "D to set default: %s", ptr);
-			M_Print (2*8, 36 + MODE_AREA_HEIGHT * 8 + 8*5, temp);
-		}
-
-		ptr = VID_GetModeDescription2 ((int)_vid_default_mode_win.value);
-
-		if (ptr)
-		{
-			sprintf (temp, "Current default: %s", ptr);
-			M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6, temp);
-		}
-
-		M_Print (15*8, 36 + MODE_AREA_HEIGHT * 8 + 8*8,
-				"Esc to exit");
-
-		row = 36 + 2*8 + (vid_line / VID_ROW_SIZE) * 8;
-		column = 8 + (vid_line % VID_ROW_SIZE) * 13*8;
-
-		if (vid_line >= 3)
-			row += 3*8;
-
-		M_DrawCharacter (column, row, 12+((int)(realtime*4)&1));
-	}
-}
-
-
-/*
-================
-VID_MenuKey
-================
-*/
-void VID_MenuKey (int key)
-{
-	if (vid_testingmode)
-		return;
-
-	switch (key)
-	{
-	case K_ESCAPE:
-		S_LocalSound ("misc/menu1.wav");
-		M_Menu_Options_f ();
-		break;
-
-	case K_LEFTARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line = ((vid_line / VID_ROW_SIZE) * VID_ROW_SIZE) +
-				   ((vid_line + 2) % VID_ROW_SIZE);
-
-		if (vid_line >= vid_wmodes)
-			vid_line = vid_wmodes - 1;
-		break;
-
-	case K_RIGHTARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line = ((vid_line / VID_ROW_SIZE) * VID_ROW_SIZE) +
-				   ((vid_line + 4) % VID_ROW_SIZE);
-
-		if (vid_line >= vid_wmodes)
-			vid_line = (vid_line / VID_ROW_SIZE) * VID_ROW_SIZE;
-		break;
-
-	case K_UPARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line -= VID_ROW_SIZE;
-
-		if (vid_line < 0)
-		{
-			vid_line += ((vid_wmodes + (VID_ROW_SIZE - 1)) /
-					VID_ROW_SIZE) * VID_ROW_SIZE;
-
-			while (vid_line >= vid_wmodes)
-				vid_line -= VID_ROW_SIZE;
-		}
-		break;
-
-	case K_DOWNARROW:
-		S_LocalSound ("misc/menu1.wav");
-		vid_line += VID_ROW_SIZE;
-
-		if (vid_line >= vid_wmodes)
-		{
-			vid_line -= ((vid_wmodes + (VID_ROW_SIZE - 1)) /
-					VID_ROW_SIZE) * VID_ROW_SIZE;
-
-			while (vid_line < 0)
-				vid_line += VID_ROW_SIZE;
-		}
-		break;
-
-	case K_ENTER:
-		S_LocalSound ("misc/menu1.wav");
-		VID_SetMode (modedescs[vid_line].modenum, vid_curpal);
-		break;
-
-	case 'T':
-	case 't':
-		S_LocalSound ("misc/menu1.wav");
-	// have to set this before setting the mode because WM_PAINT
-	// happens during the mode set and does a VID_Update, which
-	// checks vid_testingmode
-		vid_testingmode = 1;
-		vid_testendtime = realtime + 5.0;
-
-		if (!VID_SetMode (modedescs[vid_line].modenum, vid_curpal))
-		{
-			vid_testingmode = 0;
-		}
-		break;
-
-	case 'D':
-	case 'd':
-		S_LocalSound ("misc/menu1.wav");
-		firstupdate = 0;
-		Cvar_SetValue ("_vid_default_mode_win", vid_modenum);
-		break;
-
-	default:
-		break;
-	}
-}
--- a/u/vregset.c
+++ /dev/null
@@ -1,81 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// vregset.c: video register-setting interpreter
-//
-
-#include <dos.h>
-#include <conio.h>
-
-#include "quakedef.h"
-#include "vregset.h"
-
-//#define outportb	loutportb
-
-void loutportb (int port, int val)
-{
-	printf ("port, val: %x %x\n", port, val);
-	getch ();
-}
-
-/*
-================
-VideoRegisterSet
-================
-*/
-void VideoRegisterSet (int *pregset)
-{
-	int		port, temp0, temp1, temp2;
-
-	for ( ;; )
-	{
-		switch (*pregset++)
-		{
-			case VRS_END:
-				return;
-
-			case VRS_BYTE_OUT:
-				port = *pregset++;
-				outportb (port, *pregset++);
-				break;
-
-			case VRS_BYTE_RMW:
-				port = *pregset++;
-				temp0 = *pregset++;
-				temp1 = *pregset++;
-				temp2 = inportb (port);
-				temp2 &= temp0;
-				temp2 |= temp1;
-				outportb (port, temp2);
-				break;
-
-			case VRS_WORD_OUT:
-				port = *pregset++;
-				outportb (port, *pregset & 0xFF);
-				outportb (port+1, *pregset >> 8);
-				pregset++;
-				break;
-
-			default:
-				Sys_Error ("VideoRegisterSet: Invalid command\n");
-		}
-	}
-}
-
--- a/u/vregset.h
+++ /dev/null
@@ -1,56 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-//
-// vregset.h: header file for video register-setting interpreter
-//
-
-//
-// registers & subregisters
-//
-#define MISC_OUTPUT	0x3C2
-
-#define SC_INDEX		0x3C4
-#define SC_DATA			0x3C5
-#define SYNC_RESET		0
-#define MAP_MASK		2
-#define MEMORY_MODE		4
-
-#define GC_INDEX		0x3CE
-#define GC_DATA			0x3CF
-#define READ_MAP		4
-#define GRAPHICS_MODE	5
-#define MISCELLANOUS	6
-
-#define CRTC_INDEX		0x3D4
-#define CRTC_DATA		0x3D5
-#define MAX_SCAN_LINE	9
-#define UNDERLINE		0x14
-#define	MODE_CONTROL	0x17
-
-//
-// register-set commands
-//
-#define VRS_END			0
-#define VRS_BYTE_OUT	1
-#define VRS_BYTE_RMW	2
-#define VRS_WORD_OUT	3
-
-void VideoRegisterSet (int *pregset);
-
binary files a/u/winquake.aps /dev/null differ
--- a/u/winquake.h
+++ /dev/null
@@ -1,114 +1,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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.
-
-*/
-// winquake.h: Win32-specific Quake header file
-
-#pragma warning( disable : 4229 )  // mgraph gets this
-
-#include <windows.h>
-#define WM_MOUSEWHEEL                   0x020A
-
-#ifndef SERVERONLY
-#include <ddraw.h>
-#include <dsound.h>
-#ifndef GLQUAKE
-#include <mgraph.h>
-#endif
-#endif
-
-extern	HINSTANCE	global_hInstance;
-extern	int			global_nCmdShow;
-
-#ifndef SERVERONLY
-
-extern LPDIRECTDRAW		lpDD;
-extern qboolean			DDActive;
-extern LPDIRECTDRAWSURFACE	lpPrimary;
-extern LPDIRECTDRAWSURFACE	lpFrontBuffer;
-extern LPDIRECTDRAWSURFACE	lpBackBuffer;
-extern LPDIRECTDRAWPALETTE	lpDDPal;
-extern LPDIRECTSOUND pDS;
-extern LPDIRECTSOUNDBUFFER pDSBuf;
-
-extern DWORD gSndBufSize;
-//#define SNDBUFSIZE 65536
-
-void	VID_LockBuffer (void);
-void	VID_UnlockBuffer (void);
-
-#endif
-
-typedef enum {MS_WINDOWED, MS_FULLSCREEN, MS_FULLDIB, MS_UNINIT} modestate_t;
-
-extern modestate_t	modestate;
-
-extern HWND			mainwindow;
-extern qboolean		ActiveApp, Minimized;
-
-extern qboolean	WinNT;
-
-int VID_ForceUnlockedAndReturnState (void);
-void VID_ForceLockState (int lk);
-
-void IN_ShowMouse (void);
-void IN_DeactivateMouse (void);
-void IN_HideMouse (void);
-void IN_ActivateMouse (void);
-void IN_RestoreOriginalMouseState (void);
-void IN_SetQuakeMouseState (void);
-void IN_MouseEvent (int mstate);
-
-extern qboolean	winsock_lib_initialized;
-
-extern cvar_t		_windowed_mouse;
-
-extern int		window_center_x, window_center_y;
-extern RECT		window_rect;
-
-extern qboolean	mouseinitialized;
-extern HWND		hwnd_dialog;
-
-extern HANDLE	hinput, houtput;
-
-void IN_UpdateClipCursor (void);
-void CenterWindow(HWND hWndCenter, int width, int height, BOOL lefttopjustify);
-
-void S_BlockSound (void);
-void S_UnblockSound (void);
-
-void VID_SetDefaultMode (void);
-
-int (PASCAL FAR *pWSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
-int (PASCAL FAR *pWSACleanup)(void);
-int (PASCAL FAR *pWSAGetLastError)(void);
-SOCKET (PASCAL FAR *psocket)(int af, int type, int protocol);
-int (PASCAL FAR *pioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
-int (PASCAL FAR *psetsockopt)(SOCKET s, int level, int optname,
-							  const char FAR * optval, int optlen);
-int (PASCAL FAR *precvfrom)(SOCKET s, char FAR * buf, int len, int flags,
-							struct sockaddr FAR *from, int FAR * fromlen);
-int (PASCAL FAR *psendto)(SOCKET s, const char FAR * buf, int len, int flags,
-						  const struct sockaddr FAR *to, int tolen);
-int (PASCAL FAR *pclosesocket)(SOCKET s);
-int (PASCAL FAR *pgethostname)(char FAR * name, int namelen);
-struct hostent FAR * (PASCAL FAR *pgethostbyname)(const char FAR * name);
-struct hostent FAR * (PASCAL FAR *pgethostbyaddr)(const char FAR * addr,
-												  int len, int type);
-int (PASCAL FAR *pgetsockname)(SOCKET s, struct sockaddr FAR *name,
-							   int FAR * namelen);
--- a/u/winquake.rc
+++ /dev/null
@@ -1,131 +1,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON2               ICON    DISCARDABLE     "quake.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG1 DIALOGEX 0, 0, 62, 21
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_POPUP
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE
-FONT 16, "Times New Roman", 0, 0, 0x1
-BEGIN
-    CTEXT           "Starting Quake...",IDC_STATIC,4,6,54,8
-END
-
-IDD_PROGRESS DIALOGEX 0, 0, 333, 45
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_POPUP | 
-    WS_VISIBLE
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Creating 15 bit inverse palette.  This is only done once, so just be patient for the next 30-60 seconds.",
-                    IDC_STATIC,7,19,319,10
-    CONTROL         "Progress1",IDC_PROGRESS,"msctls_progress32",0x0,7,29,
-                    319,11
-    LTEXT           "Starting Quake...",IDC_STATIC,7,4,54,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOG
-    BEGIN
-        LEFTMARGIN, 4
-        RIGHTMARGIN, 58
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 16
-        HORZGUIDE, 6
-        HORZGUIDE, 16
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_STRING1             "WinQuake"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
--- a/u/worlda.s
+++ /dev/null
@@ -1,125 +1,0 @@
-//
-// worlda.s
-// x86 assembly-language server testing stuff
-//
-
-#define GLQUAKE	1	// don't include unneeded defs
-#include "asm_i386.h"
-#include "quakeasm.h"
-#include "d_ifacea.h"
-
-#ifdef id386
-
-	.data
-
-Ltemp:	.long	0
-
-	.text
-
-//----------------------------------------------------------------------
-// hull-point test
-//----------------------------------------------------------------------
-
-#define hull	4+8				// because only partially pushed
-#define	num		8+4				// because only partially pushed
-#define p		12+12			// because only partially pushed
-
-	.align 4
-.globl C(SV_HullPointContents)
-C(SV_HullPointContents):
-	pushl	%edi				// preserve register variables
-	movl	num(%esp),%eax
-	testl	%eax,%eax
-	js		Lhquickout
-
-//	float		d;
-//	dclipnode_t	*node;
-//	mplane_t	*plane;
-
-	pushl	%ebx
-	movl	hull(%esp),%ebx
-
-	pushl	%ebp
-	movl	p(%esp),%edx
-
-	movl	hu_clipnodes(%ebx),%edi
-	movl	hu_planes(%ebx),%ebp
-
-	subl	%ebx,%ebx
-	pushl	%esi
-
-// %ebx: 0
-// %eax: num
-// %edx: p
-// %edi: hull->clipnodes
-// %ebp: hull->planes
-
-//	while (num >= 0)
-//	{
-
-Lhloop:
-
-//		node = hull->clipnodes + num;
-//		plane = hull->planes + node->planenum;
-// !!! if the size of dclipnode_t changes, the scaling of %eax needs to be
-//     changed !!!
-	movl	nd_planenum(%edi,%eax,8),%ecx
-	movl	nd_children(%edi,%eax,8),%eax
-	movl	%eax,%esi
-	rorl	$16,%eax
-	leal	(%ecx,%ecx,4),%ecx
-
-//		if (plane->type < 3)
-//			d = p[plane->type] - plane->dist;
-	movb	pl_type(%ebp,%ecx,4),%bl
-	cmpb	$3,%bl
-	jb		Lnodot
-
-//		else
-//			d = DotProduct (plane->normal, p) - plane->dist;
-	flds	pl_normal(%ebp,%ecx,4)
-	fmuls	0(%edx)
-	flds	pl_normal+4(%ebp,%ecx,4)
-	fmuls	4(%edx)
-	flds	pl_normal+8(%ebp,%ecx,4)
-	fmuls	8(%edx)
-	fxch	%st(1)
-	faddp	%st(0),%st(2)
-	faddp	%st(0),%st(1)
-	fsubs	pl_dist(%ebp,%ecx,4)
-	jmp		Lsub
-
-Lnodot:
-	flds	pl_dist(%ebp,%ecx,4)
-	fsubrs	(%edx,%ebx,4)
-
-Lsub:
-	sarl	$16,%eax
-	sarl	$16,%esi
-
-//		if (d < 0)
-//			num = node->children[1];
-//		else
-//			num = node->children[0];
-	fstps	Ltemp
-	movl	Ltemp,%ecx
-	sarl	$31,%ecx
-	andl	%ecx,%esi
-	xorl	$0xFFFFFFFF,%ecx
-	andl	%ecx,%eax
-	orl		%esi,%eax
-	jns		Lhloop
-
-//	return num;
-Lhdone:
-	popl	%esi
-	popl	%ebp
-	popl	%ebx				// restore register variables
-
-Lhquickout:
-	popl	%edi
-
-	ret
-
-#endif	// id386
-
--- a/u/wq.bat
+++ /dev/null
@@ -1,42 +1,0 @@
-@echo off
-if x%1==xfast goto fast
-if x%1==xsafe goto safe
-if x%1==xverysafe goto verysafe
-if x%1==xfastvid goto fastvid
-if x%1==xfastsnd goto fastsnd
-if x%1==xmax goto max
-
-echo -------------------------------------------------------------------
-echo Options for running WinQuake:
-echo  wq max:      all features on, but doesn't work on all systems
-echo  wq fast:     maximum speed, but doesn't work on all systems
-echo  wq fastvid:  maximum video speed, but safer, probably slower sound
-echo  wq fastsnd:  maximum sound speed, but safer, probably slower video
-echo  wq safe:     very likely to run, but may be slower
-echo  wq verysafe: almost sure to run, but probably slower, and no sound
-echo -------------------------------------------------------------------
-goto done
-
-:max
-winquake -dinput %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-
-:fast
-winquake %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-
-:fastvid
-winquake -wavonly %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-
-:fastsnd
-winquake -nodirectdraw -nowindirect %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-
-:safe
-winquake -nodirectdraw -nowindirect -wavonly %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-
-:verysafe
-winquake -dibonly -nosound -nojoy %2 %3 %4 %5 %6 %7 %8 %9
-:done
--- a/u/wqreadme.txt
+++ /dev/null
@@ -1,1119 +1,0 @@
---------------------------
-| wqreadme.txt           |
-| WinQuake documentation |
-| 3/21/97                |
---------------------------
-
-WinQuake (WQ) is a native Win32 version of Quake, and will run on
-either Win95 or Windows NT 4.0 or later.  It is designed to take
-advantage of whatever enhanced video, sound, and input capabilities
-(such as DirectX or VESA VBE video modes) are present, but has
-fallback functionality so it can run on any Win95 or NT 4.0 or later
-system, even if neither DirectX nor VESA VBE is available.  You may
-experience problems running WQ on some systems, because driver and
-operating-system support for game functionality are not yet mature
-under Win32, and many bugs and incompatibilities remain in those
-components.  If you encounter what seems to be a bug, first please
-check through the list of known problems, below.  If your problem
-doesn't appear on the list, please fill out and submit the WQ bug
-report at http://www.idsoftware.com/contact/.
-
-The material accompanying Quake is the reference for all
-non-Windows-related matters concerning WinQuake; in terms of gameplay,
-WQ is the same as Quake.  This file contains Windows-related
-information only.
-
-The rest of this document is organized as follows:
-
-Installing and running WinQuake
-Common problems and workarounds
-A bit about how WQ video works
-Video command-line switches
-A bit about how WQ sound works
-Sound command-line switches
-Notes on networking
-Notes on the mouse
-Log of changes to documentation
-Special thanks
-
-
------------------------------------
-| Installing and running WinQuake |
------------------------------------
-
-In order to run WinQuake, you must first have Quake installed.
-Assuming Quake is installed in the standard directory, c:\quake,
-unzip the WinQuake zip file into c:\quake.  The following files
-from the zip file must be present in order for WQ to run:
-
-winquake.exe
-pmpro16.dll
-pmpro32.dll
-wdir16.dll
-wdir32.dll
-wdirnop.com
-wdirnop.pif
-
-Then you can run WinQuake by making c:\quake the current directory,
-typing "winquake" and pressing the Enter key.  Alternatively, you can
-use wq.bat to run WinQuake.  The wq batch file requires one parameter
-describing how to configure WQ for performance; just type "wq" to get
-a list of the six options.  The first of the six options is
-
-wq fast
-
-This is the same as typing "winquake"; this runs WinQuake in an
-aggressive configuration that is likely to yield the best performance
-if it runs successfully on your system, but which has a risk of
-causing WinQuake or even your system to crash if there are bugs or
-incompatibilities in your video or sound drivers.  Alternatively, you
-can use
-
-wq safe
-
-to run WinQuake in a conservative configuration, likely to run
-on almost all machines with no problems, but possibly with slower
-graphics, fewer high-resolution modes, and delayed sound.  Or you
-can run
-
-wq verysafe
-
-to run WinQuake in a very conservative configuration that is pretty
-much guaranteed to run, but will probably have slow performance, and
-will have no sound.  Two other options are
-
-wq fastvid
-
-which has maximum video performance, but greater sound latency (delay
-until the sound is heard), and
-
-wq fastsnd
-
-which uses more conservative video modes, but low-latency sound.
-
-(One odd note is that DirectSound has much lower-latency sound than
-wave sound, but is currently quite a bit slower overall.  Thus you
-may find that "wq fastvid" is actually faster, by as much as 5-10%,
-than "wq fast"; however, it may not feel faster, because the sound
-will lag.)
-
-Finally, you can use
-
-wq max
-
-which is the same as wq fast, but turns on DirectInput, which
-provides more responsive mouse control, but does not work properly
-on all systems.
-
-Note that DirectX is not required for WQ to run, but WQ will
-automatically take advantage of DirectSound and DirectDraw if they
-are present.  If DirectSound is not present, there will generally be
-considerable sound latency (sound will become audible several hundred
-milliseconds after the event that caused it).  Note also that there
-are currently no true DirectSound drivers for Windows NT, so WQ will
-always run using wave output on NT, and will consequently have lagged
-sound.  See below for information about obtaining DirectX if you do
-not have it.
-
-Note that VESA VBE modes aren't required for WQ to run, but WQ will
-automatically make VESA modes available if they're present.  Your BIOS
-may already have VESA VBE 2.0 support built in, but most BIOSes
-don't. Worse, some BIOSes do have VESA VBE 2.0 built-in, but have
-buggy implementations, which may prevent you from being able to run
-the faster configurations of WQ.  An easy way to get reliable VESA 2.0
-support is by obtaining SciTech Display Doctor; see below for
-further information. WQ can also use VBE/AF 1.0 and greater modes;
-again, SciTech Display Doctor is the commonest way to get VBE/AF
-support.
-
-Note that winquake -dedicated completely replaces the old winded
-dedicated Win32 server, which is now obsolete.
-
-WinQuake normally uses half the physical memory in your system for its
-heap, but not less than 8.5 Mb and not more than 16 Mb.  You can
-override this with "-heapsize n", where n is the amount of memory to
-allocate for the heap, in Kb.
-
-To use the joystick, you must bring down the console by pressing the
-tilde ('~') key, and type "joystick 1<enter>"; you can disable the
-joystick with "joystick 0<enter>" at any time.  The joystick setting
-remains in effect for subsequent WinQuake sessions until changed, so
-you only need to do joystick 1 once to enable the joystick.  If the
-joystick somehow causes problems that keep you from being able to run
-WinQuake at all, you can start WinQuake -nojoy to complete disable the
-joystick for that session.
-
-
------------------------------------
-| Common problems and workarounds |
------------------------------------
-
-WQ crashes or won't run
------------------------
-
-If WQ refuses to run or crashes on your system, try running
-it using "wq safe" or "wq verysafe".  Or you can use command-line
-switches:
-
-winquake -nodirectdraw -nowindirect -wavonly
-
-This will almost certainly solve your problem; however, it may result
-in  lagged sound (a long delay from action to hearing the sound), may
-result in fewer or slower high-res video modes, and the mouse may be
-somewhat less responsive.  If this does work, you can try removing
-each of the command-line switches until you identify the one that
-fixes the problem, thereby sacrificing as little functionality as
-possible.
-
-If the above command line does not fix your problems, try:
-
-winquake -dibonly -nosound
-
-which forces WQ into silent operation with bare-bones video support
-and no use of DirectInput for mouse input (the normal Windows mouse
-APIs are used instead).  Again, if this works, try removing switches
-until you identify the needed one.
-
-Both of the above command lines are quick fixes.  Often, the problem
-is caused by outdated or buggy DirectX drivers or code, and can
-frequently be completely fixed simply by installing the latest
-Microsoft-supplied version of DirectX, which you may be able to find
-on http://www.microsoft.com/mediadev/download/directx.exe, although
-the availability and location of the DirectX file changes
-periodically; note that at last check, this is a 3.4 Mb file.  (Be
-aware, though, that sometimes Microsoft's DirectX drivers don't
-support features that the manufacturers' drivers do support, such as
-display refresh rate control.)
-
-One known problem of this sort involves the current SB16 drivers from
-Creative Labs, which cause WQ to crash on some machines.  The
-DirectSound drivers from Microsoft, available via the above-mentioned
-URL, fix this problem.
-
-It can also sometimes help to get the latest Windows drivers for your
-video adapter or sound card (although as the SB16 example indicates,
-this is not always a good idea), and for video boards that have flash
-BIOSes, it can sometimes help to get the latest BIOS upgrade.
-
-
-How do I select fullscreen or windowed WQ operation?
-----------------------------------------------------
-Check out WQ's new, spiffy Video menu, accessible from the Options
-menu.  There are now two types of modes listed, windowed and
-fullscreen.  You can make any of these modes the current and/or
-default mode, just as in DOS Quake.  If you make a windowed mode the
-default, WQ will still briefly start up in fullscreen mode, then
-switch to windowed; if this is a problem, use the -startwindowed
-command-line switch.  More complete video control is available
-through the console, as described in the "A bit about how WQ video
-works" section, below.
-
-
-Gee, I wish I could use a mouse to play WQ with in a window
------------------------------------------------------------
-You can!  While in a windowed mode, go to the Options menu.  At the
-bottom, you'll find a new selection that lets you choose to have the
-mouse active when you're in a window.  Of course, if you do this,
-you'll have to use the keyboard (Alt-Tab, the Windows key, Ctrl-Esc,
-Alt-Esc, or Shift-Alt-Tab) to switch away from WQ.
-
-
-Serial/modem menu is missing
-----------------------------
-WQ currently does not support direct connect serial or modem play.
-
-
-DOS Quake reports unknown variables on startup after running WQ
----------------------------------------------------------------
-WQ uses some console variables that do not exist in DOS Quake, and
-some of these are automatically archived in config.cfg when you exit
-WQ.  If you then start DOS Quake, DOS Quake will complain that it
-doesn't recognize those variables.  You will also lose the settings
-of these variables when you return to WQ.  Apart from losing the
-settings, this is harmless; ignore it.
-
-
-Problems running WQ on NT 3.51
-------------------------------
-NT 3.51 isn't supported by WQ.
-
-
-WQ crashes while switching modes or Alt-Tabbing
------------------------------------------------
-So far, all cases of this seem to be tied to Creative Lab's SB16 sound
-drivers, and have been fixed by getting the latest DirectX drivers, as
-described above.  Alternatively, you should be able to fix this either
-by not switching modes or Alt-Tabbing, or by running -wavonly to
-disable DirectSound support.
-
-
-WQ sometimes runs pretty slowly fullscreen
-------------------------------------------
-There are several possible reasons for this, starting with "You have a
-slow computer."  Assuming that's not the case, if you don't have
-either DirectDraw or SciTech Display Doctor installed (see the "A bit
-about how WQ video works" section), it would probably be a good thing
-to install one or the other, because slow operation can be a result
-of slow copying or stretching of pixels to the screen by a Windows
-driver, something that's eliminated by both DirectDraw and Display
-Doctor.  You can also sometimes get a faster 320x200 mode on Win95 by
-doing vid_describemodes, then using vid_mode to select a non-VGA
-320x200 mode, as described in the "A bit about how WQ video works"
-section.
-
-You can also try using a primary sound buffer on Win95 (this doesn't
-work on NT) by using the -primarysound command-line switch; this can
-improve performance by several percent, but does not work on all
-systems, and can result in odd sound effects on some systems when
-minimizing WQ or switching the focus away from it.  If you use this
-switch, please don't report sound bugs; it's in there purely for you
-to use if it helps you, and we know it has problems on many systems.
-Finally, you can use -wavonly to select wave sound; this will increase
-your sound latency (sounds will be heard later than they should), but
-allows WQ to run 5-10% faster on some systems.  That's about all you
-can do to speed up fullscreen WQ on Win95, other than shrinking the
-active area of the screen with the screen size control in the Options
-menu.
-
-NT 4.0 comes with DirectX installed, but doesn't have any resolutions
-lower than 640x480.  In order to support a lower-resolution 320x240
-mode, WQ has NT double each pixel in both directions to get enough
-pixels for 640x480.  The extra stretching costs some performance, the
-result being that NT can seem sluggish on all but high-end Pentiums
-and Pentium Pros.  (In fact, depending on the quality of your driver's
-stretching code, it can sometimes be faster to run WQ at 640x480 than
-320x240-stretched on NT.)  One thing that can help on NT is switching
-to 640x480, then using the Options menu to shrink the active area of
-the screen.
-
-A common cause of slowness running in a window is having the desktop
-run in 16- or 32-bpp mode.  WQ is an 8-bpp application, and it slows
-things down if pixels have to be translated from 8-bpp to 16- or
-32-bpp.  (Note that this is generally a problem only when running in a
-window; fullscreen apps rarely suffer from this.)
-
-
-Sound is sluggish on NT
------------------------
-NT doesn't have any real DirectSound drivers yet, so there's no way to
-do quick-response sound on NT.  When DirectSound drivers for NT
-appear, WQ's sound should automatically be snappier.
-
-
-Sound breaks up or gets choppy, especially in menus
----------------------------------------------------
-This is generally a sign that WQ's frame rate is too low on your
-system.  Try reducing resolution or shrinking the active area of the
-screen.  In some circumstances, it may help to set the console
-variable _snd_mixahead to a larger value.
-
-
-The color black doesn't change with palette flashes sometimes
--------------------------------------------------------------
-Normally, DirectDraw lets WQ change all 256 colors, so when a palette
-flash happens, we can change all the colors, including black.
-However, on NT DirectDraw currently doesn't allow changing black;
-likewise, on both NT and Win95, black can't be changed in a window,
-either a normal window or fullscreen.  Consequently, in some modes and
-in a window, some parts of the WQ screen (such as the sigils on the
-status bar and the spray where a shotgun blast hits) stay black when
-the palette flashes.  There is no workaround.
-
-
-Problems can result if Office shortcut bar is running
------------------------------------------------------
-Various odd behaviors, especially with sound, have been reported if
-the Office shortcut bar is running while WQ is running.  If you
-experience odd problems, you might try shutting down the Office
-shortcut bar and see if that fixes anything.
-
-
-Other apps fail to play sound while WinQuake is running
--------------------------------------------------------
-The sound hardware is currently not a fully shareable resource on
-Win32.  Consequently, while WQ is running, it always has the sound
-hardware allocated to itself, to make sure that sound is never lost to
-another app.  This means that normally (when WQ is using DirectSound),
-apps that use wave sound (most non-game apps) will not be able to play
-sound while WQ is running, even if WQ is minimized or not the active
-app, although other DirectSound apps will be able to play sound when
-WQ is not the active app.  If WQ is using wave sound rather than
-DirectSound (either because -wavonly is used on the command line, or
-because there is no DirectSound driver, as is always the case on NT),
-then no other app will be able to play any sound while WQ is running,
-period.
-
-
-WQ doesn't have quite the right colors when it�s not the active app
--------------------------------------------------------------------
-We're working on fixing this.  But WQ puts everything back again as
-soon as it is reactivated, and anyway, when it�s not active, you can�t
-actually do anything in WQ, so it doesn�t really matter anyway, right?
-
-
-Desktop is weird colors when WQ runs windowed
----------------------------------------------
-WQ needs all 256 colors to look right and run fast, which causes it to
-have to change some of the 20 colors used to draw the desktop.
-
-
-Sometimes Permedia boards crash unless -nowindirect is used
------------------------------------------------------------
-It looks like this is probably a Permedia driver bug, so it might help
-if you get the most recent drivers.
-
-
-Right-click on WQ button in task bar to close doesn�t work as expected
-----------------------------------------------------------------------
-In some modes, right-clicking on the WQ task bar button doesn't work
-the way you'd expect.  We're trying to fix this, but if it's a
-problem, don't right-click.
-
-
-Screen saver never kicks in when running WQ fullscreen
-------------------------------------------------------
-It does work windowed, but when WinQuake is fullscreen, it completely
-owns the screen and doesn't share it with anyone, even the
-screensaver.  If you use Alt-Tab to minimize WQ, the screensaver will
-then be enabled, so Alt-Tab away from WQ if you're leaving your
-computer alone for a while and want the screensaver to be able to kick
-in.
-
-
-WQ doesn�t work in a window in 16-color mode
---------------------------------------------
-That�s 16 *colors*, not 16-bpp.  If you�re still running a 16-color
-desktop, run WQ fullscreen.
-
-
-Can't minimize window while mouse active
-----------------------------------------
-When running in a window with the mouse active as a WQ input device,
-there is no easy way to minimize the window, because the system menu
-can't be brought up from the keyboard (because some of you use Alt
-and Spacebar for playing the game), and the mouse can't be used to
-manipulate the window because it's controlling WQ.  To minimize, you
-can disable the mouse for WQ and use it to minimize the window.  Or
-on Win95 you can Alt-Tab away from WQ, then use the mouse to
-minimize (this doesn't work on NT, where clicking on the window
-controls just reactivates WQ).  Or you can bind a key to the
-vid_minimize command, as in
-
-bind m "vid_minimize"
-
-and press that key to minimize the window.
-
-
-Window controls don't work on NT when mouse enabled
----------------------------------------------------
-When running in a window on NT with the mouse enabled (so you can use
-the mouse to play WQ), if you Alt-Tab away from WQ, then use the mouse
-to click on the WQ system menu control, or the minimize, maximize, or
-close controls, the controls are ignored and WQ just reactivates.
-
-
-Mouse sometimes vanishes in system menu on Win95
-------------------------------------------------
-On Win95, if WQ is running in a window with the mouse enabled (so you
-can use the mouse to play WQ), if you Alt-Tab away, then click on the
-system menu, the menu comes up, but the mouse vanishes.  However, you
-can still use the keyboard to select system menu items, or to exit
-the system menu.
-
-
-WQ behaves oddly if Scandisk starts defragmenting
--------------------------------------------------
-If WQ is running fullscreen on Win95 when Scandisk starts an automatic
-defragging, WQ is forced to minimize, and when it is brought back up,
-may either be in a strange mode where it runs one frame for each
-keystroke (in which case Alt-Tab generally fixes things), or may hang
-the system.  We don't know what the problem is right now, but you may
-want to make sure you don't leave WQ sitting there fullscreen
-overnight if you have automatic defragging.
-
-
-Hang reported with zero sound volume
-------------------------------------
-When sound is turned all the way down via the WQ menus, hangs have
-been reported.
-
-
-Joystick worked fine with earlier versions of WinQuake but not now
-------------------------------------------------------------------
-The joystick was enabled by default in earlier versions of
-WinQuake, but quite a few people reported serious problems that
-forced them to disable the joystick--even some people who didn't
-have a joystick attached.  Since most people don't have joysticks,
-we've decided to disable the joystick by default, and let people
-who do want to use it set joystick 1 in the console (WinQuake
-remembers this setting, so this only needs to be done once).
-
-
-WQ runs very slowly when it has the focus under NT
---------------------------------------------------
-In one case, WQ ran very slowly when it had the focus, but fast when
-it didn't (obviously this is only visible in windowed modes).  The
-problem turned out to be that NT had a Sidewinder 3D Pro joystick
-driver installed; when the driver was removed, things were fine.
-If you see a similar problem, check whether WQ is detecting that
-your system has a joystick when you don't think it should; if so,
-try doing "joystick 0", or -nojoy on the command line, and see if
-that fixes it.  If so, there's something flaky in your system
-joystick setup.
-
-
-Joystick doesn't seem calibrated properly
------------------------------------------
-WQ relies on the information about your joystick stored in the
-system registry.  If the joystick seems miscalibrated, run the
-joystick applet and recalibrate and see if that fixes things.
-
-
-Playdemo fails across multiple levels
--------------------------------------
-If "record" is used to record a client-side demo, bad things will
-happen on playback via playdemo if a level change is recorded.
-(Timedemo works fine.)  This is unfortunate, but WinQuake
-internals make this not fixable without a good chance of
-breaking something more important, so it'll have to stay this way.
-
-
-Alt-Tab fullscreen only works sometimes
----------------------------------------
-I know it seems that way, but actually the trick is that on Win95
-it only works if you let go of Tab before you let go of Alt.
-This is due to a Windows quirk involving what key sequences are
-passed along, so you'll have to work around it by remembering to
-let go of Tab first.
-
-
-MS-DOS windows get scrunched on Alt-Tab
----------------------------------------
-This is a quirk of Windows; when you run WinQuake in a low-res
-mode, sometimes when you exit WinQuake or Alt-Tab back to the
-desktop, any open MS-DOS windows will be scrunched down to the
-size of the low-res mode.  There is no known workaround.
-
-
-Dprint in progs doesn't work
-----------------------------
-Dprint means "developer print," so it only works if the developer
-console variable is set to 1.  It was a bug in earlier versions that
-it worked even when developer was set to 0.
-
-
-Some DirectDraw modes flicker badly and look wrong
---------------------------------------------------
-Page flipping doesn't work properly in some modes on some
-systems, particularly when using some DirectDraw modes.  You
-can work around this by setting the console variable
-vid_nopageflip to 1, then setting the desired mode (note
-that the vid_nopageflip setting does not take effect until
-the next mode set after the setting is changed).  Bear in
-mind, though, that the vid_nopageflip setting is remembered
-until it is explicitly changed again, meaning that once you
-change it, it thereafter applies to all modes, even if you
-exit and restart WinQuake.
-
-
-The Windows key doesn't do anything fullscreen on Win95
--------------------------------------------------------
-True.  This is a minor bug we haven't figured out how to fix yet.
-You'll have to use Ctrl-Esc, Alt-Tab, or Alt-Esc to switch away.
-
-
-My default mode is windowed, but WQ goes fullscreen first
----------------------------------------------------------
-For internal reasons, WQ has to pick a single mode to always
-initialize when it starts up, before it sets whatever default you've
-selected.  We've chosen fullscreen mode, because that's the way most
-people will play.  If this is a problem for you, however, you can
-run WQ with the -startwindowed command-line parameter.
-
-
-Some high-resolution video modes flicker or fail to initialize
---------------------------------------------------------------
-We think these problems are all fixed, but if not, they have to
-do with triple-buffering in some modes on some DirectDraw drivers.
-If you encounter this problem, either don't use the problem modes
-or try using the -notriplebuf command-line parameter to turn off
-triple buffering.  Note, though, that turning off triple-buffering
-can reduce performance in some modes, so do this only if needed.
-
-
-Right-click doesn't work right on minimized WinQuake
-----------------------------------------------------
-If you right-click on minimized WinQuake on the task bar, the
-Close selection in the right-click menu doesn't work; you have
-to restore WQ before you can exit it.  Also, the cursor vanishes
-over the right-click menu, although it still works.
-
-
-The screen briefly blanks when you exit WQ
-------------------------------------------
-We're trying to fix this, but it's not harmful, just a mite ugly.
-
-
-QBENCH doesn't work with WinQuake
----------------------------------
-We've had a report that QBENCH doesn't work with WinQuake, but
-haven't had a chance to look into it yet.
-
-
-MWAVE sound loses focus
------------------------
-We've had a report that on a ThinkPad with MWAVE sound, WQ loses
-sound focus (and thus sound) every few seconds.
-
-
-Desktop doesn't reset to proper resolution on WQ exit
------------------------------------------------------
-We've had a report that on exiting WQ, the desktop didn't reset
-to the proper dimensions.  This may be a bug with the Matrox
-drivers, but we're not sure.  If it's a problem and newer
-drivers don't fix it, you can run -dibonly, which solves the
-problem but can cost some performance.
-
-
-Palette goes bad periodically on #9 Imagine card
-------------------------------------------------
-There's only one report of this, so maybe it's a flaky board,
-or maybe it's a driver bug.  Newer drivers might help.
-
-
-System with Packard Bell sound card III crashes on CapsLock
------------------------------------------------------------
-This appears to be the result of buggy DirectSound drivers;
--wavonly makes the problem go away.
-
-
-Dvorak keyboard mapping ignored
--------------------------------
-WQ is hardwired for QWERTY.
-
-
-Cursor messed up after running WQ
----------------------------------
-This is a Windows driver bug; the driver isn't restoring the
-cursor properly on return from fullscreen WQ to the desktop.
-Try newer drivers.
-
-
-Dedicated server runs very slowly while typing at console
----------------------------------------------------------
-When you type at a dedicated server's console, the game runs
-very slowly for everyone who's connected.
-
-
-Ctrl-Alt-Del on NT sometimes doesn't allow return to WQ
--------------------------------------------------------
-This happens on some machines while running WQ fullscreen.
-If you experience this problem, the only workaround is not
-to press Ctrl-Alt-Del while fullscreen; Alt-Tab away first.
-
-
-Many fast Alt-Tabs on Win95 sometimes disable WQ input
-------------------------------------------------------
-If you Alt-Tab fast lots of times on Win95 with WQ running
-fullscreen, sometimes you end up in fullscreen WQ, with the
-game not accepting any keyboard input (so there's no way to
-exit).  The only workaround is to not do lots of fast
-Alt-Tabs (why you'd want to, I'm not sure).
-
-
-
-----------------------------------
-| A bit about how WQ video works |
-----------------------------------
-
-WQ has the built-in ability to draw into windows (both normal, framed 
-desktop windows and fullscreen, borderless windows).  It also has
-built- in support for VGA 320x200 graphics, and supports DirectDraw,
-VESA VBE 2.0 and VESA VBE/AF (Accelerator Functions) graphics modes,
-if those are available.
-
-WQ does not require DirectDraw, but in order for DirectDraw modes to
-be available, you must have DirectDraw installed; some systems come
-with it preinstalled, but if it's not on your system, you can download
-it from http://www.microsoft.com/mediadev/download/directx.exe (the
-exact URL may vary), and install it.
-
-WQ does not require VESA VBE, but in order for VESA VBE modes to be
-available, your graphics card must be VESA VBE 2.0 or VBE/AF
-compliant; a VESA driver can either be built into the BIOS of your
-graphics card, or loadable via software.  If you don't have a VESA VBE
-driver, Scitech Display Doctor, available from Scitech Software, will
-update most graphics cards to VESA VBE 2.0 and VBE/AF.
-
-
-SciTech Display Doctor
-----------------------
-If you are having problems with your video drivers, or if you would
-like to take a shot at improving your video performance in WQ, you may
-want to try out SciTech Display Doctor (SDD).  SDD works on just about
-any graphics card and it can do several things that can make WQ run
-better on your system:
-
-1. It will update your graphics card to be compatible with VESA VBE
-2.0 and VESA VBE/AF (Accelerator Functions). These modes will usually
-give you the best performance in WQ (which is often but not always
-faster than your current performance).
-
-2. It creates low-resolution modes on your graphics card.
-Low-resolution video modes (such as 320x240, 400x300 and 512x384)
-allow you to adjust the level of detail in WQ so you can get the best
-balance between performance and image quality.
-
-The latest version of SciTech Display Doctor can be obtained from the
-following locations:
-
-www: http://www.scitechsoft.com
-ftp: ftp.scitechsoft.com
-CIS: GO SCITECH
-AOL: Keyword SciTech
-
-SciTech can be contacted at:
-
-email: [email protected]
-
-SciTech Software, Inc.
-505 Wall Street
-Chico, CA  95926-1989
-916-894-8400
-916-894-9069 FAX
-
-
-Video modes supported in Win95
-------------------------------
-What all this means is that on Win95, WQ will always be able to run in
-the following modes:
-
-1)  in a window
-2)  fullscreen 320x200 VGA mode 0x13
-3)  fullscreen high-resolution of some sort
-
-Category #3 can be any of several configurations.  On Win95, if either
-DirectDraw or VESA VBE modes are available, then all the DirectDraw
-and VESA modes will be presented as high-res choices.  (320x200 will
-always default to VGA mode 0x13.)  In the case that a given resolution
-is supported by both DirectDraw and VESA, the VESA mode will be used.
-(However, the command-line switch -nowindirect can turn off VESA modes
-entirely.)  If neither DirectDraw nor VESA modes are available, then
-high-resolution modes will be provided by using fullscreen, borderless
-windows in whatever resolutions the Windows driver supports, usually
-starting at 640x480 and going up.
-
-
-Video Modes Supported in Windows NT
------------------------------------
-NT is similar but not identical, because neither VESA VBE modes nor
-VGA mode 0x13 are available.  On NT, WQ will always be able to run in
-the following modes:
-
-1)  in a window
-2)  fullscreen high-resolution of some sort
-
-On NT, category #2 can be one of two configurations.  If DirectDraw
-modes are available, then those will be the high-res choices;
-otherwise, fullscreen, borderless windows will be used in whatever
-resolutions the driver supports, usually starting at 640x480 and going
-up.  Because there is normally no low-resolution mode such as 320x200
-or 320x240 on NT, a pseudo low-res mode is created by rendering at
-320x240, then stretching the image by doubling it in each direction
-while copying it to a 640x480 screen.  However, stretching performance
-depends on the driver, and can be slow, so sometimes 640x480 is
-actually faster than 320x240 on NT.
-
-The bottom line here is that you can generally just use the Video menu
-and pick one of the modes and be happy.  In some cases, though, you
-may need to use command-line switches (described next) to get the
-types of modes you want.  One useful tip is to go into the console and
-do vid_describemodes, which lists all the modes WQ makes available on
-your machine given the command-line switches you've used.  Each mode
-is followed by the name of the internal WQ driver that supports it, so
-you can tell which modes are DirectDraw, VESA, and so on, as follows:
-
-WINDOWED: WQ runs in a normal window
-FULLSCREEN DIB: fullscreen borderless window
-FULLSCREEN VGA8.DRV: VGA 320x200 mode
-FULLSCREEN DDRAW8.DRV: DirectDraw mode
-FULLSCREEN LINEAR8.DRV: VESA VBE 2.0+ mode
-FULLSCREEN ACCEL8.DRV: VESA VBE/AF (Accelerator Functions) mode
-                       (note that WQ does not take advantage of
-                       VBE/AF acceleration; so far as WQ is
-                       concerned VBE/AF is the same as normal VBE)
-
-You can use vid_mode from the console to set any of these modes.  So,
-for example, if you see that there are two 320x200 modes (such as one
-VGA mode 0x13, normally mode 3, and one VESA mode, normally mode 4),
-you can choose the VESA mode, which will often be faster, with
-vid_mode 4.  (You can make it the default by setting
-_vid_default_mode_win to the mode number.)
-
-There's more to the windowed modes than you might think.  320x240 is
-just what you�d expect, but 640x480 is actually rendered at 320x240
-and stretched up to 640x480, because most machines can�t handle the
-performance demands of real 640x480 rendering.  Likewise, 800x600 is a
-stretched 400x300.  Actually, though, vid_mode 2 (the 800x600 mode) is
-a user-configurable mode.  By setting the following console variables,
-you can change the characteristics of vid_mode 2:
-
-vid_config_x: width of mode 2 window
-
-vid_config_y: height of mode 2 window
-
-vid_stretch_by_2: whether to render at half-resolution in each
-direction and stretch up to the specified size in mode 2, or render at
-full resolution.
-
-After setting these variables in the console, do a vid_forcemode 2,
-and you�ll have the window you specified.  Note that after making
-these changes, the new resolution will show up as the third windowed
-mode in the Video menu.
-
-If you don't have WQ mouse play enabled in windowed mode, you can also
-go from windowed to fullscreen mode simply by clicking on the maximize
-button.  The mode switched to is controlled by the vid_fullscreen_mode
-console variable, and defaults to mode 3.
-
-Other video console commands include:
-
-vid_fullscreen: switch to the mode specified by the
-vid_fullscreen_mode console variable.
-
-vid_windowed: switch to the mode specified by the vid_windowed_mode
-console variable.
-
-Vid_fullscreen and vid_windowed can be bound to keys, so it's possible
-to flip between windowed and fullscreen with a single key press.
-
-Also, vid_minimize minimizes the WinQuake window if and only if
-WinQuake is running in a windowed mode.  You can bind a key to
-the commands "vid_windowed; wait; vid_minimize" to minimize WQ
-regardless of whether you're running in windowed or fullscreen mode.
-
-You can turn off page flipping by setting the console variable
-vid_nopageflip to 1, then setting a new mode.  (Note that the
-vid_nopageflip setting does not take effect until the next mode set.)
-Some systems run faster with page flipping turned off; also, page
-flipping does not work properly on some adapters, and vid_nopageflip
-is a workaround for this.  Note that vid_nopageflip is a persistent
-variable; it retains its setting until it is explicitly changed again,
-even across multiple WinQuake sessions.
-
-The vid_forcemode console command sets the specified mode, even if
-it's the same as the current mode (normally the mode set only happens
-if the new mode differs from the current mode).  This is generally
-useful only if you've modified the characteristics of video mode 2
-(the configurable window) while you're in mode 2, and want to force
-the new characteristics to take effect.
-
-Whenever you switch to running WinQuake in a window, the window is
-placed at the same location it was in the last time WinQuake ran
-in a window.  You can reset the window position to the upper left
-by using the -resetwinpos command-line switch.  The window position
-is stored in the vid_window_x and vid_window_y console variables.
-
-
-
--------------------------------
-| Video command-line switches |
--------------------------------
-
-The full list of video-related command-line switches is:
-
--dibonly: WQ will use only windows (both normal, framed windows on the
-desktop and fullscreen, borderless windows), not any direct hardware
-access modes such as DirectDraw or VESA modes, or even VGA 320x200
-mode.  This is the closest thing to a guaranteed-to-run fullscreen
-mode WQ has.
-
--nowindirect: WQ will not try to use VESA VBE 2.0 modes, or VBE/AF
-1.0 or later modes.  Note that if there are both DirectDraw and VESA
-modes for a given resolution, WQ will normally use the VESA mode;
--nowindirect allows DirectDraw modes to be the preferred choice for
-all resolutions except 320x200.  This can be useful if WQ is crashing
-because of a buggy VESA driver.
-
--nodirectdraw: WQ will not try to use DirectDraw modes.  This can be
-useful if WQ is crashing because of a buggy DirectDraw driver.
-
--novbeaf: WQ will not try to use VBE/AF 1.0 or later modes.
-
--startwindowed: WQ will come up in a windowed mode, without going
-fullscreen even during initialization.
-
--noforcevga: normally, WQ uses VGA mode 0x13 for the default 320x200
-mode, even if a DirectDraw or VESA 320x200 mode exists.  However,
-DirectDraw and VESA modes can be considerably faster than mode 0x13,
-because they can set up a linear framebuffer with higher memory
-bandwidth.  If you specify -noforcevga, the default 320x200 mode in
-the menu will be a DirectDraw or VESA mode if one exists.  This has no
-effect on modes selected via the console variable vid_mode, and if
-320x200 is already your video mode, -noforcevga doesn't do anything
-until you use the menu to select another mode, then select 320x200
-again.  (So if your default mode is 320x200 and you then specify
--noforcevga, switch away to some other mode and then back to 320x200
-to get the potentially faster 320x200 mode.)  The downside to this
-switch is that DirectDraw and VESA modes can cause problems in some
-systems, due to driver bugs or hardware incompatibilities; if you
-experience problems with this switch, don't use it.
-
--noautostretch: don't stretch windowed modes selected with
--startwindowed to double resolution.
-
--nofulldib: don't use fullscreen, borderless windows, even if there
-are no DirectDraw or VESA modes available.
-
--allow360: allow listing of 360-wide modes in the video mode menu.
-These are normally filtered out to make sure the menu doesn't get too
-full, which could cause high-res modes not to be displayed.
-
--notriplebuf: prevent triple-buffered page flipping (rather than double-
-buffered).  This may result in slower performance, but is a workaround
-if you encounter problems with flicker or initialization failure, which
-could possibly happen in some modes with some DirectDraw drivers.
-
-
-
-----------------------------------
-| A bit about how WQ sound works |
-----------------------------------
-
-WQ can use either DirectSound or Windows wave output to generate
-sound.  If DirectSound is available, it is used; if not, if wave sound
-is available it is used; and if neither is available, there is no
-sound.  DirectSound results in the best sound quality, and also the
-lowest-latency sound; use it if you can, because you will be happier
-with the results.  (Note, though, that no NT sound drivers yet support
-DirectSound.)  Wave sound will often have high latency, lagging the
-events that generate sound by hundreds of milliseconds on some
-machines.
-
-You can tell what kind of sound WQ uses on your system by looking at
-the startup portion of the console; you will see either "DirectSound
-initialized" or "Wave sound initialized" (neither message is printed
-if there's no sound).  Any sound failure messages will also be printed
-in the startup portion of the console.
-
-Note that WQ generates sound only when it is the active app, the one
-with the input focus.
-
-
-
--------------------------------
-| Sound command-line switches |
--------------------------------
-
-The full list of sound-related command-line switches is:
-
--wavonly: don�t use DirectSound, but use wave sound if available.
-Note that wave sound is generally faster than DirectSound, but has
-considerably greater latency.  This switch is redundant on NT, because
-all sound output on current NT drivers is wave sound.
-
--nosound: don�t output any sound.
-
--primarysound: use DirectSound primary buffer output.  This is
-generally faster than normal secondary buffer output, but does not
-work in some systems, and produces odd sound glitches on minimization
-and focus switching in other systems.  Use it at your own risk, and
-please do not report sound bugs if you're using this switch.
-
--snoforceformat: WQ will not try to force the sound hardware to 11
-KHz, 16 bits per sample.  This may be useful if DirectSound is failing
-for no apparent reason, but generally WQ will produce better sound and
-better performance if this switch is not used.
-
-
-
------------------------
-| Notes on networking |
------------------------
-
-The winsock TCP/IP driver will not cause a dial-up internet connection
-to automatically start up when Quake is started.  If you start Quake
-with it inactive, the connection will be activated when you either try
-to connect to a server or search for local servers.
-
-The local IP address will not always be known at startup.  If it is
-currently unknown the menu will display "INADDR_ANY".  This will be
-replaced with the real address when it is known.  The IP address will
-become known when you try to connect to a server, you search for local
-servers, or you start a server.
-
-For multi-homed machines (machines with more than one network adapter
-and IP adress), you can force WinQuake to bind to a specific IP
-address.  There is a command line option "-ip" that takes an IP
-address as its parameter.
-
-
-
-----------------------
-| Notes on the mouse |
-----------------------
-
-If DirectInput is installed and functioning, WinQuake can use it for
-mouse input, but does not do so automatically because DirectInput does
-not work properly on all systems.  DirectInput can be enabled via the
-command-line switch -dinput.  If DirectInput is not available or is
-not enabled, WinQuake uses the normal Windows mouse APIs instead.
-DirectInput provides slightly smoother motion; also, it tends to be
-more responsive to fast spinning motions, and we recommend that you use
-it if it works properly on your system.  You can determine if WQ uses
-DirectInput on your system when you use -dinput by checking for
-"DirectInput initialized" in the startup console text.  If not, you
-might try installing DirectX 3 (note, though, that as I write this
-there is no released DirectInput support for Windows NT, only Win95).
-
-
-
------------------------------------
-| Log of changes to documentation |
------------------------------------
-
-*** WinQuake 0.994 ***
-
-Fixed bug where in some cases involving IPX, whenever a new person
-entered the game, a current player got dumped.
-
-Added DirectInput mouse support, and the -dinput command-line to
-enable it.
-
-Added -notriplebuf to disable triple buffering to work around
-possible problems with some modes on some DirectDraw drivers.
-
-Added remembering last window position, and restoring that, rather
-than centering the window, whenever WinQuake runs in a window.
-Can be reset with the -resetwinpos command-line switch.
-
-Added the vid_minimize command, which minimizes WinQuake if and only
-if the current mode is windowed.
-
-Made it so WinQuake no longer gets suspended when Alt-Tab is used to
-switch away from a fullscreen session.  The means you can Alt-Tab
-away from fullscreen WinQuake without losing a connection to a
-Quake server.
-
-Added vid_nopageflip console variable to turn off page flipping, and
-documented page flipping problems this can be used to work around.
-
-Documented that Del-Ctrl-Alt (in that order) causes WinQuake to
-fault on Win95.
-
-Fixed the winsock TCP/IP driver so it will not cause a dial-up
-internet connection to automatically start up when Quake is started.
-If you start Quake with the internet connection already active, there
-will be no difference.  If you start Quake with it inactive, the
-connection will be activated when you either try to connect to a
-server or search for local servers.
-
-The local IP address will not always be known at startup now.  If it
-is currently unknown the menu will display "INADDR_ANY".  This
-will be replaced with the real address when it is known.  The IP
-address will become known when: you try to connect to a server,
-you search for local servers, or you start a server.
-
-For multi-homed machines (machines with more than one network
-adapter and IP adress), you can now force WinQuake to bind to a
-specific IP adress.  There is a new command line option "-ip" that
-takes an IP address as its parameter.
-
-Added vid_fullscreen_mode and ability to select that mode by
-clicking on the maximize button.  Added two commands:
-vid_fullscreen to switch to vid_fullscreen_mode, and
-vid_windowed to switch to vid_windowed mode.
-
-Changed joystick default to disabled; now it only works if the
-joystick cvar is set to 1; however, this setting now remains in
-effect permanently.  Added joystick documentation below.
-
-Documented dprint only works if developer set to 1.
-
-Documented scrunching of MS-DOS windows on Alt-Tab.
-
-Documented that NT versions earlier to 4.0 are not supported.
-
-Added DirectInput support for devices such as First Person
-Gaming's Assassin controller.  All buttons should now
-be configurable in WinQuake.
-
-Fixed bug where when low-res fullscreen DIB modes selected from
-the menu sometimes ran very slowly or produced garbled displays.
-
-Fixed bug where 1.06 and earlier save files couldn't be loaded
-by WinQuake.
-
-Removed "Net play pauses every few seconds" bug; it was determined
-not to be a bug, just an artifact of network play.
-
-Noted that even when BIOSes do have VESA 2.0 built-in, it's often
-so buggy that WinQuake crashes in faster configurations, and that
-SciTech Display Doctor is the easiest way to get reliable VESA
-support.
-
-Added note on Alt-Tab only working if Tab released first.
-
-
-*** WinQuake 0.992 ***
-
-Implemented force_centerview.
-
-Fixed backspace bug in dedicated console.
-
-Made "player entering game" messages and "say" messages visible
-in dedicated console.
-
-Added description of -heapsize (how to change default memory
-allocation).
-
-Added description of "net play pauses every few seconds" bug.
-
-Added description of "playdemo fails across multiple levels" bug.
-
-Added hooks for QHost; however, WinQuake won't work with QHost
-until a new version of QHost 3.0, which uses the hooks, is
-released.  QHost 3.0 will not work with WinQuake.
-
-Fixed bug where savegame descriptions weren't always terminated
-properly.
-
-Fixed bug where running -dedicated reset part of config.cfg to
-defaults.
-
-
-*** WinQuake 0.991 ***
-
-Fixed problem with pre-1.07 (DOS) clients connecting to WinQuake.
-
-Got rid of "Starting Quake..." dialog when running -dedicated.
-
-Added -novbeaf switch to turn off VBE/AF support in case of problems,
-and updated documentation.
-
-Corrected SciTech's U.S. Mail address in documentation.
-
-Added joystick bug decriptions and workarounds.
-
-
-
-------------------
-| Special thanks |
-------------------
-
-Special thanks for help with WinQuake to:
-
-James Barnes
-Kendall Bennett
-Raymond Chen
-John Colleran
-Andrew Goossen
-Mike Harrington
-Chris Hecker
-Todd Laney
-Scott Ludwig
-...and all the beta testers!
-
-======================================================================
-End of Document 3/21/97
-======================================================================