summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-05-12 21:28:45 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-05-12 21:28:45 (GMT)
commit724c99102e1d2ed3a2c347eedb05d9818bac7513 (patch)
tree036b97a683491243f79e42daf65c4f00ecf36c97 /src/simulation/Simulation.h
parent7128188048395f503b2f70ace2880459acdf7515 (diff)
downloadpowder-724c99102e1d2ed3a2c347eedb05d9818bac7513.zip
powder-724c99102e1d2ed3a2c347eedb05d9818bac7513.tar.gz
Stupid git
Diffstat (limited to 'src/simulation/Simulation.h')
-rw-r--r--src/simulation/Simulation.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index 71f233d..f4f8f5b 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -113,8 +113,17 @@ typedef struct menu_section menu_section;
struct sign
{
- int x,y,ju;
- char text[256];
+public:
+ enum Justification { Left = 0, Centre = 1, Right = 2 };
+ sign(std::string text_, int x_, int y_, Justification justification_):
+ text(text_),
+ x(x_),
+ y(y_),
+ ju(justification_)
+ {}
+ int x, y;
+ Justification ju;
+ std::string text;
};
typedef struct sign sign;
@@ -139,6 +148,7 @@ public:
Gravity * grav;
Air * air;
+ vector<sign> signs;
Element * elements;
vector<SimTool*> tools;
unsigned int * platent;
@@ -165,7 +175,6 @@ public:
int NUM_PARTS;
int elementCount[PT_NUM];
int ISWIRE;
- sign * signs;
//Gol sim
int CGOL;
int ISGOL;