[Orxonox-commit 7288] r11905 - in code/branches/Masterserver_FS18: data/gui/layouts src/libraries/network/packet

[mdedial at orxonox.net]

Author: mdedial
Date: 2018-04-26 13:48:45 +0200 (Thu, 26 Apr 2018)
New Revision: 11905

Modified:
   code/branches/Masterserver_FS18/data/gui/layouts/MultiplayerMenu.layout
   code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc
Log:
Add "Refresh" button to Multiplayer menu.


Modified: code/branches/Masterserver_FS18/data/gui/layouts/MultiplayerMenu.layout
===================================================================
--- code/branches/Masterserver_FS18/data/gui/layouts/MultiplayerMenu.layout	2018-04-25 12:20:39 UTC (rev 11904)
+++ code/branches/Masterserver_FS18/data/gui/layouts/MultiplayerMenu.layout	2018-04-26 11:48:45 UTC (rev 11905)
@@ -22,15 +22,21 @@
             <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerLanButton" >
                 <Property Name="Text" Value="LAN"/>
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.87,0},{0.4,0},{0.97,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.87,0},{0.25,0},{0.97,0}}" />
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.LanButton_clicked"/>
             </Window>
             <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerInternetButton" >
                 <Property Name="Text" Value="Internet" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.87,0},{0.8,0},{0.97,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.87,0},{0.6,0},{0.97,0}}" />
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.InternetButton_clicked"/>
             </Window>
+            <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerRefreshButton" >
+                <Property Name="Text" Value="Refresh" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.75,0},{0.87,0},{0.95,0},{0.97,0}}" />
+                <Event Name="Clicked" Function="MultiplayerMenu.showServerList" />
+            </Window>
         </Window>
          <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >
             <Property Name="Text" Value="Back" />

Modified: code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc	2018-04-25 12:20:39 UTC (rev 11904)
+++ code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc	2018-04-26 11:48:45 UTC (rev 11905)
@@ -233,7 +233,6 @@
             orxout(user_error, context::packets) << "Found duplicate objectIDs on the client!" << endl
                                                  << "Are you sure you don't create a Sychnronisable objcect with 'new' \
                                                      that doesn't have objectMode = 0x0?" << endl;
-            assert(false);
           }
         }
         v1.push_back(synchronisable->getObjectID());