summaryrefslogtreecommitdiff
path: root/src/simulation/elements
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation/elements')
-rw-r--r--src/simulation/elements/LAVA.cpp4
-rw-r--r--src/simulation/elements/PSTN.cpp2
-rw-r--r--src/simulation/elements/TUGN.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/simulation/elements/LAVA.cpp b/src/simulation/elements/LAVA.cpp
index 062dcf8..b52c61e 100644
--- a/src/simulation/elements/LAVA.cpp
+++ b/src/simulation/elements/LAVA.cpp
@@ -37,7 +37,7 @@ Element_LAVA::Element_LAVA()
LowPressureTransition = NT;
HighPressure = IPH;
HighPressureTransition = NT;
- LowTemperature = 2573.15f;
+ LowTemperature = 3695.0f;// Highest temperature at which any type of lava can solidify
LowTemperatureTransition = ST;
HighTemperature = ITH;
HighTemperatureTransition = NT;
@@ -68,4 +68,4 @@ int Element_LAVA::graphics(GRAPHICS_FUNC_ARGS)
}
-Element_LAVA::~Element_LAVA() {} \ No newline at end of file
+Element_LAVA::~Element_LAVA() {}
diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp
index 4da1b73..35a470d 100644
--- a/src/simulation/elements/PSTN.cpp
+++ b/src/simulation/elements/PSTN.cpp
@@ -185,7 +185,7 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir
if(spaces >= amount)
break;
} else {
- if(currentPos < maxSize && !retract)
+ if(spaces < maxSize && !retract)
tempParts[currentPos++] = r>>8;
else
return spaces;
diff --git a/src/simulation/elements/TUGN.cpp b/src/simulation/elements/TUGN.cpp
index 2c2c236..f70037b 100644
--- a/src/simulation/elements/TUGN.cpp
+++ b/src/simulation/elements/TUGN.cpp
@@ -40,7 +40,7 @@ Element_TUGN::Element_TUGN()
HighPressureTransition = NT;
LowTemperature = ITL;
LowTemperatureTransition = NT;
- HighTemperature = ITL;
+ HighTemperature = ITH;
HighTemperatureTransition = NT;
/*HighTemperature = 3895.0f;
HighTemperatureTransition = PT_LAVA;*/