le agregue unas lineas a lo que dejo ricky, nada del otro mundo, muy formal

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

diff --git a/Model/include/union.h b/Model/include/union.h
index 0f494a207d7d776d4966f34e3044bde5edeb4fef..db6be6ab78df022fb05abe914a53c85b771f2cab 100644 (file)
--- 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; }