From a86a41ad46056c8d6c70b431df1a45ed73f8a336 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 21 Mar 2016 19:28:49 +1100 Subject: [PATCH] Renamed monster files to creatures --- .../{monsters/monster_api.cpp => creatures/creature_api.cpp} | 0 .../{monsters/monster_api.hpp => creatures/creature_api.hpp} | 0 .../monster_data.cpp => creatures/creature_data.cpp} | 0 .../monster_data.hpp => creatures/creature_data.hpp} | 0 .../monster_manager.cpp => creatures/creature_manager.cpp} | 0 .../monster_manager.hpp => creatures/creature_manager.hpp} | 0 .../creature_manager_api.cpp} | 0 .../creature_manager_api.hpp} | 0 server/{monsters => creatures}/makefile | 0 server/makefile | 4 ++-- server/rooms/room_data.hpp | 2 ++ server/server_utilities.cpp | 1 + server/triggers/trigger_data.hpp | 1 + server/triggers/trigger_manager.hpp | 2 +- 14 files changed, 7 insertions(+), 3 deletions(-) rename server/{monsters/monster_api.cpp => creatures/creature_api.cpp} (100%) rename server/{monsters/monster_api.hpp => creatures/creature_api.hpp} (100%) rename server/{monsters/monster_data.cpp => creatures/creature_data.cpp} (100%) rename server/{monsters/monster_data.hpp => creatures/creature_data.hpp} (100%) rename server/{monsters/monster_manager.cpp => creatures/creature_manager.cpp} (100%) rename server/{monsters/monster_manager.hpp => creatures/creature_manager.hpp} (100%) rename server/{monsters/monster_manager_api.cpp => creatures/creature_manager_api.cpp} (100%) rename server/{monsters/monster_manager_api.hpp => creatures/creature_manager_api.hpp} (100%) rename server/{monsters => creatures}/makefile (100%) diff --git a/server/monsters/monster_api.cpp b/server/creatures/creature_api.cpp similarity index 100% rename from server/monsters/monster_api.cpp rename to server/creatures/creature_api.cpp diff --git a/server/monsters/monster_api.hpp b/server/creatures/creature_api.hpp similarity index 100% rename from server/monsters/monster_api.hpp rename to server/creatures/creature_api.hpp diff --git a/server/monsters/monster_data.cpp b/server/creatures/creature_data.cpp similarity index 100% rename from server/monsters/monster_data.cpp rename to server/creatures/creature_data.cpp diff --git a/server/monsters/monster_data.hpp b/server/creatures/creature_data.hpp similarity index 100% rename from server/monsters/monster_data.hpp rename to server/creatures/creature_data.hpp diff --git a/server/monsters/monster_manager.cpp b/server/creatures/creature_manager.cpp similarity index 100% rename from server/monsters/monster_manager.cpp rename to server/creatures/creature_manager.cpp diff --git a/server/monsters/monster_manager.hpp b/server/creatures/creature_manager.hpp similarity index 100% rename from server/monsters/monster_manager.hpp rename to server/creatures/creature_manager.hpp diff --git a/server/monsters/monster_manager_api.cpp b/server/creatures/creature_manager_api.cpp similarity index 100% rename from server/monsters/monster_manager_api.cpp rename to server/creatures/creature_manager_api.cpp diff --git a/server/monsters/monster_manager_api.hpp b/server/creatures/creature_manager_api.hpp similarity index 100% rename from server/monsters/monster_manager_api.hpp rename to server/creatures/creature_manager_api.hpp diff --git a/server/monsters/makefile b/server/creatures/makefile similarity index 100% rename from server/monsters/makefile rename to server/creatures/makefile diff --git a/server/makefile b/server/makefile index 8ec6316..94b2ded 100644 --- a/server/makefile +++ b/server/makefile @@ -1,5 +1,5 @@ #include directories -INCLUDES+=. accounts characters clients entities rooms triggers ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities +INCLUDES+=. accounts characters clients creatures entities rooms triggers ../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 @@ -32,8 +32,8 @@ all: $(OBJ) $(OUT) $(MAKE) -C accounts $(MAKE) -C characters $(MAKE) -C clients + $(MAKE) -C creatures $(MAKE) -C entities -# $(MAKE) -C monsters $(MAKE) -C rooms $(MAKE) -C triggers $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) diff --git a/server/rooms/room_data.hpp b/server/rooms/room_data.hpp index 7cd11b2..43ac00f 100644 --- a/server/rooms/room_data.hpp +++ b/server/rooms/room_data.hpp @@ -31,6 +31,8 @@ #include #include +//DOCS: rooms are designed to collate all parts of the game that should be able to interact with each other + class RoomData { public: RoomData() = default; diff --git a/server/server_utilities.cpp b/server/server_utilities.cpp index 00961dc..dece9aa 100644 --- a/server/server_utilities.cpp +++ b/server/server_utilities.cpp @@ -177,6 +177,7 @@ void pumpAndChangeRooms(int characterIndex, int newRoomIndex) { pumpAndChangeRooms(character, newRoomIndex, characterIndex); } +//TODO: (0) refactor this void pumpAndChangeRooms(CharacterData* const characterData, int newRoomIndex, int characterIndex) { //delete from the old room CharacterPacket newPacket; diff --git a/server/triggers/trigger_data.hpp b/server/triggers/trigger_data.hpp index 36e9181..bf56591 100644 --- a/server/triggers/trigger_data.hpp +++ b/server/triggers/trigger_data.hpp @@ -47,6 +47,7 @@ public: int SetScriptReference(int i); int GetScriptReference(); + //NOTE: exclusion list is currently used for entities that have already "fired" the trigger std::list* GetExclusionList(); private: diff --git a/server/triggers/trigger_manager.hpp b/server/triggers/trigger_manager.hpp index 067f9ec..ca7caf4 100644 --- a/server/triggers/trigger_manager.hpp +++ b/server/triggers/trigger_manager.hpp @@ -37,7 +37,7 @@ public: ~TriggerManager(); //common public methods - int Create(std::string handle); + int Create(std::string handle); //TODO: return the Trigger itself? void Unload(int uid); void UnloadAll();