numerous input and physics

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index c8c9abc54b8932ecd480838014a44001ca9c4dfb..61a1391261e758f913c77fe5b46bb8b0f45ebaab 100644 (file)
--- a/player.h
+++ b/player.h
@@ -66,6 +66,8 @@ VG_STATIC struct gplayer
             reverse;
 
       float grab, jump, pushing, push_time;
+      v2f grab_mouse_delta;
+
       double start_push;
       int in_air, on_board, jump_charge, jump_dir;
 
@@ -93,8 +95,6 @@ VG_STATIC struct gplayer
                         *input_js1v,
                         *input_js2h,
                         *input_js2v,
-                        *input_emjs2h,
-                        *input_emjs2v,
                         *input_jump,
                         *input_push,
                         *input_walkh,
@@ -225,8 +225,6 @@ VG_STATIC void player_init(void)                                            /* 1
    player.input_grab = vg_create_named_input( "grab", k_input_type_axis_norm );
    player.input_js2h = vg_create_named_input( "grab-h", k_input_type_axis );
    player.input_js2v = vg_create_named_input( "grab-v", k_input_type_axis );
-   player.input_emjs2h = vg_create_named_input( "kbgrab-h", k_input_type_axis );
-   player.input_emjs2v = vg_create_named_input( "kbgrab-v", k_input_type_axis );
    player.input_jump = vg_create_named_input( "jump", k_input_type_button );
    player.input_push = vg_create_named_input( "push", k_input_type_axis_norm );
 
@@ -250,23 +248,19 @@ VG_STATIC void player_init(void)                                            /* 1
       "bind -steer-v w",
       "bind +steer-v s",
 
-      "bind grab gp-rt",
-      "bind grab-h gp-rs-h",
-      "bind grab-v gp-rs-v",
-
-      "bind -kbgrab-h left",
-      "bind +kbgrab-h right",
-      "bind -kbgrab-v down",
-      "bind +kbgrab-v up",
+      "bind  grab gp-rt",
+      "bind +grab shift",
+      "bind  grab-h gp-rs-h",
+      "bind  grab-v gp-rs-v",
 
       "bind jump space",
       "bind jump gp-a",
 
       "bind  push gp-lt",
-      "bind +push shift",
+      "bind +push w",
       
-      "bind  walk-h gp-ls-h",
-      "bind  walk-v gp-ls-v",
+      "bind  walk-h  gp-ls-h",
+      "bind  walk-v -gp-ls-v",
       "bind +walk-h d",
       "bind -walk-h a",
       "bind +walk-v w",