Vector stumpy_pos = get_pos();
stumpy_pos.x += 20;
stumpy_pos.y += 25;
- Stumpy* stumpy = new Stumpy(stumpy_pos, dir);
+ auto stumpy = std::make_shared<Stumpy>(stumpy_pos, dir);
remove_me();
Sector::current()->add_object(stumpy);
float vy = -cos(angle)*velocity;
Vector pspeed = Vector(vx, vy);
Vector paccel = Vector(0, 100);
- Sector::current()->add_object(new SpriteParticle("images/objects/particles/leaf.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+ Sector::current()->add_object(std::make_shared<SpriteParticle>("images/objects/particles/leaf.sprite",
+ "default",
+ ppos, ANCHOR_MIDDLE,
+ pspeed, paccel,
+ LAYER_OBJECTS-1));
}
// spawn PoisonIvy
Vector leaf1_pos(stumpy_pos.x - POISONIVY_WIDTH - 1, stumpy_pos.y - POISONIVY_Y_OFFSET);
Rectf leaf1_bbox(leaf1_pos.x, leaf1_pos.y, leaf1_pos.x + POISONIVY_WIDTH, leaf1_pos.y + POISONIVY_HEIGHT);
if (Sector::current()->is_free_of_movingstatics(leaf1_bbox, this)) {
- PoisonIvy* leaf1 = new PoisonIvy(leaf1_bbox.p1, LEFT);
+ auto leaf1 = std::make_shared<PoisonIvy>(leaf1_bbox.p1, LEFT);
leaf1->countMe = false;
Sector::current()->add_object(leaf1);
}
Vector leaf2_pos(stumpy_pos.x + sprite->get_current_hitbox_width() + 1, stumpy_pos.y - POISONIVY_Y_OFFSET);
Rectf leaf2_bbox(leaf2_pos.x, leaf2_pos.y, leaf2_pos.x + POISONIVY_WIDTH, leaf2_pos.y + POISONIVY_HEIGHT);
if (Sector::current()->is_free_of_movingstatics(leaf2_bbox, this)) {
- PoisonIvy* leaf2 = new PoisonIvy(leaf2_bbox.p1, RIGHT);
+ auto leaf2 = std::make_shared<PoisonIvy>(leaf2_bbox.p1, RIGHT);
leaf2->countMe = false;
Sector::current()->add_object(leaf2);
}