StrafesNET/strafe-project
6
Fork 4
Code Issues3 Pull Requests Packages Projects Releases2 Wiki Activity

first stage

Browse Source
This commit is contained in:
Quaternions 2025-03-10 16:13:18 -07:00
parent aba3e99722
commit 06e29b3d42
1 changed files with 9 additions and 6 deletions

15
lib/bsp_loader/src/bsp.rs

@ -576,15 +576,18 @@ impl PartialMap2<'_>{
})); }));
//calculate teleports //calculate teleports
let first_stage_spawn_model_id=self.first_stage.as_ref().unwrap().spawn();
let mut teleport_destinations=HashMap::new(); let mut teleport_destinations=HashMap::new();
let stages={ let stages={
let mut stages=self.teleport_destinations.iter().map(|(&target,&model_id)|(target,model_id)).collect::<Vec<_>>(); let mut stages=self.teleport_destinations.iter().map(|(&target,&model_id)|(target,model_id)).collect::<Vec<_>>();
stages.sort_by_key(|&(target,_)|target); stages.sort_by_key(|&(target,_)|target);
stages.into_iter().enumerate().map(|(stage_id,(target,model_id))|{ self.first_stage.into_iter().chain(
let stage_id=modes::StageId::new(stage_id as u32); stages.into_iter().enumerate().map(|(stage_id,(target,model_id))|{
teleport_destinations.insert(target,stage_id); let stage_id=modes::StageId::new(1+stage_id as u32);
Stage::empty(model_id) teleport_destinations.insert(target,stage_id);
}).collect() Stage::empty(model_id)
})
).collect()
}; };
let mut elements=HashMap::new(); let mut elements=HashMap::new();
for (teleport_model,target) in self.teleports{ for (teleport_model,target) in self.teleports{
@ -605,7 +608,7 @@ impl PartialMap2<'_>{
} }
let main_mode=NormalizedMode::new(Mode::new( let main_mode=NormalizedMode::new(Mode::new(
strafesnet_common::gameplay_style::StyleModifiers::default(), strafesnet_common::gameplay_style::StyleModifiers::default(),
self.first_stage.unwrap().spawn(), first_stage_spawn_model_id,
HashMap::new(), HashMap::new(),
stages, stages,
elements, elements,