X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=88b67611cd585d52dd247a6a0685ba66716525aa;hb=1d182a00d99d763a9c92ab5c73d183e1d4177cc6;hp=5cebfba261cf2da87593239438b1fa0c6c31b796;hpb=6046aabffb333d1a1a150e77d4982b622a068643;p=supertux.git diff --git a/src/player.cpp b/src/player.cpp index 5cebfba26..88b67611c 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -29,9 +29,12 @@ #include "sprite.h" #include "screen.h" -#define AUTOSCROLL_DEAD_INTERVAL 300 +// behavior definitions: +#define TILES_FOR_BUTTJUMP 3 // animation times (in ms): #define SHOOTING_TIME 320 +// others stuff: +#define AUTOSCROLL_DEAD_INTERVAL 300 Surface* tux_life; @@ -80,8 +83,6 @@ Player::~Player() void Player::init() { - Level* plevel = World::current()->get_level(); - holding_something = false; base.width = 32; @@ -90,14 +91,17 @@ Player::init() size = SMALL; got_power = NONE_POWER; - base.x = plevel->start_pos_x; - base.y = plevel->start_pos_y; + base.x = 0; + base.y = 0; previous_base = old_base = base; dir = RIGHT; old_dir = dir; duck = false; + dead = false; dying = DYING_NOT; + last_ground_y = 0; + fall_mode = ON_GROUND; jumping = false; can_jump = true; butt_jump = false; @@ -176,6 +180,11 @@ Player::action(float elapsed_time) { bool jumped_in_solid = false; + if(dying && !dying_timer.check()) { + dead = true; + return; + } + if (input.fire == UP) holding_something = false; @@ -194,7 +203,7 @@ Player::action(float elapsed_time) collision_swept_object_map(&old_base, &base); - if (!invincible_timer.started() + if ((!invincible_timer.started() && !safe_timer.started()) && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y) || isspike(base.x, base.y + base.height) || isspike(base.x + base.width, base.y + base.height))) @@ -310,6 +319,19 @@ Player::under_solid() issolid(base.x + base.width - 1, base.y) ); } +bool +Player::tiles_on_air(int tiles) +{ + for(int t = 0; t != tiles; t++) + { + if(issolid(base.x + base.width / 2, base.y + base.height + (tiles*32)) || + issolid(base.x + 1, base.y + base.height + (tiles*32)) || + issolid(base.x + base.width - 1, base.y + base.height + (tiles*32))) + return false; + } + return true; +} + void Player::handle_horizontal_input() { @@ -399,6 +421,17 @@ Player::handle_horizontal_input() void Player::handle_vertical_input() { + // set fall mode... + if(on_ground()) { + fall_mode = ON_GROUND; + last_ground_y = base.y; + } else { + if(base.y > last_ground_y) + fall_mode = FALLING; + else if(fall_mode == ON_GROUND) + fall_mode = JUMPING; + } + // Press jump key if(input.up == DOWN && can_jump && on_ground()) { @@ -415,7 +448,6 @@ Player::handle_vertical_input() --base.y; jumping = true; can_jump = false; - butt_jump = true; // player started jumping, enable butt jump if (size == SMALL) play_sound(sounds[SND_JUMP], SOUND_CENTER_SPEAKER); else @@ -426,15 +458,19 @@ Player::handle_vertical_input() { jumping = false; physic.set_velocity_y(0); - butt_jump = false; // jump was not full, disable butt jump } - /* Do butt jump, in case the player has done the combination - (full jump and hold DOWN) */ - if (input.down == UP && physic.get_velocity_y() == World::current()->get_level()->gravity && butt_jump) - butt_jump = false; // in case DOWN is not hold after the full jump, disable it - - if (input.down == DOWN && butt_jump && on_ground() && size == BIG) + /* In case the player has pressed Down while in a certain range of air, + enable butt jump action */ + if (input.down == DOWN && !butt_jump) + if(tiles_on_air(TILES_FOR_BUTTJUMP)) + butt_jump = true; + + /* When Down is not held anymore, disable butt jump */ + if(butt_jump && input.down == UP) + butt_jump = false; + + if (butt_jump && on_ground() && size == BIG) { if(World::current()->trybreakbrick(base.x, base.y + base.height, false) || World::current()->trybreakbrick( @@ -442,7 +478,7 @@ Player::handle_vertical_input() // make tux jumping a little bit again after breaking the bricks physic.set_velocity_y(2); } -// butt_jump = false; +// butt_jump = false; // comment this, in case you won't to disable the continued use of buttjump } if ( (issolid(base.x + base.width / 2, base.y + base.height + 64) || @@ -577,7 +613,7 @@ Player::grabdistros() } void -Player::draw(ViewPort& viewport, int layer) +Player::draw(Camera& viewport, int layer) { PlayerSprite* sprite; @@ -594,7 +630,7 @@ Player::draw(ViewPort& viewport, int layer) if(layer == LAYER_OBJECTS + 1) { // Draw arm overlay graphics when Tux is holding something - if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check()) + if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck) { if (dir == RIGHT) sprite->grab_right->draw(pos); @@ -690,6 +726,7 @@ Player::collision(void* p_c_object, int c_object) { BadGuy* pbad_c = NULL; Trampoline* ptramp_c = NULL; + FlyingPlatform* pplatform_c = NULL; switch (c_object) { @@ -780,7 +817,12 @@ Player::collision(void* p_c_object, int c_object) } } */ - + break; + case CO_FLYING_PLATFORM: + pplatform_c = (FlyingPlatform*) p_c_object; + + base.y = pplatform_c->base.y - base.height; + physic.enable_gravity(false); break; default: @@ -794,6 +836,9 @@ Player::collision(void* p_c_object, int c_object) void Player::kill(HurtMode mode) { + if(dying) + return; + play_sound(sounds[SND_HURT], SOUND_CENTER_SPEAKER); physic.set_velocity_x(0); @@ -817,32 +862,12 @@ Player::kill(HurtMode mode) physic.enable_gravity(true); physic.set_acceleration(0, 0); physic.set_velocity(0, 7); - if(dying != DYING_SQUISHED) --player_status.lives; dying = DYING_SQUISHED; + dying_timer.start(3000); } } -void -Player::is_dying() -{ - remove_powerups(); - dying = DYING_NOT; -} - -bool Player::is_dead() -{ - float scroll_x = - World::current()->displaymanager.get_viewport().get_translation().x; - float scroll_y = - World::current()->displaymanager.get_viewport().get_translation().y; - if(base.y > screen->h + scroll_y || base.y > World::current()->get_level()->height*32 || - base.x < scroll_x - AUTOSCROLL_DEAD_INTERVAL) // can happen in auto-scrolling - return true; - else - return false; -} - /* Remove Tux's power ups */ void Player::remove_powerups() @@ -853,7 +878,15 @@ Player::remove_powerups() } void -Player::check_bounds(ViewPort& viewport, +Player::move(const Vector& vector) +{ + base.x = vector.x; + base.y = vector.y; + old_base = previous_base = base; +} + +void +Player::check_bounds(Camera& viewport, bool back_scrolling, bool hor_autoscroll) { /* Keep tux in bounds: */ @@ -867,10 +900,27 @@ Player::check_bounds(ViewPort& viewport, if (base.y > World::current()->get_level()->height * /*TILE_HEIGHT*/ 32) { kill(KILL); + return; } - if(base.x < viewport.get_translation().x && (!back_scrolling || hor_autoscroll)) // can happen if back scrolling is disabled + bool adjust = false; + // can happen if back scrolling is disabled + if(base.x < viewport.get_translation().x) { base.x = viewport.get_translation().x; + adjust = true; + } + if(base.x >= viewport.get_translation().x + screen->w - base.width) { + base.x = viewport.get_translation().x + screen->w - base.width; + adjust = true; + } + + if(adjust) { + // squished now? + if(collision_object_map(base)) { + kill(KILL); + return; + } + } if(hor_autoscroll) {