projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dead
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player.c
diff --git
a/player.c
b/player.c
index 85cf9166f25ff00b2690e56add842c5917291827..5c9f8cfe21d441e0766fae3ad9f1e22bd4eeb591 100644
(file)
--- a/
player.c
+++ b/
player.c
@@
-42,6
+42,9
@@
void player__create( player_instance *inst )
inst->input_use = vg_create_named_input( "use", k_input_type_button );
inst->input_reset= vg_create_named_input( "reset", k_input_type_button );
inst->input_camera=vg_create_named_input( "camera", k_input_type_button );
inst->input_use = vg_create_named_input( "use", k_input_type_button );
inst->input_reset= vg_create_named_input( "reset", k_input_type_button );
inst->input_camera=vg_create_named_input( "camera", k_input_type_button );
+ inst->input_trick0=vg_create_named_input( "trick0", k_input_type_button );
+ inst->input_trick1=vg_create_named_input( "trick1", k_input_type_button );
+ inst->input_trick2=vg_create_named_input( "trick2", k_input_type_button );
const char *default_cfg[] =
{
const char *default_cfg[] =
{
@@
-61,6
+64,12
@@
void player__create( player_instance *inst )
"bind jump space",
"bind jump gp-a",
"bind jump space",
"bind jump gp-a",
+ "bind trick0 mouse1",
+ "bind trick0 gp-a",
+ "bind trick1 mouse2",
+ "bind trick1 gp-b",
+ "bind trick2 gp-x", /* keyboard: m0 + m1 */
+
"bind push gp-b",
"bind push w",
"bind push gp-b",
"bind push w",
@@
-292,6
+301,8
@@
PLAYER_API void player__spawn( player_instance *player,
q_identity( player->rb.q );
rb_update_transform( &player->rb );
q_identity( player->rb.q );
rb_update_transform( &player->rb );
+ player->subsystem = k_player_subsystem_walk;
+
if( _player_reset[ player->subsystem ] )
_player_reset[ player->subsystem ]( player, rp );
}
if( _player_reset[ player->subsystem ] )
_player_reset[ player->subsystem ]( player, rp );
}