diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 563d7e1bd6..428d5e7ce4 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -1234,11 +1234,11 @@ impl<'a, T: ItemDesc + ?Sized> ItemDesc for &'a T { fn item_definition_id(&self) -> ItemDefinitionId<'_> { (*self).item_definition_id() } - fn components(&self) -> &[Item] { (*self).components() } - fn tags(&self) -> Vec { (*self).tags() } fn is_modular(&self) -> bool { (*self).is_modular() } + + fn components(&self) -> &[Item] { (*self).components() } } /// Returns all item asset specifiers diff --git a/voxygen/src/scene/figure/volume.rs b/voxygen/src/scene/figure/volume.rs index ac31a55b57..d2518a98b6 100644 --- a/voxygen/src/scene/figure/volume.rs +++ b/voxygen/src/scene/figure/volume.rs @@ -29,6 +29,17 @@ impl anim::Skeleton for VolumeKey { #[cfg(feature = "hot-anim")] const COMPUTE_FN: &'static [u8] = b"I AM NOT USED\0"; + // Override compute_matrices so that hotloading is not done for this (since it + // will fail as this isn't part of the hotloaded anim crate) + fn compute_matrices( + &self, + base_mat: anim::vek::Mat4, + buf: &mut [anim::FigureBoneData; anim::MAX_BONE_COUNT], + body: Self::Body, + ) -> anim::Offsets { + self.compute_matrices_inner(base_mat, buf, body) + } + fn compute_matrices_inner( &self, base_mat: anim::vek::Mat4, @@ -53,17 +64,6 @@ impl anim::Skeleton for VolumeKey { secondary_trail_mat: None, } } - - // Override compute_matrices so that hotloading is not done for this (since it - // will fail as this isn't part of the hotloaded anim crate) - fn compute_matrices( - &self, - base_mat: anim::vek::Mat4, - buf: &mut [anim::FigureBoneData; anim::MAX_BONE_COUNT], - body: Self::Body, - ) -> anim::Offsets { - self.compute_matrices_inner(base_mat, buf, body) - } } impl BodySpec for VolumeKey {