Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-09-27 04:19:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source 
move files, abstract some logic for later reuse
This commit is contained in:
Kurt
2020-05-11 22:14:27 -07:00
parent 46d4f4e8c1
commit 60faecdc69
18 changed files with 321 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
NHSE.WinForms/Subforms/Map/FieldItemEditor.cs
View File

@@ -4,6 +4,7 @@
using System.Linq;
using System.Windows.Forms;
using NHSE.Core;
using NHSE.Sprites;
namespace NHSE.WinForms
{
@@ -290,8 +291,8 @@ private void ViewTile(Item tile, int x, int y)
if (CHK_RedirectExtensionLoad.Checked && tile.IsExtension)
{
var l = Map.CurrentLayer;
var rx = Math.Max(0, Math.Min(l.MapWidth - 1, x - tile.ExtensionX));
var ry = Math.Max(0, Math.Min(l.MapHeight - 1, y - tile.ExtensionY));
var rx = Math.Max(0, Math.Min(l.MaxWidth - 1, x - tile.ExtensionX));
var ry = Math.Max(0, Math.Min(l.MaxHeight - 1, y - tile.ExtensionY));
var redir = l.GetTile(rx, ry);
if (redir.IsRoot && redir.ItemId == tile.ExtensionItemId)
tile = redir;
@@ -322,8 +323,8 @@ private void SetTile(Item tile, int x, int y)
var permission = l.IsOccupied(pgt, x, y);
switch (permission)
{
case FieldItemPermission.OutOfBounds:
case FieldItemPermission.Collision when CHK_NoOverwrite.Checked:
case PlacedItemPermission.OutOfBounds:
case PlacedItemPermission.Collision when CHK_NoOverwrite.Checked:
System.Media.SystemSounds.Asterisk.Play();
return;
}