From 32300f7d2661b5495b648118ec1e790f3f8a8220 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 11 Apr 2020 19:11:20 +0200
Subject: [PATCH] - use translation slot 0 for reserved content, like font
 translations.

---
 src/common/engine/palettecontainer.h | 9 ++++++++-
 src/gamedata/fonts/font.cpp          | 2 +-
 src/gamedata/fonts/hexfont.cpp       | 2 +-
 src/r_data/r_translate.h             | 4 +---
 wadsrc/static/zscript/constants.zs   | 1 -
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/common/engine/palettecontainer.h b/src/common/engine/palettecontainer.h
index 90871863fb..9cbb5e6d43 100644
--- a/src/common/engine/palettecontainer.h
+++ b/src/common/engine/palettecontainer.h
@@ -6,6 +6,12 @@
 
 class FileReader;
 
+enum
+{
+	TRANSLATION_Internal = 0
+};
+
+
 struct FRemapTable
 {
 	FRemapTable(int count = 256) { NumEntries = count; }
@@ -84,9 +90,10 @@ public:
 	FRemapTable IceMap;				// This is used by the texture compositor so it must be globally accessible.
 	uint8_t GrayMap[256];
 
+	TArray<FRemapTable*> uniqueRemaps;
+
 private:
 	FMemArena remapArena;
-	TArray<FRemapTable*> uniqueRemaps;
 	TArray<TAutoGrowArray<FRemapTablePtr, FRemapTable*>> TranslationTables;
 public:
 	void Init(int numslots);	// This cannot be a constructor!!!
diff --git a/src/gamedata/fonts/font.cpp b/src/gamedata/fonts/font.cpp
index 98cbda51f1..ba4fbf6d92 100644
--- a/src/gamedata/fonts/font.cpp
+++ b/src/gamedata/fonts/font.cpp
@@ -664,7 +664,7 @@ void FFont::SetDefaultTranslation(uint32_t *othercolors)
 			}
 		}
 	}
-	Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Font, &remap);
+	Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Internal, &remap);
 	forceremap = true;
 }
 
diff --git a/src/gamedata/fonts/hexfont.cpp b/src/gamedata/fonts/hexfont.cpp
index 58a9a5cf4d..d310fdc019 100644
--- a/src/gamedata/fonts/hexfont.cpp
+++ b/src/gamedata/fonts/hexfont.cpp
@@ -418,7 +418,7 @@ public:
 				}
 			}
 		}
-		Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Font, &remap);
+		Translations[CR_UNTRANSLATED] = GPalette.StoreTranslation(TRANSLATION_Internal, &remap);
 		forceremap = true;
 
 	}
diff --git a/src/r_data/r_translate.h b/src/r_data/r_translate.h
index 7b8caf0b3c..534c497951 100644
--- a/src/r_data/r_translate.h
+++ b/src/r_data/r_translate.h
@@ -9,8 +9,7 @@ class FSerializer;
 
 enum
 {
-	TRANSLATION_Invalid,
-	TRANSLATION_Players,
+	TRANSLATION_Players = 1,
 	TRANSLATION_PlayersExtra,
 	TRANSLATION_Standard,
 	TRANSLATION_LevelScripted,
@@ -20,7 +19,6 @@ enum
 	TRANSLATION_Blood,
 	TRANSLATION_RainPillar,
 	TRANSLATION_Custom,
-	TRANSLATION_Font,
 
 	NUM_TRANSLATION_TABLES
 };
diff --git a/wadsrc/static/zscript/constants.zs b/wadsrc/static/zscript/constants.zs
index 64884c0189..02e6d4fced 100644
--- a/wadsrc/static/zscript/constants.zs
+++ b/wadsrc/static/zscript/constants.zs
@@ -1047,7 +1047,6 @@ enum ETranslationTable
 	TRANSLATION_Blood,
 	TRANSLATION_RainPillar,
 	TRANSLATION_Custom,
-	TRANSLATION_Font,
 };
 
 enum EFindFloorCeiling