use multiple ints for characters; close #294

1 files changed, 8 insertions, 4 deletions

diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index 75ea0e9b..2eadc0ff 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -42,7 +42,7 @@ use environment_effect::{EnvironmentController, EnvironmentEffect, EnvironmentEf
 use hurrycurry_client_lib::Game;
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
-    PacketC, PacketS, PlayerID,
+    Character, PacketC, PacketS, PlayerID,
 };
 use item_portal::ItemPortal;
 use player_portal::PlayerPortal;
@@ -142,7 +142,7 @@ pub enum EntityDecl {
     },
     Tram {
         length: usize,
-        character: Option<i32>,
+        color: Option<i32>,
         points: Vec<Vec2>,
         spacing: f32,
         smoothing: f32,
@@ -219,13 +219,17 @@ pub fn construct_entity(
         EntityDecl::Environment(names) => Box::new(EnvironmentController(names)),
         EntityDecl::Tram {
             length,
-            character,
+            color,
             points,
             smoothing,
             spacing,
         } => Box::new(Tram {
             length,
-            character: character.unwrap_or(51),
+            character: Character {
+                color: color.unwrap_or_default(),
+                hairstyle: 0,
+                headwear: 0,
+            },
             ids: Vec::new(),
             points,
             progress: 0.,