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

fix: fast display option being ignored on power up

Browse Source
This commit is contained in:
Dan
2021-03-13 13:01:45 +00:00
parent 25fdcf721e
commit 6ec766eb82
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cl_radar.lua
View File

@@ -502,7 +502,7 @@ function RADAR:SetPowerState( state, instantOverride )
self.vars.power = state self.vars.power = state
-- Send the NUI message to toggle the power -- Send the NUI message to toggle the power
SendNUIMessage( { _type = "radarPower", state = state, override = instantOverride } ) SendNUIMessage( { _type = "radarPower", state = state, override = instantOverride, fast = self:IsFastDisplayEnabled() } )
-- Power is now turned on -- Power is now turned on
if ( self:IsPowerOn() ) then if ( self:IsPowerOn() ) then
@@ -520,7 +520,7 @@ function RADAR:SetPowerState( state, instantOverride )
self:SetPoweringUpState( false ) self:SetPoweringUpState( false )
-- Let the UI side know the system has loaded -- Let the UI side know the system has loaded
SendNUIMessage( { _type = "poweredUp" } ) SendNUIMessage( { _type = "poweredUp", fast = self:IsFastDisplayEnabled() } )
end ) end )
end end
else else

12
nui/radar.js
View File

@@ -494,7 +494,7 @@ function poweringUp()
} }
// Simulates the 'fully powered' state of the radar unit // Simulates the 'fully powered' state of the radar unit
function poweredUp() function poweredUp( fastDisplay )
{ {
// Completely clear everything // Completely clear everything
clearEverything(); clearEverything();
@@ -505,14 +505,14 @@ function poweredUp()
// Even though the clearEverything() function is called above, we run this so the fast window // Even though the clearEverything() function is called above, we run this so the fast window
// displays 'HLd' // displays 'HLd'
setAntennaXmit( ant, false ); setAntennaXmit( ant, false );
setAntennaFastMode( ant, true ); setAntennaFastMode( ant, fastDisplay );
} }
} }
// Runs the startup process or clears everything, the Lua side calls for the full powered up state // Runs the startup process or clears everything, the Lua side calls for the full powered up state
function radarPower( state, override ) function radarPower( state, override, fastDisplay )
{ {
state ? ( override ? poweredUp() : poweringUp() ) : clearEverything(); state ? ( override ? poweredUp( fastDisplay ) : poweringUp() ) : clearEverything();
} }
@@ -1114,10 +1114,10 @@ window.addEventListener( "message", function( event ) {
setEleVisible( elements.radar, item.state ); setEleVisible( elements.radar, item.state );
break; break;
case "radarPower": case "radarPower":
radarPower( item.state, item.override ); radarPower( item.state, item.override, item.fast );
break; break;
case "poweredUp": case "poweredUp":
poweredUp(); poweredUp( item.fast );
break; break;
case "update": case "update":
updateDisplays( item.speed, item.antennas ); updateDisplays( item.speed, item.antennas );