summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin Worthe <justin@worthe-it.co.za>2018-07-21 23:47:55 +0200
committerJustin Worthe <justin@worthe-it.co.za>2018-07-21 23:47:55 +0200
commita1fe6b65f6f4178b4a0b724ee6524da650fd2ef1 (patch)
treee6ba5fa48e5e5e4e9081d3256b77e872626a7eae /src
parent889907e32692cd26567db76585710be9071dfe5f (diff)
Rearranged to make data flow clearer
Diffstat (limited to 'src')
-rw-r--r--src/engine/bitwise_engine.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs
index 49b780d..db31511 100644
--- a/src/engine/bitwise_engine.rs
+++ b/src/engine/bitwise_engine.rs
@@ -369,14 +369,13 @@ impl BitwiseGameState {
let mut damaging = 0;
for _ in 0..MISSILE_SPEED {
for i in 0..MISSILE_MAX_SINGLE_CELL {
+ let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK;
let about_to_hit_opponent = player_missiles[i].1 & LEFT_COL_MASK;
- damaging = damaging << 1;
- damaging |= about_to_hit_opponent;
- player_missiles[i].1 = (player_missiles[i].1 & !LEFT_COL_MASK) >> 1;
- let swapping_sides = player_missiles[i].0 & RIGHT_COL_MASK;
- player_missiles[i].1 |= swapping_sides;
player_missiles[i].0 = (player_missiles[i].0 & !RIGHT_COL_MASK) << 1;
+ player_missiles[i].1 = ((player_missiles[i].1 & !LEFT_COL_MASK) >> 1) | swapping_sides;
+
+ damaging = (damaging << 1) | about_to_hit_opponent;
let mut hits = 0;
for health_tier in (0..DEFENCE_HEALTH).rev() {