thirdpartymirrors/N64ModernRuntime
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64ModernRuntime.git synced 2026-02-01 19:26:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Track latest started gamemode

Browse source
This commit is contained in:
Mr-Wiseguy 2026-01-12 01:30:08 -05:00
parent 5db1c639bc
commit 8b3bae4cf3
3 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
librecomp/include/librecomp/mods.hpp
View file

@ -307,7 +307,11 @@ namespace recomp {
uint32_t pad;
};
typedef std::variant<ModConfigQueueSaveMod, ModConfigQueueSave, ModConfigQueueEnd> ModConfigQueueVariant;
struct ModConfigSetLatestGamemode {
uint32_t pad;
};
typedef std::variant<ModConfigQueueSaveMod, ModConfigQueueSave, ModConfigQueueEnd, ModConfigSetLatestGamemode> ModConfigQueueVariant;
class LiveRecompilerCodeHandle;
class ModContext {
@ -345,6 +349,8 @@ namespace recomp {
config::ConfigValueVariant get_mod_config_value(const std::string &mod_id, const std::string &option_id) const;
void set_mods_config_path(const std::filesystem::path &path);
void set_mod_config_directory(const std::filesystem::path &path);
std::string get_latest_game_mode_id() const;
void set_latest_game_mode_id(const std::string& game_mode_id);
ModContentTypeId register_content_type(const ModContentType& type);
bool register_container_type(const std::string& extension, const std::vector<ModContentTypeId>& content_types, bool requires_manifest);
ModContentTypeId get_code_content_type() const { return code_content_type_id; }
@ -412,6 +418,7 @@ namespace recomp {
ModContentTypeId code_content_type_id;
ModContentTypeId rom_patch_content_type_id;
size_t active_game = (size_t)-1;
std::string latest_game_mode;
};
class ModCodeHandle {
@ -609,6 +616,8 @@ namespace recomp {
void set_mod_config_value(const std::string &mod_id, const std::string &option_id, const config::ConfigValueVariant &value);
config::ConfigValueVariant get_mod_config_value(size_t mod_index, const std::string &option_id);
config::ConfigValueVariant get_mod_config_value(const std::string &mod_id, const std::string &option_id);
std::string get_latest_game_mode_id();
void set_latest_game_mode_id(const std::string& game_mode_id);
std::string get_mod_id_from_filename(const std::filesystem::path& mod_filename);
std::filesystem::path get_mod_filename(const std::string& mod_id);
size_t get_mod_order_index(const std::string& mod_id);

32
librecomp/src/mods.cpp
View file

@ -658,7 +658,7 @@ bool save_mod_config_storage(const std::string &mod_id, const recomp::Version &m
return config->save_config_json(config_json);
}
bool parse_mods_config(const std::filesystem::path &path, std::unordered_set<std::string> &enabled_mods, std::vector<std::string> &mod_order) {
bool parse_mods_config(const std::filesystem::path &path, std::string& latest_game_mode, std::unordered_set<std::string> &enabled_mods, std::vector<std::string> &mod_order) {
using json = nlohmann::json;
json config_json;
if (!read_json_with_backups(path, config_json)) {
@ -680,13 +680,25 @@ bool parse_mods_config(const std::filesystem::path &path, std::unordered_set<std
get_to_vec<std::string>(*mod_order_json, mod_order);
}
auto latest_game_mode_json = config_json.find("latest_game_mode");
if (latest_game_mode_json != config_json.end()) {
const std::string* temp_ptr = latest_game_mode_json->get_ptr<const std::string*>();
if (temp_ptr == nullptr) {
latest_game_mode = {};
}
else {
latest_game_mode = *temp_ptr;
}
}
return true;
}
bool save_mods_config(const std::filesystem::path &path, const std::unordered_set<std::string> &enabled_mods, const std::vector<std::string> &mod_order) {
bool save_mods_config(const std::filesystem::path &path, const std::string& latest_game_mode, const std::unordered_set<std::string> &enabled_mods, const std::vector<std::string> &mod_order) {
nlohmann::json config_json;
config_json["enabled_mods"] = enabled_mods;
config_json["mod_order"] = mod_order;
config_json["latest_game_mode"] = latest_game_mode;
std::ofstream output_file = recomp::open_output_file_with_backup(path);
if (!output_file.good()) {
@ -723,6 +735,9 @@ void recomp::mods::ModContext::dirty_mod_configuration_thread_process() {
else if (const ModConfigQueueSaveMod* queue_save_mod = std::get_if<ModConfigQueueSaveMod>(&variant)) {
pending_mods.emplace(queue_save_mod->mod_id);
}
else if (const ModConfigSetLatestGamemode* set_latest_game_mode = std::get_if<ModConfigSetLatestGamemode>(&variant)) {
pending_config_save = true;
}
};
while (active) {
@ -768,7 +783,7 @@ void recomp::mods::ModContext::dirty_mod_configuration_thread_process() {
}
}
save_mods_config(mods_config_path, config_enabled_mods, config_mod_order);
save_mods_config(mods_config_path, latest_game_mode, config_enabled_mods, config_mod_order);
pending_config_save = false;
}
}
@ -828,7 +843,7 @@ void recomp::mods::ModContext::load_mods_config() {
std::unordered_set<std::string> config_enabled_mods;
std::vector<std::string> config_mod_order;
std::vector<bool> opened_mod_is_known;
parse_mods_config(mods_config_path, config_enabled_mods, config_mod_order);
parse_mods_config(mods_config_path, latest_game_mode, config_enabled_mods, config_mod_order);
// Fill a vector with the relative order of the mods. Existing mods will get ordered below new mods.
std::vector<size_t> sort_order;
@ -1507,6 +1522,15 @@ void recomp::mods::ModContext::set_mod_config_directory(const std::filesystem::p
mod_config_directory = path;
}
std::string recomp::mods::ModContext::get_latest_game_mode_id() const {
return latest_game_mode;
}
void recomp::mods::ModContext::set_latest_game_mode_id(const std::string& game_mode_id) {
latest_game_mode = game_mode_id;
mod_configuration_thread_queue.enqueue(ModConfigSetLatestGamemode());
}
std::vector<recomp::mods::ModLoadErrorDetails> recomp::mods::ModContext::load_mods(const GameEntry& game_entry, const std::string& game_mode_id, uint8_t* rdram, int32_t load_address, uint32_t& ram_used) {
std::vector<recomp::mods::ModLoadErrorDetails> ret{};
ram_used = 0;

11
librecomp/src/recomp.cpp
View file

@ -533,6 +533,7 @@ void recomp::start_game(const std::u8string& game_id, const std::string& game_mo
current_game = game_id;
game_status.store(GameStatus::Running);
game_status.notify_all();
mods::set_latest_game_mode_id(game_mode_id);
}
bool ultramodern::is_game_started() {
@ -601,6 +602,16 @@ recomp::config::ConfigValueVariant recomp::mods::get_mod_config_value(const std:
return mod_context->get_mod_config_value(mod_id, option_id);
}
std::string recomp::mods::get_latest_game_mode_id() {
std::lock_guard lock{ mod_context_mutex };
return mod_context->get_latest_game_mode_id();
}
void recomp::mods::set_latest_game_mode_id(const std::string& game_mode_id) {
std::lock_guard lock{ mod_context_mutex };
mod_context->set_latest_game_mode_id(game_mode_id);
}
std::string recomp::mods::get_mod_id_from_filename(const std::filesystem::path& mod_filename) {
std::lock_guard lock { mod_context_mutex };
return mod_context->get_mod_id_from_filename(mod_filename);