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

Brace style fixes

Browse Source
This commit is contained in:
ScottNZ
2015-02-12 23:54:32 +13:00
parent 1eb6c984f5
commit 582b6635ff
23 changed files with 21 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.TilesetBuilder/FormBuilder.cs
View File

@@ -136,9 +136,7 @@ namespace OpenRA.TilesetBuilder
Load();
}
else
{
CreateNewTileset();
}
if (autoExport)
{
@@ -179,7 +177,8 @@ namespace OpenRA.TilesetBuilder
{
var tilesetName = txtTilesetName.Text;
if (tilesetName.Length < 1) { tilesetName = "Temperat"; }
if (tilesetName.Length < 1)
tilesetName = "Temperat";
w.WriteStartDocument();
@@ -295,9 +294,7 @@ namespace OpenRA.TilesetBuilder
var q = p + data.Stride * tileSize * (v + t.Top) + tileSize * (u + t.Left);
for (var j = 0; j < tileSize; j++)
for (var i = 0; i < tileSize; i++)
{
bw.Write(q[i + j * data.Stride]);
}
}
else
for (var x = 0; x < tileSize * tileSize; x++)
@@ -348,10 +345,10 @@ namespace OpenRA.TilesetBuilder
var tilesetPalette = txtPal.Text;
var tilesetExt = txtExt.Text;
if (tilesetName.Length < 1) { tilesetName = "Temperat"; }
if (tilesetID.Length < 1) { tilesetID = "TEMPERAT"; }
if (tilesetPalette.Length < 1) { tilesetPalette = "temperat"; }
if (tilesetExt.Length < 1) { tilesetExt = ".tem,.shp"; }
if (tilesetName.Length < 1) tilesetName = "Temperat";
if (tilesetID.Length < 1) tilesetID = "TEMPERAT";
if (tilesetPalette.Length < 1) tilesetPalette = "temperat";
if (tilesetExt.Length < 1) tilesetExt = ".tem,.shp";
// Create a Tileset definition
// TODO: Pull this info from the GUI
@@ -440,20 +437,14 @@ namespace OpenRA.TilesetBuilder
{
var tilesetFile = txtTilesetName.Text;
if (tilesetFile.Length > 8)
{
tilesetFile = tilesetFile.ToLower().Substring(0, 8);
}
txtID.Text = tilesetFile.ToUpper();
txtPal.Text = tilesetFile.ToLower() + ".pal";
if (tilesetFile.Length < 3)
{
txtExt.Text = ".tem,.shp";
}
else
{
txtExt.Text = "." + tilesetFile.ToLower().Substring(0, 3) + ",.shp";
}
}
private void NewTilesetButton(object sender, EventArgs e)

4
OpenRA.TilesetBuilder/FormNew.cs
View File

@@ -26,15 +26,11 @@ namespace OpenRA.TilesetBuilder
if (!PaletteFromImage)
{
if (PaletteFile.Length < 5)
{
MessageBox.Show("No palette specified", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}
if (ImageFile.Length < 5)
{
MessageBox.Show("No image selected", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
DialogResult = DialogResult.OK;

11
OpenRA.TilesetBuilder/Program.cs
View File

@@ -23,16 +23,11 @@ namespace OpenRA.TilesetBuilder
Application.SetCompatibleTextRenderingDefault(false);
if (args.Length < 1)
{
Application.Run(new FormBuilder("", "0", false, "Tilesets"));
}
else if (args.Contains("--export"))
Application.Run(new FormBuilder(args[0], args[1], true, args[3]));
else
{
if (args.Contains("--export"))
Application.Run(new FormBuilder(args[0], args[1], true, args[3]));
else
Application.Run(new FormBuilder(args[0], args[1], false, "Tilesets"));
}
Application.Run(new FormBuilder(args[0], args[1], false, "Tilesets"));
}
}
}