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

build 180830. minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-08-30 20:41:44 +02:00
parent 0c062e9041
commit 1cfaaa24f6
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DynObj.cpp
View File

@@ -6474,7 +6474,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub
default: { default: {
volume = volume =
engine.m_amplitudeoffset engine.m_amplitudeoffset
+ engine.m_amplitudefactor * ( Vehicle.EnginePower / 1000 + std::fabs( Vehicle.enrot ) * 60.0 ); + engine.m_amplitudefactor * ( Vehicle.EnginePower + std::fabs( Vehicle.enrot ) * 60.0 );
break; break;
} }
} }
@@ -6626,7 +6626,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub
case TEngineType::ElectricSeriesMotor: { case TEngineType::ElectricSeriesMotor: {
volume = volume =
motor.m_amplitudeoffset motor.m_amplitudeoffset
+ motor.m_amplitudefactor * ( Vehicle.EnginePower / 1000 + motorrevolutions * 60.0 ); + motor.m_amplitudefactor * ( Vehicle.EnginePower + motorrevolutions * 60.0 );
break; break;
} }
default: { default: {

2
McZapkie/Mover.cpp
View File

@@ -250,7 +250,7 @@ double TMoverParameters::Current(double n, double U)
else else
Im = MotorCurrent; Im = MotorCurrent;
EnginePower = abs(Itot) * (1 + RList[MainCtrlActualPos].Mn) * abs(U); EnginePower = abs(Itot) * (1 + RList[MainCtrlActualPos].Mn) * abs(U) / 1000.0;
// awarie // awarie
MotorCurrent = abs(Im); // zmienna pomocnicza MotorCurrent = abs(Im); // zmienna pomocnicza

2
command.cpp
View File

@@ -144,7 +144,7 @@ commanddescription_sequence Commands_descriptions = {
{ "doortoggleright", command_target::vehicle }, { "doortoggleright", command_target::vehicle },
{ "dooropenleft", command_target::vehicle }, { "dooropenleft", command_target::vehicle },
{ "dooropenright", command_target::vehicle }, { "dooropenright", command_target::vehicle },
{ "doorlcloseleft", command_target::vehicle }, { "doorcloseleft", command_target::vehicle },
{ "doorcloseright", command_target::vehicle }, { "doorcloseright", command_target::vehicle },
{ "doorcloseall", command_target::vehicle }, { "doorcloseall", command_target::vehicle },
{ "departureannounce", command_target::vehicle }, { "departureannounce", command_target::vehicle },

2
parser.h
View File

@@ -91,7 +91,7 @@ class cParser //: public std::stringstream
bool trimComments( std::string &String ); bool trimComments( std::string &String );
std::size_t count(); std::size_t count();
// members: // members:
bool m_autoclear { true }; // not retrieved tokens are discarded when another read command is issued (legacy behaviour) bool m_autoclear { true }; // unretrieved tokens are discarded when another read command is issued (legacy behaviour)
bool LoadTraction { true }; // load traction? bool LoadTraction { true }; // load traction?
std::shared_ptr<std::istream> mStream; // relevant kind of buffer is attached on creation. std::shared_ptr<std::istream> mStream; // relevant kind of buffer is attached on creation.
std::string mFile; // name of the open file, if any std::string mFile; // name of the open file, if any

2
version.h
View File

@@ -1,5 +1,5 @@
#pragma once #pragma once
#define VERSION_MAJOR 18 #define VERSION_MAJOR 18
#define VERSION_MINOR 825 #define VERSION_MINOR 830
#define VERSION_REVISION 0 #define VERSION_REVISION 0