Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refined conditions for when autosaving is allowed

This commit is contained in:
Mr-Wiseguy 2024-05-02 02:38:17 -04:00
parent 7491eabde0
commit 76a879359e
2 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
patches/autosaving.c
View File

@ -123,10 +123,6 @@ bool autosave_compare_saves(SaveContext* a, SaveContext* b) {
Gfx* Gfx_DrawRect_DropShadow(Gfx* gfx, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy, Gfx* Gfx_DrawRect_DropShadow(Gfx* gfx, s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy,
s16 r, s16 g, s16 b, s16 a); s16 r, s16 g, s16 b, s16 a);
#define MIN_FRAMES_SINCE_CHANGED 10
OSTime last_autosave_time = 0;
int frames_since_save_changed = 0;
int autosave_icon_counter = 0; int autosave_icon_counter = 0;
#define AUTOSAVE_ICON_FADE_OUT_FRAMES 5 #define AUTOSAVE_ICON_FADE_OUT_FRAMES 5
@ -165,6 +161,12 @@ Gfx* GfxEx_DrawRect_DropShadow(Gfx* gfx, s16 rectLeft, s16 rectTop, s16 rectWidt
return gfx; return gfx;
} }
bool autosave_was_ready = false;
s32 recomp_autosave_debug_enabled() {
return 1;
}
void draw_autosave_icon(PlayState* play) { void draw_autosave_icon(PlayState* play) {
s32 alpha = 0; s32 alpha = 0;
if (autosave_icon_counter > (AUTOSAVE_ICON_SHOW_FRAMES + AUTOSAVE_ICON_FADE_OUT_FRAMES)) { if (autosave_icon_counter > (AUTOSAVE_ICON_SHOW_FRAMES + AUTOSAVE_ICON_FADE_OUT_FRAMES)) {
@ -181,9 +183,9 @@ void draw_autosave_icon(PlayState* play) {
autosave_icon_counter--; autosave_icon_counter--;
} }
if (alpha != 0) { OPEN_DISPS(play->state.gfxCtx);
OPEN_DISPS(play->state.gfxCtx);
if (alpha != 0) {
gEXForceUpscale2D(OVERLAY_DISP++, 1); gEXForceUpscale2D(OVERLAY_DISP++, 1);
gDPLoadTextureBlock(OVERLAY_DISP++, autosave_icon, G_IM_FMT_RGBA, G_IM_SIZ_32b, AUTOSAVE_ICON_WIDTH, AUTOSAVE_ICON_HEIGHT, 0, gDPLoadTextureBlock(OVERLAY_DISP++, autosave_icon, G_IM_FMT_RGBA, G_IM_SIZ_32b, AUTOSAVE_ICON_WIDTH, AUTOSAVE_ICON_HEIGHT, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@ -193,9 +195,15 @@ void draw_autosave_icon(PlayState* play) {
(s32)(1024.0f * AUTOSAVE_ICON_WIDTH / AUTOSAVE_ICON_DRAW_WIDTH), (s32)(1024.0f * AUTOSAVE_ICON_HEIGHT / AUTOSAVE_ICON_DRAW_HEIGHT), (s32)(1024.0f * AUTOSAVE_ICON_WIDTH / AUTOSAVE_ICON_DRAW_WIDTH), (s32)(1024.0f * AUTOSAVE_ICON_HEIGHT / AUTOSAVE_ICON_DRAW_HEIGHT),
255, 255, 255, alpha, G_EX_ORIGIN_RIGHT); 255, 255, 255, alpha, G_EX_ORIGIN_RIGHT);
gEXForceUpscale2D(OVERLAY_DISP++, 0); gEXForceUpscale2D(OVERLAY_DISP++, 0);
CLOSE_DISPS(play->state.gfxCtx);
} }
if (recomp_autosave_debug_enabled() && autosave_was_ready) {
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 0, 0, 255);
gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE);
gEXFillRectangle(OVERLAY_DISP++, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_LEFT, 0, SCREEN_HEIGHT - 10, 20, SCREEN_HEIGHT);
}
CLOSE_DISPS(play->state.gfxCtx);
} }
void show_autosave_icon() { void show_autosave_icon() {
@ -210,7 +218,23 @@ u32 recomp_autosave_interval() {
return 2 * 60 * 1000; return 2 * 60 * 1000;
} }
#define MIN_FRAMES_SINCE_CHANGED 10
#define MIN_FRAMES_SINCE_READY 20
OSTime last_autosave_time = 0;
bool reached_final_three_hours() {
// Logic copied with modifications from Interface_DrawClock.
if ((CURRENT_DAY >= 4) ||
((CURRENT_DAY == 3) && (CURRENT_TIME >= CLOCK_TIME(3, 0)) && (CURRENT_TIME < CLOCK_TIME(6, 0)))
) {
return true;
}
return false;
}
void autosave_post_play_update(PlayState* play) { void autosave_post_play_update(PlayState* play) {
static int frames_since_save_changed = 0;
static int frames_since_autosave_ready = 0;
if (recomp_autosave_enabled()) { if (recomp_autosave_enabled()) {
if (autosave_compare_saves(&gSaveContext, &prev_save_ctx)) { if (autosave_compare_saves(&gSaveContext, &prev_save_ctx)) {
frames_since_save_changed = 0; frames_since_save_changed = 0;
@ -222,27 +246,40 @@ void autosave_post_play_update(PlayState* play) {
OSTime time_now = osGetTime(); OSTime time_now = osGetTime();
// Check if enough time has passed since the previous autosave to create a new one. // Check the following conditions:
if (OS_CYCLES_TO_USEC(time_now - last_autosave_time) > (1000 * recomp_autosave_interval())) { // * The UI is in a normal state.
// Check the following conditions: // * Time is passing.
// * The UI is in a normal state. // * No message is on screen.
// * Time is passing. // * The game is not paused.
// * No message is on screen. // * No cutscene is running.
// * The game is not paused. // * The game is not in cutscene mode.
// * No cutscene is running. // * The clock has not reached the final 3 hours.
// * The game is not in cutscene mode. if (gSaveContext.hudVisibility == HUD_VISIBILITY_ALL &&
if (gSaveContext.hudVisibility == HUD_VISIBILITY_ALL && R_TIME_SPEED != 0 &&
R_TIME_SPEED != 0 && !Environment_IsTimeStopped() &&
!Environment_IsTimeStopped() && play->msgCtx.msgMode == MSGMODE_NONE &&
play->msgCtx.msgMode == MSGMODE_NONE && play->pauseCtx.state == PAUSE_STATE_OFF &&
play->pauseCtx.state == PAUSE_STATE_OFF && gSaveContext.save.cutsceneIndex < 0xFFF0 &&
gSaveContext.save.cutsceneIndex < 0xFFF0 && !Play_InCsMode(play) &&
!Play_InCsMode(play) !reached_final_three_hours()
) { ) {
last_autosave_time = time_now; frames_since_autosave_ready++;
do_autosave(&play->sramCtx); autosave_was_ready = true;
show_autosave_icon(); }
} else {
frames_since_autosave_ready = 0;
autosave_was_ready = false;
}
// Check if the frame count thresholds for the save data remaining unchanged and autosaving being ready have both been met
// and that enough time has passed since the previous autosave to create a new one.
if (frames_since_save_changed >= MIN_FRAMES_SINCE_CHANGED &&
frames_since_autosave_ready >= MIN_FRAMES_SINCE_READY &&
OS_CYCLES_TO_USEC(time_now - last_autosave_time) > (1000 * recomp_autosave_interval())
) {
last_autosave_time = time_now;
do_autosave(&play->sramCtx);
show_autosave_icon();
} }
} }
else { else {

11
patches/patches.h
View File

@ -23,6 +23,17 @@
#include "global.h" #include "global.h"
#include "rt64_extended_gbi.h" #include "rt64_extended_gbi.h"
#ifndef gEXFillRectangle
#define gEXFillRectangle(cmd, lorigin, rorigin, ulx, uly, lrx, lry) \
G_EX_COMMAND2(cmd, \
PARAM(RT64_EXTENDED_OPCODE, 8, 24) | PARAM(G_EX_FILLRECT_V1, 24, 0), \
PARAM(lorigin, 12, 0) | PARAM(rorigin, 12, 12), \
\
PARAM((ulx) * 4, 16, 16) | PARAM((uly) * 4, 16, 0), \
PARAM((lrx) * 4, 16, 16) | PARAM((lry) * 4, 16, 0) \
)
#endif
#define gEXMatrixGroupNoInterpolation(cmd, push, proj, edit) \ #define gEXMatrixGroupNoInterpolation(cmd, push, proj, edit) \
gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, edit) gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, edit)