fix(src): ScreenText not closing

Author: skuzzis

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Over here will be noted all the update change logs.
 
+## v1.6.21-22 - [Release](https://github.com/swiftly-solution/swiftly/releases/tag/v1.6.22)
+
+### Screen Text
+
+- Possible crash fix for the screen texts
+
 ## v1.6.20 - [Release](https://github.com/swiftly-solution/swiftly/releases/tag/v1.6.20)
 
 ### WebSockets

src/engine/gameevents/gameevents.cpp

@@ -196,6 +196,8 @@ bool EventManager::OnPostFireEvent(IGameEvent* pEvent, bool bDontBroadcast)
     std::string prettyEventName = gameEventsRegister[eventName];
 
     if (prettyEventName == "OnRoundStart") {
+        g_VGUI.ResetStateOfScreenTexts();
+
         g_Plugin.RegisterTimeout(100, []() -> void {
             g_VGUI.RegenerateScreenTexts();
         });

src/engine/vgui/screentext.cpp

@@ -7,6 +7,10 @@
 
 ScreenText::~ScreenText()
 {
+    if (pScreenEntity.IsValid()) {
+        schema::SetProp<bool>(pScreenEntity.Get(), "CPointWorldText", "m_bEnabled", false);
+        schema::SetProp<bool>(pScreenEntity.Get(), "CPointWorldText", "m_bDrawBackground", false);
+    }
 }
 
 void ScreenText::Create(Color color, std::string font, int size, bool drawBackground, bool isMenu)
@@ -57,6 +61,7 @@ void ScreenText::SetupViewForPlayer(Player* player)
 
     if (!pScreenEntity.IsValid()) return;
     if (!pScreenEntity) return;
+
     if (!player) return;
     if (player->IsFakeClient()) return;
 
@@ -190,4 +195,9 @@ bool ScreenText::IsRenderingTo(CHandle<CEntityInstance> renderingTo)
 void ScreenText::SetRenderingTo(CEntityInstance* ent)
 {
     pRenderingTo.Set(ent);
+}
+
+void ScreenText::ResetSpawnState()
+{
+    pScreenEntity.Term();
 }

src/engine/vgui/screentext.h

@@ -32,6 +32,7 @@ class ScreenText
     void SetPosition(float posX = 0.0, float posY = 0.0);
     void SetRenderingTo(CEntityInstance* ent);
     void RegenerateText(bool recreate = true);
+    void ResetSpawnState();
 
     bool IsValidEntity();
     Player* GetPlayer();

src/engine/vgui/vgui.cpp

@@ -47,6 +47,13 @@ void VGUI::DeleteScreenText(uint64_t id)
     screenTexts.erase(id);
 }
 
+void VGUI::ResetStateOfScreenTexts()
+{
+    for (auto it = screenTexts.begin(); it != screenTexts.end(); ++it) {
+        it->second->ResetSpawnState();
+    }
+}
+
 void VGUI::RegenerateScreenTexts()
 {
     for (auto it = screenTexts.begin(); it != screenTexts.end(); ++it) {

src/engine/vgui/vgui.h

@@ -21,6 +21,7 @@ class VGUI
     void DeleteScreenText(uint64_t id);
 
     void RegenerateScreenTexts();
+    void ResetStateOfScreenTexts();
 
     void FilterRenderingItems(Player* player, CCheckTransmitInfo* pInfo);