diff --git a/ServerExt/Classes/ExtHumanPawn.uc b/ServerExt/Classes/ExtHumanPawn.uc index 10a0b05..6a6d07a 100644 --- a/ServerExt/Classes/ExtHumanPawn.uc +++ b/ServerExt/Classes/ExtHumanPawn.uc @@ -816,7 +816,7 @@ ignores FaceRotation, SetMovementPhysics; { return (bForceCheck ? Global.CanDoSpecialMove(AMove,bForceCheck) : false); } - function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling) + function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling, optional bool bAllowSameTeamGrab) { return false; } diff --git a/ServerExt/Classes/ExtPlayerController.uc b/ServerExt/Classes/ExtPlayerController.uc index 9c65707..8057d2f 100644 --- a/ServerExt/Classes/ExtPlayerController.uc +++ b/ServerExt/Classes/ExtPlayerController.uc @@ -597,7 +597,7 @@ simulated function CancelConnection() function NotifyLevelUp(class PerkClass, byte PerkLevel); -function ShowBossNameplate( KFPawn_Monster KFBoss, optional string PlayerName) +function ShowBossNameplate( KFInterface_MonsterBoss KFBoss, optional string PlayerName) { if( !bNamePlateShown ) // Dont make multiple bosses pop this up multiple times. { diff --git a/ServerExt/Classes/ExtPlayerReplicationInfo.uc b/ServerExt/Classes/ExtPlayerReplicationInfo.uc index 926aa58..c165d9c 100644 --- a/ServerExt/Classes/ExtPlayerReplicationInfo.uc +++ b/ServerExt/Classes/ExtPlayerReplicationInfo.uc @@ -8,7 +8,7 @@ struct FCustomCharEntry }; struct FMyCustomChar // Now without constant. { - var byte CharacterIndex,HeadMeshIndex,HeadSkinIndex,BodyMeshIndex,BodySkinIndex,AttachmentMeshIndices[`MAX_COSMETIC_ATTACHMENTS],AttachmentSkinIndices[`MAX_COSMETIC_ATTACHMENTS]; + var int CharacterIndex,HeadMeshIndex,HeadSkinIndex,BodyMeshIndex,BodySkinIndex,AttachmentMeshIndices[`MAX_COSMETIC_ATTACHMENTS],AttachmentSkinIndices[`MAX_COSMETIC_ATTACHMENTS]; structdefaultproperties { diff --git a/ServerExt/Classes/ExtWidget_BossHealthBar.uc b/ServerExt/Classes/ExtWidget_BossHealthBar.uc index 820317f..7ece3ae 100644 --- a/ServerExt/Classes/ExtWidget_BossHealthBar.uc +++ b/ServerExt/Classes/ExtWidget_BossHealthBar.uc @@ -52,13 +52,13 @@ final function bool HasBossesAlive() return (BossList.Length>0); } -function SetBossPawn(KFPawn_Monster NewBossPawn) +function SetBossPawn(KFInterface_MonsterBoss NewBoss) { - if( !KFPC.bHideBossHealthBar && NewBossPawn!=None && NewBossPawn.IsAliveAndWell() ) + if( !KFPC.bHideBossHealthBar && NewBoss!=None && NewBoss.GetMonsterPawn().IsAliveAndWell() ) { bHasInit = true; ++NumBosses; - BossList.AddItem(NewBossPawn); + BossList.AddItem(NewBoss.GetMonsterPawn()); } } @@ -73,7 +73,7 @@ final function UpdateBossInfo() CheckBestBoss(); } - V = (BossPawn!=None ? FClamp(float(BossPawn.Health) / float(BossPawn.HealthMax),0.f,1.f) : 0.f); + V = (BossPawn!=None ? FClamp(float(BossPawn.GetMonsterPawn().Health) / float(BossPawn.GetMonsterPawn().HealthMax),0.f,1.f) : 0.f); if( LastHP!=V ) { LastHP = V; @@ -114,7 +114,7 @@ final function CheckBestBoss() if( Best!=BossPawn ) { BossPawn = Best; - SetBossName(Best.BossName); + SetBossName(Best.static.GetLocalizedName()); } } diff --git a/ServerExt/Classes/KFPawn_ZedSirenX.uc b/ServerExt/Classes/KFPawn_ZedSirenX.uc index 8905bd1..41b1d44 100644 --- a/ServerExt/Classes/KFPawn_ZedSirenX.uc +++ b/ServerExt/Classes/KFPawn_ZedSirenX.uc @@ -1,6 +1,6 @@ class KFPawn_ZedSirenX extends KFPawn_ZedSiren; -function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling) +function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling, optional bool bAllowSameTeamGrab) { return false; } diff --git a/ServerExt/Classes/VSZombie.uc b/ServerExt/Classes/VSZombie.uc index b9a5360..5c3d837 100644 --- a/ServerExt/Classes/VSZombie.uc +++ b/ServerExt/Classes/VSZombie.uc @@ -429,7 +429,7 @@ function bool DoJump( bool bUpdating ) } // Nope. -function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling) +function bool CanBeGrabbed(KFPawn GrabbingPawn, optional bool bIgnoreFalling, optional bool bAllowSameTeamGrab) { return false; }