Add zonedata coordinate to map

Also made the focus-scroll not steal focus if the form itself doesn't
have it.
This commit is contained in:
Kurt
2015-11-13 21:10:21 -08:00
parent 1275d80c1a
commit faa7afc881
6 changed files with 33 additions and 2 deletions

View File

@@ -10512,6 +10512,16 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap FLY {
get {
object obj = ResourceManager.GetObject("FLY", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View File

@@ -4540,4 +4540,7 @@
<data name="W" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\W.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FLY" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\FLY.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
pk3DS/Resources/img/fly.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

View File

@@ -108,6 +108,18 @@ private Bitmap overlayEntities(Bitmap img)
try { Util.LayerImage(img, Resources.T2, (x + sx) * mapScale, (y + sy) * mapScale, opacity); }
catch { }
}
// Overlay map
{
int x = (int)OWSE.CurrentZone.ZD.pX2;
int y = (int)OWSE.CurrentZone.ZD.pY2;
for (int sx = 0; sx < 1; sx++) // Stretch X
for (int sy = 0; sy < 1; sy++) // Stretch Y
try { Util.LayerImage(img, Resources.FLY, (x + sx) * mapScale, (y + sy) * mapScale, opacity); }
catch { }
}
return img;
}
@@ -155,7 +167,8 @@ private void MapPermView_FormClosing(object sender, FormClosingEventArgs e)
private void focusPanel(object sender, EventArgs e)
{
PAN_MAP.Focus();
if (ContainsFocus)
PAN_MAP.Focus();
}
}
}

View File

@@ -146,7 +146,9 @@ private void getZoneData()
if (Math.Abs(CurrentZone.ZD.pX - CurrentZone.ZD.pX2) > 0.01
|| Math.Abs(CurrentZone.ZD.pY - CurrentZone.ZD.pY2) > 0.01
|| CurrentZone.ZD.Z != CurrentZone.ZD.Z2)
Util.Alert("ZD Coordinate Mismatch");
{
L_ZD.Text += Environment.NewLine + "COORDINATE MISMATCH";
}
// Fetch Map Image
mapView.drawMap(CurrentZone.ZD.MapMatrix);

View File

@@ -4764,6 +4764,9 @@
<ItemGroup>
<None Include="Resources\img\F.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\img\FLY.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.