fix(core): Memory Leak

Author: skuzzis

src/engine/vgui/ScreenText.cpp

@@ -1,5 +1,7 @@
 #include "ScreenText.h"
 
+extern std::map<CEntityInstance*, CEntityKeyValues*> entKeyVal;
+
 ScreenText::ScreenText() {}
 
 ScreenText::~ScreenText()
@@ -22,6 +24,11 @@ void ScreenText::Create(Color color, std::string font, int size, bool drawBackgr
 
     CEntityKeyValues* pMenuKV = new CEntityKeyValues();
 
+    if(entKeyVal.find(pScreenEntity.Get()) != entKeyVal.end())
+        delete entKeyVal[pScreenEntity.Get()];
+        
+    entKeyVal[pScreenEntity.Get()] = pMenuKV;
+
     pMenuKV->SetBool("enabled", false);
     pMenuKV->SetFloat("world_units_per_pixel", (0.25 / 1050) * size);
     pMenuKV->SetInt("justify_horizontal", 0);
@@ -67,7 +74,7 @@ void ScreenText::SetupViewForPlayer(Player* player)
 
 void ScreenText::SetText(std::string text)
 {
-    m_text = text;
+    m_text = text.c_str();
 
     if (!pScreenEntity) return;
 

src/entitysystem/entities/listener.cpp

@@ -3,6 +3,8 @@
 PluginEvent* pEvent = nullptr;
 CEntityListener g_entityListener;
 
+std::map<CEntityInstance*, CEntityKeyValues*> entKeyVal;
+
 void EntityListener::Initialize()
 {
     SH_ADD_HOOK_MEMFUNC(INetworkServerService, StartupServer, g_pNetworkServerService, this, &EntityListener::StartupServer, true);
@@ -58,4 +60,9 @@ void CEntityListener::OnEntityDeleted(CEntityInstance* pEntity)
 {
     if (!pEvent) pEvent = new PluginEvent("core", nullptr, nullptr);
     g_pluginManager->ExecuteEvent("core", "OnEntityDeleted", encoders::msgpack::SerializeToString({ string_format("%p", (void*)pEntity), "CEntityInstance" }), pEvent);
+
+    if(entKeyVal.find(pEntity) != entKeyVal.end()) {
+        delete entKeyVal[pEntity];
+        entKeyVal.erase(pEntity);
+    }
 }