diff --git a/lib/bsp_loader/src/lib.rs b/lib/bsp_loader/src/lib.rs index 64d83ed..1021b03 100644 --- a/lib/bsp_loader/src/lib.rs +++ b/lib/bsp_loader/src/lib.rs @@ -43,10 +43,12 @@ impl From<loader::MeshError> for LoadError{ Self::Mesh(value) } } -pub struct Bsp(vbsp::Bsp); +pub struct Bsp{ + bsp:vbsp::Bsp, +} impl AsRef<vbsp::Bsp> for Bsp{ fn as_ref(&self)->&vbsp::Bsp{ - &self.0 + &self.bsp } } @@ -59,8 +61,10 @@ pub fn read<R:std::io::Read>(mut input:R)->Result<Bsp,ReadError>{ vbsp::Bsp::read(s.as_slice()).map(Bsp::new).map_err(ReadError::Bsp) } impl Bsp{ - pub const fn new(value:vbsp::Bsp)->Self{ - Self(value) + pub fn new(bsp:vbsp::Bsp)->Self{ + Self{ + bsp, + } } pub fn to_snf(&self,failure_mode:LoadFailureMode,vpk_list:&[vpk::VPK])->Result<strafesnet_common::map::CompleteMap,LoadError>{ let mut texture_deferred_loader=RenderConfigDeferredLoader::new();