sander/rust-2048
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded to latest rust

Browse source
This commit is contained in:
Coeuvre 2014-06-19 13:38:37 +08:00
parent b13c50adb2
commit 030873ee50
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/board.rs
View file

@ -102,11 +102,13 @@ impl<'a> Board<'a> {
}
pub fn merge_from_bottom_to_top(&mut self) {
self.merge_col(0, self.settings.tile_height, 1);
let height = self.settings.tile_height;
self.merge_col(0, height, 1);
}
pub fn merge_from_top_to_bottom(&mut self) {
self.merge_col(self.settings.tile_height - 1, -1, -1);
let height = self.settings.tile_height;
self.merge_col(height - 1, -1, -1);
}
fn merge_col(&mut self, y_start: int, y_end: int, y_step: int) {
@ -185,11 +187,13 @@ impl<'a> Board<'a> {
}
pub fn merge_from_left_to_right(&mut self) {
self.merge_row(self.settings.tile_width - 1, -1, -1);
let width = self.settings.tile_width;
self.merge_row(width - 1, -1, -1);
}
pub fn merge_from_right_to_left(&mut self) {
self.merge_row(0, self.settings.tile_width, 1);
let width = self.settings.tile_width;
self.merge_row(0, width, 1);
}
fn merge_row(&mut self, x_start: int, x_end: int, x_step: int) {