From 2d4cabc768968a215556f7a4ed81a728d3b6e120 Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 13 Apr 2020 14:36:03 +0200 Subject: checking for specific messages is easier because of TriggerBox::has_message --- src/systems/building.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/systems/building.rs') diff --git a/src/systems/building.rs b/src/systems/building.rs index 0f23467..e7924b4 100644 --- a/src/systems/building.rs +++ b/src/systems/building.rs @@ -31,18 +31,13 @@ impl <'a> System<'a> for Building{ fn run(&mut self, (positions, mut new, triggerboxes, builds, time_offsets): Self::SystemData) { for (position, triggerbox, build, time_offset) in (&positions, &triggerboxes, &builds, (&time_offsets).maybe()).join(){ - for message in triggerbox.messages.iter() { - match message { - Trigger::Build | Trigger::Change => { - // todo: better error handling - let mut preent = new.encyclopedia.construct(&build.obj).unwrap(); - if let Some(time) = time_offset { - preent.push(ComponentWrapper::TimeOffset(time.clone())); - } - new.to_build.push((position.pos, preent)); - } - _ => {} + if triggerbox.has_message(&[Trigger::Build, Trigger::Change]) { + // todo: better error handling + let mut preent = new.encyclopedia.construct(&build.obj).unwrap(); + if let Some(time) = time_offset { + preent.push(ComponentWrapper::TimeOffset(time.clone())); } + new.to_build.push((position.pos, preent)); } } } -- cgit