Revert "+ cargo make"

This reverts commit f8e1dd0ec3.
This commit is contained in:
Wiktor Mazur
2019-10-06 17:16:51 +02:00
parent f8e1dd0ec3
commit 803af69a69
12 changed files with 98 additions and 146 deletions
+6 -4
View File
@@ -11,8 +11,8 @@ use timer;
use super::traits::CombatState;
use super::traits::DamageDealer;
use super::traits::DamageStats;
use super::traits::FameGatherer;
use super::traits::FameStats;
use super::traits::FameGatherer;
struct Time {
_guard: timer::Guard,
@@ -49,9 +49,10 @@ pub struct Player {
combat_state: Arc<Mutex<CombatState>>,
_time: Option<Time>,
time_started: Instant,
fame: f32,
fame: f32
}
impl Player {
pub fn new(id: usize) -> Self {
let time_elapsed = Arc::new(Mutex::new(0.0));
@@ -64,7 +65,7 @@ impl Player {
combat_state,
_time: None,
time_started: Instant::now(),
fame: 0.0,
fame: 0.0
}
}
}
@@ -77,7 +78,7 @@ impl DamageDealer for Player {
self._time = Some(Time::with(elapsed, state));
}
if *self.combat_state.lock().unwrap() == CombatState::OutOfCombat {
return;
return
}
self.damage_dealt += damage_dealt
@@ -147,3 +148,4 @@ mod test {
assert_eq!(player.fame_per_hour(), 100);
}
}