diff --git a/server/main.cpp b/server/main.cpp index a132c96..a86f4f0 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -26,10 +26,10 @@ #include "character_manager.hpp" #include "client_manager.hpp" #include "config_utility.hpp" -#include "door_manager.hpp" #include "monster_manager.hpp" #include "room_manager.hpp" #include "udp_network_utility.hpp" +#include "waypoint_manager.hpp" #include #include @@ -43,10 +43,10 @@ int main(int argc, char* argv[]) { CharacterManager::CreateSingleton(); ClientManager::CreateSingleton(); ConfigUtility::CreateSingleton(); - DoorManager::CreateSingleton(); MonsterManager::CreateSingleton(); RoomManager::CreateSingleton(); UDPNetworkUtility::CreateSingleton(); + WaypointManager::CreateSingleton(); //call the server's routines ServerApplication::CreateSingleton(); @@ -63,10 +63,10 @@ int main(int argc, char* argv[]) { CharacterManager::DeleteSingleton(); ClientManager::DeleteSingleton(); ConfigUtility::DeleteSingleton(); - DoorManager::DeleteSingleton(); MonsterManager::DeleteSingleton(); RoomManager::DeleteSingleton(); UDPNetworkUtility::DeleteSingleton(); + WaypointManager::DeleteSingleton(); } catch(exception& e) { cerr << "Fatal exception thrown: " << e.what() << endl; diff --git a/server/makefile b/server/makefile index b798e8b..0c8fff1 100644 --- a/server/makefile +++ b/server/makefile @@ -1,5 +1,5 @@ #include directories -INCLUDES+=. accounts characters clients doors entities monsters rooms server_utilities ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities +INCLUDES+=. accounts characters clients entities monsters rooms server_utilities waypoints ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities #libraries #the order of the $(LIBS) is important, at least for MinGW @@ -28,11 +28,11 @@ all: $(OBJ) $(OUT) $(MAKE) -C accounts $(MAKE) -C characters $(MAKE) -C clients - $(MAKE) -C doors $(MAKE) -C entities $(MAKE) -C monsters $(MAKE) -C rooms $(MAKE) -C server_utilities + $(MAKE) -C waypoints $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) $(OBJ): | $(OBJDIR) diff --git a/server/server_application.hpp b/server/server_application.hpp index 37b33bc..72d890c 100644 --- a/server/server_application.hpp +++ b/server/server_application.hpp @@ -26,9 +26,9 @@ #include "account_manager.hpp" #include "character_manager.hpp" #include "client_manager.hpp" -#include "door_manager.hpp" #include "monster_manager.hpp" #include "room_manager.hpp" +#include "waypoint_manager.hpp" //utilities #include "config_utility.hpp" @@ -123,9 +123,9 @@ private: AccountManager& accountMgr = AccountManager::GetSingleton(); CharacterManager& characterMgr = CharacterManager::GetSingleton(); ClientManager& clientMgr = ClientManager::GetSingleton(); - DoorManager& doorMgr = DoorManager::GetSingleton(); MonsterManager& monsterMgr = MonsterManager::GetSingleton(); RoomManager& roomMgr = RoomManager::GetSingleton(); + WaypointManager& waypointMgr = WaypointManager::GetSingleton(); ConfigUtility& config = ConfigUtility::GetSingleton(); UDPNetworkUtility& network = UDPNetworkUtility::GetSingleton(); diff --git a/server/server_logic.cpp b/server/server_logic.cpp index df88632..5e93167 100644 --- a/server/server_logic.cpp +++ b/server/server_logic.cpp @@ -201,9 +201,9 @@ void ServerApplication::Quit() { accountMgr.UnloadAll(); characterMgr.UnloadAll(); clientMgr.UnloadAll(); - doorMgr.UnloadAll(); monsterMgr.UnloadAll(); roomMgr.UnloadAll(); + waypointMgr.UnloadAll(); //APIs lua_close(luaState); diff --git a/server/doors/makefile b/server/waypoints/makefile similarity index 87% rename from server/doors/makefile rename to server/waypoints/makefile index 3585271..2a5c671 100644 --- a/server/doors/makefile +++ b/server/waypoints/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. ../entities ../server_utilities ../../common/utilities +INCLUDES+=. ../server_utilities ../../common/utilities LIBS+= CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) diff --git a/server/doors/door_data.hpp b/server/waypoints/waypoint_data.cpp similarity index 67% rename from server/doors/door_data.hpp rename to server/waypoints/waypoint_data.cpp index fbd009d..229d597 100644 --- a/server/doors/door_data.hpp +++ b/server/waypoints/waypoint_data.cpp @@ -19,31 +19,5 @@ * 3. This notice may not be removed or altered from any source * distribution. */ -#ifndef DOORDATA_HPP_ -#define DOORDATA_HPP_ +#include "waypoint_data.hpp" -#include "entity.hpp" -#include "vector2.hpp" - -#include - -class DoorData: public Entity { -public: - DoorData() = default; - ~DoorData() = default; - - //accessors & mutators - std::string SetRoomName(std::string); - Vector2 SetDestPosition(Vector2); - - std::string GetRoomName(); - Vector2 GetDestPosition(); - -private: - friend class DoorManager; - - std::string roomName; - Vector2 destPosition; -}; - -#endif \ No newline at end of file diff --git a/server/doors/door_data.cpp b/server/waypoints/waypoint_data.hpp similarity index 75% rename from server/doors/door_data.cpp rename to server/waypoints/waypoint_data.hpp index c03f5a2..d1d3f77 100644 --- a/server/doors/door_data.cpp +++ b/server/waypoints/waypoint_data.hpp @@ -19,20 +19,18 @@ * 3. This notice may not be removed or altered from any source * distribution. */ -#include "door_data.hpp" +#ifndef WAYPOINTDATA_HPP_ +#define WAYPOINTDATA_HPP_ -std::string DoorData::SetRoomName(std::string s) { - return roomName = s; -} +#include -Vector2 DoorData::SetDestPosition(Vector2 v) { - return destPosition = v; -} +class WaypointData { +public: + WaypointData() = default; + ~WaypointData() = default; -std::string DoorData::GetRoomName() { - return roomName; -} +private: + friend class WaypointManager; +}; -Vector2 DoorData::GetDestPosition() { - return destPosition; -} +#endif \ No newline at end of file diff --git a/server/doors/door_manager.cpp b/server/waypoints/waypoint_manager.cpp similarity index 66% rename from server/doors/door_manager.cpp rename to server/waypoints/waypoint_manager.cpp index f2c3ebe..fe0889b 100644 --- a/server/doors/door_manager.cpp +++ b/server/waypoints/waypoint_manager.cpp @@ -19,48 +19,48 @@ * 3. This notice may not be removed or altered from any source * distribution. */ -#include "door_manager.hpp" +#include "waypoint_manager.hpp" -int DoorManager::Create(std::string, Vector2) { +int WaypointManager::Create() { //TODO } -int DoorManager::Load(std::string, Vector2) { +int WaypointManager::Load() { //TODO } -int DoorManager::Save(int uid) { +int WaypointManager::Save(int uid) { //TODO } -void DoorManager::Unload(int uid) { +void WaypointManager::Unload(int uid) { //TODO } -void DoorManager::Delete(int uid) { +void WaypointManager::Delete(int uid) { //TODO } -void DoorManager::UnloadAll() { +void WaypointManager::UnloadAll() { //TODO } -void DoorManager::UnloadIf(std::function)> fn) { +void WaypointManager::UnloadIf(std::function)> fn) { //TODO } -DoorData* DoorManager::Get(int uid) { +WaypointData* WaypointManager::Get(int uid) { //TODO } -int DoorManager::GetLoadedCount() { +int WaypointManager::GetLoadedCount() { //TODO } -int DoorManager::GetTotalCount() { +int WaypointManager::GetTotalCount() { //TODO } -std::map* DoorManager::GetContainer() { +std::map* WaypointManager::GetContainer() { //TODO } diff --git a/server/doors/door_manager.hpp b/server/waypoints/waypoint_manager.hpp similarity index 71% rename from server/doors/door_manager.hpp rename to server/waypoints/waypoint_manager.hpp index 908da7d..f4975aa 100644 --- a/server/doors/door_manager.hpp +++ b/server/waypoints/waypoint_manager.hpp @@ -19,10 +19,10 @@ * 3. This notice may not be removed or altered from any source * distribution. */ -#ifndef DOORMANAGER_HPP_ -#define DOORMANAGER_HPP_ +#ifndef WAYPOINTMANAGER_HPP_ +#define WAYPOINTMANAGER_HPP_ -#include "door_data.hpp" +#include "waypoint_data.hpp" #include "manager_interface.hpp" #include "singleton.hpp" #include "vector2.hpp" @@ -30,32 +30,32 @@ #include #include -class DoorManager: - public Singleton, - public ManagerInterface +class WaypointManager: + public Singleton, + public ManagerInterface { public: //common public methods - int Create(std::string, Vector2) override; - int Load(std::string, Vector2) override; + int Create() override; + int Load() override; int Save(int uid) override; void Unload(int uid) override; void Delete(int uid) override; void UnloadAll() override; - void UnloadIf(std::function)> fn) override; + void UnloadIf(std::function)> fn) override; //accessors & mutators - DoorData* Get(int uid) override; + WaypointData* Get(int uid) override; int GetLoadedCount() override; int GetTotalCount() override; - std::map* GetContainer() override; + std::map* GetContainer() override; private: - friend Singleton; + friend Singleton; - DoorManager() = default; - ~DoorManager() = default; + WaypointManager() = default; + ~WaypointManager() = default; }; #endif \ No newline at end of file