From 162216944f3e342424909a86f031f3e2d7982699 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 27 Jul 2024 13:51:07 -0400 Subject: [PATCH 1/2] Allow SA change time touney mode Super Admin can change timelimit in Tournament mode --- Classic/scripts/autoexec/VoteMenu.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index 8009f34..6140c5f 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -443,7 +443,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % } // 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."); return; From 5dc7c0c8c7082a6e4f5bc28a9b9b63e690a123b6 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 21 Aug 2024 00:59:23 -0400 Subject: [PATCH 2/2] Hitsound overflow fix --- Classic/scripts/server.cs | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/Classic/scripts/server.cs b/Classic/scripts/server.cs index 46dfc28..c3ba505 100644 --- a/Classic/scripts/server.cs +++ b/Classic/scripts/server.cs @@ -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. -function serverCmdSetHitSounds( %client, %playerHitsOn, %playerHitWav, %vehicleHitsOn, %vehicleHitWav ) -{ - %client.playerHitSound = %playerHitsOn; - %client.playerHitWav = addtaggedString(%playerHitWav); +// function serverCmdSetHitSounds( %client, %playerHitsOn, %playerHitWav, %vehicleHitsOn, %vehicleHitWav ) +// { +// %client.playerHitSound = %playerHitsOn; +// %client.playerHitWav = addtaggedString(%playerHitWav); - %client.vehicleHitSound = %vehicleHitsOn; - %client.vehicleHitWav = addtaggedString(%vehicleHitWav); +// %client.vehicleHitSound = %vehicleHitsOn; +// %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++; + } + } } //-----------------------------------------------------------------------------------