diff --git a/DynObj.cpp b/DynObj.cpp index a759d3ef..9c0bd8e1 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4927,7 +4927,14 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co if( false == MoverParameters->LoadAttributes.empty() ) { // Ra: tu wczytywanie modelu ładunku jest w porządku + + // bieżąca ścieżka do tekstur to dynamic/... + Global.asCurrentTexturePath = asBaseDir; + mdLoad = LoadMMediaFile_mdload( MoverParameters->LoadType.name ); + + // z powrotem defaultowa sciezka do tekstur + Global.asCurrentTexturePath = std::string( szTexturePath ); } } // models diff --git a/Train.cpp b/Train.cpp index 0555adac..53aef0c1 100644 --- a/Train.cpp +++ b/Train.cpp @@ -450,10 +450,10 @@ dictionary_source *TTrain::GetTrainState() { // reverser dict->insert( "direction", mover->ActiveDir ); // throttle - dict->insert( "mainctrl_pos", mover->MainCtrlPos ); - dict->insert( "main_ctrl_actual_pos", mover->MainCtrlActualPos ); - dict->insert( "scndctrl_pos", mover->ScndCtrlPos ); - dict->insert( "scnd_ctrl_actual_pos", mover->ScndCtrlActualPos ); + dict->insert( "mainctrl_pos", mvControlled->MainCtrlPos ); + dict->insert( "main_ctrl_actual_pos", mvControlled->MainCtrlActualPos ); + dict->insert( "scndctrl_pos", mvControlled->ScndCtrlPos ); + dict->insert( "scnd_ctrl_actual_pos", mvControlled->ScndCtrlActualPos ); dict->insert( "new_speed", mover->NewSpeed); // brakes dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) );