Merge pull request #20 from usermicrodevices/develop

fix GameLogic warnings

Author: usermicrodevices

CMakeLists.txt

@@ -4,6 +4,8 @@ project(GameServer)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+find_package(fmt REQUIRED)
+
 if(NOT TARGET asio::asio)
     message(STATUS "ASIO not found via find_package, using manual configuration")
     set(ASIO_DIR "${CMAKE_SOURCE_DIR}/thirdparty/asio")
@@ -169,6 +171,8 @@ target_link_libraries(gameserver PRIVATE
     OpenSSL::SSL
     OpenSSL::Crypto
     Python3::Python
+    fmt::fmt
+    spdlog::spdlog
 )
 
 # Compiler flags
@@ -178,6 +182,8 @@ else()
     target_compile_options(gameserver PRIVATE -Wall -Wextra -pedantic)
 endif()
 
+target_link_options(gameserver PRIVATE -Wl,-Bsymbolic)
+
 # Installation
 install(TARGETS gameserver DESTINATION bin)
 install(DIRECTORY config/ DESTINATION config)

include/game/GameLogic.hpp

@@ -10,11 +10,15 @@
 // #include "logging/Logger.hpp"
 // #include "network/ConnectionManager.hpp"
 // #include "database/DbManager.hpp"
-//
-// #include "game/ChunkLOD.hpp"
-// #include "game/CollisionSystem.hpp"
+
 #include "game/LogicCore.hpp"
 #include "game/PlayerManager.hpp"
