1
1
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-12-26 12:06:24 -05:00

Fixed enum error. Allow multiple loads of same map id.

This commit is contained in:
Tim Sarbin 2018-11-28 21:26:29 -05:00
parent 3500a07b45
commit 7a1aea686b
2 changed files with 2 additions and 7 deletions

View File

@ -2,8 +2,8 @@
{ {
public enum eLevelSubType public enum eLevelSubType
{ {
Act1BorderCliff = 1, Act1BorderCliff = 0,
Act1BorderMiddle = 2, Act1BorderMiddle = 1,
Act1BorderCorner = 2, Act1BorderCorner = 2,
Act1BorderBorder = 3, Act1BorderBorder = 3,
Act1Waypoint = 4, Act1Waypoint = 4,

View File

@ -133,11 +133,6 @@ namespace OpenDiablo2.Core.GameState_
public MapInfo LoadMap(eLevelId levelId, Point origin) public MapInfo LoadMap(eLevelId levelId, Point origin)
{ {
// Don't generate the map if it doesn't already exist
var existing = mapInfo.FirstOrDefault(x => x.LevelId == levelId);
if (existing != null)
return existing;
var level = engineDataManager.LevelPresets.First(x => x.LevelId == (int)levelId); var level = engineDataManager.LevelPresets.First(x => x.LevelId == (int)levelId);
var levelDetails = engineDataManager.LevelDetails.First(x => x.Id == level.LevelId); var levelDetails = engineDataManager.LevelDetails.First(x => x.Id == level.LevelId);
var levelType = engineDataManager.LevelTypes.First(x => x.Id == levelDetails.LevelType); var levelType = engineDataManager.LevelTypes.First(x => x.Id == levelDetails.LevelType);