X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=e7eac23cded9765557848b8f8d128c95e75326ef;hb=afc2bb16b6f16b6e18cd756556a37a756dc5bae1;hp=554bde720ac02ec2452db5328a8def228c45e2c6;hpb=1f42d724d84ed1c014ff40ccc91058472391be0c;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/game.rs b/src/core/game.rs
index 554bde7..e7eac23 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,10 +1,10 @@
-use ActiveState;
+use teststate::TestState;
 use AppState;
 use common::{Point, Radians};
 use core::app::StateChange;
 use core::controller::Controller;
 use core::controller::ControllerManager;
-use core::level::{Level, LevelGenerator};
+use core::level::{Level, LevelGenerator, Wall, IntersectResult::Intersection};
 use core::render::Renderer;
 use point;
 use sdl2::event::Event;
@@ -58,7 +58,7 @@ impl AppState for GameState {
 		return Some(StateChange::Pop)
             }
 	    Event::KeyDown { keycode: Some(Keycode::Return), .. } => {
-		return Some(StateChange::Push(Box::new(ActiveState::new((800, 600)))))
+		return Some(StateChange::Push(Box::new(TestState::new())))
             }
 	    Event::KeyDown { keycode: Some(Keycode::Space), .. } => {
 		self.lvlgen.seed = std::time::UNIX_EPOCH.elapsed().unwrap().as_secs() as u32;
@@ -271,12 +271,11 @@ impl Object for Boll {
 	self.vel += lvl.gravity;
 	self.pos += self.vel;
 
-	let x = (self.pos.x / lvl.grid.cell_size.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize;
-	let y = (self.pos.y / lvl.grid.cell_size.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize;
-	if lvl.grid.cells[x][y] {
+	if let Intersection(wall, pos) = lvl.intersect_walls(self.pos - self.vel, self.pos) {
 	    if self.bounces == 0 {
 		return Dead
 	    }
+	    self.pos = pos;
 	    self.vel *= -0.25;
 	    self.pos += self.vel;
 	    self.bounces -= 1;