summaryrefslogtreecommitdiffstats
path: root/src/player.rs
diff options
context:
space:
mode:
authorRaymond Hogenson <rhogenson@posteo.net>2018-08-22 16:28:58 -0400
committerRaymond Hogenson <rhogenson@posteo.net>2018-08-22 16:28:58 -0400
commit8656df15f29ebe0900db830eb6e5d8d1f11c2e03 (patch)
treed0b1d3d437dff05ced40d90c5beae7b1e7d1bc49 /src/player.rs
parentdde3c0e08efada0878157440dd1286de44a8c015 (diff)
downloadstallman-shooter-8656df15f29ebe0900db830eb6e5d8d1f11c2e03.tar.zst
Add introduction and conclusion screens
We're releasing version 1.0.0 baby
Diffstat (limited to 'src/player.rs')
-rw-r--r--src/player.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/player.rs b/src/player.rs
index fa2abfa..471b2e4 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -22,13 +22,12 @@ impl Player {
Player { x: 400, y: 500, x_d: 0, y_d: 0, down_p: false, left_p: false, right_p: false, up_p: false, fire_rate: 15, shift_p: false }
}
- pub fn act(&mut self, events: &mut sdl2::event::EventPollIterator){
+ pub fn act(&mut self, events: &mut sdl2::event::EventPollIterator) -> Result<(), ()> {
for event in events {
match event {
- sdl2::event::Event::Quit {..} |
- sdl2::event::Event::KeyDown { keycode: Some(sdl2::keyboard::Keycode::Escape), .. } => {
- std::process::exit(0);
- },
+ sdl2::event::Event::Quit {..} => {
+ return Err(());
+ }
sdl2::event::Event::KeyDown { keycode: Some(sdl2::keyboard::Keycode::Down), .. } => {
self.down_p = true;
self.y_d = -1;
@@ -102,6 +101,7 @@ impl Player {
self.x += if self.shift_p { self.x_d } else { self.x_d * 3 };
self.y += if self.shift_p { self.y_d } else { self.y_d * 3 };
+ return Ok(())
}
}