zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2018-10-05 04:36:27 +02:00
commit 5e04678965
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/textures/hires/hqresize.cpp
View file

@ -47,7 +47,7 @@
CUSTOM_CVAR(Int, gl_texture_hqresize, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{
if (self < 0 || self > 22)
if (self < 0 || self > 24)
{
self = 0;
}
@ -439,6 +439,10 @@ unsigned char *FTexture::CreateUpsampledTextureBuffer (unsigned char *inputBuffe
return normalNxHelper( &normalNx, 3, inputBuffer, inWidth, inHeight, outWidth, outHeight );
case 22:
return normalNxHelper( &normalNx, 4, inputBuffer, inWidth, inHeight, outWidth, outHeight );
case 23:
return normalNxHelper( &normalNx, 5, inputBuffer, inWidth, inHeight, outWidth, outHeight );
case 24:
return normalNxHelper( &normalNx, 6, inputBuffer, inWidth, inHeight, outWidth, outHeight );
}
}
return inputBuffer;

2
wadsrc/static/language.enu
View file

@ -2883,6 +2883,8 @@ OPTVAL_SCALE4X = "Scale4x";
OPTVAL_NORMAL2X = "Normal2x";
OPTVAL_NORMAL3X = "Normal3x";
OPTVAL_NORMAL4X = "Normal4x";
OPTVAL_NORMAL5X = "Normal5x";
OPTVAL_NORMAL6X = "Normal6x";
OPTVAL_HQ2X = "hq2x";
OPTVAL_HQ3X = "hq3x";
OPTVAL_HQ4X = "hq4x";

2
wadsrc/static/menudef.txt
View file

@ -2188,6 +2188,8 @@ OptionValue "HqResizeModes"
20, "$OPTVAL_NORMAL2X"
21, "$OPTVAL_NORMAL3X"
22, "$OPTVAL_NORMAL4X"
23, "$OPTVAL_NORMAL5X"
24, "$OPTVAL_NORMAL6X"
}
OptionValue "HqResizeModesNoMMX"

2
wadsrc/static/zscript/menu/optionmenu.txt
View file

@ -595,10 +595,12 @@ class GLTextureGLOptions : OptionMenu
break;
case 16:
case 18:
case 23:
multiplier = 25;
break;
case 17:
case 19:
case 24:
multiplier = 36;
break;
}