X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fapp.rs;h=ddfe3d9a250a1a4b7bc27dfea2e7c4524a5fad0d;hb=bf7b5671bb386ccd3d325ae3dea33046342d129c;hp=62d75078e1d2d89c933b656ca2ccbbbc7e79f575;hpb=3583c453df58103da76156b8971d36cb4cab35b3;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/app.rs b/src/core/app.rs
index 62d7507..ddfe3d9 100644
--- a/src/core/app.rs
+++ b/src/core/app.rs
@@ -72,15 +72,13 @@ impl AppBuilder {
         let event_pump = context.event_pump()?;
         let sprites = SpriteManager::new(canvas.texture_creator());
 	let screen = canvas.output_size().unwrap();
-	let ctrl = context.game_controller()?;
-	ctrl.set_event_state(true);
 
         Ok(App {
             canvas,
             event_pump,
             sprites,
             state: self.state.unwrap_or_else(|| Box::new(ActiveState::new(screen))),
-	    ctrl_man: ControllerManager::new(ctrl, context.haptic()?),
+	    ctrl_man: ControllerManager::new(context.joystick()?, context.haptic()?),
         })
     }
 
@@ -160,6 +158,7 @@ impl App {
             let duration =
                 last_time.to(PreciseTime::now()).num_nanoseconds().unwrap() as Nanoseconds;
             last_time = PreciseTime::now();
+	    self.ctrl_man.update(duration);
             self.state.update(duration);
 
 	    self.render();