From cd8836227f9c100812f5b2641c9511d628a96dde Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 4 Mar 2012 20:15:04 +0000
Subject: [PATCH] Polymost: with r_parallaxskypanning=1, clamp the sky at a
 constant horizon.

See E4L1 for what this means.

git-svn-id: https://svn.eduke32.com/eduke32@2415 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/polymost.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c
index 879937632..3180b3786 100644
--- a/polymer/eduke32/build/src/polymost.c
+++ b/polymer/eduke32/build/src/polymost.c
@@ -3442,8 +3442,6 @@ static void polymost_drawalls(int32_t bunch)
                 vv[1] = dd[0]*((double)xdimscale*(double)viewingrange)/(65536.0*65536.0);
                 vv[0] = dd[0]*((double)((tilesizy[globalpicnum]>>1)+parallaxyoffs)) - vv[1]*ghoriz;
                 i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesizy[globalpicnum]) i += i;
-                vv[0] += dd[0]*((double)((r_parallaxskypanning)?sec->floorypanning:0))*((double)i)/256.0;
-
 
                 //Hack to draw black rectangle below sky when looking down...
                 gdx = 0; gdy = gxyaspect / 262144.0; gdo = -ghoriz*gdy;
@@ -3464,6 +3462,8 @@ static void polymost_drawalls(int32_t bunch)
                 }
                 else domost(x0,fy0,x1,fy1);
 
+                if (r_parallaxskypanning)
+                    vv[0] += dd[0]*((double)sec->floorypanning)*((double)i)/256.0;
 
                 gdx = 0; gdy = 0; gdo = dd[0];
                 gux = gdo*(t*((double)xdimscale)*((double)yxaspect)*((double)viewingrange))/(16384.0*65536.0*65536.0*5.0*1024.0);
@@ -3734,13 +3734,13 @@ static void polymost_drawalls(int32_t bunch)
                 vv[1] = dd[0]*((double)xdimscale*(double)viewingrange)/(65536.0*65536.0);
                 vv[0] = dd[0]*((double)((tilesizy[globalpicnum]>>1)+parallaxyoffs)) - vv[1]*ghoriz;
                 i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesizy[globalpicnum]) i += i;
-                vv[0] += dd[0]*((double)((r_parallaxskypanning)?sec->ceilingypanning:0))*((double)i)/256.0;
 
                 //Hack to draw black rectangle below sky when looking down...
                 gdx = 0; gdy = gxyaspect / -262144.0; gdo = -ghoriz*gdy;
                 gux = 0; guy = 0; guo = 0;
                 gvx = 0; gvy = 0; gvo = 0;
                 oy = -vv[0]/vv[1];
+
                 if ((oy < cy0) && (oy < cy1)) domost(x1,oy,x0,oy);
                 else if ((oy < cy0) != (oy < cy1))
                 {
@@ -3756,6 +3756,9 @@ static void polymost_drawalls(int32_t bunch)
                 }
                 else domost(x1,cy1,x0,cy0);
 
+                if (r_parallaxskypanning)
+                    vv[0] += dd[0]*((double)sec->ceilingypanning)*((double)i)/256.0;
+
                 gdx = 0; gdy = 0; gdo = dd[0];
                 gux = gdo*(t*((double)xdimscale)*((double)yxaspect)*((double)viewingrange))/(16384.0*65536.0*65536.0*5.0*1024.0);
                 guy = 0; //guo calculated later