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
cb36fe7
..
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"
@@
-314,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;
}
@@
-394,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);
@@
-458,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;
@@
-466,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;