accommodate square pixel aspect tiles for rotatesprite

Used for situations where the tile data represents a 1:1 pixel aspect
and has to be rendered by rotatesprite(). Apply `|256` to existing
`dastat&(2|8)` and the aspect correction calculation will be skipped.
Makes the svga tiles in TekWar properly cover the 4:3 frame.

Author: jonof

include/build.h

@@ -422,7 +422,7 @@ void   drawmasks(void);
 void   clearview(int dacol);
 void   clearallviews(int dacol);
 void   drawmapview(int dax, int day, int zoome, short ang);
-void   rotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade, unsigned char dapalnum, unsigned char dastat, int cx1, int cy1, int cx2, int cy2);
+void   rotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade, unsigned char dapalnum, unsigned short dastat, int cx1, int cy1, int cx2, int cy2);
 void   drawline256(int x1, int y1, int x2, int y2, unsigned char col);
 void   printext256(int xpos, int ypos, short col, short backcol, const char *name, char fontsize);
 

src/engine.c

@@ -536,7 +536,8 @@ typedef struct
 	int sx, sy, z;
 	short a, picnum;
 	signed char dashade;
-	unsigned char dapalnum, dastat, pagesleft;
+	unsigned char dapalnum, pagesleft;
+	unsigned short dastat;
 	int cx1, cy1, cx2, cy2;
 	int uniqid;	//JF extension
 } permfifotype;
@@ -4374,7 +4375,7 @@ static int clippoly4(int cx1, int cy1, int cx2, int cy2)
 //
 	//JBF 20031206: Thanks to Ken's hunting, s/(rx1|ry1|rx2|ry2)/n\1/ in this function
 static void dorotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade,
