X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=7fb22060530cd693b38fe23db24da29335295099;hb=63934f5f4c15f059c9b60499575870ebb7c923a0;hp=d9d476ea56fe60ed3c3df54646bb2b51c836b2b9;hpb=05bbe471f28d4ce4f9666ca7e78c7b6ef8697066;p=supertux.git diff --git a/src/player.cpp b/src/player.cpp index d9d476ea5..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,6 +25,7 @@ #include "defines.h" #include "scene.h" #include "tile.h" +#include "sprite.h" #include "screen.h" Surface* tux_life; @@ -27,12 +36,12 @@ Surface* smalltux_jump_right; Surface* smalltux_stand_left; Surface* smalltux_stand_right; -Surface* bigtux_right[3]; -Surface* bigtux_left[3]; -Surface* bigtux_right_jump; -Surface* bigtux_left_jump; -Surface* ducktux_right; -Surface* ducktux_left; +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]; @@ -50,6 +59,17 @@ 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) { pplayer_input->down = UP; @@ -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 = 170; + base.x = plevel->start_pos_x; + base.y = plevel->start_pos_y; base.xm = 0; base.ym = 0; previous_base = old_base = base; @@ -86,12 +107,6 @@ Player::init() 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); @@ -168,17 +183,27 @@ Player::action(double frame_ratio) previous_base = base; 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) { @@ -191,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; } } @@ -201,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); @@ -258,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) @@ -269,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 @@ -312,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; } @@ -392,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) @@ -408,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); } } } @@ -456,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; @@ -464,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; @@ -516,14 +545,9 @@ Player::draw() /* Draw cape: */ if (dir == RIGHT) - { - cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); - } + cape_right[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); else - { - cape_left[global_frame_counter % 2]->draw( - base.x- scroll_x, base.y); - } + cape_left[global_frame_counter % 2]->draw(base.x- scroll_x, base.y); } @@ -548,11 +572,9 @@ Player::draw() else // moving { if (dir == RIGHT) - tux_right[(global_frame_counter/2) % tux_right.size()]->draw( - 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 - tux_left[(global_frame_counter/2) % tux_left.size()]->draw( - base.x - scroll_x, base.y - 9); + tux_left[(global_frame_counter/2) % tux_left.size()]->draw(base.x - scroll_x, base.y - 9); } } } @@ -580,15 +602,9 @@ Player::draw() /* Draw cape (just not in ducked mode since that looks silly): */ if (dir == RIGHT) - { - bigcape_right[global_frame_counter % 2]->draw( - capex, capey); - } + bigcape_right[global_frame_counter % 2]->draw(capex, capey); else - { - bigcape_left[global_frame_counter % 2]->draw( - capex, capey); - } + bigcape_left[global_frame_counter % 2]->draw(capex, capey); } if (!got_coffee) @@ -597,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) - { - bigtux_right[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_right->draw(base.x - scroll_x, base.y); else - { - bigtux_left[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_left->draw(base.x - scroll_x, base.y); } else { if (dir == RIGHT) - { - bigtux_right_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_right_jump->draw(base.x - scroll_x, base.y); else - { - bigtux_left_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_left_jump->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - { - skidtux_right->draw( - base.x- scroll_x - 8, base.y); - } + skidtux_right->draw(base.x - scroll_x - 8, base.y); else - { - skidtux_left->draw( - base.x- scroll_x - 8, base.y); - } + skidtux_left->draw(base.x - scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - ducktux_right->draw( base.x- scroll_x - 8, base.y - 16); - } + ducktux_right->draw(base.x - scroll_x, base.y); else - { - ducktux_left->draw( base.x- scroll_x - 8, base.y - 16); - } + ducktux_left->draw(base.x - scroll_x, base.y); } } else @@ -660,54 +654,32 @@ Player::draw() if (!jumping || physic.get_velocity_y() > 0) { if (dir == RIGHT) - { - bigfiretux_right[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_right[frame_]->draw(base.x- scroll_x - 8, base.y); else - { - bigfiretux_left[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_left[frame_]->draw(base.x- scroll_x - 8, base.y); } else { if (dir == RIGHT) - { - bigfiretux_right_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_right_jump->draw(base.x- scroll_x - 8, base.y); else - { - bigfiretux_left_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigfiretux_left_jump->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - skidfiretux_right->draw( - base.x- scroll_x - 8, base.y); - } + skidfiretux_right->draw(base.x- scroll_x - 8, base.y); else - { - skidfiretux_left->draw( - base.x- scroll_x - 8, base.y); - } + skidfiretux_left->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); - } + duckfiretux_right->draw( base.x- scroll_x - 8, base.y - 16); else - { - duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); - } + duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16); } } } @@ -730,18 +702,18 @@ Player::collision(void* p_c_object, int c_object) /* 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 == FLAT) + else if (pbad_c->mode == BadGuy::FLAT) { // Don't get hurt if we're kicking a flat badguy! } - else if (pbad_c->mode == KICK) + else if (pbad_c->mode == BadGuy::KICK) { /* Hurt if you get hit by kicked laptop: */ if (!invincible_timer.started())