diff --git a/platform/Windows/audiolib.vcxproj b/platform/Windows/audiolib.vcxproj
index 98f66ad4d..74bbd9fc6 100644
--- a/platform/Windows/audiolib.vcxproj
+++ b/platform/Windows/audiolib.vcxproj
@@ -23,32 +23,32 @@
{0029C61B-B63D-4E61-99F2-F4E49AABFC47}
Win32Proj
audiolib
- 10.0.17134.0
+ 10.0
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
diff --git a/platform/Windows/build.vcxproj b/platform/Windows/build.vcxproj
index 215278847..bf4f6fee8 100644
--- a/platform/Windows/build.vcxproj
+++ b/platform/Windows/build.vcxproj
@@ -23,32 +23,32 @@
{DBECB851-5624-4FA8-9A9D-7169D0F12FF1}
Win32Proj
build
- 10.0.17134.0
+ 10.0
StaticLibrary
true
- v141
+ v142
MultiByte
StaticLibrary
false
- v141
+ v142
true
MultiByte
StaticLibrary
true
- v141
+ v142
MultiByte
StaticLibrary
false
- v141
+ v142
true
MultiByte
diff --git a/platform/Windows/eduke32.sln b/platform/Windows/eduke32.sln
index 6eb9fa159..78db1d144 100644
--- a/platform/Windows/eduke32.sln
+++ b/platform/Windows/eduke32.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2047
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29306.81
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eduke32", "eduke32.vcxproj", "{8E7A6179-0B72-4073-8A4C-E8682D481DAE}"
EndProject
@@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "build.vcxproj", "{
{6AC1D997-8DAE-4343-8DD8-DA2A1CA63212} = {6AC1D997-8DAE-4343-8DD8-DA2A1CA63212}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapster32", "mapster32.vcxproj", "{EC8A030F-08E9-45F6-896B-95BEC9E9FC61}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enet", "enet.vcxproj", "{A68CC5E4-567A-44C8-94FE-C1DE09AEEB40}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audiolib", "audiolib.vcxproj", "{0029C61B-B63D-4E61-99F2-F4E49AABFC47}"
@@ -53,14 +51,6 @@ Global
{DBECB851-5624-4FA8-9A9D-7169D0F12FF1}.Release|Win32.Build.0 = Release|Win32
{DBECB851-5624-4FA8-9A9D-7169D0F12FF1}.Release|x64.ActiveCfg = Release|x64
{DBECB851-5624-4FA8-9A9D-7169D0F12FF1}.Release|x64.Build.0 = Release|x64
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Debug|Win32.ActiveCfg = Debug|Win32
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Debug|Win32.Build.0 = Debug|Win32
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Debug|x64.ActiveCfg = Debug|x64
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Debug|x64.Build.0 = Debug|x64
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Release|Win32.ActiveCfg = Release|Win32
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Release|Win32.Build.0 = Release|Win32
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Release|x64.ActiveCfg = Release|x64
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61}.Release|x64.Build.0 = Release|x64
{A68CC5E4-567A-44C8-94FE-C1DE09AEEB40}.Debug|Win32.ActiveCfg = Debug|Win32
{A68CC5E4-567A-44C8-94FE-C1DE09AEEB40}.Debug|Win32.Build.0 = Debug|Win32
{A68CC5E4-567A-44C8-94FE-C1DE09AEEB40}.Debug|x64.ActiveCfg = Debug|x64
@@ -108,7 +98,6 @@ Global
GlobalSection(NestedProjects) = preSolution
{8E7A6179-0B72-4073-8A4C-E8682D481DAE} = {18C3CB5F-1DE6-4CFE-B7F7-ABE824222E1C}
{DBECB851-5624-4FA8-9A9D-7169D0F12FF1} = {8BD117A0-7FA2-44B0-88A5-29D6C220601E}
- {EC8A030F-08E9-45F6-896B-95BEC9E9FC61} = {18C3CB5F-1DE6-4CFE-B7F7-ABE824222E1C}
{A68CC5E4-567A-44C8-94FE-C1DE09AEEB40} = {8BD117A0-7FA2-44B0-88A5-29D6C220601E}
{0029C61B-B63D-4E61-99F2-F4E49AABFC47} = {8BD117A0-7FA2-44B0-88A5-29D6C220601E}
{BCDE1852-E2C6-4ABB-84FB-5CD431764A9A} = {8BD117A0-7FA2-44B0-88A5-29D6C220601E}
diff --git a/platform/Windows/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj
index 69f193e07..8c7fc2e9e 100644
--- a/platform/Windows/eduke32.vcxproj
+++ b/platform/Windows/eduke32.vcxproj
@@ -23,8 +23,8 @@
{8E7A6179-0B72-4073-8A4C-E8682D481DAE}
eduke32
MakeFileProj
- v141
- 10.0.17134.0
+ v142
+ 10.0
diff --git a/platform/Windows/enet.vcxproj b/platform/Windows/enet.vcxproj
index c8ceed7b0..368b77ff1 100644
--- a/platform/Windows/enet.vcxproj
+++ b/platform/Windows/enet.vcxproj
@@ -45,32 +45,32 @@
Win32Proj
enet
enet
- 10.0.17134.0
+ 10.0
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
diff --git a/platform/Windows/glad.vcxproj b/platform/Windows/glad.vcxproj
index 161e30199..1552fc51d 100644
--- a/platform/Windows/glad.vcxproj
+++ b/platform/Windows/glad.vcxproj
@@ -32,32 +32,32 @@
glad
glad
{6AC1D997-8DAE-4343-8DD8-DA2A1CA63212}
- 10.0.17134.0
+ 10.0
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
diff --git a/platform/Windows/lib/64/libSDL2.a b/platform/Windows/lib/64/libSDL2.a
index 0436899bf..89f7d37fc 100644
Binary files a/platform/Windows/lib/64/libSDL2.a and b/platform/Windows/lib/64/libSDL2.a differ
diff --git a/platform/Windows/lib/64/libSDL2main.a b/platform/Windows/lib/64/libSDL2main.a
index 6951e46e8..4d07170c4 100644
Binary files a/platform/Windows/lib/64/libSDL2main.a and b/platform/Windows/lib/64/libSDL2main.a differ
diff --git a/platform/Windows/libxmp-lite.vcxproj b/platform/Windows/libxmp-lite.vcxproj
index abf0353a7..8983938e0 100644
--- a/platform/Windows/libxmp-lite.vcxproj
+++ b/platform/Windows/libxmp-lite.vcxproj
@@ -73,32 +73,32 @@
Win32Proj
libxmp-lite
{32D4CF70-A3D6-4CEA-81D7-64C743980276}
- 10.0.17134.0
+ 10.0
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
diff --git a/platform/Windows/mact.vcxproj b/platform/Windows/mact.vcxproj
index 0abefd6d9..a663cfa19 100644
--- a/platform/Windows/mact.vcxproj
+++ b/platform/Windows/mact.vcxproj
@@ -40,32 +40,32 @@
{BCDE1852-E2C6-4ABB-84FB-5CD431764A9A}
Win32Proj
mact
- 10.0.17134.0
+ 10.0
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
StaticLibrary
true
- v141
+ v142
Unicode
StaticLibrary
false
- v141
+ v142
true
Unicode
diff --git a/platform/Windows/mapster32.vcxproj b/platform/Windows/mapster32.vcxproj
index e2395ea50..f36e64120 100644
--- a/platform/Windows/mapster32.vcxproj
+++ b/platform/Windows/mapster32.vcxproj
@@ -24,32 +24,32 @@
Win32Proj
mapster32
mapster32
- 10.0.17134.0
+ 10.0
Application
true
- v141
+ v142
MultiByte
Application
false
- v141
+ v142
true
MultiByte
Application
true
- v141
+ v142
MultiByte
Application
false
- v141
+ v142
true
MultiByte
diff --git a/source/build/include/build.h b/source/build/include/build.h
index a473c0a02..a9d1a4fcd 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -97,7 +97,7 @@ enum rendmode_t {
# define LUNATIC_FASTCALL __fastcall
#endif
-#define MAXWALLSB ((MAXWALLS>>3)+(MAXWALLS>>4))
+#define MAXWALLSB ((MAXWALLS>>2)+(MAXWALLS>>3))
#define MAXTILES 30720
#define MAXUSERTILES (MAXTILES-16) // reserve 16 tiles at the end
diff --git a/source/build/include/polymost.h b/source/build/include/polymost.h
index 81bb5daba..a6e9a9eae 100644
--- a/source/build/include/polymost.h
+++ b/source/build/include/polymost.h
@@ -7,6 +7,8 @@
#include "glad/glad.h"
#include "hightile.h"
+void Polymost_CacheHitList(uint8_t* hash);
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -31,6 +33,8 @@ extern struct glfiltermodes glfiltermodes[NUMGLFILTERMODES];
extern void Polymost_prepare_loadboard(void);
+void GetTextureHandle(GLuint *handle);
+
//void phex(char v, char *s);
void uploadtexture(int32_t doalloc, vec2_t siz, int32_t texfmt, coltype *pic, vec2_t tsiz, int32_t dameth);
void uploadtextureindexed(int32_t doalloc, vec2_t offset, vec2_t siz, intptr_t tile);
diff --git a/source/build/src/glbuild.cpp b/source/build/src/glbuild.cpp
index 3d5e4cab7..e0f40c2bf 100644
--- a/source/build/src/glbuild.cpp
+++ b/source/build/src/glbuild.cpp
@@ -231,7 +231,7 @@ int32_t loadglulibrary(const char *driver)
bgluProject = (bgluProjectProcPtr) GLUGETPROC("gluProject");
bgluUnProject = (bgluUnProjectProcPtr) GLUGETPROC("gluUnProject");
- if (err) unloadglulibrary();
+ //if (err) unloadglulibrary();
return err;
#else
UNREFERENCED_PARAMETER(driver);