projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- added standard copyright header to every file
[supertux.git]
/
src
/
player.cpp
diff --git
a/src/player.cpp
b/src/player.cpp
index
d9d476e
..
b3e1831
100644
(file)
--- 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 <tobi.web@gmx.de>
//
//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de> & 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 <math.h>
#include "gameloop.h"
#include <math.h>
#include "gameloop.h"
@@
-17,6
+25,7
@@
#include "defines.h"
#include "scene.h"
#include "tile.h"
#include "defines.h"
#include "scene.h"
#include "tile.h"
+#include "sprite.h"
#include "screen.h"
Surface* tux_life;
#include "screen.h"
Surface* tux_life;
@@
-27,12
+36,12
@@
Surface* smalltux_jump_right;
Surface* smalltux_stand_left;
Surface* smalltux_stand_right;
Surface* smalltux_stand_left;
Surface* smalltux_stand_right;
-S
urface* bigtux_right[3]
;
-S
urface* bigtux_left[3]
;
-S
urfac
e* bigtux_right_jump;
-S
urfac
e* bigtux_left_jump;
-S
urfac
e* ducktux_right;
-S
urfac
e* ducktux_left;
+S
prite* bigtux_right
;
+S
prite* bigtux_left
;
+S
prit
e* bigtux_right_jump;
+S
prit
e* bigtux_left_jump;
+S
prit
e* ducktux_right;
+S
prit
e* ducktux_left;
Surface* skidtux_right;
Surface* skidtux_left;
Surface* firetux_right[3];
Surface* skidtux_right;
Surface* skidtux_left;
Surface* firetux_right[3];
@@
-63,15
+72,16
@@
void player_input_init(player_input_type* pplayer_input)
void
Player::init()
{
void
Player::init()
{
+ Level* plevel = World::current()->get_level();
+
base.width = 32;
base.height = 32;
size = SMALL;
got_coffee = false;
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;
base.xm = 0;
base.ym = 0;
previous_base = old_base = base;
@@
-312,10
+322,10
@@
Player::handle_horizontal_input()
float ay = physic.get_acceleration_y();
float dirsign = 0;
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;
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;
}
dir = RIGHT;
dirsign = 1;
}
@@
-392,7
+402,7
@@
Player::handle_vertical_input()
{
if(input.up == DOWN)
{
{
if(input.up == DOWN)
{
- if (on_ground()
&& !duck
)
+ if (on_ground())
{
// jump
physic.set_velocity(physic.get_velocity_x(), 5.5);
{
// jump
physic.set_velocity(physic.get_velocity_x(), 5.5);
@@
-456,7
+466,7
@@
Player::handle_input()
}
/* Duck! */
}
/* 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;
{
duck = true;
base.height = 32;
@@
-464,7
+474,7
@@
Player::handle_input()
// changing base size confuses collision otherwise
old_base = previous_base = base;
}
// 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;
{
duck = false;
base.y -= 32;
@@
-516,14
+526,9
@@
Player::draw()
/* Draw cape: */
if (dir == RIGHT)
/* 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
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
+553,9
@@
Player::draw()
else // moving
{
if (dir == RIGHT)
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
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
+583,9
@@
Player::draw()
/* Draw cape (just not in ducked mode since that looks silly): */
if (dir == RIGHT)
/* 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
else
- {
- bigcape_left[global_frame_counter % 2]->draw(
- capex, capey);
- }
+ bigcape_left[global_frame_counter % 2]->draw(capex, capey);
}
if (!got_coffee)
}
if (!got_coffee)
@@
-597,57
+594,35
@@
Player::draw()
{
if (!skidding_timer.started())
{
{
if (!skidding_timer.started())
{
- if (
!jumping || physic.get_velocity_y() >
0)
+ if (
physic.get_velocity_y() ==
0)
{
if (dir == RIGHT)
{
if (dir == RIGHT)
- {
- bigtux_right[frame_]->draw(
- base.x- scroll_x - 8, base.y);
- }
+ bigtux_right->draw(base.x - scroll_x, base.y);
else
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)
}
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
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)
}
}
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
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)
}
}
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
else
- {
- ducktux_left->draw( base.x- scroll_x - 8, base.y - 16);
- }
+ ducktux_left->draw(base.x - scroll_x, base.y);
}
}
else
}
}
else
@@
-660,54
+635,32
@@
Player::draw()
if (!jumping || physic.get_velocity_y() > 0)
{
if (dir == RIGHT)
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
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)
}
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
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)
}
}
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
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)
}
}
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
else
- {
- duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16);
- }
+ duckfiretux_left->draw( base.x- scroll_x - 8, base.y - 16);
}
}
}
}
}
}