X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fapp.rs;h=97679df9e25bce3cc1a5a0dfc9973bb93a2bb93d;hb=5d7eff9e9c0f585e9c4d57907f2e72003d39c757;hp=f5452fdaab2f5b34c2ab6f603ccf50c01cb12171;hpb=953b4c960649b82f4e186c2a9afee5367270f0fc;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/app.rs b/src/core/app.rs
index f5452fd..97679df 100644
--- a/src/core/app.rs
+++ b/src/core/app.rs
@@ -2,7 +2,7 @@ use boll::*;
 use core::controller::ControllerManager;
 use core::render::Renderer;
 use geometry::{Point, Dimension};
-use point; // defined in common, but loaded from main...
+use point;
 use rand::Rng;
 use sdl2::event::{Event, WindowEvent};
 use sdl2::keyboard::Keycode;
@@ -73,7 +73,7 @@ impl AppBuilder {
             event_pump,
             sprites,
             states: vec!(self.state.unwrap_or_else(|| Box::new(ActiveState::new(screen)))),
-	    ctrl_man: ControllerManager::new(context.joystick()?, context.haptic()?),
+	    ctrl_man: ControllerManager::new(context.game_controller()?, context.haptic()?),
         })
     }