summaryrefslogtreecommitdiff
path: root/src/engine/bitwise_engine.rs
diff options
context:
space:
mode:
authorJustin Worthe <justin@worthe-it.co.za>2018-08-09 20:50:25 +0200
committerJustin Worthe <justin@worthe-it.co.za>2018-08-09 20:50:25 +0200
commit2c7870073e70ac19a6959c5627b04ad3c62d8173 (patch)
treefc6905f5acaa349b602aaa615ea49d4258f8feb7 /src/engine/bitwise_engine.rs
parentea78e266cff3f57c39442aefc21295a758419e69 (diff)
Removed unnecessary Player field
Diffstat (limited to 'src/engine/bitwise_engine.rs')
-rw-r--r--src/engine/bitwise_engine.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs
index 6b9ccab..e1296c8 100644
--- a/src/engine/bitwise_engine.rs
+++ b/src/engine/bitwise_engine.rs
@@ -9,8 +9,7 @@ const RIGHT_COL_MASK: u64 = 0x8080808080808080;
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Player {
pub energy: u16,
- pub health: u8,
- pub energy_generated: u16,
+ pub health: u8
}
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -421,8 +420,7 @@ impl BitwiseGameState {
fn add_energy(player: &mut Player, player_buildings: &mut PlayerBuildings) {
- player.energy_generated = ENERGY_GENERATED_BASE + player_buildings.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER;
- player.energy += player.energy_generated;
+ player.energy += player_buildings.energy_generated();
}
fn update_status(&mut self) {
@@ -456,6 +454,10 @@ impl PlayerBuildings {
tesla_cooldowns: [TeslaCooldown::empty(); TESLA_MAX]
}
}
+
+ pub fn energy_generated(&self) -> u16 {
+ ENERGY_GENERATED_BASE + self.energy_towers.count_ones() as u16 * ENERGY_GENERATED_TOWER
+ }
}
impl TeslaCooldown {