Replaced reference with smart pointer in Wall
[kaka/rust-sdl-test.git] / src / core / app.rs
index d440eb3..808277f 100644 (file)
@@ -1,8 +1,8 @@
 use boll::*;
-use common::{Point, Dimension};
 use core::controller::ControllerManager;
 use core::render::Renderer;
-use point; // defined in common, but loaded from main...
+use geometry::{Point, Dimension};
+use point;
 use rand::Rng;
 use sdl2::event::{Event, WindowEvent};
 use sdl2::keyboard::Keycode;
@@ -171,7 +171,7 @@ impl App {
                // if let Some(s) = self.states.last_mut() {
                //     s.pause();
                // }
-               state.enter(&mut self.ctrl_man);
+               state.enter(&self.ctrl_man);
                self.states.push(state);
            }
            StateChange::Pop => {
@@ -262,7 +262,7 @@ impl App {
 
     fn render(&mut self) {
        self.renderer.clear();
-        self.states.last_mut().unwrap().render(&mut self.renderer, &mut self.sprites);
+        self.states.last_mut().unwrap().render(&mut self.renderer, &self.sprites);
         self.renderer.present();
     }
 }