aboutsummaryrefslogtreecommitdiffstats
path: root/src/world.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-06-03 08:47:13 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-06-03 08:47:13 -0400
commitf4632d58014dce0edc2d447dc934bae9cf957439 (patch)
treeef6018e960d1111f414be9e24fb3d21d2ba693c8 /src/world.cpp
parent2e6369f4dbe2b49a3cb8bec3bacd6559c9733a55 (diff)
coolarray, particles are good now
Diffstat (limited to 'src/world.cpp')
-rw-r--r--src/world.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/world.cpp b/src/world.cpp
index 5ab20ed..b096180 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -718,7 +718,7 @@ void World::draw(Player *p)
std::vector<GLfloat> partVec(pss);
GLfloat *pIndex = &partVec[0];
-
+
for (const auto &p : particles) {
pc += 30;
if (pc > pss) {
@@ -1487,14 +1487,14 @@ addObject(std::string in, std::string p, float x, float y)
void World::
addParticle(float x, float y, float w, float h, float vx, float vy, Color color, int d)
{
- particles.emplace_back(x, y, w, h, vx, vy, color, d);
+ particles.push_back(Particles(x, y, w, h, vx, vy, color, d));
particles.back().canMove = true;
}
void World::
addParticle(float x, float y, float w, float h, float vx, float vy, Color color, int d, unsigned char flags)
{
- particles.emplace_back(x, y, w, h, vx, vy, color, d);
+ particles.push_back(Particles(x, y, w, h, vx, vy, color, d));
particles.back().canMove = true;
particles.back().gravity = flags & (1 << 0);
particles.back().bounce = flags & (1 << 1);