diff options
| author | cracker64 <cracker642@gmail.com> | 2013-03-10 03:48:12 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-03-10 03:48:12 (GMT) |
| commit | 3abc33fd3b8bfaa720202ad2e4d5c46b9d51e9d7 (patch) | |
| tree | d7adefd78acebcc127c684a00bcd31e253ef148a /src/simulation/Simulation.cpp | |
| parent | a9e66429d60c0867e540d645a8c52db79abb1736 (diff) | |
| parent | e6f6eedd1364fd3792d6ca7aa3ac2d0c97911f70 (diff) | |
| download | powder-3abc33fd3b8bfaa720202ad2e4d5c46b9d51e9d7.zip powder-3abc33fd3b8bfaa720202ad2e4d5c46b9d51e9d7.tar.gz | |
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index b6f4f84..3acf413 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++) { |