Finished these server tweaks

common/network/packet_types/text_packet.cpp

@@ -29,6 +29,12 @@ void serializeText(void* buffer, TextPacket* packet) {
 	//content
 	serialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
 	serialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+
+	//location
+	serialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	serialCopy(&buffer, &packet->origin.x, sizeof(double));
+	serialCopy(&buffer, &packet->origin.y, sizeof(double));
+	serialCopy(&buffer, &packet->range, sizeof(int));
 }
 
 void deserializeText(void* buffer, TextPacket* packet) {
@@ -37,4 +43,10 @@ void deserializeText(void* buffer, TextPacket* packet) {
 	//content
 	deserialCopy(&buffer, packet->name, PACKET_STRING_SIZE);
 	deserialCopy(&buffer, packet->text, PACKET_STRING_SIZE);
+
+	//location
+	deserialCopy(&buffer, &packet->roomIndex, sizeof(int));
+	deserialCopy(&buffer, &packet->origin.x, sizeof(double));
+	deserialCopy(&buffer, &packet->origin.y, sizeof(double));
+	deserialCopy(&buffer, &packet->range, sizeof(int));
 }

common/network/packet_types/text_packet.hpp

@@ -24,9 +24,14 @@
 
 #include "serial_packet_base.hpp"
 
+#include "vector2.hpp"
+
 struct TextPacket : SerialPacketBase {
 	char name[PACKET_STRING_SIZE];
 	char text[PACKET_STRING_SIZE];
+	int roomIndex;
+	Vector2 origin;
+	int range;
 };
 
 void serializeText(void* buffer, TextPacket* packet);

common/network/serial_packet_type.hpp

@@ -131,6 +131,8 @@ enum class SerialPacketType {
 
 	//general speech
 	TEXT_BROADCAST,
+	TEXT_SPEECH,
+	TEXT_WHISPER,
 
 	//rejection/error messages
 	JOIN_REJECTION,

common/network/serial_utility.cpp

@@ -92,6 +92,8 @@ void serializePacket(void* buffer, SerialPacketBase* packet) {
 			serializeMonster(buffer, static_cast<MonsterPacket*>(packet));
 		break;
 		case SerialPacketType::TEXT_BROADCAST:
+		case SerialPacketType::TEXT_SPEECH:
+		case SerialPacketType::TEXT_WHISPER:
 		case SerialPacketType::JOIN_REJECTION:
 		case SerialPacketType::LOGIN_REJECTION:
 		case SerialPacketType::REGION_REJECTION:
@@ -154,6 +156,8 @@ void deserializePacket(void* buffer, SerialPacketBase* packet) {
 			deserializeMonster(buffer, static_cast<MonsterPacket*>(packet));
 		break;
 		case SerialPacketType::TEXT_BROADCAST:
+		case SerialPacketType::TEXT_SPEECH:
+		case SerialPacketType::TEXT_WHISPER:
 		case SerialPacketType::JOIN_REJECTION:
 		case SerialPacketType::LOGIN_REJECTION:
 		case SerialPacketType::REGION_REJECTION: