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

fix some editor weirdness (2/2)

Browse Source
This commit is contained in:
Chris Forbes
2010-09-17 07:58:06 +12:00
parent 40533a50c1
commit 94e5b02a39
2 changed files with 76 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Editor/Form1.Designer.cs generated
View File

@@ -110,7 +110,6 @@
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.splitContainer2);
this.splitContainer1.Panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.splitContainer1_Panel1_Paint);
//
// splitContainer1.Panel2
//
@@ -235,7 +234,7 @@
this.surface1.Size = new System.Drawing.Size(783, 727);
this.surface1.TabIndex = 5;
this.surface1.Text = "surface1";
this.surface1.Click += new System.EventHandler(this.surface1_Click_1);
this.surface1.Click += new System.EventHandler(this.OnSurfaceClicked);
//
// menuStrip1
//

54
OpenRA.Editor/Form1.cs
View File

@@ -63,7 +63,6 @@ namespace OpenRA.Editor
// load the map
var map = new Map(new Folder(mapname));
// upgrade maps that have no player definitions. editor doesnt care,
// but this breaks the game pretty badly.
if (map.Players.Count == 0)
@@ -206,8 +205,6 @@ namespace OpenRA.Editor
pmMiniMap.Image = Minimap.TerrainBitmap(surface1.Map, true);
}
static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
{
var template = ts.Templates[n];
@@ -340,11 +337,6 @@ namespace OpenRA.Editor
surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
surface1.Map.Package = new Folder(loadedMapName);
surface1.Map.Save(loadedMapName);
using (var nms = new MapSelect())
{
Minimap.TerrainBitmap(surface1.Map, true)
.Save(Path.Combine(loadedMapName, "map.png"), System.Drawing.Imaging.ImageFormat.Png);
}
dirty = false;
}
@@ -364,47 +356,28 @@ namespace OpenRA.Editor
if (DialogResult.OK == nms.ShowDialog())
{
if (nms.txtNew.Text == "")
{
nms.txtNew.Text = "unnamed";
}
string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
DirectoryInfo directory = new DirectoryInfo(mapfoldername);
loadedMapName = mapfoldername;
try
{
if (directory.Exists)
{
return;
}
directory.Create();
Directory.CreateDirectory(mapfoldername);
}
catch (Exception ed)
{
Console.WriteLine("Directory creation failed: {0}", ed.ToString());
MessageBox.Show("Directory creation failed: {0}", ed.ToString());
}
finally { }
SaveClicked(sender, e);
}
}
//if (DialogResult.OK == folderBrowser.ShowDialog())
//{
//loadedMapName = folderBrowser.SelectedPath;
// SaveClicked(sender, e);
//}
}
void OpenClicked(object sender, EventArgs e)
{
//folderBrowser.ShowNewFolderButton = true;
using (var nms = new MapSelect())
{
nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
@@ -420,10 +393,6 @@ namespace OpenRA.Editor
LoadMap(mapfoldername);
}
}
//if (DialogResult.OK == folderBrowser.ShowDialog())
//LoadMap(folderBrowser.SelectedPath);
}
void NewClicked(object sender, EventArgs e)
@@ -514,28 +483,13 @@ namespace OpenRA.Editor
}
}
private void splitContainer1_Panel1_Paint(object sender, PaintEventArgs e)
{
}
private void statusStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
private void surface1_Click(object sender, EventArgs e)
{
}
private void layersFloaterToolStripMenuItem_Click(object sender, EventArgs e)
{
var pb = new PaletteBox();
pb.Show();
}
private void surface1_Click_1(object sender, EventArgs e)
private void OnSurfaceClicked(object sender, EventArgs e)
{
pmMiniMap.Image = Minimap.TerrainBitmap(surface1.Map, true);
}