Skip to content

move parsed trigger allocation into models #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jamiras merged 12 commits into from
Feb 14, 2026
Merged

move parsed trigger allocation into models #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dbec182
add GetSubNote to CodeNoteModel
Jamiras Jan 24, 2026
0719504
address analysis warnings
Jamiras Jan 24, 2026
91d90ba
address analysis warnings
Jamiras Jan 24, 2026
aa200c8
replace ra::StringXX functions with ra::util::String::XX
Jamiras Jan 26, 2026
ca1c688
Merge branch 'master' into refactor/string
Jamiras Jan 31, 2026
6aba94f
address analysis warning
Jamiras Feb 2, 2026
7d3efa3
move memory management for local achievements/leaderboards intotheir …
Jamiras Feb 4, 2026
a8856c2
improve [redacted] logging logic
Jamiras Feb 9, 2026
17561dc
eliminate AchievementRuntime::GetAchievementTrigger/GetLeaderboardDef…
Jamiras Feb 11, 2026
6fb1b67
Merge branch 'master' into feature/model_memory_management
Jamiras Feb 11, 2026
5d58937
remove comment
Jamiras Feb 11, 2026
2da840c
address analysis warnings
Jamiras Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/RA_Integration.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
<ClCompile Include="data\context\GameContext.cpp" />
<ClCompile Include="data\context\SessionTracker.cpp" />
<ClCompile Include="data\models\AchievementModel.cpp" />
<ClCompile Include="data\models\CapturedTriggerHits.cpp" />
<ClCompile Include="data\models\CodeNotesModel.cpp" />
<ClCompile Include="data\models\LeaderboardModel.cpp" />
<ClCompile Include="data\models\LocalBadgesModel.cpp" />
Expand Down Expand Up @@ -221,7 +220,6 @@
<ClInclude Include="data\context\GameContext.hh" />
<ClInclude Include="data\context\SessionTracker.hh" />
<ClInclude Include="data\models\AchievementModel.hh" />
<ClInclude Include="data\models\CapturedTriggerHits.hh" />
<ClInclude Include="data\models\CodeNotesModel.hh" />
<ClInclude Include="data\models\LeaderboardModel.hh" />
<ClInclude Include="data\models\LocalBadgesModel.hh" />
Expand Down
6 changes: 0 additions & 6 deletions src/RA_Integration.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,6 @@
<ClCompile Include="data\models\LocalBadgesModel.cpp">
<Filter>Data\Models</Filter>
</ClCompile>
<ClCompile Include="data\models\CapturedTriggerHits.cpp">
<Filter>Data\Models</Filter>
</ClCompile>
<ClCompile Include="ui\viewmodels\ChallengeIndicatorViewModel.cpp">
<Filter>UI\ViewModels</Filter>
</ClCompile>
Expand Down Expand Up @@ -848,9 +845,6 @@
<ClInclude Include="data\models\LocalBadgesModel.hh">
<Filter>Data\Models</Filter>
</ClInclude>
<ClInclude Include="data\models\CapturedTriggerHits.hh">
<Filter>Data\Models</Filter>
</ClInclude>
<ClInclude Include="ui\win32\bindings\NumericUpDownBinding.hh">
<Filter>UI\Win32\Bindings</Filter>
</ClInclude>
Expand Down
17 changes: 6 additions & 11 deletions src/data/context/GameContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,9 @@ void GameContext::InitializeFromAchievementRuntime(const std::map<uint32_t, std:
for (; pAchievementData < pAchievementStop; ++pAchievementData)
{
// if the server has provided an unexpected category (usually 0), ignore it.
ra::data::models::AssetCategory nCategory = ra::data::models::AssetCategory::None;
switch (pAchievementData->public_.category)
{
case RC_CLIENT_ACHIEVEMENT_CATEGORY_CORE:
nCategory = ra::data::models::AssetCategory::Core;

// automatically activate all core achievements in compatibility mode
if (GetMode() == Mode::CompatibilityTest)
{
Expand All @@ -431,8 +428,6 @@ void GameContext::InitializeFromAchievementRuntime(const std::map<uint32_t, std:
break;

case RC_CLIENT_ACHIEVEMENT_CATEGORY_UNOFFICIAL:
nCategory = ra::data::models::AssetCategory::Unofficial;

// all unofficial achievements should start inactive.
// rc_client automatically activates them.
pAchievementData->public_.state = RC_CLIENT_ACHIEVEMENT_STATE_INACTIVE;
Expand All @@ -449,10 +444,11 @@ void GameContext::InitializeFromAchievementRuntime(const std::map<uint32_t, std:

const auto sDefinition = mAchievementDefinitions.find(pAchievementData->public_.id);
if (sDefinition != mAchievementDefinitions.end())
vmAchievement->Attach(*pAchievementData, nCategory, sDefinition->second);
vmAchievement->InitializeFromPublishedAchievement(*pAchievementData, sDefinition->second);
else
vmAchievement->Attach(*pAchievementData, nCategory, "");
vmAchievement->InitializeFromPublishedAchievement(*pAchievementData, "");

vmAchievement->SetLocalAchievementInfo(*pAchievementData);
vmAchievement->SetSubsetID(pSubset->public_.id);

m_vAssets.Append(std::move(vmAchievement));
Expand Down Expand Up @@ -481,14 +477,13 @@ void GameContext::InitializeFromAchievementRuntime(const std::map<uint32_t, std:
{
auto vmLeaderboard = std::make_unique<ra::data::models::LeaderboardModel>();

const auto nCategory = ra::data::models::AssetCategory::Core; // all published leaderboards are core

const auto sDefinition = mLeaderboardDefinitions.find(pLeaderboardData->public_.id);
if (sDefinition != mLeaderboardDefinitions.end())
vmLeaderboard->Attach(*pLeaderboardData, nCategory, sDefinition->second);
vmLeaderboard->InitializeFromPublishedLeaderboard(*pLeaderboardData, sDefinition->second);
else
vmLeaderboard->Attach(*pLeaderboardData, nCategory, "");
vmLeaderboard->InitializeFromPublishedLeaderboard(*pLeaderboardData, "");

vmLeaderboard->SetLocalLeaderboardInfo(*pLeaderboardData);
vmLeaderboard->SetSubsetID(pSubset->public_.id);

m_vAssets.Append(std::move(vmLeaderboard));
Expand Down
Loading
Loading