export functions for use with rc_client_external (#1040)

RetroAchievements · Dec 9, 2023 · c19a893 · c19a893
1 parent 2164dcc
commit c19a893
Show file tree

Hide file tree

Showing 14 changed files with 671 additions and 31 deletions.
diff --git a/rcheevos b/rcheevos
diff --git a/src/api/impl/ConnectedServer.cpp b/src/api/impl/ConnectedServer.cpp
@@ -346,7 +346,7 @@ static bool DoRequest(const rc_api_request_t& api_request, const char* sApiName,
                 if (!sParams.empty())
                     sParams.push_back('&');
 
-                sParams.append(api_request.post_data, ptr - api_request.post_data - 1);
+                sParams.append(api_request.post_data, ptr - api_request.post_data);
             }
 
             while (*ptr && ptr[0] != '&')

diff --git a/src/data/context/GameContext.cpp b/src/data/context/GameContext.cpp
@@ -145,9 +145,6 @@ void GameContext::LoadGame(unsigned int nGameId, const std::string& sGameHash, M
         }
     }
 
-    // enable spectator mode to prevent unlocks when testing compatibility
-    rc_client_set_spectator_mode_enabled(pRuntime.GetClient(), nMode == Mode::CompatibilityTest);
-
     const bool bWasPaused = pRuntime.IsPaused();
     pRuntime.SetPaused(true);
 
@@ -322,6 +319,15 @@ void GameContext::InitializeFromAchievementRuntime(const std::map<uint32_t, std:
                 {
                     case RC_CLIENT_ACHIEVEMENT_CATEGORY_CORE:
                         nCategory = ra::data::models::AssetCategory::Core;
+
+                        // automatically activate all core achievements in compatibility mode
+                        if (GetMode() == Mode::CompatibilityTest)
+                        {
+                            pAchievementData->public_.state = RC_CLIENT_ACHIEVEMENT_STATE_ACTIVE;
+
+                            if (pAchievementData->trigger)
+                                pAchievementData->trigger->state = RC_TRIGGER_STATE_WAITING;
+                        }
                         break;
 
                     case RC_CLIENT_ACHIEVEMENT_CATEGORY_UNOFFICIAL:

diff --git a/src/data/models/CodeNotesModel.cpp b/src/data/models/CodeNotesModel.cpp
@@ -110,7 +110,12 @@ void CodeNotesModel::ExtractSize(CodeNote& pNote)
         const wchar_t c = (nIndex == nLength) ? 0 : pNote.Note.at(nIndex);
 
         // find the next word
-        if (isalpha(c))
+        if (c > 255)
+        {
+            // ignore unicode characters - isalpha with the default locale would return false,
+            // but also likes to pop up asserts when in a debug build.
+        }
+        else if (isalpha(c))
         {
             if (sWord.empty())
             {
@@ -252,7 +257,7 @@ void CodeNotesModel::ExtractSize(CodeNote& pNote)
         bLastWordIsSize = bWordIsSize;
         bLastWordIsNumber = bWordIsNumber;
 
-        if (isalnum(c))
+        if (c < 256 && isalnum(c))
         {
             std::swap(sPreviousWord, sWord);
             sWord.clear();
+8 −0		include/rc_client.h
+35 −0		include/rc_client_raintegration.h
+466 −66		src/rc_client.c
+135 −0		src/rc_client_external.h
+48 −1		src/rc_client_internal.h
+373 −0		src/rc_client_raintegration.c
+44 −0		src/rc_client_raintegration_internal.h
+6 −0		src/rc_libretro.c
+2 −1		src/rhash/hash.c
+4 −0		test/Makefile
+9 −0		test/rcheevos-test.vcxproj
+15 −0		test/rcheevos-test.vcxproj.filters
+17 −0		test/test.c
+118 −7		test/test_rc_client.c
+1,224 −0		test/test_rc_client_external.c
+271 −0		test/test_rc_client_raintegration.c
+3 −0		test/test_rc_libretro.c