eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 18:39:18 +02:00
Code Issues 123 Wiki Activity

Poprawka na pusty rozkład.

Browse Source
This commit is contained in:
firleju
2016-11-09 16:20:52 +01:00
parent 283973f773
commit ebe2da9d6f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mtable.cpp
View File

@@ -230,7 +230,7 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax)
else else
{ /*analiza rozk³adu jazdy*/ { /*analiza rozk³adu jazdy*/
ConversionError = 0; ConversionError = 0;
while (!(fin.bad() || (ConversionError != 0) || EndTable)) while (fin.good() && !((ConversionError != 0) || EndTable))
{ {
std::getline(fin,lines); /*wczytanie linii*/ std::getline(fin,lines); /*wczytanie linii*/
if (lines.find("___________________") != std::string::npos) /*linia pozioma górna*/ if (lines.find("___________________") != std::string::npos) /*linia pozioma górna*/
@@ -246,6 +246,11 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax)
} while (!(s == "|") || (fin.eof())); /*œrodkowy pion*/ } while (!(s == "|") || (fin.eof())); /*œrodkowy pion*/
} }
} }
else if (lines == "")
{
fin.close();
break;
}
fin >> s; /*nazwa poci¹gu*/ fin >> s; /*nazwa poci¹gu*/
// if LowerCase(s)<>ExtractFileName(TrainName) then {musi byæ taka sama, jak nazwa // if LowerCase(s)<>ExtractFileName(TrainName) then {musi byæ taka sama, jak nazwa
// pliku} // pliku}