diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-08 14:29:33 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-08 14:29:33 (GMT) |
| commit | 645bcb1bcd1095efc1ab1d113e9282aef5774d1f (patch) | |
| tree | d94f25332a42f17261d115edcd686c832007662c /src/simulation/Simulation.h | |
| parent | c0b45928392efdffbde819842387a041e2d1936a (diff) | |
| parent | 89a0603b53b314345d93e422dd945848ea3a9938 (diff) | |
| download | powder-645bcb1bcd1095efc1ab1d113e9282aef5774d1f.zip powder-645bcb1bcd1095efc1ab1d113e9282aef5774d1f.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/simulation/Simulation.h')
| -rw-r--r-- | src/simulation/Simulation.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h index 9e9424f..5ce0d1e 100644 --- a/src/simulation/Simulation.h +++ b/src/simulation/Simulation.h @@ -74,10 +74,9 @@ public: int emp_decor; //Gol sim int CGOL; - int ISGOL; int GSPEED; unsigned char gol[YRES][XRES]; - unsigned char gol2[YRES][XRES][NGOL+1]; + unsigned short gol2[YRES][XRES][9]; //Air sim float (*vx)[XRES/CELL]; float (*vy)[XRES/CELL]; |