summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-06-11 12:39:39 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-06-11 12:39:39 (GMT)
commit3205df3a2188e6e314d7393381403dd04cd85623 (patch)
tree5f3ec4728b3d4edd7eead8a581abead144eb2b07 /src/simulation/Simulation.cpp
parent5eb9370fc185103f3f8700f7da31525d5e862f81 (diff)
downloadpowder-3205df3a2188e6e314d7393381403dd04cd85623.zip
powder-3205df3a2188e6e314d7393381403dd04cd85623.tar.gz
Saving and loading other flags from GameSave, remove old saveloader
Diffstat (limited to 'src/simulation/Simulation.cpp')
-rw-r--r--src/simulation/Simulation.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index c4b44ce..850f978 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -6,7 +6,6 @@
//#include "ElementFunctions.h"
#include "Air.h"
#include "Gravity.h"
-#include "SaveLoader.h"
#include "elements/Element.h"
#undef LUACONSOLE
@@ -3740,7 +3739,7 @@ killed:
goto movedone;
}
}
- if (elements[t].Falldown>1 && !ngrav_enable && gravityMode==0 && parts[i].vy>fabsf(parts[i].vx))
+ if (elements[t].Falldown>1 && !grav->ngrav_enable && gravityMode==0 && parts[i].vy>fabsf(parts[i].vx))
{
s = 0;
// stagnant is true if FLAG_STAGNANT was set for this particle in previous frame