Ticket #3244: t3244_keep_player_and_gamelist_selection_v2_r16728.patch

binaries/data/mods/public/gui/lobby/lobby.js

@@ -1 +1 @@
 var g_ChatMessages = [];
 var g_Name = "unknown";
 var g_GameList = {};
+var g_filteredGameList = {};
+var g_selectedGameIP = "";
+var g_selectedNick = "";
 var g_specialKey = Math.random();
 // This object looks like {"name":[numMessagesSinceReset, lastReset, timeBlocked]} when in use.
 var g_spamMonitor = {};
 var g_timestamp = Engine.ConfigDB_GetValue("user", "lobby.chattimestamp") == "true";
 var g_mapSizes = {};
@@ -154 +157 @@
  * @return Array containing the player, presence, nickname, and rating listings.
  */
 function updatePlayerList()
 {
     var playersBox = Engine.GetGUIObjectByName("playersBox");
+    
+    // Save previously selected player
+    if (playersBox.selected > -1)
+        g_selectedNick = playersBox.list[playersBox.selected];
+        
     var playerList = [];
     var presenceList = [];
     var nickList = [];
     var ratingList = [];
     var cleanPlayerList = Engine.GetPlayerList();
@@ -189 +197 @@
     }
     playersBox.list_name = playerList;
     playersBox.list_status = presenceList;
     playersBox.list_rating = ratingList;
     playersBox.list = nickList;
-    if (playersBox.selected >= playersBox.list.length)
-        playersBox.selected = -1;
+    
+    // Select the previously selected player
+    playersBox.selected = playersBox.list.indexOf(g_selectedNick);
+    
     return [playerList, presenceList, nickList, ratingList];
 }
 
 /**
  * Display the profile of the selected player.
@@ -355 +365 @@
  * Update the game listing from data cached in C++.
  */
 function updateGameList()
 {
     var gamesBox = Engine.GetGUIObjectByName("gamesBox");
-    var gameList = Engine.GetGameList();
+    
+    // Save previously selected game by ip
+    if (gamesBox.selected > -1)
+        g_selectedGameIP = g_filteredGameList[gamesBox.selected].ip;
+    
     // Store the game whole game list data so that we can access it later
     // to update the game info panel.
-    g_GameList = gameList;
+    g_GameList = Engine.GetGameList();
 
     // Sort the list of games to that games 'waiting' are displayed at the top, followed by 'init', followed by 'running'.
     var gameStatuses = ['waiting', 'init', 'running'];
     g_GameList.sort(function (a,b) {
         if (gameStatuses.indexOf(a.state) < gameStatuses.indexOf(b.state))
@@ -386 +400 @@
     var list_nPlayers = [];
     var list = [];
     var list_data = [];
 
     var c = 0;
-    for (var g of gameList)
+    var selectedIndex = -1;
+    for (var g of g_GameList)
     {
         if (!filterGame(g))
         {
             // 'waiting' games are highlighted in orange, 'running' in red, and 'init' in green.
             let name = escapeText(g.name);
@@ -400 +415 @@
                 name = '[color="255 127 0"]' + name + '[/color]';
             else
                 name = '[color="255 0 0"]' + name + '[/color]';
             list_name.push(name);
             list_ip.push(g.ip);
+            if (g.ip == g_selectedGameIP)
+                selectedIndex = list_ip.length - 1;
             list_mapName.push(translate(g.niceMapName));
             list_mapSize.push(translatedMapSize(g.mapSize));
             let idx = g_mapTypes.indexOf(g.mapType);
             list_mapType.push(idx != -1 ? g_mapTypesText[idx] : "");
             list_nPlayers.push(g.nbp + "/" +g.tnbp);
             list.push(name);
             list_data.push(c);
         }
         c++;
     }
-
+    g_filteredGameList = g_GameList.filter(g => !filterGame(g));
+    
     gamesBox.list_name = list_name;
     gamesBox.list_mapName = list_mapName;
     gamesBox.list_mapSize = list_mapSize;
     gamesBox.list_mapType = list_mapType;
     gamesBox.list_nPlayers = list_nPlayers;
     gamesBox.list = list;
     gamesBox.list_data = list_data;
 
-    if (gamesBox.selected >= gamesBox.list_name.length)
-        gamesBox.selected = -1;
-
+    // Select previously selected game
+    gamesBox.selected = selectedIndex;
+    
     // Update info box about the game currently selected
     updateGameSelection();
 }
 
 /**
@@ -627 +645 @@
             var playerList = playersBox.list_name;
             var presenceList = playersBox.list_status;
             var nickList = playersBox.list;
             var ratingList = playersBox.list_rating;
             var nickIndex = nickList.indexOf(nick);
+
+            // Save the previously selected nickname
+            if (playersBox.selected > -1)
+                g_selectedNick = playersBox.list[playersBox.selected];
+
             switch(message.level)
             {
             case "join":
                 if (nick == g_Name)
                 {
@@ -662 +685 @@
                 addChatMessage({ "text": "/special " + sprintf(translate("%(nick)s has left."), { nick: nick }), "key": g_specialKey });
                 break;
             case "nick":
                 if (nickIndex == -1) // This shouldn't ever happen
                     break;
+                
                 if (!isValidNick(message.data))
                 {
                     addChatMessage({ "from": "system", "text": sprintf(translate("Invalid nickname: %(nick)s"), { nick: message.data })});
                     break;
                 }
@@ -693 +717 @@
             }
             // Push new data to GUI
             playersBox.list_name = playerList;
             playersBox.list_status = presenceList;
             playersBox.list_rating = ratingList;
-            playersBox.list = nickList;     
-            if (playersBox.selected >= playersBox.list.length)
-                playersBox.selected = -1;
+            playersBox.list = nickList;
+            // Select the previously selected player
+            playersBox.selected = nickList.indexOf(g_selectedNick);
             break;
         case "system":
             switch (message.level)
             {
             case "standard":