Added market message, reworked text messages a little

This commit is contained in:
TheSumm
2015-01-22 20:38:28 +01:00
parent 1d022905ab
commit 92e2e8224f
5 changed files with 57 additions and 8 deletions

View File

@@ -575,6 +575,10 @@ local function onAmountChange()
end
end
local function onMarketMessage(messageMode, message)
Market.displayMessage(message)
end
local function initMarketItems(category)
for c = MarketCategory.First, MarketCategory.Last do
marketItems[c] = {}
@@ -748,6 +752,8 @@ function init()
offerExhaust[MarketAction.Sell] = 10
offerExhaust[MarketAction.Buy] = 20
registerMessageMode(MessageModes.Market, onMarketMessage)
protocol.initProtocol()
connect(g_game, { onGameEnd = Market.reset })
connect(g_game, { onGameEnd = Market.close })
@@ -760,6 +766,8 @@ end
function terminate()
Market.close()
unregisterMessageMode(MessageModes.Market, onMarketMessage)
protocol.terminateProtocol()
disconnect(g_game, { onGameEnd = Market.reset })
disconnect(g_game, { onGameEnd = Market.close })
@@ -780,6 +788,13 @@ function Market.reset()
end
end
function Market.displayMessage(message)
if marketWindow:isHidden() then return end
local infoBox = displayInfoBox(tr('Market Error'), message)
infoBox:lock()
end
function Market.clearSelectedItem()
if Market.isItemSelected() then
Market.resetCreateOffer()
@@ -1059,7 +1074,7 @@ function Market.createNewOffer()
end
if errorMsg ~= '' then
displayInfoBox('Error', errorMsg)
Market.displayMessage(errorMsg)
return
end