#include "gameobjs.h"
#include "sprite_manager.h"
#include "resources.h"
+#include "level.h"
void
BouncyDistro::init(float x, float y)
void load_object_gfx()
{
+ char sprite_name[16];
+
for (int i = 0; i < TRAMPOLINE_FRAMES; i++)
{
- char sprite_name[16];
sprintf(sprite_name, "trampoline-%i", i+1);
img_trampoline[i] = sprite_manager->load(sprite_name);
}
{
base.x = x;
base.y = y;
-
base.width = 32;
base.height = 32;
frame = 0;
+ mode = M_NORMAL;
+ physic.reset();
}
void
void
Trampoline::action(double frame_ratio)
{
- physic.apply(frame_ratio, base.x, base.y);
+ // TODO: Remove if we're too far off the screen
// Falling
- if (issolid(base.x + base.width/2, base.y + base.height))
+ if (mode != M_HELD)
{
- base.y = int((base.y + base.height)/32) * 32 - base.height;
+ if (issolid(base.x + base.width/2, base.y + base.height))
+ {
+ base.y = int((base.y + base.height)/32) * 32 - base.height;
+
+ physic.enable_gravity(false);
+ physic.set_velocity_y(0.0f);
- physic.enable_gravity(false);
- physic.set_velocity_y(0.0f);
+ physic.set_velocity_x(0);
+ }
+ else
+ {
+ physic.enable_gravity(true);
+ }
}
- else
- physic.enable_gravity(true);
+ else // Player is carrying us around
+ {
+ /* FIXME: The trampoline object shouldn't know about pplayer objects. */
+ /* If we're holding the iceblock */
+ Player& tux = *World::current()->get_tux();
+ Direction dir = tux.dir;
-}
+ if(dir == RIGHT)
+ {
+ base.x = tux.base.x + 16;
+ base.y = tux.base.y + tux.base.height/1.5 - base.height;
+ }
+ else /* facing left */
+ {
+ base.x = tux.base.x - 16;
+ base.y = tux.base.y + tux.base.height/1.5 - base.height;
+ }
-// TODO:
-// If HELD
-// - move with tux
-// If jumped on
-// - compress springs (reduce height)
+ if(collision_object_map(base))
+ {
+ base.x = tux.base.x;
+ base.y = tux.base.y + tux.base.height/1.5 - base.height;
+ }
+ }
+
+ physic.apply(frame_ratio, base.x, base.y);
+ collision_swept_object_map(&old_base, &base);
+}
void
Trampoline::collision(void *p_c_object, int c_object, CollisionType type)
if (type == COLLISION_NORMAL)
{
- // TODO: Pick up if HELD
+ // Pick up if HELD (done in Player)
}
else if (type == COLLISION_SQUISH)
{
- // TODO: compress springs
- // TODO: launch tux, if necessary
-
int squish_amount = (32 - (int)pplayer_c->base.y % 32);
if (squish_amount < 24)
else
frame = 0;
- if (squish_amount < 24)
- {
- pplayer_c->physic.set_velocity_y(8);
- }
+ if (squish_amount < 20)
+ pplayer_c->physic.set_velocity_y(power);
+ else if (pplayer_c->physic.get_velocity_y() < 0)
+ pplayer_c->physic.set_velocity_y(-squish_amount/32);
}
break;
}
}
+
+/* Object Manager */
+//---------------------------------------------------------------------------
+
+ObjectManager::ObjectManager()
+{
+ std::string filename = datadir + "/images/tilesets/supertux.stbg";
+ load_badguys(filename);
+}
+
+ObjectManager::~ObjectManager()
+{
+ for(std::vector<BadGuy*>::iterator i = badguys.begin(); i != badguys.end(); ++i) {
+ delete *i;
+ }
+}
+
+void ObjectManager::load_badguys(std::string filename)
+{
+/*
+ lisp_object_t* root_obj = lisp_read_from_file(filename);
+
+ if (!root_obj)
+ st_abort("Couldn't load file", filename);
+
+ if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-badguys") == 0)
+ {
+ lisp_object_t* cur = lisp_cdr(root_obj);
+
+ while(!lisp_nil_p(cur))
+ {
+ lisp_object_t* element = lisp_car(cur);
+
+ if (strcmp(lisp_symbol(lisp_car(element)), "badguy") == 0)
+ {
+
+
+ Tile* tile = new Tile;
+ tile->id = -1;
+ tile->solid = false;
+ tile->brick = false;
+ tile->ice = false;
+ tile->water = false;
+ tile->fullbox = false;
+ tile->distro = false;
+ tile->goal = false;
+ tile->data = 0;
+ tile->next_tile = 0;
+ tile->anim_speed = 25;
+
+ LispReader reader(lisp_cdr(element));
+ assert(reader.read_int("id", &tile->id));
+ reader.read_bool("solid", &tile->solid);
+ reader.read_bool("brick", &tile->brick);
+ reader.read_bool("ice", &tile->ice);
+ reader.read_bool("water", &tile->water);
+ reader.read_bool("fullbox", &tile->fullbox);
+ reader.read_bool("distro", &tile->distro);
+ reader.read_bool("goal", &tile->goal);
+ reader.read_int("data", &tile->data);
+ reader.read_int("anim-speed", &tile->anim_speed);
+ reader.read_int("next-tile", &tile->next_tile);
+ reader.read_string_vector("images", &tile->filenames);
+ reader.read_string_vector("editor-images", &tile->editor_filenames);
+
+ for(std::vector<std::string>::iterator it = tile->
+ filenames.begin();
+ it != tile->filenames.end();
+ ++it)
+ {
+ Surface* cur_image;
+ tile->images.push_back(cur_image);
+ tile->images[tile->images.size()-1] = new Surface(
+ datadir + "/images/tilesets/" + (*it),
+ USE_ALPHA);
+ }
+ for(std::vector<std::string>::iterator it = tile->editor_filenames.begin();
+ it != tile->editor_filenames.end();
+ ++it)
+ {
+ Surface* cur_image;
+ tile->editor_images.push_back(cur_image);
+ tile->editor_images[tile->editor_images.size()-1] = new Surface(
+ datadir + "/images/tilesets/" + (*it),
+ USE_ALPHA);
+ }
+
+ if (tile->id + tileset_id >= int(tiles.size())
+ )
+ tiles.resize(tile->id + tileset_id+1);
+
+ tiles[tile->id + tileset_id] = tile;
+ }
+ else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
+ {
+ LispReader reader(lisp_cdr(element));
+ std::string filename;
+ reader.read_string("file", &filename);
+ filename = datadir + "/images/tilesets/" + filename;
+ load_tileset(filename);
+ }
+ else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
+ {
+ TileGroup new_;
+ LispReader reader(lisp_cdr(element));
+ reader.read_string("name", &new_.name);
+ reader.read_int_vector("tiles", &new_.tiles);
+ if(!tilegroups_)
+ tilegroups_ = new std::set<TileGroup>;
+ tilegroups_->insert(new_).first;
+ }
+ else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
+ {
+ LispReader reader(lisp_cdr(element));
+ reader.read_int("id", &tileset_id);
+ tileset_id *= 1000;
+ }
+ else
+ {
+ puts("Unhandled symbol");
+ }
+
+ cur = lisp_cdr(cur);
+ }
+ }
+ else
+ {
+ assert(0);
+ }
+
+ lisp_free(root_obj);
+*/
+}
+
+void ObjectManager::draw_bg()
+{
+/*
+ for (unsigned int i = 0; i < bouncy_bricks.size(); ++i)
+ bouncy_bricks[i]->draw();
+
+ for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
+ (*i)->draw();
+
+ for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+ (*i)->draw();
+*/
+}
+
+void ObjectManager::draw_fg()
+{
+/*
+ for (unsigned int i = 0; i < bullets.size(); ++i)
+ bullets[i].draw();
+
+ for (unsigned int i = 0; i < floating_scores.size(); ++i)
+ floating_scores[i]->draw();
+
+ for (unsigned int i = 0; i < upgrades.size(); ++i)
+ upgrades[i].draw();
+
+ for (unsigned int i = 0; i < bouncy_distros.size(); ++i)
+ bouncy_distros[i]->draw();
+
+ for (unsigned int i = 0; i < broken_bricks.size(); ++i)
+ broken_bricks[i]->draw();
+*/
+}
+
+void ObjectManager::actions()
+{
+/*
+ for (unsigned int i = 0; i < bouncy_distros.size(); i++)
+ bouncy_distros[i]->action(frame_ratio);
+
+ for (unsigned int i = 0; i < broken_bricks.size(); i++)
+ broken_bricks[i]->action(frame_ratio);
+
+ // Handle all kinds of game objects
+ for (unsigned int i = 0; i < bouncy_bricks.size(); i++)
+ bouncy_bricks[i]->action(frame_ratio);
+
+ for (unsigned int i = 0; i < floating_scores.size(); i++)
+ floating_scores[i]->action(frame_ratio);
+
+ for (unsigned int i = 0; i < bullets.size(); ++i)
+ bullets[i].action(frame_ratio);
+
+ for (unsigned int i = 0; i < upgrades.size(); i++)
+ upgrades[i].action(frame_ratio);
+
+ for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
+ (*i)->action(frame_ratio);
+
+ for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+ (*i)->action(frame_ratio);
+*/
+}
+
/* EOF */
projects / supertux.git / blobdiff