mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-24 08:32:34 +02:00
Compile fixes, cleanup
This commit is contained in:
parent
3711ce846e
commit
fabad20aa1
@ -10,7 +10,6 @@
|
||||
*/
|
||||
|
||||
#include "StdInc.h"
|
||||
#include "CMapGenOptions.h"
|
||||
|
||||
#include "../mapping/CMapHeader.h"
|
||||
#include "CRmgTemplateStorage.h"
|
||||
|
@ -80,13 +80,6 @@ void CMapGenerator::loadConfig()
|
||||
config.pandoraMultiplierSpells = randomMapJson["pandoras"]["valueMultiplierSpells"].Integer();
|
||||
config.pandoraSpellSchool = randomMapJson["pandoras"]["valueSpellSchool"].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();
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,6 @@ protected:
|
||||
void collectNeighbourZones();
|
||||
|
||||
protected:
|
||||
|
||||
std::vector<rmg::ZoneConnection> dConnections, dCompleted;
|
||||
std::map<TRmgTemplateZoneId, rmg::Tileset> dNeighbourZones;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user