- Fixed a bug where stats could be interpreted correctly resulting in high ranks being granted early

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_StatsInterface.h

@@ -438,6 +438,7 @@ class NGMP_OnlineServices_StatsInterface
 {
 public:
 	NGMP_OnlineServices_StatsInterface();
+	~NGMP_OnlineServices_StatsInterface();
 
 	void GetGlobalStats(std::function<void(GlobalStats)> cb);
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp

@@ -246,22 +246,6 @@ void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats)
 // default values
 RankPoints::RankPoints(void)
 {
-	NGMP_OnlineServices_StatsInterface* statsInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_StatsInterface>();
-
-	if (statsInterface != nullptr)
-	{
-		m_ranks[RANK_PRIVATE] = 0;
-		m_ranks[RANK_CORPORAL] = statsInterface->getPointsForRank(RANK_CORPORAL); // 5
-		m_ranks[RANK_SERGEANT] = statsInterface->getPointsForRank(RANK_SERGEANT); // 10
-		m_ranks[RANK_LIEUTENANT] = statsInterface->getPointsForRank(RANK_LIEUTENANT); // 20
-		m_ranks[RANK_CAPTAIN] = statsInterface->getPointsForRank(RANK_CAPTAIN); // 50
-		m_ranks[RANK_MAJOR] = statsInterface->getPointsForRank(RANK_MAJOR); // 100
-		m_ranks[RANK_COLONEL] = statsInterface->getPointsForRank(RANK_COLONEL); // 200
-		m_ranks[RANK_BRIGADIER_GENERAL] = statsInterface->getPointsForRank(RANK_BRIGADIER_GENERAL); // 500
-		m_ranks[RANK_GENERAL] = statsInterface->getPointsForRank(RANK_GENERAL); // 1000
-		m_ranks[RANK_COMMANDER_IN_CHIEF] = statsInterface->getPointsForRank(RANK_COMMANDER_IN_CHIEF); // 2000
-	}
-
 	m_winMultiplier = 3.0f;
 	m_lostMultiplier = 0.0f;
 	m_hourSpentOnlineMultiplier = 1.0f;

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.cpp

@@ -387,7 +387,7 @@ void WebSocket::Tick()
 					try
 					{
 						// null terminate buffer
-						m_vecWSPartialBuffer[m_vecWSPartialBuffer.size()] = '\0';
+						m_vecWSPartialBuffer.push_back('\0');
 
 						// process it
 						nlohmann::json jsonObject;

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_StatsInterface.cpp

@@ -12,10 +12,38 @@ NGMP_OnlineServices_StatsInterface::NGMP_OnlineServices_StatsInterface()
 {
 	TheRankPointValues = NEW RankPoints;
 
+	// populate ranks
+	// TODO_NGMP: Perhaps get this from the service?
+	TheRankPointValues->m_ranks[RANK_PRIVATE] = 0;
+	TheRankPointValues->m_ranks[RANK_CORPORAL] = getPointsForRank(RANK_CORPORAL); // 5
+	TheRankPointValues->m_ranks[RANK_SERGEANT] = getPointsForRank(RANK_SERGEANT); // 10
+	TheRankPointValues->m_ranks[RANK_LIEUTENANT] = getPointsForRank(RANK_LIEUTENANT); // 20
+	TheRankPointValues->m_ranks[RANK_CAPTAIN] = getPointsForRank(RANK_CAPTAIN); // 50
+	TheRankPointValues->m_ranks[RANK_MAJOR] = getPointsForRank(RANK_MAJOR); // 100
+	TheRankPointValues->m_ranks[RANK_COLONEL] = getPointsForRank(RANK_COLONEL); // 200
+	TheRankPointValues->m_ranks[RANK_BRIGADIER_GENERAL] = getPointsForRank(RANK_BRIGADIER_GENERAL); // 500
+	TheRankPointValues->m_ranks[RANK_GENERAL] = getPointsForRank(RANK_GENERAL); // 1000
+	TheRankPointValues->m_ranks[RANK_COMMANDER_IN_CHIEF] = getPointsForRank(RANK_COMMANDER_IN_CHIEF); // 2000
+
 	// TODO_NGMP: Better location
 	TheLadderList = NEW LadderList;
 }
 
+NGMP_OnlineServices_StatsInterface::~NGMP_OnlineServices_StatsInterface()
+{
+	if (TheRankPointValues != nullptr)
+	{
+		delete TheRankPointValues;
+		TheRankPointValues = nullptr;
+	}
+
+	if (TheLadderList != nullptr)
+	{
+		delete TheLadderList;
+		TheLadderList = nullptr;
+	}
+}
+
 void NGMP_OnlineServices_StatsInterface::GetGlobalStats(std::function<void(GlobalStats)> cb)
 {
 	std::string strURI = NGMP_OnlineServicesManager::GetAPIEndpoint("GlobalStats");
@@ -169,9 +197,14 @@ void NGMP_OnlineServices_StatsInterface::findPlayerStatsByID(int64_t userID, std
 						// cb
 						cb(true, stats);
 					}
+					catch (nlohmann::json::exception& jsonException)
+					{
+						NetworkLog(ELogVerbosity::LOG_RELEASE, "Stats: Unparsable JSON 1: %s (%s)", strBody.c_str(), jsonException.what());
+						cb(false, stats);
+					}
 					catch (...)
 					{
-						// cb
+						NetworkLog(ELogVerbosity::LOG_RELEASE, "Stats: Unparsable JSON 2: %s", strBody.c_str());
 						cb(false, stats);
 					}
 				});