// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
+
#include <algorithm>
#include <iostream>
-#include <math.h>
-#include "world.h"
+#include <cmath>
+
+#include "app/globals.h"
#include "tile.h"
+#include "tile_manager.h"
#include "gameloop.h"
#include "gameobjs.h"
-#include "sprite_manager.h"
+#include "special/sprite_manager.h"
#include "resources.h"
-#include "level.h"
+#include "sector.h"
+#include "tilemap.h"
+#include "video/drawing_context.h"
BouncyDistro::BouncyDistro(const Vector& pos)
: position(pos)
}
BouncyBrick::BouncyBrick(const Vector& pos)
- : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED)
-{
- shape = World::current()->get_level()->gettileid(pos.x, pos.y);
+ : position(pos), offset(0), offset_m(-BOUNCY_BRICK_SPEED),
+ shape(Sector::current()->solids->get_tile_id_at(pos))
+{
+ shape.hidden = true;
}
void
/* Stop bouncing? */
if (offset >= 0)
- remove_me();
+ {
+ shape.hidden = false;
+ remove_me();
+ }
}
void
BouncyBrick::draw(DrawingContext& context)
{
TileManager::instance()->
- draw_tile(context, shape, position + Vector(0, offset), LAYER_TILES+1);
+ draw_tile(context, shape.id, position + Vector(0, offset), LAYER_TILES+1);
}
FloatingScore::FloatingScore(const Vector& pos, int score)
/* Trampoline */
-#define TRAMPOLINE_FRAMES 4
-Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+Sprite *img_trampoline;
Trampoline::Trampoline(LispReader& reader)
{
- reader.read_float("x", &base.x);
- reader.read_float("y", &base.y);
+ reader.read_float("x", base.x);
+ reader.read_float("y", base.y);
+ base.width = 32;
+ base.height = 32;
+ power = 7.5;
+ reader.read_float("power", power);
+
+ frame = 0;
+ mode = M_NORMAL;
+ physic.reset();
+}
+
+Trampoline::Trampoline(float x, float y)
+{
+ base.x = x;
+ base.y = y;
base.width = 32;
base.height = 32;
power = 7.5;
- reader.read_float("power", &power);
frame = 0;
mode = M_NORMAL;
void
Trampoline::draw(DrawingContext& context)
{
- img_trampoline[frame]->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
+ img_trampoline->set_frame(frame);
+ img_trampoline->draw(context, base, LAYER_OBJECTS);
frame = 0;
}
{
/* FIXME: The trampoline object shouldn't know about pplayer objects. */
/* If we're holding the iceblock */
- Player& tux = *World::current()->get_tux();
+ Player& tux = *Sector::current()->player;
Direction dir = tux.dir;
if(dir == RIGHT)
}
}
- physic.apply(frame_ratio, base.x, base.y);
+ physic.apply(frame_ratio, base.x, base.y, Sector::current()->gravity);
collision_swept_object_map(&old_base, &base);
}
FlyingPlatform::FlyingPlatform(LispReader& reader)
{
- reader.read_int_vector("x", &pos_x);
- reader.read_int_vector("y", &pos_y);
+ reader.read_int_vector("x", pos_x);
+ reader.read_int_vector("y", pos_y);
velocity = 2.0;
- reader.read_float("velocity", &velocity);
+ reader.read_float("velocity", velocity);
base.x = pos_x[0];
base.y = pos_y[0];
frame = 0;
}
+FlyingPlatform::FlyingPlatform(int x, int y)
+{
+base.x = x;
+base.y = y;
+point = 0;
+move = false;
+}
+
void
FlyingPlatform::write(LispWriter& writer)
{
void
FlyingPlatform::draw(DrawingContext& context)
{
- img_flying_platform->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
+ img_flying_platform->draw(context, base, LAYER_OBJECTS);
}
void
}
}
-void load_object_gfx()
+Sprite *img_smoke_cloud;
+
+SmokeCloud::SmokeCloud(const Vector& pos)
+ : position(pos)
{
- char sprite_name[16];
+ timer.start(300);
+}
- for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
- {
- sprintf(sprite_name, "trampoline-%i", i+1);
- img_trampoline[i] = sprite_manager->load(sprite_name);
- }
+void
+SmokeCloud::action(float elapsed_time)
+{
+ position.y -= 1.2 * elapsed_time;
+
+ if(!timer.check())
+ remove_me();
+}
+void
+SmokeCloud::draw(DrawingContext& context)
+{
+ img_smoke_cloud->draw(context, position, LAYER_OBJECTS+1);
+}
+
+Particles::Particles(const Vector& epicenter, const Vector& velocity, const Vector& acceleration, int number, Color color_, int size_, int life_time)
+ : color(color_), size(size_), vel(velocity), accel(acceleration)
+{
+ timer.start(life_time);
+
+ // create particles
+ for(int p = 0; p < number; p++)
+ {
+ Particle* particle = new Particle;
+ particle->pos = epicenter;
+ particle->angle = (rand() % 360) * (M_PI / 180); // in radius
+
+ particles.push_back(particle);
+ }
+}
+
+Particles::~Particles()
+{
+ // free particles
+ for(std::vector<Particle*>::iterator i = particles.begin(); i < particles.end(); i++)
+ delete (*i);
+}
+
+void
+Particles::action(float elapsed_time)
+{
+ vel.x += accel.x * elapsed_time;
+ vel.y += accel.y * elapsed_time;
+
+ // update particles
+ for(int p = 0; p < particles.size(); p++)
+ {
+ particles[p]->pos.x += sin(particles[p]->angle) * vel.x * elapsed_time;
+ particles[p]->pos.y += cos(particles[p]->angle) * vel.y * elapsed_time;
+ }
+
+ if(!timer.check())
+ remove_me();
+}
+
+void
+Particles::draw(DrawingContext& context)
+{
+ // draw particles
+ for(int p = 0; p < particles.size(); p++)
+ {
+ context.draw_filled_rect(particles[p]->pos, Vector(size,size), color, LAYER_OBJECTS+10);
+ }
+}
+
+void load_object_gfx()
+{
+ img_trampoline = sprite_manager->load("trampoline");
+ img_trampoline->start_animation(0);
img_flying_platform = sprite_manager->load("flying_platform");
+ img_smoke_cloud = sprite_manager->load("stomp");
}
projects / supertux.git / blobdiff