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

fix 1h second item cache issue #661

Browse Source
This commit is contained in:
scott-c 2020-07-05 23:11:45 +08:00
parent d63da1beb9
commit 6014bd8364
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
voxygen/src/scene/figure/cache.rs
View File

@ -32,6 +32,7 @@ enum FigureKey {
struct CharacterCacheKey { struct CharacterCacheKey {
state: Option<Discriminant<CharacterState>>, // TODO: Can this be simplified? state: Option<Discriminant<CharacterState>>, // TODO: Can this be simplified?
active_tool: Option<ToolKind>, active_tool: Option<ToolKind>,
second_tool: Option<ToolKind>,
shoulder: Option<Item>, shoulder: Option<Item>,
chest: Option<Item>, chest: Option<Item>,
belt: Option<Item>, belt: Option<Item>,
@ -53,6 +54,13 @@ impl CharacterCacheKey {
} else { } else {
None None
}, },
second_tool: if let Some(ItemKind::Tool(tool)) =
loadout.second_item.as_ref().map(|i| &i.item.kind)
{
Some(tool.kind)
} else {
None
},
shoulder: loadout.shoulder.clone(), shoulder: loadout.shoulder.clone(),
chest: loadout.chest.clone(), chest: loadout.chest.clone(),
belt: loadout.belt.clone(), belt: loadout.belt.clone(),