Dolda2000 GitWeb
/
kaka
/
rust-sdl-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed warning - irrefutable let pattern
[kaka/rust-sdl-test.git]
/
src
/
core
/
game.rs
diff --git
a/src/core/game.rs
b/src/core/game.rs
index
e7eac23
..
b0d9968
100644
(file)
--- 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();
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_siz
e.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_siz
e.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize;
+ let x = (self.pos.x / lvl.grid.
scal
e.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize;
+ let y = (self.pos.y / lvl.grid.
scal
e.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) {
self.vel += lvl.gravity;
if lvl.grid.cells[x][y] {
if self.vel.y > 0.0 && !(ctrl.mov.down() && ctrl.jump.is_pressed) {