aboutsummaryrefslogtreecommitdiff
path: root/server/src/entity/mod.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-12-16 01:07:41 +0100
committermetamuffin <metamuffin@disroot.org>2025-12-16 01:07:41 +0100
commite2efb15aa58477d898f92c8959242c0da3ce62bc (patch)
treedbea74993c73c2f3f43fcf771c01dbd8d2607c5d /server/src/entity/mod.rs
parent48d7482ded28ce9d3d4ff52517b48665ff1b8ebd (diff)
downloadhurrycurry-e2efb15aa58477d898f92c8959242c0da3ce62bc.tar
hurrycurry-e2efb15aa58477d898f92c8959242c0da3ce62bc.tar.bz2
hurrycurry-e2efb15aa58477d898f92c8959242c0da3ce62bc.tar.zst
Add player portal pair entity; fix tile/item remapping
Diffstat (limited to 'server/src/entity/mod.rs')
-rw-r--r--server/src/entity/mod.rs12
1 files changed, 11 insertions, 1 deletions
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index 6e1a618c..ee8a1a74 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -25,12 +25,16 @@ mod environment_effect;
mod item_portal;
mod pedestrians;
mod player_portal;
+pub mod player_portal_pair;
mod tag_minigame;
mod tram;
pub mod tutorial;
use crate::{
- entity::{demand_sink::DemandSink, pedestrians::Pedestrians, tag_minigame::TagMinigame},
+ entity::{
+ demand_sink::DemandSink, pedestrians::Pedestrians, player_portal_pair::PlayerPortalPair,
+ tag_minigame::TagMinigame,
+ },
scoreboard::ScoreboardStore,
};
use anyhow::Result;
@@ -170,5 +174,11 @@ pub fn construct_entity(decl: &EntityDecl) -> DynEntity {
speed: speed.unwrap_or(0.6),
}),
EntityDecl::DemandSink { pos } => Box::new(DemandSink { pos }),
+ EntityDecl::PlayerPortalPair {
+ a,
+ b,
+ in_tile,
+ out_tile,
+ } => Box::new(PlayerPortalPair::new(a, b, in_tile, out_tile)),
}
}