some refactoring

This commit is contained in:
Manuel Simon Hirsig
2015-09-28 01:06:52 +02:00
parent 8c0ef71d11
commit 8f069da665
+13 -25
View File
@@ -10,7 +10,7 @@ local currentAuction
----------------------------------------- -----------------------------------------
local record_auction, undercut, ItemType2AuctionClass, SubType2AuctionSubclass, set_message, report local record_auction, undercut, item_class_index, item_subclass_index, set_message, report
----------------------------------------- -----------------------------------------
@@ -295,15 +295,15 @@ function Aux_RefreshEntries()
local _, _, _, _, _, sType, sSubType = GetItemInfo(name) local _, _, _, _, _, sType, sSubType = GetItemInfo(name)
local currentAuctionClass = ItemType2AuctionClass(sType) local class_index -- = item_class_index(sType)
local currentAuctionSubclass = nil -- SubType2AuctionSubclass(currentAuctionClass, sSubType) local subclass_index -- = item_subclass_index(class_index, sSubType)
set_message('Scanning auctions ...') set_message('Scanning auctions ...')
Aux.scan.start{ Aux.scan.start{
query = Aux.scan.create_query{ query = Aux.scan.create_query{
name = name, name = name,
classIndex = currentAuctionClass, classIndex = class_index,
subclassIndex = currentAuctionSubclass subclassIndex = subclass_index,
}, },
on_start_page = function(i) on_start_page = function(i)
set_message('Scanning auctions: page ' .. i .. ' ...') set_message('Scanning auctions: page ' .. i .. ' ...')
@@ -479,32 +479,20 @@ end
----------------------------------------- -----------------------------------------
function ItemType2AuctionClass(itemType) function item_class_index(item_class)
local itemClasses = { GetAuctionItemClasses() } for i, class in pairs(GetAuctionItemClasses()) do
if itemClasses then if class == item_class then
if getn(itemClasses) > 0 then return i
local itemClass
for x, itemClass in pairs(itemClasses) do
if itemClass == itemType then
return x
end
end
end end
else
Aux_Log("Can't GetAuctionItemClasses")
end end
end end
----------------------------------------- -----------------------------------------
function SubType2AuctionSubclass(auctionClass, itemSubtype) function item_subclass_index(class_index, item_subclass)
local itemClasses = { GetAuctionItemSubClasses(auctionClass.number) } for i, subclass in pairs(GetAuctionItemSubClasses(class_index)) do
if itemClasses.n > 0 then if subclass == item_subclass then
local itemClass return i
for x, itemClass in pairs(itemClasses) do
if itemClass == itemSubtype then
return x
end
end end
end end
end end