|
|
|
@ -549,7 +549,6 @@ main(int argc, char *argv[])
|
|
|
|
|
{
|
|
|
|
|
pDF = DF = DFMgr.getSingleContext();
|
|
|
|
|
DF->Attach();
|
|
|
|
|
Mats = DF->getMaterials();
|
|
|
|
|
Maps = DF->getMaps();
|
|
|
|
|
}
|
|
|
|
|
catch (exception& e)
|
|
|
|
@ -560,6 +559,15 @@ main(int argc, char *argv[])
|
|
|
|
|
#endif
|
|
|
|
|
finish(0);
|
|
|
|
|
}
|
|
|
|
|
bool hasmats = true;
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
Mats = DF->getMaterials();
|
|
|
|
|
}
|
|
|
|
|
catch (exception& e)
|
|
|
|
|
{
|
|
|
|
|
hasmats = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Process* p = DF->getProcess();
|
|
|
|
|
// init the map
|
|
|
|
@ -574,17 +582,22 @@ main(int argc, char *argv[])
|
|
|
|
|
y_max = y_max_a;
|
|
|
|
|
z_max = z_max_a;
|
|
|
|
|
|
|
|
|
|
bool hasimats = 1;
|
|
|
|
|
bool hascmats = 1;
|
|
|
|
|
bool hasimats = false;
|
|
|
|
|
bool hascmats = false;
|
|
|
|
|
|
|
|
|
|
if(hasmats)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
hascmats = true;
|
|
|
|
|
// get stone matgloss mapping
|
|
|
|
|
if(!Mats->ReadInorganicMaterials())
|
|
|
|
|
if(Mats->ReadInorganicMaterials())
|
|
|
|
|
{
|
|
|
|
|
hasimats = 0;
|
|
|
|
|
hasimats = true;
|
|
|
|
|
}
|
|
|
|
|
if(!Mats->ReadCreatureTypes())
|
|
|
|
|
if(Mats->ReadCreatureTypes())
|
|
|
|
|
{
|
|
|
|
|
hascmats = 0;
|
|
|
|
|
hascmats = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
// get region geology
|
|
|
|
@ -726,6 +739,8 @@ main(int argc, char *argv[])
|
|
|
|
|
DF->Suspend();
|
|
|
|
|
// restart cleared modules
|
|
|
|
|
Maps->Start();
|
|
|
|
|
if(hasmats)
|
|
|
|
|
{
|
|
|
|
|
Mats->Start();
|
|
|
|
|
if(hasimats)
|
|
|
|
|
{
|
|
|
|
@ -735,6 +750,7 @@ main(int argc, char *argv[])
|
|
|
|
|
{
|
|
|
|
|
Mats->ReadCreatureTypes();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
uint32_t effectnum;
|
|
|
|
|
/*
|
|
|
|
|
if(DF.InitReadEffects(effectnum))
|
|
|
|
|