eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 05:09:20 +02:00
Code Issues 150 Wiki Activity

Merge branch 'master' into feat/modern-editor

Browse Source
This commit is contained in:
Hirek
2026-10-08 17:44:58 +02:00
parent 28b4e57133 79bd0c8e91
commit 917c8f7285
41 changed files with 479 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/application.cpp
View File

@@ -498,7 +498,7 @@ int eu07_application::run()
{
command_queue::commands_map commands_to_exec;
command_queue::commands_map local_commands = simulation::Commands.pop_intercept_queue();
double slave_sync;
double slave_sync{0.0};
// if we're the server
if (m_network && m_network->servers)

2
application/drivermode.cpp
View File

@@ -690,7 +690,7 @@ void driver_mode::update_camera(double const Deltatime)
// reset window state, it'll be set again if applicable in a check below
Global.CabWindowOpen = false;
if (simulation::Train != nullptr && Camera.m_owner != nullptr && false == DebugCameraFlag)
if (simulation::Train != nullptr && controlled != nullptr && Camera.m_owner != nullptr && false == DebugCameraFlag)
{
// jeśli jazda w kabinie, przeliczyć trzeba parametry kamery
/*

2
application/scenarioloaderuilayer.cpp
View File

@@ -213,7 +213,7 @@ void scenarioloader_ui::render_()
const float spacing = 10.0f * scale; // odstęp między ikoną a tekstem
// Loading icon
const deferred_image *img = &m_loading_wheel_frames[38];
deferred_image *img = &m_loading_wheel_frames[38];
const auto loading_tex = img->get();
const auto loading_size = glm::vec2(img->size()) * glm::vec2(scale);

2
application/uitranscripts.cpp
View File

@@ -42,7 +42,7 @@ TTranscripts::Add( std::string const &txt, bool backgorund ) {
cParser parser( asciitext );
while( true == parser.getTokens( 3, false, "[]\n" ) ) {
float begin, end;
float begin{ 0.f }, end{ 0.f };
std::string transcript;
parser
>> begin