The-Homebrew-Cloud/Zelda64Recomp
2
0
Fork 0
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git synced 2024-12-24 20:01:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

relocated game reset flag.

Browse Source
This commit is contained in:
LT-Schmiddy 2024-11-24 16:42:09 -05:00
parent 09e4c8e217
commit 058987b788
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/zelda_config.h
View File

@ -89,8 +89,6 @@ namespace zelda64 {
void open_quit_game_prompt(); void open_quit_game_prompt();
void open_reset_game_prompt(); void open_reset_game_prompt();
extern bool should_game_reset;
}; };
#endif #endif

7
include/zelda_game.h
View File

@ -2,8 +2,11 @@
#define __ZELDA_GAME_H__ #define __ZELDA_GAME_H__
namespace zelda64 { namespace zelda64 {
void quicksave_save(); // Quicksaving is disabled for now:
void quicksave_load(); //void quicksave_save();
//void quicksave_load();
extern bool should_game_reset;
}; };
#endif #endif

5
src/game/recomp_api.cpp
View File

@ -3,6 +3,7 @@
#include "librecomp/recomp.h" #include "librecomp/recomp.h"
#include "librecomp/overlays.hpp" #include "librecomp/overlays.hpp"
#include "zelda_config.h" #include "zelda_config.h"
#include "zelda_game.h"
#include "recomp_input.h" #include "recomp_input.h"
#include "recomp_ui.h" #include "recomp_ui.h"
#include "zelda_render.h" #include "zelda_render.h"
@ -14,6 +15,10 @@
#include "ultramodern/ultramodern.hpp" #include "ultramodern/ultramodern.hpp"
#include "ultramodern/config.hpp" #include "ultramodern/config.hpp"
namespace zelda64 {
bool should_game_reset;
}
extern "C" void recomp_update_inputs(uint8_t* rdram, recomp_context* ctx) { extern "C" void recomp_update_inputs(uint8_t* rdram, recomp_context* ctx) {
recomp::poll_inputs(); recomp::poll_inputs();
} }

5
src/ui/ui_config.cpp
View File

@ -3,6 +3,7 @@
#include "zelda_sound.h" #include "zelda_sound.h"
#include "zelda_config.h" #include "zelda_config.h"
#include "zelda_debug.h" #include "zelda_debug.h"
#include "zelda_game.h"
#include "zelda_render.h" #include "zelda_render.h"
#include "promptfont.h" #include "promptfont.h"
#include "ultramodern/config.hpp" #include "ultramodern/config.hpp"
@ -161,10 +162,6 @@ static bool sample_positions_supported = false;
static bool cont_active = true; static bool cont_active = true;
namespace zelda64 {
bool should_game_reset;
}
static recomp::InputDevice cur_device = recomp::InputDevice::Controller; static recomp::InputDevice cur_device = recomp::InputDevice::Controller;
int recomp::get_scanned_input_index() { int recomp::get_scanned_input_index() {