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

Merge branch 'Dev' into Stable

Browse source
This commit is contained in:
ChocoTaco 2024-08-21 10:00:36 -04:00
commit 6a24073739
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -443,7 +443,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
} }
// 30 minutes Only in Tournament mode // 30 minutes Only in Tournament mode
if($Host::TournamentMode && %arg1 !$= "30") if($Host::TournamentMode && %arg1 !$= "30" && !%client.isSuperAdmin)
{ {
messageClient(%client, "", "\c2Only 30 minute time limit allowed in tournament mode."); messageClient(%client, "", "\c2Only 30 minute time limit allowed in tournament mode.");
return; return;

33
Classic/scripts/server.cs
View file

@ -3318,13 +3318,34 @@ function serverCmdProcessGameLink(%client, %arg1, %arg2, %arg3, %arg4, %arg5)
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// z0dd - ZOD, 6/03/02. New function. Impact hit sounds settings from clientprefs.cs. // z0dd - ZOD, 6/03/02. New function. Impact hit sounds settings from clientprefs.cs.
function serverCmdSetHitSounds( %client, %playerHitsOn, %playerHitWav, %vehicleHitsOn, %vehicleHitWav ) // function serverCmdSetHitSounds( %client, %playerHitsOn, %playerHitWav, %vehicleHitsOn, %vehicleHitWav )
{ // {
%client.playerHitSound = %playerHitsOn; // %client.playerHitSound = %playerHitsOn;
%client.playerHitWav = addtaggedString(%playerHitWav); // %client.playerHitWav = addtaggedString(%playerHitWav);
%client.vehicleHitSound = %vehicleHitsOn; // %client.vehicleHitSound = %vehicleHitsOn;
%client.vehicleHitWav = addtaggedString(%vehicleHitWav); // %client.vehicleHitWav = addtaggedString(%vehicleHitWav);
// }
//Rewritten to prevent overflows
function serverCmdSetHitSounds( %client, %playerHitsOn, %playerHitWav, %vehicleHitsOn, %vehicleHitWav ){
if(%client.hitTagSoundCount < 15){// limit this to prevent string table overflow
%client.playerHitSound = %playerHitsOn;
%client.playerHitWav = addtaggedString(%playerHitWav);
if(!%client.hitTagSound[%client.playerHitWav]){
%client.hitTagSound[%client.playerHitWav] = 1;
%client.hitTagSoundCount++;
}
%client.vehicleHitSound = %vehicleHitsOn;
%client.vehicleHitWav = addtaggedString(%vehicleHitWav);
if(!%client.hitTagSound[%client.vehicleHitWav]){
%client.hitTagSound[%client.vehicleHitWav] = 1;
%client.hitTagSoundCount++;
}
}
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------