master
AndreFaramir 12 years ago
parent 68d0f6e015
commit 6d6f890ede

@ -202,6 +202,7 @@ function Console.sendCurrentMessage()
local originalMessage = message local originalMessage = message
local chatCommandSayMode local chatCommandSayMode
local chatCommandPrivate local chatCommandPrivate
local chatCommandPrivateReady
local chatCommandMessage = message:match("^%#y (.*)") local chatCommandMessage = message:match("^%#y (.*)")
if chatCommandMessage ~= nil then chatCommandSayMode = 'yell' end -- player used yell command if chatCommandMessage ~= nil then chatCommandSayMode = 'yell' end -- player used yell command
@ -218,8 +219,8 @@ function Console.sendCurrentMessage()
if chatCommandInitial == "*" then if chatCommandInitial == "*" then
consoleLineEdit:setText('*'.. chatCommandPrivate .. '* ') consoleLineEdit:setText('*'.. chatCommandPrivate .. '* ')
end end
chatCommandPrivate = chatCommandPrivate
message = chatCommandMessage:trim() message = chatCommandMessage:trim()
chatCommandPrivateReady = true
end end
end end
@ -241,7 +242,7 @@ function Console.sendCurrentMessage()
end end
local speaktypedesc local speaktypedesc
if tab.channelId and not chatCommandPrivate then if tab.channelId and not chatCommandPrivateReady then
if tab.channelId == 0 then if tab.channelId == 0 then
speaktypedesc = chatCommandSayMode or SayModes[consolePanel:getChildById('sayModeButton').sayMode].speakTypeDesc speaktypedesc = chatCommandSayMode or SayModes[consolePanel:getChildById('sayModeButton').sayMode].speakTypeDesc
if speaktypedesc ~= 'say' then Console.sayModeChange(2) end -- head back to say mode if speaktypedesc ~= 'say' then Console.sayModeChange(2) end -- head back to say mode
@ -253,7 +254,7 @@ function Console.sendCurrentMessage()
return return
else else
local isPrivateCommand = false local isPrivateCommand = false
if chatCommandPrivate then if chatCommandPrivateReady then
speaktypedesc = 'privatePlayerToPlayer' speaktypedesc = 'privatePlayerToPlayer'
name = chatCommandPrivate name = chatCommandPrivate
isPrivateCommand = true isPrivateCommand = true

Loading…
Cancel
Save