diff --git a/MskGs/Classes/MskGsVoteCollector.uc b/MskGs/Classes/MskGsVoteCollector.uc index bb50c78..e64b8da 100644 --- a/MskGs/Classes/MskGsVoteCollector.uc +++ b/MskGs/Classes/MskGsVoteCollector.uc @@ -97,8 +97,7 @@ function WarnKicker(PlayerReplicationInfo PRI_Kickee, PlayerReplicationInfo PRI_ if (!IsKickerWarned(KFPC_Kicker)) { KickWarningList.AddItem(KFPC_Kicker); - WorldInfo.Game.Broadcast(KFPC_Kicker, PRI_Kicker.PlayerName@"tried to kick"@PRI_Kickee.PlayerName); - WorldInfo.Game.Broadcast(KFPC_Kicker, "If he tries to do it again, the hand of God will punish him"); + WorldInfo.Game.Broadcast(KFPC_Kicker, PRI_Kicker.PlayerName@"tried to kick"@PRI_Kickee.PlayerName$". If he tries to do it again, the hand of God will punish him"); } } diff --git a/MskGs/Classes/MskGs_Endless.uc b/MskGs/Classes/MskGs_Endless.uc index 7053364..431f399 100644 --- a/MskGs/Classes/MskGs_Endless.uc +++ b/MskGs/Classes/MskGs_Endless.uc @@ -111,30 +111,6 @@ function UpdateGameSettings() } } } - -function WaveEnded(EWaveEndCondition WinCondition) -{ - if(!bWaveStarted && !MyKFGRI.bTraderIsOpen) - return; - - WaveMax = WaveNum + 2; - MyKFGRI.WaveMax = WaveMax; - - if(KFGameReplicationInfo_Endless(GameReplicationInfo).CurrentWeeklyMode != INDEX_NONE) - { - EndOutbreakRound(); - } - bUseSpecialWave = false; - - KFGameReplicationInfo_Endless(GameReplicationInfo).CurrentWeeklyMode = INDEX_NONE; - KFGameReplicationInfo_Endless(GameReplicationInfo).CurrentSpecialMode = INDEX_NONE; - - HellOnEarthPlusRoundIncrement(); - - Super(KFGameInfo_Survival).WaveEnded(WinCondition); - - TrySetNextWaveSpecial(); -} defaultproperties {