diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index 1c0b3c5..af9bff8 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -184,7 +184,9 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % // Show smurf names correctly if(%client.isSmurf) - %client.nameBase = stripChars( detag( getTaggedString( %client.name ) ), "\cp\co\c6\c7\c8\c9" ); + %votername = stripChars( detag( getTaggedString( %client.name ) ), "\cp\co\c6\c7\c8\c9" ); + else + %votername = %client.nameBase; %teamSpecific = 0; switch$(%typeName) @@ -221,7 +223,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % return; } - %msg = %client.nameBase @ " initiated a vote to kick player " @ %arg1.nameBase @ "."; + %msg = %votername @ " initiated a vote to kick player " @ %arg1.nameBase @ "."; messageAdmins("", "\c5[A]\c1"@ %msg @"~wgui/objective_notification.wav"); $CMHasVoted[%client.guid]++; } @@ -249,7 +251,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % if(!$host::allowadminplayervotes) // admin player votes are NOT enabled return; // can't do that pal - %msg = %client.nameBase @ " initiated a vote to admin player " @ %arg1.nameBase @ "."; + %msg = %votername @ " initiated a vote to admin player " @ %arg1.nameBase @ "."; } case "BanPlayer": @@ -275,14 +277,14 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % return; } - %msg = %client.nameBase @ " initiated a vote to change the mission to " @ %arg1 @ " (" @ %arg2 @ ")."; + %msg = %votername @ " initiated a vote to change the mission to " @ %arg1 @ " (" @ %arg2 @ ")."; $CMHasVoted[%client.guid]++; } case "VoteTeamDamage": if(!%isAdmin) { - %msg = %client.nameBase @ " initiated a vote to " @ ($TeamDamage == 0 ? "enable" : "disable") @ " team damage."; + %msg = %votername @ " initiated a vote to " @ ($TeamDamage == 0 ? "enable" : "disable") @ " team damage."; } case "VoteTournamentMode": @@ -294,13 +296,13 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % return; } - %msg = %client.nameBase @ " initiated a vote to switch the server to Tournament Mode (" @ %arg1 @ ")."; + %msg = %votername @ " initiated a vote to switch the server to Tournament Mode (" @ %arg1 @ ")."; } case "VoteFFAMode": if(!%isAdmin || (%isAdmin && %client.ForceVote)) { - %msg = %client.nameBase @ " initiated a vote to switch the server to Free For All mode."; + %msg = %votername @ " initiated a vote to switch the server to Free For All mode."; } case "VoteChangeTimeLimit": @@ -346,7 +348,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % if((!%isAdmin && $Host::AllowPlayerVoteTimeLimit) || (%isAdmin && %client.ForceVote)) { if(%arg1 $= "999") %time = "unlimited"; else %time = %arg1; - %msg = %client.nameBase @ " initiated a vote to change the time limit to " @ %time @ "."; + %msg = %votername @ " initiated a vote to change the time limit to " @ %time @ "."; // VoteOvertime StartVOTimeVote(%game); $CMHasVoted[%client.guid]++; @@ -358,7 +360,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % if($MatchStarted || $CountdownStarted) return; - %msg = %client.nameBase @ " initiated a vote to start the match."; + %msg = %votername @ " initiated a vote to start the match."; } case "CancelMatchStart": @@ -373,25 +375,25 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.greedMode == 0 ? "enable" : "disable") @ " greed mode."; + %msg = %votername @ " initiated a vote to " @ (Game.greedMode == 0 ? "enable" : "disable") @ " greed mode."; case "VoteHoardMode": if($CurrentMissionType !$= "Hunters" || $CurrentMissionType !$= "TeamHunters") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.hoardMode == 0 ? "enable" : "disable") @ " hoard mode."; + %msg = %votername @ " initiated a vote to " @ (Game.hoardMode == 0 ? "enable" : "disable") @ " hoard mode."; case "VoteRandomTeams": if(!%isAdmin || (%isAdmin && %client.ForceVote)) { - %msg = %client.nameBase @ " initiated a vote to " @ ($RandomTeams == 0 ? "enable" : "disable") @ " random teams."; + %msg = %votername @ " initiated a vote to " @ ($RandomTeams == 0 ? "enable" : "disable") @ " random teams."; } case "VoteFairTeams": if(!%isAdmin || (%isAdmin && %client.ForceVote)) { - %msg = %client.nameBase @ " initiated a vote to " @ ($FairTeams == 0 ? "enable" : "disable") @ " fair teams."; + %msg = %votername @ " initiated a vote to " @ ($FairTeams == 0 ? "enable" : "disable") @ " fair teams."; } case "VoteSkipMission": @@ -403,7 +405,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % return; } - %msg = %client.nameBase @ " initiated a vote to skip the current mission."; + %msg = %votername @ " initiated a vote to skip the current mission."; $CMHasVoted[%client.guid]++; } @@ -427,35 +429,35 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.duelMode == 0 ? "enable" : "disable") @ " duel mode."; + %msg = %votername @ " initiated a vote to " @ (Game.duelMode == 0 ? "enable" : "disable") @ " duel mode."; case "VoteSplashDamage": if(!$CurrentMissionType $= "LakRabbit") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.noSplashDamage == 0 ? "enable" : "disable") @ " splash damage."; + %msg = %votername @ " initiated a vote to " @ (Game.noSplashDamage == 0 ? "enable" : "disable") @ " splash damage."; case "VotePro": if(!$CurrentMissionType $= "LakRabbit") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.pubPro == 0 ? "enable" : "disable") @ " pro mode."; + %msg = %votername @ " initiated a vote to " @ (Game.pubPro == 0 ? "enable" : "disable") @ " pro mode."; case "DMSLOnlyMode": if(!$CurrentMissionType $= "DM") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.DMSLOnlyMode == 0 ? "enable" : "disable") @ " shocklance only mode."; + %msg = %votername @ " initiated a vote to " @ (Game.DMSLOnlyMode == 0 ? "enable" : "disable") @ " shocklance only mode."; case "SCtFProMode": if(!$CurrentMissionType $= "sctf") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.SCtFProMode == 0 ? "enable" : "disable") @ " pro mode."; + %msg = %votername @ " initiated a vote to " @ (Game.SCtFProMode == 0 ? "enable" : "disable") @ " pro mode."; case "showServerRules": if (($Host::ServerRules[1] !$= "") && (!%client.CantView))