diff options
| -rw-r--r-- | data/maps/debug2.yaml | 2 | ||||
| -rw-r--r-- | server/src/entity/tram.rs | 2 | ||||
| -rw-r--r-- | server/src/server.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/debug2.yaml b/data/maps/debug2.yaml index 3c849045..ef8c8ae1 100644 --- a/data/maps/debug2.yaml +++ b/data/maps/debug2.yaml @@ -99,7 +99,7 @@ entities: - !tram length: 4 character: 52 - points: [[3, 3], [23, 3], [23, 15], [3, 15]] + points: [[5, 5], [23, 3], [23, 15], [3, 15]] smoothing: 3. spacing: 0.3625 - !pedestrians diff --git a/server/src/entity/tram.rs b/server/src/entity/tram.rs index 706c139f..d1d1effa 100644 --- a/server/src/entity/tram.rs +++ b/server/src/entity/tram.rs @@ -43,7 +43,7 @@ impl Entity for Tram { character: self.character, class: PlayerClass::Tram, id: Some(id), - position: None, + position: self.points.get(0).copied(), }); self.ids.push(id); } diff --git a/server/src/server.rs b/server/src/server.rs index 98a9826c..47611eb6 100644 --- a/server/src/server.rs +++ b/server/src/server.rs @@ -254,7 +254,7 @@ impl GameServerExt for Game { let position = custom_position.unwrap_or(match class { PlayerClass::Customer => serverdata.customer_spawn, PlayerClass::Bot | PlayerClass::Chef => serverdata.chef_spawn, - PlayerClass::Tram => Vec2::ZERO, // TODO should always have custom location + PlayerClass::Tram => Vec2::ZERO, // should always have custom location }) + (Vec2::new(random(), random()) - 0.5); self.players.insert( id, |