markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bot: added support for loading from custom folders (ref #498)

Browse source
This commit is contained in:
jeefo 2023-12-20 00:06:45 +03:00
commit a904f49231
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
7 changed files with 59 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/config.cpp
View file

@ -621,13 +621,15 @@ void BotConfig::loadDifficultyConfig () {
}
void BotConfig::loadMapSpecificConfig () {
auto mapSpecificConfig = strings.joinPath (folders.addons, folders.bot, folders.config, "maps", strings.format ("%s.%s", game.getMapName (), kConfigExtension));
auto mapSpecificConfig = strings.joinPath (folders.config, "maps", strings.format ("%s.%s", game.getMapName (), kConfigExtension));
// check existence of file
if (plat.fileExists (strings.joinPath (game.getRunningModName (), mapSpecificConfig).chars ())) {
game.serverCommand ("exec %s", mapSpecificConfig);
if (plat.fileExists (strings.joinPath (bstor.getRunningPath (), mapSpecificConfig).chars ())) {
auto mapSpecificConfigForExec = strings.joinPath (bstor.getRunningPathVFS (), mapSpecificConfig);
mapSpecificConfigForExec.replace ("\\", "/");
ctrl.msg ("Executed map-specific config: %s", mapSpecificConfig);
game.serverCommand ("exec %s", mapSpecificConfigForExec);
ctrl.msg ("Executed map-specific config: %s", mapSpecificConfigForExec);
}
}
@ -837,7 +839,7 @@ bool BotConfig::openConfig (StringRef fileName, StringRef errorIfNotExists, MemF
}
// save config dir
auto configDir = strings.joinPath (folders.addons, folders.bot, folders.config);
auto configDir = strings.joinPath (bstor.getRunningPathVFS (), folders.config);
if (languageDependant) {
if (fileName.startsWith ("lang") && cv_language.str () == "en") {