diff --git a/SRB2.cbp b/SRB2.cbp
index b4cf543db..e5be4f5e0 100644
--- a/SRB2.cbp
+++ b/SRB2.cbp
@@ -1726,11 +1726,6 @@ HW3SOUND for 3D hardware sound support
-
-
-
-
-
diff --git a/Srb2.dev b/Srb2.dev
index 8bd36cf49..204021263 100644
--- a/Srb2.dev
+++ b/Srb2.dev
@@ -773,16 +773,6 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
-[Unit79]
-FileName=src\r_draw16.c
-Folder=R_Rend
-Compile=0
-CompileCpp=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
[Unit80]
FileName=src\r_draw8.c
Folder=R_Rend
diff --git a/src/r_draw.c b/src/r_draw.c
index f7d1fb413..883ef3e46 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -772,11 +772,3 @@ void R_DrawViewBorder(void)
// ==========================================================================
#include "r_draw8.c"
-
-// ==========================================================================
-// INCLUDE 16bpp DRAWING CODE HERE
-// ==========================================================================
-
-#ifdef HIGHCOLOR
-#include "r_draw16.c"
-#endif
diff --git a/src/r_draw.h b/src/r_draw.h
index 39587a696..6e5758dd5 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -189,17 +189,5 @@ void R_DrawFogSpan_8(void);
void R_DrawFogColumn_8(void);
void R_DrawColumnShadowed_8(void);
-// ------------------
-// 16bpp DRAWING CODE
-// ------------------
-
-#ifdef HIGHCOLOR
-void R_DrawColumn_16(void);
-void R_DrawWallColumn_16(void);
-void R_DrawTranslucentColumn_16(void);
-void R_DrawTranslatedColumn_16(void);
-void R_DrawSpan_16(void);
-#endif
-
// =========================================================================
#endif // __R_DRAW__
diff --git a/src/r_draw16.c b/src/r_draw16.c
deleted file mode 100644
index 918dd356c..000000000
--- a/src/r_draw16.c
+++ /dev/null
@@ -1,214 +0,0 @@
-// SONIC ROBO BLAST 2
-//-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2018 by Sonic Team Junior.
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-/// \file r_draw16.c
-/// \brief 16bpp (HIGHCOLOR) span/column drawer functions
-/// \note no includes because this is included as part of r_draw.c
-
-// ==========================================================================
-// COLUMNS
-// ==========================================================================
-
-/// \brief kick out the upper bit of each component (we're in 5 : 5 : 5)
-#define HIMASK1 0x7bde
-
-/** \brief The R_DrawColumn_16 function
- standard upto 128high posts column drawer
-*/
-void R_DrawColumn_16(void)
-{
- INT32 count;
- INT16 *dest;
- fixed_t frac, fracstep;
-
- count = dc_yh - dc_yl + 1;
-
- // Zero length, column does not exceed a pixel.
- if (count <= 0)
- return;
-
-#ifdef RANGECHECK
- if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
- I_Error("R_DrawColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
- // Framebuffer destination address.
- // Use ylookup LUT to avoid multiply with ScreenWidth.
- // Use columnofs LUT for subwindows?
- dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
- // Determine scaling, which is the only mapping to be done.
- fracstep = dc_iscale;
- frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
- // Inner loop that does the actual texture mapping, e.g. a DDA-like scaling.
- // This is as fast as it gets.
-
- do
- {
- // Re-map color indices from wall texture column using a lighting/special effects LUT.
- *dest = hicolormaps[((INT16 *)(void *)dc_source)[(frac>>FRACBITS)&127]>>1];
-
- dest += vid.width;
- frac += fracstep;
- } while (--count);
-}
-
-/** \brief The R_DrawWallColumn_16 function
- LAME cutnpaste: same as R_DrawColumn_16 but wraps around 256
- instead of 128 for the tall sky textures (256x240)
-*/
-void R_DrawWallColumn_16(void)
-{
- INT32 count;
- INT16 *dest;
- fixed_t frac, fracstep;
-
- count = dc_yh - dc_yl + 1;
-
- // Zero length, column does not exceed a pixel.
- if (count <= 0)
- return;
-
-#ifdef RANGECHECK
- if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
- I_Error("R_DrawWallColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
- dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
- fracstep = dc_iscale;
- frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
- do
- {
- *dest = hicolormaps[((INT16 *)(void *)dc_source)[(frac>>FRACBITS)&255]>>1];
-
- dest += vid.width;
- frac += fracstep;
- } while (--count);
-}
-
-/** \brief The R_DrawTranslucentColumn_16 function
- LAME cutnpaste: same as R_DrawColumn_16 but does
- translucent
-*/
-void R_DrawTranslucentColumn_16(void)
-{
- INT32 count;
- INT16 *dest;
- fixed_t frac, fracstep;
-
- // check out coords for src*
- if ((dc_yl < 0) || (dc_x >= vid.width))
- return;
-
- count = dc_yh - dc_yl;
- if (count < 0)
- return;
-
-#ifdef RANGECHECK
- if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
- I_Error("R_DrawTranslucentColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
- // FIXME. As above.
- dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
- // Looks familiar.
- fracstep = dc_iscale;
- frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
- // Here we do an additional index re-mapping.
- do
- {
- *dest = (INT16)((INT16)((color8to16[dc_source[frac>>FRACBITS]]>>1) & 0x39ce)
- + (INT16)(((*dest & HIMASK1)) & 0x7fff));
-
- dest += vid.width;
- frac += fracstep;
- } while (count--);
-}
-
-/** \brief The R_DrawTranslatedColumn_16 function
- ?
-*/
-void R_DrawTranslatedColumn_16(void)
-{
- INT32 count;
- INT16 *dest;
- fixed_t frac, fracstep;
-
- count = dc_yh - dc_yl;
- if (count < 0)
- return;
-
-#ifdef RANGECHECK
- if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
- I_Error("R_DrawTranslatedColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
- dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
- // Looks familiar.
- fracstep = dc_iscale;
- frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
- // Here we do an additional index re-mapping.
- do
- {
- *dest = color8to16[dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]]];
- dest += vid.width;
-
- frac += fracstep;
- } while (count--);
-}
-
-// ==========================================================================
-// SPANS
-// ==========================================================================
-
-/** \brief The R_*_16 function
- Draws the actual span.
-*/
-void R_DrawSpan_16(void)
-{
- fixed_t xfrac, yfrac;
- INT16 *dest;
- INT32 count, spot;
-
-#ifdef RANGECHECK
- if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= vid.width || ds_y > vid.height)
- I_Error("R_DrawSpan_16: %d to %d at %d", ds_x1, ds_x2, ds_y);
-#endif
-
- xfrac = ds_xfrac;
- yfrac = ds_yfrac;
-
- dest = (INT16 *)(void *)(ylookup[ds_y] + columnofs[ds_x1]);
-
- // We do not check for zero spans here?
- count = ds_x2 - ds_x1;
-
- if (count <= 0) // We do now!
- return;
-
- do
- {
- // Current texture index in u, v.
- spot = ((yfrac>>(16-6))&(63*64)) + ((xfrac>>16)&63);
-
- // Lookup pixel from flat texture tile, re-index using light/colormap.
- *dest++ = hicolormaps[((INT16 *)(void *)ds_source)[spot]>>1];
-
- // Next step in u, v.
- xfrac += ds_xstep;
- yfrac += ds_ystep;
- } while (count--);
-}
diff --git a/src/sdl/Srb2SDL.dsp b/src/sdl/Srb2SDL.dsp
index 67400625a..47ede4126 100644
--- a/src/sdl/Srb2SDL.dsp
+++ b/src/sdl/Srb2SDL.dsp
@@ -867,11 +867,6 @@ SOURCE=..\r_draw.h
# End Source File
# Begin Source File
-SOURCE=..\r_draw16.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
SOURCE=..\r_draw8.c
# PROP Exclude_From_Build 1
# End Source File
diff --git a/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj b/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
index 24f05a04c..662885c1d 100644
--- a/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
@@ -1540,13 +1540,6 @@
path = ../../r_draw8.c;
refType = 2;
};
- 84177789085A111B000C01D8 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- name = r_draw16.c;
- path = ../../r_draw16.c;
- refType = 2;
- };
8417778A085A111B000C01D8 = {
fileEncoding = 30;
isa = PBXFileReference;
diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
index c95642240..bbdbff9ed 100644
--- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -283,7 +283,6 @@
1E44AF570B67CEC100BAD059 /* r_defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = r_defs.h; path = ../../r_defs.h; sourceTree = SOURCE_ROOT; };
1E44AF580B67CEC100BAD059 /* r_data.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_data.c; path = ../../r_data.c; sourceTree = SOURCE_ROOT; };
1E44AF590B67CEC100BAD059 /* r_draw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_draw.c; path = ../../r_draw.c; sourceTree = SOURCE_ROOT; };
- 1E44AF5A0B67CEC100BAD059 /* r_draw16.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_draw16.c; path = ../../r_draw16.c; sourceTree = SOURCE_ROOT; };
1E44AF5B0B67CEC100BAD059 /* r_draw8.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_draw8.c; path = ../../r_draw8.c; sourceTree = SOURCE_ROOT; };
1E44AF5C0B67CEC100BAD059 /* r_main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_main.c; path = ../../r_main.c; sourceTree = SOURCE_ROOT; };
1E44AF5D0B67CEC100BAD059 /* r_main.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = r_main.h; path = ../../r_main.h; sourceTree = SOURCE_ROOT; };
@@ -732,7 +731,6 @@
1E44AF570B67CEC100BAD059 /* r_defs.h */,
1E44AF580B67CEC100BAD059 /* r_data.c */,
1E44AF590B67CEC100BAD059 /* r_draw.c */,
- 1E44AF5A0B67CEC100BAD059 /* r_draw16.c */,
1E44AF5B0B67CEC100BAD059 /* r_draw8.c */,
1E44AF5C0B67CEC100BAD059 /* r_main.c */,
1E44AF5D0B67CEC100BAD059 /* r_main.h */,