From 5e63a045fa5fb1f7bb1f8eb858dd2d11f3776063 Mon Sep 17 00:00:00 2001
From: JustinAJ <justin.aj@hotmail.com>
Date: Thu, 6 Nov 2014 00:36:00 -0500
Subject: [PATCH] Added tieFormat to ServerProfile; GDI's score is now
 correctly parsed during a tie.

---
 RenX.Core/RenX_Server.cpp        | 12 +++++++++++-
 RenX.Core/RenX_ServerProfile.cpp |  2 ++
 RenX.Core/RenX_ServerProfile.h   |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp
index f2ed0b6..b2d6a3e 100644
--- a/RenX.Core/RenX_Server.cpp
+++ b/RenX.Core/RenX_Server.cpp
@@ -851,7 +851,17 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
 				}
 				else if (playerData.equals("Tie"))
 				{
-					int gScore = action.gotoToken(1, '=').asInt(10);
+					int gScore;
+					switch (RenX::Server::profile->tieFormat)
+					{
+					default:
+					case 1:
+						gScore = buff.getToken(2, RenX::DelimC).gotoToken(1, '=').asInt(10);
+						break;
+					case 0:
+						gScore = action.gotoToken(1, '=').asInt(10);
+						break;
+					}
 					int nScore = buff.getToken(3, RenX::DelimC).gotoToken(1, '=').asInt(10);
 
 					this->needsCList = true;
diff --git a/RenX.Core/RenX_ServerProfile.cpp b/RenX.Core/RenX_ServerProfile.cpp
index cda45d7..f019a0a 100644
--- a/RenX.Core/RenX_ServerProfile.cpp
+++ b/RenX.Core/RenX_ServerProfile.cpp
@@ -26,6 +26,7 @@ struct BaseProfile : RenX::ServerProfile
 		disconnectOnGameOver = false;
 		pidbug = false;
 		mustSanitize = true;
+		tieFormat = 1;
 	}
 } _baseProfile;
 const RenX::ServerProfile *RenX::defaultProfile = &_baseProfile;
@@ -46,6 +47,7 @@ struct OpenBeta2Profile : BaseProfile
 	{
 		privateMessages = false;
 		pidbug = true;
+		tieFormat = 0;
 	}
 } _openBeta2Profile;
 const RenX::ServerProfile *RenX::openBeta2Profile = &_openBeta2Profile;
diff --git a/RenX.Core/RenX_ServerProfile.h b/RenX.Core/RenX_ServerProfile.h
index 92e82b6..0b7835e 100644
--- a/RenX.Core/RenX_ServerProfile.h
+++ b/RenX.Core/RenX_ServerProfile.h
@@ -37,6 +37,7 @@ namespace RenX
 		bool disconnectOnGameOver;
 		bool pidbug;
 		bool mustSanitize;
+		int tieFormat;
 	};
 
 	RENX_API extern const ServerProfile *defaultProfile;	/** Default server profile */