Skip to content

Commit adcdbbd

Browse files
RemimstrRemimstr
committed
Update old player movement match patterns to concise syntax
1 parent 779bd56 commit adcdbbd

5 files changed

Lines changed: 60 additions & 40 deletions

File tree

‎book/src/chapter_4.md‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,18 +273,22 @@ pub fn player_input(gs: &mut State, ctx: &mut Rltk) {
273273
match ctx.key {
274274
None => {} // Nothing happened
275275
Some(key) => match key {
276-
VirtualKeyCode::Left => try_move_player(-1, 0, &mut gs.ecs),
277-
VirtualKeyCode::Numpad4 => try_move_player(-1, 0, &mut gs.ecs),
276+
VirtualKeyCode::Left |
277+
VirtualKeyCode::Numpad4 |
278278
VirtualKeyCode::H => try_move_player(-1, 0, &mut gs.ecs),
279-
VirtualKeyCode::Right => try_move_player(1, 0, &mut gs.ecs),
280-
VirtualKeyCode::Numpad6 => try_move_player(1, 0, &mut gs.ecs),
279+
280+
VirtualKeyCode::Right |
281+
VirtualKeyCode::Numpad6 |
281282
VirtualKeyCode::L => try_move_player(1, 0, &mut gs.ecs),
282-
VirtualKeyCode::Up => try_move_player(0, -1, &mut gs.ecs),
283-
VirtualKeyCode::Numpad8 => try_move_player(0, -1, &mut gs.ecs),
283+
284+
VirtualKeyCode::Up |
285+
VirtualKeyCode::Numpad8 |
284286
VirtualKeyCode::K => try_move_player(0, -1, &mut gs.ecs),
285-
VirtualKeyCode::Down => try_move_player(0, 1, &mut gs.ecs),
286-
VirtualKeyCode::Numpad2 => try_move_player(0, 1, &mut gs.ecs),
287+
288+
VirtualKeyCode::Down |
289+
VirtualKeyCode::Numpad2 |
287290
VirtualKeyCode::J => try_move_player(0, 1, &mut gs.ecs),
291+
288292
_ => {}
289293
},
290294
}

‎book/src/chapter_6.md‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,18 +200,22 @@ pub fn player_input(gs: &mut State, ctx: &mut Rltk) -> RunState {
200200
match ctx.key {
201201
None => { return RunState::Paused } // Nothing happened
202202
Some(key) => match key {
203-
VirtualKeyCode::Left => try_move_player(-1, 0, &mut gs.ecs),
204-
VirtualKeyCode::Numpad4 => try_move_player(-1, 0, &mut gs.ecs),
203+
VirtualKeyCode::Left |
204+
VirtualKeyCode::Numpad4 |
205205
VirtualKeyCode::H => try_move_player(-1, 0, &mut gs.ecs),
206-
VirtualKeyCode::Right => try_move_player(1, 0, &mut gs.ecs),
207-
VirtualKeyCode::Numpad6 => try_move_player(1, 0, &mut gs.ecs),
206+
207+
VirtualKeyCode::Right |
208+
VirtualKeyCode::Numpad6 |
208209
VirtualKeyCode::L => try_move_player(1, 0, &mut gs.ecs),
209-
VirtualKeyCode::Up => try_move_player(0, -1, &mut gs.ecs),
210-
VirtualKeyCode::Numpad8 => try_move_player(0, -1, &mut gs.ecs),
210+
211+
VirtualKeyCode::Up |
212+
VirtualKeyCode::Numpad8 |
211213
VirtualKeyCode::K => try_move_player(0, -1, &mut gs.ecs),
212-
VirtualKeyCode::Down => try_move_player(0, 1, &mut gs.ecs),
213-
VirtualKeyCode::Numpad2 => try_move_player(0, 1, &mut gs.ecs),
214+
215+
VirtualKeyCode::Down |
216+
VirtualKeyCode::Numpad2 |
214217
VirtualKeyCode::J => try_move_player(0, 1, &mut gs.ecs),
218+
215219
_ => { return RunState::Paused }
216220
},
217221
}

‎chapter-04-newmap/src/player.rs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,22 @@ pub fn player_input(gs: &mut State, ctx: &mut Rltk) {
2222
match ctx.key {
2323
None => {} // Nothing happened
2424
Some(key) => match key {
25-
VirtualKeyCode::Left => try_move_player(-1, 0, &mut gs.ecs),
26-
VirtualKeyCode::Numpad4 => try_move_player(-1, 0, &mut gs.ecs),
25+
VirtualKeyCode::Left |
26+
VirtualKeyCode::Numpad4 |
2727
VirtualKeyCode::H => try_move_player(-1, 0, &mut gs.ecs),
28-
VirtualKeyCode::Right => try_move_player(1, 0, &mut gs.ecs),
29-
VirtualKeyCode::Numpad6 => try_move_player(1, 0, &mut gs.ecs),
28+
29+
VirtualKeyCode::Right |
30+
VirtualKeyCode::Numpad6 |
3031
VirtualKeyCode::L => try_move_player(1, 0, &mut gs.ecs),
31-
VirtualKeyCode::Up => try_move_player(0, -1, &mut gs.ecs),
32-
VirtualKeyCode::Numpad8 => try_move_player(0, -1, &mut gs.ecs),
32+
33+
VirtualKeyCode::Up |
34+
VirtualKeyCode::Numpad8 |
3335
VirtualKeyCode::K => try_move_player(0, -1, &mut gs.ecs),
34-
VirtualKeyCode::Down => try_move_player(0, 1, &mut gs.ecs),
35-
VirtualKeyCode::Numpad2 => try_move_player(0, 1, &mut gs.ecs),
36+
37+
VirtualKeyCode::Down |
38+
VirtualKeyCode::Numpad2 |
3639
VirtualKeyCode::J => try_move_player(0, 1, &mut gs.ecs),
40+
3741
_ => {}
3842
},
3943
}

‎chapter-05-fov/src/player.rs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,22 @@ pub fn player_input(gs: &mut State, ctx: &mut Rltk) {
2525
match ctx.key {
2626
None => {} // Nothing happened
2727
Some(key) => match key {
28-
VirtualKeyCode::Left => try_move_player(-1, 0, &mut gs.ecs),
29-
VirtualKeyCode::Numpad4 => try_move_player(-1, 0, &mut gs.ecs),
28+
VirtualKeyCode::Left |
29+
VirtualKeyCode::Numpad4 |
3030
VirtualKeyCode::H => try_move_player(-1, 0, &mut gs.ecs),
31-
VirtualKeyCode::Right => try_move_player(1, 0, &mut gs.ecs),
32-
VirtualKeyCode::Numpad6 => try_move_player(1, 0, &mut gs.ecs),
31+
32+
VirtualKeyCode::Right |
33+
VirtualKeyCode::Numpad6 |
3334
VirtualKeyCode::L => try_move_player(1, 0, &mut gs.ecs),
34-
VirtualKeyCode::Up => try_move_player(0, -1, &mut gs.ecs),
35-
VirtualKeyCode::Numpad8 => try_move_player(0, -1, &mut gs.ecs),
35+
36+
VirtualKeyCode::Up |
37+
VirtualKeyCode::Numpad8 |
3638
VirtualKeyCode::K => try_move_player(0, -1, &mut gs.ecs),
37-
VirtualKeyCode::Down => try_move_player(0, 1, &mut gs.ecs),
38-
VirtualKeyCode::Numpad2 => try_move_player(0, 1, &mut gs.ecs),
39+
40+
VirtualKeyCode::Down |
41+
VirtualKeyCode::Numpad2 |
3942
VirtualKeyCode::J => try_move_player(0, 1, &mut gs.ecs),
43+
4044
_ => {}
4145
},
4246
}

‎chapter-06-monsters/src/player.rs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,22 @@ pub fn player_input(gs: &mut State, ctx: &mut Rltk) -> RunState {
2828
match ctx.key {
2929
None => { return RunState::Paused } // Nothing happened
3030
Some(key) => match key {
31-
VirtualKeyCode::Left => try_move_player(-1, 0, &mut gs.ecs),
32-
VirtualKeyCode::Numpad4 => try_move_player(-1, 0, &mut gs.ecs),
31+
VirtualKeyCode::Left |
32+
VirtualKeyCode::Numpad4 |
3333
VirtualKeyCode::H => try_move_player(-1, 0, &mut gs.ecs),
34-
VirtualKeyCode::Right => try_move_player(1, 0, &mut gs.ecs),
35-
VirtualKeyCode::Numpad6 => try_move_player(1, 0, &mut gs.ecs),
34+
35+
VirtualKeyCode::Right |
36+
VirtualKeyCode::Numpad6 |
3637
VirtualKeyCode::L => try_move_player(1, 0, &mut gs.ecs),
37-
VirtualKeyCode::Up => try_move_player(0, -1, &mut gs.ecs),
38-
VirtualKeyCode::Numpad8 => try_move_player(0, -1, &mut gs.ecs),
38+
39+
VirtualKeyCode::Up |
40+
VirtualKeyCode::Numpad8 |
3941
VirtualKeyCode::K => try_move_player(0, -1, &mut gs.ecs),
40-
VirtualKeyCode::Down => try_move_player(0, 1, &mut gs.ecs),
41-
VirtualKeyCode::Numpad2 => try_move_player(0, 1, &mut gs.ecs),
42+
43+
VirtualKeyCode::Down |
44+
VirtualKeyCode::Numpad2 |
4245
VirtualKeyCode::J => try_move_player(0, 1, &mut gs.ecs),
46+
4347
_ => { return RunState::Paused }
4448
},
4549
}

0 commit comments

Comments
 (0)