diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-10-20 14:38:40 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-10-20 14:38:40 (GMT) |
| commit | d9f1762da0b2c549cef48bb2d7b078a89c9ee959 (patch) | |
| tree | 9f8bcf0e4cfde472447d1ced5a9a5312fc71504a /src | |
| parent | e8c53dc3e8d293ef750f3780b999783ae3537ba9 (diff) | |
| parent | dd73a7244f49de54ccd35a7cf1fdafd1a557e505 (diff) | |
| download | powder-d9f1762da0b2c549cef48bb2d7b078a89c9ee959.zip powder-d9f1762da0b2c549cef48bb2d7b078a89c9ee959.tar.gz | |
Merge branch 'develop' of https://github.com/simtr/The-Powder-Toy into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 76c0830..60ca1f7 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2216,7 +2216,7 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny) part_change_type(i, x, y, PT_ELEC); parts[i].ctype = 0; } - else if ((r&0xFF) == PT_H2 && pv[y/CELL][x/CELL] < 45.0f) + else if ((r&0xFF) == PT_H2 && pv[y/CELL][x/CELL] < 45.0f && parts[i].temp < 3000) { part_change_type(i, x, y, PT_PROT); parts[i].ctype = 0; |