From 735740e4532c91e11d1d87c01dd438bce771d4e0 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Fri, 18 Mar 2022 04:56:55 -0400
Subject: [PATCH] - add level names to title bar (and by proxy, to RPC)

---
 source/core/gamecontrol.cpp           | 8 ++++++++
 source/core/gamecontrol.h             | 2 ++
 source/games/blood/src/blood.cpp      | 1 +
 source/games/duke/src/premap.cpp      | 3 ++-
 source/games/exhumed/src/gameloop.cpp | 2 +-
 source/games/sw/src/game.cpp          | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
index 468c417a2..fd091c1c7 100644
--- a/source/core/gamecontrol.cpp
+++ b/source/core/gamecontrol.cpp
@@ -1675,6 +1675,14 @@ void InitBuildTiles()
 
 static FString LevelName;
 
+void TITLE_InformName(const char* newname)
+{
+	LevelName = newname;
+	if (newname[0] == '$')
+		LevelName = GStrings(newname + 1);
+	I_UpdateWindowTitle();
+}
+
 void I_UpdateWindowTitle()
 {
 	FString titlestr;
diff --git a/source/core/gamecontrol.h b/source/core/gamecontrol.h
index b97b9eeec..191f071e0 100644
--- a/source/core/gamecontrol.h
+++ b/source/core/gamecontrol.h
@@ -46,6 +46,8 @@ void DeferredStartGame(MapRecord* map, int skill, bool nostopsound = false);
 void ChangeLevel(MapRecord* map, int skill, bool bossexit = false);
 void CompleteLevel(MapRecord* map);
 
+void TITLE_InformName(const char* newname);
+
 struct UserConfig
 {
 	FString gamegrp;
diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp
index 1204e9fad..27da18eac 100644
--- a/source/games/blood/src/blood.cpp
+++ b/source/games/blood/src/blood.cpp
@@ -253,6 +253,7 @@ void StartLevel(MapRecord* level, bool newgame)
 	startsector = &sector[startsectno];
 	SECRET_SetMapName(currentLevel->DisplayName(), currentLevel->name);
 	STAT_NewLevel(currentLevel->fileName);
+	TITLE_InformName(currentLevel->name);
 	wsrand(dbReadMapCRC(currentLevel->LabelName()));
 	gKillMgr.Clear();
 	gSecretMgr.Clear();
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
index 12bdb0cd3..4f04a606d 100644
--- a/source/games/duke/src/premap.cpp
+++ b/source/games/duke/src/premap.cpp
@@ -973,7 +973,8 @@ static int LoadTheMap(MapRecord *mi, struct player_struct *p, int gamemode)
 
 	SECRET_SetMapName(mi->DisplayName(), mi->name);
 	STAT_NewLevel(mi->fileName);
-
+	TITLE_InformName(mi->name);
+	
 	p->angle.ang = buildang(lbang);
 
 	gotpic.Zero();
diff --git a/source/games/exhumed/src/gameloop.cpp b/source/games/exhumed/src/gameloop.cpp
index 107227377..b17013879 100644
--- a/source/games/exhumed/src/gameloop.cpp
+++ b/source/games/exhumed/src/gameloop.cpp
@@ -127,7 +127,7 @@ void GameInterface::NextLevel(MapRecord *map, int skill)
 	}
 
 	STAT_NewLevel(currentLevel->labelName);
-
+	TITLE_InformName(currentLevel->name);
 }
 
 //---------------------------------------------------------------------------
diff --git a/source/games/sw/src/game.cpp b/source/games/sw/src/game.cpp
index 39a408cb1..a22c90d8d 100644
--- a/source/games/sw/src/game.cpp
+++ b/source/games/sw/src/game.cpp
@@ -406,6 +406,7 @@ void InitLevel(MapRecord *maprec)
 
     SECRET_SetMapName(currentLevel->DisplayName(), currentLevel->name);
     STAT_NewLevel(currentLevel->fileName);
+    TITLE_InformName(currentLevel->name);
     Player[0].angle.ang = buildang(ang);
 
     auto vissect = &sector[0]; // hack alert!