dying = DYING_NOT;
jumping = false;
can_jump = true;
+ butt_jump = false;
frame_main = 0;
frame_ = 0;
physic.enable_gravity(false);
/* Reset score multiplier (for multi-hits): */
- player_status.score_multiplier = 1;
+ if (!invincible_timer.started())
+ player_status.score_multiplier = 1;
}
if(jumped_in_solid)
}
}
+ if (input.down == DOWN && !on_ground() && !duck)
+ butt_jump = true;
+ else if (input.down == UP)
+ butt_jump = false;
+ if (input.down == DOWN && butt_jump && on_ground())
+ {
+ if (isbrick(base.x, base.y + base.height))
+ World::current()->trybreakbrick(base.x, base.y + base.height, false);
+ if (isbrick(base.x + base.width, base.y + base.height))
+ World::current()->trybreakbrick(base.x + base.width, base.y + base.height, false);
+
+ butt_jump = false;
+ }
+
+
if ( (issolid(base.x + base.width / 2, base.y + base.height + 64) ||
issolid(base.x + 1, base.y + base.height + 64) ||
issolid(base.x + base.width - 1, base.y + base.height + 64))
{
if (dying == DYING_SQUISHED)
{
- smalltux_gameover->draw(base.x - scroll_x, base.y);
+ smalltux_gameover->draw(base.x, base.y);
}
else
{
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);
}
physic.enable_gravity(true);
physic.set_acceleration(0, 0);
physic.set_velocity(0, 7);
+ if(dying != DYING_SQUISHED)
+ --player_status.lives;
dying = DYING_SQUISHED;
}
}
if(base.x < scroll_x && (!back_scrolling || hor_autoscroll)) // can happen if back scrolling is disabled
base.x = scroll_x;
- if(base.x == scroll_x && hor_autoscroll)
- if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32)))
- kill(KILL);
-
- if(base.x + base.width > scroll_x + screen->w && hor_autoscroll)
- base.x = scroll_x + screen->w - base.width;
+ if(hor_autoscroll)
+ {
+ if(base.x == scroll_x)
+ if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32)))
+ kill(KILL);
+ if(base.x + base.width > scroll_x + screen->w)
+ base.x = scroll_x + screen->w - base.width;
+ }
}