epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added comment and a static field for localhost.

Browse Source
This commit is contained in:
WolfGaming
2014-12-07 10:30:57 +00:00
parent f191babec8
commit 20fe03b6c1
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/ServerTraits/PlayerPinger.cs
View File

@@ -35,11 +35,10 @@ namespace OpenRA.Mods.Common.Server
isInitialPing = false; isInitialPing = false;
lastPing = Game.RunTime; lastPing = Game.RunTime;
if (server.LobbyInfo.IsSinglePlayer && server.Conns.Any() && server.GetClient(server.Conns.First()).IpAddress == "127.0.0.1") // Ignore client timeout in singleplayer games to make debugging easier
{ if (server.LobbyInfo.IsSinglePlayer && !server.Settings.Dedicated)
foreach (var c in server.Conns.ToList()) foreach (var c in server.Conns.ToList())
server.SendOrderTo(c, "Ping", Game.RunTime.ToString()); server.SendOrderTo(c, "Ping", Game.RunTime.ToString());
}
else else
{ {
foreach (var c in server.Conns.ToList()) foreach (var c in server.Conns.ToList())

3
OpenRA.Mods.RA/Widgets/Logic/ClientTooltipLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System; using System;
using System.Net;
using OpenRA.Network; using OpenRA.Network;
using OpenRA.Widgets; using OpenRA.Widgets;
@@ -76,7 +77,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
latency.GetText = () => LobbyUtils.LatencyDescription(ping); latency.GetText = () => LobbyUtils.LatencyDescription(ping);
latency.GetColor = () => LobbyUtils.LatencyColor(ping); latency.GetColor = () => LobbyUtils.LatencyColor(ping);
var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress; var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress;
if (address == "127.0.0.1" && UPnP.NatDevice != null) if (address == IPAddress.Loopback.ToString() && UPnP.NatDevice != null)
address = UPnP.NatDevice.GetExternalIP().ToString(); address = UPnP.NatDevice.GetExternalIP().ToString();
var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(address); var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(address);
ip.GetText = () => cachedDescriptiveIP; ip.GetText = () => cachedDescriptiveIP;

3
OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Net;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Widgets; using OpenRA.Mods.Common.Widgets;
using OpenRA.Network; using OpenRA.Network;
@@ -224,7 +225,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
if (ip == null) if (ip == null)
return "Unknown Host"; return "Unknown Host";
if (ip == "127.0.0.1") if (ip == IPAddress.Loopback.ToString())
return "Local Host"; return "Local Host";
return ip; return ip;
} }