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

build 180331. minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-03-31 04:08:01 +02:00
parent fe9f509b3b
commit 07f14381a8
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
McZapkie/Mover.cpp
View File

@@ -3167,8 +3167,10 @@ void TMoverParameters::CompressorCheck(double dt)
if( Compressor > MaxCompressor ) { if( Compressor > MaxCompressor ) {
// wyłącznik ciśnieniowy jest niezależny od sposobu zasilania // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania
// TBD, TODO: don't operate the lock without battery power? // TBD, TODO: don't operate the lock without battery power?
if( ( CompressorPower == 0 ) if( ( ( CompressorPower == 0 )
|| ( CompressorPower == 3 ) ) { || ( CompressorPower == 3 ) )
&& ( ( EngineType == DieselEngine )
|| ( EngineType == DieselElectric ) ) ) {
// if the compressor is powered directly by the engine the lock can't turn it off and instead just changes the output // if the compressor is powered directly by the engine the lock can't turn it off and instead just changes the output
if( false == CompressorGovernorLock ) { if( false == CompressorGovernorLock ) {
// emit relay sound when the lock engages (the state change itself is below) and presumably changes where the air goes // emit relay sound when the lock engages (the state change itself is below) and presumably changes where the air goes

4
Track.cpp
View File

@@ -415,7 +415,9 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin)
>> fSoundDistance; >> fSoundDistance;
fTrackWidth2 = fTrackWidth; // rozstaw/szerokość w punkcie 2, na razie taka sama fTrackWidth2 = fTrackWidth; // rozstaw/szerokość w punkcie 2, na razie taka sama
parser->getTokens(2); parser->getTokens(2);
*parser >> iQualityFlag >> iDamageFlag; *parser
>> iQualityFlag
>> iDamageFlag;
if (iDamageFlag & 128) if (iDamageFlag & 128)
iAction |= 0x80; // flaga wykolejania z powodu uszkodzenia iAction |= 0x80; // flaga wykolejania z powodu uszkodzenia
parser->getTokens(); parser->getTokens();

2
version.h
View File

@@ -1,5 +1,5 @@
#pragma once #pragma once
#define VERSION_MAJOR 18 #define VERSION_MAJOR 18
#define VERSION_MINOR 330 #define VERSION_MINOR 331
#define VERSION_REVISION 0 #define VERSION_REVISION 0