KillingFloor2/KF2-YetAnotherScoreboard
KillingFloor2/KF2-YetAnotherScoreboard
1
0
Fork 0
Code Releases 7 Activity

fix typos after regex code style fix

Browse Source
This commit is contained in:
GenZmeY 2021-06-13 10:29:12 +03:00
parent ad77bf6d51
commit 7cae2bb925
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ScoreboardExt/Classes/CustomRanks.uc
View File

@ -5,4 +5,4 @@ class CustomRanks extends Object
`include(Build.uci) `include(Build.uci)
`include(Logger.uci) `include(Logger.uci)
var config array < RankInfo> Rank; var config array<RankInfo> Rank;

18
ScoreboardExt/Classes/GUIStyleBase.uc
View File

@ -209,7 +209,7 @@ final function DrawColoredText(coerce string S, float X, float Y, optional float
{ {
local float XL, YL; local float XL, YL;
local int i, Index; local int i, Index;
local array < string> SArray; local array<string> SArray;
local string T, PrevT; local string T, PrevT;
local Color TextColor; local Color TextColor;
@ -347,8 +347,8 @@ final function DrawTexturedString(coerce string S, float X, float Y, optional fl
Mat = FindNextTexture(S); Mat = FindNextTexture(S);
while (Mat != None) while (Mat != None)
{ {
i = InStr(S, " < TEXTURE"); i = InStr(S, "<TEXTURE");
j = InStr(S, " > "); j = InStr(S, ">");
D = Left(S, i); D = Left(S, i);
S = Mid(S, j+2); S = Mid(S, j+2);
@ -384,12 +384,12 @@ final function Texture2D FindNextTexture(out string S)
local FTexturePreCache Cache; local FTexturePreCache Cache;
Path = S; Path = S;
i = InStr(Path, " < Icon > "); i = InStr(Path, "<Icon>");
if (i == INDEX_NONE) if (i == INDEX_NONE)
return None; return None;
j = InStr(Path, " < /Icon > "); j = InStr(Path, " </Icon>");
S = Left(Path, i)$" < TEXTURE > "$Mid(Path, j+6); S = Left(Path, i)$"<TEXTURE>"$Mid(Path, j+6);
Path = Mid(Path, i+6, j-(i+6)); Path = Mid(Path, i+6, j-(i+6));
i = PrecachedTextures.Find('Path', Path); i = PrecachedTextures.Find('Path', Path);
@ -418,12 +418,12 @@ final function string StripTextureFromString(string S, optional bool bNoStringAd
while (true) while (true)
{ {
i = InStr(S, " < Icon > "); i = InStr(S, "<Icon>");
if (i == INDEX_NONE) if (i == INDEX_NONE)
break; break;
j = InStr(S, " < /Icon > "); j = InStr(S, "</Icon>");
S = Left(S, i)$(bNoStringAdd ? "" : "W")$Mid(S, j+Len(" < /Icon > ")); S = Left(S, i)$(bNoStringAdd ? "" : "W")$Mid(S, j+Len("</Icon>"));
} }
return StripColorTags(S); return StripColorTags(S);

8
ScoreboardExt/Classes/KF2GUIController.uc
View File

@ -444,7 +444,7 @@ simulated final function int GetFreeIndex(bool bNewAlwaysTop ) // Find first all
ActiveMenus.Length = i+1; ActiveMenus.Length = i+1;
return i; return i;
} }
simulated function KFGUI_Base InitializeHUDWidget(class < KFGUI_Base> GUIClass) simulated function KFGUI_Base InitializeHUDWidget(class<KFGUI_Base> GUIClass)
{ {
local KFGUI_Base Widget; local KFGUI_Base Widget;
@ -466,7 +466,7 @@ simulated function KFGUI_Base InitializeHUDWidget(class < KFGUI_Base> GUIClass)
return Widget; return Widget;
} }
simulated function KFGUI_Page OpenMenu(class < KFGUI_Page> MenuClass) simulated function KFGUI_Page OpenMenu(class<KFGUI_Page> MenuClass)
{ {
local int i; local int i;
local KFGUI_Page M; local KFGUI_Page M;
@ -527,7 +527,7 @@ simulated function KFGUI_Page OpenMenu(class < KFGUI_Page> MenuClass)
M.ShowMenu(); M.ShowMenu();
return M; return M;
} }
simulated function CloseMenu(class < KFGUI_Page> MenuClass, optional bool bCloseAll) simulated function CloseMenu(class<KFGUI_Page> MenuClass, optional bool bCloseAll)
{ {
local int i, j; local int i, j;
local KFGUI_Page M; local KFGUI_Page M;
@ -623,7 +623,7 @@ simulated function BringMenuToFront(KFGUI_Page Page)
ActiveMenus.Insert(0, 1); ActiveMenus.Insert(0, 1);
ActiveMenus[0] = Page; ActiveMenus[0] = Page;
} }
simulated final function bool MenuIsOpen(optional class < KFGUI_Page> MenuClass) simulated final function bool MenuIsOpen(optional class<KFGUI_Page> MenuClass)
{ {
local int i; local int i;

2
ScoreboardExt/Classes/KFGUI_Base.uc
View File

@ -192,7 +192,7 @@ function KFGUI_Base FindComponentID(name InID)
return Self; return Self;
return None; return None;
} }
function FindAllComponentID(name InID, out array < KFGUI_Base> Res) function FindAllComponentID(name InID, out array<KFGUI_Base> Res)
{ {
if (ID == InID) if (ID == InID)
Res[Res.Length] = Self; Res[Res.Length] = Self;

2
ScoreboardExt/Classes/KFGUI_CategoryList.uc
View File

@ -25,7 +25,7 @@ function AddCategory(name CatID, string CatName, optional Texture2D IconMat, opt
B.OnClickRight = SelectedCategory; B.OnClickRight = SelectedCategory;
} }
function KFGUI_Base AddItemToCategory(name CatID, class < KFGUI_Base> Item) function KFGUI_Base AddItemToCategory(name CatID, class<KFGUI_Base> Item)
{ {
local FCategoryItems CatItem; local FCategoryItems CatItem;
local KFGUI_Base G; local KFGUI_Base G;

2
ScoreboardExt/Classes/KFGUI_ColumnList.uc
View File

@ -190,7 +190,7 @@ final function KFGUI_ListItem GetFromIndex(int Index)
function SortColumn(int Column, optional bool bReverse) function SortColumn(int Column, optional bool bReverse)
{ {
local array < KFGUI_ListItem> List; local array<KFGUI_ListItem> List;
local KFGUI_ListItem Sel, N,P; local KFGUI_ListItem Sel, N,P;
local int i; local int i;

6
ScoreboardExt/Classes/KFGUI_ComponentList.uc
View File

@ -9,12 +9,12 @@ var() int NumColumns;
var array<KFGUI_Base> ItemComponents; var array<KFGUI_Base> ItemComponents;
// REMEMBER to call InitMenu() on the newly created component after values are init!!! // 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<KFGUI_Base> CompClass, optional float XS=1.f, optional float YS=1.f)
{ {
return AddComponentAtIndex(ItemComponents.Length, CompClass, XS, YS); 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<KFGUI_Base> CompClass, optional float XS=1.f, optional float YS=1.f)
{ {
local KFGUI_Base G; local KFGUI_Base G;
@ -40,7 +40,7 @@ final function AddItemAtIndex(int i, KFGUI_Base Item)
ItemComponents.InsertItem(i, 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<KFGUI_Base> CompClass, optional float XS=1.f, optional float YS=1.f)
{ {
local KFGUI_Base G; local KFGUI_Base G;

2
ScoreboardExt/Classes/KFGUI_SwitchMenuBar.uc
View File

@ -25,7 +25,7 @@ function CloseMenu()
} }
// Remember to call InitMenu() on the newly created page after. // 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<KFGUI_Base> PageClass, string Caption, string Hint, optional out KFGUI_Button Button)
{ {
local KFGUI_Base P; local KFGUI_Base P;
local KFGUI_Button B; local KFGUI_Button B;

2
ScoreboardExt/Classes/KFGUI_TextField.uc
View File

@ -66,7 +66,7 @@ final function string GetText()
final function ParseTextLines() final function ParseTextLines()
{ {
local array < string> SA; local array<string> SA;
local int i, j,z; local int i, j,z;
local string S; local string S;
local color C; local color C;

2
ScoreboardExt/Classes/KFGUI_Tooltip.uc
View File

@ -26,7 +26,7 @@ function ShowMenu()
final function SetText(string S) final function SetText(string S)
{ {
ParseStringIntoArray(S, Lines, " < SEPERATOR > ", false); ParseStringIntoArray(S, Lines, "<SEPERATOR>", false);
} }
function PreDraw() function PreDraw()

2
ScoreboardExt/Classes/KFScoreBoard.uc
View File

@ -429,7 +429,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
if (!Settings.State.Dynamic) if (!Settings.State.Dynamic)
SetDrawColor(C, Settings.Style.LeftStateBoxColor); SetDrawColor(C, Settings.Style.LeftStateBoxColor);
if (KFPRIArray.Length > 1 && Index == 0) if (KFPRIArray.Length > 1 && Index == 0)
Shape = Settings.Style.ShapeLeftStateBoxTopPlayer; Shape = Settings.Style.ShapeLeftStateBoxTopPlayer;
else if (KFPRIArray.Length > 1 && Index == KFPRIArray.Length - 1) else if (KFPRIArray.Length > 1 && Index == KFPRIArray.Length - 1)

12
ScoreboardExt/Classes/Types.uc
View File

@ -229,13 +229,13 @@ struct SCEStyle
ShapePlayersCountBox = 4 ShapePlayersCountBox = 4
ShapeHeaderBox = 2 ShapeHeaderBox = 2
ShapeLeftStateBoxTopPlayer = 1 ShapeLeftStateBoxTopPlayer = 1
ShapeLeftStateBoxMidPlayer = 0 ShapeLeftStateBoxMidPlayer = 1
ShapeLeftStateBoxBottomPlayer = 3 ShapeLeftStateBoxBottomPlayer = 1
ShapePlayerBoxTopPlayer = 1 ShapePlayerBoxTopPlayer = 0
ShapePlayerBoxMidPlayer = 0 ShapePlayerBoxMidPlayer = 0
ShapePlayerBoxBottomPlayer = 3 ShapePlayerBoxBottomPlayer = 0
ShapeStatsBoxTopPlayer = 1 ShapeStatsBoxTopPlayer = 3
ShapeStatsBoxMidPlayer = 0 ShapeStatsBoxMidPlayer = 3
ShapeStatsBoxBottomPlayer = 3 ShapeStatsBoxBottomPlayer = 3
ServerNameBoxColor = (R=75, G=0, B=0, A=200) ServerNameBoxColor = (R=75, G=0, B=0, A=200)