summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-09-12 00:41:43 (GMT)
committer jacob1 <jfu614@gmail.com>2013-09-12 00:41:43 (GMT)
commit332aa25bf6aa938fe3217a7a6622bf5f4c2f3201 (patch)
tree910075200d0eb324641f6df3e46b9a7cdd594756 /src/simulation
parent09c54b596bfaa13ae5009bbe4d5e6a0131ba50d2 (diff)
downloadpowder-332aa25bf6aa938fe3217a7a6622bf5f4c2f3201.zip
powder-332aa25bf6aa938fe3217a7a6622bf5f4c2f3201.tar.gz
save pavg[] in saves, for VIRS, PIPE, and STOR
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/Simulation.cpp4
-rw-r--r--src/simulation/elements/ELEC.cpp2
-rw-r--r--src/simulation/elements/PHOT.cpp4
3 files changed, 1 insertions, 9 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index b090841..e46681d 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -140,10 +140,6 @@ int Simulation::Load(int fullX, int fullY, GameSave * save)
}
}
}
- if (parts[i].pavg[0] || parts[i].pavg[1])
- {
- parts[i].pavg[0] = parts[i].pavg[1] = 0;
- }
}
parts_lastActiveIndex = NPART-1;
force_stacking_check = 1;
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp
index 56e90b3..871b61e 100644
--- a/src/simulation/elements/ELEC.cpp
+++ b/src/simulation/elements/ELEC.cpp
@@ -50,8 +50,6 @@ Element_ELEC::Element_ELEC()
int Element_ELEC::update(UPDATE_FUNC_ARGS)
{
int r, rt, rx, ry, nb, rrx, rry;
- parts[i].pavg[0] = x;
- parts[i].pavg[1] = y;
for (rx=-2; rx<=2; rx++)
for (ry=-2; ry<=2; ry++)
if (BOUNDS_CHECK) {
diff --git a/src/simulation/elements/PHOT.cpp b/src/simulation/elements/PHOT.cpp
index 4fe5bbe..3c94351 100644
--- a/src/simulation/elements/PHOT.cpp
+++ b/src/simulation/elements/PHOT.cpp
@@ -49,10 +49,8 @@ Element_PHOT::Element_PHOT()
//#TPT-Directive ElementHeader Element_PHOT static int update(UPDATE_FUNC_ARGS)
int Element_PHOT::update(UPDATE_FUNC_ARGS)
{
- int r, rt, rx, ry;
+ int r, rx, ry;
float rr, rrr;
- parts[i].pavg[0] = x;
- parts[i].pavg[1] = y;
if (!(parts[i].ctype&0x3FFFFFFF)) {
sim->kill_part(i);
return 1;