Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-01-19 16:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip Confirm+

Browse source
This commit is contained in:
ChocoTaco 2025-01-11 17:41:16 -05:00
parent a9bc48fa53
commit be0adbecca
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classic/scripts/DMGame.cs
View file

@ -839,7 +839,7 @@ function DMGame::sendGameVoteMenu(%game, %client, %key)
if(%game.scheduleVote $= "")
{
//echo(%client.ForceVote);
if(%client.ForceVote $= "skip_confirm")
if(%client.ForceVote $= "skip_confirm+")
return;
if(!%isAdmin || (%isAdmin && %client.ForceVote))

2
Classic/scripts/LCTFGame.cs
View file

@ -2265,7 +2265,7 @@ function LCTFGame::sendGameVoteMenu(%game, %client, %key)
if(%game.scheduleVote $= "")
{
//echo(%client.ForceVote);
if(%client.ForceVote $= "skip_confirm")
if(%client.ForceVote $= "skip_confirm+")
return;
if(!%isAdmin || (%isAdmin && %client.ForceVote))

2
Classic/scripts/LakRabbitGame.cs
View file

@ -1175,7 +1175,7 @@ function LakRabbitGame::sendGameVoteMenu( %game, %client, %key )
if( %game.scheduleVote $= "" )
{
//echo(%client.ForceVote);
if(%client.ForceVote $= "skip_confirm")
if(%client.ForceVote $= "skip_confirm+")
return;
if(!%isAdmin || (%isAdmin && %client.ForceVote))

2
Classic/scripts/SCtFGame.cs
View file

@ -2006,7 +2006,7 @@ function SCtFGame::sendGameVoteMenu(%game, %client, %key)
if ( %game.scheduleVote $= "" )
{
//echo(%client.ForceVote);
if(%client.ForceVote $= "skip_confirm")
if(%client.ForceVote $= "skip_confirm+")
return;
if(!%isAdmin || (%isAdmin && %client.ForceVote))

9
Classic/scripts/autoexec/VoteMenu.cs
View file

@ -43,6 +43,8 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
if(%client.ForceVote > 0)
%client.ForceVote = %client.ForceVote - 1;
if(%client.ForceVote $= "skip_confirm+")
%client.ForceVote = 0;
//Admin Submenu
if(%client.ForceVote > 0)
@ -67,6 +69,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
{
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipConfirm', 'Are you sure you want to Skip the Mission?','Are you sure you want to Skip the Mission?');
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'Yes, Skip the Mission', 'Yes, Skip the Mission' );
%client.ForceVote = "skip_confirm+";
return;
}
@ -554,13 +557,13 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
}
case "VoteSkipConfirm":
if(%isAdmin && %client.ForceVote !$= "skip_confirm")
if(%client.ForceVote $= "skip_confirm+")
%client.ForceVote = 0;
else if(%isAdmin && %client.ForceVote !$= "skip_confirm")
{
%client.ForceVote = "skip_confirm";
return;
}
else
%client.ForceVote = 0;
case "VoteSkipMission":
if((!%isAdmin && $Host::AllowPlayerVoteSkipMission) || (%isAdmin && %client.ForceVote))