# HG changeset patch # User Zerotorescue # Date 1292851831 -3600 # Node ID 06fee4208bf2005d26452dcbf6e20a8bd64a0c32 # Parent 4fc49c9a8f2b08e58be533a8cdbe7484aeaec271 Altoholic should now properly show an on select message when chosen. Selecting DataStore as item count addons should no longer break. The local item count displayed in the summary is now actually local rather than global. diff -r 4fc49c9a8f2b -r 06fee4208bf2 ItemCountAddons/Altoholic.lua --- a/ItemCountAddons/Altoholic.lua Mon Dec 20 14:22:19 2010 +0100 +++ b/ItemCountAddons/Altoholic.lua Mon Dec 20 14:30:31 2010 +0100 @@ -14,6 +14,6 @@ print("|cffff6600Note: " .. addonName .. " can not provide local item data.|r"); end - IMRegisterItemCountAddon("Altoholic", GetTotalCount, nil, IsEnabled); + IMRegisterItemCountAddon("Altoholic", GetTotalCount, nil, IsEnabled, OnSelect); end diff -r 4fc49c9a8f2b -r 06fee4208bf2 ItemCountAddons/DataStore (current account only).lua --- a/ItemCountAddons/DataStore (current account only).lua Mon Dec 20 14:22:19 2010 +0100 +++ b/ItemCountAddons/DataStore (current account only).lua Mon Dec 20 14:30:31 2010 +0100 @@ -8,9 +8,9 @@ -- Process all charracters on this account (GetCharacters defaults to THIS_ACCOUNT) for characterName, character in pairs(DataStore:GetCharacters(realm, nil)) do -- Get only useful info (currency / gear shouldn't contain the stuff we are interested in) - local bag, bank = DataStore:GetContainerItemCount(character, itemId); - local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId); - local mail = DataStore:GetMailItemCount(character, itemId); + local bag, bank = DataStore:GetContainerItemCount(character, itemId) or 0, 0; + local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId) or 0; + local mail = DataStore:GetMailItemCount(character, itemId) or 0; totalCount = totalCount + bag + bank + auctionHouse + mail; end @@ -21,9 +21,9 @@ local function GetCharacterCount(itemId) local character = DataStore:GetCharacter(); - local bag, bank = DataStore:GetContainerItemCount(character, itemId); - local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId); - local mail = DataStore:GetMailItemCount(character, itemId); + local bag, bank = DataStore:GetContainerItemCount(character, itemId) or 0, 0; + local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId) or 0; + local mail = DataStore:GetMailItemCount(character, itemId) or 0; return bag, bank, auctionHouse, mail; end diff -r 4fc49c9a8f2b -r 06fee4208bf2 ItemCountAddons/DataStore (with guilds).lua --- a/ItemCountAddons/DataStore (with guilds).lua Mon Dec 20 14:22:19 2010 +0100 +++ b/ItemCountAddons/DataStore (with guilds).lua Mon Dec 20 14:30:31 2010 +0100 @@ -13,9 +13,9 @@ -- Process all charracters for characterName, character in pairs(DataStore:GetCharacters(realm, accountName)) do -- Get only useful info (currency / gear shouldn't contain the stuff we are interested in) - local bag, bank = DataStore:GetContainerItemCount(character, itemId); - local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId); - local mail = DataStore:GetMailItemCount(character, itemId); + local bag, bank = DataStore:GetContainerItemCount(character, itemId) or 0, 0; + local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId) or 0; + local mail = DataStore:GetMailItemCount(character, itemId) or 0; totalCount = totalCount + bag + bank + auctionHouse + mail; end @@ -27,7 +27,7 @@ guilds[guildName] = true; - local guild = DataStore:GetGuildBankItemCount(guild, itemId); + local guild = DataStore:GetGuildBankItemCount(guild, itemId) or 0; totalCount = totalCount + guild; end @@ -40,9 +40,9 @@ local function GetCharacterCount(itemId) local character = DataStore:GetCharacter(); - local bag, bank = DataStore:GetContainerItemCount(character, itemId); - local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId); - local mail = DataStore:GetMailItemCount(character, itemId); + local bag, bank = DataStore:GetContainerItemCount(character, itemId) or 0, 0; + local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId) or 0; + local mail = DataStore:GetMailItemCount(character, itemId) or 0; return bag, bank, auctionHouse, mail; end diff -r 4fc49c9a8f2b -r 06fee4208bf2 ItemCountAddons/DataStore (without guilds).lua --- a/ItemCountAddons/DataStore (without guilds).lua Mon Dec 20 14:22:19 2010 +0100 +++ b/ItemCountAddons/DataStore (without guilds).lua Mon Dec 20 14:30:31 2010 +0100 @@ -11,9 +11,9 @@ -- Process all charracters for characterName, character in pairs(DataStore:GetCharacters(realm, accountName)) do -- Get only useful info (currency / gear shouldn't contain the stuff we are interested in) - local bag, bank = DataStore:GetContainerItemCount(character, itemId); - local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId); - local mail = DataStore:GetMailItemCount(character, itemId); + local bag, bank = DataStore:GetContainerItemCount(character, itemId) or 0, 0; + local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId) or 0; + local mail = DataStore:GetMailItemCount(character, itemId) or 0; totalCount = totalCount + bag + bank + auctionHouse + mail; end @@ -25,9 +25,9 @@ local function GetCharacterCount(itemId) local character = DataStore:GetCharacter(); - local bag, bank = DataStore:GetContainerItemCount(character, itemId); - local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId); - local mail = DataStore:GetMailItemCount(character, itemId); + local bag, bank = DataStore:GetContainerItemCount(character, itemId) or 0, 0; + local auctionHouse = DataStore:GetAuctionHouseItemCount(character, itemId) or 0; + local mail = DataStore:GetMailItemCount(character, itemId) or 0; return bag, bank, auctionHouse, mail; end diff -r 4fc49c9a8f2b -r 06fee4208bf2 Summary.lua --- a/Summary.lua Mon Dec 20 14:22:19 2010 +0100 +++ b/Summary.lua Mon Dec 20 14:30:31 2010 +0100 @@ -562,7 +562,7 @@ if item.localCount == -3 then -- Only if item count was queued, update it - item.localCount = addon:GetItemCount(item.id, groupName); + item.localCount = addon:GetLocalItemCount(item.id, groupName); if item.set.localCount and item.set.localCount.SetText then item.set.localCount:SetText(self:DisplayItemCount(item.localCount, minimumStock)); end