This commit is contained in:
Pfauenauge90 2020-06-12 00:39:57 +02:00 committed by Forest Anderson
parent f83c58498f
commit a497fb92d3
16 changed files with 36 additions and 33 deletions

BIN
assets/voxygen/element/icons/chat/broadcast_offline.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/voxygen/element/icons/chat/say.png (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/voxygen/element/icons/chat/tell.png (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -108,12 +108,12 @@ impl ChatMsg {
ChatType::Broadcast => SpeechBubbleType::None,
ChatType::Private => SpeechBubbleType::None,
ChatType::Kill => SpeechBubbleType::None,
ChatType::Tell(_u, _) => SpeechBubbleType::None,
ChatType::Say(_u) => SpeechBubbleType::None,
ChatType::Group(_u, _s) => SpeechBubbleType::None,
ChatType::Faction(_u, _s) => SpeechBubbleType::None,
ChatType::Region(_u) => SpeechBubbleType::None,
ChatType::World(_u) => SpeechBubbleType::None,
ChatType::Tell(_u, _) => SpeechBubbleType::Tell,
ChatType::Say(_u) => SpeechBubbleType::Say,
ChatType::Group(_u, _s) => SpeechBubbleType::Group,
ChatType::Faction(_u, _s) => SpeechBubbleType::Faction,
ChatType::Region(_u) => SpeechBubbleType::Region,
ChatType::World(_u) => SpeechBubbleType::World,
ChatType::Npc(_u, _r) => SpeechBubbleType::None,
}
}

View File

@ -59,7 +59,7 @@ pub struct Overhead<'a> {
voxygen_i18n: &'a std::sync::Arc<VoxygenLocalization>,
imgs: &'a Imgs,
fonts: &'a ConrodVoxygenFonts,
bubble_type: &SpeechBubbleType,
bubble_type: &'a SpeechBubbleType,
#[conrod(common_builder)]
common: widget::CommonBuilder,
}