Merge branch 'master' into dev

This commit is contained in:
shavit 2016-11-21 04:40:02 +02:00 committed by GitHub
commit beb86a2ae3
6 changed files with 10 additions and 11 deletions

View File

@ -991,7 +991,7 @@ void SQL_SetPrefix()
{
SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it.");
}
char[] sLine = new char[PLATFORM_MAX_PATH*2];
while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2))

View File

@ -1081,7 +1081,7 @@ public void SQL_RR_Callback(Database db, DBResultSet results, const char[] error
}
Menu m = new Menu(RRMenu_Handler);
m.SetTitle("%T:", "RecentRecords", client, gI_RecentLimit, (gI_RecentLimit != 1)? "s":"");
m.SetTitle("%T:", "RecentRecords", client, gI_RecentLimit);
while(results.FetchRow())
{
@ -1327,7 +1327,7 @@ void SQL_SetPrefix()
{
SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it.");
}
char[] sLine = new char[PLATFORM_MAX_PATH*2];
while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2))

View File

@ -1254,7 +1254,6 @@ void CreateAdjustMenu(int client, int page)
{
Menu hMenu = new Menu(ZoneAdjuster_Handler);
char[] sMenuItem = new char[64];
FormatEx(sMenuItem, 64, "%T", "ZoneAdjustPosition", client);
hMenu.SetTitle("%T", "ZoneAdjustPosition", client);
FormatEx(sMenuItem, 64, "%T", "ZoneAdjustDone", client);
@ -1382,7 +1381,7 @@ public int ZoneRotate_Handler(Menu menu, MenuAction action, int param1, int para
bool bIncrease = view_as<bool>(StringToInt(sInfo) == 1);
gF_RotateAngle[param1] += (bIncrease? gF_Modifier[param1]:-gF_Modifier[param1]);
Shavit_PrintToChat(param1, "%T", "ZoneRotateSuccesful", param1, gS_ChatStrings[sMessageVariable], ((bIncrease)? gF_Modifier[param1]:-gF_Modifier[param1]), gS_ChatStrings[sMessageText]);
Shavit_PrintToChat(param1, "%T", "ZoneRotateSuccessful", param1, gS_ChatStrings[sMessageVariable], ((bIncrease)? gF_Modifier[param1]:-gF_Modifier[param1]), gS_ChatStrings[sMessageText]);
CreateRotateMenu(param1);
}
@ -1397,7 +1396,7 @@ public int ZoneRotate_Handler(Menu menu, MenuAction action, int param1, int para
void CreateWidthLengthMenu(int client, int page)
{
Menu hMenu = new Menu(ZoneEdge_Handler);
hMenu.SetTitle("%T", "ZoneAdjustPosition", client);
hMenu.SetTitle("%T", "ZoneRotate", client);
char[] sMenuItem = new char[64];
FormatEx(sMenuItem, 64, "%T", "ZoneAdjustDone", client);
@ -2053,7 +2052,7 @@ void SQL_SetPrefix()
{
SetFailState("Cannot open \"configs/shavit-prefix.txt\". Make sure this file exists and that the server has read permissions to it.");
}
char[] sLine = new char[PLATFORM_MAX_PATH*2];
while(fFile.ReadLine(sLine, PLATFORM_MAX_PATH*2))

View File

@ -29,7 +29,7 @@
}
"TopMenuTitle"
{
"#format" "{1:s}"
"#format" "{1:d}"
"en" "Top {1} Players"
}
"TopNoResults"

View File

@ -96,8 +96,8 @@
// ---------- WR Menu ---------- //
"RecentRecords"
{
"#format" "{1:d},{2:s}"
"en" "Recent {1} record{2}"
"#format" "{1:d}"
"en" "Recent {1} record(s)"
}
"WRDate"
{

View File

@ -168,7 +168,7 @@
"#format" "{1:.01f}"
"en" "Rotate by +{1} degrees"
}
"ZoneRotateSuccesful"
"ZoneRotateSuccessful"
{
"#format" "{1:c},{2:.01f},{3:c}"
"en" "Zone rotated by {1}{2}{3} degrees."