X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/c0c615a959dc4f317aa7def359335bd3b8cf7930..0e3cd5a760199d782d22e53ec20be11ba0e23e55:/Model/include/union.h?ds=sidebyside

diff --git a/Model/include/union.h b/Model/include/union.h
index 0f494a2..db6be6a 100644
--- a/Model/include/union.h
+++ b/Model/include/union.h
@@ -28,6 +28,10 @@ public:
 protected:
 	int in_on_zero; 
 	int in_ready;
+	int in_colors;
+	RGB color1, color2;
+	float flow1, flow2;
+	PlantItem *entrada1;
 private:
 	Union(const Union &):Transport("null") {}
 	Union &operator = (const Union &) { return *this; }