fix cyclic includes

Author: usermicrodevices

include/database/DbManager.hpp

@@ -47,9 +47,12 @@ class DbManager {
     bool IsInitialized() const { return initialized_; }
 
     // Backend Management
+    bool SaveGameState(const std::string& key, const nlohmann::json& state);
     bool SetBackend(DatabaseType type, const nlohmann::json& config);
     DatabaseBackend* GetBackend() const { return backend_.get(); }
     DatabaseType GetCurrentType() const { return currentType_; }
+    nlohmann::json Query(const std::string& sql) { return backend_->Query(sql); };
+    nlohmann::json GetPlayer(uint64_t playerId){ return backend_->GetPlayer(playerId); };
 
     // Configuration
     bool LoadConfiguration(const std::string& configPath = "");
@@ -85,6 +88,11 @@ class DbManager {
     static DbManager* instance_;
 
     std::unique_ptr<DatabaseBackend> backend_;
+// #ifdef USE_CITUS
+//     std::unique_ptr<CitusClient> backend_;
+// #else
+//     std::unique_ptr<PostgreSqlClient> backend_;
+// #endif
     DatabaseType currentType_;
     nlohmann::json config_;
     std::atomic<bool> initialized_;

include/game/GameLogic.hpp

@@ -6,18 +6,17 @@
 #include <glm/glm.hpp>
 #include <nlohmann/json.hpp>
 
-#include "config/ConfigManager.hpp"
-#include "logging/Logger.hpp"
-#include "network/ConnectionManager.hpp"
-#include "database/DbManager.hpp"
-
-#include "game/LogicWorld.hpp"
-#include "game/LogicEntity.hpp"
-#include "game/ChunkLOD.hpp"
-#include "game/CollisionSystem.hpp"
-
-
-class GameLogic {
+// #include "config/ConfigManager.hpp"
+// #include "logging/Logger.hpp"
+// #include "network/ConnectionManager.hpp"
+// #include "database/DbManager.hpp"
+//
+// #include "game/ChunkLOD.hpp"
+// #include "game/CollisionSystem.hpp"
+#include "game/LogicCore.hpp"
+
+class GameLogic : public LogicCore
+{
 public:
     static GameLogic& GetInstance();
 
@@ -122,10 +121,11 @@ class GameLogic {
     // Component systems
     LogicWorld worldLogic_;
     LogicEntity entityLogic_;
-    
+    //PlayerManager& playerManager_;
+
     // Database backend
     std::unique_ptr<DatabaseBackend> databaseBackend_;
-    
+
     // Connection manager for broadcasting
     std::shared_ptr<ConnectionManager> connectionManager_;
 

include/game/LogicCore.hpp

@@ -21,14 +21,20 @@
 //#include "config/ConfigManager.hpp"
 //#include "logging/Logger.hpp"
 //#include "database/DbManager.hpp"
+#include "game/RAIIThread.hpp"
 #include "game/PlayerManager.hpp"
+#include "game/LogicWorld.hpp"
+#include "game/LogicEntity.hpp"
 
 class PythonScripting;
 class ScriptHotReloader;
 #include "scripting/PythonScripting.hpp"
 
 class LogicCore {
 public:
+    LogicCore();
+    ~LogicCore();
+
     using MessageHandler = std::function<void(uint64_t sessionId, const nlohmann::json&)>;
     using BinaryMessageHandler = std::function<void(uint64_t sessionId, uint16_t messageType, const std::vector<uint8_t>&)>;
     using EventCallback = std::function<void()>;
@@ -81,15 +87,13 @@ class LogicCore {
     bool CheckRateLimit(uint64_t sessionId);
 
 protected:
-    LogicCore();
-    virtual ~LogicCore();
 
     // Threading
     RAIIThread gameLoopThread_;
     RAIIThread spawnerThread_;
     RAIIThread saveThread_;
 
-    std::atomic<bool> running_{false};
+    std::atomic<bool> running_;
     std::chrono::milliseconds gameLoopInterval_{16};
 
     std::condition_variable gameLoopCV_;
@@ -122,11 +126,11 @@ class LogicCore {
 
     // References to other systems
     PlayerManager& playerManager_;
-    CitusClient& dbClient_;
+    DbManager& dbManager_;
 
     PythonScripting& pythonScripting_;
     std::unique_ptr<ScriptHotReloader> scriptHotReloader_;
-    bool pythonEnabled_{false};
+    bool pythonEnabled_;
 
     // Random generator
     std::mt19937 rng_;
@@ -136,15 +140,15 @@ class LogicCore {
     virtual void SpawnerLoop();
     virtual void SaveLoop();
 
-    // ADDED: Missing method declarations
+    // method declarations
     void ProcessGameTick(float deltaTime);
     void SpawnEnemies();
     void RespawnNPCs();
     void SpawnResources();
     void SaveGameState();
     void CleanupOldData();
 
-    // ADDED: Missing handler declarations
+    // handler declarations
     void HandleLogin(uint64_t sessionId, const nlohmann::json& data);
     void HandleChat(uint64_t sessionId, const nlohmann::json& data);
     void HandleCombat(uint64_t sessionId, const nlohmann::json& data);