From df95ca74ec0207374f20e98fd114fef19deeb5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20M=C3=BCller?= <robytemueller@gmail.com>
Date: Mon, 29 Jan 2024 23:17:12 +0100
Subject: [PATCH] Extract `CVoting::RemoveOption` function

---
 src/game/client/components/voting.cpp | 60 ++++++++++++++-------------
 src/game/client/components/voting.h   |  1 +
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/game/client/components/voting.cpp b/src/game/client/components/voting.cpp
index 71b0fe129..180851ce1 100644
--- a/src/game/client/components/voting.cpp
+++ b/src/game/client/components/voting.cpp
@@ -177,6 +177,37 @@ void CVoting::AddOption(const char *pDescription)
 	++m_NumVoteOptions;
 }
 
+void CVoting::RemoveOption(const char *pDescription)
+{
+	for(CVoteOptionClient *pOption = m_pFirst; pOption; pOption = pOption->m_pNext)
+	{
+		if(str_comp(pOption->m_aDescription, pDescription) == 0)
+		{
+			// remove it from the list
+			if(m_pFirst == pOption)
+				m_pFirst = m_pFirst->m_pNext;
+			if(m_pLast == pOption)
+				m_pLast = m_pLast->m_pPrev;
+			if(pOption->m_pPrev)
+				pOption->m_pPrev->m_pNext = pOption->m_pNext;
+			if(pOption->m_pNext)
+				pOption->m_pNext->m_pPrev = pOption->m_pPrev;
+			--m_NumVoteOptions;
+
+			// add it to recycle list
+			pOption->m_pNext = 0;
+			pOption->m_pPrev = m_pRecycleLast;
+			if(pOption->m_pPrev)
+				pOption->m_pPrev->m_pNext = pOption;
+			m_pRecycleLast = pOption;
+			if(!m_pRecycleFirst)
+				m_pRecycleLast = pOption;
+
+			break;
+		}
+	}
+}
+
 void CVoting::ClearOptions()
 {
 	m_Heap.Reset();
@@ -271,34 +302,7 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
 	else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONREMOVE)
 	{
 		CNetMsg_Sv_VoteOptionRemove *pMsg = (CNetMsg_Sv_VoteOptionRemove *)pRawMsg;
-
-		for(CVoteOptionClient *pOption = m_pFirst; pOption; pOption = pOption->m_pNext)
-		{
-			if(str_comp(pOption->m_aDescription, pMsg->m_pDescription) == 0)
-			{
-				// remove it from the list
-				if(m_pFirst == pOption)
-					m_pFirst = m_pFirst->m_pNext;
-				if(m_pLast == pOption)
-					m_pLast = m_pLast->m_pPrev;
-				if(pOption->m_pPrev)
-					pOption->m_pPrev->m_pNext = pOption->m_pNext;
-				if(pOption->m_pNext)
-					pOption->m_pNext->m_pPrev = pOption->m_pPrev;
-				--m_NumVoteOptions;
-
-				// add it to recycle list
-				pOption->m_pNext = 0;
-				pOption->m_pPrev = m_pRecycleLast;
-				if(pOption->m_pPrev)
-					pOption->m_pPrev->m_pNext = pOption;
-				m_pRecycleLast = pOption;
-				if(!m_pRecycleFirst)
-					m_pRecycleLast = pOption;
-
-				break;
-			}
-		}
+		RemoveOption(pMsg->m_pDescription);
 	}
 	else if(MsgType == NETMSGTYPE_SV_YOURVOTE)
 	{
diff --git a/src/game/client/components/voting.h b/src/game/client/components/voting.h
index f2970b332..930e197ab 100644
--- a/src/game/client/components/voting.h
+++ b/src/game/client/components/voting.h
@@ -25,6 +25,7 @@ class CVoting : public CComponent
 	int m_Yes, m_No, m_Pass, m_Total;
 
 	void AddOption(const char *pDescription);
+	void RemoveOption(const char *pDescription);
 	void ClearOptions();
 	void Callvote(const char *pType, const char *pValue, const char *pReason);