X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;fp=src%2Fcore%2Fgame.rs;h=b0d996839ffe4f317f05fe2b47743dbf76d5b30c;hb=d59c7f04922541543adb533ab07a26a781341777;hp=e7eac23cded9765557848b8f8d128c95e75326ef;hpb=d01df1fc6e3bfafd385b2533e6155ddd8714fcfb;p=kaka%2Frust-sdl-test.git diff --git a/src/core/game.rs b/src/core/game.rs index e7eac23..b0d9968 100644 --- a/src/core/game.rs +++ b/src/core/game.rs @@ -173,8 +173,8 @@ impl Object for Character { fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState { let ctrl = self.ctrl.borrow(); - 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; + let x = (self.pos.x / lvl.grid.scale.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize; + let y = (self.pos.y / lvl.grid.scale.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize; self.vel += lvl.gravity; if lvl.grid.cells[x][y] { if self.vel.y > 0.0 && !(ctrl.mov.down() && ctrl.jump.is_pressed) {