From 2dca87b80a28db71363dd209997ac475b01b119d Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 4 Mar 2012 20:13:34 +0000 Subject: [PATCH] Make 'double ghoriz' static in polymost.c. git-svn-id: https://svn.eduke32.com/eduke32@2409 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/polymost.h | 2 +- polymer/eduke32/build/src/polymost.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/build/include/polymost.h b/polymer/eduke32/build/include/polymost.h index 714e5797b..c7da2d488 100644 --- a/polymer/eduke32/build/include/polymost.h +++ b/polymer/eduke32/build/include/polymost.h @@ -111,7 +111,7 @@ pthtyp *gltexcache(int32_t dapicnum, int32_t dapalnum, int32_t dameth); extern int32_t globalnoeffect; extern int32_t drawingskybox; -extern double gyxscale, gxyaspect, /*gviewxrange,*/ ghalfx, grhalfxdown10, ghoriz; +extern double gyxscale, gxyaspect, /*gviewxrange,*/ ghalfx, grhalfxdown10 /*, ghoriz*/; #define FOGSCALE 0.0000768 diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c index 16d3aa3bd..879937632 100644 --- a/polymer/eduke32/build/src/polymost.c +++ b/polymer/eduke32/build/src/polymost.c @@ -115,8 +115,8 @@ int32_t shadescale_unbounded = 0; int32_t r_usenewshading = 1; -static double gviewxrange; -double gyxscale, gxyaspect, ghalfx, grhalfxdown10, grhalfxdown10x, ghoriz; +static double gviewxrange, ghoriz; +double gyxscale, gxyaspect, ghalfx, grhalfxdown10, grhalfxdown10x; double gcosang, gsinang, gcosang2, gsinang2; double gchang, gshang, gctang, gstang, gvisibility; float gtang = 0.0; @@ -4446,7 +4446,9 @@ void polymost_drawrooms() } #endif - ox2 = (searchx-ghalfx)/ratio; oy2 = (searchy-ghoriz)/ ratio; oz2 = ghalfx; + ox2 = (searchx-ghalfx)/ratio; + oy2 = (searchy-ghoriz)/ratio; // ghoriz is (ydimen>>1) here + oz2 = ghalfx; //Tilt rotation ox = ox2*gctang + oy2*gstang;