From 0df96cd1201c3c1900d27f95a696959efc84c95c Mon Sep 17 00:00:00 2001
From: p3lim-52096 <p3lim-52096@ae24c21f-2f0c-4c94-9256-0092abe71e0d>
Date: Tue, 14 Apr 2009 15:26:09 +0000
Subject: [PATCH] Updated for 3.1 Removed useless code

git-svn-id: svn://svn.wowinterface.com/pMinimap-54/trunk@90 ae24c21f-2f0c-4c94-9256-0092abe71e0d
---
 pMinimap/pMinimap.lua |   27 ++++++++-------------------
 pMinimap/pMinimap.toc |    4 ++--
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/pMinimap/pMinimap.lua b/pMinimap/pMinimap.lua
index 625aed2..c4ea38d 100644
--- a/pMinimap/pMinimap.lua
+++ b/pMinimap/pMinimap.lua
@@ -26,8 +26,6 @@ local defaults = {
 }
 
 do
-	local ptr = select(4, GetBuildInfo()) > 3e4 -- temporary, remove in 3.1
-
 	local total = 0.25
 	function onUpdate(self, elapsed)
 		if(total) then
@@ -35,12 +33,8 @@ do
 			if(total <= 0) then
 				total = 0.25
 
-				if(IsInInstance() and not ptr) then -- only remove coordinates in instance for 3.0.9, remove this in 3.1
-					self.Text:SetText() 
-				else
-					local x, y = GetPlayerMapPosition('player')
-					self.Text:SetFormattedText('%.0f,%.0f', x * 100, y * 100)
-				end
+				local x, y = GetPlayerMapPosition('player')
+				self.Text:SetFormattedText('%.0f,%.0f', x * 100, y * 100)
 			end
 		end
 	end
@@ -78,8 +72,7 @@ end
 
 local function slashHandler(str)
 	if(str == 'reset') then
-		pMinimapDB = nil
-		pMinimap:LoadDefaults()
+		pMinimapDB = {}
 		print('|cffff8080pMinimap:|r Savedvariables is now reset. You should reload/relog to affect changes.')
 	elseif(str == 'refresh') then
 		Minimap:SetMaskTexture([=[Interface\ChatFrame\ChatFrameBackground]=])
@@ -198,13 +191,6 @@ local function Initialize(self)
 end
 
 
-function pMinimap:LoadDefaults()
-	pMinimapDB = setmetatable(pMinimapDB or {}, {__index = defaults})
-	pMinimapDB.unlocked = false
-
-	self.db = pMinimapDB
-end
-
 function pMinimap:CreateClock()
 	TimeManager_LoadUI()
 
@@ -250,7 +236,6 @@ end
 
 function pMinimap:ADDON_LOADED(event, addon)
 	if(addon ~= 'pMinimap') then return end
-	self:UnregisterEvent(event)
 
 	CreateFrame('Frame', nil, InterfaceOptionsFrame):SetScript('OnShow', optionsPanel)
 	LSM:Register('font', 'Visitor TT1', [=[Interface\AddOns\pMinimap\font.ttf]=])
@@ -259,8 +244,12 @@ function pMinimap:ADDON_LOADED(event, addon)
 	SLASH_PMINIMAP2 = '/pminimap'
 	SlashCmdList.PMINIMAP = slashHandler
 
-	self:LoadDefaults()
+	pMinimapDB = setmetatable(pMinimapDB or {}, {__index = defaults})
+	pMinimapDB.unlocked = false
+
+	self.db = pMinimapDB
 	self.onCoordUpdate = onUpdate
+	self:UnregisterEvent(event)
 
 	InterfaceOptionsDisplayPanelShowClock.setFunc('1')
 	InterfaceOptionsDisplayPanelShowClock.setFunc = function() end
diff --git a/pMinimap/pMinimap.toc b/pMinimap/pMinimap.toc
index 35c95f3..043d3ae 100644
--- a/pMinimap/pMinimap.toc
+++ b/pMinimap/pMinimap.toc
@@ -1,6 +1,6 @@
-## Interface: 30000
+## Interface: 30100
 ## Author: p3lim
-## Version: 30000.wowi:revision
+## Version: 30100.wowi:revision
 ## Title: |cffff6000p|rMinimap
 ## Notes: Yet another square minimap addon
 ## SavedVariablesPerCharacter: pMinimapDB
-- 
1.7.9.5