Score Generations: update rank table API

Author: hyperbx

Games/Sonic Generations/ScoreGenerations/API/ScoreGenerationsAPIv2.cpp

@@ -77,16 +77,11 @@ static ScoreTable& SCORE_GENS_API GetScoreTable()
     return TableProvider::GetScoreTable();
 }
 
-static RankTable& SCORE_GENS_API GetCurrentRankTable()
+static RankTable& SCORE_GENS_API GetRankTable()
 {
     return TableProvider::GetRankTables()[g_pStageID];
 }
 
-static RankTable& SCORE_GENS_API GetRankTable(const char* in_pStageID)
-{
-    return TableProvider::GetRankTables()[in_pStageID];
-}
-
 static void SCORE_GENS_API GetRankTables(RankTableNode** out_ppBuffer, int* out_pLength)
 {
     auto& rRankTables = TableProvider::GetRankTables();
@@ -105,6 +100,11 @@ static void SCORE_GENS_API GetRankTables(RankTableNode** out_ppBuffer, int* out_
     *out_pLength = length;
 }
 
+static RankTable& SCORE_GENS_API FindRankTable(const char* in_pStageID)
+{
+    return TableProvider::GetRankTables()[in_pStageID];
+}
+
 static BonusTable& SCORE_GENS_API GetBonusTable()
 {
     return TableProvider::GetBonusTable();
@@ -160,9 +160,9 @@ API g_ScoreGenerationsAPI
     ComputeUserBonus,
     GetStatistics,
     GetScoreTable,
-    GetCurrentRankTable,
     GetRankTable,
     GetRankTables,
+    FindRankTable,
     GetBonusTable,
     GetMultiplierTable,
     GetTimerTable,

Games/Sonic Generations/ScoreGenerations/API/ScoreGenerationsAPIv2.h

@@ -24,9 +24,9 @@ namespace ScoreGenerations
 		DECLARE_API_FUNC(int, ComputeUserBonus);
 		DECLARE_API_FUNC(Statistics&, GetStatistics);
 		DECLARE_API_FUNC(ScoreTable&, GetScoreTable);
-		DECLARE_API_FUNC(RankTable&, GetCurrentRankTable);
-		DECLARE_API_FUNC(RankTable&, GetRankTable, const char* in_pStageID);
+		DECLARE_API_FUNC(RankTable&, GetRankTable);
 		DECLARE_API_FUNC(void, GetRankTables, RankTableNode** out_ppBuffer, int* out_pLength);
+		DECLARE_API_FUNC(RankTable&, FindRankTable, const char* in_pStageID);
 		DECLARE_API_FUNC(BonusTable&, GetBonusTable);
 		DECLARE_API_FUNC(MultiplierTable&, GetMultiplierTable);
 		DECLARE_API_FUNC(TimerTable&, GetTimerTable);

Games/Sonic Generations/ScoreGenerations/API/ScoreGenerationsTypes.h

@@ -168,6 +168,8 @@ namespace ScoreGenerations
             : pStageID(in_pStageID), pRankTable(in_pRankTable) {}
     };
 
+    typedef std::unordered_map<std::string, RankTable> RankTableMap_t;
+
     struct BonusTable
     {
         int HomingChainBonus{};
@@ -194,6 +196,4 @@ namespace ScoreGenerations
         float SuperSonicTimer{};
         float SlamTimer{};
     };
-
-    typedef std::unordered_map<std::string, RankTable> RankTableMap_t;
 };

Games/Sonic Generations/ScoreGenerationsAPIDebug/DllMain.cpp

@@ -161,8 +161,7 @@ EXPORT void OnFrame()
 #if SCORE_GENS_API_VERSION == 1
 			ScoreGenerationsAPI::GetRankTables();
 #elif SCORE_GENS_API_VERSION == 2
-			LOGFN_WARNING("GetCurrentRankTable() = 0x{:X}", (size_t)&pApi->GetCurrentRankTable());
-			LOGFN_WARNING("GetRankTable(\"{}\") = 0x{:X}", pApi->GetStageID(), (size_t)&pApi->GetRankTable(pApi->GetStageID()));
+			LOGFN_WARNING("GetRankTable() = 0x{:X}", (size_t)&pApi->GetRankTable());
 
 			ScoreGenerations::RankTableNode* pRankTables{};
 			int rankTablesLength{};
@@ -190,6 +189,8 @@ EXPORT void OnFrame()
 			}
 
 			delete[] pRankTables;
+
+			LOGFN_WARNING("FindRankTable(\"{}\") = 0x{:X}", pApi->GetStageID(), (size_t)&pApi->FindRankTable(pApi->GetStageID()));
 #endif
 		}