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

9
OpenRA.Utility/UpgradeRules.cs
View File

@@ -1,6 +1,6 @@
#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
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Globalization;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
@@ -43,7 +42,7 @@ namespace OpenRA.Utility
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 world = value * 1024 * scaleMult / (scaleDiv * ts.Height);
var cells = world / 1024;
@@ -338,7 +337,7 @@ namespace OpenRA.Utility
public static void UpgradeMap(string[] args)
{
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);
UpgradeWeaponRules(engineDate, ref map.Weapons, null, 0);
@@ -350,7 +349,7 @@ namespace OpenRA.Utility
public static void UpgradeMod(string[] args)
{
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.MapCache.LoadMaps();