16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 05:29:18 +02:00

Merge remote-tracking branch 'tmj/master' into sim

This commit is contained in:
milek7
2020-10-18 23:35:14 +02:00
244 changed files with 54164 additions and 11636 deletions

View File

@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
#include "DynObj.h"
#include "Console.h"
#include "Logs.h"
#include "opengl33renderer.h"
#include "renderer.h"
void TButton::Clear(int i)
{
@@ -124,6 +124,7 @@ TButton::Turn( bool const State ) {
}
void TButton::Update( bool const Power ) {
// TODO: remove passing manually power state when LD is in place
auto const state { Power && ( bData ? *bData : m_state ) };