Already in classic

This commit is contained in:
ChocoTaco1 2020-03-24 23:13:09 -04:00
parent 285bed0135
commit 0af69a7df7

View file

@ -174,7 +174,7 @@ function ShapeBase::throwObject(%this,%obj)
{
%obj.static = false;
// z0dd - ZOD - SquirrelOfDeath, 10/02/02. Hack for flag collision bug.
if(Game.Class $= CTFGame || Game.Class $= PracticeCTFGame)
if(Game.Class $= CTFGame || Game.Class $= PracticeCTFGame || Game.Class $= SCtFGame)
%obj.searchSchedule = Game.schedule(10, "startFlagCollisionSearch", %obj);
}
@ -283,13 +283,6 @@ function resetObserveFollow( %client, %dismount )
}
}
// ilys - Start checkSpeed schedule on MPB
function MobileBaseVehicle::onAdd(%this, %obj)
{
Parent::onAdd(%this, %obj);
%obj.schedule(5000, "checkSpeed", %obj);
}
// ilys - checkSpeed function. Kill the driver and MPB if going too fast.
function WheeledVehicle::checkSpeed(%data, %obj)
{
@ -374,33 +367,6 @@ function serverCmdPlayAnim(%client, %anim)
// Not used in Classic
}
// ilys - Do not allow animations inside a forcefield.
// ilys - Unmount the mortar and grenade launcher on animation.
function PlayAnim(%client, %anim)
{
if( %anim $= "Death1" || %anim $= "Death2" || %anim $= "Death3" || %anim $= "Death4" || %anim $= "Death5" ||
%anim $= "Death6" || %anim $= "Death7" || %anim $= "Death8" || %anim $= "Death9" || %anim $= "Death10" ||
%anim $= "Death11" || %anim $= "sitting" || %anim $= "scoutRoot" || %anim $= "look" || %anim $= "lookms" ||
%anim $= "looknw" || %anim $= "head" || %anim $= "headSide" || %anim $= "ski" || %anim $= "light_recoil")
return;
%player = %client.player;
if(!isObject(%player))
return;
if(%player.isMounted() || %player.isInForceField())
return;
%weapon = ( %player.getMountedImage($WeaponSlot) == 0 ) ? "" : %player.getMountedImage($WeaponSlot).getName().item;
if(%weapon $= "MissileLauncher" || %weapon $= "GrenadeLauncher" || %weapon $= "SniperRifle" || %weapon $= "Mortar")
{
%player.animResetWeapon = true;
%player.lastWeapon = %weapon;
%player.unmountImage($WeaponSlot);
%player.setArmThread(look);
}
%player.setActionThread(%anim);
}
// ilys - Fix for the Standing Pilot bug
function Armor::onMount(%this,%obj,%vehicle,%node)
{