diff --git a/pk3DS/Properties/Resources.Designer.cs b/pk3DS/Properties/Resources.Designer.cs index a68c377..7bcd88b 100644 --- a/pk3DS/Properties/Resources.Designer.cs +++ b/pk3DS/Properties/Resources.Designer.cs @@ -10512,6 +10512,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap FLY { + get { + object obj = ResourceManager.GetObject("FLY", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/pk3DS/Properties/Resources.resx b/pk3DS/Properties/Resources.resx index c59aa8d..af0b2bb 100644 --- a/pk3DS/Properties/Resources.resx +++ b/pk3DS/Properties/Resources.resx @@ -4540,4 +4540,7 @@ ..\Resources\img\W.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\FLY.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/pk3DS/Resources/img/fly.png b/pk3DS/Resources/img/fly.png new file mode 100644 index 0000000..8d2a007 Binary files /dev/null and b/pk3DS/Resources/img/fly.png differ diff --git a/pk3DS/Subforms/MapPermView.cs b/pk3DS/Subforms/MapPermView.cs index 58fbb39..9dcb416 100644 --- a/pk3DS/Subforms/MapPermView.cs +++ b/pk3DS/Subforms/MapPermView.cs @@ -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(); } } } diff --git a/pk3DS/Subforms/OWSE.cs b/pk3DS/Subforms/OWSE.cs index 94c930e..4907960 100644 --- a/pk3DS/Subforms/OWSE.cs +++ b/pk3DS/Subforms/OWSE.cs @@ -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); diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj index b5e2ac3..829f47d 100644 --- a/pk3DS/pk3DS.csproj +++ b/pk3DS/pk3DS.csproj @@ -4764,6 +4764,9 @@ + + +