From ea505f942872e25e30ea1721549b6fee065e7ace Mon Sep 17 00:00:00 2001 From: yamamama Date: Thu, 5 Mar 2026 23:47:28 -0500 Subject: [PATCH] Some quick cleanup --- src/r_draw_column.cpp | 6 ------ src/r_things.cpp | 11 ----------- 2 files changed, 17 deletions(-) diff --git a/src/r_draw_column.cpp b/src/r_draw_column.cpp index 65ba577bf..5aa3b9195 100644 --- a/src/r_draw_column.cpp +++ b/src/r_draw_column.cpp @@ -704,12 +704,6 @@ static void R_DrawAffineColumnTemplate(drawcolumndata_t *dc) R_DrawAffineColumnTemplate(dc); \ } -#define DEFINE_AFFINE_COLUMN_COMBO(name, flags) \ - DEFINE_AFFINE_COLUMN_FUNC(name, flags|DC_DIRECT) \ - DEFINE_AFFINE_COLUMN_FUNC(name ## _Brightmap, flags|DC_DIRECT|DC_BRIGHTMAP) \ - DEFINE_AFFINE_COLUMN_FUNC(name ## _Flush, flags) - -// Replace with DEFINE_AFFINE_COLUMN_COMBO down the line #define DEFINE_AFFINE_COLUMN_SETUP(name, flags) \ DEFINE_AFFINE_COLUMN_FUNC(name, flags|DC_DIRECT) \ DEFINE_AFFINE_COLUMN_FUNC(name ## _Brightmap, flags|DC_DIRECT|DC_BRIGHTMAP) diff --git a/src/r_things.cpp b/src/r_things.cpp index ab59b994f..f6c06d746 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1538,14 +1538,6 @@ static void R_SplitSprite(vissprite_t *sprite) newsprite->gzt = sprite->gz; - /*if (sprite->cut & SC_AFFINE) - { - // Affines: Fix splitting alignment errors by applying a pixel offset - fixed_t szt_diff = (newsprite->sz - cutfrac + 9) << FRACBITS; - newsprite->affine.offset.y = std::min(0, -((sprite->affine.bounds.ylen * FRACUNIT) - szt_diff)); - }*/ - - sprite->sz = cutfrac; newsprite->szt = (INT16)(sprite->sz - 1); @@ -2421,9 +2413,6 @@ static void R_ProjectSprite(mobj_t *thing) spr_width = (affine_bounds.xlen * FRACUNIT); spr_offset = (affine_bounds.xleft * FRACUNIT) - FLOAT_TO_FIXED(affine_pivotoffsetdiff.x); - //spr_height = (affine_bounds.ylen * FRACUNIT); - //spr_topoffset = (affine_bounds.yup * FRACUNIT); - spritexscale = FRACUNIT; spriteyscale = FRACUNIT; }