Changeset 3241

Timestamp:

02/02/10 21:33:15 (5 weeks ago)

Author:

ghoulsblade

Message:

uoam and partypositions visible in compass, premake option:soundopenalonly, chattabs:filtered some system stuff from chat, MacroCmd_WalkInDir bgugfix, removed some debug output

Location:

trunk

Files:

• lua/gui/gui.chat.lua (modified) (1 diff)
• lua/lib.compass.lua (modified) (2 diffs)
• lua/lib.macrolist.lua (modified) (1 diff)
• lua/net/net.cursor.lua (modified) (1 diff)
• lua/net/net.mobile.lua (modified) (2 diffs)
• lua/net/net.objectpicker.lua (modified) (2 diffs)
• lua/net/net.partysystem.lua (modified) (1 diff)
• lua/net/net.uoam.lua (modified) (2 diffs)
• lua/net/net.walk.lua (modified) (6 diffs)
• premake.lua (modified) (1 diff)

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 clilocid == nil) then bMatch = true end
+                if (channel.bNormalChat and src == "normal" 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.compass.lua

@@ -574 +574 @@
         
         if gbCompassShowMobiles then
-            -- update dots
+                        -- update dots
+            local dots = {}
             local l = GetMobileList()
-            local count = countarr(l) + countarr(gPositionMarkers[gCompassMapIndex] or {})
+            -- show mobiles
+            for k,mobile in pairs(l) do 
+                local r,g,b = GetNotorietyColor(mobile.notoriety)
+                local a = 1
+                                table.insert(dots,{mobile.xloc, mobile.yloc,r,g,b,a})
+                        end
+            -- show marked spots
+            for k,mark in pairs(gPositionMarkers[gCompassMapIndex] or {}) do 
+                local xloc,yloc,r,g,b,a = unpack(mark)
+                                table.insert(dots,{xloc,yloc,r,g,b,a})
+                        end
+                        -- show uoam positions
+                        local uoamPosList = UOAM_GetOtherPositions()
+                        for name,data in pairs(uoamPosList) do -- {xloc=?,yloc=?,bIsOnSameFacet=?}
+                                if (data.bIsOnSameFacet) then 
+                                        local r,g,b,a = 0,0.5,0,1
+                                        table.insert(dots,{data.xloc,data.yloc,r,g,b,a})
+                                end
+                        end
+                        -- show party positions
+                        for serial,pos in pairs(PartySystem_GetMemberPosList()) do 
+                                if (pos.facet == MapGetMapIndex()) then 
+                                        local r,g,b,a = 0,0.8,0,1
+                                        table.insert(dots,{pos.xloc,pos.yloc,r,g,b,a})
+                                end
+                        end
+                        
+                        
+                        local count = #dots
             
             local mygfx = gIrisCompassDialog.mapdot.gfx
             mygfx:RenderableBegin(4 * count,6 * count,true,false,OT_TRIANGLE_LIST)
-
             local halfwidth = 3
-            
             local index = 0
-            
-            -- show mobiles
-            for k,mobile in pairs(l) do 
-                local px,py = GetRelativeCompasUOPositionInPx(mobile.xloc, mobile.yloc)
-                local r,g,b = GetNotorietyColor(mobile.notoriety)
-                local a = 1
-                                
+            for k,dot in ipairs(dots) do 
+                local xloc,yloc,r,g,b,a = unpack(dot)
+                local px,py = GetRelativeCompasUOPositionInPx(xloc,yloc)
                 mygfx:RenderableVertex(((mx - halfwidth + px)/vw * 2.0 - 1.0),((my - halfwidth + py)/vh * (-2.0) + 1.0),z, 0,0, r,g,b,a)
                 mygfx:RenderableVertex(((mx + halfwidth + px)/vw * 2.0 - 1.0),((my - halfwidth + py)/vh * (-2.0) + 1.0),z, 1,0, r,g,b,a)
@@ -597 +620 @@
                 mygfx:RenderableIndex3(index+0,index+1,index+2)
                 mygfx:RenderableIndex3(index+1,index+3,index+2)
-                
                 index = index + 4
             end
-            -- show marked spots
-            for k,mark in pairs(gPositionMarkers[gCompassMapIndex] or {}) do 
-                local xloc,yloc,r,g,b,a = unpack(mark)
-                local px,py = GetRelativeCompasUOPositionInPx(xloc, yloc)
-                
-                mygfx:RenderableVertex(((mx - halfwidth + px)/vw * 2.0 - 1.0),((my - halfwidth + py)/vh * (-2.0) + 1.0),z, 0,0, r,g,b,a)
-                mygfx:RenderableVertex(((mx + halfwidth + px)/vw * 2.0 - 1.0),((my - halfwidth + py)/vh * (-2.0) + 1.0),z, 1,0, r,g,b,a)
-                mygfx:RenderableVertex(((mx - halfwidth + px)/vw * 2.0 - 1.0),((my + halfwidth + py)/vh * (-2.0) + 1.0),z, 0,1, r,g,b,a)
-                mygfx:RenderableVertex(((mx + halfwidth + px)/vw * 2.0 - 1.0),((my + halfwidth + py)/vh * (-2.0) + 1.0),z, 1,1, r,g,b,a)
-                mygfx:RenderableIndex3(index+0,index+1,index+2)
-                mygfx:RenderableIndex3(index+1,index+3,index+2)
-                
-                index = index + 4
-            end
-            
             mygfx:RenderableEnd()
         

trunk/lua/lib.macrolist.lua

@@ -1072 +1072 @@
 end
 
-function MacroCmd_WalkInDir     (iDir,bRunFlag) ExecWalkRequestIfPossible(iDir,bRunFlag) end
+function MacroCmd_WalkInDir     (iDir,bRunFlag,bTrySides) WalkStep_WalkInDir(iDir,bRunFlag,bTrySides) end
 
 -- run from a job (uses wait) !!!! 

trunk/lua/net/net.cursor.lua

@@ -53 +53 @@
 -- Send Targetcursor (0x6c)
 function Send_Target (bIsPos,flag,serial,x,y,z,model,bIsCancel)
-        print("Send_Target",bIsPos,hex(flag),hex(serial),x,y,z,hex(model))
+        --~ print("Send_Target",bIsPos,hex(flag),hex(serial),x,y,z,hex(model))
         --printf("NET: Send_Target: %d 0x%02x 0x%08x %d %d %d 0x%04x\n",bIsPos and 1 or 0,flag,serial,x or 0,y or 0,z or 0,model or 0)
         

trunk/lua/net/net.mobile.lua

@@ -184 +184 @@
         stats.mobstatversion    = MySave_PopNetUint8()
         
-        print("stats.mobstatversion",hex(stats.mobstatversion))
+        --~ print("stats.mobstatversion",hex(stats.mobstatversion))
         
         -- mobstatversion : http://docs.polserver.com/packets/index.php?Packet=0x11
@@ -250 +250 @@
         end
 
+        if (iBytesLeft == 2 and gPolServer) then stats.unknown_pol = MySave_PopNetUint16() end -- avoid annoying warning in console
         --printf("NET : kPacket_Mobile_Stats mobile=0x%08x name=%s\n",mobileserial,stats.name)
         

trunk/lua/net/net.objectpicker.lua

@@ -52 +52 @@
         data.entrynum           = input:PopNetUint8()
         sizeleft = sizeleft - 1
-        print("kPacket_Object_Picker",SmartDump(data))
+        --~ print("kPacket_Object_Picker",SmartDump(data))
         data.entrylist = {}
         for i = 1,data.entrynum do
@@ -73 +73 @@
                 
                 if (entry.namelen > 0) then entry.name = input:PopFilledString(entry.namelen) end
-                print("kPacket_Object_Picker entry",SmartDump(entry))
+                --~ print("kPacket_Object_Picker entry",SmartDump(entry))
                 table.insert(data.entrylist,entry)
         end

trunk/lua/net/net.partysystem.lua

@@ -30 +30 @@
 gPartyMemberPosList = {} -- Hook_PartyPos -- {[serial]={serial=?,xloc=?,yloc=?,facet=?},...}  , 0xF0 packet, protocol extension
 RegisterListener("Hook_PartyPos", function (partyposlist) gPartyMemberPosList = partyposlist end)
+
+function PartySystem_GetMemberPosList () return gPartyMemberPosList end -- key=serial,val=pos{xloc=?,yloc=?,facet=?}
 
 -- can see party members not in sightrange using 0xF0 packet

trunk/lua/net/net.uoam.lua

@@ -64 +64 @@
         return kUOAM_Facet.felu
 end
-
 
 function UOAM_Start (name,pass,server,port)
@@ -262 +261 @@
 end
 function UOAM_SendChat (text)
-        UOAM_PushChat(gUOAMSendFIFO,gUOAMName,gUOAMPass,text)
+        print("############################")
+        print("UOAM_SendChat","#"..tostring(text).."#")
+        UOAM_PushChat(gUOAMSendFIFO,gUOAMName,gUOAMPass,"    "..text)
         UOAM_TrafficStep()
 end

trunk/lua/net/net.walk.lua

@@ -211 +211 @@
                 if (not WalkQueueOkForNextSend()) then
                         if (Client_GetTicks() > gWalkRequestAntiStuckTimeout) then
-                                print("++++++++++++++++++++++++++++++ walk:walk-request-timeout,sending resync-request")
+                                --~ print("++++++++++++++++++++++++++++++ walk:walk-request-timeout,sending resync-request")
                                 Send_Movement_Resync_Request()
                         else
@@ -283 +283 @@
         out:PushNetUint32(iFastKey)
         out:SendPacket()
-        print("++++++++++++++++++++++++++++++ walk:request",sprintf("0x%04x",iFullDir),iSeqNum,WalkGetInterval(TestBit(iFullDir,kWalkFlag_Run)))
+        --~ print("++++++++++++++++++++++++++++++ walk:request",sprintf("0x%04x",iFullDir),iSeqNum,WalkGetInterval(TestBit(iFullDir,kWalkFlag_Run)))
 end
 
@@ -292 +292 @@
         local id = input:PopNetUint8()
         local iSeqNum = input:PopNetUint8()
-        print("++++++++++++++++++++++++++++++ walk:accept",iSeqNum)
+        --~ print("++++++++++++++++++++++++++++++ walk:accept",iSeqNum)
         local player_notoriety = input:PopNetUint8()
         local playermobile = GetPlayerMobile()
@@ -317 +317 @@
 function ResetWalkQueue ()
         --~ WalkLog("ResetWalkQueue start")
-        print("ResetWalkQueue,gNextWalkSequenceNumber=0")
-        print(_TRACEBACK())
+        --~ print("ResetWalkQueue,gNextWalkSequenceNumber=0")
+        --~ print(_TRACEBACK())
         gNextWalkSequenceNumber = 0
         gWalkRequests = {}
@@ -368 +368 @@
         out:PushNetUint8(hex2num("0x00"))
         out:SendPacket()
-        print("++++++++++++++++++++++++++++++ Send_Accept_Block_Movement",seqnumber)
+        --~ print("++++++++++++++++++++++++++++++ Send_Accept_Block_Movement",seqnumber)
 end
 
@@ -387 +387 @@
         out:PushNetUint8(0)
         out:SendPacket()
-        print("++++++++++++++++++++++++++++++ Send_Movement_Resync_Request,0,0")
+        --~ print("++++++++++++++++++++++++++++++ Send_Movement_Resync_Request,0,0")
 end
 

trunk/premake.lua

@@ -55 +55 @@
 if (options["nosound"]) then            gLugreUseOpenAlSoft = false gbUseSoundOpenAl = false gbUseSoundFmod = false print(">>> nosound") end
 if (options["soundfmodonly"]) then      gLugreUseOpenAlSoft = false gbUseSoundOpenAl = false gbUseSoundFmod = true  print(">>> soundfmodonly") end
+if (options["soundopenalonly"]) then    gLugreUseOpenAlSoft = false gbUseSoundOpenAl =true gbUseSoundFmod = false  print(">>> soundopenalonly") end
 
 gLugreDir = "lugre"