X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=eabbdf975ab36fc4edfb9682e4b7585f36fd490b;hb=37f3e1edd969b4ede9dd033895ff806477f6e866;hp=e8893de5b6a41ae0fdd91f1679a5cc1a4b8bd6db;hpb=7991463123d291446f06630ae0fe0bbe2427ad23;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/game.rs b/src/core/game.rs
index e8893de..eabbdf9 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,6 +1,6 @@
 use ActiveState;
 use AppState;
-use common::{Point2D, Radians};
+use common::{Point, Radians};
 use core::app::StateChange;
 use core::controller::Controller;
 use core::controller::ControllerManager;
@@ -145,8 +145,8 @@ pub trait Drawable {}
 
 pub struct Character {
     ctrl: Rc<RefCell<Controller>>,
-    pos: Point2D<f64>,
-    vel: Point2D<f64>,
+    pos: Point<f64>,
+    vel: Point<f64>,
 }
 
 impl Character {
@@ -165,11 +165,12 @@ impl Object for Character {
 
 	let x = (self.pos.x / lvl.grid.cell_size as f64).min(lvl.grid.width as f64 - 1.0).max(0.0) as usize;
 	let y = (self.pos.y / lvl.grid.cell_size as f64).min(lvl.grid.height as f64 - 1.0).max(0.0) as usize;
+	self.vel += lvl.gravity;
 	if lvl.grid.cells[x][y] {
-	    self.vel += lvl.gravity;
 	    if self.vel.y > 0.0 && !(ctrl.mov.down() && ctrl.jump.is_pressed) {
 		self.vel.y = 0.0;
 		self.vel.x *= 0.9;
+		self.pos.y -= 1.0;
 	    }
 
 	    if !ctrl.mov.down() {
@@ -177,8 +178,6 @@ impl Object for Character {
 		    self.vel.y = -5.0;
 		}
 	    }
-	} else {
-	    self.vel += lvl.gravity;
 	}
 	self.pos += self.vel;
 
@@ -238,7 +237,7 @@ impl Object for Character {
 	renderer.draw_line(pos, p, (0, 255, 0));
 	draw_cross(renderer, p);
 	// // circle values
-	// let p = (self.pos + Point2D::from(ctrl.aim.a) * l).to_i32().into();
+	// let p = (self.pos + Point::from(ctrl.aim.a) * l).to_i32().into();
 	// renderer.draw_line(pos, p, (0, 0, 255));
 	// draw_cross(renderer, p);
     }
@@ -252,8 +251,8 @@ fn draw_cross(renderer: &mut Renderer, p: (i32, i32)) {
 ////////// BOLL ////////////////////////////////////////////////////////////////
 
 pub struct Boll {
-    pos: Point2D<f64>,
-    vel: Point2D<f64>,
+    pos: Point<f64>,
+    vel: Point<f64>,
     bounces: u8,
 }
 
@@ -275,7 +274,7 @@ impl Object for Boll {
 	    let mut rng = rand::thread_rng();
 	    let a = Radians(self.vel.to_radians().0 + Normal::new(0.0, 0.75).sample(&mut rng));
 	    objects.push(Box::new(Boll {
-	    	vel: Point2D::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(),
+	    	vel: Point::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(),
 	    	..*self
 	    }));
 	}