summaryrefslogtreecommitdiff
path: root/src/systems
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2020-04-12 22:27:33 +0200
committertroido <troido@protonmail.com>2020-04-12 22:27:33 +0200
commit883e56e07a48dc0d4916614abc33e40dde1d1d66 (patch)
treee66ec69204b61a8df62f515c5f4857232aafe396 /src/systems
parentba09108692a694dd832f38ef6ea447135f418b73 (diff)
removed mortal component
Diffstat (limited to 'src/systems')
-rw-r--r--src/systems/die.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/systems/die.rs b/src/systems/die.rs
index fd953e0..e9fb127 100644
--- a/src/systems/die.rs
+++ b/src/systems/die.rs
@@ -9,7 +9,7 @@ use specs::{
};
use crate::{
- components::{Mortal, Dead, Removed, Player},
+ components::{Dead, Removed, Player},
resources::Emigration,
purgatory,
playerstate::RoomPos
@@ -20,15 +20,14 @@ pub struct Die;
impl <'a> System<'a> for Die {
type SystemData = (
Entities<'a>,
- ReadStorage<'a, Mortal>,
ReadStorage<'a, Dead>,
WriteStorage<'a, Removed>,
Write<'a, Emigration>,
ReadStorage<'a, Player>
);
- fn run(&mut self, (entities, mortals, deads, mut removeds, mut emigration, players): Self::SystemData) {
+ fn run(&mut self, (entities, deads, mut removeds, mut emigration, players): Self::SystemData) {
// npcs etc get removed when dead
- for (entity, _, _) in (&entities, &mortals, &deads).join() {
+ for (entity, _, _) in (&entities, &deads, !&players).join() {
removeds.insert(entity, Removed).unwrap();
}
// players move to purgatory when dead