projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1058ca0
)
disable swimming
author
Matthias Braun
<matze@braunis.de>
Fri, 25 May 2007 13:59:54 +0000
(13:59 +0000)
committer
Matthias Braun
<matze@braunis.de>
Fri, 25 May 2007 13:59:54 +0000
(13:59 +0000)
SVN-Revision: 5009
src/object/player.cpp
patch
|
blob
|
history
diff --git
a/src/object/player.cpp
b/src/object/player.cpp
index
31cac18
..
e930279
100644
(file)
--- a/
src/object/player.cpp
+++ b/
src/object/player.cpp
@@
-51,6
+51,8
@@
#include "object/sprite_particle.hpp"
#include "trigger/climbable.hpp"
#include "object/sprite_particle.hpp"
#include "trigger/climbable.hpp"
+//#define DO_SWIMMING
+
static const int TILES_FOR_BUTTJUMP = 3;
static const float SHOOTING_TIME = .150f;
/// time before idle animation starts
static const int TILES_FOR_BUTTJUMP = 3;
static const float SHOOTING_TIME = .150f;
/// time before idle animation starts
@@
-601,11
+603,13
@@
Player::handle_vertical_input()
// swimming
physic.set_acceleration_y(0);
// swimming
physic.set_acceleration_y(0);
+#ifdef SWIMMING
if (swimming) {
if (controller->hold(Controller::UP) || controller->hold(Controller::JUMP))
physic.set_acceleration_y(-2000);
physic.set_velocity_y(physic.get_velocity_y() * 0.94);
}
if (swimming) {
if (controller->hold(Controller::UP) || controller->hold(Controller::JUMP))
physic.set_acceleration_y(-2000);
physic.set_velocity_y(physic.get_velocity_y() * 0.94);
}
+#endif
}
void
}
void
@@
-1032,6
+1036,7
@@
Player::collision_tile(uint32_t tile_attributes)
if(tile_attributes & Tile::HURTS)
kill(false);
if(tile_attributes & Tile::HURTS)
kill(false);
+#ifdef SWIMMING
if( swimming ){
if( tile_attributes & Tile::WATER ){
no_water = false;
if( swimming ){
if( tile_attributes & Tile::WATER ){
no_water = false;
@@
-1045,6
+1050,7
@@
Player::collision_tile(uint32_t tile_attributes)
sound_manager->play( "sounds/splash.ogg" );
}
}
sound_manager->play( "sounds/splash.ogg" );
}
}
+#endif
}
void
}
void