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

build 200501. minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2020-05-01 17:38:26 +02:00
parent be37862352
commit 8aee89ffa9
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Train.cpp
View File

@@ -498,16 +498,13 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d)
{
Global.CurrentMaxTextureSize = Global.iMaxCabTextureSize;
auto const filename{ DynamicObject->asBaseDir + DynamicObject->MoverParameters->TypeName + ".mmd" };
auto const result { LoadMMediaFile( filename ) };
Global.CurrentMaxTextureSize = Global.iMaxTextureSize;
/*
if( false == result ) {
return false;
}
*/
LoadMMediaFile( filename );
InitializeCab( mvOccupied->CabOccupied, filename );
Global.CurrentMaxTextureSize = Global.iMaxTextureSize;
if( DynamicObject->Controller == Humandriver ) {
// McZapkie-030303: mozliwosc wyswietlania kabiny, w przyszlosci dac opcje w mmd
DynamicObject->bDisplayCab = true;
@@ -3012,8 +3009,15 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma
if( Command.action == GLFW_PRESS ) {
// only reacting to press, so the switch doesn't flip back and forth if key is held down
if( ( false == Train->mvOccupied->Power110vIsAvailable )
&& ( Train->ggConverterButton.GetValue() < 0.5 ) ) {
auto const overloadrelayisopen { (
Train->Dynamic()->Mechanik != nullptr ?
Train->Dynamic()->Mechanik->IsAnyConverterOverloadRelayOpen :
Train->mvOccupied->ConvOvldFlag ) };
if( Train->mvOccupied->ConvSwitchType != "impulse" ?
Train->ggConverterButton.GetValue() < 0.5 :
( ( false == Train->mvOccupied->Power110vIsAvailable )
&& ( false == overloadrelayisopen ) ) ) {
// turn on
OnCommand_converterenable( Train, Command );
}