aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/machina/Machine.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/machina/Machine.hpp')
-rw-r--r--src/engine/machina/Machine.hpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp
index 8a98e4c..d4eccea 100644
--- a/src/engine/machina/Machine.hpp
+++ b/src/engine/machina/Machine.hpp
@@ -51,7 +51,11 @@ public:
*/
Machine(const Machine& copy);
- Machine& operator=(const Machine& other);
+ /** Completely replace this machine's contents with a deep copy. */
+ Machine& operator=(const Machine& copy);
+
+ /** Merge another machine into this machine. */
+ void merge(const Machine& machine);
bool is_empty() { return _nodes.empty(); }
bool is_finished() { return _is_finished; }