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

Merge pull request #85 from Anonim17PL/master

Browse Source 
Poprawki po 078470c, 2a5d8cc i 7cac46d
This commit is contained in:
Ryba04
2025-05-04 17:40:59 +02:00
committed by GitHub
parent 5ec90e62a3 583dc8c1ec
commit 6b21737ec4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
McZapkie/Mover.cpp
View File

@@ -11395,7 +11395,7 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet
extract_value(PantType, "PantType", Line, ""); extract_value(PantType, "PantType", Line, "");
if (PantType == "AKP_4E") if (PantType == "AKP_4E")
collectorparameters.PantographType = TPantType::AKP_4E; collectorparameters.PantographType = TPantType::AKP_4E;
if (PantType._Starts_with("DSA")) // zakladam ze wszystkie pantografy DSA sa takie same if (PantType.rfind("DSA",0) == 0) // zakladam ze wszystkie pantografy DSA sa takie same
collectorparameters.PantographType = TPantType::DSAx; collectorparameters.PantographType = TPantType::DSAx;
if (PantType == "EC160" || PantType == "EC200") if (PantType == "EC160" || PantType == "EC200")
collectorparameters.PantographType = TPantType::EC160_200; collectorparameters.PantographType = TPantType::EC160_200;

2
application.h
View File

@@ -38,7 +38,7 @@ public:
run(); run();
// issues request for a worker thread to perform specified task. returns: true if task was scheduled // issues request for a worker thread to perform specified task. returns: true if task was scheduled
void eu07_application::DiscordRPCService(); // discord rich presence service function (runs as separate thread) void DiscordRPCService(); // discord rich presence service function (runs as separate thread)
bool bool
request( python_taskqueue::task_request const &Task ); request( python_taskqueue::task_request const &Task );
// ensures the main thread holds the python gil and can safely execute python calls // ensures the main thread holds the python gil and can safely execute python calls

3
particles.cpp
View File

@@ -474,7 +474,8 @@ particle_manager::find( std::string const &Template ) {
} }
// ... and if it fails try to add the template to the database from a data file // ... and if it fails try to add the template to the database from a data file
smoke_source source; smoke_source source;
if( source.deserialize( cParser( templatepath + templatename + ".txt", cParser::buffer_FILE ) ) ) { cParser sound_parser( templatepath + templatename + ".txt", cParser::buffer_FILE );
if( source.deserialize( sound_parser ) ) {
// if deserialization didn't fail finish source setup... // if deserialization didn't fail finish source setup...
source.m_opacitymodifier.bind( &Global.SmokeFidelity ); source.m_opacitymodifier.bind( &Global.SmokeFidelity );
// ...then cache the source as template for future instances // ...then cache the source as template for future instances