refactor server to use client-lib data model (breaks customers)

1 files changed, 12 insertions, 4 deletions

diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index 94718dd1..10d0c155 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -21,11 +21,12 @@ pub mod environment_effect;
 pub mod item_portal;
 pub mod player_portal;
 
-use crate::{data::ItemTileRegistry, game::Game};
+use crate::data::ItemTileRegistry;
 use anyhow::{anyhow, Result};
 use conveyor::Conveyor;
 use customers::{demands::generate_demands, Customers};
 use environment_effect::{EnvironmentController, EnvironmentEffect, EnvironmentEffectController};
+use hurrycurry_client_lib::Game;
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     ItemIndex, PacketC, Recipe, TileIndex,
@@ -35,8 +36,15 @@ use player_portal::PlayerPortal;
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, HashSet, VecDeque};
 
+pub struct EntityContext<'a> {
+    pub game: &'a mut Game,
+    pub packet_out: &'a mut VecDeque<PacketC>,
+    pub score_changed: &'a mut bool,
+    pub dt: f32,
+}
+
 pub trait EntityT: Clone {
-    fn tick(&mut self, game: &mut Game, packet_out: &mut VecDeque<PacketC>, dt: f32) -> Result<()>;
+    fn tick(&mut self, c: EntityContext<'_>) -> Result<()>;
 }
 
 macro_rules! entities {
@@ -44,8 +52,8 @@ macro_rules! entities {
         #[derive(Debug, Clone)]
         pub enum Entity { $($e($e)),* }
         impl EntityT for Entity {
-            fn tick(&mut self, game: &mut Game, packet_out: &mut VecDeque<PacketC>, dt: f32) -> Result<()> {
-                match self { $(Entity::$e(x) => x.tick(game, packet_out, dt)),*, }
+            fn tick(&mut self, c: EntityContext<'_>) -> Result<()> {
+                match self { $(Entity::$e(x) => x.tick(c)),*, }
             }
         }
     };