diff --git a/ScoreboardExt/Classes/DamageReplicationInfo.uc b/ScoreboardExt/Classes/DamageReplicationInfo.uc index ac6e325..df1e859 100644 --- a/ScoreboardExt/Classes/DamageReplicationInfo.uc +++ b/ScoreboardExt/Classes/DamageReplicationInfo.uc @@ -4,7 +4,7 @@ var KFPlayerController KFPC; unreliable client function ClientNumberMsg( int Count, vector Pos, class Type ) { - ClassicKFHUD(KFPC.MyHUD).AddNumberMsg(Count,Pos,Type); + ScoreboardExtHUD(KFPC.MyHUD).AddNumberMsg(Count,Pos,Type); } defaultproperties diff --git a/ScoreboardExt/Classes/GUIStyleBase.uc b/ScoreboardExt/Classes/GUIStyleBase.uc index ab3170b..8662d67 100644 --- a/ScoreboardExt/Classes/GUIStyleBase.uc +++ b/ScoreboardExt/Classes/GUIStyleBase.uc @@ -11,7 +11,7 @@ var() byte MaxFontScale; var float DefaultHeight; // Default font text size. var transient Canvas Canvas; var transient KF2GUIController Owner; -var transient ClassicKFHUD HUDOwner; +var transient ScoreboardExtHUD HUDOwner; var Font MainFont, NumberFont, InfiniteFont; var Color BlurColor, BlurColor2; diff --git a/ScoreboardExt/Classes/KF1HUD_BossHealthBar.uc b/ScoreboardExt/Classes/KF1HUD_BossHealthBar.uc index f52f0a2..4a40332 100644 --- a/ScoreboardExt/Classes/KF1HUD_BossHealthBar.uc +++ b/ScoreboardExt/Classes/KF1HUD_BossHealthBar.uc @@ -2,9 +2,9 @@ class KF1HUD_BossHealthBar extends KFGFxWidget_BossHealthBar; function TickHud(float DeltaTime) { - local ClassicKFHUD HUD; + local ScoreboardExtHUD HUD; - HUD = ClassicKFHUD(KFPC.MyHUD); + HUD = ScoreboardExtHUD(KFPC.MyHUD); if(KFPC.bHideBossHealthBar != bLastHideValue) { bLastHideValue = KFPC.bHideBossHealthBar; @@ -18,9 +18,9 @@ function TickHud(float DeltaTime) function SetEscortPawn(KFPawn_Scripted NewPawn) { - local ClassicKFHUD HUD; + local ScoreboardExtHUD HUD; - HUD = ClassicKFHUD(KFPC.MyHUD); + HUD = ScoreboardExtHUD(KFPC.MyHUD); if (NewPawn == none) return; @@ -37,25 +37,25 @@ function SetBossPawn(KFInterface_MonsterBoss NewBoss) if(NewBoss == None || KFPC.bHideBossHealthBar) return; - ClassicKFHUD(KFPC.MyHUD).BossInfoIcon = Texture2D(DynamicLoadObject(NewBoss.GetIconPath(),class'Texture2D')); - ClassicKFHUD(KFPC.MyHUD).BossPawn = NewBoss; + ScoreboardExtHUD(KFPC.MyHUD).BossInfoIcon = Texture2D(DynamicLoadObject(NewBoss.GetIconPath(),class'Texture2D')); + ScoreboardExtHUD(KFPC.MyHUD).BossPawn = NewBoss; } function UpdateBossShield(float NewShieldPercect) { - ClassicKFHUD(KFPC.MyHUD).BossShieldPct = NewShieldPercect; + ScoreboardExtHUD(KFPC.MyHUD).BossShieldPct = NewShieldPercect; } function UpdateBossBattlePhase(int BattlePhase) { - ClassicKFHUD(KFPC.MyHUD).BossBattlePhaseColor = ClassicKFHUD(KFPC.MyHUD).BattlePhaseColors[Max(BattlePhase - 1, 0)]; + ScoreboardExtHUD(KFPC.MyHUD).BossBattlePhaseColor = ScoreboardExtHUD(KFPC.MyHUD).BattlePhaseColors[Max(BattlePhase - 1, 0)]; } function OnNamePlateHidden() { - local ClassicKFHUD HUD; + local ScoreboardExtHUD HUD; - HUD = ClassicKFHUD(KFPC.MyHUD); + HUD = ScoreboardExtHUD(KFPC.MyHUD); if(KFPC.bHideBossHealthBar && HUD.ScriptedPawn == none) return; @@ -66,9 +66,9 @@ function OnNamePlateHidden() simulated function Deactivate() { - local ClassicKFHUD HUD; + local ScoreboardExtHUD HUD; - HUD = ClassicKFHUD(KFPC.MyHUD); + HUD = ScoreboardExtHUD(KFPC.MyHUD); HUD.BossInfoIcon = None; HUD.BossPawn = None; diff --git a/ScoreboardExt/Classes/KF1HUD_MusicNotification.uc b/ScoreboardExt/Classes/KF1HUD_MusicNotification.uc index 455e2a1..95091f1 100644 --- a/ScoreboardExt/Classes/KF1HUD_MusicNotification.uc +++ b/ScoreboardExt/Classes/KF1HUD_MusicNotification.uc @@ -1,12 +1,13 @@ -class KF1HUD_MusicNotification extends KFGFxWidget_MusicNotification; +class KF1HUD_MusicNotification extends KFGFxWidget_MusicNotification + dependson(ScoreboardExtHUD); function ShowSongInfo(string SongInfoString) { local KFGameEngine KFEngine; - local ClassicKFHUD HUD; + local ScoreboardExtHUD HUD; local PopupMessage Msg; - HUD = ClassicKFHUD(GetPC().MyHUD); + HUD = ScoreboardExtHUD(GetPC().MyHUD); KFEngine = KFGameEngine(Class'Engine'.static.GetEngine()); if(KFEngine != none && KFEngine.MusicVolumeMultiplier > 0) diff --git a/ScoreboardExt/Classes/KF1HUD_PlayerStatus.uc b/ScoreboardExt/Classes/KF1HUD_PlayerStatus.uc index 36577f5..4f632a6 100644 --- a/ScoreboardExt/Classes/KF1HUD_PlayerStatus.uc +++ b/ScoreboardExt/Classes/KF1HUD_PlayerStatus.uc @@ -3,7 +3,7 @@ class KF1HUD_PlayerStatus extends KFGFxHUD_PlayerStatus; function UpdateXP(int XPDelta, int XPPercent, bool bLevelUp, Class PerkClass) { if(!bLevelUp && MyPC.GetPerkLevelFromPerkList(PerkClass) < `MAX_PERK_LEVEL) - ClassicKFHUD(MyPC.MyHUD).NotifyXPEarned(XPDelta,PerkClass.default.PerkIcon,MakeColor(255, 255 * (KFPlayerReplicationInfo(MyPC.PlayerReplicationInfo).GetActivePerkLevel()/`MAX_PERK_LEVEL), 0, 255)); + ScoreboardExtHUD(MyPC.MyHUD).NotifyXPEarned(XPDelta,PerkClass.default.PerkIcon,MakeColor(255, 255 * (KFPlayerReplicationInfo(MyPC.PlayerReplicationInfo).GetActivePerkLevel()/`MAX_PERK_LEVEL), 0, 255)); Super.UpdateXP(XPDelta, XPPercent, bLevelUp, PerkClass); } diff --git a/ScoreboardExt/Classes/KF1HUD_WeaponSelectWidget.uc b/ScoreboardExt/Classes/KF1HUD_WeaponSelectWidget.uc index 54b802e..f7b474a 100644 --- a/ScoreboardExt/Classes/KF1HUD_WeaponSelectWidget.uc +++ b/ScoreboardExt/Classes/KF1HUD_WeaponSelectWidget.uc @@ -2,9 +2,9 @@ class KF1HUD_WeaponSelectWidget extends KFGFxHUD_WeaponSelectWidget; function SetSelectedWeapon(int GroupIndex, int SelectedIndex) { - local ClassicKFHUD HUD; + local ScoreboardExtHUD HUD; - HUD = ClassicKFHUD(GetPC().MyHUD); + HUD = ScoreboardExtHUD(GetPC().MyHUD); if( !HUD.bDisplayInventory ) { HUD.bDisplayInventory = true; diff --git a/ScoreboardExt/Classes/KF1_HUDWrapper.uc b/ScoreboardExt/Classes/KF1_HUDWrapper.uc index 47a1d94..1b6c97c 100644 --- a/ScoreboardExt/Classes/KF1_HUDWrapper.uc +++ b/ScoreboardExt/Classes/KF1_HUDWrapper.uc @@ -1,4 +1,5 @@ -class KF1_HUDWrapper extends KFGFxMoviePlayer_HUD; +class KF1_HUDWrapper extends KFGFxMoviePlayer_HUD + dependson(ScoreboardExtHUD); event bool WidgetInitialized(name WidgetName, name WidgetPath, GFxObject Widget) { @@ -145,7 +146,7 @@ function DisplayPriorityMessage(string InPrimaryMessageString, string InSecondar break; } - ClassicKFHUD(KFPC.myHUD).ShowPriorityMessage(PriorityMsg); + ScoreboardExtHUD(KFPC.myHUD).ShowPriorityMessage(PriorityMsg); } function string GetExpandedWaveInfo() @@ -205,7 +206,7 @@ function ShowKillMessage(PlayerReplicationInfo PRI1, PlayerReplicationInfo PRI2, KilledName=PRI2.PlayerName; } - ClassicKFHUD(KFPC.myHUD).ShowKillMessage(PRI1, PRI2, bHumanDeath, KilledName, KillerName); + ScoreboardExtHUD(KFPC.myHUD).ShowKillMessage(PRI1, PRI2, bHumanDeath, KilledName, KillerName); } DefaultProperties diff --git a/ScoreboardExt/Classes/KF2GUIController.uc b/ScoreboardExt/Classes/KF2GUIController.uc index 729ac32..5f73c5a 100644 --- a/ScoreboardExt/Classes/KF2GUIController.uc +++ b/ScoreboardExt/Classes/KF2GUIController.uc @@ -4,7 +4,7 @@ Class KF2GUIController extends Info var() class DefaultStyle; var PlayerController PlayerOwner; -var ClassicKFHUD HUDOwner; +var ScoreboardExtHUD HUDOwner; var transient KF2GUIInput CustomInput; var transient PlayerInput BackupInput; var transient GameViewportClient ClientViewport; @@ -44,7 +44,7 @@ static function KF2GUIController GetGUIController( PlayerController PC ) return None; } - foreach PC.ChildActors(class'KFClassicHUD.KF2GUIController',G) + foreach PC.ChildActors(class'ScoreboardExt.KF2GUIController',G) { if( !G.bIsInvalid ) { @@ -54,7 +54,7 @@ static function KF2GUIController GetGUIController( PlayerController PC ) if( G==None ) { - G = PC.Spawn(class'KFClassicHUD.KF2GUIController',PC); + G = PC.Spawn(class'ScoreboardExt.KF2GUIController',PC); } return G; @@ -64,7 +64,7 @@ simulated function PostBeginPlay() { PlayerOwner = PlayerController(Owner); ClientViewport = LocalPlayer(PlayerOwner.Player).ViewportClient; - HUDOwner = ClassicKFHUD(PlayerOwner.myHUD); + HUDOwner = ScoreboardExtHUD(PlayerOwner.myHUD); CurrentStyle = new (None) DefaultStyle; CurrentStyle.InitStyle(); @@ -232,7 +232,7 @@ simulated function HandleDrawMenu() { if( HackConsole==None ) { - HackConsole = new(ClientViewport)class'KFClassicHUD.KFGUIConsoleHack'; + HackConsole = new(ClientViewport)class'ScoreboardExt.KFGUIConsoleHack'; HackConsole.OutputObject = Self; } if( HackConsole!=ClientViewport.ViewportConsole ) @@ -352,7 +352,7 @@ simulated final function SetMenuState( bool bActive ) { if( CustomInput==None ) { - CustomInput = new (KFPlayerController(PlayerOwner)) class'KFClassicHUD.KF2GUIInput'; + CustomInput = new (KFPlayerController(PlayerOwner)) class'ScoreboardExt.KF2GUIInput'; CustomInput.ControllerOwner = Self; CustomInput.OnReceivedNativeInputKey = ReceivedInputKey; CustomInput.BaseInput = PlayerOwner.PlayerInput; diff --git a/ScoreboardExt/Classes/KFGUI_Base.uc b/ScoreboardExt/Classes/KFGUI_Base.uc index aeb28d1..cd1260c 100644 --- a/ScoreboardExt/Classes/KFGUI_Base.uc +++ b/ScoreboardExt/Classes/KFGUI_Base.uc @@ -3,7 +3,7 @@ Class KFGUI_Base extends Object abstract; var KF2GUIController Owner; -var ClassicKFHUD HUDOwner; +var ScoreboardExtHUD HUDOwner; var KFGUI_Base ParentComponent; // Parent component if any. var transient Canvas Canvas; diff --git a/ScoreboardExt/Classes/ClassicKFHUD.uc b/ScoreboardExt/Classes/ScoreboardExtHUD.uc similarity index 99% rename from ScoreboardExt/Classes/ClassicKFHUD.uc rename to ScoreboardExt/Classes/ScoreboardExtHUD.uc index 116a5de..f6d34d8 100644 --- a/ScoreboardExt/Classes/ClassicKFHUD.uc +++ b/ScoreboardExt/Classes/ScoreboardExtHUD.uc @@ -1,5 +1,5 @@ -class ClassicKFHUD extends KFGFxHudWrapper - config(ClassicHUD); +class ScoreboardExtHUD extends KFGFxHudWrapper + config(ScoreboardExtMut); const GFxListenerPriority = 80000; @@ -608,7 +608,7 @@ function PostRender() if( GUIController==None || GUIController.bIsInvalid ) { - GUIController = Class'KFClassicHUD.KF2GUIController'.Static.GetGUIController(PlayerOwner); + GUIController = Class'ScoreboardExt.KF2GUIController'.Static.GetGUIController(PlayerOwner); if( GUIController!=None ) { GUIStyle = GUIController.CurrentStyle; @@ -3725,7 +3725,7 @@ simulated function CheckAndDrawHiddenPlayerIcons( array V exec function OpenSettingsMenu() { - GUIController.OpenMenu(class'KFClassicHUD.UI_MidGameMenu'); + GUIController.OpenMenu(class'ScoreboardExt.UI_MidGameMenu'); } exec function SetShowScores(bool bNewValue) diff --git a/ScoreboardExt/Classes/ClassicHUD.uc b/ScoreboardExt/Classes/ScoreboardExtMut.uc similarity index 96% rename from ScoreboardExt/Classes/ClassicHUD.uc rename to ScoreboardExt/Classes/ScoreboardExtMut.uc index 70b7c12..8e53cd7 100644 --- a/ScoreboardExt/Classes/ClassicHUD.uc +++ b/ScoreboardExt/Classes/ScoreboardExtMut.uc @@ -1,4 +1,4 @@ -class ClassicHUD extends KFMutator; +class ScoreboardExtMut extends KFMutator; var KFPawn LastHitZed; var int LastHitHP; @@ -16,7 +16,7 @@ var array DamageReplicationInfos; function PostBeginPlay() { Super.PostBeginPlay(); - WorldInfo.Game.HUDType = class'ClassicKFHUD'; + WorldInfo.Game.HUDType = class'ScoreboardExtHUD'; } function NetDamage(int OriginalDamage, out int Damage, Pawn Injured, Controller InstigatedBy, vector HitLocation, out vector Momentum, class DamageType, Actor DamageCauser) diff --git a/ScoreboardExt/Classes/UIP_ColorSettings.uc b/ScoreboardExt/Classes/UIP_ColorSettings.uc index 0a72cb0..36b0c31 100644 --- a/ScoreboardExt/Classes/UIP_ColorSettings.uc +++ b/ScoreboardExt/Classes/UIP_ColorSettings.uc @@ -2,11 +2,11 @@ Class UIP_ColorSettings extends KFGUI_MultiComponent; var KFGUI_ComponentList SettingsBox; var KFGUI_ColorSlider MainHudSlider,OutlineSlider,FontSlider,ArmorSlider,HealthSlider; -var ClassicKFHUD HUD; +var ScoreboardExtHUD HUD; function InitMenu() { - HUD = ClassicKFHUD(GetPlayer().myHUD); + HUD = ScoreboardExtHUD(GetPlayer().myHUD); Super.InitMenu(); diff --git a/ScoreboardExt/Classes/UIP_Settings.uc b/ScoreboardExt/Classes/UIP_Settings.uc index 3d5774d..22b9ff7 100644 --- a/ScoreboardExt/Classes/UIP_Settings.uc +++ b/ScoreboardExt/Classes/UIP_Settings.uc @@ -5,7 +5,7 @@ var KFGUI_TextLable ResetColorLabel,PerkStarsLabel,PerkStarsRowLabel,ControllerT var KFGUI_EditBox PerkStarsBox, PerkRowsBox; var KFGUI_ComboBox ControllerBox; -var ClassicKFHUD HUD; +var ScoreboardExtHUD HUD; var KFPlayerController PC; function InitMenu() @@ -13,7 +13,7 @@ function InitMenu() local string S; PC = KFPlayerController(GetPlayer()); - HUD = ClassicKFHUD(PC.myHUD); + HUD = ScoreboardExtHUD(PC.myHUD); Super.InitMenu(); diff --git a/make.sh b/make.sh index 8b249e0..f40fdd9 100644 --- a/make.sh +++ b/make.sh @@ -162,7 +162,7 @@ echo "Map=\"KF-Outpost\" Game=\"KFGameContent.KFGameInfo_Survival\" Difficulty=\"0\" GameLength=\"0\" -Mutators=\"KFClassicHUD.ClassicHUD\" +Mutators=\"ScoreboardExt.ScoreboardExtMut\" Args=\"\"" > "$MutTestingIni" }