Delete old db and file manipulation functions, more cleanup

TheStarport · Nov 15, 2023 · aa1f339 · aa1f339
1 parent 2de146b
commit aa1f339
Show file tree

Hide file tree

Showing 38 changed files with 245 additions and 880 deletions.
diff --git a/include/API/InternalApi.hpp b/include/API/InternalApi.hpp
@@ -21,4 +21,6 @@ class InternalApi
         static Action<void, Error> FMsgEncodeXml(std::wstring_view xml, char* buffer, uint size, uint& ret);
         static void FMsgSendChat(ClientId client, char* buffer, uint size);
         static Action<void, Error> SendMessage(ClientId to, std::wstring_view message, ClientId from = ClientId(), std::wstring_view = L"");
+
+        static uint CreateID(const std::wstring& nickname);
 };
diff --git a/include/API/Types/SystemId.hpp b/include/API/Types/SystemId.hpp
@@ -18,12 +18,14 @@ class SystemId
 
         Action<std::wstring_view, Error> GetName() const;
         Action<std::wstring, Error> GetNickName() const;
-        Action<std::vector<Universe::IZone*>, Error> GetZones() const;
+        Action<std::vector<Universe::IZone *>, Error> GetZones() const;
+        Action<std::wstring, Error> PositionToSectorCoord(const Vector &pos) const;
         Action<std::vector<SystemId>, Error> GetNeighboringSystems() const; // TODO: Look into Freelancer System Enumerator.
-        Action<std::vector<CSolar*>, Error> GetSolars(bool onlyDockables = false);
+        Action<std::vector<CSolar *>, Error> GetSolars(bool onlyDockables = false);
         Action<std::vector<ClientId>, Error> GetPlayersInSystem(bool includeDocked = false) const;
 
         Action<void, Error> Message(std::wstring_view msg, MessageColor color = MessageColor::Default, MessageFormat format = MessageFormat::Normal);
-        Action<void, Error> PlaySoundOrMusic(std::wstring trackNickNameSound, bool isMusic = false, std::optional<std::pair<Vector, float>> sphere = {});
+        Action<void, Error> PlaySoundOrMusic(const std::wstring &trackNickNameSound, bool isMusic = false,
+                                             const std::optional<std::pair<Vector, float>> &sphere = {});
         Action<uint, Error> KillAllPlayers() const;
 };
