diff options
Diffstat (limited to 'server/src/entity/conveyor.rs')
| -rw-r--r-- | server/src/entity/conveyor.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/server/src/entity/conveyor.rs b/server/src/entity/conveyor.rs index 38478db7..7f3d8688 100644 --- a/server/src/entity/conveyor.rs +++ b/server/src/entity/conveyor.rs @@ -1,3 +1,5 @@ +use std::collections::VecDeque; + /* Hurry Curry! - a game about cooking Copyright 2024 metamuffin @@ -18,7 +20,7 @@ use super::EntityT; use crate::game::{interact_effect, Game}; use anyhow::{anyhow, Result}; -use hurrycurry_protocol::{glam::IVec2, ItemIndex, ItemLocation}; +use hurrycurry_protocol::{glam::IVec2, ItemIndex, ItemLocation, PacketC}; #[derive(Debug, Clone)] pub struct Conveyor { @@ -31,7 +33,7 @@ pub struct Conveyor { } impl EntityT for Conveyor { - fn tick(&mut self, game: &mut Game, dt: f32) -> Result<()> { + fn tick(&mut self, game: &mut Game, packet_out: &mut VecDeque<PacketC>, dt: f32) -> Result<()> { let from = game .tiles .get(&self.from) @@ -44,7 +46,9 @@ impl EntityT for Conveyor { .get(t) .ok_or(anyhow!("conveyor filter missing"))?; filter_tile.item.as_ref().map(|e| e.kind) - } else { self.filter_item.as_ref().map(|i| *i) }; + } else { + self.filter_item.as_ref().map(|i| *i) + }; if let Some(filter) = filter { if from_item.kind != filter { @@ -71,7 +75,7 @@ impl EntityT for Conveyor { &mut from.item, ItemLocation::Tile(self.from), Some(to.kind), - &mut game.packet_out, + packet_out, &mut game.score, true, ); |