Michatec/wk_wars2x
1
1
Fork 0
mirror of https://github.com/Michatec/wk_wars2x.git synced 2026-04-01 00:16:27 +02:00
Code Issues Packages Projects Releases Activity

Added sort mode wrappers

Browse Source
This commit is contained in:
Dan
2019-11-07 19:47:36 +00:00
parent 14e8ef06dd
commit 4241e12cce
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cl_radar.lua
View File

@@ -145,6 +145,14 @@ function RADAR:CacheNumOfRays()
self.vars.numberOfRays = #self.rayTraces self.vars.numberOfRays = #self.rayTraces
end end
function RADAR:GetSortModeText()
return self.sorting[self.vars.sortMode].name
end
function RADAR:GetSortModeFunc()
return self.sorting[self.vars.sortMode].func
end
function RADAR:ToggleSortMode() function RADAR:ToggleSortMode()
if ( self.vars.sortMode < #self.sorting ) then if ( self.vars.sortMode < #self.sorting ) then
self.vars.sortMode = self.vars.sortMode + 1 self.vars.sortMode = self.vars.sortMode + 1
@@ -152,7 +160,7 @@ function RADAR:ToggleSortMode()
self.vars.sortMode = 1 self.vars.sortMode = 1
end end
UTIL:Notify( "Radar mode set to " .. self.sorting[self.vars.sortMode].name ) UTIL:Notify( "Radar mode set to " .. self:GetSortModeText() )
end end
--[[------------------------------------------------------------------------ --[[------------------------------------------------------------------------
@@ -394,10 +402,9 @@ function RADAR:Main()
local caughtVehs = self:GetCapturedVehicles() local caughtVehs = self:GetCapturedVehicles()
if ( not UTIL:IsTableEmpty( caughtVehs ) ) then if ( not UTIL:IsTableEmpty( caughtVehs ) ) then
-- table.sort( caughtVehs, RADAR.sorting.fastest ) table.sort( caughtVehs, self:GetSortModeFunc() )
table.sort( caughtVehs, self.sorting[self.vars.sortMode].func )
print( "Printing table for sort mode " .. self.sorting[self.vars.sortMode].name ) print( "Printing table for sort mode " .. self:GetSortModeText() )
for k, v in pairs( caughtVehs ) do for k, v in pairs( caughtVehs ) do
print( tostring( k ) .. " - " .. tostring( v.veh ) .. " - " .. tostring( v.relPos ) .. " - " .. tostring( v.dist ) .. " - " .. tostring( v.speed ) .. " - " .. tostring( v.size ) ) print( tostring( k ) .. " - " .. tostring( v.veh ) .. " - " .. tostring( v.relPos ) .. " - " .. tostring( v.dist ) .. " - " .. tostring( v.speed ) .. " - " .. tostring( v.size ) )
end end