From f607204c19beb6a256b29454e4c323ce1ce93e4f Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Fri, 30 Sep 2016 20:50:59 +0000
Subject: [PATCH] grr

---
 .../src/shared/ChatServerConnection.cpp       |  7 +--
 .../src/shared/ClientConnection.cpp           | 48 +++----------------
 2 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/engine/server/application/ConnectionServer/src/shared/ChatServerConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ChatServerConnection.cpp
index ed53c023..3a83d710 100755
--- a/engine/server/application/ConnectionServer/src/shared/ChatServerConnection.cpp
+++ b/engine/server/application/ConnectionServer/src/shared/ChatServerConnection.cpp
@@ -74,10 +74,11 @@ void ChatServerConnection::onReceive(const Archive::ByteStream & message)
     GameNetworkMessage m(ri);
     ri = message.begin();
 	
-	if (message.getType() == constcrc("GameClientMessage")) {
+	if (m.getType() == constcrc("GameClientMessage")) {
 		//we're receiving a message to forward to the client.
 		//it is prefixed with NetworkId and reliable.
-        const GameClientMessage msg(ri);
+        	
+		const GameClientMessage msg(ri);
 		Archive::ReadIterator mri(msg.getByteStream());
 		GameNetworkMessage gnm(mri);
 		mri = msg.getByteStream().begin();
@@ -111,7 +112,7 @@ void ChatServerConnection::onReceive(const Archive::ByteStream & message)
 			DEBUG_REPORT_LOG(!client, ("Error, could not map %s to a client\n", (*i).getValueString().c_str()));
 			if (client)
 			{
-				if (messageType !== constcrc("ChatStatisticsCS")) {
+				if (messageType != constcrc("ChatStatisticsCS")) {
 					client->getClientConnection()->sendByteStream(msg.getByteStream(), msg.getReliable());
 				}
 				
diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
index 9399110d..f2b94005 100755
--- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
+++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
@@ -50,6 +50,8 @@
 #include "Session/LoginAPI/Client.h"
 #include "UdpLibrary.h"
 
+#include "sharedFoundation/CrcConstexpr.hpp"
+
 #include <algorithm>
 
 //-----------------------------------------------------------------------
@@ -629,7 +631,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message)
 		GameNetworkMessage m(ri);
 		ri = message.begin();
 		
-		const uint32 messageType = message.getType();
+		const uint32 messageType = m.getType();
 
 		//Clients with a selected character get routed to a game server.
 		//@todo check for filtering out bad messages.
@@ -690,7 +692,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message)
 				// only if that test pass do we forward the message on to the chat server to request
 				// to enter the room
 					case constcrc("ChatEnterRoom") :
-					case constcrc(("ChatEnterRoomById") :
+					case constcrc("ChatEnterRoomById") :
 					{
 						NOT_NULL(m_client);
 
@@ -698,7 +700,8 @@ void ClientConnection::onReceive(const Archive::ByteStream & message)
 						std::string roomName;
 
 						Archive::ReadIterator cri = message.begin();
-						if (msgType == constcrc(("ChatEnterRoom"))
+
+						if (messageType == constcrc("ChatEnterRoom"))
 						{
 							ChatEnterRoom const cer(cri);
 							sequence = cer.getSequence();
@@ -871,44 +874,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message)
 							v.clear();
 							v.push_back(m_client->getNetworkId());
 
-							// TODO: this shit could be made into a template
-							switch (messageType) {
-								case constcrc("ConnectPlayerMessage") :
-								{
-									ConnectPlayerMessage message(ri);
-									break;
-								}
-								case constcrc("CreateTicketMessage") :
-								{
-									CreateTicketMessage message(ri);
-									break;
-								}
-								case constcrc("AppendCommentMessage") :
-								{
-									AppendCommentMessage message(ri);
-									break;
-								}
-								case constcrc("CancelTicketMessage") :
-								{
-									CancelTicketMessage message(ri);
-									break;
-								}
-								case constcrc("GetTicketsMessage") :
-								{
-									GetTicketsMessage message(ri);
-									break;
-								}
-								case constcrc("NewTicketActivityMessage") :
-								{
-									NewTicketActivityMessage message(ri);
-									break;
-								}
-							}
-							
-							GameClientMessage gcm(v, true, ri);
-							message.setStationId(getSUID());
-							customerServiceConnection->send(gcm , true);
-							
+						//insert here	
 						}
 					}
 					else