update(main): Update country ID to be STR for leaderboards

Author: Jouca

src/MoreLeaderboards/MoreLeaderboards.cpp

@@ -178,7 +178,7 @@ void MoreLeaderboards::onModsList(CCObject* pSender) {
 }
 
 void MoreLeaderboards::onRegion(CCObject* pSender) {
-    SelectRegion::scene([this](int id) {
+    SelectRegion::scene([this](std::string id) {
         country_id = id;
 
         if (loading) return;
@@ -253,7 +253,7 @@ You can submit your <cy>user stats</c> to the <cj>Updated Leaderboards</c> team
 
 MoreLeaderboards* MoreLeaderboards::create(std::string type) {
     auto pRet = new MoreLeaderboards();
-    SelectRegionCell::country_id = 0;
+    SelectRegionCell::country_id = "NAN";
     if (pRet && pRet->init(type)) {
         pRet->autorelease();
         return pRet;
@@ -632,6 +632,7 @@ void MoreLeaderboards::startLoadingMore() {
                 .param("username", username)
                 .param("mod", (modFilter ? "1" : "0"))
                 .param("modFilter", modFilterType)
+                .param("version", "1.0")
                 .get("https://clarifygdps.com/gdutils/moreleaderboards.php")
         );
     };

src/MoreLeaderboards/MoreLeaderboards.h

@@ -48,7 +48,7 @@ class MoreLeaderboards : public CCLayer {
     CCString* datas = nullptr;
     std::string data_region = "";
 
-    int country_id = 0;
+    std::string country_id = "NAN";
 
     CCMenu* m_menu;
     CCMenuItemToggler* m_tab1;

src/MoreLeaderboards/SelectRegion.cpp

@@ -25,7 +25,7 @@ std::vector<std::string> SelectRegion::getWords(std::string s, std::string delim
     return res;
 }
 
-void SelectRegion::scene(const std::function<void(int)>& callback) {
+void SelectRegion::scene(const std::function<void(std::string)>& callback) {
     auto popup = new SelectRegion(callback);
 
     if (popup && popup->initAnchored(250.0f, 210.0f)) {
@@ -52,7 +52,7 @@ void SelectRegion::loadPage() {
     CCArray* data = CCArray::create();
 
     for (std::string const& mod : SelectRegion::displayedData) {
-        auto cell = SelectRegionCell::create(mod, [this](int id) {
+        auto cell = SelectRegionCell::create(mod, [this](std::string id) {
             selectedRegion(id);
             removeFromParent();
         });

src/MoreLeaderboards/SelectRegion.h

@@ -6,7 +6,7 @@
 
 class SelectRegion : public Popup<> {
     LoadingCircle* loading_circle;
-    std::function<void(int)> selectedRegion;
+    std::function<void(std::string)> selectedRegion;
 
     protected:
         bool setup() override;
@@ -16,9 +16,9 @@ class SelectRegion : public Popup<> {
     public:
         static std::vector<std::string> displayedData;
 
-        SelectRegion(const std::function<void(int)>& callback) : selectedRegion(callback) {}
+        SelectRegion(const std::function<void(std::string)>& callback) : selectedRegion(callback) {}
 
-        static void scene(const std::function<void(int)>& callback);
+        static void scene(const std::function<void(std::string)>& callback);
 
         static std::vector<std::string> getWords(std::string s, std::string delim);
 };

src/MoreLeaderboards/SelectRegionCell.cpp

@@ -1,6 +1,6 @@
 #include "SelectRegionCell.h"
 
-int SelectRegionCell::country_id = 0;
+std::string SelectRegionCell::country_id = "NAN";
 
 bool SelectRegionCell::init(std::string mod) {
     std::vector<std::string> data = SelectRegion::getWords(mod, ":");
@@ -33,14 +33,14 @@ bool SelectRegionCell::init(std::string mod) {
                 earthSpr->setPosition({ 20, 14 });
                 addChild(earthSpr);
             }
+
+            id_ctr = name;
         } else if (id == "5") {
             auto nbPlayers = cocos2d::CCLabelBMFont::create((name + " players").c_str(), "goldFont.fnt");
             nbPlayers->setPosition({ 38, 8 });
             nbPlayers->setAnchorPoint({ 0, 0.5 });
             nbPlayers->setScale(.375f);
             addChild(nbPlayers);
-        } else if (id == "4") {
-            id_ctr = numFromString<int>(name).unwrapOrDefault();
         }
 
         data.erase(data.begin());
@@ -81,7 +81,7 @@ void SelectRegionCell::onClick(cocos2d::CCObject* pSender) {
     selectedRegion(country_id = id_ctr);
 }
 
-SelectRegionCell* SelectRegionCell::create(std::string mod, const std::function<void(int)>& callback) {
+SelectRegionCell* SelectRegionCell::create(std::string mod, const std::function<void(std::string)>& callback) {
     auto ret = new SelectRegionCell(callback);
     if (ret && ret->init(mod)) {
         ret->retain();

src/MoreLeaderboards/SelectRegionCell.h

@@ -3,14 +3,14 @@
 #include <Geode/Bindings.hpp>
 
 class SelectRegionCell : public cocos2d::CCLayer {
-    std::function<void(int)> selectedRegion;
-    int id_ctr;
+    std::function<void(std::string)> selectedRegion;
+    std::string id_ctr;
 
     void onClick(cocos2d::CCObject* pSender);
 public:
-    SelectRegionCell(const std::function<void(int)>& callback) : selectedRegion(callback) {}
+    SelectRegionCell(const std::function<void(std::string)>& callback) : selectedRegion(callback) {}
 
-    static int country_id;
+    static std::string country_id;
     bool init(std::string mod);
-    static SelectRegionCell* create(std::string mod, const std::function<void(int)>& callback);
+    static SelectRegionCell* create(std::string mod, const std::function<void(std::string)>& callback);
 };