Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

#918 reverting wrongly merged inventory related changes.

Browse Source
This commit is contained in:
Thomas Kosel 2021-07-28 21:13:09 +02:00
parent acb7f5dc4b
commit c8527491cc
No known key found for this signature in database
GPG Key ID: AC43C6126CC42595
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/systems/src/character_behavior.rs
View File

@ -74,6 +74,7 @@ pub struct ReadData<'a> {
combos: ReadStorage<'a, Combo>,
alignments: ReadStorage<'a, comp::Alignment>,
terrain: ReadExpect<'a, TerrainGrid>,
inventories: ReadStorage<'a, Inventory>,
}
/// ## Character Behavior System
@ -92,7 +93,6 @@ impl<'a> System<'a> for Sys {
WriteStorage<'a, Ori>,
WriteStorage<'a, Density>,
WriteStorage<'a, Energy>,
WriteStorage<'a, Inventory>,
WriteStorage<'a, Controller>,
WriteStorage<'a, Poise>,
Write<'a, Vec<Outcome>>,
@ -112,7 +112,6 @@ impl<'a> System<'a> for Sys {
mut orientations,
mut densities,
mut energies,
mut inventories,
mut controllers,
mut poises,
mut outcomes,
@ -148,7 +147,7 @@ impl<'a> System<'a> for Sys {
&read_data.masses,
&mut densities,
&mut energies,
&mut inventories,
read_data.inventories.maybe(),
&mut controllers,
read_data.healths.maybe(),
&read_data.bodies,
@ -283,7 +282,7 @@ impl<'a> System<'a> for Sys {
mass,
density: &mut density,
energy,
inventory: Some(&inventory),
inventory,
controller: &mut controller,
health,
body,