Changeset 3243

Timestamp:

02/03/10 20:05:12 (7 months ago)

Author:

ghoulsblade

Message:

config dialog : uoam tab lists members

Location:

trunk/lua

Files:

• gui/gui.chat.lua (modified) (1 diff)
• lib.configdialog.lua (modified) (3 diffs)
• net/net.uoam.lua (modified) (3 diffs)

trunk/lua/gui/gui.chat.lua

@@ -110 +110 @@
                 if (channel.class_ok) then for k,v in pairs(channel.class_ok) do if (src == v) then bMatch = true break end end end
                 if (channel.filter) then for k,v in pairs(channel.filter) do if (string.find(line2 ,"^"..v)) then bMatch = true break end end end
-                if (channel.bNormalChat and src == "normal" and serial ~= 0xFFFFFFFF and serial ~= 0 and clilocid == nil and name ~= "System") then bMatch = true end
+                if (channel.bNormalChat and src == "normal" and name ~= "script" and serial ~= 0xFFFFFFFF and serial ~= 0 and clilocid == nil and name ~= "System") then bMatch = true end
                 if (bMatch) then self:AddLineToChannel(channel,line2,color) end
         end

trunk/lua/lib.configdialog.lua

@@ -12 +12 @@
 
 function OpenConfigDialog ()
+        ConfigDialog_Close()
     if (not gConfigDialogHotkeyActionGroups) then InitConfigDialogHotkeyActions() end
 
@@ -114 +115 @@
 end
 
-function ConfigDialog_Close () gConfigDialog:Destroy() end
+function ConfigDialog_Close () if (gConfigDialog) then gConfigDialog:Destroy() gConfigDialog = nil end end
 
 
@@ -190 +191 @@
         
     page:AddChild("Button",{label="Disconnect",on_button_click=function () UOAM_Stop() end})
+        
+                        
+        for name,pos in pairs(UOAM_GetOtherPositions()) do 
+        page:AddChild("UOText",{bold=1,text=tostring(name).." : "..tostring(pos and pos.facetname)})
+        end
 end
 

trunk/lua/net/net.uoam.lua

@@ -13 +13 @@
 kUOAM_Facet.malas       = 0x6D -- MapGetMapIndex()=3  109=
 kUOAM_Facet.tokuno      = 0x73 -- MapGetMapIndex()=4  115=
+kUOAM_FacetNameByID = {}
+
+kUOAM_facetid_uo2uoam = {}
+kUOAM_facetid_uo2uoam[kMapIndex.Felucca ] = kUOAM_Facet.felu    
+kUOAM_facetid_uo2uoam[kMapIndex.Trammel ] = kUOAM_Facet.tram    
+kUOAM_facetid_uo2uoam[kMapIndex.Ilshenar] = kUOAM_Facet.ilsh    
+kUOAM_facetid_uo2uoam[kMapIndex.Malas   ] = kUOAM_Facet.malas   
+kUOAM_facetid_uo2uoam[kMapIndex.Tokuno  ] = kUOAM_Facet.tokuno  
+kUOAM_facetid_uoam2uo = FlipTable(kUOAM_facetid_uo2uoam)
+        
+        
+
                                              
 
@@ -57 +69 @@
 function UOAM_GetMyFacetByte ()
         local mapindex = MapGetMapIndex()
-        if (mapindex==0) then return kUOAM_Facet.felu   end
-        if (mapindex==1) then return kUOAM_Facet.tram   end
-        if (mapindex==2) then return kUOAM_Facet.ilsh   end
-        if (mapindex==3) then return kUOAM_Facet.malas  end
-        if (mapindex==4) then return kUOAM_Facet.tokuno end 
+        if (mapindex==kMapIndex.Felucca ) then return kUOAM_Facet.felu  end
+        if (mapindex==kMapIndex.Trammel ) then return kUOAM_Facet.tram  end
+        if (mapindex==kMapIndex.Ilshenar) then return kUOAM_Facet.ilsh  end
+        if (mapindex==kMapIndex.Malas   ) then return kUOAM_Facet.malas end
+        if (mapindex==kMapIndex.Tokuno  ) then return kUOAM_Facet.tokuno        end 
         return kUOAM_Facet.felu
 end
@@ -216 +228 @@
                                 if (gEnableUOAMDebug) then print("uoam:recv:",a,b,c,d,e,f,facetbyte,x,y,z,name) end
                                 if (name ~= gUOAMName) then 
-                                        gUOAMOtherPositions[name] = {xloc=x,yloc=y,bIsOnSameFacet=UOAM_GetMyFacetByte() == facetbyte}
+                                        local facet_uoam = UOAM_GetMyFacetByte()
+                                        local facet_uo = kUOAM_facetid_uoam2uo[facet_uoam]
+                                        gUOAMOtherPositions[name] = {xloc=x,yloc=y,facet=facet_uo,facetname=kMapNameByIndex[facet_uo],bIsOnSameFacet=facet_uoam == facetbyte}
                                 end
                         end