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

Merge branch 'fix-1278' into 'master'

Browse Source 
Fixes the issue mentioned in #1278

See merge request veloren/veloren!2760
This commit is contained in:
Marcel 2021-08-12 07:24:16 +00:00
commit 0dfc0d39dd
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
voxygen/src/hud/trade.rs
View File

@ -201,27 +201,15 @@ impl<'a> Trade<'a> {
})
.unwrap_or_else(|| format!("Player {}", who));
let offer_header = self
.client
.player_list()
.get(&uid)
.map(|_| {
self.localized_strings
.get("hud.trade.your_offer")
.to_owned()
})
.or_else(|| {
self.client
.state()
.read_storage::<Stats>()
.get(entity)
.map(|_| {
self.localized_strings
.get("hud.trade.their_offer")
.to_owned()
})
})
.unwrap_or_else(|| format!("Player {}", who));
let offer_header = if who == 1 {
self.localized_strings
.get("hud.trade.their_offer")
.to_owned()
} else {
self.localized_strings
.get("hud.trade.your_offer")
.to_owned()
};
Text::new(&offer_header)
.up_from(state.ids.inv_alignment[who], 20.0)