Mercurial > wow > emfor1
diff CensusPlus.lua @ 11:663f782bd903
rebase on CensusPlus-40000-5.0.2.zip ; toc update
| author | EmFor |
|---|---|
| date | Sun, 14 Aug 2011 12:10:07 +0200 |
| parents | 10c85be19b56 |
| children | 77d2c7423ed5 |
line wrap: on
line diff
--- a/CensusPlus.lua Fri Dec 10 17:19:53 2010 +0100 +++ b/CensusPlus.lua Sun Aug 14 12:10:07 2011 +0200 @@ -48,13 +48,13 @@ --local CensusPlus_MYGUILD = "The Last Journey"; local CensusPlus_MYGUILD = "Worgengrauen"; --------------------------------------------------------------------------------- -local CensusPlus_VERSION = "4.3.2"; -- version +local CensusPlus_VERSION = "5.0.2"; -- version local CensusPlus_MAXBARHEIGHT = 128; -- Length of blue bars local CensusPlus_NUMGUILDBUTTONS = 10; -- How many guild buttons are on the UI? local MAX_CHARACTER_LEVEL = 85; -- Maximum level a PC can attain --rm local MAX_LEVEL_DISPLAY = 255; -- Maximum level a PC can attain -local MAX_WHO_RESULTS = 48; -- Maximum number of who results the server will return +local MAX_WHO_RESULTS = 49; -- Maximum number of who results the server will return CensusPlus_GUILDBUTTONSIZEY = 16; local CensusPlus_UPDATEDELAY = 5; -- Delay time between /who messages local CP_MAX_TIMES = 50; @@ -205,8 +205,9 @@ g_RaceClassList[CENSUSPlus_UNDEAD] = 27; g_RaceClassList[CENSUSPlus_DRAENEI] = 28; g_RaceClassList[CENSUSPlus_BLOODELF] = 29; -g_RaceClassList[CENSUSPlus_WORGEN] = 31; -g_RaceClassList[CENSUSPlus_GOBLIN] = 32; +g_RaceClassList[CENSUSPlus_WORGEN] = 32; +g_RaceClassList[CENSUSPlus_GOBLIN] = 31; + g_TimeDatabase[CENSUSPlus_DRUID] = 0; g_TimeDatabase[CENSUSPlus_HUNTER] = 0; @@ -499,8 +500,8 @@ -- ----------------------------------------------------------------------------------- local function GetNameLetters() +-- return { "a", "b", "c", "d", "e", "f", "g", "i", "o", "p", "r", "s", "t", "u", "y" }; --rm --- return { "a", "b", "c", "d", "e", "f", "g", "i", "o", "p", "r", "s", "t", "u", "y" }; -- return { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "\195\134", "\195\164", "\195\182", "\195\188", "\195\152" }; return { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "\195\134", "\195\164", "\195\182", "\195\188", "\195\152", "\195\184" }; end @@ -676,7 +677,6 @@ g_WaitingForWhoUpdate = false; CP_Pre_OnEvent(...); - -- -- If we opened the who window, do a manual pause and open a dialog -- @@ -1517,7 +1517,9 @@ end end + CensusPlusTakeButton:SetText( CENSUSPlus_PAUSE ); + end ----------------------------------------------------------------------------------- @@ -2955,6 +2957,7 @@ for i = 1, numRaces, 1 do local race = thisFactionRaces[i]; local buttonName = "CensusPlusRaceBar"..i; + local button = getglobal(buttonName); local thisCount = g_RaceCount[i]; if ((thisCount ~= nil) and (thisCount > 0) and (maxCount > 0)) then @@ -2966,6 +2969,8 @@ button:Hide(); end local normalTextureName="Interface\\AddOns\\CensusPlus\\Skin\\CensusPlus_"..g_RaceClassList[race]; + + local legendName = "CensusPlusRaceLegend"..i; local legend = getglobal(legendName); legend:SetNormalTexture(normalTextureName); @@ -4019,33 +4024,28 @@ SendWho( msg ); end end - function CensusPlus_Options_OnMouseUp(self,...) CensusPlus_Msg('Mouse up'); - if ( self.isMoving ) then self:StopMovingOrSizing(); self.isMoving = false; end end - function CensusPlus_Options_OnMouseDown(self,arg1,arg2,arg3,...) if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then self:StartMoving(); self.isMoving = true; end end - function CensusPlus_Mini_OnMouseDown( self, arg1 ) if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then self:StartMoving(); self.isMoving = true; end end - function CensusPlus_Census_OnMouseDown( self, arg1 ) if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then self:StartMoving(); self.isMoving = true; end -end +end \ No newline at end of file
