tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shared IMap/Map class removal (#467)

Browse Source 
* Fully removed the Map and IMap class.

* Submodule update to sibling engine commit.
This commit is contained in:
Acruid
2019-11-26 14:16:36 -08:00
committed by Pieter-Jan Briers
parent 9cfa0d447a
commit d549c44f95
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameTicking/GameTicker.cs
View File

@@ -328,12 +328,12 @@ namespace Content.Server.GameTicking
}
// Delete all maps outside of nullspace.
foreach (var map in _mapManager.GetAllMaps().ToList())
foreach (var mapId in _mapManager.GetAllMapIds().ToList())
{
// TODO: Maybe something less naive here?
if (map.Index != MapId.Nullspace)
if (mapId != MapId.Nullspace)
{
_mapManager.DeleteMap(map.Index);
_mapManager.DeleteMap(mapId);
}
}
@@ -366,9 +366,9 @@ namespace Content.Server.GameTicking
private void _preRoundSetup()
{
var newMap = _mapManager.CreateMap();
var newMapId = _mapManager.CreateMap();
var startTime = _gameTiming.RealTime;
var grid = _mapLoader.LoadBlueprint(newMap, MapFile);
var grid = _mapLoader.LoadBlueprint(newMapId, MapFile);
_spawnPoint = new GridCoordinates(Vector2.Zero, grid);