make sv_ko_mode string instead of int

Author: JSaurusRex

src/engine/server/databases/sqlite.cpp

@@ -437,7 +437,7 @@ bool CSqliteConnection::AddPoints_COTD(const char *pPlayer, int Points, char *pE
 		"INSERT INTO %s_cotd_points_%s(Name, Points) "
 		"VALUES (?, ?) "
 		"ON CONFLICT(Name) DO UPDATE SET Points=Points+?",
-		GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race");
+		GetPrefix(), g_Config.m_SvKoMode);
 	if(PrepareStatement(aBuf, pError, ErrorSize))
 	{
 		return true;

src/engine/shared/config_variables.h

@@ -661,7 +661,7 @@ MACRO_CONFIG_INT(SvKoPublicChat, sv_ko_public_chat, 0, 0, 1, CFGFLAG_SERVER, "ma
 MACRO_CONFIG_INT(SvKoFirstTo, sv_ko_first_to, 0, 0, 5, CFGFLAG_SERVER, "Activates ko-run mode, first to X wins the game (KO GAME)")
 MACRO_CONFIG_INT(SvForcePredictionMargin, sv_force_prediction_margin, 0, 0, 200, CFGFLAG_SERVER, "force players to have a higher prediction margin for more consistant gameplay")
 MACRO_CONFIG_INT(SvKoSQL, sv_ko_sql, 0, 0, 1, CFGFLAG_SERVER, "Save result of cup of the day in database")
-MACRO_CONFIG_INT(SvKoMode, sv_ko_mode, 0, 0, 1, CFGFLAG_SERVER, "Cup of the day Mode: 0 = gores, 1 = race")
+MACRO_CONFIG_STR(SvKoMode, sv_ko_mode, 128, "race", CFGFLAG_SERVER, "Cup of the day Mode, example usage: sv_ko_mode race")
 MACRO_CONFIG_INT(SvKoSetSlots, sv_ko_set_slots, 0, 0, 1, CFGFLAG_SERVER, "If slots are automatically set & unset by server")
 
 

src/game/server/gamemodes/DDRace.cpp

@@ -39,7 +39,7 @@ void CGameControllerDDRace::KO_Start()
 	has_finished = false;
 	bool finished = (GameServer()->ko_player_count <= 1);
 
-	if(GameServer()->ko_round >= g_Config.m_SvKoFirstTo*3)
+	if(g_Config.m_SvKoFirstTo && GameServer()->ko_round >= g_Config.m_SvKoFirstTo*3)
 	{
 		GameServer()->SendChat(-1, TEAM_ALL, "Ran out of rounds");
 		finished = true;

src/game/server/scoreworker.cpp

@@ -829,7 +829,7 @@ bool CScoreWorker::SaveCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 	{
 		str_format(aBuf, sizeof(aBuf),
 			"SELECT COUNT(*) AS COTD_FINISH FROM %s_cotd_ranks_%s WHERE Map=? AND Name=? ORDER BY Rank ASC LIMIT 1",
-			pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race");
+			pSqlServer->GetPrefix(), g_Config.m_SvKoMode);
 		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 		{
 			return true;
@@ -847,7 +847,7 @@ bool CScoreWorker::SaveCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 		{
 			str_format(aBuf, sizeof(aBuf),
 			"INSERT INTO %s_cotd_ranks_%s(Name, Map, Rank) VALUES(?, ?, %i)",
-			pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race", pData->m_Rank);
+			pSqlServer->GetPrefix(), g_Config.m_SvKoMode, pData->m_Rank);
 
 			if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 			{
@@ -885,8 +885,8 @@ bool CScoreWorker::ShowCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 		"    SELECT Points FROM %s_cotd_points_%s WHERE Name = ?"
 		")) as Ranking, Points, Name "
 		"FROM %s_cotd_points_%s WHERE Name = ?",
-		pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race", pSqlServer->GetPrefix(),
-		g_Config.m_SvKoMode == 0 ? "gores" : "race", pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race");
+		pSqlServer->GetPrefix(), g_Config.m_SvKoMode, pSqlServer->GetPrefix(),
+		g_Config.m_SvKoMode, pSqlServer->GetPrefix(), g_Config.m_SvKoMode);
 
 	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 	{
@@ -909,12 +909,12 @@ bool CScoreWorker::ShowCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 		pResult->m_MessageKind = CScorePlayerResult::ALL;
 		str_format(paMessages[0], sizeof(paMessages[0]),
 			"%d. %s COTD %s Points: %d, requested by %s",
-			Rank, aName, g_Config.m_SvKoMode == 0 ? "gores" : "race", Count, pData->m_aRequestingPlayer);
+			Rank, aName, g_Config.m_SvKoMode, Count, pData->m_aRequestingPlayer);
 	}
 	else
 	{
 		str_format(paMessages[0], sizeof(paMessages[0]),
-			"%s has not collected any cotd %s points so far", pData->m_aName, g_Config.m_SvKoMode == 0 ? "gores" : "race");
+			"%s has not collected any cotd %s points so far", pData->m_aName, g_Config.m_SvKoMode);
 	}
 	return false;
 }