mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-27 22:49:25 +02:00
- Updated MSVS project
- Artifacts added via mods now work correctly without WoG
This commit is contained in:
@@ -609,17 +609,12 @@ void CArtHandler::initAllowedArtifactsList(const std::vector<bool> &allowed)
|
|||||||
|
|
||||||
for (ArtifactID i=ArtifactID::SPELLBOOK; i<ArtifactID::ART_SELECTION; i.advance(1))
|
for (ArtifactID i=ArtifactID::SPELLBOOK; i<ArtifactID::ART_SELECTION; i.advance(1))
|
||||||
{
|
{
|
||||||
|
//check artifacts allowed on a map
|
||||||
|
//TODO: This line will be different when custom map format is implemented
|
||||||
if (allowed[i] && legalArtifact(i))
|
if (allowed[i] && legalArtifact(i))
|
||||||
allowedArtifacts.push_back(artifacts[i]);
|
allowedArtifacts.push_back(artifacts[i]);
|
||||||
}
|
}
|
||||||
if (VLC->modh->modules.COMMANDERS) //allow all commander artifacts for testing
|
for (ArtifactID i = ArtifactID::ART_SELECTION; i<ArtifactID(artifacts.size()); i.advance(1)) //try to allow all artifacts added by mods
|
||||||
{
|
|
||||||
for (int i = 146; i <= 155; ++i)
|
|
||||||
{
|
|
||||||
allowedArtifacts.push_back(artifacts[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (int i = GameConstants::ARTIFACTS_QUANTITY; i < artifacts.size(); ++i) //allow all new artifacts by default
|
|
||||||
{
|
{
|
||||||
if (legalArtifact(ArtifactID(i)))
|
if (legalArtifact(ArtifactID(i)))
|
||||||
allowedArtifacts.push_back(artifacts[i]);
|
allowedArtifacts.push_back(artifacts[i]);
|
||||||
|
|||||||
@@ -364,6 +364,7 @@
|
|||||||
<ClInclude Include="spells\CreatureSpellMechanics.h" />
|
<ClInclude Include="spells\CreatureSpellMechanics.h" />
|
||||||
<ClInclude Include="spells\CSpellHandler.h" />
|
<ClInclude Include="spells\CSpellHandler.h" />
|
||||||
<ClInclude Include="spells\ISpellMechanics.h" />
|
<ClInclude Include="spells\ISpellMechanics.h" />
|
||||||
|
<ClInclude Include="spells\Magic.h" />
|
||||||
<ClInclude Include="spells\SpellMechanics.h" />
|
<ClInclude Include="spells\SpellMechanics.h" />
|
||||||
<ClInclude Include="spells\ViewSpellInt.h" />
|
<ClInclude Include="spells\ViewSpellInt.h" />
|
||||||
<ClInclude Include="StartInfo.h" />
|
<ClInclude Include="StartInfo.h" />
|
||||||
|
|||||||
@@ -225,6 +225,7 @@
|
|||||||
<ClCompile Include="spells\CreatureSpellMechanics.cpp">
|
<ClCompile Include="spells\CreatureSpellMechanics.cpp">
|
||||||
<Filter>spells</Filter>
|
<Filter>spells</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="mapping\CDrawRoadsOperation.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="CCreatureSet.h">
|
<ClInclude Include="CCreatureSet.h">
|
||||||
@@ -533,5 +534,8 @@
|
|||||||
<ClInclude Include="spells\SpellMechanics.h">
|
<ClInclude Include="spells\SpellMechanics.h">
|
||||||
<Filter>spells</Filter>
|
<Filter>spells</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="spells\Magic.h">
|
||||||
|
<Filter>spells</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Reference in New Issue
Block a user