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

merge (with bugs)

This commit is contained in:
VB
2017-04-24 20:52:21 +02:00
40 changed files with 5449 additions and 2493 deletions

View File

@@ -49,11 +49,12 @@ private:
daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday );
SYSTEMTIME m_time;
double m_milliseconds{ 0.0 };
int m_yearday;
char m_monthdaycounts[ 2 ][ 13 ];
};
namespace Simulation {
namespace simulation {
extern simulation_time Time;
@@ -100,7 +101,6 @@ TWorld();
bool InitPerformed() { return m_init; }
GLFWwindow *window;
void OnKeyDown(int cKey);
void OnKeyUp(int cKey);
// void UpdateWindow();
void OnMouseMove(double x, double y);
void OnCommandGet(DaneRozkaz *pRozkaz);