Future/iw4_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw4_bot_warfare.git synced 2025-04-21 05:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix up errors

Browse Source
This commit is contained in:
ineedbots 2021-11-10 15:54:34 -06:00
parent 9fa8506daf
commit d34c33e74b
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
userraw/maps/mp/gametypes/_damage.gsc
View File

@ -1594,6 +1594,8 @@ Callback_PlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, s
doPrintDamage(dmg, hitloc, flags) doPrintDamage(dmg, hitloc, flags)
{ {
self endon( "disconnect" );
huddamage = newclienthudelem(self); huddamage = newclienthudelem(self);
huddamage.alignx = "center"; huddamage.alignx = "center";
huddamage.horzalign = "center"; huddamage.horzalign = "center";
@ -1625,6 +1627,7 @@ doPrintDamage(dmg, hitloc, flags)
wait 1; wait 1;
if ( isDefined( huddamage ) )
huddamage destroy(); huddamage destroy();
} }
@ -1633,10 +1636,15 @@ finishPlayerDamageWrapper( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeat
{ {
if( level.allowPrintDamage ) if( level.allowPrintDamage )
{ {
if ( isDefined( eAttacker ) && isPlayer( eAttacker ) && eAttacker.printDamage ) if ( !isDefined( eAttacker ) )
eAttacker thread doPrintDamage(iDamage, sHitLoc, iDFlags); {
if ( !isDefined( eInflictor ) )
self thread doPrintDamage( iDamage, sHitLoc, iDFlags );
}
if ( isPlayer( eAttacker ) && eAttacker.printDamage )
eAttacker thread doPrintDamage( iDamage, sHitLoc, iDFlags );
else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && eAttacker.owner.printDamage ) else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && eAttacker.owner.printDamage )
eAttacker.owner thread doPrintDamage(iDamage, sHitLoc, iDFlags); eAttacker.owner thread doPrintDamage( iDamage, sHitLoc, iDFlags );
} }
if( level.extraDamageFeedback ) if( level.extraDamageFeedback )

2
userraw/maps/mp/gametypes/_weapons.gsc
View File

@ -1572,7 +1572,7 @@ setClaymoreTeamHeadIcon( team )
{ {
self endon( "death" ); self endon( "death" );
if ( self.weaponname == "claymore_mp" && !level.allowExtendedClaymoreTrace ) if ( isDefined( self.weaponname ) && self.weaponname == "claymore_mp" && !level.allowExtendedClaymoreTrace )
{ {
self waittill( "missile_stuck" ); self waittill( "missile_stuck" );
self waittill( "claymore_trace_fixed" ); self waittill( "claymore_trace_fixed" );

3
userraw/maps/mp/killstreaks/_killstreaks.gsc
View File

@ -702,8 +702,11 @@ giveKillstreakWeapon( weapon )
self takeWeapon( item ); self takeWeapon( item );
} }
if ( isDefined( weapon ) && weapon != "" )
{
self _giveWeapon( weapon, 0 ); self _giveWeapon( weapon, 0 );
self _setActionSlot( 4, "weapon", weapon ); self _setActionSlot( 4, "weapon", weapon );
}
} }