Fixed timed helptexts

Author: Regynate

ChaosMod/Components/HelpTextQueue.cpp

@@ -4,12 +4,12 @@
 
 #include "Memory/Hooks/GetLabelTextHook.h"
 
-void HelpTextQueue::DisplayLabel(std::string_view label, std::uint8_t durationSecs)
+void HelpTextQueue::DisplayLabel(std::string label, std::uint8_t durationSecs)
 {
 	if (durationSecs == 0)
 		return;
 
-	m_HelpTextQueue.emplace(label, durationSecs / 1000.f);
+	m_HelpTextQueue.emplace(label, durationSecs);
 }
 
 void HelpTextQueue::OnModPauseCleanup()
@@ -19,14 +19,21 @@ void HelpTextQueue::OnModPauseCleanup()
 
 void HelpTextQueue::OnRun()
 {
-	if (m_HelpTextQueue.empty() || IS_HELP_MESSAGE_BEING_DISPLAYED())
+	if (m_HelpTextQueue.empty())
 		return;
 
 	auto &helpText = m_HelpTextQueue.front();
 
-	BEGIN_TEXT_COMMAND_DISPLAY_HELP(helpText.Text.data());
-	END_TEXT_COMMAND_DISPLAY_HELP(0, false, false, 0);
+	auto text = helpText.Text;
 
-	if ((helpText.TimerSecs -= GET_FRAME_TIME()) < 0.f)
-		m_HelpTextQueue.pop();
+	if (!IS_HELP_MESSAGE_BEING_DISPLAYED()
+	    || (BEGIN_TEXT_COMMAND_IS_THIS_HELP_MESSAGE_BEING_DISPLAYED(text.data()),
+	        END_TEXT_COMMAND_IS_THIS_HELP_MESSAGE_BEING_DISPLAYED(0)))
+	{
+		BEGIN_TEXT_COMMAND_DISPLAY_HELP(text.data());
+		END_TEXT_COMMAND_DISPLAY_HELP(0, false, false, -1);
+
+		if ((helpText.TimerSecs -= GET_FRAME_TIME()) < 0.f)
+			m_HelpTextQueue.pop();
+	}
 }

ChaosMod/Components/HelpTextQueue.h

@@ -8,13 +8,13 @@ class HelpTextQueue : public Component
 {
 	struct HelpText
 	{
-		std::string_view Text;
+		std::string Text;
 		float TimerSecs;
 	};
 	std::queue<HelpText> m_HelpTextQueue;
 
   public:
-	void DisplayLabel(std::string_view label, std::uint8_t durationSecs);
+	void DisplayLabel(std::string label, std::uint8_t durationSecs);
 
 	virtual void OnModPauseCleanup() override;
 	virtual void OnRun() override;