space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-15 14:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace IMapManager.FindGridAt with IMapManager.TryFindGridAt.

Browse Source 
Grid spatial queries do not return the default grid anymore.
This commit is contained in:
Acruid
2020-02-27 02:10:18 -08:00
parent d5872ce66d
commit 8f968760cb
5 changed files with 68 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Client/Graphics/ClientEye/EyeManager.cs
+5 -10
View File
@@ -85,19 +85,14 @@ namespace Robust.Client.Graphics.ClientEye
public GridCoordinates ScreenToWorld(Vector2 point)
{
var mapPos = ScreenToMap(point).Position;
var mapCoords = ScreenToMap(point);
IMapGrid grid;
var mapId = currentEye.Position.MapId;
if (_mapManager.MapExists(mapId))
if (!_mapManager.TryFindGridAt(mapCoords, out var grid))
{
grid = _mapManager.FindGridAt(mapId, mapPos);
grid = _mapManager.GetDefaultGrid(mapCoords.MapId);
}
else
{
grid = _mapManager.GetGrid(GridId.Invalid);
}
return new GridCoordinates(grid.WorldToLocal(mapPos), grid);
return new GridCoordinates(grid.WorldToLocal(mapCoords.Position), grid.Index);
}
public MapCoordinates ScreenToMap(Vector2 point)