X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_config.h;h=8b1ea59eb7d2748fcd0ae3b4d5d4bbae00fe80be;hb=47941822dae18a018c985847b052e70214a3ccc6;hp=e1784ec1900b06100609e2093ddfca995b5d6b09;hpb=8bc80dc83f08a7016f1057f82d00727a2e417fa3;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/vg_config.h b/vg_config.h
index e1784ec..8b1ea59 100644
--- a/vg_config.h
+++ b/vg_config.h
@@ -5,7 +5,7 @@
 #define VG_CONFIG
 #include "vg/vg.h"
 
-static struct button_binding vg_button_binds[] = 
+VG_STATIC struct button_binding vg_button_binds[] = 
 {
 	{ .name = "primary", .bind = GLFW_MOUSE_BUTTON_LEFT },
 	{ .name = "secondary", .bind = GLFW_MOUSE_BUTTON_RIGHT },
@@ -17,28 +17,29 @@ static struct button_binding vg_button_binds[] =
    { .name = "down", .bind = GLFW_KEY_F },
    { .name = "yawl", .bind = GLFW_KEY_Q },
    { .name = "yawr", .bind = GLFW_KEY_E },
-   { .name = "push", .bind = GLFW_KEY_T }
+   { .name = "push", .bind = GLFW_KEY_T },
+   { .name = "menu", .bind = GLFW_KEY_ESCAPE }
 };
 
-static struct button_binding vg_controller_binds[] = 
+VG_STATIC struct button_binding vg_controller_binds[] = 
 {
-   { "push", GLFW_GAMEPAD_BUTTON_A },
-   { "break", GLFW_GAMEPAD_BUTTON_B },
-   { "switchmode", GLFW_GAMEPAD_BUTTON_Y },
-   { "jump", GLFW_GAMEPAD_BUTTON_X },
-   { "reset", GLFW_GAMEPAD_BUTTON_LEFT_BUMPER }
+   { "jump",         GLFW_GAMEPAD_BUTTON_A },
+   { "break",        GLFW_GAMEPAD_BUTTON_B },
+   { "switchmode",   GLFW_GAMEPAD_BUTTON_Y },
+   { "reset",        GLFW_GAMEPAD_BUTTON_LEFT_BUMPER },
+   { "menu",         GLFW_GAMEPAD_BUTTON_BACK }
 };
 
-static struct axis_binding vg_axis_binds[] = 
+VG_STATIC struct axis_binding vg_axis_binds[] = 
 {
-	{ .name = "horizontal",	.axis = GLFW_GAMEPAD_AXIS_LEFT_X },
-	{ .name = "vertical", 	.axis = GLFW_GAMEPAD_AXIS_LEFT_Y },
-   { .name = "grabr",      .axis = GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER },
-   { .name = "grabl",      .axis = GLFW_GAMEPAD_AXIS_LEFT_TRIGGER },
-   { .name = "h1",         .axis = GLFW_GAMEPAD_AXIS_RIGHT_X },
-   { .name = "v1",         .axis = GLFW_GAMEPAD_AXIS_RIGHT_Y }
+	{ .name = "lookh",	   .axis = GLFW_GAMEPAD_AXIS_LEFT_X },
+	{ .name = "lookv", 	   .axis = GLFW_GAMEPAD_AXIS_LEFT_Y },
+   { .name = "grabh",      .axis = GLFW_GAMEPAD_AXIS_RIGHT_X },
+   { .name = "grabv",      .axis = GLFW_GAMEPAD_AXIS_RIGHT_Y },
+   { .name = "walk/push",  .axis = GLFW_GAMEPAD_AXIS_LEFT_TRIGGER },
+   { .name = "grab",       .axis = GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER },
 };
 
-static struct vg_achievement vg_achievements[] =
+VG_STATIC struct vg_achievement vg_achievements[] =
 {
 };