projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update helpers/location to 'frosted' ui
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_walk.c
diff --git
a/player_walk.c
b/player_walk.c
index 62aff8ddfe2af0635e61b254422a26d64308036f..b421e42c3ab98305b692d6e42b2d01609419e4ff 100644
(file)
--- a/
player_walk.c
+++ b/
player_walk.c
@@
-915,7
+915,8
@@
void player__walk_animate(void){
}
static void player_walk_pose_sit( struct player_walk_animator *animator,
}
static void player_walk_pose_sit( struct player_walk_animator *animator,
- player_pose *pose ){
+ player_pose *pose )
+{
mdl_keyframe bpose[32];
struct player_walk *w = &player_walk;
mdl_keyframe bpose[32];
struct player_walk *w = &player_walk;
@@
-1037,7
+1038,9
@@
void player__walk_pose( void *_animator, player_pose *pose ){
/* sit */
if( (animator->activity == k_walk_activity_sit) ||
/* sit */
if( (animator->activity == k_walk_activity_sit) ||
- (animator->activity == k_walk_activity_sit_up) ){
+ (animator->activity == k_walk_activity_sit_up) )
+ {
+ skeleton_copy_pose( sk, apose, pose->keyframes );
player_walk_pose_sit( animator, pose );
}
else if( animator->activity == k_walk_activity_odrop_in ){
player_walk_pose_sit( animator, pose );
}
else if( animator->activity == k_walk_activity_odrop_in ){