X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=7fb22060530cd693b38fe23db24da29335295099;hb=63934f5f4c15f059c9b60499575870ebb7c923a0;hp=337c52f33d331d48b93765ec3b4941f4a53e351d;hpb=9049bc39abe1375659584ed8cf950faf8b6a5145;p=supertux.git diff --git a/src/player.cpp b/src/player.cpp index 337c52f33..7fb220605 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1,14 +1,22 @@ +// $Id$ // -// C Implementation: player/tux +// SuperTux - A Jump'n Run +// Copyright (C) 2003 Tobias Glaesser // -// Description: -// -// -// Author: Tobias Glaesser & Bill Kendrick, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. // +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. // +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include #include "gameloop.h" @@ -17,38 +25,50 @@ #include "defines.h" #include "scene.h" #include "tile.h" +#include "sprite.h" #include "screen.h" -texture_type tux_life; -std::vector tux_right; -std::vector tux_left; -texture_type smalltux_jump_left; -texture_type smalltux_jump_right; -texture_type smalltux_stand_left; -texture_type smalltux_stand_right; - -texture_type bigtux_right[3]; -texture_type bigtux_left[3]; -texture_type bigtux_right_jump; -texture_type bigtux_left_jump; -texture_type ducktux_right; -texture_type ducktux_left; -texture_type skidtux_right; -texture_type skidtux_left; -texture_type firetux_right[3]; -texture_type firetux_left[3]; -texture_type bigfiretux_right[3]; -texture_type bigfiretux_left[3]; -texture_type bigfiretux_right_jump; -texture_type bigfiretux_left_jump; -texture_type duckfiretux_right; -texture_type duckfiretux_left; -texture_type skidfiretux_right; -texture_type skidfiretux_left; -texture_type cape_right[2]; -texture_type cape_left[2]; -texture_type bigcape_right[2]; -texture_type bigcape_left[2]; +Surface* tux_life; +std::vector tux_right; +std::vector tux_left; +Surface* smalltux_jump_left; +Surface* smalltux_jump_right; +Surface* smalltux_stand_left; +Surface* smalltux_stand_right; + +Sprite* bigtux_right; +Sprite* bigtux_left; +Sprite* bigtux_right_jump; +Sprite* bigtux_left_jump; +Sprite* ducktux_right; +Sprite* ducktux_left; +Surface* skidtux_right; +Surface* skidtux_left; +Surface* firetux_right[3]; +Surface* firetux_left[3]; +Surface* bigfiretux_right[3]; +Surface* bigfiretux_left[3]; +Surface* bigfiretux_right_jump; +Surface* bigfiretux_left_jump; +Surface* duckfiretux_right; +Surface* duckfiretux_left; +Surface* skidfiretux_right; +Surface* skidfiretux_left; +Surface* cape_right[2]; +Surface* cape_left[2]; +Surface* bigcape_right[2]; +Surface* bigcape_left[2]; + +PlayerKeymap keymap; + +PlayerKeymap::PlayerKeymap() +{ + keymap.jump = SDLK_UP; + keymap.duck = SDLK_DOWN; + keymap.left = SDLK_LEFT; + keymap.right = SDLK_RIGHT; + keymap.fire = SDLK_LCTRL; +} void player_input_init(player_input_type* pplayer_input) { @@ -63,15 +83,16 @@ void player_input_init(player_input_type* pplayer_input) void Player::init() { + Level* plevel = World::current()->get_level(); + base.width = 32; base.height = 32; size = SMALL; got_coffee = false; - // FIXME: Make the start position configurable via the levelfile - base.x = 100; - base.y = 240; + base.x = plevel->start_pos_x; + base.y = plevel->start_pos_y; base.xm = 0; base.ym = 0; previous_base = old_base = base; @@ -83,18 +104,9 @@ Player::init() frame_main = 0; frame_ = 0; - lives = 3; - score = 0; - distros = 0; - + player_input_init(&input); - keymap.jump = SDLK_UP; - keymap.duck = SDLK_DOWN; - keymap.left = SDLK_LEFT; - keymap.right = SDLK_RIGHT; - keymap.fire = SDLK_LCTRL; - invincible_timer.init(true); skidding_timer.init(true); safe_timer.init(true); @@ -139,7 +151,7 @@ void Player::level_begin() { base.x = 100; - base.y = 240; + base.y = 170; base.xm = 0; base.ym = 0; previous_base = old_base = base; @@ -169,20 +181,29 @@ Player::action(double frame_ratio) /* Move tux: */ previous_base = base; - duck = false; physic.apply(frame_ratio, base.x, base.y); - if(dying == DYING_NOT) { + if(dying == DYING_NOT) + { + base_type target = base; + collision_swept_object_map(&old_base, &base); + + // Don't accelerate Tux if he is running against a wall + if (target.x != base.x) + { + physic.set_velocity_x(0); + } + // special exception for cases where we're stuck under tiles after // being ducked. In this case we drift out if(!duck && on_ground() && old_base.x == base.x && old_base.y == base.y - && collision_object_map(&base)) { - base.x += frame_ratio * WALK_SPEED * (dir ? 1 : -1); - previous_base = old_base = base; + && collision_object_map(&base)) { + base.x += frame_ratio * WALK_SPEED * (dir ? 1 : -1); + previous_base = old_base = base; } keep_in_bounds(); - } + } if (dying == DYING_NOT) { @@ -195,7 +216,7 @@ Player::action(double frame_ratio) if(under_solid()) { // fall down - physic.set_velocity(physic.get_velocity_x(), 0); + physic.set_velocity_y(0); jumped_in_solid = true; } } @@ -205,7 +226,7 @@ Player::action(double frame_ratio) if (physic.get_velocity_y() < 0) { base.y = (int)(((int)base.y / 32) * 32); - physic.set_velocity(physic.get_velocity_x(), 0); + physic.set_velocity_y(0); } physic.enable_gravity(false); @@ -262,10 +283,10 @@ Player::action(double frame_ratio) if (get_current_music() == HERRING_MUSIC && !invincible_timer.check()) { /* - no, we are no more invincible - or we were not in invincible mode - but are we in hurry ? - */ + no, we are no more invincible + or we were not in invincible mode + but are we in hurry ? + */ // FIXME: Move this to gamesession if (GameSession::current()->time_left.get_left() < TIME_WARNING) @@ -273,7 +294,7 @@ Player::action(double frame_ratio) /* yes, we are in hurry stop the herring_song, prepare to play the correct fast level_song ! - */ + */ set_current_music(HURRYUP_MUSIC); } else @@ -285,30 +306,6 @@ Player::action(double frame_ratio) play_current_music(); } - /* End of level? */ - if (base.x >= World::current()->get_level()->endpos - && World::current()->get_level()->endpos != 0) - { - player_status.next_level = 1; - } - - /* Duck! */ - if (input.down == DOWN && size == BIG && !duck) - { - duck = true; - base.height = 32; - base.y += 32; - // changing base size confuses collision otherwise - old_base = previous_base = base; - } - else if(input.down == UP && size == BIG && duck) - { - duck = false; - base.y -= 32; - base.height = 64; - old_base = previous_base = base; - } - // check some timers skidding_timer.check(); invincible_timer.check(); @@ -340,10 +337,10 @@ Player::handle_horizontal_input() float ay = physic.get_acceleration_y(); float dirsign = 0; - if(!duck && input.left == DOWN && input.right == UP) { + if(input.left == DOWN && input.right == UP && (!duck || physic.get_velocity_y() != 0)) { dir = LEFT; dirsign = -1; - } else if(!duck && input.left == UP && input.right == DOWN) { + } else if(input.left == UP && input.right == DOWN && (!duck || physic.get_velocity_y() != 0)) { dir = RIGHT; dirsign = 1; } @@ -397,7 +394,20 @@ Player::handle_horizontal_input() ax = WALK_ACCELERATION_X * -1.5; } } - + + // if we're on ice slow down acceleration or deceleration + if (isice(base.x, base.y + base.height)) + { + /* the acceleration/deceleration rate on ice is inversely proportional to + * the current velocity. + */ + + // increasing 1 will increase acceleration/deceleration rate + // decreasing 1 will decrease acceleration/deceleration rate + // must stay above zero, though + if (ax != 0) ax *= 1 / fabs(vx); + } + physic.set_velocity(vx, vy); physic.set_acceleration(ax, ay); } @@ -407,10 +417,14 @@ Player::handle_vertical_input() { if(input.up == DOWN) { - if (on_ground() && !duck) + if (on_ground()) { // jump - physic.set_velocity(physic.get_velocity_x(), 5.5); + if (physic.get_velocity_x() > MAX_WALK_XM) + physic.set_velocity_y(5.8); + else + physic.set_velocity_y(5.2); + --base.y; jumping = true; if (size == SMALL) @@ -423,7 +437,7 @@ Player::handle_vertical_input() { jumping = false; if(physic.get_velocity_y() > 0) { - physic.set_velocity(physic.get_velocity_x(), 0); + physic.set_velocity_y(0); } } } @@ -471,7 +485,7 @@ Player::handle_input() } /* Duck! */ - if (input.down == DOWN && size == BIG && !duck) + if (input.down == DOWN && size == BIG && !duck && physic.get_velocity_y() == 0) { duck = true; base.height = 32; @@ -479,7 +493,7 @@ Player::handle_input() // changing base size confuses collision otherwise old_base = previous_base = base; } - else if(input.down == UP && size == BIG && duck) + else if(input.down == UP && size == BIG && duck && physic.get_velocity_y() == 0) { duck = false; base.y -= 32; @@ -509,11 +523,11 @@ Player::grabdistros() } /* Enough distros for a One-up? */ - if (distros >= DISTROS_LIFEUP) + if (player_status.distros >= DISTROS_LIFEUP) { - distros = distros - DISTROS_LIFEUP; - if(lives < MAX_LIVES) - lives++; + player_status.distros = player_status.distros - DISTROS_LIFEUP; + if(player_status.lives < MAX_LIVES) + ++player_status.lives; /*We want to hear the sound even, if MAX_LIVES is reached*/ play_sound(sounds[SND_LIFEUP], SOUND_CENTER_SPEAKER); } @@ -531,15 +545,9 @@ Player::draw() /* Draw cape: */ if (dir == RIGHT) - { - texture_draw(&cape_right[global_frame_counter % 2], - base.x- scroll_x, base.y); - } + cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); else - { - texture_draw(&cape_left[global_frame_counter % 2], - base.x- scroll_x, base.y); - } + cape_left[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); } @@ -548,27 +556,25 @@ Player::draw() if (physic.get_velocity_y() != 0) { if (dir == RIGHT) - texture_draw(&smalltux_jump_right, base.x - scroll_x, base.y - 10); + smalltux_jump_right->draw( base.x - scroll_x, base.y - 10); else - texture_draw(&smalltux_jump_left, base.x - scroll_x, base.y - 10); + smalltux_jump_left->draw( base.x - scroll_x, base.y - 10); } else { if (fabsf(physic.get_velocity_x()) < 1.0f) // standing { if (dir == RIGHT) - texture_draw(&smalltux_stand_right, base.x - scroll_x, base.y - 9); + smalltux_stand_right->draw( base.x - scroll_x, base.y - 9); else - texture_draw(&smalltux_stand_left, base.x - scroll_x, base.y - 9); + smalltux_stand_left->draw( base.x - scroll_x, base.y - 9); } else // moving { if (dir == RIGHT) - texture_draw(&tux_right[(global_frame_counter/2) % tux_right.size()], - base.x - scroll_x, base.y - 9); + tux_right[(global_frame_counter/2) % tux_right.size()]->draw(base.x - scroll_x, base.y - 9); else - texture_draw(&tux_left[(global_frame_counter/2) % tux_left.size()], - base.x - scroll_x, base.y - 9); + tux_left[(global_frame_counter/2) % tux_left.size()]->draw(base.x - scroll_x, base.y - 9); } } } @@ -578,11 +584,11 @@ Player::draw() if (dir == RIGHT) { - texture_draw(&firetux_right[frame_], base.x- scroll_x, base.y); + firetux_right[frame_]->draw( base.x- scroll_x, base.y); } else { - texture_draw(&firetux_left[frame_], base.x- scroll_x, base.y); + firetux_left[frame_]->draw( base.x- scroll_x, base.y); } } } @@ -590,21 +596,15 @@ Player::draw() { if (invincible_timer.started()) { - float capex = base.x + (base.width - bigcape_right[0].w) / 2; + float capex = base.x + (base.width - bigcape_right[0]->w) / 2; capex -= scroll_x; - float capey = base.y + (base.height - bigcape_right[0].h) / 2; + float capey = base.y + (base.height - bigcape_right[0]->h) / 2; /* Draw cape (just not in ducked mode since that looks silly): */ if (dir == RIGHT) - { - texture_draw(&bigcape_right[global_frame_counter % 2], - capex, capey); - } + bigcape_right[global_frame_counter % 2]->draw(capex, capey); else - { - texture_draw(&bigcape_left[global_frame_counter % 2], - capex, capey); - } + bigcape_left[global_frame_counter % 2]->draw(capex, capey); } if (!got_coffee) @@ -613,57 +613,35 @@ Player::draw() { if (!skidding_timer.started()) { - if (!jumping || physic.get_velocity_y() > 0) + if (physic.get_velocity_y() == 0) { if (dir == RIGHT) - { - texture_draw(&bigtux_right[frame_], - base.x- scroll_x - 8, base.y); - } + bigtux_right->draw(base.x - scroll_x, base.y); else - { - texture_draw(&bigtux_left[frame_], - base.x- scroll_x - 8, base.y); - } + bigtux_left->draw(base.x - scroll_x, base.y); } else { if (dir == RIGHT) - { - texture_draw(&bigtux_right_jump, - base.x- scroll_x - 8, base.y); - } + bigtux_right_jump->draw(base.x - scroll_x, base.y); else - { - texture_draw(&bigtux_left_jump, - base.x- scroll_x - 8, base.y); - } + bigtux_left_jump->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - { - texture_draw(&skidtux_right, - base.x- scroll_x - 8, base.y); - } + skidtux_right->draw(base.x - scroll_x - 8, base.y); else - { - texture_draw(&skidtux_left, - base.x- scroll_x - 8, base.y); - } + skidtux_left->draw(base.x - scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - texture_draw(&ducktux_right, base.x- scroll_x - 8, base.y - 16); - } + ducktux_right->draw(base.x - scroll_x, base.y); else - { - texture_draw(&ducktux_left, base.x- scroll_x - 8, base.y - 16); - } + ducktux_left->draw(base.x - scroll_x, base.y); } } else @@ -676,62 +654,37 @@ Player::draw() if (!jumping || physic.get_velocity_y() > 0) { if (dir == RIGHT) - { - texture_draw(&bigfiretux_right[frame_], - base.x- scroll_x - 8, base.y); - } + bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y); else - { - texture_draw(&bigfiretux_left[frame_], - base.x- scroll_x - 8, base.y); - } + bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y); } else { if (dir == RIGHT) - { - texture_draw(&bigfiretux_right_jump, - base.x- scroll_x - 8, base.y); - } + bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y); else - { - texture_draw(&bigfiretux_left_jump, - base.x- scroll_x - 8, base.y); - } + bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - texture_draw(&skidfiretux_right, - base.x- scroll_x - 8, base.y); - } + skidfiretux_right->draw(base.x- scroll_x - 8, base.y); else - { - texture_draw(&skidfiretux_left, - base.x- scroll_x - 8, base.y); - } + skidfiretux_left->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - texture_draw(&duckfiretux_right, base.x- scroll_x - 8, base.y - 16); - } + duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); else - { - texture_draw(&duckfiretux_left, base.x- scroll_x - 8, base.y - 16); - } + duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); } } } } - if(dying) - text_drawf(&gold_text,"Penguins can fly !:",0,0,A_HMIDDLE,A_VMIDDLE,1); - if (debug_mode) fillrect(base.x - scroll_x, base.y, 32, 32, 75,75,75, 150); } @@ -745,41 +698,35 @@ Player::collision(void* p_c_object, int c_object) { case CO_BADGUY: pbad_c = (BadGuy*) p_c_object; - /* Hurt the player if he just touched it: */ + /* Hurt player if he touches a badguy */ if (!pbad_c->dying && !dying && !safe_timer.started() && - pbad_c->mode != HELD) + pbad_c->mode != BadGuy::HELD) { - if (pbad_c->mode == FLAT && input.fire == DOWN) + if (pbad_c->mode == BadGuy::FLAT && input.fire == DOWN) { - pbad_c->mode = HELD; + pbad_c->mode = BadGuy::HELD; pbad_c->base.y-=8; } - else if (pbad_c->mode == KICK) + else if (pbad_c->mode == BadGuy::FLAT) { - if (base.y < pbad_c->base.y - 16) + // Don't get hurt if we're kicking a flat badguy! + } + else if (pbad_c->mode == BadGuy::KICK) + { + /* Hurt if you get hit by kicked laptop: */ + if (!invincible_timer.started()) { - /* Step on (stop being kicked) */ - - pbad_c->mode = FLAT; - play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER); + kill(SHRINK); } else { - /* Hurt if you get hit by kicked laptop: */ - if (!invincible_timer.started()) - { - kill(SHRINK); - } - else - { - pbad_c->dying = DYING_FALLING; - play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); - World::current()->add_score(pbad_c->base.x - scroll_x, - pbad_c->base.y, - 25 * player_status.score_multiplier); - } + pbad_c->dying = DYING_FALLING; + play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); + World::current()->add_score(pbad_c->base.x - scroll_x, + pbad_c->base.y, + 25 * player_status.score_multiplier); } } else @@ -834,9 +781,6 @@ Player::kill(int mode) void Player::is_dying() { - /* He died :^( */ - - --lives; remove_powerups(); dying = DYING_NOT; }