diff --git a/src/textures/hires/hqresize.cpp b/src/textures/hires/hqresize.cpp index 6bcb2d8053..01f310ed2f 100644 --- a/src/textures/hires/hqresize.cpp +++ b/src/textures/hires/hqresize.cpp @@ -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; diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 4f5e1dd134..6ce6fcf23e 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -2881,6 +2881,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"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index a40c8b2df2..f210af4777 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -2188,6 +2188,8 @@ OptionValue "HqResizeModes" 20, "$OPTVAL_NORMAL2X" 21, "$OPTVAL_NORMAL3X" 22, "$OPTVAL_NORMAL4X" + 23, "$OPTVAL_NORMAL5X" + 24, "$OPTVAL_NORMAL6X" } OptionValue "HqResizeModesNoMMX" diff --git a/wadsrc/static/zscript/menu/optionmenu.txt b/wadsrc/static/zscript/menu/optionmenu.txt index ede7c02178..3e18537350 100644 --- a/wadsrc/static/zscript/menu/optionmenu.txt +++ b/wadsrc/static/zscript/menu/optionmenu.txt @@ -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; }