From 7cae2bb925a841b68e299f2bfe069cce1ffc6e8c Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Sun, 13 Jun 2021 10:29:12 +0300 Subject: [PATCH] fix typos after regex code style fix --- ScoreboardExt/Classes/CustomRanks.uc | 2 +- ScoreboardExt/Classes/GUIStyleBase.uc | 18 +++++++++--------- ScoreboardExt/Classes/KF2GUIController.uc | 8 ++++---- ScoreboardExt/Classes/KFGUI_Base.uc | 2 +- ScoreboardExt/Classes/KFGUI_CategoryList.uc | 2 +- ScoreboardExt/Classes/KFGUI_ColumnList.uc | 2 +- ScoreboardExt/Classes/KFGUI_ComponentList.uc | 6 +++--- ScoreboardExt/Classes/KFGUI_SwitchMenuBar.uc | 2 +- ScoreboardExt/Classes/KFGUI_TextField.uc | 2 +- ScoreboardExt/Classes/KFGUI_Tooltip.uc | 2 +- ScoreboardExt/Classes/KFScoreBoard.uc | 2 +- ScoreboardExt/Classes/Types.uc | 12 ++++++------ 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ScoreboardExt/Classes/CustomRanks.uc b/ScoreboardExt/Classes/CustomRanks.uc index 21a68d7..260428f 100644 --- a/ScoreboardExt/Classes/CustomRanks.uc +++ b/ScoreboardExt/Classes/CustomRanks.uc @@ -5,4 +5,4 @@ class CustomRanks extends Object `include(Build.uci) `include(Logger.uci) -var config array < RankInfo> Rank; +var config array Rank; diff --git a/ScoreboardExt/Classes/GUIStyleBase.uc b/ScoreboardExt/Classes/GUIStyleBase.uc index 321afbd..3c1c1d3 100644 --- a/ScoreboardExt/Classes/GUIStyleBase.uc +++ b/ScoreboardExt/Classes/GUIStyleBase.uc @@ -209,7 +209,7 @@ final function DrawColoredText(coerce string S, float X, float Y, optional float { local float XL, YL; local int i, Index; - local array < string> SArray; + local array SArray; local string T, PrevT; local Color TextColor; @@ -347,8 +347,8 @@ final function DrawTexturedString(coerce string S, float X, float Y, optional fl Mat = FindNextTexture(S); while (Mat != None) { - i = InStr(S, " < TEXTURE"); - j = InStr(S, " > "); + i = InStr(S, ""); D = Left(S, i); S = Mid(S, j+2); @@ -384,12 +384,12 @@ final function Texture2D FindNextTexture(out string S) local FTexturePreCache Cache; Path = S; - i = InStr(Path, " < Icon > "); + i = InStr(Path, ""); if (i == INDEX_NONE) return None; - j = InStr(Path, " < /Icon > "); - S = Left(Path, i)$" < TEXTURE > "$Mid(Path, j+6); + j = InStr(Path, " "); + S = Left(Path, i)$""$Mid(Path, j+6); Path = Mid(Path, i+6, j-(i+6)); i = PrecachedTextures.Find('Path', Path); @@ -418,12 +418,12 @@ final function string StripTextureFromString(string S, optional bool bNoStringAd while (true) { - i = InStr(S, " < Icon > "); + i = InStr(S, ""); if (i == INDEX_NONE) break; - j = InStr(S, " < /Icon > "); - S = Left(S, i)$(bNoStringAdd ? "" : "W")$Mid(S, j+Len(" < /Icon > ")); + j = InStr(S, ""); + S = Left(S, i)$(bNoStringAdd ? "" : "W")$Mid(S, j+Len("")); } return StripColorTags(S); diff --git a/ScoreboardExt/Classes/KF2GUIController.uc b/ScoreboardExt/Classes/KF2GUIController.uc index 4c37fe1..a166214 100644 --- a/ScoreboardExt/Classes/KF2GUIController.uc +++ b/ScoreboardExt/Classes/KF2GUIController.uc @@ -444,7 +444,7 @@ simulated final function int GetFreeIndex(bool bNewAlwaysTop ) // Find first all ActiveMenus.Length = i+1; return i; } -simulated function KFGUI_Base InitializeHUDWidget(class < KFGUI_Base> GUIClass) +simulated function KFGUI_Base InitializeHUDWidget(class GUIClass) { local KFGUI_Base Widget; @@ -466,7 +466,7 @@ simulated function KFGUI_Base InitializeHUDWidget(class < KFGUI_Base> GUIClass) return Widget; } -simulated function KFGUI_Page OpenMenu(class < KFGUI_Page> MenuClass) +simulated function KFGUI_Page OpenMenu(class MenuClass) { local int i; local KFGUI_Page M; @@ -527,7 +527,7 @@ simulated function KFGUI_Page OpenMenu(class < KFGUI_Page> MenuClass) M.ShowMenu(); return M; } -simulated function CloseMenu(class < KFGUI_Page> MenuClass, optional bool bCloseAll) +simulated function CloseMenu(class MenuClass, optional bool bCloseAll) { local int i, j; local KFGUI_Page M; @@ -623,7 +623,7 @@ simulated function BringMenuToFront(KFGUI_Page Page) ActiveMenus.Insert(0, 1); ActiveMenus[0] = Page; } -simulated final function bool MenuIsOpen(optional class < KFGUI_Page> MenuClass) +simulated final function bool MenuIsOpen(optional class MenuClass) { local int i; diff --git a/ScoreboardExt/Classes/KFGUI_Base.uc b/ScoreboardExt/Classes/KFGUI_Base.uc index 4686185..e189bc7 100644 --- a/ScoreboardExt/Classes/KFGUI_Base.uc +++ b/ScoreboardExt/Classes/KFGUI_Base.uc @@ -192,7 +192,7 @@ function KFGUI_Base FindComponentID(name InID) return Self; return None; } -function FindAllComponentID(name InID, out array < KFGUI_Base> Res) +function FindAllComponentID(name InID, out array Res) { if (ID == InID) Res[Res.Length] = Self; diff --git a/ScoreboardExt/Classes/KFGUI_CategoryList.uc b/ScoreboardExt/Classes/KFGUI_CategoryList.uc index 6276a42..b4f2b42 100644 --- a/ScoreboardExt/Classes/KFGUI_CategoryList.uc +++ b/ScoreboardExt/Classes/KFGUI_CategoryList.uc @@ -25,7 +25,7 @@ function AddCategory(name CatID, string CatName, optional Texture2D IconMat, opt B.OnClickRight = SelectedCategory; } -function KFGUI_Base AddItemToCategory(name CatID, class < KFGUI_Base> Item) +function KFGUI_Base AddItemToCategory(name CatID, class Item) { local FCategoryItems CatItem; local KFGUI_Base G; diff --git a/ScoreboardExt/Classes/KFGUI_ColumnList.uc b/ScoreboardExt/Classes/KFGUI_ColumnList.uc index 1a5773a..924bccc 100644 --- a/ScoreboardExt/Classes/KFGUI_ColumnList.uc +++ b/ScoreboardExt/Classes/KFGUI_ColumnList.uc @@ -190,7 +190,7 @@ final function KFGUI_ListItem GetFromIndex(int Index) function SortColumn(int Column, optional bool bReverse) { - local array < KFGUI_ListItem> List; + local array List; local KFGUI_ListItem Sel, N,P; local int i; diff --git a/ScoreboardExt/Classes/KFGUI_ComponentList.uc b/ScoreboardExt/Classes/KFGUI_ComponentList.uc index d9a98b9..d92f7ca 100644 --- a/ScoreboardExt/Classes/KFGUI_ComponentList.uc +++ b/ScoreboardExt/Classes/KFGUI_ComponentList.uc @@ -9,12 +9,12 @@ var() int NumColumns; var array ItemComponents; // REMEMBER to call InitMenu() on the newly created component after values are init!!! -final function KFGUI_Base AddListComponent(class < KFGUI_Base> CompClass, optional float XS=1.f, optional float YS=1.f) +final function KFGUI_Base AddListComponent(class CompClass, optional float XS=1.f, optional float YS=1.f) { return AddComponentAtIndex(ItemComponents.Length, CompClass, XS, YS); } -final function KFGUI_Base CreateComponent(class < KFGUI_Base> CompClass, optional float XS=1.f, optional float YS=1.f) +final function KFGUI_Base CreateComponent(class CompClass, optional float XS=1.f, optional float YS=1.f) { local KFGUI_Base G; @@ -40,7 +40,7 @@ final function AddItemAtIndex(int i, KFGUI_Base Item) ItemComponents.InsertItem(i, Item); } -final function KFGUI_Base AddComponentAtIndex(int i, class < KFGUI_Base> CompClass, optional float XS=1.f, optional float YS=1.f) +final function KFGUI_Base AddComponentAtIndex(int i, class CompClass, optional float XS=1.f, optional float YS=1.f) { local KFGUI_Base G; diff --git a/ScoreboardExt/Classes/KFGUI_SwitchMenuBar.uc b/ScoreboardExt/Classes/KFGUI_SwitchMenuBar.uc index aea4dc3..4d19e38 100644 --- a/ScoreboardExt/Classes/KFGUI_SwitchMenuBar.uc +++ b/ScoreboardExt/Classes/KFGUI_SwitchMenuBar.uc @@ -25,7 +25,7 @@ function CloseMenu() } // Remember to call InitMenu() on the newly created page after. -final function KFGUI_Base AddPage(class < KFGUI_Base> PageClass, string Caption, string Hint, optional out KFGUI_Button Button) +final function KFGUI_Base AddPage(class PageClass, string Caption, string Hint, optional out KFGUI_Button Button) { local KFGUI_Base P; local KFGUI_Button B; diff --git a/ScoreboardExt/Classes/KFGUI_TextField.uc b/ScoreboardExt/Classes/KFGUI_TextField.uc index e640c14..731c998 100644 --- a/ScoreboardExt/Classes/KFGUI_TextField.uc +++ b/ScoreboardExt/Classes/KFGUI_TextField.uc @@ -66,7 +66,7 @@ final function string GetText() final function ParseTextLines() { - local array < string> SA; + local array SA; local int i, j,z; local string S; local color C; diff --git a/ScoreboardExt/Classes/KFGUI_Tooltip.uc b/ScoreboardExt/Classes/KFGUI_Tooltip.uc index e52eeb9..74b0d04 100644 --- a/ScoreboardExt/Classes/KFGUI_Tooltip.uc +++ b/ScoreboardExt/Classes/KFGUI_Tooltip.uc @@ -26,7 +26,7 @@ function ShowMenu() final function SetText(string S) { - ParseStringIntoArray(S, Lines, " < SEPERATOR > ", false); + ParseStringIntoArray(S, Lines, "", false); } function PreDraw() diff --git a/ScoreboardExt/Classes/KFScoreBoard.uc b/ScoreboardExt/Classes/KFScoreBoard.uc index 783d92a..fb6ae1b 100644 --- a/ScoreboardExt/Classes/KFScoreBoard.uc +++ b/ScoreboardExt/Classes/KFScoreBoard.uc @@ -429,7 +429,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float if (!Settings.State.Dynamic) SetDrawColor(C, Settings.Style.LeftStateBoxColor); - + if (KFPRIArray.Length > 1 && Index == 0) Shape = Settings.Style.ShapeLeftStateBoxTopPlayer; else if (KFPRIArray.Length > 1 && Index == KFPRIArray.Length - 1) diff --git a/ScoreboardExt/Classes/Types.uc b/ScoreboardExt/Classes/Types.uc index 3da1e4c..330a975 100644 --- a/ScoreboardExt/Classes/Types.uc +++ b/ScoreboardExt/Classes/Types.uc @@ -229,13 +229,13 @@ struct SCEStyle ShapePlayersCountBox = 4 ShapeHeaderBox = 2 ShapeLeftStateBoxTopPlayer = 1 - ShapeLeftStateBoxMidPlayer = 0 - ShapeLeftStateBoxBottomPlayer = 3 - ShapePlayerBoxTopPlayer = 1 + ShapeLeftStateBoxMidPlayer = 1 + ShapeLeftStateBoxBottomPlayer = 1 + ShapePlayerBoxTopPlayer = 0 ShapePlayerBoxMidPlayer = 0 - ShapePlayerBoxBottomPlayer = 3 - ShapeStatsBoxTopPlayer = 1 - ShapeStatsBoxMidPlayer = 0 + ShapePlayerBoxBottomPlayer = 0 + ShapeStatsBoxTopPlayer = 3 + ShapeStatsBoxMidPlayer = 3 ShapeStatsBoxBottomPlayer = 3 ServerNameBoxColor = (R=75, G=0, B=0, A=200)