diff --git a/.gitmodules b/.gitmodules index 656289c2..f8fa759e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ [submodule "deps/fix-rpaths"] path = deps/fix-rpaths url = https://gist.github.com/NQNStudios/7145bcf6621891f5176c8caa165d6b93 +[submodule "rsrc/scenarios/custom"] + path = rsrc/scenarios/custom + url = https://github.com/NQNStudios/cboe-scenarios diff --git a/proj/vs2013/Common/Common.vcxproj b/proj/vs2013/Common/Common.vcxproj index 2307fbff..3db02b12 100644 --- a/proj/vs2013/Common/Common.vcxproj +++ b/proj/vs2013/Common/Common.vcxproj @@ -502,6 +502,7 @@ + diff --git a/proj/vs2017/Common/Common.vcxproj b/proj/vs2017/Common/Common.vcxproj index d2c0b4f8..082b7c0b 100644 --- a/proj/vs2017/Common/Common.vcxproj +++ b/proj/vs2017/Common/Common.vcxproj @@ -561,6 +561,7 @@ + diff --git a/rsrc/SConscript b/rsrc/SConscript index e8601581..c01b3a7c 100644 --- a/rsrc/SConscript +++ b/rsrc/SConscript @@ -57,6 +57,7 @@ scen_env.BuildScenario('#build/rsrc/scenarios/stealth.boes', 'scenarios/stealth/ scen_env.BuildScenario('#build/rsrc/scenarios/zakhazi.boes', 'scenarios/zakhazi/header.exs') env.Install(path.join(install_dir, "Blades of Exile Scenarios"), Glob("#build/rsrc/scenarios/*.boes")) +env.Install(path.join(install_dir, "Blades of Exile Scenarios"), "scenarios/custom") env.Install(path.join(install_dir, "Blades of Exile Base"), Glob("#build/rsrc/bases/*.boes")) # Validate dialogs diff --git a/rsrc/scenarios/custom b/rsrc/scenarios/custom new file mode 160000 index 00000000..0a6259c3 --- /dev/null +++ b/rsrc/scenarios/custom @@ -0,0 +1 @@ +Subproject commit 0a6259c37fa3dd2c1fec7e5256f7b16b590cc790 diff --git a/src/fileio/fileio_scen.cpp b/src/fileio/fileio_scen.cpp index 877b6f58..f0a41d0f 100644 --- a/src/fileio/fileio_scen.cpp +++ b/src/fileio/fileio_scen.cpp @@ -79,6 +79,9 @@ std::vector all_scen_dirs() { scen_dirs.push_back(scen_dir); } + // Experimental: ship with the full scenario archive + scen_dirs.push_back(progDir/"Blades of Exile Scenarios/custom"); + #ifdef DEBUG fs::path replay_scenarios_dir = boost::filesystem::current_path(); replay_scenarios_dir = replay_scenarios_dir/".."/".."/"test"/"replays"/"scenarios";