Fix crash around m_pGameEvent + gHUD

* Instead use rain's suggestion to change it to using `DECLARE_HUDELEMENT` directly
NeotokyoRebuild · Jun 2, 2024 · f8d8fdb · f8d8fdb
1 parent 15725ad
commit f8d8fdb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 26 deletions.
diff --git a/mp/src/game/client/neo/c_neo_player.cpp b/mp/src/game/client/neo/c_neo_player.cpp
@@ -915,7 +915,7 @@ void C_NEO_Player::PreThink( void )
 			Warning("Couldn't find ghostMarker\n");
 		}
 
-		auto indicator = m_pNeoPanel->GetGameEventIndicator();
+		auto indicator = GET_HUDELEMENT(CNEOHud_GameEvent);
 
 		if (indicator)
 		{
@@ -970,9 +970,10 @@ void C_NEO_Player::PostThink(void)
 
 	if (!preparingToHideMsg && m_bPreviouslyPreparingToHideMsg)
 	{
-		if (m_pNeoPanel && m_pNeoPanel->GetGameEventIndicator())
+		auto indicator = GET_HUDELEMENT(CNEOHud_GameEvent);
+		if (indicator)
 		{
-			m_pNeoPanel->GetGameEventIndicator()->SetVisible(false);
+			indicator->SetVisible(false);
 			m_bPreviouslyPreparingToHideMsg = false;
 		}
 		else

diff --git a/mp/src/game/client/neo/ui/neo_hud_elements.cpp b/mp/src/game/client/neo/ui/neo_hud_elements.cpp
@@ -53,7 +53,6 @@ CNeoHudElements::CNeoHudElements(IViewPort *pViewPort)
 	m_pAmmo = NULL;
 	m_pCompass = NULL;
 	m_pFriendlyMarker = NULL;
-	m_pGameEvent = NULL;
 	m_pHTA = NULL;
 	m_pRoundState = NULL;
 	m_pLastUpdater = NULL;
@@ -91,13 +90,6 @@ void CNeoHudElements::FreePanelChildren()
 		m_pFriendlyMarker = NULL;
 	}
 
-	// now that the game event hud is added to gHud, gHud should take care of deleting it itself?
-	if (m_pGameEvent)
-	{
-		m_pGameEvent->DeletePanel();
-		m_pGameEvent = NULL;
-	}
-
 	if (m_pHTA)
 	{
 		m_pHTA->DeletePanel();
@@ -243,7 +235,6 @@ void CNeoHudElements::InitHud()
 	InitAmmo();
 	InitCompass();
 	InitFriendlyMarker();
-	InitGameEventIndicator();
 	InitGhostMarkers();
 	InitHTA();
 	InitRoundState();
@@ -275,12 +266,6 @@ void CNeoHudElements::InitFriendlyMarker()
 	m_pFriendlyMarker = new CNEOHud_FriendlyMarker(UI_ELEMENT_NAME_IFF, this);
 }
 
-void CNeoHudElements::InitGameEventIndicator()
-{
-	Assert(!m_pGameEvent);
-	m_pGameEvent = new CNEOHud_GameEvent(UI_ELEMENT_GAME_EVENT, this);
-}
-
 void CNeoHudElements::InitGhostMarkers()
 {
 	Assert(m_vecGhostMarkers.Count() == 0);

diff --git a/mp/src/game/client/neo/ui/neo_hud_elements.h b/mp/src/game/client/neo/ui/neo_hud_elements.h
@@ -50,7 +50,6 @@ class CNeoHudElements : public vgui::EditablePanel,
 
 	CNEOHud_Ammo* GetAmmo() { return m_pAmmo; }
 	CNEOHud_Compass *GetCompass() { return m_pCompass; }
-	CNEOHud_GameEvent *GetGameEventIndicator() { return m_pGameEvent; }
 	CNEOHud_GhostMarker *GetGhostMarker();
 	CNEOHud_HTA* GetHTA() { return m_pHTA; }
 	CNEOHud_FriendlyMarker *GetIFF() { return m_pFriendlyMarker; }
@@ -77,7 +76,6 @@ class CNeoHudElements : public vgui::EditablePanel,
 private:
 	void InitAmmo();
 	void InitCompass();
-	void InitGameEventIndicator();
 	void InitGhostMarkers();
 	void InitFriendlyMarker();
 	void InitHTA();
@@ -94,7 +92,6 @@ class CNeoHudElements : public vgui::EditablePanel,
 	CNEOHud_Ammo* m_pAmmo;
 	CNEOHud_Compass *m_pCompass;
 	CNEOHud_FriendlyMarker *m_pFriendlyMarker;
-	CNEOHud_GameEvent *m_pGameEvent;
 	CNEOHud_HTA* m_pHTA;
 	CNEOHud_RoundState *m_pRoundState;
 	CTargetID* m_pTargetID;
@@ -107,4 +104,4 @@ class CNeoHudElements : public vgui::EditablePanel,
 	void FillIFFs();
 };
 
-#endif // NEO_HUD_ELEMENTS_H
+#endif // NEO_HUD_ELEMENTS_H
diff --git a/mp/src/game/client/neo/ui/neo_hud_game_event.cpp b/mp/src/game/client/neo/ui/neo_hud_game_event.cpp
@@ -19,6 +19,8 @@
 
 using vgui::surface;
 
+DECLARE_HUDELEMENT(CNEOHud_GameEvent);
+
 NEO_HUD_ELEMENT_DECLARE_FREQ_CVAR(GameEvent, 0.1)
 
 DECLARE_HUD_MESSAGE(CNEOHud_GameEvent, RoundResult);
@@ -61,8 +63,6 @@ CNEOHud_GameEvent::CNEOHud_GameEvent(const char *pElementName, vgui::Panel *pare
 
 	m_hFont = scheme->GetFont("NHudOCR");
 
-	gHUD.AddHudElement(this);
-
 	SetMessage("", 1);
 
 	SetVisible(false);

diff --git a/mp/src/game/client/neo/ui/neo_hud_game_event.h b/mp/src/game/client/neo/ui/neo_hud_game_event.h
@@ -15,7 +15,7 @@ class CNEOHud_GameEvent : public CNEOHud_ChildElement, public CHudElement, publi
 {
 	DECLARE_CLASS_SIMPLE(CNEOHud_GameEvent, vgui::Panel);
 public:
-	CNEOHud_GameEvent(const char *pElementName, vgui::Panel *parent);
+	CNEOHud_GameEvent(const char *pElementName, vgui::Panel *parent = nullptr);
 
 	void SetMessage(const char *message, size_t size);
 	void SetMessage(const wchar_t *message, size_t size);
@@ -50,4 +50,4 @@ class CNEOHud_GameEvent : public CNEOHud_ChildElement, public CHudElement, publi
 };
 
 
-#endif // NEO_HUD_GAME_EVENT_H
+#endif // NEO_HUD_GAME_EVENT_H