diff options
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/world.cpp b/src/world.cpp index 0a84c20..5ce0b2d 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -323,7 +323,6 @@ update( Player *p, unsigned int delta ) e->left = false; } } - // iterate through particles particles.erase( std::remove_if( particles.begin(), particles.end(), [&delta](Particles &part){return part.kill(delta);}), particles.end()); for ( auto part = particles.begin(); part != particles.end(); part++ ) { @@ -336,6 +335,7 @@ update( Player *p, unsigned int delta ) if ( (*part).loc.x >= b->loc.x && (*part).loc.x <= b->loc.x + b->width ) { if ( (*part).loc.y <= b->loc.y + b->height * .25) particles.erase( part ); + } } } @@ -1512,6 +1512,7 @@ loadWorldFromXMLNoSave( std::string path ) { } return tmp; + } Village::Village(const char *meme, World *w){ |