7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-04 01:01:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
altalk23 2022-10-08 14:57:09 +03:00
commit 496fcc9965
3 changed files with 14 additions and 12 deletions

16
loader/src/load/Interface.cpp
View file

@ -7,22 +7,22 @@
USE_GEODE_NAMESPACE();
void Interface::init(Mod* mod) {
if (!this->m_mod) {
this->m_mod = mod;
for (auto const& hook : this->m_scheduledHooks) {
std::invoke(hook.m_addFunction, this->m_mod, hook.m_displayName, hook.m_address);
if (!m_mod) {
m_mod = mod;
for (auto const& hook : m_scheduledHooks) {
std::invoke(hook.m_addFunction, m_mod, hook.m_displayName, hook.m_address);
}
this->m_scheduledHooks.clear();
m_scheduledHooks.clear();
for (auto const& fn : this->m_scheduledFunctions) {
for (auto const& fn : m_scheduledFunctions) {
std::invoke(fn);
}
this->m_scheduledFunctions.clear();
m_scheduledFunctions.clear();
}
}
void Interface::scheduleOnLoad(ScheduledFunction function) {
this->m_scheduledFunctions.push_back(function);
m_scheduledFunctions.push_back(function);
}
Interface* Interface::create() {

4
loader/src/load/Log.cpp
View file

@ -100,9 +100,9 @@ std::string Log::toString(bool logTime) const {
res += fmt::format("{:%H:%M:%S}", this->m_time);
}
res += fmt::format(" [{}]: ", this->m_sender ? this->m_sender->getName() : "?");
res += fmt::format("[{}]: ", m_sender ? m_sender->getName() : "?");
for (ComponentTrait* i : this->m_components) {
for (auto& i : m_components) {
res += i->_toString();
}

6
loader/src/load/ModInfo.cpp
View file

@ -89,8 +89,10 @@ Result<ModInfo> ModInfo::createFromSchemaV010(ModJson const& rawJson) {
info.m_binaryName = info.m_id + GEODE_PLATFORM_EXTENSION;
if (root.has("binary")) {
log::warn("Warning: [mod.json].binary is deprecated "
"and will be removed in the future.");
log::warn(
"[mod.json].binary is deprecated "
"and will be removed in the future."
);
}
root.has("binary").asOneOf<value_t::string, value_t::object>();