diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-12 21:21:01 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-12 21:21:01 (GMT) |
| commit | de680a1e5cd65c771a9ed659510fb48b2916a5f0 (patch) | |
| tree | 660919b656177aa469d4dc17571e9b7dfcc7d4a2 /src/simulation/Simulation.cpp | |
| parent | 86b7a118004c9f9797d4d898dd587000e5178cea (diff) | |
| parent | 134d1fab10a713ce0e99bfc3325b099abcbbe591 (diff) | |
| download | powder-de680a1e5cd65c771a9ed659510fb48b2916a5f0.zip powder-de680a1e5cd65c771a9ed659510fb48b2916a5f0.tar.gz | |
Merge
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index b6f4f84..f037252 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -146,10 +146,13 @@ int Simulation::Load(int fullX, int fullY, GameSave * save) Element_PPIP::ppip_changed = 1; for(int i = 0; i < save->signs.size() && signs.size() < MAXSIGNS; i++) { - sign tempSign = save->signs[i]; - tempSign.x += fullX; - tempSign.y += fullY; - signs.push_back(tempSign); + if (save->signs[i].text[0]) + { + sign tempSign = save->signs[i]; + tempSign.x += fullX; + tempSign.y += fullY; + signs.push_back(tempSign); + } } for(int saveBlockX = 0; saveBlockX < save->blockWidth; saveBlockX++) { @@ -2105,7 +2108,6 @@ void Simulation::init_can_move() } can_move[PT_ELEC][PT_LCRY] = 2; can_move[PT_ELEC][PT_EXOT] = 2; - can_move[PT_NEUT][PT_EXOT] = 2; can_move[PT_PHOT][PT_LCRY] = 3;//varies according to LCRY life can_move[PT_PHOT][PT_BIZR] = 2; @@ -2115,7 +2117,6 @@ void Simulation::init_can_move() can_move[PT_PHOT][PT_BIZRS] = 2; can_move[PT_ELEC][PT_BIZRS] = 2; - can_move[PT_NEUT][PT_INVIS] = 2; //whol eats anar can_move[PT_ANAR][PT_WHOL] = 1; can_move[PT_ANAR][PT_NWHL] = 1; |