From 9a8df716bb1be96acdfa490f5e6353ab4236682e Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Sat, 29 Apr 2023 21:51:17 -0700 Subject: [PATCH] Fix script errors related to player damage callback. --- maps/bots/_bot.gsc | 8 ++++---- maps/bots/_bot_internal.gsc | 2 +- maps/bots/_bot_script.gsc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maps/bots/_bot.gsc b/maps/bots/_bot.gsc index 49bbffa..0484e81 100644 --- a/maps/bots/_bot.gsc +++ b/maps/bots/_bot.gsc @@ -140,15 +140,15 @@ handleBots() /* The hook callback for when any player becomes damaged. */ -onPlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset ) +onPlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, modelIndex, psOffsetTime ) { if ( self is_bot() ) { - self maps\bots\_bot_internal::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset ); - self maps\bots\_bot_script::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset ); + self maps\bots\_bot_internal::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, modelIndex, psOffsetTime ); + self maps\bots\_bot_script::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, modelIndex, psOffsetTime ); } - self [[level.prevCallbackPlayerDamage]]( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, iModelIndex, timeOffset ); + self [[level.prevCallbackPlayerDamage]]( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, modelIndex, psOffsetTime ); } /* diff --git a/maps/bots/_bot_internal.gsc b/maps/bots/_bot_internal.gsc index b95e07a..83c880b 100644 --- a/maps/bots/_bot_internal.gsc +++ b/maps/bots/_bot_internal.gsc @@ -106,7 +106,7 @@ resetBotVars() /* The callback hook when the bot gets damaged. */ -onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset ) +onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, modelIndex, psOffsetTime ) { } diff --git a/maps/bots/_bot_script.gsc b/maps/bots/_bot_script.gsc index 861b834..bbaa8f1 100644 --- a/maps/bots/_bot_script.gsc +++ b/maps/bots/_bot_script.gsc @@ -25,7 +25,7 @@ connected() /* The callback for when the bot gets damaged. */ -onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset ) +onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, modelIndex, psOffsetTime ) { }