jackcartersmith/gse
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

display & save progress/max_progress as uint32

Browse Source
This commit is contained in:
otavepto 2024-06-23 00:30:49 +03:00
parent de03379602
commit 2bea12e199
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overlay_experimental/overlay/steam_overlay.h
View File

@ -71,8 +71,8 @@ struct Overlay_Achievement
std::string description{}; std::string description{};
std::string icon_name{}; std::string icon_name{};
std::string icon_gray_name{}; std::string icon_gray_name{};
float progress{}; uint32 progress{};
float max_progress{}; uint32 max_progress{};
bool hidden{}; bool hidden{};
bool achieved{}; bool achieved{};
uint32 unlock_time{}; uint32 unlock_time{};

14
overlay_experimental/steam_overlay.cpp
View File

@ -361,8 +361,8 @@ void Steam_Overlay::load_achievements_data()
float pnMinProgress = 0, pnMaxProgress = 0; float pnMinProgress = 0, pnMaxProgress = 0;
if (steamUserStats->GetAchievementProgressLimits(ach.name.c_str(), &pnMinProgress, &pnMaxProgress)) { if (steamUserStats->GetAchievementProgressLimits(ach.name.c_str(), &pnMinProgress, &pnMaxProgress)) {
ach.progress = pnMinProgress; ach.progress = (uint32)pnMinProgress;
ach.max_progress = pnMaxProgress; ach.max_progress = (uint32)pnMaxProgress;
} }
achievements.emplace_back(ach); achievements.emplace_back(ach);
@ -669,7 +669,7 @@ void Steam_Overlay::show_test_achievement()
// randomly add progress // randomly add progress
if (common_helpers::rand_number(1000) % 2) { if (common_helpers::rand_number(1000) % 2) {
for_progress = true; for_progress = true;
float progress = common_helpers::rand_number(500) / 10.0f + 50; // [50.0, 100.0] uint32 progress = (uint32)(common_helpers::rand_number(500) / 10 + 50); // [50, 100]
ach.max_progress = 100; ach.max_progress = 100;
ach.progress = progress; ach.progress = progress;
ach.achieved = false; ach.achieved = false;
@ -1034,8 +1034,8 @@ void Steam_Overlay::add_ach_progressbar(const Overlay_Achievement &ach)
{ {
if (!ach.achieved && ach.max_progress > 0) { if (!ach.achieved && ach.max_progress > 0) {
char buf[32]{}; char buf[32]{};
sprintf(buf, "%.1f/%.1f", ach.progress, ach.max_progress); sprintf(buf, "%u/%u", ach.progress, ach.max_progress);
ImGui::ProgressBar(ach.progress / ach.max_progress, { -1 , settings->overlay_appearance.font_size }, buf); ImGui::ProgressBar((float)ach.progress / ach.max_progress, { -1 , settings->overlay_appearance.font_size }, buf);
} }
} }
@ -2088,8 +2088,8 @@ void Steam_Overlay::AddAchievementNotification(const std::string &ach_name, nloh
a.achieved = ach.value("earned", false); a.achieved = ach.value("earned", false);
a.unlock_time = ach.value("earned_time", static_cast<uint32>(0)); a.unlock_time = ach.value("earned_time", static_cast<uint32>(0));
a.progress = ach.value("progress", static_cast<float>(0)); a.progress = ach.value("progress", static_cast<uint32>(0));
a.max_progress = ach.value("max_progress", static_cast<float>(0)); a.max_progress = ach.value("max_progress", static_cast<uint32>(0));
} catch(...) {} } catch(...) {}
if (a.achieved && !for_progress) { // here we don't show the progress indications if (a.achieved && !for_progress) { // here we don't show the progress indications