summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.h
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-09-30 18:21:32 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-30 19:43:38 (GMT)
commitbe1b9112e85c270920a559acd790340ca32bce7f (patch)
tree9cfd011bd6b3cb030c825613ae43fcdee5c43c73 /src/simulation/Simulation.h
parent1c60ce25ee2fe15cc4bfa0649853bf6a0b95c14d (diff)
downloadpowder-be1b9112e85c270920a559acd790340ca32bce7f.zip
powder-be1b9112e85c270920a559acd790340ca32bce7f.tar.gz
Fix some uninitialized variables, add back sandcolor changing
Diffstat (limited to 'src/simulation/Simulation.h')
-rw-r--r--src/simulation/Simulation.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index 83e5629..ba9fa1a 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -115,10 +115,8 @@ public:
int sys_pause;
int framerender;
int pretty_powder;
- //
- int sandcolour_r;
- int sandcolour_g;
- int sandcolour_b; //TODO: Make a single variable
+ int sandcolour;
+ int sandcolour_frame;
int Load(GameSave * save);
int Load(int x, int y, GameSave * save);