Fix #53, fix tile modification with zoom, fix upside down drawing.

HEROsMod.cs

@@ -166,12 +166,36 @@ public override void ModifyInterfaceLayers(List<GameInterfaceLayer> layers)
 						}
 						catch (Exception e)
 						{
-							ModUtils.DebugText("PostDrawInInventory Error: " + e.Message + e.StackTrace);
+							ModUtils.DebugText("HerosMod: UI Error: " + e.Message + e.StackTrace);
 						}
 						return true;
 					},
 					InterfaceScaleType.UI)
 				);
+
+				// Technically before the above GameInterfaceLayer 
+				layers.Insert(inventoryLayerIndex, new LegacyGameInterfaceLayer(
+					"HerosMod: UI (Game Scale)",
+					delegate {
+						try
+						{
+							if (ModUtils.NetworkMode != NetworkMode.Server)
+							{
+								foreach (var service in ServiceController.Services)
+								{
+									service.UpdateGameScale();
+								}
+							}
+							SelectionTool.Update();
+						}
+						catch (Exception e)
+						{
+							ModUtils.DebugText("HerosMod: UI (Game Scale) Error: " + e.Message + e.StackTrace);
+						}
+						return true;
+					},
+					InterfaceScaleType.Game)
+				);
 			}
 		}
 
@@ -501,7 +525,6 @@ public static void Update(/*GameTime gameTime*/)
 					service.Update();
 				}
 				MasterView.UpdateMaster();
-				SelectionTool.Update();
 				//if (Main.ingameOptionsWindow && (IngameOptions.category == 2 || IngameOptions.category == 3))
 				//{
 				//	HEROsModMod.UIKit.MasterView.gameScreen.AddChild(new HEROsModMod.UIKit.UIComponents.KeybindWindow());
@@ -648,11 +671,7 @@ public static void DrawBehindUI(SpriteBatch spriteBatch)
 			if (!Main.gameMenu)
 			{
 				HEROsModVideo.Services.MobHUD.MobInfo.Draw(spriteBatch);
-				SelectionTool.Draw(spriteBatch);
-				if (RegionService.RegionsVisible)
-					RegionService.DrawRegions(spriteBatch);
 				//HEROsModNetwork.CTF.CaptureTheFlag.Draw(spriteBatch);
-				CheckTileModificationTool.DrawBoxOnCursor(spriteBatch);
 			}
 		}
 	}

HEROsModModWorld.cs

@@ -36,5 +36,21 @@ public override TagCompound Save()
 			}
 			return null;
 		}
+
+		public override void PostDrawTiles()
+		{
+			if (RegionService.RegionsVisible || SelectionTool.Visible || CheckTileModificationTool.ListeningForInput)
+			{
+				Main.spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, Main.DefaultSamplerState, 
+DepthStencilState.None, Main.instance.Rasterizer, null, Main.GameViewMatrix.TransformationMatrix);
+				if (SelectionTool.Visible)
+					SelectionTool.Draw(Main.spriteBatch);
+				if (RegionService.RegionsVisible)
+					RegionService.DrawRegions(Main.spriteBatch);
+				if(CheckTileModificationTool.ListeningForInput)
+					CheckTileModificationTool.DrawBoxOnCursor(Main.spriteBatch);
+				Main.spriteBatch.End();
+			}
+		}
 	}
 }

HEROsModServices/CheckTileModificationTool.cs

@@ -9,7 +9,8 @@ namespace HEROsMod.HEROsModServices
 {
 	internal class CheckTileModificationTool : HEROsModService
 	{
-		private static bool ListeningForInput = false;
+		internal static bool ListeningForInput = false;
+		internal static Vector2 CheckCoordinates;
 
 		public CheckTileModificationTool()
 		{
@@ -25,13 +26,14 @@ private void HotbarIcon_onLeftClick(object sender, EventArgs e)
 			ListeningForInput = !ListeningForInput;
 		}
 
-		public override void Update()
+		public override void UpdateGameScale()
 		{
 			if (ListeningForInput && !Main.gameMenu)
 			{
+				CheckCoordinates = ModUtils.CursorTileCoords;
 				if (ModUtils.MouseState.LeftButton == ButtonState.Pressed && ModUtils.PreviousMouseState.LeftButton == ButtonState.Released && !UIKit.UIView.GameMouseOverwritten)
 				{
-					HEROsModNetwork.GeneralMessages.RequestTileModificationCheck(ModUtils.CursorTileCoords);
+					HEROsModNetwork.GeneralMessages.RequestTileModificationCheck(CheckCoordinates);
 				}
 				if (ModUtils.MouseState.RightButton == ButtonState.Pressed && ModUtils.PreviousMouseState.RightButton == ButtonState.Released && !UIKit.UIView.GameMouseOverwritten)
 				{
@@ -46,10 +48,7 @@ public static void DrawBoxOnCursor(SpriteBatch spriteBatch)
 		{
 			if (ListeningForInput)
 			{
-				Vector2 pos = ModUtils.CursorWorldCoords;
-				pos.X = (int)pos.X / 16 * 16;
-				pos.Y = (int)pos.Y / 16 * 16;
-				ModUtils.DrawBorderedRect(spriteBatch, Color.Blue, ModUtils.CursorTileCoords, new Vector2(1, 1), 2);
+				ModUtils.DrawBorderedRect(spriteBatch, Color.Blue, CheckCoordinates, new Vector2(1, 1), 2);
 			}
 		}
 

HEROsModServices/HEROsModService.cs

@@ -60,6 +60,10 @@ public virtual void Update()
 		{
 		}
 
+		public virtual void UpdateGameScale()
+		{
+		}
+
 		/// <summary>
 		/// This method must be called before the Service is desposed.
 		/// </summary>

HEROsModServices/SelectionTool.cs

@@ -65,8 +65,10 @@ public static void Update()
 				if (ModUtils.MouseState.LeftButton == ButtonState.Pressed && ModUtils.PreviousMouseState.LeftButton == ButtonState.Released && !UIKit.UIView.GameMouseOverwritten)
 				{
 					_dragging = true;
-					Position = ModUtils.CursorTileCoords;
+					Position = Main.MouseWorld.ToTileCoordinates().ToVector2();
 					_anchor = Position;
+					Width = 1;
+					Height = 1;
 				}
 				else if (_dragging && ModUtils.MouseState.LeftButton == ButtonState.Pressed)
 				{

ModUtils.cs

@@ -587,7 +587,8 @@ public static Vector2 CursorTileCoords
 		{
 			get
 			{
-				return GetTileCoordsFromWorldCoords(GetCursorWorldCoords());
+				return Main.MouseWorld.ToTileCoordinates().ToVector2();
+				//return GetTileCoordsFromWorldCoords(GetCursorWorldCoords());
 			}
 		}