Skip to content
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

Implement save data install from ZIP #19436

Merged
merged 8 commits into from
Sep 7, 2024
Merged

Implement save data install from ZIP #19436

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3a04736
Add ability to install savedata from GameFAQs-style ZIP files
hrydgard Sep 5, 2024
f38cc4a
Add some prototype UI for overwriting saves
hrydgard Sep 5, 2024
8186f14
Much more UI work on savedata import
hrydgard Sep 7, 2024
b0cee36
New strings
hrydgard Sep 7, 2024
2046728
Warning fix
hrydgard Sep 7, 2024
ce4f8ba
Buildfix
hrydgard Sep 7, 2024
48a0c0f
Fix using ESC in savedata screen. Warning fix
hrydgard Sep 7, 2024
514f29d
Fix save data manager dialog popup
hrydgard Sep 7, 2024
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
Prev Previous commit
Next Next commit
Warning fix
  • Loading branch information
@hrydgard
hrydgard committed Sep 7, 2024
commit 204672800c3f56f5c7c433b184c0336d1c9a0ec2
14 changes: 8 additions & 6 deletions UI/DebugOverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,21 +435,23 @@ void DrawFPS(UIContext *ctx, const Bounds &bounds) {
float vps, fps, actual_fps;
__DisplayGetFPS(&vps, &fps, &actual_fps);

char fpsbuf[256]{};
if (g_Config.iShowStatusFlags == ((int)ShowStatusFlags::FPS_COUNTER | (int)ShowStatusFlags::SPEED_COUNTER)) {
char fpsbuf[256];
fpsbuf[0] = '\0';
if ((g_Config.iShowStatusFlags & ((int)ShowStatusFlags::FPS_COUNTER | (int)ShowStatusFlags::SPEED_COUNTER)) == ((int)ShowStatusFlags::FPS_COUNTER | (int)ShowStatusFlags::SPEED_COUNTER)) {
snprintf(fpsbuf, sizeof(fpsbuf), "%0.0f/%0.0f (%0.1f%%)", actual_fps, fps, vps / ((g_Config.iDisplayRefreshRate / 60.0f * 59.94f) / 100.0f));
} else {
if (g_Config.iShowStatusFlags & (int)ShowStatusFlags::FPS_COUNTER) {
snprintf(fpsbuf, sizeof(fpsbuf), "FPS: %0.1f", actual_fps);
}
if (g_Config.iShowStatusFlags & (int)ShowStatusFlags::SPEED_COUNTER) {
snprintf(fpsbuf, sizeof(fpsbuf), "%s Speed: %0.1f%%", fpsbuf, vps / (59.94f / 100.0f));
} else if (g_Config.iShowStatusFlags & (int)ShowStatusFlags::SPEED_COUNTER) {
snprintf(fpsbuf, sizeof(fpsbuf), "Speed: %0.1f%%", vps / (59.94f / 100.0f));
}
}

#ifdef CAN_DISPLAY_CURRENT_BATTERY_CAPACITY
if (g_Config.iShowStatusFlags & (int)ShowStatusFlags::BATTERY_PERCENT) {
snprintf(fpsbuf, sizeof(fpsbuf), "%s Battery: %d%%", fpsbuf, getCurrentBatteryCapacity());
char temp[256];
snprintf(temp, sizeof(temp), "%s Battery: %d%%", fpsbuf, getCurrentBatteryCapacity());
snprintf(fpsbuf, sizeof(fpsbuf), "%s", temp);
}
#endif

Expand Down