From 40566274d9a186682c3d4ff31b84e522d78cbd09 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 3 Dec 2023 13:01:33 +0000
Subject: [PATCH] Jart DM assistance

- anonymous namespace for filescope variables, funcs
- Step away from std::optional, use anonymous initialiser instead
---
 src/menus/main-goner.cpp | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/menus/main-goner.cpp b/src/menus/main-goner.cpp
index eee4605ba..cd2c201ef 100644
--- a/src/menus/main-goner.cpp
+++ b/src/menus/main-goner.cpp
@@ -56,7 +56,8 @@ menu_t MAIN_GonerDef = {
 	M_GonerInputs,
 };
 
-// ---
+namespace
+{
 
 typedef enum
 {
@@ -68,7 +69,7 @@ typedef enum
 class GonerSpeaker
 {
 public:
-	float offset;
+	float offset = 0;
 
 	GonerSpeaker(std::string skinName, float offset)
 	{
@@ -80,6 +81,8 @@ public:
 		this->offset = offset;
 	};
 
+	GonerSpeaker() {};
+
 	sfxenum_t TalkSound(void)
 	{
 		if (!ValidID())
@@ -105,7 +108,7 @@ private:
 	};
 };
 
-std::array<std::optional<GonerSpeaker>, MAXGONERSPEAKERS> goner_speakers = {};
+std::array<GonerSpeaker, MAXGONERSPEAKERS> goner_speakers = {};
 
 srb2::Dialogue::Typewriter goner_typewriter;
 
@@ -136,11 +139,7 @@ public:
 		if (speaker >= MAXGONERSPEAKERS)
 			return false;
 
-		goner_typewriter.voiceSfx = sfx_ktalk;
-		if (goner_speakers[speaker])
-		{
-			goner_typewriter.voiceSfx = (*goner_speakers[speaker]).TalkSound();
-		}
+		goner_typewriter.voiceSfx = goner_speakers[speaker].TalkSound();
 
 		goner_typewriter.NewText(dialogue);
 
@@ -155,7 +154,7 @@ public:
 std::forward_list<GonerChatLine> LinesToDigest;
 std::forward_list<GonerChatLine> LinesOutput;
 
-// ---
+}; // namespace
 
 void M_GonerTick(void)
 {
@@ -262,10 +261,7 @@ static void M_GonerDrawer(void)
 
 		//if (newy > BASEVIDHEIGHT) continue; -- not needed yet
 
-		if (!goner_speakers[element.speaker])
-			continue;
-
-		auto speaker = *goner_speakers[element.speaker];
+		auto speaker = goner_speakers[element.speaker];
 
 		srb2::Draw line = drawer
 			.xy(speaker.offset, newy)