Skip to content

scoreboard: Trigger events improvements #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2023
Merged

scoreboard: Trigger events improvements #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ae3a6
Push fixes.
sacr1ficez Jan 15, 2023
c2d6bb1
Use shared type in meta.xml
sacr1ficez Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions [gameplay]/scoreboard/dxscoreboard_client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ addEventHandler( "onClientResourceStart", resourceRoot,
bindKey( settingsKey, "down", "Open scoreboard settings", "1" )

addEventHandler( "onClientRender", root, drawScoreboard )
triggerServerEvent( "onClientDXScoreboardResourceStart", root )
readScoreboardSettings()
triggerServerEvent( "requestServerInfo", root )
triggerServerEvent( "requestServerInfo", localPlayer )

colorPicker.constructor()
end
Expand All @@ -87,7 +86,7 @@ function sendServerInfo( output )
serverInfo = output
end
addEvent( "sendServerInfo", true )
addEventHandler( "sendServerInfo", resourceRoot, sendServerInfo )
addEventHandler( "sendServerInfo", root, sendServerInfo )

function toggleScoreboard( _, state )
state = iif( state == "1", true, false )
Expand Down Expand Up @@ -218,7 +217,7 @@ function doDrawScoreboard( rtPass, onlyAnim, sX, sY )
if not (windowSettings and isElement( windowSettings )) then
showCursor( false )
end
triggerServerEvent( "requestServerInfo", root )
triggerServerEvent( "requestServerInfo", localPlayer )
end
scoreboardDrawn = true
end
Expand Down Expand Up @@ -791,7 +790,7 @@ end


addEvent( "doScoreboardAddColumn", true )
addEventHandler( "doScoreboardAddColumn", resourceRoot,
addEventHandler( "doScoreboardAddColumn", root,
function ( name, width, friendlyName, priority, fromResource, isImage, imageW, imageH )
scoreboardAddColumn( name, width, friendlyName, priority, nil, fromResource, isImage, imageW, imageH )
end
Expand Down
21 changes: 14 additions & 7 deletions [gameplay]/scoreboard/dxscoreboard_exports.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,20 @@ function scoreboardGetColumnCount()
return #scoreboardColumns
end

function onClientDXScoreboardResourceStart()
for key, column in ipairs( scoreboardColumns ) do
triggerClientEvent( client, "doScoreboardAddColumn", root, column.name, column.width, column.friendlyName, column.priority, nil, column.isImage, column.imageW, column.imageH )
function onPlayerResourceStartScoreboard(startedResource)
local validResource = startedResource == resource

if not validResource then
return false
end

for columnID = 1, #scoreboardColumns do
local columnData = scoreboardColumns[columnID]

triggerClientEvent(source, "doScoreboardAddColumn", source, columnData.name, columnData.width, columnData.friendlyName, columnData.priority, nil, columnData.isImage, columnData.imageW, columnData.imageH)
end
end
addEvent( "onClientDXScoreboardResourceStart", true )
addEventHandler( "onClientDXScoreboardResourceStart", resourceRoot, onClientDXScoreboardResourceStart )
addEventHandler("onPlayerResourceStart", root, onPlayerResourceStartScoreboard)

function requestServerInfo()
local mapmanager = getResourceFromName( "mapmanager" )
Expand All @@ -230,10 +237,10 @@ function requestServerInfo()
output.map = getResourceInfo( map, "name" ) or getResourceName( map )
end
end
triggerClientEvent( client, "sendServerInfo", root, output )
triggerClientEvent( client, "sendServerInfo", client, output )
end
addEvent( "requestServerInfo", true )
addEventHandler( "requestServerInfo", resourceRoot, requestServerInfo )
addEventHandler( "requestServerInfo", root, requestServerInfo )

function removeResourceScoreboardColumns( resource )
if resourceColumns[resource] then
Expand Down
4 changes: 2 additions & 2 deletions [gameplay]/scoreboard/meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<meta>
<min_mta_version server="1.5.8-9.20957"/>
<info author="Awwu" type="script" name="Scoreboard" description="DirectX scoreboard resource" showInResourceBrowser="true" version="2.7.2"/>

<script src="dxscoreboard_shared.lua" type="server" />
<script src="dxscoreboard_shared.lua" type="shared" />
<script src="dxscoreboard_exports.lua" type="server" />
<script src="dxscoreboard_http.lua" type="server" />
<script src="dxscoreboard_client.lua" type="client" />
<script src="dxscoreboard_clientsettings.lua" type="client" />
<script src="dxscoreboard_shared.lua" type="client" />
<script src="dxscoreboard_countries.lua" type="server" />

<script src="colorpicker/colorpicker.lua" type="client" />
Expand Down