[Jrisk-cvs] SF.net SVN: domination-code:[2585] Domination/sharedUI/src_mapstore_lobby/ net/yura/domination/lobby/mini/MiniLobbyRisk.java

[<yu...@us...>]

Revision: 2585
          http://sourceforge.net/p/domination/code/2585
Author:   yuranet
Date:     2024-11-23 22:51:43 +0000 (Sat, 23 Nov 2024)
Log Message:
-----------
close loading screen when game loaded or disconnected

Modified Paths:
--------------
    Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java

Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java	2024-11-23 22:43:26 UTC (rev 2584)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java	2024-11-23 22:51:43 UTC (rev 2585)
@@ -92,35 +92,39 @@
      * @see net.yura.domination.lobby.client.ClientGameRisk#gameObject(java.lang.Object)
      */
     public void objectForGame(Object object) {
-        if (object instanceof RiskGame) {
-            RiskGame thegame = (RiskGame)object;
-            Player player = thegame.getPlayer(lobby.whoAmI());
-            String address = player==null?"_watch_":player.getAddress();
-            myrisk.setOnlinePlay(this);
-            myrisk.setAddress(address);
-            myrisk.setGame(thegame);
-            openGame = true;
-        }
-// TODO remove this legacy message system
-        else if (object instanceof java.util.Map) {
-            java.util.Map map = (java.util.Map)object;
-
-            String command = (String)map.get("command");
-            if ("game".equals(command)) {
-                String address = (String)map.get("playerId");
-                RiskGame thegame = (RiskGame)map.get("game");
+        try {
+            if (object instanceof RiskGame) {
+                RiskGame thegame = (RiskGame) object;
+                Player player = thegame.getPlayer(lobby.whoAmI());
+                String address = player == null ? "_watch_" : player.getAddress();
                 myrisk.setOnlinePlay(this);
                 myrisk.setAddress(address);
                 myrisk.setGame(thegame);
                 openGame = true;
             }
+// TODO remove this legacy message system
+            else if (object instanceof java.util.Map) {
+                java.util.Map map = (java.util.Map) object;
+
+                String command = (String) map.get("command");
+                if ("game".equals(command)) {
+                    String address = (String) map.get("playerId");
+                    RiskGame thegame = (RiskGame) map.get("game");
+                    myrisk.setOnlinePlay(this);
+                    myrisk.setAddress(address);
+                    myrisk.setGame(thegame);
+                    openGame = true;
+                } else {
+                    System.out.println("MiniLobbyRisk unknown command " + command + " " + map);
+                }
+            }
+// END TODO
             else {
-                System.out.println("MiniLobbyRisk unknown command "+command+" "+map);
+                System.out.println("MiniLobbyRisk unknown object " + object);
             }
         }
-// END TODO
-        else {
-            System.out.println("MiniLobbyRisk unknown object "+object);
+        finally {
+            LoadingManager.showLoadingScreen(false);
         }
     }
 
@@ -137,6 +141,7 @@
     }
 
     public void disconnected() {
+        LoadingManager.showLoadingScreen(false);
         myrisk.disconnected();
     }