vinzenz/servicepoint-tanks
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update servicepoint (#22)

Browse source
This commit is contained in:
Vinzenz Schroeter 2024-09-07 15:33:29 +02:00 • committed by GitHub
commit 1ecd11a9e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell.nix
View file

@ -1,11 +1,23 @@
{pkgs ? import <nixpkgs> {}}: {pkgs ? import <nixpkgs> {}}:
let
rust-toolchain = pkgs.symlinkJoin {
name = "rust-toolchain";
paths = with pkgs; [rustc cargo rustPlatform.rustcSrc rustfmt clippy];
};
in
pkgs.mkShell { pkgs.mkShell {
nativeBuildInputs = with pkgs.buildPackages; [ nativeBuildInputs = with pkgs.buildPackages; [
rustup rust-toolchain
pkg-config pkg-config
xe xe
lzma lzma
cargo-tarpaulin cargo-tarpaulin
gnumake gnumake
iconv
dotnet-sdk_8
]; ];
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
} }

4
tanks-backend/TanksServer/Interactivity/SendToServicePointDisplay.cs
View file

@ -18,7 +18,7 @@ internal sealed class SendToServicePointDisplay : IFrameConsumer
private readonly MapService _mapService; private readonly MapService _mapService;
private readonly ILogger<SendToServicePointDisplay> _logger; private readonly ILogger<SendToServicePointDisplay> _logger;
private readonly PlayerServer _players; private readonly PlayerServer _players;
private readonly ByteGrid _scoresBuffer; private readonly Cp437Grid _scoresBuffer;
private readonly TimeSpan _minFrameTime; private readonly TimeSpan _minFrameTime;
private readonly IOptionsMonitor<HostConfiguration> _options; private readonly IOptionsMonitor<HostConfiguration> _options;
@ -43,7 +43,7 @@ internal sealed class SendToServicePointDisplay : IFrameConsumer
var localIp = GetLocalIPv4(displayConfig.Value).Split('.'); var localIp = GetLocalIPv4(displayConfig.Value).Split('.');
Debug.Assert(localIp.Length == 4); Debug.Assert(localIp.Length == 4);
_scoresBuffer = ByteGrid.New(12, 20); _scoresBuffer = Cp437Grid.New(12, 20);
_scoresBuffer[00] = "== TANKS! =="; _scoresBuffer[00] = "== TANKS! ==";
_scoresBuffer[01] = "-- scores --"; _scoresBuffer[01] = "-- scores --";

2
tanks-backend/TanksServer/TanksServer.csproj
View file

@ -21,7 +21,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="DotNext.Threading" Version="5.3.0" /> <PackageReference Include="DotNext.Threading" Version="5.3.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
tanks-backend/servicepoint

@ -1 +1 @@
Subproject commit ff713690e3799eaaf7aed5ec5ac557cc91d96178 Subproject commit c5cb6475b24fdcdcd073ea44457628daed4e21a6