qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove maxwarpwidth and maxwarpheight.

Browse source 
Only the sw32 renderer even tried to use them, and they didn't get set
properly. This fixes JohnnyonFlame's waterwarp issue.
This commit is contained in:
Bill Currie 2014-02-02 14:40:39 +09:00
parent 2cd59c962c
commit 9d71d9bb7a
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/vid.h
View file

@ -59,8 +59,6 @@ typedef struct {
int conrowbytes;
int conwidth;
int conheight;
int maxwarpwidth;
int maxwarpheight;
byte *direct; // direct drawing to framebuffer, if not
// NULL
int (*surf_cache_size)(int width, int height);

16
libs/video/renderer/sw32/sw32_rmisc.c
View file

@ -248,8 +248,8 @@ sw32_R_SetupFrame (void)
if ((sw32_r_dowarp != sw32_r_dowarpold) || sw32_r_viewchanged) {
if (sw32_r_dowarp) {
if ((vid.width <= vid.maxwarpwidth)
&& (vid.height <= vid.maxwarpheight)) {
if ((vid.width <= WARP_WIDTH)
&& (vid.height <= WARP_HEIGHT)) {
vrect.x = 0;
vrect.y = 0;
vrect.width = vid.width;
@ -261,14 +261,14 @@ sw32_R_SetupFrame (void)
w = vid.width;
h = vid.height;
if (w > vid.maxwarpwidth) {
h *= (float) vid.maxwarpwidth / w;
w = vid.maxwarpwidth;
if (w > WARP_WIDTH) {
h *= (float) WARP_WIDTH / w;
w = WARP_WIDTH;
}
if (h > vid.maxwarpheight) {
h = vid.maxwarpheight;
w *= (float) vid.maxwarpheight / h;
if (h > WARP_HEIGHT) {
h = WARP_HEIGHT;
w *= (float) WARP_HEIGHT / h;
}
vrect.x = 0;