From bea6834f8e1f7c22c1864543273a07e36502b2a0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 8 Dec 2022 12:44:06 +0100
Subject: [PATCH] - code cleanup.

---
 source/common/engine/sc_man.h           |  7 +++++++
 source/common/textures/image.cpp        | 10 +++++-----
 source/common/textures/image.h          |  7 ++++---
 source/common/textures/texturemanager.h |  4 ++++
 source/core/coreactor.h                 |  1 +
 source/core/psky.cpp                    |  2 +-
 source/games/duke/src/bowling.cpp       |  1 +
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/source/common/engine/sc_man.h b/source/common/engine/sc_man.h
index 01d90a409..4d66b5f21 100644
--- a/source/common/engine/sc_man.h
+++ b/source/common/engine/sc_man.h
@@ -117,6 +117,13 @@ public:
 	void MustGetNumber(bool evaluate = false);
 	bool CheckNumber(bool evaluate = false);
 
+	bool GetNumber(int16_t& var, bool evaluate = false)
+	{
+		if (!GetNumber(evaluate)) return false;
+		var = Number;
+		return true;
+	}
+
 	bool GetNumber(int& var, bool evaluate = false)
 	{
 		if (!GetNumber(evaluate)) return false;
diff --git a/source/common/textures/image.cpp b/source/common/textures/image.cpp
index b910c7560..aefab6488 100644
--- a/source/common/textures/image.cpp
+++ b/source/common/textures/image.cpp
@@ -82,8 +82,8 @@ PalettedPixels FImageSource::GetCachedPalettedPixels(int conversion)
 {
 	PalettedPixels ret;
 
-	FString name;
-	fileSystem.GetFileShortName(name, SourceLump);
+	//FString name;
+	//fileSystem.GetFileShortName(name, SourceLump);
 
 	auto imageID = ImageID;
 
@@ -196,10 +196,10 @@ FBitmap FImageSource::GetCachedBitmap(const PalEntry *remap, int conversion, int
 {
 	FBitmap ret;
 
-	FString name;
-	int trans = -1;
-	fileSystem.GetFileShortName(name, SourceLump);
+	//FString name;
+	//fileSystem.GetFileShortName(name, SourceLump);
 
+	int trans = -1;
 	auto imageID = ImageID;
 
 	if (remap != nullptr)
diff --git a/source/common/textures/image.h b/source/common/textures/image.h
index 54f6cf585..1c641c04d 100644
--- a/source/common/textures/image.h
+++ b/source/common/textures/image.h
@@ -60,7 +60,7 @@ public:
 	virtual bool SupportRemap0() { return false; }		// Unfortunate hackery that's needed for Hexen's skies. Only the image can know about the needed parameters
 	virtual bool IsRawCompatible() { return true; }		// Same thing for mid texture compatibility handling. Can only be determined by looking at the composition data which is private to the image.
 
-	void CopySize(FImageSource &other)
+	void CopySize(FImageSource &other) noexcept
 	{
 		Width = other.Width;
 		Height = other.Height;
@@ -71,6 +71,7 @@ public:
 
 	// Images are statically allocated and freed in bulk. None of the subclasses may hold any destructible data.
 	void *operator new(size_t block) { return ImageArena.Alloc(block); }
+	void* operator new(size_t block, void* mem) { return mem; }
 	void operator delete(void *block) {}
 
 	bool bMasked = true;						// Image (might) have holes (Assume true unless proven otherwise!)
@@ -102,8 +103,8 @@ public:
 		noremap0 = 2
 	};
 
-	FImageSource(int sourcelump = -1) : SourceLump(sourcelump) { ImageID = ++NextID; }
-	virtual ~FImageSource() {}
+	FImageSource(int sourcelump = -1) noexcept : SourceLump(sourcelump) { ImageID = ++NextID; }
+	virtual ~FImageSource() = default;
 
 	int GetWidth() const
 	{
diff --git a/source/common/textures/texturemanager.h b/source/common/textures/texturemanager.h
index 3cc4086b6..91ff461a2 100644
--- a/source/common/textures/texturemanager.h
+++ b/source/common/textures/texturemanager.h
@@ -174,6 +174,10 @@ public:
 		BuildTileData.Reserve(1);
 		return BuildTileData.Last();
 	}
+	TArray<TArray<uint8_t>>& GetBuildTileDataStore()
+	{
+		return BuildTileData;
+	}
 
 	FGameTexture* GameTexture(FTextureID id) { return Textures[id.GetIndex()].Texture; }
 	void SetTranslation(FTextureID fromtexnum, FTextureID totexnum);
diff --git a/source/core/coreactor.h b/source/core/coreactor.h
index 82374fa61..44a92b899 100644
--- a/source/core/coreactor.h
+++ b/source/core/coreactor.h
@@ -4,6 +4,7 @@
 #include "maptypes.h"
 #include "build.h"
 #include "actorinfo.h"
+#include "clip.h"
 
 enum
 {
diff --git a/source/core/psky.cpp b/source/core/psky.cpp
index 6f6458fb1..ab9935d91 100644
--- a/source/core/psky.cpp
+++ b/source/core/psky.cpp
@@ -98,7 +98,7 @@ SkyDefinition getSky(int tilenum)
 			result = {};
 			result.scale = 1.f;
 		}
-		int w =   tileWidth(tilenum);
+		int w = tileWidth(tilenum);
 		if (result.lognumtiles == 0 || w >= 256)
 		{
 			if (w < 512) result.lognumtiles = 2;
diff --git a/source/games/duke/src/bowling.cpp b/source/games/duke/src/bowling.cpp
index 327023692..843449103 100644
--- a/source/games/duke/src/bowling.cpp
+++ b/source/games/duke/src/bowling.cpp
@@ -43,6 +43,7 @@ BEGIN_DUKE_NS
 void tileCopySection(FTextureID tilenum1, int sx1, int sy1, int xsiz, int ysiz, uint8_t* p2, int xsiz2, int ysiz2, int sx2, int sy2)
 {
 	auto tex = TexMan.GetGameTexture(tilenum1);
+	if (!tex->isValid()) return;
 	int xsiz1 = tex->GetTexelWidth();
 	int ysiz1 = tex->GetTexelHeight();
 	if (xsiz1 > 0 && ysiz1 > 0)