diff --git a/include/API/Utils/Serializer.hpp b/include/API/Utils/Serializer.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Core/FLHook.hpp"
+#include "Core/Logger.hpp"
 
 namespace nlohmann
 {

diff --git a/include/Core/ClientServerInterface.hpp b/include/Core/ClientServerInterface.hpp
@@ -72,6 +72,7 @@ class IServerImplHook
         static void __stdcall LocationExit(uint locationId, ClientId client);
         static void __stdcall LocationEnter(uint locationId, ClientId client);
 
+        static bool LoginInnerAfter(const SLoginInfo& li, ClientId client);
         static void __stdcall Login(const SLoginInfo& li, ClientId client);
         static void __stdcall SetManeuver(ClientId client, const XSetManeuver& sm);
         static void __stdcall MineAsteroid(uint systemId, const Vector& pos, uint crateId, uint lootId, uint count, ClientId client);

diff --git a/include/Core/FLHook.hpp b/include/Core/FLHook.hpp
@@ -9,6 +9,7 @@ class ClientList;
 class InfocardManager;
 class Logger;
 class TempBanManager;
+class FlPacket;
 
 class FLHook final
 {
@@ -17,6 +18,7 @@ class FLHook final
         friend InternalApi;
         friend ClientId;
         friend ShipId;
+        friend FlPacket;
 
         // Static things
 
@@ -80,7 +82,6 @@ class FLHook final
 
         static void LoadSettings();
         static void ClearClientInfo(ClientId client);
-        void LoadUserSettings(uint client);
         static void ProcessPendingCommands();
 
         // Timers
@@ -102,9 +103,12 @@ class FLHook final
 
         bool OnServerStart();
         void InitHookExports();
-        void PatchClientImpl();
+        static void PatchClientImpl();
         void UnloadHookExports();
 
+        void LoadUserSettings(ClientId client);
+        bool LoadBaseMarket();
+
         uint damageToClientId;
         uint damageToSpaceId;
 

diff --git a/include/Core/IpResolver.hpp b/include/Core/IpResolver.hpp
@@ -4,6 +4,7 @@ class FLHook;
 class IpResolver
 {
         friend FLHook;
+        friend IServerImplHook;
 
         struct ResolvedIp
         {

diff --git a/include/PCH.cpp b/include/PCH.cpp
@@ -2,6 +2,7 @@
 
 // Dummy file to force build!
 
+#include "API/FLHook/ClientList.hpp"
 #include "Exceptions/InvalidParameterException.hpp"
 
 // Template specializations for arg transformations

diff --git a/project/FLHook.vcxproj b/project/FLHook.vcxproj
@@ -18,13 +18,7 @@
     <ClCompile Include="..\source\API\InternalApi.cpp" />
     <ClCompile Include="..\Source\API\FLHook\ClientList.cpp" />
     <ClCompile Include="..\source\API\FLHook\InfocardManager.cpp" />
-    <ClCompile Include="..\Source\API\FLHook\Mail.cpp" />
     <ClCompile Include="..\Source\API\FLHook\MessageHandler.cpp" />
-    <ClCompile Include="..\Source\API\FLServer\Admin.cpp" />
-    <ClCompile Include="..\Source\API\FLServer\Math.cpp" />
-    <ClCompile Include="..\Source\API\FLServer\PilotPersonalities.cpp" />
-    <ClCompile Include="..\Source\API\FLServer\Player.cpp" />
-    <ClCompile Include="..\Source\API\FLServer\Solar.cpp" />
     <ClCompile Include="..\source\API\Types\AccountId.cpp" />
     <ClCompile Include="..\source\API\Types\BaseId.cpp" />
     <ClCompile Include="..\Source\API\Types\ClientId.cpp" />
@@ -35,9 +29,6 @@
     <ClCompile Include="..\source\API\Types\RepId.cpp" />
     <ClCompile Include="..\source\API\Types\ShipId.cpp" />
     <ClCompile Include="..\source\API\Types\SystemId.cpp" />
-    <ClCompile Include="..\source\API\Utils\FileUtils.cpp" />
-    <ClCompile Include="..\Source\API\Utils\IniUtils.cpp" />
-    <ClCompile Include="..\Source\Core\ApiInternal.cpp" />
     <ClCompile Include="..\Source\Core\Commands\AdminCommandProcessor.cpp" />
     <ClCompile Include="..\Source\Core\Commands\CommandLineParser.cpp" />
     <ClCompile Include="..\Source\Core\Commands\ExternalCommandProcessor.cpp" />
@@ -84,7 +75,6 @@
     <ClCompile Include="..\Source\Hooks\ClientServerInterface\Trade.cpp" />
     <ClCompile Include="..\Source\Hooks\ClientServerInterface\Hooks.cpp" />
     <ClCompile Include="..\Source\Hooks\ClientServerInterface\UserInterface.cpp" />
-    <ClCompile Include="..\Source\Hooks\HkDataBaseMarket.cpp" />
     <ClCompile Include="..\Source\Hooks\HkIChatServer.cpp" />
     <ClCompile Include="..\Source\Hooks\IEngineHook.cpp" />
     <ClCompile Include="..\Source\Hooks\HkIEngineDamage.cpp" />

diff --git a/project/FLHook.vcxproj.filters b/project/FLHook.vcxproj.filters
@@ -22,9 +22,6 @@
     <Filter Include="Source\API\FLHook">
       <UniqueIdentifier>{876be2ae-78a1-4080-970d-c0ea7773b25c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source\API\FLServer">
-      <UniqueIdentifier>{3ec9ac72-9554-4f7f-83ef-85c47f948d0e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Include\API">
       <UniqueIdentifier>{a18e4208-124a-4ccd-9fda-632fa9238c6d}</UniqueIdentifier>
     </Filter>
@@ -114,9 +111,6 @@
     <ClCompile Include="..\Source\Core\Commands\UserCommandProcessor.cpp">
       <Filter>Source\Core\Commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\Source\Hooks\HkDataBaseMarket.cpp">
-      <Filter>Source\Hooks</Filter>
-    </ClCompile>
     <ClCompile Include="..\Source\Hooks\HkIChatServer.cpp">
       <Filter>Source\Hooks</Filter>
     </ClCompile>
@@ -138,27 +132,9 @@
     <ClCompile Include="..\Source\Hooks\SendComm.cpp">
       <Filter>Source\Hooks</Filter>
     </ClCompile>
-    <ClCompile Include="..\Source\API\FLHook\Mail.cpp">
-      <Filter>Source\API\FLHook</Filter>
-    </ClCompile>
     <ClCompile Include="..\Source\API\FLHook\MessageHandler.cpp">
       <Filter>Source\API\FLHook</Filter>
     </ClCompile>
-    <ClCompile Include="..\Source\API\FLServer\Admin.cpp">
-      <Filter>Source\API\FLServer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\API\FLServer\Math.cpp">
-      <Filter>Source\API\FLServer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\API\FLServer\PilotPersonalities.cpp">
-      <Filter>Source\API\FLServer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\API\FLServer\Player.cpp">
-      <Filter>Source\API\FLServer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\API\FLServer\Solar.cpp">
-      <Filter>Source\API\FLServer</Filter>
-    </ClCompile>
     <ClCompile Include="..\Include\PCH.cpp" />
     <ClCompile Include="..\Source\Hooks\ClientServerInterface\Hooks.cpp">
       <Filter>Source\Hooks\ClientServerInterface</Filter>
@@ -250,12 +226,6 @@
     <ClCompile Include="..\Source\Core\Commands\ExternalCommandProcessor.cpp">
       <Filter>Source\Core\Commands</Filter>
     </ClCompile>
-    <ClCompile Include="..\Source\API\Utils\IniUtils.cpp">
-      <Filter>Source\API\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\API\Utils\FileUtils.cpp">
-      <Filter>Source\API\Utils</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\Core\IpResolver.cpp">
       <Filter>Source\Core</Filter>
     </ClCompile>
@@ -265,9 +235,6 @@
     <ClCompile Include="..\source\API\InternalApi.cpp">
       <Filter>Source\API</Filter>
     </ClCompile>
-    <ClCompile Include="..\Source\Core\ApiInternal.cpp">
-      <Filter>Source\Core</Filter>
-    </ClCompile>
     <ClCompile Include="..\Source\API\Types\ClientId.cpp">
       <Filter>Source\API\Types</Filter>
     </ClCompile>

diff --git a/source/API/FLHook/Mail.cpp b/source/API/FLHook/Mail.cpp