+#include "game/InventorySystem.hpp"
+#include "game/LootTableManager.hpp"
+#include "game/MobSystem.hpp"
+#include "game/SkillSystem.hpp"
+#include "game/QuestManager.hpp"
+#include "game/EntityManager.hpp"
 
 class GameLogic : public LogicCore
 {

include/game/InventorySystem.hpp

@@ -26,7 +26,7 @@ class InventorySystem {
 
     // Inventory management
     bool AddItem(uint64_t playerId, const LootItem& item, int quantity = 1);
-    bool RemoveItem(uint64_t playerId, const std::string& itemId, int quantity = 1);
+    bool RemoveItem(uint64_t playerId, uint64_t itemId, int quantity = 1);
     bool MoveItem(uint64_t playerId, int fromSlot, int toSlot);
     bool SwapItems(uint64_t playerId, int slot1, int slot2);
     bool SplitStack(uint64_t playerId, int slot, int splitQuantity);
@@ -35,12 +35,12 @@ class InventorySystem {
     // Equipment management
     bool EquipItem(uint64_t playerId, int inventorySlot);
     bool UnequipItem(uint64_t playerId, int equipmentSlot);
-    bool AutoEquip(uint64_t playerId, const std::string& itemId);
+    bool AutoEquip(uint64_t playerId, uint64_t itemId);
 
     // Query methods
     std::shared_ptr<LootItem> GetItem(uint64_t playerId, int slot);
-    int GetItemCount(uint64_t playerId, const std::string& itemId) const;
-    bool HasItem(uint64_t playerId, const std::string& itemId, int quantity = 1) const;
+    int GetItemCount(uint64_t playerId, uint64_t itemId) const;
+    bool HasItem(uint64_t playerId, uint64_t itemId, int quantity = 1) const;
     std::vector<InventorySlot> GetInventory(uint64_t playerId) const;
     std::vector<InventorySlot> GetEquipment(uint64_t playerId) const;
 
@@ -50,8 +50,8 @@ class InventorySystem {
     bool HasSpaceFor(uint64_t playerId, const LootItem& item, int quantity = 1) const;
 
     // Trading
-    bool CanTradeItem(uint64_t playerId, const std::string& itemId) const;
-    bool TransferItem(uint64_t fromPlayerId, uint64_t toPlayerId, const std::string& itemId, int quantity);
+    bool CanTradeItem(uint64_t playerId, uint64_t itemId) const;
+    bool TransferItem(uint64_t fromPlayerId, uint64_t toPlayerId, uint64_t itemId, int quantity);
 
     // Serialization
     bool LoadInventory(uint64_t playerId);
@@ -97,7 +97,7 @@ class InventorySystem {
 
     // Helper methods
     bool ValidateSlot(uint64_t playerId, int slot) const;
-    int FindItemSlot(uint64_t playerId, const std::string& itemId) const;
+    int FindItemSlot(uint64_t playerId, uint64_t itemId) const;
     int FindFreeSlot(uint64_t playerId) const;
     bool CanStackWithSlot(const InventorySlot& slot, const LootItem& item) const;
     bool IsEquipmentSlot(int slot) const;

include/game/LootItem.hpp

@@ -46,10 +46,10 @@ struct ItemModifier {
 class LootItem {
 public:
     LootItem();
-    LootItem(const std::string& id, const std::string& name, ItemType type, LootRarity rarity);
+    LootItem(uint64_t id, const std::string& name = "", ItemType type = ItemType::MATERIAL, LootRarity rarity = LootRarity::COMMON);
 
     // Getters
-    const std::string& GetId() const { return id_; }
+    uint64_t GetId() const { return id_; }
     const std::string& GetName() const { return name_; }
     ItemType GetType() const { return type_; }
     LootRarity GetRarity() const { return rarity_; }
@@ -83,7 +83,7 @@ class LootItem {
     bool IsConsumable() const;
 
 private:
-    std::string id_;
+    uint64_t id_;
     std::string name_;
     std::string description_;
     ItemType type_;

include/game/Player.hpp

@@ -149,19 +149,19 @@ struct PlayerSettings {
 
 class Player : public GameEntity {
 public:
-    Player(int64_t id, const std::string& username);
+    Player(uint64_t id, const std::string& username);
     Player(const glm::vec3& position);
     Player(const glm::vec3& position, PlayerClass player_class, PlayerRace race);
     virtual ~Player();
 
-    int64_t GetId() const { return id_; }
+    uint64_t GetId() const { return id_; }
     const std::string& GetUsername() const { return username_; }
 
     void UpdatePosition(float x, float y, float z);
     void UpdateHeartbeat();
     bool IsHeartbeatExpired(int timeoutSeconds) const;
-    void ApplyDamage(int damage, int64_t attackerId);
-    void ApplyHealing(int amount, int64_t healerId);
+    void ApplyDamage(int damage, uint64_t attackerId);
+    void ApplyHealing(int amount, uint64_t healerId);
 
     // Player-specific properties
     void SetPlayerClass(PlayerClass player_class) { player_class_ = player_class; }
@@ -320,7 +320,7 @@ class Player : public GameEntity {
     nlohmann::json ToJson() const;
 
 private:
-    int64_t id_;
+    uint64_t id_;
     std::string username_;
 
     //struct Position {float x, y, z;} position_;

include/game/QuestManager.hpp

@@ -234,7 +234,7 @@ class QuestManager {
                          const std::string& objective_id, int delta = 1);
     void OnMonsterKilled(uint64_t entity_id, const std::string& monster_id);
     void OnItemCollected(uint64_t entity_id, const std::string& item_id, int count = 1);
-    void OnNPCTalkedTo(uint64_t entity_id, const std::string& npc_id);
+    void OnNPCTalkedTo(uint64_t entity_id, uint64_t npc_id);
     void OnLocationVisited(uint64_t entity_id, const glm::vec3& location, float radius = 10.0f);
     void OnDungeonCompleted(uint64_t entity_id, const std::string& dungeon_id);
     void OnLevelGained(uint64_t entity_id, int new_level);
@@ -274,8 +274,8 @@ class QuestManager {
     uint64_t GetTrackedQuest(uint64_t entity_id) const;
 
     // --- NPC Interaction ---
-    std::vector<uint64_t> GetQuestsFromNPC(uint64_t entity_id, const std::string& npc_id) const;
-    std::vector<uint64_t> GetQuestsToTurnIn(uint64_t entity_id, const std::string& npc_id) const;
+    std::vector<uint64_t> GetQuestsFromNPC(uint64_t entity_id, uint64_t npc_id) const;
+    std::vector<uint64_t> GetQuestsToTurnIn(uint64_t entity_id, uint64_t npc_id) const;
 
     // --- Statistics ---
     int GetTotalQuestsCompleted(uint64_t entity_id) const;

include/network/ConnectionManager.hpp

@@ -68,8 +68,8 @@ class ConnectionManager {
 
     // Statistics
     struct SessionStatsInfo {
-        std::chrono::steady_clock::time_point start_time;
-        std::chrono::steady_clock::time_point last_activity;
+        std::chrono::system_clock::time_point start_time;
+        std::chrono::system_clock::time_point last_activity;
         uint64_t messages_sent = 0;
         uint64_t messages_received = 0;
         uint64_t bytes_sent = 0;
@@ -157,8 +157,8 @@ class ConnectionManager {
     std::unordered_map<std::string, std::vector<EventHandler>> eventHandlers_;
 
     // Maintenance
-    std::chrono::steady_clock::time_point lastCleanup_;
-    std::chrono::steady_clock::time_point lastMonitor_;
+    std::chrono::system_clock::time_point lastCleanup_;
+    std::chrono::system_clock::time_point lastMonitor_;
 
     // Internal methods
     void AddToGroupInternal(const std::string& groupId, uint64_t sessionId);