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

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-10-12 23:13:51 +02:00
parent 2a00d52525 68f82be451
commit c7741c6618
32 changed files with 27 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Train.h
View File

@@ -671,7 +671,7 @@ private:
// McZapkie: do syczenia
float fPPress, fNPress;
int iRadioChannel { 1 }; // numer aktualnego kana?u radiowego
std::vector<std::pair<std::string, material_handle>> m_screens;
std::vector<std::pair<std::string, texture_handle>> m_screens;
public:
float fPress[20][3]; // cisnienia dla wszystkich czlonow