Basic realistic heat and latent heat support.

4 files changed, 8 insertions, 5 deletions

diff --git a/src/simulation/elements/Element.cpp b/src/simulation/elements/Element.cpp
index 789cdb8..ff2918a 100644
--- a/src/simulation/elements/Element.cpp
+++ b/src/simulation/elements/Element.cpp
@@ -26,6 +26,7 @@ Element::Element():
 	Weight(50),
 
 	Temperature(273.15f),
+	Enthalpy(0.0f),
 	HeatConduct(128),
 	Description("No description"),
 
@@ -67,4 +68,4 @@ int Element::defaultGraphics(GRAPHICS_FUNC_ARGS)
 		*pixel_mode |= DECO_FIRE;
 	}
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/src/simulation/elements/Element.h b/src/simulation/elements/Element.h
index 7fca108..65e3898 100644
--- a/src/simulation/elements/Element.h
+++ b/src/simulation/elements/Element.h
@@ -32,6 +32,7 @@ public:
 	int Weight;
 	int MenuSection;
 	float Temperature;
+	float Enthalpy;
 	unsigned char HeatConduct;
 	char *Description;
 	char State;
@@ -54,4 +55,4 @@ public:
 	static int defaultGraphics(GRAPHICS_FUNC_ARGS);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp
index 0a98149..342582a 100644
--- a/src/simulation/elements/FIRE.cpp
+++ b/src/simulation/elements/FIRE.cpp
@@ -27,7 +27,7 @@ Element_FIRE::Element_FIRE()
     Weight = 2;
     
     Temperature = R_TEMP+400.0f+273.15f;
-    HeatConduct = 88;
+    HeatConduct = 1;
     Description = "Ignites flammable materials. Heats air.";
     
     State = ST_GAS;
@@ -199,4 +199,4 @@ int Element_FIRE::graphics(GRAPHICS_FUNC_ARGS)
 	return 0;
 }
 
-Element_FIRE::~Element_FIRE() {}
\ No newline at end of file
+Element_FIRE::~Element_FIRE() {}
diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp
index 3c546e6..ca3b926 100644
--- a/src/simulation/elements/WATR.cpp
+++ b/src/simulation/elements/WATR.cpp
@@ -27,6 +27,7 @@ Element_WATR::Element_WATR()
     Weight = 30;
     
     Temperature = R_TEMP-2.0f	+273.15f;
+    Enthalpy = 7500;
     HeatConduct = 29;
     Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires.";
     
@@ -84,4 +85,4 @@ int Element_WATR::update(UPDATE_FUNC_ARGS)
 	return 0;
 }
 
-Element_WATR::~Element_WATR() {}
\ No newline at end of file
+Element_WATR::~Element_WATR() {}