From eec9a6b5b3196cda1a1ae3bdb7760f3302f403ec Mon Sep 17 00:00:00 2001
From: braker <7152322+araszka@users.noreply.github.com>
Date: Sat, 7 Oct 2023 13:45:56 +0200
Subject: [PATCH] Fix scoreboard (#223)

---
 .../Templates/Components/PlayerRow/ClubTag.mt |  4 ++--
 .../Components/PlayerRow/Framemodel.mt        |  4 ++--
 .../Components/PlayerRow/PlayerActions.mt     |  4 ++--
 .../Scoreboard/Templates/Scoreboard.mt        | 24 +++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/ClubTag.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/ClubTag.mt
index 35227ac35..d38cca467 100644
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/ClubTag.mt
+++ b/src/Modules/Scoreboard/Templates/Components/PlayerRow/ClubTag.mt
@@ -8,8 +8,8 @@
               size="{{ h * 2 }} {{ h }}"
               valign="center"
               modulatecolor="000"
-              image="file://Media/Manialinks/Nadeo/TMNext/Menus/Common/Common_Flag_Mask.dds"
-              alphamask="file://Media/Manialinks/Nadeo/TMNext/Menus/Common/Common_Flag_Mask.dds"
+              image="file://Media/Manialinks/Nadeo/Trackmania/Menus/PageClub/ClubActivities/Clubs_ActivityIcon_Mask.dds"
+              alphamask="file://Media/Manialinks/Nadeo/Trackmania/Menus/PageClub/ClubActivities/Clubs_ActivityIcon_Mask.dds"
               hidden="{{ hidden }}"
         />
 
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/Framemodel.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/Framemodel.mt
index 204d1a46c..5374b4c55 100644
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/Framemodel.mt
+++ b/src/Modules/Scoreboard/Templates/Components/PlayerRow/Framemodel.mt
@@ -59,8 +59,8 @@
                 <quad id="flag"
                       size="{{ rowInnerHeight * 2 }} {{ rowInnerHeight }}"
                       valign="center"
-                      image="file://Media/Manialinks/Nadeo/TMNext/Menus/Common/Common_Flag_Mask.dds"
-                      alphamask="file://Media/Manialinks/Nadeo/TMNext/Menus/Common/Common_Flag_Mask.dds"
+                      image="file://Media/Manialinks/Nadeo/Trackmania/Menus/PageClub/ClubActivities/Clubs_ActivityIcon_Mask.dds"
+                      alphamask="file://Media/Manialinks/Nadeo/Trackmania/Menus/PageClub/ClubActivities/Clubs_ActivityIcon_Mask.dds"
                 />
 
                <ClubTag h="{{ rowInnerHeight }}" />
diff --git a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerActions.mt b/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerActions.mt
index 2aa8fac77..be4c74717 100644
--- a/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerActions.mt
+++ b/src/Modules/Scoreboard/Templates/Components/PlayerRow/PlayerActions.mt
@@ -49,8 +49,8 @@
             }else if (Event.Control.ControlId == "show_player_profile") {
                 declare playerRow = (Event.Control.Parent.Parent as CMlFrame);
                 declare CSmScore playerScore for playerRow;
-                declare Text LibTMxSMRaceScoresTable_OpenProfileUserId for ClientUI = "";
-                LibTMxSMRaceScoresTable_OpenProfileUserId = playerScore.User.WebServicesUserId;
+                declare Text TMGame_ScoresTable_OpenProfileUserId for ClientUI = "";
+                TMGame_ScoresTable_OpenProfileUserId = playerScore.User.WebServicesUserId;
                 TogglePlayerActions(playerRow);
             }
         ***
diff --git a/src/Modules/Scoreboard/Templates/Scoreboard.mt b/src/Modules/Scoreboard/Templates/Scoreboard.mt
index 670093eef..23378f242 100644
--- a/src/Modules/Scoreboard/Templates/Scoreboard.mt
+++ b/src/Modules/Scoreboard/Templates/Scoreboard.mt
@@ -110,9 +110,9 @@
         #Include "MathLib" as ML
         #Include "TextLib" as TL
         #Include "ColorLib" as CL
