From 7282c4aeba0463a4d2cd0bf94d1903f0833fe7be Mon Sep 17 00:00:00 2001 From: Darthpred Date: Wed, 12 Mar 2014 00:30:26 +0400 Subject: [PATCH] Seems fine --- ElvUI_SLE/modules/chat/chat.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua index ddc3ef7..9a35995 100755 --- a/ElvUI_SLE/modules/chat/chat.lua +++ b/ElvUI_SLE/modules/chat/chat.lua @@ -15,12 +15,15 @@ local lfgChannels = { } local Myname = E.myname -local Myrealm = E.myrealm +--local Myrealm = E.myrealm local len, gsub, find, sub, gmatch, format, random = string.len, string.gsub, string.find, string.sub, string.gmatch, string.format, math.random local tinsert, tremove, tsort, twipe, tconcat = table.insert, table.remove, table.sort, table.wipe, table.concat -Myrealm = Myrealm:gsub(' ', '') +--Myrealm = Myrealm:gsub(' ', '') + +local PLAYER_REALM = gsub(E.myrealm,'[%s%-]','') +local PLAYER_NAME = Myname.."-"..PLAYER_REALM local rolePaths = { TANK = [[|TInterface\AddOns\ElvUI\media\textures\tank.tga:15:15:0:0:64:64:2:56:2:56|t]], @@ -699,11 +702,11 @@ function SLE:GetChatIcon(sender) else senderName = Myname end - senderRealm = senderRealm or Myrealm + senderRealm = senderRealm or PLAYER_REALM senderRealm = senderRealm:gsub(' ', '') --Disabling ALL special icons. IDK why Elv use that and why would we want to have that but whatever - if(specialChatIcons[Myrealm] == nil or (specialChatIcons[Myrealm] and specialChatIcons[Myrealm][Myname] ~= true)) then + if(specialChatIcons[PLAYER_REALM] == nil or (specialChatIcons[PLAYER_REALM] and specialChatIcons[PLAYER_REALM][Myname] ~= true)) then if specialChatIcons[senderRealm] and specialChatIcons[senderRealm][senderName] then return specialChatIcons[senderRealm][senderName] end @@ -753,7 +756,7 @@ function CH:CheckLFGRoles() local role = UnitGroupRolesAssigned("player") if(role) then - lfgRoles[Myname..'-'..Myrealm] = rolePaths[role] + lfgRoles[Myname..'-'..PLAYER_REALM] = rolePaths[role] end for i=1, GetNumGroupMembers() do @@ -762,7 +765,7 @@ function CH:CheckLFGRoles() local name, realm = UnitName(unit..i) if(role and name) then - name = realm and name..'-'..realm or name..'-'..Myrealm + name = realm and name..'-'..realm or name..'-'..PLAYER_REALM lfgRoles[name] = rolePaths[role] end end -- 1.7.9.5