Merge branch 'ryzom/ui/improvements' into atys

ryzom/patch-changes
Ulukyn 4 years ago
commit f4a104bf3f

@ -147,6 +147,7 @@ extern bool CharNameValidArrived;
extern bool CharNameValid; extern bool CharNameValid;
bool IsInRingSession = false; bool IsInRingSession = false;
TSessionId HighestMainlandSessionId; // highest in the position stack TSessionId HighestMainlandSessionId; // highest in the position stack
ucstring lastUniversMessage;
extern const char *CDBBankNames[INVALID_CDB_BANK+1]; extern const char *CDBBankNames[INVALID_CDB_BANK+1];
@ -769,8 +770,12 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
PeopleInterraction.ChatInput.Region.displayMessage(finalString, col, 2, &windowVisible); PeopleInterraction.ChatInput.Region.displayMessage(finalString, col, 2, &windowVisible);
} }
else if (mode == CChatGroup::universe) else if (mode == CChatGroup::universe)
{
if (lastUniversMessage != finalString)
{ {
PeopleInterraction.ChatInput.Universe.displayMessage(finalString, col, 2, &windowVisible); PeopleInterraction.ChatInput.Universe.displayMessage(finalString, col, 2, &windowVisible);
lastUniversMessage = finalString;
}
} }
else if (mode == CChatGroup::dyn_chat) else if (mode == CChatGroup::dyn_chat)
{ {

@ -750,7 +750,7 @@ restartLoop:
// if the string contains a special rename of creature, remove it // if the string contains a special rename of creature, remove it
if (str.size() > 2 && str[0] == '<' && str[1] == '#') if (str.size() > 2 && str[0] == '<' && str[1] == '#')
{ {
str = str.substr(2); str = toUpper(str[2])+str.substr(3);
} }
// append this string // append this string

Loading…
Cancel
Save