-        #Include "Libs/Nadeo/ModeLibs/TrackMania/MV_Utils.Script.txt" as MV_Utils
-        #Include "ManiaApps/Nadeo/TMxSM/Race/UIModules/ScoresTable_Common.Script.txt" as UIModules_ScoresTable
-        #Include "ManiaApps/Nadeo/TMxSM/Race/UIModules/Helpers_Client.Script.txt" as RaceHelpers
+        #Include "Libs/Nadeo/TMGame/Modes/MV_Utils.Script.txt" as MV_Utils
+        #Include "Libs/Nadeo/TMGame/Modes/Base/UIModules/ScoresTable_Common.Script.txt" as UIModules_ScoresTable
+        #Include "Libs/Nadeo/TMGame/Modes/Base/UIModules/Helpers_Client.Script.txt" as RaceHelpers
     
         #Const C_Status_Disconnected	0
         #Const C_Status_Spawned			1
@@ -260,9 +260,9 @@
                 return;
             }
             
-            declare netread Text[][Text] Net_TMxSM_ScoresTable_CustomPoints for Teams[0];
+            declare netread Text[][Text] Net_TMGame_ScoresTable_CustomPoints for Teams[0];
             declare netread Integer[Text] Net_TMxSM_ScoresTable_CustomTimes for Teams[0];
-            declare Boolean CustomPointsEnabled = Net_TMxSM_ScoresTable_CustomPoints.existskey(Score.User.WebServicesUserId);
+            declare Boolean CustomPointsEnabled = Net_TMGame_ScoresTable_CustomPoints.existskey(Score.User.WebServicesUserId);
             declare Boolean Race_ScoresTable_IsSpectator for Score = False;
             declare ScoresTable_PlayerLastUpdate for Score = -1;
             declare Boolean PlayerIsConnected = ScoresTable_PlayerLastUpdate == Now;
@@ -284,13 +284,13 @@
                 declare CustomLabelColorHex = "000";
                 declare CustomLabelValue = "";
                 
-                if (Net_TMxSM_ScoresTable_CustomPoints[Score.User.WebServicesUserId].existskey(C_CustomPoints_Text)) {
-                    CustomLabelValue = Net_TMxSM_ScoresTable_CustomPoints[Score.User.WebServicesUserId][C_CustomPoints_Text];
+                if (Net_TMGame_ScoresTable_CustomPoints[Score.User.WebServicesUserId].existskey(C_CustomPoints_Text)) {
+                    CustomLabelValue = Net_TMGame_ScoresTable_CustomPoints[Score.User.WebServicesUserId][C_CustomPoints_Text];
                 }else{
                     CustomLabelValue = "";
                 }
-                if (Net_TMxSM_ScoresTable_CustomPoints[Score.User.WebServicesUserId].existskey(C_CustomPoints_Color)) {
-                    CustomLabelColorHex = Net_TMxSM_ScoresTable_CustomPoints[Score.User.WebServicesUserId][C_CustomPoints_Color];
+                if (Net_TMGame_ScoresTable_CustomPoints[Score.User.WebServicesUserId].existskey(C_CustomPoints_Color)) {
+                    CustomLabelColorHex = Net_TMGame_ScoresTable_CustomPoints[Score.User.WebServicesUserId][C_CustomPoints_Color];
                 }
             
                 if(CustomLabelValue != ""){
@@ -584,7 +584,7 @@
         <!--
         *** OnInitialization ***
         ***
-            declare netread Integer Net_TMxSM_ScoresTable_ScoreMode for Teams[0];
+            declare netread Integer Net_TMGame_ScoresTable_ScoreMode for Teams[0];
             declare Integer scoreboardUpdateInterval = 333;
             declare Integer lastScoreboardUpdate = 0;
             RowsFrame <=> (Page.MainFrame.GetFirstChild("frame_scroll") as CMlFrame);
@@ -613,8 +613,8 @@
                 lastScoreboardUpdate = Now;
             }
             
-            if(CurrentScoreMode != Net_TMxSM_ScoresTable_ScoreMode){
-                CurrentScoreMode = Net_TMxSM_ScoresTable_ScoreMode;
+            if(CurrentScoreMode != Net_TMGame_ScoresTable_ScoreMode){
+                CurrentScoreMode = Net_TMGame_ScoresTable_ScoreMode;
                 UpdateScoreboardLayout();
                 log("[EvoSC#] Update scoreboard layout.");
             }