diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-25 14:53:27 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-25 15:29:27 (GMT) |
| commit | 082072a05e7847ed3c226495f9d613e11f768306 (patch) | |
| tree | 11b5f1eb0bf059df0a494aff86d2662ff7c24ecf /src/simulation/elements | |
| parent | 6ace7bd26fe8f274d911beab143c2743f03af8cf (diff) | |
| download | powder-082072a05e7847ed3c226495f9d613e11f768306.zip powder-082072a05e7847ed3c226495f9d613e11f768306.tar.gz | |
OPS: Fix byte order when unpacking 4 byte tmp fields
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/Element.cpp | 1 | ||||
| -rw-r--r-- | src/simulation/elements/Element.h | 1 | ||||
| -rw-r--r-- | src/simulation/elements/FIRE.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/elements/WATR.cpp | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/src/simulation/elements/Element.cpp b/src/simulation/elements/Element.cpp index 4ec33a6..8d4b997 100644 --- a/src/simulation/elements/Element.cpp +++ b/src/simulation/elements/Element.cpp @@ -26,7 +26,6 @@ Element::Element(): Weight(50), Temperature(273.15f), - Enthalpy(0.0f), HeatConduct(128), Description("No description"), diff --git a/src/simulation/elements/Element.h b/src/simulation/elements/Element.h index 72b6c2b..9df38d7 100644 --- a/src/simulation/elements/Element.h +++ b/src/simulation/elements/Element.h @@ -32,7 +32,6 @@ public: int Weight; int MenuSection; float Temperature; - float Enthalpy; unsigned char HeatConduct; char *Description; char State; diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp index 342582a..0a98149 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 = 1; + HeatConduct = 88; 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() {} +Element_FIRE::~Element_FIRE() {}
\ No newline at end of file diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp index bac8b68..f0fde66 100644 --- a/src/simulation/elements/WATR.cpp +++ b/src/simulation/elements/WATR.cpp @@ -27,7 +27,6 @@ Element_WATR::Element_WATR() Weight = 30; Temperature = R_TEMP-2.0f +273.15f; - Enthalpy = 7500; HeatConduct = 29; Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires."; |
