From 40e954779e900643564e07766962bc07ac5f9d7d Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sun, 22 Nov 2020 15:12:34 -0800
Subject: [PATCH] Resolve one last conflict in splat sorting
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
---
src/r_things.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/r_things.c b/src/r_things.c
index 2daa6984d..01c02aec4 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2656,23 +2656,11 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
if (!behind)
{
- fixed_t z1 = 0, z2 = 0;
-
- if (rover->mobj->z - viewz > 0)
- {
- z1 = rover->pz;
- z2 = r2->sprite->pz;
- }
+ // FIXME: calculate gz and gzt for splats properly and use that
+ if (rover->mobj->z < viewz)
+ infront = (r2->sprite->mobj->z >= rover->mobj->z);
else
- {
- z1 = r2->sprite->pz;
- z2 = rover->pz;
- }
-
- z1 -= viewz;
- z2 -= viewz;
-
- infront = (z1 >= z2);
+ infront = (r2->sprite->mobj->z <= rover->mobj->z);
}
}
else
--
GitLab