Skip to content

Use the Script mod type for mods including native and Squirrel scripts #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xanfre wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use the Script mod type for mods including native and Squirrel scripts #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Source/ModManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ void ModManager::checkModDirectory(Mod& mod)
}
mod.setHasSubtitle(dir.HasSubDirs(config_.game.subtitleFolder));
mod.setHasDML(dir.HasFiles("*.dml") || dir.HasSubDirs("dbmods"));
mod.setHasScript(dir.HasSubDirs("scriptdata"));
mod.setHasScript(dir.HasFiles("*.osm") || dir.HasSubDirs("sq_scripts") || dir.HasSubDirs("scriptdata"));
mod.setHasMis(dir.HasFiles("*.mis"));
mod.setHasGamesys(dir.HasFiles("*.gam"));
mod.setHasOther(dir.HasFiles("*.crf"));
Expand Down Expand Up @@ -1474,7 +1474,7 @@ void ModManager::resetStates()
}
}

const std::array<wxString, 21> ModManager::dataDirectories_ =
const std::array<wxString, 20> ModManager::dataDirectories_ =
{
{
"bitmap",
Expand All @@ -1496,21 +1496,18 @@ const std::array<wxString, 21> ModManager::dataDirectories_ =
"snd",
"snd2",
"song",
"sq_scripts",
"strings"
}
};

const std::array<wxString, 8> ModManager::dataFiles_ =
const std::array<wxString, 6> ModManager::dataFiles_ =
{
{
"motiondb.bin",
"editor.res",
"metaui_r.res",
"shkres.res",
"skeldata.res",
"texture.res",
"*.nut",
"*.osm"
"texture.res"
}
};
4 changes: 2 additions & 2 deletions Source/ModManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ class ModManager
void collectMisFileToModMapping(Mod& mod, std::unordered_map<std::string, std::vector<Mod*>>& misFileToMods);
void createLogFile();

static const std::array<wxString, 21> dataDirectories_;
static const std::array<wxString, 8> dataFiles_;
static const std::array<wxString, 20> dataDirectories_;
static const std::array<wxString, 6> dataFiles_;

ApplicationConfig& config_;
ModConfig modConfig_;
Expand Down