added agents and mission code

both incomplete, but should fix some problems with missing data Signed-off-by: Allan <zyenathalous@bellsouth.net>
evemuproject · Apr 2, 2021 · 23205fc · 23205fc
1 parent 478774c
commit 23205fc
Show file tree

Hide file tree

Showing 28 changed files with 3,848 additions and 927 deletions.
diff --git a/src/eve-server/CMakeLists.txt b/src/eve-server/CMakeLists.txt
@@ -618,7 +618,7 @@ SET( test_SOURCE
 SOURCE_GROUP( "src"                FILES ${INCLUDE} )
 SOURCE_GROUP( "src\\account"       FILES ${account_INCLUDE} )
 SOURCE_GROUP( "src\\admin"         FILES ${admin_INCLUDE} )
-#SOURCE_GROUP( "src\\agent"         FILES ${agent_INCLUDE} )
+SOURCE_GROUP( "src\\agents"        FILES ${agent_INCLUDE} )
 SOURCE_GROUP( "src\\alliance"      FILES ${alliance_INCLUDE} )
 SOURCE_GROUP( "src\\cache"         FILES ${cache_INCLUDE} )
 SOURCE_GROUP( "src\\character"     FILES ${character_INCLUDE} )
@@ -655,7 +655,7 @@ SOURCE_GROUP( "src\\system\\test"  FILES ${test_INCLUDE} )
 SOURCE_GROUP( "src"                FILES ${SOURCE} )
 SOURCE_GROUP( "src\\account"       FILES ${account_SOURCE} )
 SOURCE_GROUP( "src\\admin"         FILES ${admin_SOURCE} )
-#SOURCE_GROUP( "src\\agent"         FILES ${agent_SOURCE} )
+SOURCE_GROUP( "src\\agents"        FILES ${agent_SOURCE} )
 SOURCE_GROUP( "src\\alliance"      FILES ${alliance_SOURCE} )
 SOURCE_GROUP( "src\\cache"         FILES ${cache_SOURCE} )
 SOURCE_GROUP( "src\\character"     FILES ${character_SOURCE} )
@@ -675,7 +675,7 @@ SOURCE_GROUP( "src\\mail"          FILES ${mail_SOURCE} )
 SOURCE_GROUP( "src\\manufacturing" FILES ${manufacturing_SOURCE} )
 SOURCE_GROUP( "src\\map"           FILES ${map_SOURCE} )
 SOURCE_GROUP( "src\\market"        FILES ${market_SOURCE} )
-#SOURCE_GROUP( "src\\missions"      FILES ${missions_SOURCE} )
+SOURCE_GROUP( "src\\missions"      FILES ${missions_SOURCE} )
 SOURCE_GROUP( "src\\npc"           FILES ${npc_SOURCE} )
 #SOURCE_GROUP( "src\\planet"        FILES ${planet_SOURCE} )
 #SOURCE_GROUP( "src\\pos"           FILES ${pos_SOURCE} )
@@ -693,7 +693,7 @@ ADD_EXECUTABLE( "${TARGET_NAME}"
                 ${INCLUDE}                ${SOURCE}
                 ${account_INCLUDE}        ${account_SOURCE}
                 ${admin_INCLUDE}          ${admin_SOURCE}
-                #${agent_INCLUDE}          ${agent_SOURCE}
+                ${agent_INCLUDE}          ${agent_SOURCE}
                 ${alliance_INCLUDE}       ${alliance_SOURCE}
                 ${cache_INCLUDE}          ${cache_SOURCE}
                 ${character_INCLUDE}      ${character_SOURCE}
@@ -713,7 +713,7 @@ ADD_EXECUTABLE( "${TARGET_NAME}"
                 ${manufacturing_INCLUDE}  ${manufacturing_SOURCE}
                 ${map_INCLUDE}            ${map_SOURCE}
                 ${market_INCLUDE}         ${market_SOURCE}
-                #${missions_INCLUDE}       ${missions_SOURCE}
+                ${missions_INCLUDE}       ${missions_SOURCE}
                 ${npc_INCLUDE}            ${npc_SOURCE}
                 #${planet_INCLUDE}         ${planet_SOURCE}
                 #${pos_INCLUDE}            ${pos_SOURCE}
@@ -741,7 +741,7 @@ INSTALL( TARGETS "${TARGET_NAME}"
          RUNTIME DESTINATION "bin" )
 INSTALL( FILES "${TARGET_UTILS_DIR}/config/devtools.raw"
          DESTINATION "etc" )
-#Install configuration files as well     
+#Install configuration files as well
 INSTALL( FILES "${TARGET_UTILS_DIR}/config/eve-server.xml"
          DESTINATION "etc" )
 INSTALL( FILES "${TARGET_UTILS_DIR}/config/log.ini"

diff --git a/src/eve-server/Client.cpp b/src/eve-server/Client.cpp
@@ -39,7 +39,7 @@
 #include "corporation/CorporationDB.h"
 #include "fleet/FleetService.h"
 #include "imageserver/ImageServer.h"
-//#include "missions/MissionDataMgr.h"
+#include "missions/MissionDataMgr.h"
 #include "npc/NPC.h"
 //#include "npc/Drone.h"
 //#include "npc/DroneAI.h"

diff --git a/src/eve-server/ConsoleCommands.cpp b/src/eve-server/ConsoleCommands.cpp
@@ -35,7 +35,7 @@
 #include "inventory/ItemDB.h"
 #include "market/MarketDB.h"
 #include "market/MarketMgr.h"
-//#include "missions/MissionDataMgr.h"
+#include "missions/MissionDataMgr.h"
 #include "threading/Threading.h"
 // #include "testing/test.h"
 

diff --git a/src/eve-server/EntityList.cpp b/src/eve-server/EntityList.cpp
@@ -33,12 +33,12 @@
 #include "EntityList.h"
 #include "EVEServerConfig.h"
 #include "ServiceDB.h"
-//#include "agents/Agent.h"
+#include "agents/Agent.h"
 #include "exploration/Probes.h"
 #include "map/MapDB.h"
 #include "market/MarketMgr.h"
 //#include "market/MarketBotMgr.h"
-//#include "missions/MissionDataMgr.h"
+#include "missions/MissionDataMgr.h"
 #include "station/Station.h"
 #include "system/DestinyManager.h"
 #include "system/SystemManager.h"
@@ -307,7 +307,6 @@ void EntityList::RemoveStation(uint32 stationID) {
     m_stations.erase(stationID);
 }
 
-/*
 Agent* EntityList::GetAgent(uint32 agentID) {
     std::map<uint32, Agent*>::iterator res = m_agents.find(agentID);
     if (res != m_agents.end())
@@ -320,7 +319,7 @@ Agent* EntityList::GetAgent(uint32 agentID) {
     }
     m_agents[agentID] = pAgent;
     return pAgent;
-}*/
+}
 
 void EntityList::GetClients(std::vector<Client*> &result) const {
     for (auto cur : m_players)