eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-04-06 22:33:08 +02:00
parent 5380666fa6 87f078925c
commit a914065dd0
13 changed files with 908 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mtable.cpp
View File

@@ -530,13 +530,13 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax)
{
adjustedtime = clamp_circular( TimeTable[i].Ah * 60 + TimeTable[i].Am + timeoffset, 24 * 60 ); // nowe minuty
TimeTable[i].Am = adjustedtime % 60;
TimeTable[i].Ah = (adjustedtime /*div*/ / 60) % 60;
TimeTable[i].Ah = (adjustedtime / 60) % 24;
}
if ((TimeTable[i].Dh >= 0))
{
adjustedtime = clamp_circular( TimeTable[i].Dh * 60 + TimeTable[i].Dm + timeoffset, 24 * 60 ); // nowe minuty
TimeTable[i].Dm = adjustedtime % 60;
TimeTable[i].Dh = (adjustedtime /*div*/ / 60) % 60;
TimeTable[i].Dh = (adjustedtime / 60) % 24;
}
}
}