16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 14:49:19 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-09-16 22:48:53 +02:00
126 changed files with 40430 additions and 6134 deletions

19
Event.h
View File

@@ -96,6 +96,10 @@ public:
bool StopCommand();
void StopCommandSent();
void Append(TEvent *e);
void
group( scene::group_handle Group );
scene::group_handle
group() const;
// members
std::string asName;
bool m_ignored { false }; // replacement for tp_ignored
@@ -116,9 +120,24 @@ public:
bool m_conditionalelse { false }; // TODO: make a part of condition struct
private:
// methods
void Conditions( cParser *parser, std::string s );
// members
scene::group_handle m_group { null_handle }; // group this event belongs to, if any
};
inline
void
TEvent::group( scene::group_handle Group ) {
m_group = Group;
}
inline
scene::group_handle
TEvent::group() const {
return m_group;
}
class event_manager {
public: