josh/CaveGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cut Server Kernel32dll crap

Browse Source
This commit is contained in:
scientiist
2023-03-07 16:15:15 -06:00
parent 808361b3d7
commit 6b16dfc324
2 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CaveGame.Client.DesktopGL/CaveGame.Client.DesktopGL.csproj
View File

@@ -51,22 +51,48 @@
<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
</ItemGroup>
<ItemGroup>
<!--None Update="Assets\Scripts\MainMenu.lua">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Assets\Scripts\menu.lua">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Scripts\SingleplayerMenu.lua">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None-->
<None Update="assets\Textures\icon.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<None Update="Steamworks\steam_api64.dll">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial8.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial10.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial10Italic.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial12.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial14.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial16.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial20.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Arial30.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\ComicSans10.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Consolas10.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\Fonts\Consolas12.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Remove="Assets\redherring.txt" />
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
@@ -92,6 +118,7 @@
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<!--Exec Command="xcopy &quot;$(ProjectDir)assets\*.*&quot; &quot;$(TargetDir)assets\\&quot; /E /I /F /Y" /-->
</Target>
<Import Project="..\CaveGame.Server\CaveGame.Server.projitems" Label="Shared" />
<Import Project="..\CaveGame.Client\CaveGame.Client.projitems" Label="Shared" />

37
CaveGame.Server.ConsoleApp/Program.cs
View File

@@ -19,24 +19,21 @@ namespace CaveGame.Server.ConsoleApp
public string Text;
public ConsoleColor Color;
}
//
//
//
//
public static class Program
{
private delegate bool ConsoleCtrlHandlerDelegate(int sig);
#if WINDOZE
[DllImport("Kernel32")]
private static extern bool SetConsoleCtrlHandler(ConsoleCtrlHandlerDelegate handler, bool add);
#else
private static bool SetConsoleCtrlHandler(ConsoleCtrlHandlerDelegate useless, bool shit)
{
return false;
}
#endif
static ConsoleCtrlHandlerDelegate _consoleCtrlHandler;
//#if WINDOZE
//[DllImport("Kernel32")]
//private static extern bool SetConsoleCtrlHandler(ConsoleCtrlHandlerDelegate handler, bool add);
//#else
//private static bool SetConsoleCtrlHandler(ConsoleCtrlHandlerDelegate useless, bool shit)
//{
// return false;
//}
//#endif
//static ConsoleCtrlHandlerDelegate _consoleCtrlHandler;
static int maxlines = 50;
@@ -55,12 +52,12 @@ namespace CaveGame.Server.ConsoleApp
StandaloneGameServer server = new StandaloneGameServer(config, worldMDT);
server.Output = consoleWrapper;
_consoleCtrlHandler += s =>
{
server.Shutdown();
return false;
};
SetConsoleCtrlHandler(_consoleCtrlHandler, true);
//_consoleCtrlHandler += s =>
//{
//server.Shutdown();
//return false;
//};
//SetConsoleCtrlHandler(_consoleCtrlHandler, true);
server.LoadPlugins();
Task.Run(server.Start);
string inputBuf = "";