X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fapp.rs;h=f5452fdaab2f5b34c2ab6f603ccf50c01cb12171;hb=953b4c960649b82f4e186c2a9afee5367270f0fc;hp=d440eb3759c59db429c229dabe216e36944830b0;hpb=40c949e573ea85720e1fa9972a1e16f5f1216799;p=kaka%2Frust-sdl-test.git diff --git a/src/core/app.rs b/src/core/app.rs index d440eb3..f5452fd 100644 --- a/src/core/app.rs +++ b/src/core/app.rs @@ -1,7 +1,7 @@ use boll::*; -use common::{Point, Dimension}; use core::controller::ControllerManager; use core::render::Renderer; +use geometry::{Point, Dimension}; use point; // defined in common, but loaded from main... use rand::Rng; use sdl2::event::{Event, WindowEvent}; @@ -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(); } }