X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrtris;a=blobdiff_plain;f=src%2Fgame.c;h=68f6a23e0620f07331c296e007398b00230a401f;hp=05bdc95d9976ec86d6d5f1f0cab6aa14f01cbf89;hb=325391b617a3f5a1f17e03598baa66d00715422d;hpb=257b041b5f6f64b53bafe5b4d4f8ffa67a39c0e5

diff --git a/src/game.c b/src/game.c
index 05bdc95..68f6a23 100644
--- a/src/game.c
+++ b/src/game.c
@@ -15,6 +15,7 @@ static void print_framerate(void);
 static int should_swap;
 static unsigned long framerate;
 
+
 int game_init(int argc, char **argv)
 {
 	if(init_opengl() == -1) {
@@ -58,14 +59,6 @@ void game_cleanup()
 
 static void update(float dt)
 {
-	int num_vr_sticks;
-
-	if((num_vr_sticks = goatvr_num_sticks()) > 0) {
-		float p[2];
-		goatvr_stick_pos(0, p);
-		/* TODO */
-	}
-
 	screen->update(dt);
 }
 
@@ -187,10 +180,16 @@ void game_mouse_wheel(int dir)
 
 void game_gamepad_axis(int axis, float val)
 {
+	joy_axis[axis] = val;
 }
 
 void game_gamepad_button(int bn, int pressed)
 {
+	if(pressed) {
+		joy_bnstate |= (1 << bn);
+	} else {
+		joy_bnstate &= ~(1 << bn);
+	}
 }
 
 static void calc_framerate(void)