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

new shorthand Exts.(Try)ParseIntegerInvariant

Browse Source
This commit is contained in:
Matthias Mailänder
2014-05-09 08:47:05 +02:00
parent bd55ffc10d
commit 59ace5d01b
21 changed files with 117 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Exts.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -11,6 +11,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@@ -251,6 +252,16 @@ namespace OpenRA
throw new InvalidOperationException("ToBits only accepts up to 32 values."); throw new InvalidOperationException("ToBits only accepts up to 32 values.");
return result; return result;
} }
public static int ParseIntegerInvariant(string s)
{
return int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
}
public static bool TryParseIntegerInvariant(string s, out int i)
{
return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
}
} }
public static class Enum<T> public static class Enum<T>

54
OpenRA.Game/FieldLoader.cs Executable file → Normal file
View File

@@ -116,7 +116,7 @@ namespace OpenRA
if (fieldType == typeof(int)) if (fieldType == typeof(int))
{ {
int res; int res;
if (int.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out res)) if (Exts.TryParseIntegerInvariant(value, out res))
return res; return res;
return InvalidValueAction(value, fieldType, fieldName); return InvalidValueAction(value, fieldType, fieldName);
} }
@@ -165,15 +165,15 @@ namespace OpenRA
var parts = value.Split(','); var parts = value.Split(',');
if (parts.Length == 3) if (parts.Length == 3)
return Color.FromArgb( return Color.FromArgb(
int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255), Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255), Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
int.Parse(parts[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255)); Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
if (parts.Length == 4) if (parts.Length == 4)
return Color.FromArgb( return Color.FromArgb(
int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255), Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255), Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
int.Parse(parts[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255), Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255),
int.Parse(parts[3], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255)); Exts.ParseIntegerInvariant(parts[3]).Clamp(0, 255));
return InvalidValueAction(value, fieldType, fieldName); return InvalidValueAction(value, fieldType, fieldName);
} }
@@ -184,9 +184,9 @@ namespace OpenRA
// Allow old ColorRamp format to be parsed as HSLColor // Allow old ColorRamp format to be parsed as HSLColor
if (parts.Length == 3 || parts.Length == 4) if (parts.Length == 3 || parts.Length == 4)
return new HSLColor( return new HSLColor(
(byte)int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255), (byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
(byte)int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255), (byte)Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
(byte)int.Parse(parts[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo).Clamp(0, 255)); (byte)Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
return InvalidValueAction(value, fieldType, fieldName); return InvalidValueAction(value, fieldType, fieldName);
} }
@@ -238,7 +238,7 @@ namespace OpenRA
else if (fieldType == typeof(WAngle)) else if (fieldType == typeof(WAngle))
{ {
int res; int res;
if (int.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out res)) if (Exts.TryParseIntegerInvariant(value, out res))
return new WAngle(res); return new WAngle(res);
return InvalidValueAction(value, fieldType, fieldName); return InvalidValueAction(value, fieldType, fieldName);
} }
@@ -249,9 +249,9 @@ namespace OpenRA
if (parts.Length == 3) if (parts.Length == 3)
{ {
int rr, rp, ry; int rr, rp, ry;
if (int.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out rr) if (Exts.TryParseIntegerInvariant(value, out rr)
&& int.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out rp) && Exts.TryParseIntegerInvariant(value, out rp)
&& int.TryParse(value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out ry)) && Exts.TryParseIntegerInvariant(value, out ry))
return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry)); return new WRot(new WAngle(rr), new WAngle(rp), new WAngle(ry));
} }
@@ -262,16 +262,16 @@ namespace OpenRA
{ {
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
return new CPos( return new CPos(
int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(parts[0]),
int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); Exts.ParseIntegerInvariant(parts[1]));
} }
else if (fieldType == typeof(CVec)) else if (fieldType == typeof(CVec))
{ {
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
return new CVec( return new CVec(
int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(parts[0]),
int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); Exts.ParseIntegerInvariant(parts[1]));
} }
else if (fieldType.IsEnum) else if (fieldType.IsEnum)
@@ -306,16 +306,16 @@ namespace OpenRA
{ {
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
return new Size( return new Size(
int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(parts[0]),
int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); Exts.ParseIntegerInvariant(parts[1]));
} }
else if (fieldType == typeof(int2)) else if (fieldType == typeof(int2))
{ {
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
return new int2( return new int2(
int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(parts[0]),
int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); Exts.ParseIntegerInvariant(parts[1]));
} }
else if (fieldType == typeof(float2)) else if (fieldType == typeof(float2))
@@ -335,10 +335,10 @@ namespace OpenRA
{ {
var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
return new Rectangle( return new Rectangle(
int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(parts[0]),
int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(parts[1]),
int.Parse(parts[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(parts[2]),
int.Parse(parts[3], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); Exts.ParseIntegerInvariant(parts[3]));
} }
else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>)) else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))

