eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
milek7
2020-10-23 01:23:48 +02:00
parent 89b9204ab0
commit 286f31b75c
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Texture.cpp
View File

@@ -348,7 +348,7 @@ void opengl_texture::load_STBI()
data.resize(x * y * 4);
memcpy(&data[0], image, data.size());
delete image;
free(image);
data_format = GL_RGBA;
data_components = (n == 4 ? GL_RGBA : GL_RGB);

3
driveruipanels.cpp
View File

@@ -762,7 +762,7 @@ debug_panel::update_section_vehicle( std::vector<text_line> &Output ) {
std::snprintf(
m_buffer.data(), m_buffer.size(),
STR_C("Brakes:\n train: %.2f, independent: %.2f, mode: %d, delay: %s, load flag: %d\nBrake cylinder pressures:\n train: %.2f, independent: %.2f, status: 0x%.2x\nPipe pressures:\n brake: %.2f (hat: %.2f), main: %.2f, control: %.2f\nTank pressures:\n auxiliary: %.2f, main: %.2f, control: %.2f"),
STR_C("Brakes:\n train: %.2f (mode: %d, delay: %s, load flag: %d)\n independent: %.2f (%.2f), manual: %.2f, spring: %.2f\nBrake cylinder pressures:\n train: %.2f, independent: %.2f, status: 0x%.2x\nPipe pressures:\n brake: %.2f (hat: %.2f), main: %.2f, control: %.2f\nTank pressures:\n auxiliary: %.2f, main: %.2f, control: %.2f"),
// brakes
mover.fBrakeCtrlPos,
mover.BrakeOpModeFlag,
@@ -1313,7 +1313,6 @@ debug_panel::render_section_settings() {
if( ImGui::SliderFloat( ( to_string( static_cast<int>( Global.EnvironmentAmbientVolume * 100 ) ) + "%###volumeambient" ).c_str(), &Global.EnvironmentAmbientVolume, 0.0f, 1.0f, "Ambient sounds" ) ) {
audio::event_volume_change = true;
}
ImGui::PushStyleColor( ImGuiCol_Text, { Global.UITextColor.r, Global.UITextColor.g, Global.UITextColor.b, Global.UITextColor.a } );
return true;
}

6
launcher/scenery_list.cpp
View File

@@ -235,11 +235,9 @@ void ui::scenerylist_panel::draw_summary_tooltip(const dynamic_desc &dyn_desc)
ImGui::TextUnformatted(STR_C("Coupling:"));
for (int i = 1; i <= 0x100; i <<= 1) {
bool dummy = true;
for (int i = 1; i <= 0x100; i <<= 1) {
if (dyn_desc.coupling & i)
ImGui::Text("+ %s", Translations.coupling_name(i).c_str(), &dummy);
ImGui::Text("+ %s", Translations.coupling_name(i).c_str());
}
}