diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-18 16:08:24 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-18 16:08:24 (GMT) |
| commit | 7018e46fac29ba41398dc49b069aa9aeaa37b04d (patch) | |
| tree | 45c0b98be36e7f1a1accb03b423a34837b2cbf03 /src/simulation/Simulation.h | |
| parent | 69b788ba7d7c0910369cbff0f708c949195683bc (diff) | |
| download | powder-7018e46fac29ba41398dc49b069aa9aeaa37b04d.zip powder-7018e46fac29ba41398dc49b069aa9aeaa37b04d.tar.gz | |
Remove disabled elements when simulating. Fix crash when kill_part is run on elements with invalid types
Diffstat (limited to 'src/simulation/Simulation.h')
| -rw-r--r-- | src/simulation/Simulation.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h index 48e06d9..dad9e3e 100644 --- a/src/simulation/Simulation.h +++ b/src/simulation/Simulation.h @@ -20,11 +20,11 @@ #include "WallType.h" #include "GOLMenu.h" #include "MenuSection.h" +#include "elements/Element.h" #define CHANNELS ((int)(MAX_TEMP-73)/100+2) class Snapshot; -class Element; class SimTool; class Brush; struct SimulationSample; @@ -47,7 +47,8 @@ public: Air * air; std::vector<sign> signs; - Element * elements; + Element elements[PT_NUM]; + //Element * elements; std::vector<SimTool*> tools; unsigned int * platent; wall_type wtypes[UI_WALLCOUNT]; |