diff options
author | Aki <please@ignore.pl> | 2024-03-12 00:31:44 +0100 |
---|---|---|
committer | Aki <please@ignore.pl> | 2024-03-12 00:31:44 +0100 |
commit | 2914a714cebae7f30d47362dfe50c39cb6621163 (patch) | |
tree | 1bbf4cb36448279ff7ee4f2a4e8b484485f06c1f /Starserver/StarServer.cpp | |
parent | bee3cae04a8789cfdc1688ae6d2d47c387431783 (diff) | |
download | starshatter-2914a714cebae7f30d47362dfe50c39cb6621163.zip starshatter-2914a714cebae7f30d47362dfe50c39cb6621163.tar.gz starshatter-2914a714cebae7f30d47362dfe50c39cb6621163.tar.bz2 |
Removed some connections from Starserver and Game to Types.h
This was intended to be wider but DataLoader seems to stop progress
once again. This in turn asks for rework of FoundationEx, Readers and
Virtual Filesystem.
Diffstat (limited to 'Starserver/StarServer.cpp')
-rw-r--r-- | Starserver/StarServer.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/Starserver/StarServer.cpp b/Starserver/StarServer.cpp index ab3d0fb..ea10639 100644 --- a/Starserver/StarServer.cpp +++ b/Starserver/StarServer.cpp @@ -4,7 +4,6 @@ Copyright (c) 1997-2006, Destroyer Studios LLC. AUTHOR: John DiCamillo - */ #include "StarServer.h" @@ -13,30 +12,31 @@ #include <iostream> #include <thread> -#include "Campaign.h" -#include "Clock.h" -#include "CombatRoster.h" -#include "DataLoader.h" -#include "Drive.h" -#include "Explosion.h" -#include "FlightDeck.h" -#include "Galaxy.h" -#include "Game.h" -#include "ModConfig.h" +#include <Campaign.h> +#include <Clock.h> +#include <CombatRoster.h> +#include <DataLoader.h> +#include <Drive.h> +#include <Explosion.h> +#include <FlightDeck.h> +#include <Galaxy.h> +#include <Game.h> +#include <ModConfig.h> +#include <NetGame.cpp> +#include <NetLobby.h> +#include <NetLobbyServer.h> +#include <NetServerConfig.h> +#include <RadioTraffic.h> +#include <Random.h> +#include <Ship.h> +#include <Shot.h> +#include <Sim.h> +#include <SystemDesign.h> +#include <Types.h> +#include <Utils.h> +#include <WeaponDesign.h> + #include "NetAdminServer.h" -#include "NetGame.cpp" -#include "NetLobby.h" -#include "NetLobbyServer.h" -#include "NetServerConfig.h" -#include "RadioTraffic.h" -#include "Random.h" -#include "Ship.h" -#include "Shot.h" -#include "Sim.h" -#include "SystemDesign.h" -#include "Types.h" -#include "Utils.h" -#include "WeaponDesign.h" StarServer* StarServer::instance {nullptr}; @@ -109,11 +109,11 @@ StarServer::~StarServer() bool -StarServer::Init(HINSTANCE hi, HINSTANCE hpi, LPSTR cmdline, int nCmdShow) +StarServer::Init() { if (auto loader = DataLoader::GetLoader()) loader->UseFileSystem(false); - return Game::Init(hi, hpi, cmdline, nCmdShow); + return Game::Init(); } |