From bc0a55de41787a70c255334a33923e98127950ea Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 17 Oct 2020 12:06:58 +0200
Subject: [PATCH] - backend update.

---
 source/common/console/c_cvars.cpp         | 20 ++++++++++++++++++++
 source/common/filesystem/file_ssi.cpp     |  8 ++++----
 source/common/platform/win32/i_main.cpp   |  2 +-
 source/common/textures/gametexture.h      |  3 ++-
 source/common/textures/hires/hqresize.cpp |  3 ++-
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/source/common/console/c_cvars.cpp b/source/common/console/c_cvars.cpp
index 6fd6e4271..1c6df1e24 100644
--- a/source/common/console/c_cvars.cpp
+++ b/source/common/console/c_cvars.cpp
@@ -1497,6 +1497,26 @@ CCMD (unset)
 	}
 }
 
+CCMD (resetcvar)
+{
+	if (argv.argc() != 2)
+	{
+		Printf ("usage: resetcvar <variable>\n");
+	}
+	else
+	{
+		FBaseCVar *var = FindCVar (argv[1], NULL);
+		if (var != NULL)
+		{
+			var->ResetToDefault();
+		}
+		else
+		{
+			Printf ("No such variable: %s\n", argv[1]);
+		}
+	}
+}
+
 CCMD (get)
 {
 	FBaseCVar *var, *prev;
diff --git a/source/common/filesystem/file_ssi.cpp b/source/common/filesystem/file_ssi.cpp
index d47503740..64623e805 100644
--- a/source/common/filesystem/file_ssi.cpp
+++ b/source/common/filesystem/file_ssi.cpp
@@ -75,7 +75,7 @@ bool FSSIFile::Open(bool quiet, int version, int lumpcount, LumpFilterInfo*)
 
 
 	int32_t j = (version == 2 ? 267 : 254) + (lumpcount * 121);
-	for (int i = 0; i < NumLumps; i+=2)
+	for (uint32_t i = 0; i < NumLumps; i+=2)
 	{
 		char fn[13];
 		int strlength = Reader.ReadUInt8();
@@ -121,11 +121,11 @@ FResourceFile* CheckSSI(const char* filename, FileReader& file, bool quiet, Lump
 	char buf[72];
 	memset(zerobuf, 0, 72);
 
-	auto skipstring = [&](int length)
+	auto skipstring = [&](size_t length)
 	{
-		int strlength = file.ReadUInt8();
+		size_t strlength = file.ReadUInt8();
 		if (strlength > length) return false;
-		int count = file.Read(buf, length);
+		size_t count = file.Read(buf, length);
 		buf[length] = 0;
 		if (count != length || strlen(buf) != strlength) return false;
 		if (length != strlength && memcmp(buf + strlength, zerobuf, length - strlength)) return false;
diff --git a/source/common/platform/win32/i_main.cpp b/source/common/platform/win32/i_main.cpp
index 01d799998..6e1b2ea33 100644
--- a/source/common/platform/win32/i_main.cpp
+++ b/source/common/platform/win32/i_main.cpp
@@ -1242,7 +1242,7 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE nothing, LPWSTR cmdline, int
 	_CrtSetDbgFlag (_CrtSetDbgFlag(0) | _CRTDBG_LEAK_CHECK_DF);
 
 	// Use this to break at a specific allocation number.
-	//_crtBreakAlloc = 291757;
+	//_crtBreakAlloc = 227524;
 #endif
 
 	int ret = DoMain (hInstance);
diff --git a/source/common/textures/gametexture.h b/source/common/textures/gametexture.h
index c07753eac..0720267c3 100644
--- a/source/common/textures/gametexture.h
+++ b/source/common/textures/gametexture.h
@@ -366,7 +366,8 @@ enum EUpscaleFlags
 	UF_None = 0,
 	UF_Texture = 1,
 	UF_Sprite = 2,
-	UF_Font = 4
+	UF_Font = 4,
+	UF_Skin = 8
 };
 
 extern int upscalemask;
diff --git a/source/common/textures/hires/hqresize.cpp b/source/common/textures/hires/hqresize.cpp
index e8b457ee1..16b2b4b13 100644
--- a/source/common/textures/hires/hqresize.cpp
+++ b/source/common/textures/hires/hqresize.cpp
@@ -75,7 +75,7 @@ CUSTOM_CVAR(Int, gl_texture_hqresize_maxinputsize, 512, CVAR_ARCHIVE | CVAR_GLOB
 	TexMan.FlushAll();
 }
 
-CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 7, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
+CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 15, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	TexMan.FlushAll();
 	UpdateUpscaleMask();
@@ -84,6 +84,7 @@ CUSTOM_CVAR(Int, gl_texture_hqresize_targets, 7, CVAR_ARCHIVE | CVAR_GLOBALCONFI
 CVAR (Flag, gl_texture_hqresize_textures, gl_texture_hqresize_targets, 1);
 CVAR (Flag, gl_texture_hqresize_sprites, gl_texture_hqresize_targets, 2);
 CVAR (Flag, gl_texture_hqresize_fonts, gl_texture_hqresize_targets, 4);
+CVAR (Flag, gl_texture_hqresize_skins, gl_texture_hqresize_targets, 8);
 
 CVAR(Bool, gl_texture_hqresize_multithread, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);