#include <iostream>
#include <cmath>
-#include "app/globals.h"
-#include "tile.h"
-#include "tile_manager.h"
-#include "gameloop.h"
-#include "gameobjs.h"
-#include "special/sprite_manager.h"
-#include "resources.h"
-#include "sector.h"
-#include "tilemap.h"
-#include "video/drawing_context.h"
-#include "camera.h"
+#include "tile.hpp"
+#include "tile_manager.hpp"
+#include "game_session.hpp"
+#include "gameobjs.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "sprite/sprite.hpp"
+#include "resources.hpp"
+#include "sector.hpp"
+#include "tilemap.hpp"
+#include "video/drawing_context.hpp"
+#include "camera.hpp"
+#include "main.hpp"
BouncyCoin::BouncyCoin(const Vector& pos)
: position(pos)
{
timer.start(.3);
- sprite = sprite_manager->create("coin");
+ sprite = sprite_manager->create("images/objects/coin/coin.sprite");
sprite->set_action("still");
}
}
void
-BouncyCoin::action(float elapsed_time)
+BouncyCoin::update(float elapsed_time)
{
position.y += -200 * elapsed_time;
}
void
-BrokenBrick::action(float elapsed_time)
+BrokenBrick::update(float elapsed_time)
{
position += movement * elapsed_time;
}
void
-FloatingText::action(float elapsed_time)
+FloatingText::update(float elapsed_time)
{
position.y -= 1.4 * elapsed_time;
: position(pos)
{
timer.start(.3);
+ sprite = sprite_manager->create("images/objects/particles/stomp.sprite");
}
-void
-SmokeCloud::action(float elapsed_time)
+SmokeCloud::~SmokeCloud()
{
- position.y -= 120 * elapsed_time;
-
- if(timer.check())
- remove_me();
+ delete sprite;
}
void
-SmokeCloud::draw(DrawingContext& context)
-{
- img_smoke_cloud->draw(context, position, LAYER_OBJECTS+1);
-}
-
-Particles::Particles(const Vector& epicenter, int min_angle, int max_angle,
- const Vector& initial_velocity, const Vector& acceleration, int number,
- Color color_, int size_, float life_time, int drawing_layer_)
- : accel(acceleration), color(color_), size(size_), drawing_layer(drawing_layer_)
-{
- if(life_time == 0) {
- live_forever = true;
- } else {
- live_forever = false;
- timer.start(life_time);
- }
-
- // create particles
- for(int p = 0; p < number; p++)
- {
- Particle* particle = new Particle;
- particle->pos = epicenter;
-
- float angle = ((rand() % (max_angle-min_angle))+min_angle)
- * (M_PI / 180); // convert to radius
- particle->vel.x = /*fabs*/(sin(angle)) * initial_velocity.x;
-// if(angle >= M_PI && angle < M_PI*2)
-// particle->vel.x *= -1; // work around to fix signal
- particle->vel.y = /*fabs*/(cos(angle)) * initial_velocity.y;
-// if(angle >= M_PI_2 && angle < 3*M_PI_2)
-// particle->vel.y *= -1;
-
- particles.push_back(particle);
- }
-}
-
-Particles::~Particles()
+SmokeCloud::update(float elapsed_time)
{
- // free particles
- for(std::vector<Particle*>::iterator i = particles.begin();
- i < particles.end(); i++)
- delete (*i);
-}
+ position.y -= 120 * elapsed_time;
-void
-Particles::action(float elapsed_time)
-{
- Vector camera = Sector::current()->camera->get_translation();
-
- // update particles
- for(std::vector<Particle*>::iterator i = particles.begin();
- i != particles.end(); ) {
- (*i)->pos.x += (*i)->vel.x * elapsed_time;
- (*i)->pos.y += (*i)->vel.y * elapsed_time;
-
- (*i)->vel.x += accel.x * elapsed_time;
- (*i)->vel.y += accel.y * elapsed_time;
-
- if((*i)->pos.x < camera.x || (*i)->pos.x > screen->w + camera.x ||
- (*i)->pos.y < camera.y || (*i)->pos.y > screen->h + camera.y) {
- delete (*i);
- i = particles.erase(i);
- } else {
- ++i;
- }
- }
-
- if((timer.check() && !live_forever) || particles.size() == 0)
+ if(timer.check())
remove_me();
}
void
-Particles::draw(DrawingContext& context)
-{
- // draw particles
- for(std::vector<Particle*>::iterator i = particles.begin();
- i != particles.end(); i++) {
- context.draw_filled_rect((*i)->pos, Vector(size,size), color,drawing_layer);
- }
-}
-
-void load_object_gfx()
-{
-#if 0
- img_trampoline = sprite_manager->load("trampoline");
- img_trampoline->start_animation(0);
- img_flying_platform = sprite_manager->load("flying_platform");
-#endif
- img_smoke_cloud = sprite_manager->create("stomp");
-}
-
-void free_object_gfx()
+SmokeCloud::draw(DrawingContext& context)
{
- delete img_smoke_cloud;
+ sprite->draw(context, position, LAYER_OBJECTS+1);
}