games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Compile fixes, cleanup

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-07-08 10:21:36 +02:00
parent 3711ce846e
commit fabad20aa1
4 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/rmg/CMapGenOptions.cpp
View File

@@ -10,7 +10,6 @@
*/ */
#include "StdInc.h" #include "StdInc.h"
#include "CMapGenOptions.h"
#include "../mapping/CMapHeader.h" #include "../mapping/CMapHeader.h"
#include "CRmgTemplateStorage.h" #include "CRmgTemplateStorage.h"

7
lib/rmg/CMapGenerator.cpp
View File

@@ -80,13 +80,6 @@ void CMapGenerator::loadConfig()
config.pandoraMultiplierSpells = randomMapJson["pandoras"]["valueMultiplierSpells"].Integer(); config.pandoraMultiplierSpells = randomMapJson["pandoras"]["valueMultiplierSpells"].Integer();
config.pandoraSpellSchool = randomMapJson["pandoras"]["valueSpellSchool"].Integer(); config.pandoraSpellSchool = randomMapJson["pandoras"]["valueSpellSchool"].Integer();
config.pandoraSpell60 = randomMapJson["pandoras"]["valueSpell60"].Integer(); config.pandoraSpell60 = randomMapJson["pandoras"]["valueSpell60"].Integer();
/*
//override config with game options
if(!mapGenOptions.isRoadEnabled(config.secondaryRoadType))
config.secondaryRoadType = "";
if(!mapGenOptions.isRoadEnabled(config.defaultRoadType))
config.defaultRoadType = config.secondaryRoadType;
*/
config.singleThread = randomMapJson["singleThread"].Bool(); config.singleThread = randomMapJson["singleThread"].Bool();
} }

1
lib/rmg/modificators/ConnectionsPlacer.h
View File

@@ -35,7 +35,6 @@ protected:
void collectNeighbourZones(); void collectNeighbourZones();
protected: protected:
std::vector<rmg::ZoneConnection> dConnections, dCompleted; std::vector<rmg::ZoneConnection> dConnections, dCompleted;
std::map<TRmgTemplateZoneId, rmg::Tileset> dNeighbourZones; std::map<TRmgTemplateZoneId, rmg::Tileset> dNeighbourZones;
}; };

2
lib/rmg/modificators/MinePlacer.cpp
View File

@@ -65,7 +65,7 @@ bool MinePlacer::placeMines(ObjectManager & manager)
if (!i && (res == EGameResID::WOOD || res == EGameResID::ORE)) if (!i && (res == EGameResID::WOOD || res == EGameResID::ORE))
{ {
//only first wood&ore mines are close //only first wood & ore mines are close
manager.addCloseObject(RequiredObjectInfo(mine, rmginfo.value)); manager.addCloseObject(RequiredObjectInfo(mine, rmginfo.value));
} }
else else