summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-06-02 01:57:03 (GMT)
committer jacob1 <jfu614@gmail.com>2013-06-02 01:57:03 (GMT)
commit8d7ab7f5e27b9b5ba71b4ef13e4cbb9f7e5a4641 (patch)
treed3bf71c04abc24aa014dbc403421d1821a8c96be /src/simulation
parentb16524292e2d8c640e0e4e0801d5cb4e512e4707 (diff)
downloadpowder-8d7ab7f5e27b9b5ba71b4ef13e4cbb9f7e5a4641.zip
powder-8d7ab7f5e27b9b5ba71b4ef13e4cbb9f7e5a4641.tar.gz
allow creating WIND lines from lua
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/Simulation.h27
1 files changed, 16 insertions, 11 deletions
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index 1b27bc7..bc728b4 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -52,26 +52,32 @@ public:
int currentTick;
+ char can_move[PT_NUM][PT_NUM];
+ int parts_lastActiveIndex;// = NPART-1;
+ int pfree;
+ int NUM_PARTS;
+ bool elementRecount;
+ int elementCount[PT_NUM];
+ int ISWIRE;
+ int force_stacking_check;
+ int emp_decor;
+ //Stickman
playerst player;
playerst player2;
playerst fighters[256]; //255 is the maximum number of fighters
unsigned char fighcount; //Contains the number of fighters
int lighting_recreate;
bool gravWallChanged;
+ //Portals and Wifi
Particle portalp[CHANNELS][8][80];
Particle emptyparticle;
int portal_rx[8];
int portal_ry[8];
int wireless[CHANNELS][2];
- char can_move[PT_NUM][PT_NUM];
- int parts_lastActiveIndex;// = NPART-1;
- int pfree;
- int NUM_PARTS;
- bool elementRecount;
- int elementCount[PT_NUM];
- int ISWIRE;
- int force_stacking_check;
- int emp_decor;
+ //PROP tool property to draw (TODO)
+ //void *prop_value;
+ //StructProperty::PropertyType proptype;
+ //size_t prop_offset;
//Gol sim
int CGOL;
int GSPEED;
@@ -97,10 +103,9 @@ public:
int pmap[YRES][XRES];
int photons[YRES][XRES];
int pmap_count[YRES][XRES];
- //
+ //Simulation Settings
int edgeMode;
int gravityMode;
- //int airMode;
int legacy_enable;
int aheat_enable;
int VINE_MODE;