summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/Simulation.cpp3
-rw-r--r--src/simulation/Simulation.h1
-rw-r--r--src/simulation/elements/PLNT.cpp2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index a45ef10..e45f5a8 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -38,7 +38,7 @@ int Simulation::Load(int fullX, int fullY, GameSave * save)
{
int blockX, blockY, x, y, r;
- if(!save) return 0;
+ if(!save) return 1;
save->Expand();
//Align to blockMap
@@ -4758,7 +4758,6 @@ Simulation::Simulation():
lighting_recreate(0),
force_stacking_check(0),
ISWIRE(0),
- VINE_MODE(0),
gravWallChanged(false),
replaceModeSelected(0),
replaceModeFlags(0)
diff --git a/src/simulation/Simulation.h b/src/simulation/Simulation.h
index 9062f13..31bb5e4 100644
--- a/src/simulation/Simulation.h
+++ b/src/simulation/Simulation.h
@@ -108,7 +108,6 @@ public:
int gravityMode;
int legacy_enable;
int aheat_enable;
- int VINE_MODE;
int water_equal_test;
int sys_pause;
int framerender;
diff --git a/src/simulation/elements/PLNT.cpp b/src/simulation/elements/PLNT.cpp
index 61218d5..99890e6 100644
--- a/src/simulation/elements/PLNT.cpp
+++ b/src/simulation/elements/PLNT.cpp
@@ -81,7 +81,7 @@ int Element_PLNT::update(UPDATE_FUNC_ARGS)
}
break;
case PT_WOOD:
- if (surround_space && !(rand()%4) && (abs(rx+ry)<=2) && (sim->VINE_MODE || parts[i].tmp==1))
+ if (surround_space && !(rand()%4) && (abs(rx+ry)<=2) && parts[i].tmp==1)
{
int nnx = rand()%3 -1;
int nny = rand()%3 -1;