5
OpenRA.Game/Graphics/CursorProvider.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -9,7 +9,6 @@
#endregion #endregion
using System; using System;
using System.Globalization;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.FileSystem; using OpenRA.FileSystem;
@@ -42,7 +41,7 @@ namespace OpenRA.Graphics
if (sequences.NodesDict.ContainsKey("ShadowIndex")) if (sequences.NodesDict.ContainsKey("ShadowIndex"))
{ {
Array.Resize(ref shadowIndex, shadowIndex.Length + 1); Array.Resize(ref shadowIndex, shadowIndex.Length + 1);
int.TryParse(sequences.NodesDict["ShadowIndex"].Value, NumberStyles.Any, NumberFormatInfo.InvariantInfo, Exts.TryParseIntegerInvariant(sequences.NodesDict["ShadowIndex"].Value,
out shadowIndex[shadowIndex.Length - 1]); out shadowIndex[shadowIndex.Length - 1]);
} }

11
OpenRA.Game/Graphics/CursorSequence.cs
View File

@@ -8,7 +8,6 @@
*/ */
#endregion #endregion
using System.Globalization;
using OpenRA.FileFormats; using OpenRA.FileFormats;
namespace OpenRA.Graphics namespace OpenRA.Graphics
@@ -31,22 +30,22 @@ namespace OpenRA.Graphics
sprites = Game.modData.SpriteLoader.LoadAllSprites(cursorSrc); sprites = Game.modData.SpriteLoader.LoadAllSprites(cursorSrc);
var d = info.NodesDict; var d = info.NodesDict;
start = int.Parse(d["start"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); start = Exts.ParseIntegerInvariant(d["start"].Value);
this.palette = palette; this.palette = palette;
if ((d.ContainsKey("length") && d["length"].Value == "*") || (d.ContainsKey("end") && d["end"].Value == "*")) if ((d.ContainsKey("length") && d["length"].Value == "*") || (d.ContainsKey("end") && d["end"].Value == "*"))
length = sprites.Length - start; length = sprites.Length - start;
else if (d.ContainsKey("length")) else if (d.ContainsKey("length"))
length = int.Parse(d["length"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); length = Exts.ParseIntegerInvariant(d["length"].Value);
else if (d.ContainsKey("end")) else if (d.ContainsKey("end"))
length = int.Parse(d["end"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo) - start; length = Exts.ParseIntegerInvariant(d["end"].Value) - start;
else else
length = 1; length = 1;
if (d.ContainsKey("x")) if (d.ContainsKey("x"))
int.TryParse(d["x"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out Hotspot.X); Exts.TryParseIntegerInvariant(d["x"].Value, out Hotspot.X);
if (d.ContainsKey("y")) if (d.ContainsKey("y"))
int.TryParse(d["y"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out Hotspot.Y); Exts.TryParseIntegerInvariant(d["y"].Value, out Hotspot.Y);
} }
public Sprite GetSprite(int frame) public Sprite GetSprite(int frame)

15
OpenRA.Game/Graphics/Sequence.cs
View File

@@ -9,7 +9,6 @@
#endregion #endregion
using System; using System;
using System.Globalization;
using System.Linq; using System.Linq;
namespace OpenRA.Graphics namespace OpenRA.Graphics
@@ -41,7 +40,7 @@ namespace OpenRA.Graphics
try try
{ {
if (d.ContainsKey("Start")) if (d.ContainsKey("Start"))
Start = int.Parse(d["Start"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); Start = Exts.ParseIntegerInvariant(d["Start"].Value);
if (d.ContainsKey("Offset")) if (d.ContainsKey("Offset"))
offset = FieldLoader.GetValue<float2>("Offset", d["Offset"].Value); offset = FieldLoader.GetValue<float2>("Offset", d["Offset"].Value);
@@ -59,16 +58,16 @@ namespace OpenRA.Graphics
else if (d["Length"].Value == "*") else if (d["Length"].Value == "*")
Length = sprites.Length - Start; Length = sprites.Length - Start;
else else
Length = int.Parse(d["Length"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); Length = Exts.ParseIntegerInvariant(d["Length"].Value);
if (d.ContainsKey("Stride")) if (d.ContainsKey("Stride"))
Stride = int.Parse(d["Stride"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); Stride = Exts.ParseIntegerInvariant(d["Stride"].Value);
else else
Stride = Length; Stride = Length;
if (d.ContainsKey("Facings")) if (d.ContainsKey("Facings"))
{ {
var f = int.Parse(d["Facings"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var f = Exts.ParseIntegerInvariant(d["Facings"].Value);
Facings = Math.Abs(f); Facings = Math.Abs(f);
reverseFacings = f < 0; reverseFacings = f < 0;
} }
@@ -76,7 +75,7 @@ namespace OpenRA.Graphics
Facings = 1; Facings = 1;
if (d.ContainsKey("Tick")) if (d.ContainsKey("Tick"))
Tick = int.Parse(d["Tick"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); Tick = Exts.ParseIntegerInvariant(d["Tick"].Value);
else else
Tick = 40; Tick = 40;
@@ -84,10 +83,10 @@ namespace OpenRA.Graphics
transpose = bool.Parse(d["Transpose"].Value); transpose = bool.Parse(d["Transpose"].Value);
if (d.ContainsKey("Frames")) if (d.ContainsKey("Frames"))
Frames = Array.ConvertAll<string, int>(d["Frames"].Value.Split(','), (s) => int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); Frames = Array.ConvertAll<string, int>(d["Frames"].Value.Split(','), Exts.ParseIntegerInvariant);
if (d.ContainsKey("ShadowStart")) if (d.ContainsKey("ShadowStart"))
ShadowStart = int.Parse(d["ShadowStart"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); ShadowStart = Exts.ParseIntegerInvariant(d["ShadowStart"].Value);
else else
ShadowStart = -1; ShadowStart = -1;

5
OpenRA.Game/Manifest.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -10,7 +10,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using OpenRA.Primitives; using OpenRA.Primitives;
@@ -69,7 +68,7 @@ namespace OpenRA
LobbyDefaults = yaml["LobbyDefaults"]; LobbyDefaults = yaml["LobbyDefaults"];
Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key, Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key,
x => Pair.New(x.Value.NodesDict["Font"].Value, x => Pair.New(x.Value.NodesDict["Font"].Value,
int.Parse(x.Value.NodesDict["Size"].Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo))); Exts.ParseIntegerInvariant(x.Value.NodesDict["Size"].Value)));
if (yaml.ContainsKey("TileSize")) if (yaml.ContainsKey("TileSize"))
TileSize = FieldLoader.GetValue<Size>("TileSize", yaml["TileSize"].Value); TileSize = FieldLoader.GetValue<Size>("TileSize", yaml["TileSize"].Value);

9
OpenRA.Game/Map/Map.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -11,7 +11,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
@@ -203,9 +202,9 @@ namespace OpenRA
var vals = kv.Key.Split(' '); var vals = kv.Key.Split(' ');
var loc = vals[1].Split(','); var loc = vals[1].Split(',');
ret.Add(new SmudgeReference(vals[0], new int2( ret.Add(new SmudgeReference(vals[0], new int2(
int.Parse(loc[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo), Exts.ParseIntegerInvariant(loc[0]),
int.Parse(loc[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)), Exts.ParseIntegerInvariant(loc[1])),
int.Parse(vals[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo))); Exts.ParseIntegerInvariant(vals[2])));
} }
return ret; return ret;

5
OpenRA.Game/Server/Server.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2012 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -11,7 +11,6 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
@@ -467,7 +466,7 @@ namespace OpenRA.Server
case "Pong": case "Pong":
{ {
int pingSent; int pingSent;
if (!int.TryParse(so.Data, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out pingSent)) if (!OpenRA.Exts.TryParseIntegerInvariant(so.Data, out pingSent))
{ {
Log.Write("server", "Invalid order pong payload: {0}", so.Data); Log.Write("server", "Invalid order pong payload: {0}", so.Data);
break; break;

5
OpenRA.Game/Support/Evaluator.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -10,7 +10,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
namespace OpenRA.Support namespace OpenRA.Support
@@ -37,7 +36,7 @@ namespace OpenRA.Support
case '-': ApplyBinop(s, (x, y) => y - x); break; case '-': ApplyBinop(s, (x, y) => y - x); break;
case '*': ApplyBinop(s, (x, y) => y * x); break; case '*': ApplyBinop(s, (x, y) => y * x); break;
case '/': ApplyBinop(s, (x, y) => y / x); break; case '/': ApplyBinop(s, (x, y) => y / x); break;
default: s.Push(int.Parse(t, NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); break; default: s.Push(Exts.ParseIntegerInvariant(t)); break;
} }
} }

9
OpenRA.Game/WRange.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -9,7 +9,6 @@
#endregion #endregion
using System; using System;
using System.Globalization;
using System.Linq; using System.Linq;
namespace OpenRA namespace OpenRA
@@ -57,12 +56,12 @@ namespace OpenRA
switch (components.Length) switch (components.Length)
{ {
case 2: case 2:
if (!int.TryParse(components[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out cell) || if (!Exts.TryParseIntegerInvariant(components[0], out cell) ||
!int.TryParse(components[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out subcell)) !Exts.TryParseIntegerInvariant(components[1], out subcell))
return false; return false;
break; break;
case 1: case 1:
if (!int.TryParse(components[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out subcell)) if (!Exts.TryParseIntegerInvariant(components[0], out subcell))
return false; return false;
break; break;
default: return false; default: return false;

3
OpenRA.Irc/IrcClient.cs
View File

@@ -9,7 +9,6 @@
#endregion #endregion
using System; using System;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
@@ -281,7 +280,7 @@ namespace OpenRA.Irc
OnLineRead(l); OnLineRead(l);
int numeric; int numeric;
if (int.TryParse(l.Command, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out numeric)) if (Exts.TryParseIntegerInvariant(l.Command, out numeric))
{ {
var nl = new NumericLine(l, numeric); var nl = new NumericLine(l, numeric);
LocalUser.OnNumeric(nl); LocalUser.OnNumeric(nl);

5
OpenRA.Irc/IrcClientUser.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -9,7 +9,6 @@
#endregion #endregion
using System; using System;
using System.Globalization;
using System.Linq; using System.Linq;
using OpenRA.Primitives; using OpenRA.Primitives;
@@ -48,7 +47,7 @@ namespace OpenRA.Irc
{ {
var topic = line.GetChannel().Topic; var topic = line.GetChannel().Topic;
topic.Author = new User(line[4]); topic.Author = new User(line[4]);
topic.Time = IrcUtils.DateTimeFromUnixTime(int.Parse(line[5], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); topic.Time = IrcUtils.DateTimeFromUnixTime(Exts.ParseIntegerInvariant(line[5]));
} }
break; break;
case NumericCommand.ERR_NICKNAMEINUSE: case NumericCommand.ERR_NICKNAMEINUSE:

27
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -10,7 +10,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Network; using OpenRA.Network;
@@ -226,7 +225,7 @@ namespace OpenRA.Mods.RA.Server
var slot = server.LobbyInfo.Slots[parts[0]]; var slot = server.LobbyInfo.Slots[parts[0]];
var bot = server.LobbyInfo.ClientInSlot(parts[0]); var bot = server.LobbyInfo.ClientInSlot(parts[0]);
int controllerClientIndex; int controllerClientIndex;
if (!int.TryParse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out controllerClientIndex)) if (!Exts.TryParseIntegerInvariant(parts[1], out controllerClientIndex))
{ {
Log.Write("server", "Invalid bot controller client index: {0}", parts[1]); Log.Write("server", "Invalid bot controller client index: {0}", parts[1]);
return false; return false;
@@ -414,7 +413,7 @@ namespace OpenRA.Mods.RA.Server
} }
int teamCount; int teamCount;
if (!int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out teamCount)) if (!Exts.TryParseIntegerInvariant(s, out teamCount))
{ {
server.SendOrderTo(conn, "Message", "Number of teams could not be parsed: {0}".F(s)); server.SendOrderTo(conn, "Message", "Number of teams could not be parsed: {0}".F(s));
return true; return true;
@@ -537,7 +536,7 @@ namespace OpenRA.Mods.RA.Server
return true; return true;
} }
server.LobbyInfo.GlobalSettings.StartingCash = int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); server.LobbyInfo.GlobalSettings.StartingCash = Exts.ParseIntegerInvariant(s);
server.SyncLobbyInfo(); server.SyncLobbyInfo();
return true; return true;
}}, }},
@@ -558,7 +557,7 @@ namespace OpenRA.Mods.RA.Server
} }
int kickClientID; int kickClientID;
int.TryParse(split[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out kickClientID); Exts.TryParseIntegerInvariant(split[0], out kickClientID);
var kickConn = server.Conns.SingleOrDefault(c => server.GetClient(c) != null && server.GetClient(c).Index == kickClientID); var kickConn = server.Conns.SingleOrDefault(c => server.GetClient(c) != null && server.GetClient(c).Index == kickClientID);
if (kickConn == null) if (kickConn == null)
@@ -597,7 +596,7 @@ namespace OpenRA.Mods.RA.Server
s => s =>
{ {
var parts = s.Split(' '); var parts = s.Split(' ');
var targetClient = server.LobbyInfo.ClientWithIndex(int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); var targetClient = server.LobbyInfo.ClientWithIndex(Exts.ParseIntegerInvariant(parts[0]));
// Only the host can change other client's info // Only the host can change other client's info
if (targetClient.Index != client.Index && !client.IsAdmin) if (targetClient.Index != client.Index && !client.IsAdmin)
@@ -615,7 +614,7 @@ namespace OpenRA.Mods.RA.Server
s => s =>
{ {
var parts = s.Split(' '); var parts = s.Split(' ');
var targetClient = server.LobbyInfo.ClientWithIndex(int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); var targetClient = server.LobbyInfo.ClientWithIndex(Exts.ParseIntegerInvariant(parts[0]));
// Only the host can change other client's info // Only the host can change other client's info
if (targetClient.Index != client.Index && !client.IsAdmin) if (targetClient.Index != client.Index && !client.IsAdmin)
@@ -626,7 +625,7 @@ namespace OpenRA.Mods.RA.Server
return true; return true;
int team; int team;
if (!int.TryParse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out team)) if (!Exts.TryParseIntegerInvariant(parts[1], out team))
{ {
Log.Write("server", "Invalid team: {0}", s ); Log.Write("server", "Invalid team: {0}", s );
return false; return false;
@@ -640,7 +639,7 @@ namespace OpenRA.Mods.RA.Server
s => s =>
{ {
var parts = s.Split(' '); var parts = s.Split(' ');
var targetClient = server.LobbyInfo.ClientWithIndex(int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); var targetClient = server.LobbyInfo.ClientWithIndex(Exts.ParseIntegerInvariant(parts[0]));
// Only the host can change other client's info // Only the host can change other client's info
if (targetClient.Index != client.Index && !client.IsAdmin) if (targetClient.Index != client.Index && !client.IsAdmin)
@@ -655,14 +654,14 @@ namespace OpenRA.Mods.RA.Server
return true; return true;
int spawnPoint; int spawnPoint;
if (!int.TryParse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out spawnPoint) if (!Exts.TryParseIntegerInvariant(parts[1], out spawnPoint)
|| spawnPoint < 0 || spawnPoint > server.Map.GetSpawnPoints().Length) || spawnPoint < 0 || spawnPoint > server.Map.GetSpawnPoints().Length)
{ {
Log.Write("server", "Invalid spawn point: {0}", parts[1]); Log.Write("server", "Invalid spawn point: {0}", parts[1]);
return true; return true;
} }
if (server.LobbyInfo.Clients.Where( cc => cc != client ).Any( cc => (cc.SpawnPoint == spawnPoint) && (cc.SpawnPoint != 0) )) if (server.LobbyInfo.Clients.Where(cc => cc != client).Any(cc => (cc.SpawnPoint == spawnPoint) && (cc.SpawnPoint != 0)))
{ {
server.SendOrderTo(conn, "Message", "You can't be at the same spawn point as another player"); server.SendOrderTo(conn, "Message", "You can't be at the same spawn point as another player");
return true; return true;
@@ -676,7 +675,7 @@ namespace OpenRA.Mods.RA.Server
s => s =>
{ {
var parts = s.Split(' '); var parts = s.Split(' ');
var targetClient = server.LobbyInfo.ClientWithIndex(int.Parse(parts[0], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); var targetClient = server.LobbyInfo.ClientWithIndex(Exts.ParseIntegerInvariant(parts[0]));
// Only the host can change other client's info // Only the host can change other client's info
if (targetClient.Index != client.Index && !client.IsAdmin) if (targetClient.Index != client.Index && !client.IsAdmin)
@@ -686,7 +685,7 @@ namespace OpenRA.Mods.RA.Server
if (targetClient.Slot == null || server.LobbyInfo.Slots[targetClient.Slot].LockColor) if (targetClient.Slot == null || server.LobbyInfo.Slots[targetClient.Slot].LockColor)
return true; return true;
var ci = parts[1].Split(',').Select(cc => int.Parse(cc, NumberStyles.Integer, NumberFormatInfo.InvariantInfo)).ToArray(); var ci = parts[1].Split(',').Select(cc => Exts.ParseIntegerInvariant(cc)).ToArray();
targetClient.Color = targetClient.PreferredColor = new HSLColor((byte)ci[0], (byte)ci[1], (byte)ci[2]); targetClient.Color = targetClient.PreferredColor = new HSLColor((byte)ci[0], (byte)ci[1], (byte)ci[2]);
server.SyncLobbyInfo(); server.SyncLobbyInfo();
return true; return true;

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

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -9,7 +9,6 @@
#endregion #endregion
using System; using System;
using System.Globalization;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic namespace OpenRA.Mods.RA.Widgets.Logic
@@ -29,7 +28,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
panel.Get<ButtonWidget>("JOIN_BUTTON").OnClick = () => panel.Get<ButtonWidget>("JOIN_BUTTON").OnClick = () =>
{ {
var port = Exts.WithDefault(1234, () => int.Parse(portField.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo)); var port = Exts.WithDefault(1234, () => Exts.ParseIntegerInvariant(portField.Text));
Game.Settings.Player.LastServer = "{0}:{1}".F(ipField.Text, port); Game.Settings.Player.LastServer = "{0}:{1}".F(ipField.Text, port);
Game.Settings.Save(); Game.Settings.Save();

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

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

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

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

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

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -11,7 +11,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics; using OpenRA.Graphics;
@@ -152,7 +151,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
frameLimitTextfield.OnLoseFocus = () => frameLimitTextfield.OnLoseFocus = () =>
{ {
int fps; int fps;
int.TryParse(frameLimitTextfield.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out fps); Exts.TryParseIntegerInvariant(frameLimitTextfield.Text, out fps);
ds.MaxFramerate = fps.Clamp(20, 200); ds.MaxFramerate = fps.Clamp(20, 200);
frameLimitTextfield.Text = ds.MaxFramerate.ToString(); frameLimitTextfield.Text = ds.MaxFramerate.ToString();
Game.SetIdealFrameTime(ds.MaxFramerate); Game.SetIdealFrameTime(ds.MaxFramerate);
@@ -163,8 +162,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
return () => return () =>
{ {
int x, y; int x, y;
int.TryParse(windowWidth.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out x); Exts.TryParseIntegerInvariant(windowWidth.Text, out x);
int.TryParse(windowHeight.Text, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out y); Exts.TryParseIntegerInvariant(windowHeight.Text, out y);
ds.WindowedSize = new int2(x, y); ds.WindowedSize = new int2(x, y);
frameLimitTextfield.YieldKeyboardFocus(); frameLimitTextfield.YieldKeyboardFocus();
}; };

7
OpenRA.Utility/Command.cs
View File

@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@@ -236,9 +235,9 @@ namespace OpenRA.Utility
for (var z = 3; z < args.Length - 2; z += 3) for (var z = 3; z < args.Length - 2; z += 3)
{ {
var start = int.Parse(args[z], NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var start = Exts.ParseIntegerInvariant(args[z]);
var m = int.Parse(args[z + 1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var m = Exts.ParseIntegerInvariant(args[z + 1]);
var n = int.Parse(args[z + 2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var n = Exts.ParseIntegerInvariant(args[z + 2]);
for (var i = 0; i < m; i++) for (var i = 0; i < m; i++)
for (var j = 0; j < n; j++) for (var j = 0; j < n; j++)

34
OpenRA.Utility/LegacyMapImporter.cs
View File

@@ -129,11 +129,11 @@ namespace OpenRA.Utility
var file = new IniFile(GlobalFileSystem.Open(iniFile)); var file = new IniFile(GlobalFileSystem.Open(iniFile));
var basic = file.GetSection("Basic"); var basic = file.GetSection("Basic");
var mapSection = file.GetSection("Map"); var mapSection = file.GetSection("Map");
var legacyMapFormat = (IniMapFormat)int.Parse(basic.GetValue("NewINIFormat", "0"), NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var legacyMapFormat = (IniMapFormat)Exts.ParseIntegerInvariant(basic.GetValue("NewINIFormat", "0"));
var offsetX = int.Parse(mapSection.GetValue("X", "0"), NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var offsetX = Exts.ParseIntegerInvariant(mapSection.GetValue("X", "0"));
var offsetY = int.Parse(mapSection.GetValue("Y", "0"), NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var offsetY = Exts.ParseIntegerInvariant(mapSection.GetValue("Y", "0"));
var width = int.Parse(mapSection.GetValue("Width", "0"), NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var width = Exts.ParseIntegerInvariant(mapSection.GetValue("Width", "0"));
var height = int.Parse(mapSection.GetValue("Height", "0"), NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var height = Exts.ParseIntegerInvariant(mapSection.GetValue("Height", "0"));
mapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64; mapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
map.Title = basic.GetValue("Name", Path.GetFileNameWithoutExtension(iniFile)); map.Title = basic.GetValue("Name", Path.GetFileNameWithoutExtension(iniFile));
@@ -174,9 +174,9 @@ namespace OpenRA.Utility
LoadPlayer(file, p, legacyMapFormat == IniMapFormat.RedAlert); LoadPlayer(file, p, legacyMapFormat == IniMapFormat.RedAlert);
var wps = file.GetSection("Waypoints") var wps = file.GetSection("Waypoints")
.Where(kv => int.Parse(kv.Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo) > 0) .Where(kv => Exts.ParseIntegerInvariant(kv.Value) > 0)
.Select(kv => Pair.New(int.Parse(kv.Key, NumberStyles.Integer, NumberFormatInfo.InvariantInfo), .Select(kv => Pair.New(Exts.ParseIntegerInvariant(kv.Key),
LocationFromMapOffset(int.Parse(kv.Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo), mapSize))) LocationFromMapOffset(Exts.ParseIntegerInvariant(kv.Value), mapSize)))
.ToArray(); .ToArray();
// Add waypoint actors // Add waypoint actors
@@ -298,7 +298,7 @@ namespace OpenRA.Utility
foreach (KeyValuePair<string, string> kv in terrain) foreach (KeyValuePair<string, string> kv in terrain)
{ {
var loc = int.Parse(kv.Key, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var loc = Exts.ParseIntegerInvariant(kv.Key);
map.Actors.Value.Add("Actor" + actorCount++, map.Actors.Value.Add("Actor" + actorCount++,
new ActorReference(kv.Value.ToLowerInvariant()) new ActorReference(kv.Value.ToLowerInvariant())
{ {
@@ -332,7 +332,7 @@ namespace OpenRA.Utility
foreach (KeyValuePair<string, string> kv in overlay) foreach (KeyValuePair<string, string> kv in overlay)
{ {
var loc = int.Parse(kv.Key, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var loc = Exts.ParseIntegerInvariant(kv.Key);
var cell = new CPos(loc % mapSize, loc / mapSize); var cell = new CPos(loc % mapSize, loc / mapSize);
var res = Pair.New((byte)0, (byte)0); var res = Pair.New((byte)0, (byte)0);
@@ -359,7 +359,7 @@ namespace OpenRA.Utility
foreach (KeyValuePair<string, string> kv in terrain) foreach (KeyValuePair<string, string> kv in terrain)
{ {
var loc = int.Parse(kv.Key, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var loc = Exts.ParseIntegerInvariant(kv.Key);
map.Actors.Value.Add("Actor" + actorCount++, map.Actors.Value.Add("Actor" + actorCount++,
new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant()) new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant())
{ {
@@ -379,7 +379,7 @@ namespace OpenRA.Utility
try try
{ {
var parts = s.Value.Split(','); var parts = s.Value.Split(',');
var loc = int.Parse(parts[3]); var loc = Exts.ParseIntegerInvariant(parts[3]);
if (parts[0] == "") if (parts[0] == "")
parts[0] = "Neutral"; parts[0] = "Neutral";
@@ -392,12 +392,12 @@ namespace OpenRA.Utility
new OwnerInit(parts[0]), new OwnerInit(parts[0]),
new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo) / 256), new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo) / 256),
new FacingInit((section == "INFANTRY") new FacingInit((section == "INFANTRY")
? int.Parse(parts[6], NumberStyles.Integer, NumberFormatInfo.InvariantInfo) ? Exts.ParseIntegerInvariant(parts[6])
: int.Parse(parts[4], NumberStyles.Integer, NumberFormatInfo.InvariantInfo)), : Exts.ParseIntegerInvariant(parts[4])),
}; };
if (section == "INFANTRY") if (section == "INFANTRY")
actor.Add(new SubCellInit(int.Parse(parts[4], NumberStyles.Integer, NumberFormatInfo.InvariantInfo))); actor.Add(new SubCellInit(Exts.ParseIntegerInvariant(parts[4])));
if (!Rules.Info.ContainsKey(parts[1].ToLowerInvariant())) if (!Rules.Info.ContainsKey(parts[1].ToLowerInvariant()))
errorHandler("Ignoring unknown actor type: `{0}`".F(parts[1].ToLowerInvariant())); errorHandler("Ignoring unknown actor type: `{0}`".F(parts[1].ToLowerInvariant()));
@@ -417,8 +417,8 @@ namespace OpenRA.Utility
{ {
// loc=type,loc,depth // loc=type,loc,depth
var parts = s.Value.Split(','); var parts = s.Value.Split(',');
var loc = int.Parse(parts[1], NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var loc = Exts.ParseIntegerInvariant(parts[1]);
map.Smudges.Value.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % mapSize, loc / mapSize), int.Parse(parts[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo))); map.Smudges.Value.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % mapSize, loc / mapSize), Exts.ParseIntegerInvariant(parts[2])));
} }
} }

9
OpenRA.Utility/UpgradeRules.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@@ -43,7 +42,7 @@ namespace OpenRA.Utility
static void ConvertPxToRange(ref string input, int scaleMult, int scaleDiv) static void ConvertPxToRange(ref string input, int scaleMult, int scaleDiv)
{ {
var value = int.Parse(input, NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var value = Exts.ParseIntegerInvariant(input);
var ts = Game.modData.Manifest.TileSize; var ts = Game.modData.Manifest.TileSize;
var world = value * 1024 * scaleMult / (scaleDiv * ts.Height); var world = value * 1024 * scaleMult / (scaleDiv * ts.Height);
var cells = world / 1024; var cells = world / 1024;
@@ -338,7 +337,7 @@ namespace OpenRA.Utility
public static void UpgradeMap(string[] args) public static void UpgradeMap(string[] args)
{ {
var map = new Map(args[1]); var map = new Map(args[1]);
var engineDate = int.Parse(args[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var engineDate = Exts.ParseIntegerInvariant(args[2]);
Game.modData = new ModData(map.RequiresMod); Game.modData = new ModData(map.RequiresMod);
UpgradeWeaponRules(engineDate, ref map.Weapons, null, 0); UpgradeWeaponRules(engineDate, ref map.Weapons, null, 0);
@@ -350,7 +349,7 @@ namespace OpenRA.Utility
public static void UpgradeMod(string[] args) public static void UpgradeMod(string[] args)
{ {
var mod = args[1]; var mod = args[1];
var engineDate = int.Parse(args[2], NumberStyles.Integer, NumberFormatInfo.InvariantInfo); var engineDate = Exts.ParseIntegerInvariant(args[2]);
Game.modData = new ModData(mod); Game.modData = new ModData(mod);
Game.modData.MapCache.LoadMaps(); Game.modData.MapCache.LoadMaps();