16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 17:09:19 +02:00

re-enabled cargo mesh loading; minor brake fixes; increased use of glew and stl containers

This commit is contained in:
tmj-fstate
2017-01-26 04:57:41 +01:00
parent d6015c13dc
commit c3fab994ae
13 changed files with 244 additions and 237 deletions

View File

@@ -288,8 +288,10 @@ std::string TSpeedPos::GetName()
{
if (iFlags & spTrack) // jeśli tor
return trTrack->NameGet();
else if (iFlags & spEvent) // jeśli event
else if( iFlags & spEvent ) // jeśli event
return evEvent->asName;
else
return "";
}
std::string TSpeedPos::TableText()
@@ -297,7 +299,7 @@ std::string TSpeedPos::TableText()
if (iFlags & spEnabled)
{ // o ile pozycja istotna
return "Flags=" + to_hex_str(iFlags, 6) + ", Dist=" + to_string(fDist, 1, 7) +
", Vel=" + std::to_string(fVelNext) + ", Name=" + GetName();
", Vel=" + to_string(fVelNext, 1, 5) + ", Name=" + GetName();
//if (iFlags & spTrack) // jeśli tor
// return "Flags=#" + IntToHex(iFlags, 8) + ", Dist=" + FloatToStrF(fDist, ffFixed, 7, 1) +
// ", Vel=" + AnsiString(fVelNext) + ", Track=" + trTrack->NameGet();