activate_bad_guys();
activate_particle_systems();
get_level()->load_song();
+
+ apply_bonuses();
+
+ scrolling_timer.init(true);
}
World::World(const std::string& subset, int level_nr)
activate_bad_guys();
activate_particle_systems();
get_level()->load_song();
+
+ apply_bonuses();
+
+ scrolling_timer.init(true);
+}
+
+void
+World::apply_bonuses()
+{
+ // Apply bonuses from former levels
+ switch (player_status.bonus)
+ {
+ case PlayerStatus::NO_BONUS:
+ break;
+
+ case PlayerStatus::FLOWER_BONUS:
+ tux.got_coffee = true;
+ // fall through
+
+ case PlayerStatus::GROWUP_BONUS:
+ // FIXME: Move this to Player class
+ tux.size = BIG;
+ tux.base.height = 64;
+ tux.base.y -= 32;
+ break;
+ }
}
World::~World()
{
for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
delete *i;
+
+ for (ParticleSystems::iterator i = particle_systems.begin();
+ i != particle_systems.end(); ++i)
+ delete *i;
+
+ for (std::vector<BouncyDistro*>::iterator i = bouncy_distros.begin();
+ i != bouncy_distros.end(); ++i)
+ delete *i;
+
+ for (std::vector<BrokenBrick*>::iterator i = broken_bricks.begin();
+ i != broken_bricks.end(); ++i)
+ delete *i;
+
+ for (std::vector<BouncyBrick*>::iterator i = bouncy_bricks.begin();
+ i != bouncy_bricks.end(); ++i)
+ delete *i;
+
+ for (std::vector<FloatingScore*>::iterator i = floating_scores.begin();
+ i != floating_scores.end(); ++i)
+ delete *i;
- halt_music(); // just to be sure (because levelmusic is freed now)
delete level;
}
/* Draw the real background */
if(get_level()->bkgd_image[0] != '\0')
{
- int s = ((int)scroll_x / 2)%640;
+ int s = (int)((float)scroll_x * ((float)level->bkgd_speed/60.)) % screen->w;
level->img_bkgd->draw_part(s, 0,0,0,level->img_bkgd->w - s, level->img_bkgd->h);
level->img_bkgd->draw_part(0, 0,screen->w - s ,0,s,level->img_bkgd->h);
}
/* (Bouncy bricks): */
for (unsigned int i = 0; i < bouncy_bricks.size(); ++i)
- bouncy_bricks[i].draw();
+ bouncy_bricks[i]->draw();
for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
(*i)->draw();
bullets[i].draw();
for (unsigned int i = 0; i < floating_scores.size(); ++i)
- floating_scores[i].draw();
+ 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();
+ bouncy_distros[i]->draw();
for (unsigned int i = 0; i < broken_bricks.size(); ++i)
- broken_bricks[i].draw();
+ broken_bricks[i]->draw();
/* Draw foreground: */
for (y = 0; y < 15; ++y)
World::action(double frame_ratio)
{
tux.action(frame_ratio);
+ scrolling(frame_ratio);
/* Handle bouncy distros: */
for (unsigned int i = 0; i < bouncy_distros.size(); i++)
- bouncy_distros[i].action(frame_ratio);
+ bouncy_distros[i]->action(frame_ratio);
/* Handle broken bricks: */
for (unsigned int i = 0; i < broken_bricks.size(); i++)
- broken_bricks[i].action(frame_ratio);
-
- /* Handle distro counting: */
- if (counting_distros)
- {
- distro_counter--;
-
- if (distro_counter <= 0)
- counting_distros = -1;
- }
+ 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);
+ bouncy_bricks[i]->action(frame_ratio);
for (unsigned int i = 0; i < floating_scores.size(); i++)
- floating_scores[i].action(frame_ratio);
+ floating_scores[i]->action(frame_ratio);
for (unsigned int i = 0; i < bullets.size(); ++i)
bullets[i].action(frame_ratio);
/* Handle all possible collisions. */
collision_handler();
- { // Cleanup marked badguys
- for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
- if ((*i)->is_removable())
- delete *i;
- bad_guys.remove_if(std::mem_fun(&BadGuy::is_removable));
+ // Cleanup marked badguys
+ for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end();
+ /* ++i handled at end of the loop */) {
+ if ((*i)->is_removable()) {
+ delete *i;
+ i = bad_guys.erase(i);
+ } else {
+ ++i;
+ }
+ }
+}
+
+// the space that it takes for the screen to start scrolling, regarding
+// screen bounds (in pixels)
+#define X_SPACE (400-16)
+// the time it takes to move the camera (in ms)
+#define CHANGE_DIR_SCROLL_SPEED 2000
+
+/* This functions takes cares of the scrolling */
+void World::scrolling(double frame_ratio)
+{
+ int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
+
+ if (level->back_scrolling || debug_mode)
+ {
+ if(tux.old_dir != tux.dir && level->back_scrolling)
+ scrolling_timer.start(CHANGE_DIR_SCROLL_SPEED);
+
+ if(scrolling_timer.check())
+ {
+ float final_scroll_x;
+ if (tux.physic.get_velocity_x() > 0)
+ final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
+ else if (tux.physic.get_velocity_x() < 0)
+ final_scroll_x = tux_pos_x - X_SPACE;
+ else
+ {
+ if (tux.dir == RIGHT)
+ final_scroll_x = tux_pos_x - (screen->w - X_SPACE);
+ else if (tux.dir == LEFT && level->back_scrolling)
+ final_scroll_x = tux_pos_x - X_SPACE;
+ }
+
+ scroll_x += (final_scroll_x - scroll_x)
+ / (frame_ratio * (CHANGE_DIR_SCROLL_SPEED / 100))
+ + (tux.physic.get_velocity_x() * frame_ratio + tux.physic.get_acceleration_x() * frame_ratio * frame_ratio);
+ // std::cerr << tux_pos_x << " " << final_scroll_x << " " << scroll_x << std::endl;
+
+ }
+ else
+ {
+ if (tux.physic.get_velocity_x() > 0 && scroll_x < tux_pos_x - (screen->w - X_SPACE))
+ scroll_x = tux_pos_x - (screen->w - X_SPACE);
+ else if (tux.physic.get_velocity_x() < 0 && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
+ scroll_x = tux_pos_x - X_SPACE;
+ else
+ {
+ if (tux.dir == RIGHT && scroll_x < tux_pos_x - (screen->w - X_SPACE))
+ scroll_x = tux_pos_x - (screen->w - X_SPACE);
+ else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
+ scroll_x = tux_pos_x - X_SPACE;
+ }
+ }
+ }
+
+ else /*no debug*/
+ {
+ if (tux.physic.get_velocity_x() > 0 && scroll_x < tux_pos_x - (screen->w - X_SPACE))
+ scroll_x = tux_pos_x - (screen->w - X_SPACE);
+ else if (tux.physic.get_velocity_x() < 0 && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
+ scroll_x = tux_pos_x - X_SPACE;
+ else
+ {
+ if (tux.dir == RIGHT && scroll_x < tux_pos_x - (screen->w - X_SPACE))
+ scroll_x = tux_pos_x - (screen->w - X_SPACE);
+ else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling)
+ scroll_x = tux_pos_x - X_SPACE;
+ }
+
}
+
+ // this code prevent the screen to scroll before the start or after the level's end
+ if(scroll_x < 0)
+ scroll_x = 0;
+ if(scroll_x > level->width * 32 - screen->w)
+ scroll_x = level->width * 32 - screen->w;
}
void
// functions of the collided objects.
if (tux.previous_base.y < tux.base.y &&
tux.previous_base.y + tux.previous_base.height
- < (*i)->base.y + (*i)->base.height/2)
+ < (*i)->base.y + (*i)->base.height/2
+ && !tux.invincible_timer.started())
{
(*i)->collision(&tux, CO_PLAYER, COLLISION_SQUISH);
}
{
// We have detected a collision and now call the collision
// functions of the collided objects.
- upgrades[i].collision(&tux, CO_PLAYER);
+ upgrades[i].collision(&tux, CO_PLAYER, COLLISION_NORMAL);
}
}
}
{
player_status.score += s;
- FloatingScore new_floating_score;
- new_floating_score.init(x,y,s);
+ FloatingScore* new_floating_score = new FloatingScore();
+ new_floating_score->init(x,y,s);
floating_scores.push_back(new_floating_score);
}
void
World::add_bouncy_distro(float x, float y)
{
- BouncyDistro new_bouncy_distro;
- new_bouncy_distro.init(x,y);
+ BouncyDistro* new_bouncy_distro = new BouncyDistro();
+ new_bouncy_distro->init(x,y);
bouncy_distros.push_back(new_bouncy_distro);
}
void
World::add_broken_brick_piece(Tile* tile, float x, float y, float xm, float ym)
{
- BrokenBrick new_broken_brick;
- new_broken_brick.init(tile, x, y, xm, ym);
+ BrokenBrick* new_broken_brick = new BrokenBrick();
+ new_broken_brick->init(tile, x, y, xm, ym);
broken_bricks.push_back(new_broken_brick);
}
void
World::add_bouncy_brick(float x, float y)
{
- BouncyBrick new_bouncy_brick;
- new_bouncy_brick.init(x,y);
+ BouncyBrick* new_bouncy_brick = new BouncyBrick();
+ new_bouncy_brick->init(x,y);
bouncy_bricks.push_back(new_bouncy_brick);
}
currentmusic = musictype;
switch(currentmusic) {
case HURRYUP_MUSIC:
- ::play_music(get_level()->get_level_music_fast());
+ music_manager->play_music(get_level()->get_level_music_fast());
break;
case LEVEL_MUSIC:
- ::play_music(get_level()->get_level_music());
+ music_manager->play_music(get_level()->get_level_music());
break;
case HERRING_MUSIC:
- ::play_music(herring_song);
+ music_manager->play_music(herring_song);
break;
default:
- ::halt_music();
+ music_manager->halt_music();
break;
}
}
add_bouncy_distro(((int)(x + 1) / 32) * 32,
(int)(y / 32) * 32);
+ // TODO: don't handle this in a global way but per-tile...
if (!counting_distros)
{
counting_distros = true;
- distro_counter = 50;
+ distro_counter = 5;
+ }
+ else
+ {
+ distro_counter--;
}
if (distro_counter <= 0)
- plevel->change(x, y, TM_IA, tile->next_tile);
+ {
+ counting_distros = false;
+ plevel->change(x, y, TM_IA, tile->next_tile);
+ }
play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
player_status.score = player_status.score + SCORE_DISTRO;
upgrades[i].base.x >= x - 32 && upgrades[i].base.x <= x + 32 &&
upgrades[i].base.y >= y - 16 && upgrades[i].base.y <= y + 16)
{
- upgrades[i].base.xm = -upgrades[i].base.xm;
- upgrades[i].base.ym = -8;
- play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER);
+ upgrades[i].collision(&tux, CO_PLAYER, COLLISION_BUMP);
}
}
}
projects / supertux.git / blobdiff