PlayerSprite smalltux;
PlayerSprite largetux;
+PlayerSprite icetux;
PlayerSprite firetux;
PlayerKeymap keymap;
base.height = 32;
size = SMALL;
- got_coffee = false;
+ got_power = NONE_POWER;
base.x = plevel->start_pos_x;
base.y = plevel->start_pos_y;
/* Shoot! */
- if (input.fire == DOWN && input.old_fire == UP && got_coffee)
+ if (input.fire == DOWN && input.old_fire == UP && got_power != NONE_POWER)
{
World::current()->add_bullet(base.x, base.y, physic.get_velocity_x(), dir);
input.old_fire = DOWN;
{
if (dying == DYING_SQUISHED)
{
- smalltux_gameover->draw(base.x - scroll_x, base.y);
+ smalltux_gameover->draw(base.x, base.y);
}
else
{
if (size == SMALL)
sprite = &smalltux;
- else if (got_coffee)
+ else if (got_power == FIRE_POWER)
sprite = &firetux;
+ else if (got_power == ICE_POWER)
+ sprite = &icetux;
else
sprite = &largetux;
if (duck && size != SMALL)
{
if (dir == RIGHT)
- sprite->duck_right->draw(base.x - scroll_x, base.y);
+ sprite->duck_right->draw(base.x, base.y);
else
- sprite->duck_left->draw(base.x - scroll_x, base.y);
+ sprite->duck_left->draw(base.x, base.y);
}
else if (skidding_timer.started())
{
if (dir == RIGHT)
- sprite->skid_right->draw(base.x - scroll_x, base.y);
+ sprite->skid_right->draw(base.x, base.y);
else
- sprite->skid_left->draw(base.x - scroll_x, base.y);
+ sprite->skid_left->draw(base.x, base.y);
}
else if (kick_timer.started())
{
if (dir == RIGHT)
- sprite->kick_right->draw(base.x - scroll_x, base.y);
+ sprite->kick_right->draw(base.x, base.y);
else
- sprite->kick_left->draw(base.x - scroll_x, base.y);
+ sprite->kick_left->draw(base.x, base.y);
}
else if (physic.get_velocity_y() != 0)
{
if (dir == RIGHT)
- sprite->jump_right->draw(base.x - scroll_x, base.y);
+ sprite->jump_right->draw(base.x, base.y);
else
- sprite->jump_left->draw(base.x - scroll_x, base.y);
+ sprite->jump_left->draw(base.x, base.y);
}
else
{
if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
{
if (dir == RIGHT)
- sprite->stand_right->draw( base.x - scroll_x, base.y);
+ sprite->stand_right->draw( base.x, base.y);
else
- sprite->stand_left->draw( base.x - scroll_x, base.y);
+ sprite->stand_left->draw( base.x, base.y);
}
else // moving
{
if (dir == RIGHT)
- sprite->walk_right->draw(base.x - scroll_x, base.y);
+ sprite->walk_right->draw(base.x, base.y);
else
- sprite->walk_left->draw(base.x - scroll_x, base.y);
+ sprite->walk_left->draw(base.x, base.y);
}
}
if (holding_something && physic.get_velocity_y() == 0)
{
if (dir == RIGHT)
- sprite->grab_right->draw(base.x - scroll_x, base.y);
+ sprite->grab_right->draw(base.x, base.y);
else
- sprite->grab_left->draw(base.x - scroll_x, base.y);
+ sprite->grab_left->draw(base.x, base.y);
}
// Draw blinking star overlay
(invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
{
if (size == SMALL || duck)
- smalltux_star->draw(base.x - scroll_x, base.y);
+ smalltux_star->draw(base.x, base.y);
else
- largetux_star->draw(base.x - scroll_x, base.y);
+ largetux_star->draw(base.x, base.y);
}
}
}
if (debug_mode)
- fillrect(base.x - scroll_x, base.y,
+ fillrect(base.x - scroll_x, base.y - scroll_y,
base.width, base.height, 75,75,75, 150);
}
{
pbad_c->dying = DYING_FALLING;
play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
- World::current()->add_score(pbad_c->base.x - scroll_x,
+ World::current()->add_score(pbad_c->base.x,
pbad_c->base.y,
25 * player_status.score_multiplier);
}
if (mode == SHRINK && size == BIG)
{
- if (got_coffee)
+ if (got_power != NONE_POWER)
{
- got_coffee = false;
+ got_power = NONE_POWER;
}
else
{
void
Player::remove_powerups()
{
- got_coffee = false;
+ got_power = NONE_POWER;
size = SMALL;
base.height = 32;
}