PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' of https://github.com/TorchAPI/Torch

Browse Source
This commit is contained in:
N1Ran
2021-04-25 21:30:51 -04:00
parent af894e7507 a5743701ea
commit 966b2f5756
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Torch/VRageGame.cs
View File

@@ -164,11 +164,15 @@ namespace Torch
_log.Info("Initializing UGC services"); _log.Info("Initializing UGC services");
IMyGameService service; IMyGameService service;
IMyUGCService serviceInstance; IMyUGCService serviceInstance;
var aggregator = new MyServerDiscoveryAggregator();
if (TorchBase.Instance.Config.UgcServiceType == UGCServiceType.Steam) if (TorchBase.Instance.Config.UgcServiceType == UGCServiceType.Steam)
{ {
service = MySteamGameService.Create(dedicated, _appSteamId); service = MySteamGameService.Create(dedicated, _appSteamId);
serviceInstance = MySteamUgcService.Create(_appSteamId, service); serviceInstance = MySteamUgcService.Create(_appSteamId, service);
MySteamGameService.InitNetworking(dedicated, service, (MyServerDiscoveryAggregator) MyGameService.ServerDiscovery); MySteamGameService.InitNetworking(dedicated,
service,
"Space Engineers",
aggregator);
} }
else else
{ {
@@ -179,11 +183,19 @@ namespace Torch
MyPlatformGameSettings.UGC_TEST_ENVIRONMENT, true); MyPlatformGameSettings.UGC_TEST_ENVIRONMENT, true);
MyEOSService.InitNetworking(dedicated, MyEOSService.InitNetworking(dedicated,
dedicated ? MyPerServerSettings.GameDSName : MyPerServerSettings.GameNameSafe, service, dedicated ? MyPerServerSettings.GameDSName : MyPerServerSettings.GameNameSafe,
"xyza7891A4WeGrpP85BTlBa3BSfUEABN", "ZdHZVevSVfIajebTnTmh5MVi3KPHflszD9hJB7mRkgg", service,
"24b1cd652a18461fa9b3d533ac8d6b5b", "1958fe26c66d4151a327ec162e4d49c8", "xyza7891A4WeGrpP85BTlBa3BSfUEABN",
"07c169b3b641401496d352cad1c905d6", "https://retail.epicgames.com/", MyEOSService.CreatePlatform(), "ZdHZVevSVfIajebTnTmh5MVi3KPHflszD9hJB7mRkgg",
MySandboxGame.ConfigDedicated.VerboseNetworkLogging, null, Enumerable.Empty<string>(), (MyServerDiscoveryAggregator) MyGameService.ServerDiscovery, null); "24b1cd652a18461fa9b3d533ac8d6b5b",
"1958fe26c66d4151a327ec162e4d49c8",
"07c169b3b641401496d352cad1c905d6",
"https://retail.epicgames.com/",
MyEOSService.CreatePlatform(),
MySandboxGame.ConfigDedicated.VerboseNetworkLogging,
Enumerable.Empty<string>(),
(MyServerDiscoveryAggregator) MyGameService.ServerDiscovery,
null);
var mockingInventory = new MyMockingInventory(service); var mockingInventory = new MyMockingInventory(service);
MyServiceManager.Instance.AddService<IMyInventoryService>(mockingInventory); MyServiceManager.Instance.AddService<IMyInventoryService>(mockingInventory);