wow/ouroloot: core.lua comparison

comparison core.lua @ 135:feca7e0e1f89

Remove MoP transition code, be smarter about detecting groups.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Fri, 31 Aug 2012 23:15:40 -0400
parents	47b149f9a5d7
children	8345df517488

comparison

equal deleted inserted replaced

-:7817367a008e
+:feca7e0e1f89
 OuroLootSV_hist  = nil
 OuroLootSV_log   = {}
 ------ Constants
-local RAID_ROSTER_UPDATE_EVENT = 'GROUP_ROSTER_UPDATE'
-	--(select(4,GetBuildInfo()) >= 50000) and 'GROUP_ROSTER_UPDATE' or 'RAID_ROSTER_UPDATE'
 local option_defaults = { profile = {
 	--['datarev'] = 20,    -- cheating, this isn't actually an option
 	['popup_on_join'] = true,
 	['register_slash_synonyms'] = false,
 	['slash_synonyms'] = '/ol,/oloot',
 local type, select, next, pairs, ipairs, tinsert, tremove, tostring, tonumber, wipe =
 	type, select, next, pairs, ipairs, table.insert, table.remove, tostring, tonumber, table.wipe
 local pprint, tabledump = addon.pprint, flib.tabledump
 local CopyTable = CopyTable
-local GetNumRaidMembers = GetNumGroupMembers or GetNumRaidMembers
+local GetNumGroupMembers = GetNumGroupMembers
-local IsInRaid = IsInRaid or (function() return GetNumRaidMembers() > 0 end)
+local IsInRaid = IsInRaid
 -- En masse forward decls of symbols defined inside local blocks
 local _register_bossmod, makedate, create_new_cache, _init, _log, _do_loot_metas
 local _history_by_loot_id, _setup_unique_replace, _unavoidable_collision
 local _notify_about_change, _LFR_suppressing, _add_loot_disposition
 	self.OnInitialize = nil   -- free up ALL the things!
 end
 function addon:OnEnable()
 	self:RegisterEvent("PLAYER_LOGOUT")
-	self:RegisterEvent(RAID_ROSTER_UPDATE_EVENT,"RAID_ROSTER_UPDATE")
+	self:RegisterEvent("GROUP_ROSTER_UPDATE")
 	-- This Print cribbed from Talented.  I like the way jerry thinks: the
 	-- first string argument can be a format spec for the remainder of the
 	-- arguments.  AceConsole:Printf isn't used because we can't specify a
 	-- prefix without jumping through ridonkulous hoops.
 	_G.OuroLootSV_hist = nil
 	_G.OuroLootSV_log = nil
 	ReloadUI()
 end
 function addon:PLAYER_LOGOUT()
-	self:UnregisterEvent(RAID_ROSTER_UPDATE_EVENT)
+	-- Can these still fire at the very last instant?
+	self:UnregisterEvent("GROUP_ROSTER_UPDATE")
 	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
 	local worth_saving = #g_loot > 0 or next(g_loot.raiders)
 	if not worth_saving then for text in self:registered_textgen_iter() do
 		worth_saving = worth_saving or g_loot.printed[text] > 0
 				UnitLevel, UnitInRaid, UnitIsVisible, GetGuildInfo, GetRaidRosterInfo =
 	      IsInInstance, UnitIsConnected, UnitClass, UnitRace, UnitSex,
 		  		UnitLevel, UnitInRaid, UnitIsVisible, GetGuildInfo, GetRaidRosterInfo
 	local time, difftime = time, difftime
 	local R_ACTIVE, R_OFFLINE, R_LEFT = 'online', 'offline', 'no_longer'
+	local was_in_raid
 	local lastevent, now = 0, 0
 	local redo_count = 0
 	local redo, timer_handle, my_realm
 		if redo then
 			redo_count = redo_count + 1
 		end
 		redo = false
-		for i = 1, GetNumRaidMembers() do
+		for i = 1, GetNumGroupMembers() do
 			local unit = 'raid'..i
 			-- We grab a bunch of return values here, but only pay attention to
 			-- them under specific circumstances.  Try to use as many of these
 			-- values as possible rather than multiple Unit* calls.
 			local fname, connected, subgroup, level, class, _
 				redo = redo or r.needinfo
 			end
 		end
 		if redo then  -- XXX test redo_count here and eventually give up?
 			if not timer_handle then
-				timer_handle = self:ScheduleRepeatingTimer("RAID_ROSTER_UPDATE", 60)
+				timer_handle = self:ScheduleRepeatingTimer("GROUP_ROSTER_UPDATE", 60)
 			end
 		else
 			redo_count = 0
 			if timer_handle then
 				self:CancelTimer(timer_handle)
 				timer_handle = nil
 			end
 		end
 	end
-	function addon:RAID_ROSTER_UPDATE (event)
+	function addon:GROUP_ROSTER_UPDATE (event)
-		if GetNumRaidMembers() == 0 then
+		if not IsInRaid() then
-			-- Leaving a raid group.
+			if was_in_raid then
-			-- Because of PLAYER_ENTERING_WORLD, this code also executes on load
+				-- Leaving a raid group.
-			-- screens while soloing and in regular groups.  Take care.
+				self.dprint('flow', "no longer in raid group")
-			self.dprint('flow', "GetNumRaidMembers == 0")
+				was_in_raid = false
-			if self.enabled and not self.debug.notraid then
+				if self.enabled and not self.debug.notraid then
-				self.dprint('flow', "enabled, leaving raid")
+					self.dprint('flow', "enabled, leaving raid")
-				self.popped = nil
+					self.popped = nil
-				self:Deactivate()
+					self:Deactivate()
-				self:CheckRoster(--[[leaving raid]]true)
+					self:CheckRoster(--[[leaving raid]]true)
-			end
+				end
-			_LFR_suppressing = nil
+				_LFR_suppressing = nil
+			end
+			-- Flow for 5-player groups goes right to here.
 			return
 		end
 		local inside,whatkind = IsInInstance()
 		if inside and (whatkind == "pvp" or whatkind == "arena") then
 			self.dprint('flow', "got RRU event but in pvp zone, bailing")
 			return
 		end
 		local docheck = self.enabled
-		if event == "Activate" then
+		if event == "GROUP_ROSTER_UPDATE" then
-			-- dispatched from Activate
-			if opts.history_suppress_LFR
-			   and GetLFGMode(LE_LFG_CATEGORY_RF)
-			then
-				_LFR_suppressing = true
-			end
-			my_realm = self.history.realm
-			_register_bossmod(self)
-			self:RegisterEvent("CHAT_MSG_LOOT")
-			docheck = true
-		elseif event == RAID_ROSTER_UPDATE_EVENT then
 			-- hot code path, be careful
 			-- event registration from onload, joined a raid, maybe show popup
 			self.dprint('flow', "RRU check:", self.popped, opts.popup_on_join)
 			if (not self.popped) and opts.popup_on_join then
 				self.popped = StaticPopup_Show "OUROL_REMIND"
 				self.popped.data = self
 				return
 			end
-		end
+		elseif event == "Activate" then
+			-- dispatched from Activate
+			if opts.history_suppress_LFR
+			   and GetLFGMode(LE_LFG_CATEGORY_RF)
+			then
+				_LFR_suppressing = true
+			end
+			my_realm = self.history.realm
+			_register_bossmod(self)
+			self:RegisterEvent("CHAT_MSG_LOOT")
+			was_in_raid = true
+			docheck = true
+		end
 		-- Throttle the checks fired by common events.
 		if docheck and not InCombatLockdown() then
 			now = time()
 			if difftime(now,lastevent) > 45 then
 				lastevent = now
 ------ On/off
 -- Both of these need to be (effectively) idempotent.
 function addon:Activate (opt_threshold, opt_bcast_only)
 	self.dprint('flow', ":Activate is running")
-	self:RegisterEvent(RAID_ROSTER_UPDATE_EVENT,"RAID_ROSTER_UPDATE")
+	self:RegisterEvent("GROUP_ROSTER_UPDATE")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD",
-		function() self:ScheduleTimer("RAID_ROSTER_UPDATE", 5, "PLAYER_ENTERING_WORLD") end)
+		function() self:ScheduleTimer("GROUP_ROSTER_UPDATE", 5, "PLAYER_ENTERING_WORLD") end)
 	self.popped = true
 	if self.DO_ITEMID_FIX then
 		self.DO_ITEMID_FIX = nil
 		self:do_item_cache_fixup(--[[force_silent=]]not self.author_debug)
 		self.loot_clean = nil
 	end
 	if IsInRaid() then
 		self.dprint('flow', ">:Activate calling RRU")
-		self:RAID_ROSTER_UPDATE("Activate")
+		self:GROUP_ROSTER_UPDATE("Activate")
 	elseif self.debug.notraid then
 		self.dprint('flow', ">:(notraid) Activate registering loot and bossmods")
 		self:RegisterEvent("CHAT_MSG_LOOT")
 		_register_bossmod(self)
 	elseif g_restore_p then
 -- Note:  running '/ouroloot off' will also avoid the popup reminder when
 -- joining a raid, but will not change the saved option setting.
 function addon:Deactivate()
 	self.enabled = false
 	self.rebroadcast = false
-	self:UnregisterEvent(RAID_ROSTER_UPDATE_EVENT)
+	self:UnregisterEvent("GROUP_ROSTER_UPDATE")
 	self:UnregisterEvent("PLAYER_ENTERING_WORLD")
 	self:UnregisterEvent("CHAT_MSG_LOOT")
 	_LFR_suppressing = nil
 	-- Passing .raiders directly doesn't work with a proxy (again, WTB Lua
 	-- 5.2 and its __pairs iterators).  Give it the same structure as a boss

Mercurial > wow > ouroloot

comparison core.lua @ 135:feca7e0e1f89