Skip to content

feat: Fix save is loaded twice. #18

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

Closed
Sys0xdbg wants to merge 1 commit into from
Closed

feat: Fix save is loaded twice. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/hooks/saves/stat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace big
break;

tried_loading = true;
json_loaded = g_stats_service->load_stats();
json_loaded = g_stats_service->load_stats(_this->m_char_slot);

if (json_loaded)
{
Expand Down
47 changes: 25 additions & 22 deletions src/services/stats/stats_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,107 +551,110 @@ namespace big
LOGIF(VERBOSE, g.enable_debug_logs, "Saving took {:%S}", std::chrono::duration_cast<std::chrono::milliseconds>(end_time-start_time));
}

bool stats_service::load_stats()
bool stats_service::load_stats(uint8_t char_index)
{
std::chrono::time_point start_time = std::chrono::high_resolution_clock::now();
if (!load_internal_stats_from_json(0))
if (!load_internal_stats_from_json(char_index))
{
return false;
}

load_internal_stats_from_json(1);
load_internal_stats_from_json(2);

load_internal_stats_from_json(SAVE_OVERWRITE_INDEX);

load_script_data();

if (char_index != 0)
{
load_script_data();
}

const auto& stats = *g_pointers->m_stats;
for (const auto& stat : stats)
{
if (stat.m_stat->GetCharIndex() != char_index)
continue;

switch (stat.m_stat->GetTypeId())
{
case eStatType::INT:
{
if (m_int_stats.contains(stat.m_hash))
if (m_int_stats.contains(stat.m_hash) && m_int_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetIntData(m_int_stats[stat.m_hash].data);
break;
}
case eStatType::FLOAT:
{
if (m_float_stats.contains(stat.m_hash))
if (m_float_stats.contains(stat.m_hash) && m_float_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetFloatData(m_float_stats[stat.m_hash].data);
break;
}
case eStatType::STRING:
{
if (m_string_stats.contains(stat.m_hash))
if (m_string_stats.contains(stat.m_hash) && m_string_stats[stat.m_hash].m_character_index == char_index)
strncpy(((sSubStatData<char[32]>*)stat.m_stat)->m_data, m_string_stats[stat.m_hash].data.data(), 32);
break;
}
case eStatType::BOOL_:
{
if (m_bool_stats.contains(stat.m_hash))
if (m_bool_stats.contains(stat.m_hash) && m_bool_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetBoolData(m_bool_stats[stat.m_hash].data);
break;
}
case eStatType::UINT8:
{
if (m_uint8_stats.contains(stat.m_hash))
if (m_uint8_stats.contains(stat.m_hash) && m_uint8_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint8Data(m_uint8_stats[stat.m_hash].data);
break;
}
case eStatType::UINT16:
{
if (m_uint16_stats.contains(stat.m_hash))
if (m_uint16_stats.contains(stat.m_hash) && m_uint16_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint16Data(m_uint16_stats[stat.m_hash].data);
break;
}
case eStatType::UINT32:
{
if (m_uint32_stats.contains(stat.m_hash))
if (m_uint32_stats.contains(stat.m_hash) && m_uint32_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint32Data(m_uint32_stats[stat.m_hash].data);
break;
}
case eStatType::UINT64:
{
if (m_uint64_stats.contains(stat.m_hash))
if (m_uint64_stats.contains(stat.m_hash) && m_uint64_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint64Data(m_uint64_stats[stat.m_hash].data);
break;
}
case eStatType::INT64:
{
if (m_int64_stats.contains(stat.m_hash))
if (m_int64_stats.contains(stat.m_hash) && m_int64_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetInt64Data(m_int64_stats[stat.m_hash].data);
break;
}
case eStatType::DATE:
{
if (m_date_stats.contains(stat.m_hash))
if (m_date_stats.contains(stat.m_hash) && m_date_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint64Data(m_date_stats[stat.m_hash].data);
break;
}
case eStatType::POS:
{
if (m_pos_stats.contains(stat.m_hash))
if (m_pos_stats.contains(stat.m_hash) && m_pos_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint64Data(m_pos_stats[stat.m_hash].data);
break;
}
case eStatType::TEXTLABEL:
{
if (m_textlabel_stats.contains(stat.m_hash))
if (m_textlabel_stats.contains(stat.m_hash) && m_textlabel_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetIntData(m_textlabel_stats[stat.m_hash].data);
break;
}
case eStatType::PACKED:
{
if (m_packed_stats.contains(stat.m_hash))
if (m_packed_stats.contains(stat.m_hash) && m_packed_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint64Data(m_packed_stats[stat.m_hash].data);
break;
}
case eStatType::USERID:
{
if (m_userid_stats.contains(stat.m_hash))
if (m_userid_stats.contains(stat.m_hash) && m_userid_stats[stat.m_hash].m_character_index == char_index)
stat.m_stat->SetUint64Data(m_userid_stats[stat.m_hash].data);
break;
}
Expand All @@ -671,7 +674,7 @@ namespace big
}

std::chrono::time_point end_time = std::chrono::high_resolution_clock::now();
LOGIF(VERBOSE, g.enable_debug_logs, "Loading took {:%S}", std::chrono::duration_cast<std::chrono::milliseconds>(end_time-start_time));
LOGIF(VERBOSE, g.enable_debug_logs, "Loading char_index {} took {:%S}", char_index, std::chrono::duration_cast<std::chrono::milliseconds>(end_time-start_time));
return true;
}
}
2 changes: 1 addition & 1 deletion src/services/stats/stats_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ namespace big
~stats_service();

void save_stats();
bool load_stats();
bool load_stats(uint8_t char_index);

void register_stat(const char* name);

Expand Down