Check Point: Compiles 100% with MIFF

engine/CMakeLists.txt

@@ -1,3 +1,4 @@
 
+add_subdirectory(client)
 add_subdirectory(server)
 add_subdirectory(shared)

engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/AuctionTransferAPICore.cpp

@@ -135,7 +135,7 @@ void AuctionTransferAPICore::responseCallback(short type, Base::ByteStream::Read
 	ServerTrackObject *stobj = new ServerTrackObject(++m_mappedServerTrack, real_server_track, connection);
 	m_serverTracks.insert(std::pair<unsigned, ServerTrackObject *>(m_mappedServerTrack, stobj));
 
-	long long transactionID;
+	long transactionID;
 	get(iter, transactionID);
 	switch (type)
 	{
@@ -143,7 +143,7 @@ void AuctionTransferAPICore::responseCallback(short type, Base::ByteStream::Read
 		{
 			unsigned stationID;
 			unsigned characterID;
-			long long assetID;
+			long assetID;
 			std::string newName;
 			get(iter, stationID);
 			get(iter, characterID);

engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.cpp

@@ -76,7 +76,7 @@ void ReplyRequest::pack(Base::ByteStream &msg)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
-CommonRequest::CommonRequest( RequestTypes type, unsigned serverTrack, long long transactionID )
+CommonRequest::CommonRequest( RequestTypes type, unsigned serverTrack, long transactionID )
 	: GenericRequest((short)type, serverTrack), m_transactionID(transactionID)
 {
 }
@@ -101,7 +101,7 @@ void GetIDRequest::pack(Base::ByteStream &msg)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
-SendPrepareCompressedRequest::SendPrepareCompressedRequest(RequestTypes type, unsigned serverTrack, const char *serverID, long long transactionID, unsigned stationID, unsigned characterID, long long assetID, const unsigned char *xmlAsset, unsigned length)
+SendPrepareCompressedRequest::SendPrepareCompressedRequest(RequestTypes type, unsigned serverTrack, const char *serverID, long transactionID, unsigned stationID, unsigned characterID, long assetID, const unsigned char *xmlAsset, unsigned length)
   : GenericRequest((short)type, serverTrack),  
 	m_transactionID(transactionID), 
 	m_stationID(stationID),
@@ -125,7 +125,7 @@ void SendPrepareCompressedRequest::pack(Base::ByteStream &msg)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
-SendPrepareRequest::SendPrepareRequest( RequestTypes type, unsigned serverTrack, const char *serverID, long long transactionID, unsigned stationID, unsigned characterID, long long assetID, const char *xml )
+SendPrepareRequest::SendPrepareRequest( RequestTypes type, unsigned serverTrack, const char *serverID, long transactionID, unsigned stationID, unsigned characterID, long assetID, const char *xml )
 	: GenericRequest((short)type, serverTrack),  
 	  m_transactionID(transactionID), 
 	  m_stationID(stationID),

engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Request.h

@@ -43,12 +43,12 @@ namespace AuctionTransfer
 	class CommonRequest: public GenericRequest
 	{
 	public:
-		CommonRequest(RequestTypes type, unsigned serverTrack, long long transactionID);
+		CommonRequest(RequestTypes type, unsigned serverTrack, long transactionID);
 		virtual ~CommonRequest()	{};
 
 		void pack(Base::ByteStream &msg);
 	private:
-		long long m_transactionID;
+		long m_transactionID;
 	};
 
 	//////////////////////////////////////////////////////////////////////////////////////
@@ -66,15 +66,15 @@ namespace AuctionTransfer
 	class SendPrepareRequest: public GenericRequest
 	{
 	public:
-		SendPrepareRequest(RequestTypes type, unsigned serverTrack, const char *serverID, long long transactionID, unsigned stationID, unsigned characterID, long long assetID, const char *xmlAsset);
+		SendPrepareRequest(RequestTypes type, unsigned serverTrack, const char *serverID, long transactionID, unsigned stationID, unsigned characterID, long assetID, const char *xmlAsset);
 		virtual ~SendPrepareRequest()	{};
 
 		void pack(Base::ByteStream &msg);
 	private:
-		long long m_transactionID;
+		long m_transactionID;
 		unsigned m_stationID;
 		unsigned m_characterID;
-		long long m_assetID;
+		long m_assetID;
 		std::string m_xml;
 		std::string m_serverID;
 	};
@@ -83,15 +83,15 @@ namespace AuctionTransfer
 	class SendPrepareCompressedRequest: public GenericRequest
 	{
 	public:
-		SendPrepareCompressedRequest(RequestTypes type, unsigned serverTrack, const char *serverID, long long transactionID, unsigned stationID, unsigned characterID, long long assetID, const unsigned char *xmlAsset, unsigned length);
+		SendPrepareCompressedRequest(RequestTypes type, unsigned serverTrack, const char *serverID, long transactionID, unsigned stationID, unsigned characterID, long assetID, const unsigned char *xmlAsset, unsigned length);
 		virtual ~SendPrepareCompressedRequest()	{};
 
 		void pack(Base::ByteStream &msg);
 	private:
-		long long m_transactionID;
+		long m_transactionID;
 		unsigned m_stationID;
 		unsigned m_characterID;
-		long long m_assetID;
+		long m_assetID;
 		//std::string m_xml;
 		std::string m_serverID;
 		Blob m_data;
@@ -133,7 +133,7 @@ namespace AuctionTransfer
 	private:
 		std::string m_gameCode;
 		std::string m_serverCode;
-		long long m_assetID;
+		long m_assetID;
 		unsigned m_userID;
 		std::string m_event;
 		std::string m_message;

engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/Response.h

@@ -22,10 +22,10 @@ namespace AuctionTransfer
 	public:
 		GetIDResponse(RequestTypes type, void *user);
 		virtual ~GetIDResponse() {}
-		long long getNewID() { return m_transactionID; }
+		long getNewID() { return m_transactionID; }
 		virtual void unpack(Base::ByteStream::ReadIterator &iter);
 	private:
-		long long m_transactionID;
+		long m_transactionID;
 	};
 
 

engine/server/application/ChatServer/src/shared/ChatInterface.cpp

@@ -355,7 +355,7 @@ void ChatInterface::OnGetRoom(unsigned track, unsigned result, const ChatRoom *r
 		ChatServer::putSystemAvatarInRoom(roomName);
 	}
 	std::string lowerRoomName = toLower(roomName);
-	unsigned sequence = (unsigned)user;
+	uint64_t sequence = (uint64_t)user;
 	std::unordered_map<std::string, ChatServerRoomOwner>::iterator f = roomList.find(lowerRoomName);
 	if (f != roomList.end() && room)
 	{
@@ -416,7 +416,7 @@ void ChatInterface::OnGetRoom(unsigned track, unsigned result, const ChatRoom *r
 
 //-----------------------------------------------------------------------
 
-void ChatInterface::queryRoom(const NetworkId & id, ConnectionServerConnection * connection, const unsigned int sequence, const std::string & roomName)
+void ChatInterface::queryRoom(const NetworkId & id, ConnectionServerConnection * connection, const uint64_t sequence, const std::string & roomName)
 {
 	UNREF(connection);
 	ChatServer::fileLog(s_enableChatRoomLogs, "ChatInterface", "queryRoom() id(%s) connection(%s) sequence(%u) roomName(%s)", id.getValueString().c_str(), ChatServer::getConnectionAddress(connection).c_str(), sequence, roomName.c_str());
@@ -1579,7 +1579,7 @@ void ChatInterface::OnCreateRoom(unsigned track,unsigned result, const ChatRoom
 	PROFILER_AUTO_BLOCK_DEFINE("ChatInterface - OnCreateRoom");
 	UNREF(user);
 
-	unsigned sequence = (unsigned)user;
+	uint64_t sequence = (uint64_t)user;
 	static Unicode::String wideSWG = Unicode::narrowToWide("SOE+SWG");
 	static Unicode::String wideFilter = Unicode::narrowToWide("");
 	static ChatUnicodeString swgNode(wideSWG.data(), wideSWG.size());
@@ -1882,7 +1882,7 @@ void ChatInterface::OnEnterRoom(unsigned track, unsigned result, const ChatAvata
 		return;
 	}
 
-	unsigned sequence = (unsigned)user;
+	uint64_t sequence = (uint64_t)user;
 
 	ChatAvatarId srcId;
 	if (srcAvatar)
@@ -2559,7 +2559,7 @@ void ChatInterface::OnLeaveRoom(unsigned track, unsigned result, const ChatAvata
 		return;
 	}
 
-	unsigned sequence = (unsigned)user;
+	uint64_t sequence = (uint64_t)user;
 
 	ChatAvatarId id;
 	if (srcAvatar)
@@ -2913,7 +2913,7 @@ void ChatInterface::OnSendRoomMessage(unsigned track, unsigned result, const Cha
 	}
 	UNREF(srcAvatar);
 	UNREF(destRoom);
-	unsigned sequence = (unsigned)user;
+	uint64_t sequence = (uint64_t)user;
     ChatOnSendRoomMessage chat(sequence, result);
     IGNORE_RETURN(ChatServer::sendResponseForTrackId(track, chat));
 }
@@ -2998,7 +2998,7 @@ void ChatInterface::OnSendInstantMessage(unsigned track, unsigned result, const
 	}
 	UNREF(srcAvatar);
 
-	unsigned sequence = (unsigned)user;
+	uint64_t sequence = (uint64_t)user;
 
 	ChatOnSendInstantMessage chat(sequence, result);
 	IGNORE_RETURN(ChatServer::sendResponseForTrackId(track, chat));
@@ -3053,7 +3053,7 @@ void ChatInterface::OnSendPersistentMessage(unsigned track, unsigned result, con
 		DEBUG_WARNING(true, ("We received an OnSendPersistentMessage with a success result code but nullptr data.  This is an error that the API should never give."));
 		return;
 	}
-	unsigned sequence = (unsigned)user;
+	uint64_t sequence = (uint64_t)user;
 	UNREF(srcAvatar);
 	ChatOnSendPersistentMessage chat(sequence, result);
 	IGNORE_RETURN(ChatServer::sendResponseForTrackId(track, chat));

engine/server/application/ChatServer/src/shared/ChatInterface.h

@@ -68,7 +68,7 @@ public:
 
 	std::string  getChatName(const NetworkId &id);
 
-	void          queryRoom         (const NetworkId & id, ConnectionServerConnection * connection, const unsigned int sequenceId, const std::string & roomName);
+	void          queryRoom         (const NetworkId & id, ConnectionServerConnection * connection, const uint64_t sequenceId, const std::string & roomName);
 	void          updateRoomForThisChatAPI(const ChatRoom *room, const ChatAvatar *additionalAvatar);
 	void          updateRooms();
 

engine/server/application/ChatServer/src/shared/ChatServer.cpp

@@ -1083,7 +1083,7 @@ int countDots(const std::string &str)
 
 //-----------------------------------------------------------------------
 
-void ChatServer::createRoom(const NetworkId & id, const unsigned int sequence, const std::string & roomName, const bool isModerated, const bool isPublic, const std::string & title)
+void ChatServer::createRoom(const NetworkId & id, const uint64_t sequence, const std::string & roomName, const bool isModerated, const bool isPublic, const std::string & title)
 {
 	if(roomName.empty())
 		return;
@@ -1393,7 +1393,7 @@ void ChatServer::disconnectPlayer(const NetworkId & id)
 
 //-----------------------------------------------------------------------
 
-void ChatServer::enterRoom(const NetworkId & id, const unsigned int sequence, const unsigned int roomId)
+void ChatServer::enterRoom(const NetworkId & id, const uint64_t sequence, const unsigned int roomId)
 {
 	ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "enterRoom() id(%s) sequence(%u) roomId(%u)", id.getValueString().c_str(), sequence, roomId);
 
@@ -1456,7 +1456,7 @@ void ChatServer::putSystemAvatarInRoom(const std::string & roomName)
 
 //-----------------------------------------------------------------------
 
-void ChatServer::enterRoom(const NetworkId & id, const unsigned int sequence, const std::string & roomName)
+void ChatServer::enterRoom(const NetworkId & id, const uint64_t sequence, const std::string & roomName)
 {
 	ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "enterRoom() id(%s) sequence(%u) roomName(%s)", id.getValueString().c_str(), sequence, roomName.c_str());
 
@@ -1759,7 +1759,7 @@ void ChatServer::removeSystemAvatarFromRoom(const ChatRoom *room)
 
 //-----------------------------------------------------------------------
 
-void ChatServer::leaveRoom(const NetworkId & id, const unsigned int sequence, const unsigned int roomId)
+void ChatServer::leaveRoom(const NetworkId & id, const uint64_t sequence, const unsigned int roomId)
 {
 	ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "leaveRoom() id(%s) sequence(%u) roomId(%u)", id.getValueString().c_str(), sequence, roomId);
 
@@ -1945,7 +1945,7 @@ void ChatServer::kickAvatarFromRoom(const NetworkId & id, const ChatAvatarId & a
 
 //-----------------------------------------------------------------------
 
-void ChatServer::queryRoom(const NetworkId & id, ConnectionServerConnection * connection, const unsigned int sequence, const std::string & roomName)
+void ChatServer::queryRoom(const NetworkId & id, ConnectionServerConnection * connection, const uint64_t sequence, const std::string & roomName)
 {
 	ChatServer::fileLog(s_enableChatRoomLogs, "ChatServer", "queryRoom() id(%s) roomName(%s)", id.getValueString().c_str(), roomName.c_str());
 
@@ -1954,7 +1954,7 @@ void ChatServer::queryRoom(const NetworkId & id, ConnectionServerConnection * co
 
 //-----------------------------------------------------------------------
 
-void ChatServer::requestPersistentMessage(const NetworkId &id, const unsigned int sequence, const unsigned int messageId)
+void ChatServer::requestPersistentMessage(const NetworkId &id, const uint64_t sequence, const unsigned int messageId)
 {
 	ChatServer::fileLog(false, "ChatServer", "requestPersistentMessage() id(%s) sequence(%u) messageId(%u)", id.getValueString().c_str(), sequence, messageId);
 
@@ -2039,7 +2039,7 @@ void ChatServer::sendInstantMessage(const ChatAvatarId & from, const ChatAvatarI
 
 //-----------------------------------------------------------------------
 
-void ChatServer::sendInstantMessage(const NetworkId & fromId, const unsigned int sequence, const ChatAvatarId & n, const Unicode::String & message, const Unicode::String & oob)
+void ChatServer::sendInstantMessage(const NetworkId & fromId, const uint64_t sequence, const ChatAvatarId & n, const Unicode::String & message, const Unicode::String & oob)
 {
 	canonicalizeAvatarId(n);
 	ChatServer::fileLog(false, "ChatServer", "sendInstantMessage() fromId(%s) sequence(%u) toName(%s)", fromId.getValueString().c_str(), sequence, n.getFullName().c_str());
@@ -2177,7 +2177,7 @@ void ChatServer::sendPersistentMessage(const ChatAvatarId & from, const ChatAvat
 
 //-----------------------------------------------------------------------
 
-void ChatServer::sendPersistentMessage(const NetworkId & fromId, const unsigned int sequenceId, const ChatAvatarId & to, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob)
+void ChatServer::sendPersistentMessage(const NetworkId & fromId, const uint64_t sequenceId, const ChatAvatarId & to, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob)
 {
 	canonicalizeAvatarId(to);
 
@@ -2272,7 +2272,7 @@ void ChatServer::sendRoomMessage(const ChatAvatarId &id, const std::string & roo
 
 //-----------------------------------------------------------------------
 
-void ChatServer::sendRoomMessage(const NetworkId & id, const unsigned int sequence, const unsigned int roomId, const Unicode::String &msg, const Unicode::String & oob)
+void ChatServer::sendRoomMessage(const NetworkId & id, const uint64_t sequence, const unsigned int roomId, const Unicode::String &msg, const Unicode::String & oob)
 {
 	if(!msg.empty() || !oob.empty())
 	{

engine/server/application/ChatServer/src/shared/ChatServer.h

@@ -152,19 +152,19 @@ public:
 	static void       chatConnectedAvatar       (const NetworkId & id, const ChatAvatar & avatar);
 
 	static void       connectPlayer             (ConnectionServerConnection * connection, const unsigned int suid, const std::string & characterName, const NetworkId & networkId, const bool isSecure, const bool isSubscribed);
-	static void       createRoom                (const NetworkId & id, const unsigned int sequence, const std::string & name, const bool isModerated, const bool isPublic, const std::string & title);
+	static void       createRoom                (const NetworkId & id, const uint64_t sequence, const std::string & name, const bool isModerated, const bool isPublic, const std::string & title);
 	static void       putSystemAvatarInRoom     (const std::string & roomName);
-	static void       enterRoom                 (const NetworkId & id, const unsigned int sequence, const std::string & roomName);
-	static void       enterRoom                 (const NetworkId & id, const unsigned int sequence, const unsigned int roomId);
+	static void       enterRoom                 (const NetworkId & id, const uint64_t sequence, const std::string & roomName);
+	static void       enterRoom                 (const NetworkId & id, const uint64_t sequence, const unsigned int roomId);
 	static void       enterRoom                 (const ChatAvatarId & id, const std::string & roomName, bool forceCreate, bool createPrivate);
-	static void       sendInstantMessage        (const NetworkId & fromId, const unsigned int sequence, const ChatAvatarId & to, const Unicode::String & message, const Unicode::String & oob);
+	static void       sendInstantMessage        (const NetworkId & fromId, const uint64_t sequence, const ChatAvatarId & to, const Unicode::String & message, const Unicode::String & oob);
 	static void       sendInstantMessage        (const ChatAvatarId & from, const ChatAvatarId & to, const Unicode::String & message, const Unicode::String & oob);
-	static void       leaveRoom                 (const NetworkId & id, const unsigned int sequence, const unsigned int roomId);
+	static void       leaveRoom                 (const NetworkId & id, const uint64_t sequence, const unsigned int roomId);
 	static void       removeAvatarFromRoom      (const NetworkId & requestor, const ChatAvatarId & avatarId, const std::string & roomName);
 	static void       removeSystemAvatarFromRoom(const ChatRoom *room);
 	static void       removeAvatarFromRoom      (const ChatAvatarId & avatarId, const std::string & roomName);
 	static void       kickAvatarFromRoom        (const NetworkId & id, const ChatAvatarId & avatarId, const std::string & roomName);
-	static void       sendRoomMessage           (const NetworkId & id, const unsigned int sequence, const unsigned int roomId, const Unicode::String & message, const Unicode::String & oob);
+	static void       sendRoomMessage           (const NetworkId & id, const uint64_t sequence, const unsigned int roomId, const Unicode::String & message, const Unicode::String & oob);
 	static void       sendRoomMessage           (const ChatAvatarId & from, const std::string & roomName, const Unicode::String & message, const Unicode::String & oob);
 	static void       sendStandardRoomMessage   (const ChatAvatarId & from, const std::string & roomName, const Unicode::String & message, const Unicode::String & oob);
 	static void       destroyRoom               (const NetworkId & id, const unsigned int sequence, const unsigned int roomId);
@@ -180,15 +180,15 @@ public:
 	static void       invite                    (const NetworkId & id, const ChatAvatarId & avatar, const std::string & roomName);
 	static void       inviteGroupMembers        (const NetworkId & id, const ChatAvatarId & avatar, const std::string & roomName, const std::vector<NetworkId> & members);
 	static void       uninvite                  (const NetworkId & id, const unsigned int sequence, const ChatAvatarId & avatar, const std::string & roomName);
-	static void       queryRoom                 (const NetworkId & id, ConnectionServerConnection * connection, const unsigned int sequence, const std::string & roomName);
+	static void       queryRoom                 (const NetworkId & id, ConnectionServerConnection * connection, const uint64_t sequence, const std::string & roomName);
 	static void       requestRoomList           (const NetworkId & id, ConnectionServerConnection * connection);
 	static void       addModeratorToRoom        (const unsigned int sequenceId, const NetworkId & id, const ChatAvatarId & avatarId, const std::string & roomName);
 	static void       removeModeratorFromRoom   (const unsigned int sequenceId, const NetworkId & id, const ChatAvatarId & avatarId, const std::string & roomName);
 	static void       deletePersistentMessage   (const NetworkId & ownerId, const unsigned int messageId);
 	static void       deleteAllPersistentMessages(const NetworkId &sourceNetworkId, const NetworkId &targetNetworkId);
-	static void       sendPersistentMessage     (const NetworkId & fromId, const unsigned int sequence, const ChatAvatarId & to, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob);
+	static void       sendPersistentMessage     (const NetworkId & fromId, const uint64_t sequence, const ChatAvatarId & to, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob);
 	static void       sendPersistentMessage     (const ChatAvatarId & from, const ChatAvatarId & to, const Unicode::String & subject, const Unicode::String & message, const Unicode::String & oob);
-	static void       requestPersistentMessage  (const NetworkId &id, const unsigned int sequence, const unsigned int messageId);
+	static void       requestPersistentMessage  (const NetworkId &id, const uint64_t sequence, const unsigned int messageId);
 	static void       banFromRoom               (const unsigned sequence, const NetworkId &banner, const ChatAvatarId &bannee, const std::string &roomName);
 	static void       unbanFromRoom             (const unsigned sequence, const NetworkId &banner, const ChatAvatarId &bannee, const std::string &roomName);
 	static void       removeConnectionServerConnection(ConnectionServerConnection * target);