projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved buttons. You can create new level-subsets via the leveleditor now. Better...
[supertux.git]
/
src
/
player.c
diff --git
a/src/player.c
b/src/player.c
index
44d5830
..
8b567cb
100644
(file)
--- a/
src/player.c
+++ b/
src/player.c
@@
-124,6
+124,9
@@
void player_level_begin(player_type* pplayer)
timer_init(&pplayer->invincible_timer,YES);
timer_init(&pplayer->skidding_timer,YES);
timer_init(&pplayer->safe_timer,YES);
timer_init(&pplayer->invincible_timer,YES);
timer_init(&pplayer->skidding_timer,YES);
timer_init(&pplayer->safe_timer,YES);
+ timer_init(&pplayer->frame_timer,YES);
+ physic_init(&pplayer->hphysic);
+ physic_init(&pplayer->vphysic);
}
void player_action(player_type* pplayer)
}
void player_action(player_type* pplayer)
@@
-882,9
+885,17
@@
void player_input(player_type *pplayer)
else
{
if(pplayer->base.xm > 0)
else
{
if(pplayer->base.xm > 0)
- pplayer->base.xm = (int)(pplayer->base.xm - frame_ratio);
+ {
+ pplayer->base.xm = (int)(pplayer->base.xm - frame_ratio);
+ if(pplayer->base.xm < 0)
+ pplayer->base.xm = 0;
+ }
else if(pplayer->base.xm < 0)
else if(pplayer->base.xm < 0)
- pplayer->base.xm = (int)(pplayer->base.xm + frame_ratio);
+ {
+ pplayer->base.xm = (int)(pplayer->base.xm + frame_ratio);
+ if(pplayer->base.xm > 0)
+ pplayer->base.xm = 0;
+ }
}
/* Jump/jumping? */
}
/* Jump/jumping? */