-	unsigned char dapalnum, unsigned char dastat, int cx1, int cy1, int cx2, int cy2, int uniqid)
+	unsigned char dapalnum, unsigned short dastat, int cx1, int cy1, int cx2, int cy2, int uniqid)
 {
 	int cosang, sinang, v, nextv, dax1, dax2, oy, bx, by;
 	int x, y, x1, y1, x2, y2, gx1, gy1, iv;
@@ -4438,11 +4439,16 @@ static void dorotatesprite(int sx, int sy, int z, short a, short picnum, signed
 
 	xv = mulscale14(cosang,z);
 	yv = mulscale14(sinang,z);
-	if (((dastat&2) != 0) || ((dastat&8) == 0)) //Don't aspect unscaled perms
+	if (((dastat&2) != 0 && (dastat&256) == 0) || ((dastat&8) == 0)) //Don't aspect unscaled perms
 	{
 		xv2 = mulscale16(xv,xyaspect);
 		yv2 = mulscale16(yv,xyaspect);
 	}
+	else if (pixelaspect == 65536 && ((dastat&2) && (dastat&256))) //Skew 1:1 to 1.2:1 aspect
+	{
+		xv2 = mulscale16(xv,78643);
+		yv2 = mulscale16(yv,78643);
+	}
 	else
 	{
 		xv2 = xv;
@@ -4502,11 +4508,16 @@ static void dorotatesprite(int sx, int sy, int z, short a, short picnum, signed
 	iv = divscale32(1L,z);
 	xv = mulscale14(sinang,iv);
 	yv = mulscale14(cosang,iv);
-	if (((dastat&2) != 0) || ((dastat&8) == 0)) //Don't aspect unscaled perms
+	if (((dastat&2) != 0 && (dastat&256) == 0) || ((dastat&8) == 0)) //Don't aspect unscaled perms
 	{
 		yv2 = mulscale16(-xv,yxaspect);
 		xv2 = mulscale16(yv,yxaspect);
 	}
+	else if (pixelaspect == 65536 && ((dastat&2) && (dastat&256))) //Skew 1:1 to 1.2:1 aspect
+	{
+		yv2 = mulscale16(-xv,54613);
+		xv2 = mulscale16(yv,54613);
+	}
 	else
 	{
 		yv2 = -xv;
@@ -9948,7 +9959,7 @@ void flushperms(void)
 // rotatesprite
 //
 void rotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade,
-	unsigned char dapalnum, unsigned char dastat, int cx1, int cy1, int cx2, int cy2)
+	unsigned char dapalnum, unsigned short dastat, int cx1, int cy1, int cx2, int cy2)
 {
 	int i, gap = -1;
 	permfifotype *per, *per2;

src/polymost.c

@@ -3715,9 +3715,10 @@ void polymost_drawsprite (int snum)
 	//dastat&32   1:reverse translucence
 	//dastat&64   1:non-masked, 0:masked
 	//dastat&128  1:draw all pages (permanent)
+	//dastat&256  1:one-to-one pixel aspect (when dastat&2)
 	//cx1,...     clip window (actual screen coords)
 void polymost_dorotatesprite (int sx, int sy, int z, short a, short picnum,
-	signed char dashade, unsigned char dapalnum, unsigned char dastat, int cx1, int cy1, int cx2, int cy2, int uniqid)
+	signed char dashade, unsigned char dapalnum, unsigned short dastat, int cx1, int cy1, int cx2, int cy2, int uniqid)
 {
 	int n, nn, x, zz, xoff, yoff, xsiz, ysiz, method;
 	int ogpicnum, ogshade, ogpal, oxdimen, oydimen;
@@ -3768,7 +3769,7 @@ void polymost_dorotatesprite (int sx, int sy, int z, short a, short picnum,
 					d = (double)z/(65536.0*16384.0);
 					cosang2 = cosang = (double)sintable[(a+512)&2047]*d;
 					sinang2 = sinang = (double)sintable[a&2047]*d;
-					if ((dastat&2) || (!(dastat&8))) //Don't aspect unscaled perms
+					if (((dastat&2) && !(dastat&256)) || (!(dastat&8))) //Don't aspect unscaled perms
 						{ d = (double)xyaspect/65536.0; cosang2 *= d; sinang2 *= d; }
 					fx += -(double)xoff*cosang2+ (double)yoff*sinang2;
 					fy += -(double)xoff*sinang - (double)yoff*cosang;
@@ -3902,8 +3903,10 @@ void polymost_dorotatesprite (int sx, int sy, int z, short a, short picnum,
 	d = (double)z/(65536.0*16384.0);
 	cosang2 = cosang = (double)sintable[(a+512)&2047]*d;
 	sinang2 = sinang = (double)sintable[a&2047]*d;
-	if ((dastat&2) || (!(dastat&8))) //Don't aspect unscaled perms
+	if (((dastat&2) && !(dastat&256)) || (!(dastat&8))) //Don't aspect unscaled perms
 		{ d = (double)xyaspect/65536.0; cosang2 *= d; sinang2 *= d; }
+	else if (pixelaspect == 65536 && ((dastat&2) && (dastat&256))) //Skew 1:1 to 1.2:1 aspect
+		{ d = 1.2; cosang2 *= d; sinang2 *= d; }
 	px[0] = (double)sx/65536.0 - (double)xoff*cosang2+ (double)yoff*sinang2;
 	py[0] = (double)sy/65536.0 - (double)xoff*sinang - (double)yoff*cosang;
 	px[1] = px[0] + (double)xsiz*cosang2;

src/polymost_priv.h

@@ -127,5 +127,5 @@ void polymost_drawrooms (void);
 void polymost_drawmaskwall (int damaskwallcnt);
 void polymost_drawsprite (int snum);
 void polymost_dorotatesprite (int sx, int sy, int z, short a, short picnum,
-    signed char dashade, unsigned char dapalnum, unsigned char dastat, int cx1, int cy1, int cx2, int cy2, int uniqid);
+    signed char dashade, unsigned char dapalnum, unsigned short dastat, int cx1, int cy1, int cx2, int cy2, int uniqid);
 void polymost_initosdfuncs(void);