epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse with NumberFormatInfo.InvariantInfo everywhere

Browse Source 
closes #5240
This commit is contained in:
Matthias Mailänder
2014-05-05 17:28:09 +02:00
parent bf9d3a8082
commit b19d286f56
20 changed files with 132 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Widgets/Logic/DirectConnectLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System;
using System.Globalization;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
@@ -28,7 +29,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
panel.Get<ButtonWidget>("JOIN_BUTTON").OnClick = () =>
{
var port = Exts.WithDefault(1234, () => int.Parse(portField.Text));
var port = Exts.WithDefault(1234, () => int.Parse(portField.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo));
Game.Settings.Player.LastServer = "{0}:{1}".F(ipField.Text, port);
Game.Settings.Save();

3
OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs
View File

@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Drawing;
using System.Net;
@@ -284,7 +285,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
return;
var host = server.Address.Split(':')[0];
var port = int.Parse(server.Address.Split(':')[1]);
var port = int.Parse(server.Address.Split(':')[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
ConnectionLogic.Connect(host, port, "", OpenLobby, DoNothing);
}

5
OpenRA.Mods.RA/Widgets/Logic/ServerCreationLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System;
using System.Globalization;
using System.Net;
using OpenRA.GameRules;
using OpenRA.Widgets;
@@ -81,10 +82,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
var name = panel.Get<TextFieldWidget>("SERVER_NAME").Text;
int listenPort, externalPort;
if (!int.TryParse(panel.Get<TextFieldWidget>("LISTEN_PORT").Text, out listenPort))
if (!int.TryParse(panel.Get<TextFieldWidget>("LISTEN_PORT").Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out listenPort))
listenPort = 1234;
if (!int.TryParse(panel.Get<TextFieldWidget>("EXTERNAL_PORT").Text, out externalPort))
if (!int.TryParse(panel.Get<TextFieldWidget>("EXTERNAL_PORT").Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out externalPort))
externalPort = 1234;
var passwordField = panel.GetOrNull<PasswordFieldWidget>("PASSWORD");

7
OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Graphics;
@@ -151,7 +152,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
frameLimitTextfield.OnLoseFocus = () =>
{
int fps;
int.TryParse(frameLimitTextfield.Text, out fps);
int.TryParse(frameLimitTextfield.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out fps);
ds.MaxFramerate = fps.Clamp(20, 200);
frameLimitTextfield.Text = ds.MaxFramerate.ToString();
Game.SetIdealFrameTime(ds.MaxFramerate);
@@ -162,8 +163,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
return () =>
{
int x, y;
int.TryParse(windowWidth.Text, out x);
int.TryParse(windowHeight.Text, out y);
int.TryParse(windowWidth.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out x);
int.TryParse(windowHeight.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out y);
ds.WindowedSize = new int2(x, y);
frameLimitTextfield.YieldKeyboardFocus();
};