Stack mystery rounds

Author: furo321

src/engine/server.h

@@ -276,6 +276,7 @@ class IServer : public IInterface
 	virtual void ReadAnnouncementsFile(const char *pFileName) = 0;
 	virtual const char *GetMysteryRoundLine() = 0;
 	virtual void ReadMysteryRoundsFile(const char *pFileName) = 0;
+	virtual size_t GetMysteryRoundsSize() = 0;
 	virtual bool ClientPrevIngame(int ClientId) = 0;
 	virtual const char *GetNetErrorString(int ClientId) = 0;
 	virtual void ResetNetErrorString(int ClientId) = 0;

src/engine/server/server.h

@@ -452,6 +452,7 @@ class CServer : public IServer
 
 	const char *GetMysteryRoundLine() override;
 	void ReadMysteryRoundsFile(const char *pFileName) override;
+	size_t GetMysteryRoundsSize() override { return m_vMysteryRounds.size(); }
 
 	int *GetIdMap(int ClientId) override;
 

src/game/server/gamemodes/Bomb.cpp

@@ -504,18 +504,32 @@ void CGameControllerBomb::EndBombRound(bool RealEnd)
 			GameServer()->SendChat(-1, TEAM_ALL, "Noone won the round!");
 		}
 
-		if(g_Config.m_BombtagMysteryChance && rand() % 101 <= g_Config.m_BombtagMysteryChance)
+		std::vector<std::string> vTemp;
+		while(g_Config.m_BombtagMysteryChance && rand() % 101 <= g_Config.m_BombtagMysteryChance)
 		{
+			if(vTemp.size() == Server()->GetMysteryRoundsSize())
+			{
+				break;
+			}
+			if(!m_WasMysteryRound)
+			{
+				GameServer()->SendChat(-1, TEAM_ALL, "MYSTERY ROUND!");
+			}
 			const char *pLine = GameServer()->Server()->GetMysteryRoundLine();
 			if(pLine)
 			{
-				GameServer()->SendChat(-1, TEAM_ALL, "MYSTERY ROUND!");
+				if(std::find(vTemp.begin(), vTemp.end(), pLine) != vTemp.end())
+				{
+					continue;
+				}
+
 				GameServer()->Console()->ExecuteFile(g_Config.m_SvMysteryRoundsResetFileName);
 				GameServer()->Console()->ExecuteLine(pLine);
 				m_WasMysteryRound = true;
+				vTemp.emplace_back(pLine);
 			}
 		}
-		else if(m_WasMysteryRound)
+		if(m_WasMysteryRound)
 		{
 			GameServer()->Console()->ExecuteFile(g_Config.m_SvMysteryRoundsResetFileName);
 			m_WasMysteryRound = false;