mirror of
https://github.com/Mr-Wiseguy/Zelda64Recomp.git
synced 2024-11-22 20:59:21 +01:00
Fixed cursor hiding lag, moved save file location to config folder
This commit is contained in:
parent
7fd55dae5c
commit
0192cac272
@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
namespace recomp {
|
namespace recomp {
|
||||||
constexpr std::u8string_view program_id = u8"Zelda64Recompiled";
|
constexpr std::u8string_view program_id = u8"Zelda64Recompiled";
|
||||||
|
constexpr std::u8string_view mm_game_id = u8"mm.n64.us.1.0";
|
||||||
|
|
||||||
void load_config();
|
void load_config();
|
||||||
void save_config();
|
void save_config();
|
||||||
|
@ -56,6 +56,7 @@ namespace recomp {
|
|||||||
void destroy_ui();
|
void destroy_ui();
|
||||||
void apply_color_hack();
|
void apply_color_hack();
|
||||||
void get_window_size(int& width, int& height);
|
void get_window_size(int& width, int& height);
|
||||||
|
void set_cursor_visible(bool visible);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -216,7 +216,6 @@ EquipSlot func_8082FDC4(void) {
|
|||||||
|
|
||||||
for (int extra_slot_index = 0; extra_slot_index < ARRAY_COUNT(buttons_to_extra_slot); extra_slot_index++) {
|
for (int extra_slot_index = 0; extra_slot_index < ARRAY_COUNT(buttons_to_extra_slot); extra_slot_index++) {
|
||||||
if (CHECK_BTN_ALL(sPlayerControlInput_reloc->press.button, buttons_to_extra_slot[extra_slot_index].button)) {
|
if (CHECK_BTN_ALL(sPlayerControlInput_reloc->press.button, buttons_to_extra_slot[extra_slot_index].button)) {
|
||||||
recomp_printf("Pressed extra item button %d\n", extra_slot_index);
|
|
||||||
return (EquipSlot)buttons_to_extra_slot[extra_slot_index].slot;
|
return (EquipSlot)buttons_to_extra_slot[extra_slot_index].slot;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -237,7 +236,6 @@ ItemId Player_GetItemOnButton(PlayState* play, Player* player, EquipSlot slot) {
|
|||||||
|
|
||||||
// @recomp Check for extra item slots.
|
// @recomp Check for extra item slots.
|
||||||
if (slot <= -EQUIP_SLOT_EX_START) {
|
if (slot <= -EQUIP_SLOT_EX_START) {
|
||||||
recomp_printf("Checking extra item slot %d\n", -slot);
|
|
||||||
ItemId item = EXTRA_BTN_ITEM(-slot);
|
ItemId item = EXTRA_BTN_ITEM(-slot);
|
||||||
|
|
||||||
// Ensure the item was valid and has been obtained.
|
// Ensure the item was valid and has been obtained.
|
||||||
|
@ -66,6 +66,12 @@ void queue_if_enabled(SDL_Event* event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static std::atomic_bool cursor_enabled = true;
|
||||||
|
|
||||||
|
void recomp::set_cursor_visible(bool visible) {
|
||||||
|
cursor_enabled.store(visible);
|
||||||
|
}
|
||||||
|
|
||||||
bool sdl_event_filter(void* userdata, SDL_Event* event) {
|
bool sdl_event_filter(void* userdata, SDL_Event* event) {
|
||||||
switch (event->type) {
|
switch (event->type) {
|
||||||
case SDL_EventType::SDL_KEYDOWN:
|
case SDL_EventType::SDL_KEYDOWN:
|
||||||
@ -185,6 +191,7 @@ void recomp::handle_events() {
|
|||||||
static bool exited = false;
|
static bool exited = false;
|
||||||
while (SDL_PollEvent(&cur_event) && !exited) {
|
while (SDL_PollEvent(&cur_event) && !exited) {
|
||||||
exited = sdl_event_filter(nullptr, &cur_event);
|
exited = sdl_event_filter(nullptr, &cur_event);
|
||||||
|
SDL_ShowCursor(cursor_enabled ? SDL_ENABLE : SDL_DISABLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,8 +2,10 @@
|
|||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <string>
|
||||||
#include "recomp.h"
|
#include "recomp.h"
|
||||||
#include "recomp_game.h"
|
#include "recomp_game.h"
|
||||||
|
#include "recomp_config.h"
|
||||||
#include "../ultramodern/ultra64.h"
|
#include "../ultramodern/ultra64.h"
|
||||||
#include "../ultramodern/ultramodern.hpp"
|
#include "../ultramodern/ultramodern.hpp"
|
||||||
|
|
||||||
@ -59,10 +61,15 @@ void recomp::do_rom_read(uint8_t* rdram, gpr ram_address, uint32_t physical_addr
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::array<char, 0x20000> save_buffer;
|
std::array<char, 0x20000> save_buffer;
|
||||||
const char save_filename[] = "save.bin";
|
const std::u8string save_folder = u8"saves";
|
||||||
|
const std::u8string save_filename = std::u8string{recomp::mm_game_id} + u8".bin";
|
||||||
|
|
||||||
|
std::filesystem::path get_save_file_path() {
|
||||||
|
return recomp::get_app_folder_path() / save_folder / save_filename;
|
||||||
|
}
|
||||||
|
|
||||||
void update_save_file() {
|
void update_save_file() {
|
||||||
std::ofstream save_file{ save_filename, std::ios_base::binary };
|
std::ofstream save_file{ get_save_file_path(), std::ios_base::binary };
|
||||||
|
|
||||||
if (save_file.good()) {
|
if (save_file.good()) {
|
||||||
save_file.write(save_buffer.data(), save_buffer.size());
|
save_file.write(save_buffer.data(), save_buffer.size());
|
||||||
@ -92,7 +99,7 @@ void save_read(uint8_t* rdram, gpr rdram_address, uint32_t offset, uint32_t coun
|
|||||||
|
|
||||||
void save_clear(uint32_t start, uint32_t size, char value) {
|
void save_clear(uint32_t start, uint32_t size, char value) {
|
||||||
std::fill_n(save_buffer.begin() + start, size, value);
|
std::fill_n(save_buffer.begin() + start, size, value);
|
||||||
std::ofstream save_file{ save_filename, std::ios_base::binary };
|
std::ofstream save_file{ get_save_file_path(), std::ios_base::binary };
|
||||||
|
|
||||||
if (save_file.good()) {
|
if (save_file.good()) {
|
||||||
save_file.write(save_buffer.data(), save_buffer.size());
|
save_file.write(save_buffer.data(), save_buffer.size());
|
||||||
@ -103,11 +110,17 @@ void save_clear(uint32_t start, uint32_t size, char value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ultramodern::save_init() {
|
void ultramodern::save_init() {
|
||||||
std::ifstream save_file{ save_filename, std::ios_base::binary };
|
std::filesystem::path save_file_path = get_save_file_path();
|
||||||
|
|
||||||
|
// Ensure the save file directory exists.
|
||||||
|
std::filesystem::create_directories(save_file_path.parent_path());
|
||||||
|
|
||||||
|
// Read the save file if it exists.
|
||||||
|
std::ifstream save_file{ save_file_path, std::ios_base::binary };
|
||||||
if (save_file.good()) {
|
if (save_file.good()) {
|
||||||
save_file.read(save_buffer.data(), save_buffer.size());
|
save_file.read(save_buffer.data(), save_buffer.size());
|
||||||
} else {
|
} else {
|
||||||
|
// Otherwise clear the save file to all zeroes.
|
||||||
save_buffer.fill(0);
|
save_buffer.fill(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ struct RomEntry {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const std::unordered_map<recomp::Game, RomEntry> game_roms {
|
const std::unordered_map<recomp::Game, RomEntry> game_roms {
|
||||||
{ recomp::Game::MM, { 0xEF18B4A9E2386169ULL, u8"mm.n64.us.1.0.z64", "ZELDA MAJORA'S MASK" }},
|
{ recomp::Game::MM, { 0xEF18B4A9E2386169ULL, std::u8string{recomp::mm_game_id} + u8".z64", "ZELDA MAJORA'S MASK" }},
|
||||||
};
|
};
|
||||||
|
|
||||||
bool check_hash(const std::vector<uint8_t>& rom_data, uint64_t expected_hash) {
|
bool check_hash(const std::vector<uint8_t>& rom_data, uint64_t expected_hash) {
|
||||||
|
@ -900,8 +900,7 @@ struct UIContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mouse_is_active_initialized) {
|
if (mouse_is_active_initialized) {
|
||||||
// TODO: Figure out why this only works if the mouse is moving
|
recomp::set_cursor_visible(mouse_is_active);
|
||||||
SDL_ShowCursor(mouse_is_active ? SDL_ENABLE : SDL_DISABLE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current_document == nullptr) {
|
if (current_document == nullptr) {
|
||||||
|
Loading…
Reference in New Issue
Block a user