Added trigger reference to WaypointData, unused

WaypointData also inherits from Entity now, so I could alias Entity's API
for it too. I've also made a number of comment tweaks.

client/scenes/in_world.cpp

@@ -540,9 +540,9 @@ void InWorld::UpdateMap() {
 //entity management
 //-------------------------
 
-//NOTE: preexisting characters will result in query responses
-//NOTE: new characters will result in create messages
-//NOTE: this client's character will exist in both (skipped)
+//DOCS: preexisting characters will result in query responses
+//DOCS: new characters will result in create messages
+//DOCS: this client's character will exist in both (skipped)
 
 void InWorld::HandleCharacterCreate(CharacterPacket* const argPacket) {
 	//prevent double message

common/network/udp_network_utility.cpp

@@ -26,7 +26,7 @@
 
 #include <stdexcept>
 
-//NOTE: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
+//DOCS: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
 //NOTE: don't confuse SerialPacketBase with UDPpacket
 
 void UDPNetworkUtility::Open(int port) {

server/accounts/account_manager.cpp

@@ -219,7 +219,6 @@ void AccountManager::UnloadIf(std::function<bool(std::pair<const int, AccountDat
 //-------------------------
 
 AccountData* AccountManager::Get(int uid) {
-	//TODO: could this load an account first?
 	std::map<int, AccountData>::iterator it = elementMap.find(uid);
 
 	if (it == elementMap.end()) {

server/clients/client_manager.cpp

@@ -78,7 +78,6 @@ void ClientManager::UnloadIf(std::function<bool(std::pair<const int, ClientData>
 	while (it != elementMap.end()) {
 		if (fn(*it)) {
 			it = elementMap.erase(it);
-			//TODO: ? disconnect, unload characters, notify other clients
 		}
 		else {
 			++it;

server/entities/entity.hpp

@@ -38,7 +38,7 @@ public:
 
 protected:
 	Entity() = default;
-	~Entity() = default;
+	virtual ~Entity() = default;
 
 	int roomIndex = -1;
 	Vector2 origin;

server/server_character_methods.cpp

@@ -191,7 +191,6 @@ void ServerApplication::HandleCharacterSetRoom(CharacterPacket* const argPacket)
 	}
 
 	//set the character's room, zero it's origin, zero it's motion
-	//TODO: Set the origin here
 	characterData->SetRoomIndex(argPacket->roomIndex);
 	characterData->SetOrigin({0, 0});
 	characterData->SetMotion({0, 0});

server/server_logic.cpp

@@ -105,6 +105,7 @@ void ServerApplication::Init(int argc, char* argv[]) {
 	characterMgr.SetDatabase(database);
 
 	roomMgr.SetLuaState(luaState);
+	waypointMgr.SetLuaState(luaState);
 
 	std::cout << "Internal managers initialized" << std::endl;
 

server/waypoints/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../server_utilities ../../common/utilities
+INCLUDES+=. ../entities ../server_utilities ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/waypoints/waypoint_api.cpp

@@ -23,6 +23,7 @@
 
 #include "waypoint_data.hpp"
 
+//TODO: Can I alias the entity API for this?
 static const luaL_Reg waypointLib[] = {
 	{nullptr, nullptr}
 };

server/waypoints/waypoint_data.cpp

@@ -21,3 +21,10 @@
 */
 #include "waypoint_data.hpp"
 
+int WaypointData::SetTriggerReference(int i) {
+	return triggerRef = i;
+}
+
+int WaypointData::GetTriggerReference() {
+	return triggerRef;
+}

server/waypoints/waypoint_data.hpp

@@ -22,15 +22,28 @@
 #ifndef WAYPOINTDATA_HPP_
 #define WAYPOINTDATA_HPP_
 
+#include "entity.hpp"
+
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
+
 #include <string>
 
-class WaypointData {
+class WaypointData: public Entity {
 public:
 	WaypointData() = default;
 	~WaypointData() = default;
 
+	int SetTriggerReference(int i);
+	int GetTriggerReference();
+
 private:
 	friend class WaypointManager;
+
+	int triggerRef = LUA_NOREF;
 };
 
 #endif

server/waypoints/waypoint_manager.hpp

@@ -26,10 +26,17 @@
 #include "singleton.hpp"
 #include "vector2.hpp"
 
+#if defined(__MINGW32__)
+ #include "lua/lua.hpp"
+#else
+ #include "lua.hpp"
+#endif
+
 #include <functional>
 #include <map>
 #include <string>
 
+//TODO: should waypoints be managed on a per-room basis?
 class WaypointManager: public Singleton<WaypointManager> {
 public:
 	//common public methods
@@ -48,6 +55,10 @@ public:
 	int GetTotalCount();
 	std::map<int, WaypointData>* GetContainer();
 
+	//hooks
+	lua_State* SetLuaState(lua_State* L) { return lua = L; }
+	lua_State* GetLuaState() { return lua; }
+
 private:
 	friend Singleton<WaypointManager>;
 
@@ -56,6 +67,8 @@ private:
 
 	//members
 	std::map<int, WaypointData> elementMap;
+	lua_State* lua = nullptr;
+	int counter = 0;
 };
 
 #endif