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

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-06-30 18:45:58 +02:00
parent 76bb4be325 30e31cdfd0
commit dc584c140e
37 changed files with 672 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Event.h
View File

@@ -105,7 +105,7 @@ public:
TEventType Type = tp_Unknown;
double fStartTime = 0.0;
double fDelay = 0.0;
TDynamicObject *Activator = nullptr;
TDynamicObject const *Activator = nullptr;
TParam Params[13]; // McZapkie-070502 //Ra: zamienić to na union/struct
unsigned int iFlags = 0; // zamiast Params[8] z flagami warunku
@@ -122,6 +122,8 @@ private:
class event_manager {
public:
// constructors
event_manager() = default;
// destructor
~event_manager();
// methods
@@ -147,7 +149,7 @@ public:
FindEvent( std::string const &Name );
// legacy method, inserts specified event in the event query
bool
AddToQuery( TEvent *Event, TDynamicObject *Owner, double delay = 0.0 );
AddToQuery( TEvent *Event, TDynamicObject const *Owner, double delay = 0.0 );
// legacy method, executes queued events
bool
CheckQuery();