- Modified item buying logic: selected items are purchased immediately without having to click the "buy" button, and they stay in the list of purchased items until the round is started. (-> It's possible to see which items have been purchased and cancel purchases).

- Clients can be given a permission to manage the campaign (atm selecting which location to head towards and buying items).
- Syncing cargomanager state with clients.
- Misc fixes.
This commit is contained in:
Joonas Rikkonen
2017-09-17 15:55:24 +03:00
parent b292a301cf
commit 9114ae658f
13 changed files with 271 additions and 151 deletions
@@ -44,9 +44,13 @@ namespace Barotrauma
{
selectedConnection = connection;
selectedLocation = highlightedLocation;
OnLocationSelected?.Invoke(selectedLocation, selectedConnection);
//GameMain.LobbyScreen.SelectLocation(highlightedLocation, connection);
//clients aren't allowed to select the location without a permission
if (GameMain.Client == null || GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign))
{
OnLocationSelected?.Invoke(selectedLocation, selectedConnection);
GameMain.Client?.SendCampaignState();
}
}
}
@@ -54,6 +58,7 @@ namespace Barotrauma
if (PlayerInput.DoubleClicked() && highlightedLocation != null)
{
currentLocation = highlightedLocation;
OnLocationChanged?.Invoke(currentLocation);
}
#endif
}