Изменение метода загрузки
This commit is contained in:
parent
314d2c3b15
commit
cc6f49f85d
@ -123,43 +123,31 @@ namespace WarmlyLocomotive
|
||||
}
|
||||
using (StreamReader sr = new(filename))
|
||||
{
|
||||
bool isFirst = true;
|
||||
string str;
|
||||
while((str = sr.ReadLine()) != null)
|
||||
string str = sr.ReadLine();
|
||||
if (!str.Contains("MapsCollection"))
|
||||
{
|
||||
if (isFirst)
|
||||
//если нет такой записи, то это не те данные
|
||||
return false;
|
||||
}
|
||||
_mapStorages.Clear();
|
||||
while ((str = sr.ReadLine()) != null)
|
||||
{
|
||||
var elem = str.Split(separatorDict);
|
||||
AbstractMap map = null;
|
||||
switch (elem[1])
|
||||
{
|
||||
if (!str.Contains("MapsCollection"))
|
||||
{
|
||||
//если нет такой записи, то это не те данные
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
//очищаем записи
|
||||
_mapStorages.Clear();
|
||||
}
|
||||
isFirst = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
var elem = str.Split(separatorDict);
|
||||
AbstractMap map = null;
|
||||
switch (elem[1])
|
||||
{
|
||||
case "SimpleMap":
|
||||
map = new SimpleMap();
|
||||
break;
|
||||
case "BigBarriersMap":
|
||||
map = new BigBarriersMap();
|
||||
break;
|
||||
case "CirclesMap":
|
||||
map = new CirclesMap();
|
||||
break;
|
||||
}
|
||||
_mapStorages.Add(elem[0], new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
|
||||
_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
|
||||
case "SimpleMap":
|
||||
map = new SimpleMap();
|
||||
break;
|
||||
case "BigBarriersMap":
|
||||
map = new BigBarriersMap();
|
||||
break;
|
||||
case "CirclesMap":
|
||||
map = new CirclesMap();
|
||||
break;
|
||||
}
|
||||
_mapStorages.Add(elem[0], new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
|
||||
_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
Loading…
Reference in New Issue
Block a user