diff --git a/src/r_debug.hpp b/src/r_debug.hpp deleted file mode 100644 index a62ded790..000000000 --- a/src/r_debug.hpp +++ /dev/null @@ -1,25 +0,0 @@ -// DR. ROBOTNIK'S RING RACERS -//----------------------------------------------------------------------------- -// Copyright (C) 2024 by James Robert Roman. -// Copyright (C) 2024 by Kart Krew. -// -// This program is free software distributed under the -// terms of the GNU General Public License, version 2. -// See the 'LICENSE' file for more details. -//----------------------------------------------------------------------------- - -#ifndef r_debug_hpp -#define r_debug_hpp - -#include "doomtype.h" - -namespace srb2::r_debug -{ - -void add_texture_to_frame_list(INT32 texnum); -void clear_frame_list(); -void draw_frame_list(); - -}; // namespace srb2::r_debug - -#endif/*r_debug_hpp*/ diff --git a/src/r_plane.cpp b/src/r_plane.cpp index c7f5a59ae..0e9006cc0 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -743,8 +743,6 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc)(drawcolumndata_t*), bo } INT32 angle = (pl->viewangle + xtoviewangle[viewssnum][x + i])>>ANGLETOSKYSHIFT; - angle -= (skytextureoffset >> FRACBITS); - dc.iscale = FixedMul(skyscale[viewssnum], FINECOSINE(xtoviewangle[viewssnum][x + i]>>ANGLETOFINESHIFT)); dc.x = x + i; dc.source = diff --git a/src/r_sky.c b/src/r_sky.c index a69ab4c46..5510c36da 100644 --- a/src/r_sky.c +++ b/src/r_sky.c @@ -37,14 +37,10 @@ INT32 skyflatnum; */ INT32 skytexture; -/** \brief the horizon line of the sky texture +/** \brief the horizon line in a 256x128 sky texture */ INT32 skytexturemid; -/** \brief the x offset of the sky texture -*/ -INT32 skytextureoffset; - /** \brief the scale of the sky */ fixed_t skyscale[MAXSPLITSCREENPLAYERS]; @@ -65,19 +61,8 @@ char globallevelskytexture[9]; */ void R_SetupSkyDraw(void) { - // the horizon line in the sky texture - skytexturemid = (textures[skytexture]->height / 2) << FRACBITS; - skytextureoffset = 0; - - if (textures[skytexture]->type == TEXTURETYPE_SINGLEPATCH) - { - // Sal: Allow for sky offsets - texpatch_t *const tex_patch = &textures[skytexture]->patches[0]; - patch_t *patch = W_CachePatchNumPwad(tex_patch->wad, tex_patch->lump, PU_CACHE); - - skytexturemid += (patch->topoffset << FRACBITS); - skytextureoffset += (patch->leftoffset << FRACBITS); - } + // the horizon line in a 256x128 sky texture + skytexturemid = (textures[skytexture]->height/2)<