From 7d5bda709aa0fa93b2c31bb51345c9ac63ad8e66 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 20 Aug 2016 03:02:40 +0100
Subject: [PATCH] Sorting is fixed! Turns out rover isn't a FOF, it's another
sprite. Thanks @RedEnchilada for noticing this oversight!!
http://gfycat.com/EsteemedPleasedDuck <-- so great
---
src/r_things.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/r_things.c b/src/r_things.c
index 698e24b0da..e1527d6afd 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1962,7 +1962,7 @@ static void R_CreateDrawNodes(void)
for (i = x1; i <= x2; i++)
{
- if (r2->seg->frontscale[i] > rover->scale)
+ if (r2->seg->frontscale[i] > rover->sortscale)
break;
}
if (i > x2)
@@ -1981,10 +1981,10 @@ static void R_CreateDrawNodes(void)
continue;
scale = r2->thickseg->scale1 > r2->thickseg->scale2 ? r2->thickseg->scale1 : r2->thickseg->scale2;
- if (scale <= rover->scale)
+ if (scale <= rover->sortscale)
continue;
scale = r2->thickseg->scale1 + (r2->thickseg->scalestep * (sintersect - r2->thickseg->x1));
- if (scale <= rover->scale)
+ if (scale <= rover->sortscale)
continue;
#ifdef ESLOPE
@@ -2034,11 +2034,11 @@ static void R_CreateDrawNodes(void)
continue;
scale = r2->seg->scale1 > r2->seg->scale2 ? r2->seg->scale1 : r2->seg->scale2;
- if (scale <= rover->scale)
+ if (scale <= rover->sortscale)
continue;
scale = r2->seg->scale1 + (r2->seg->scalestep * (sintersect - r2->seg->x1));
- if (rover->scale < scale)
+ if (rover->sortscale < scale)
{
entry = R_CreateDrawNode(NULL);
(entry->prev = r2->prev)->next = entry;
@@ -2054,8 +2054,8 @@ static void R_CreateDrawNodes(void)
if (r2->sprite->szt > rover->sz || r2->sprite->sz < rover->szt)
continue;
- if (r2->sprite->sortscale > rover->scale
- || (r2->sprite->sortscale == rover->scale && r2->sprite->dispoffset > rover->dispoffset))
+ if (r2->sprite->sortscale > rover->sortscale
+ || (r2->sprite->sortscale == rover->sortscale && r2->sprite->dispoffset > rover->dispoffset))
{
entry = R_CreateDrawNode(NULL);
(entry->prev = r2->prev)->next = entry;
--
GitLab