Fixed errors preventing compilation for 5 patch_mp scripts.

_acousticsensor.gsc, _scrambler.gsc, _sensor_grenade.gsc, _globallogic_player.gsc and _weaponobjects.gsc all required fixed function pointers.
This commit is contained in:
JezuzLizard 2021-01-29 02:28:00 -08:00
parent 4d3669b782
commit cdae047b49
5 changed files with 9 additions and 9 deletions

View File

@ -19,7 +19,7 @@ createacousticsensorwatcher() //checked matches cerberus output
watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "acoustic_sensor", "acoustic_sensor_mp", self.team ); watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "acoustic_sensor", "acoustic_sensor_mp", self.team );
watcher.onspawn = ::onspawnacousticsensor; watcher.onspawn = ::onspawnacousticsensor;
watcher.detonate = ::acousticsensordetonate; watcher.detonate = ::acousticsensordetonate;
watcher.stun = ::maps/mp/gametypes/_weaponobjects::weaponstun; watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
watcher.stuntime = 5; watcher.stuntime = 5;
watcher.reconmodel = "t5_weapon_acoustic_sensor_world_detect"; watcher.reconmodel = "t5_weapon_acoustic_sensor_world_detect";
watcher.hackable = 1; watcher.hackable = 1;

View File

@ -22,7 +22,7 @@ createscramblerwatcher() //checked matches cerberus output
watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "scrambler", "scrambler_mp", self.team ); watcher = self maps/mp/gametypes/_weaponobjects::createuseweaponobjectwatcher( "scrambler", "scrambler_mp", self.team );
watcher.onspawn = ::onspawnscrambler; watcher.onspawn = ::onspawnscrambler;
watcher.detonate = ::scramblerdetonate; watcher.detonate = ::scramblerdetonate;
watcher.stun = ::maps/mp/gametypes/_weaponobjects::weaponstun; watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
watcher.stuntime = 5; watcher.stuntime = 5;
watcher.reconmodel = "t5_weapon_scrambler_world_detect"; watcher.reconmodel = "t5_weapon_scrambler_world_detect";
watcher.hackable = 1; watcher.hackable = 1;

View File

@ -20,7 +20,7 @@ createsensorgrenadewatcher() //checked matches cerberus output
watcher.headicon = 0; watcher.headicon = 0;
watcher.onspawn = ::onspawnsensorgrenade; watcher.onspawn = ::onspawnsensorgrenade;
watcher.detonate = ::sensorgrenadedestroyed; watcher.detonate = ::sensorgrenadedestroyed;
watcher.stun = ::maps/mp/gametypes/_weaponobjects::weaponstun; watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
watcher.stuntime = 0; watcher.stuntime = 0;
watcher.reconmodel = "t6_wpn_motion_sensor_world_detect"; watcher.reconmodel = "t6_wpn_motion_sensor_world_detect";
watcher.ondamage = ::watchsensorgrenadedamage; watcher.ondamage = ::watchsensorgrenadedamage;

View File

@ -826,7 +826,7 @@ callback_playerdamage( einflictor, eattacker, idamage, idflags, smeansofdeath, s
{ {
smeansofdeath = "MOD_HEAD_SHOT"; smeansofdeath = "MOD_HEAD_SHOT";
} }
if ( level.onplayerdamage != ::maps/mp/gametypes/_globallogic::blank ) if ( level.onplayerdamage != maps/mp/gametypes/_globallogic::blank )
{ {
modifieddamage = [[ level.onplayerdamage ]]( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime ); modifieddamage = [[ level.onplayerdamage ]]( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime );
if ( isDefined( modifieddamage ) ) if ( isDefined( modifieddamage ) )

View File

@ -219,9 +219,9 @@ setupretrievablewatcher() //checked changed to match cerberus output
createballisticknifewatcher() //checked matches cerberus output createballisticknifewatcher() //checked matches cerberus output
{ {
watcher = self createuseweaponobjectwatcher( "knife_ballistic", "knife_ballistic_mp", self.team ); watcher = self createuseweaponobjectwatcher( "knife_ballistic", "knife_ballistic_mp", self.team );
watcher.onspawn = ::maps/mp/_ballistic_knife::onspawn; watcher.onspawn = maps/mp/_ballistic_knife::onspawn;
watcher.detonate = ::deleteent; watcher.detonate = ::deleteent;
watcher.onspawnretrievetriggers = ::maps/mp/_ballistic_knife::onspawnretrievetrigger; watcher.onspawnretrievetriggers = maps/mp/_ballistic_knife::onspawnretrievetrigger;
watcher.storedifferentobject = 1; watcher.storedifferentobject = 1;
} }
@ -249,7 +249,7 @@ creatercbombwatcher() //checked matches cerberus output
watcher.ownergetsassist = 1; watcher.ownergetsassist = 1;
watcher.playdestroyeddialog = 0; watcher.playdestroyeddialog = 0;
watcher.deleteonkillbrush = 0; watcher.deleteonkillbrush = 0;
watcher.detonate = ::maps/mp/killstreaks/_rcbomb::blowup; watcher.detonate = maps/mp/killstreaks/_rcbomb::blowup;
watcher.stuntime = 1; watcher.stuntime = 1;
} }
@ -262,8 +262,8 @@ createqrdronewatcher() //checked matches cerberus output
watcher.ownergetsassist = 1; watcher.ownergetsassist = 1;
watcher.playdestroyeddialog = 0; watcher.playdestroyeddialog = 0;
watcher.deleteonkillbrush = 0; watcher.deleteonkillbrush = 0;
watcher.detonate = ::maps/mp/killstreaks/_qrdrone::qrdrone_blowup; watcher.detonate = maps/mp/killstreaks/_qrdrone::qrdrone_blowup;
watcher.ondamage = ::maps/mp/killstreaks/_qrdrone::qrdrone_damagewatcher; watcher.ondamage = maps/mp/killstreaks/_qrdrone::qrdrone_damagewatcher;
watcher.stuntime = 5; watcher.stuntime = 5;
} }