Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable
This commit is contained in:
commit
3522a4cef5
|
@ -167,8 +167,7 @@ static bool mod_load_files(struct Mod* mod, char* modName, char* fullPath) {
|
||||||
struct dirent* dir = NULL;
|
struct dirent* dir = NULL;
|
||||||
DIR* d = opendir(actorsPath);
|
DIR* d = opendir(actorsPath);
|
||||||
if (!d) {
|
if (!d) {
|
||||||
LOG_ERROR("Could not open directory '%s'", actorsPath);
|
return true;
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// iterate mod directory
|
// iterate mod directory
|
||||||
|
|
|
@ -147,7 +147,10 @@ void mods_init(void) {
|
||||||
|
|
||||||
// load mods
|
// load mods
|
||||||
if (hasUserPath) { mods_load(&gLocalMods, userModPath); }
|
if (hasUserPath) { mods_load(&gLocalMods, userModPath); }
|
||||||
mods_load(&gLocalMods, "./" MOD_DIRECTORY);
|
char defaultModsPath[SYS_MAX_PATH] = { 0 };
|
||||||
|
if (snprintf(defaultModsPath, SYS_MAX_PATH - 1, "%s", "./" MOD_DIRECTORY) >= 0) {
|
||||||
|
mods_load(&gLocalMods, defaultModsPath);
|
||||||
|
}
|
||||||
|
|
||||||
// calculate total size
|
// calculate total size
|
||||||
gLocalMods.size = 0;
|
gLocalMods.size = 0;
|
||||||
|
|
Loading…
Reference in New Issue