From 6f4ca480b50f693b52255e8f2f7ef4184d2cd081 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 19 Oct 2019 20:25:58 +0200
Subject: [PATCH] - sky clamping may only be done in Blood for now.

This needs a better solution.
---
 source/blood/src/common_game.h  | 7 -------
 source/build/src/polymost.cpp   | 1 +
 source/build/src/texcache.cpp   | 2 +-
 source/common/ns.h              | 8 ++++++++
 source/duke3d/src/common_game.h | 7 -------
 source/rr/src/common_game.h     | 7 -------
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/source/blood/src/common_game.h b/source/blood/src/common_game.h
index 6a08378e3..5e59d0de8 100644
--- a/source/blood/src/common_game.h
+++ b/source/blood/src/common_game.h
@@ -32,13 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 BEGIN_BLD_NS
 
 extern int g_useCwd;
-#ifndef APPNAME
-#define APPNAME "NBlood"
-#endif
-
-#ifndef APPBASENAME
-#define APPBASENAME "nblood"
-#endif
 
 #define BLOODWIDESCREENDEF "blood_widescreen.def"
 
diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp
index cf418d7a9..0bc4917d9 100644
--- a/source/build/src/polymost.cpp
+++ b/source/build/src/polymost.cpp
@@ -2048,6 +2048,7 @@ static void polymost_flatskyrender(vec2f_t const* const dpxy, int32_t const n, i
     int y = ((int32_t)(((x0-ghalfx)*o.y)+fglobalang)>>(11-dapskybits));
     float fx = x0;
 
+	if (playing_blood) method |= DAMETH_CLAMPED;	// Hack to make Blood's skies show properly.
     do
     {
         globalpicnum = dapskyoff[y&((1<<dapskybits)-1)]+ti;
diff --git a/source/build/src/texcache.cpp b/source/build/src/texcache.cpp
index caabb05a8..4d47805a3 100644
--- a/source/build/src/texcache.cpp
+++ b/source/build/src/texcache.cpp
@@ -156,7 +156,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
 	auto mtex = LoadTexture(tex, TextureType, lookuppal);
 	if (mtex)
 	{
-		auto sampler = method & DAMETH_SKY? SamplerClampXY : (method & DAMETH_CLAMPED) ? (sampleroverride != -1 ? sampleroverride : SamplerClampXY) : SamplerRepeat;
+		auto sampler = (method & DAMETH_CLAMPED) ? (sampleroverride != -1 ? sampleroverride : SamplerClampXY) : SamplerRepeat;
 		if (TextureType == TT_INDEXED) sampler = sampler + SamplerNoFilterRepeat - SamplerRepeat;
 
 		BindTexture(0, mtex, sampler);
diff --git a/source/common/ns.h b/source/common/ns.h
index 378c99324..e7a3b0d85 100644
--- a/source/common/ns.h
+++ b/source/common/ns.h
@@ -29,3 +29,11 @@
 #define END_SW_NS
 
 #endif
+
+#ifndef APPNAME
+#define APPNAME             "Demolition"
+#endif
+
+#ifndef APPBASENAME
+#define APPBASENAME         "demolition"
+#endif
diff --git a/source/duke3d/src/common_game.h b/source/duke3d/src/common_game.h
index 7a25a161a..e9163cfcf 100644
--- a/source/duke3d/src/common_game.h
+++ b/source/duke3d/src/common_game.h
@@ -17,13 +17,6 @@ BEGIN_DUKE_NS
 
 extern int g_useCwd;
 
-#ifndef APPNAME
-#define APPNAME             "EDuke32"
-#endif
-
-#ifndef APPBASENAME
-#define APPBASENAME         "eduke32"
-#endif
 
 #define GAMEFLAG_DUKE       0x00000001
 #define GAMEFLAG_NAM        0x00000002
diff --git a/source/rr/src/common_game.h b/source/rr/src/common_game.h
index abf8771a7..d7f5fa74b 100644
--- a/source/rr/src/common_game.h
+++ b/source/rr/src/common_game.h
@@ -15,13 +15,6 @@ BEGIN_RR_NS
 
 extern int g_useCwd;
 
-#ifndef APPNAME
-#define APPNAME             "Rednukem"
-#endif
-
-#ifndef APPBASENAME
-#define APPBASENAME         "rednukem"
-#endif
 
 #define GAMEFLAG_DUKE       0x00000001
 #define GAMEFLAG_NAM        0x00000002