* Se agrega un nuevo mensaje para intercambio de colores que anda muy bien

[z.facultad/75.42/plaqui.git] / Model / include / union.h

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