diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-07 16:59:50 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-07 16:59:50 (GMT) |
| commit | 51b17badf4c72270bb762ea795d05d51c8b355e3 (patch) | |
| tree | b66671e0496b68114c6e91eedb58bf783d5343c0 /src/simulation/SaveLoader.cpp | |
| parent | fb111f42d00dd8a2041bae970c0913e096ac5101 (diff) | |
| download | powder-51b17badf4c72270bb762ea795d05d51c8b355e3.zip powder-51b17badf4c72270bb762ea795d05d51c8b355e3.tar.gz | |
A bit of refactoring (elements)
Diffstat (limited to 'src/simulation/SaveLoader.cpp')
| -rw-r--r-- | src/simulation/SaveLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/simulation/SaveLoader.cpp b/src/simulation/SaveLoader.cpp index 71748c4..7989d38 100644 --- a/src/simulation/SaveLoader.cpp +++ b/src/simulation/SaveLoader.cpp @@ -6,7 +6,7 @@ */ #include <bzlib.h> -#include <math.h> +#include <cmath> #include "SaveLoader.h" //!TODO: enum for LoadSave return @@ -497,7 +497,7 @@ int SaveLoader::PSVLoad(unsigned char * data, int dataLength, Simulation * sim, } else { - parts[i-1].temp = sim->ptypes[parts[i-1].type].heat; + parts[i-1].temp = sim->elements[parts[i-1].type].Temperature; } } } @@ -607,7 +607,7 @@ int SaveLoader::PSVLoad(unsigned char * data, int dataLength, Simulation * sim, parts[i-1].tmp2 = parts[i-1].life; } } - if (!sim->ptypes[parts[i-1].type].enabled) + if (!sim->elements[parts[i-1].type].Enabled) parts[i-1].type = PT_NONE; } } |