summaryrefslogtreecommitdiff
path: root/src/refresh/sw/poly.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2013-03-16 19:26:58 +0400
committerAndrey Nazarov <skuller@skuller.net>2013-03-20 22:04:53 +0400
commit48c4d307ec6c7a3fa75425ffd73bf9eef6bb61fb (patch)
tree80c9c8dd364b04e0bdae3ba92f649a48abe202d2 /src/refresh/sw/poly.c
parent5b90200a5fb8facbb431c789f37495ed7a6e9c10 (diff)
Use TURB_SIZE constant where appropriate.
Also force resampling of all turbulent textures to 64x64.
Diffstat (limited to 'src/refresh/sw/poly.c')
-rw-r--r--src/refresh/sw/poly.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/refresh/sw/poly.c b/src/refresh/sw/poly.c
index a31436e..6fcab6a 100644
--- a/src/refresh/sw/poly.c
+++ b/src/refresh/sw/poly.c
@@ -80,11 +80,11 @@ static void R_DrawSpanletTurbulentBlended(void)
byte *ptex;
do {
- sturb = ((s_spanletvars.s + r_turb_turb[(s_spanletvars.t >> 16) & (CYCLE - 1)]) >> 16) & 63;
- tturb = ((s_spanletvars.t + r_turb_turb[(s_spanletvars.s >> 16) & (CYCLE - 1)]) >> 16) & 63;
+ sturb = ((s_spanletvars.s + r_turb_turb[(s_spanletvars.t >> 16) & (CYCLE - 1)]) >> 16) & TURB_MASK;
+ tturb = ((s_spanletvars.t + r_turb_turb[(s_spanletvars.s >> 16) & (CYCLE - 1)]) >> 16) & TURB_MASK;
if (*s_spanletvars.pz <= (s_spanletvars.izi >> 16)) {
- ptex = s_spanletvars.pbase + (sturb) * TEX_BYTES + (tturb) * 64 * TEX_BYTES;
+ ptex = s_spanletvars.pbase + (sturb) * TEX_BYTES + (tturb) * TURB_SIZE * TEX_BYTES;
s_spanletvars.pdest[0] = (s_spanletvars.pdest[0] * r_polydesc.one_minus_alpha + ptex[2] * r_polydesc.alpha) >> 8;
s_spanletvars.pdest[1] = (s_spanletvars.pdest[1] * r_polydesc.one_minus_alpha + ptex[1] * r_polydesc.alpha) >> 8;
s_spanletvars.pdest[2] = (s_spanletvars.pdest[2] * r_polydesc.one_minus_alpha + ptex[0] * r_polydesc.alpha) >> 8;