|
|
@ -274,60 +274,12 @@ int Maps_ReadRegionOffsets(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int Maps_ReadAllVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z, t_vein* vein_buffer, t_frozenliquidvein* frozenvein_buffer, t_spattervein* spattervein_buffer)
|
|
|
|
t_vein* Maps_ReadStandardVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z)
|
|
|
|
{
|
|
|
|
|
|
|
|
if(maps != NULL)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if(alloc_vein_buffer_callback == NULL || alloc_frozenliquidvein_callback == NULL || alloc_spattervein_callback == NULL)
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vector<t_vein> veins;
|
|
|
|
|
|
|
|
vector<t_frozenliquidvein> frozen_veins;
|
|
|
|
|
|
|
|
vector<t_spattervein> spatter_veins;
|
|
|
|
|
|
|
|
bool result = ((DFHack::Maps*)maps)->ReadVeins(x, y, z, &veins, &frozen_veins, &spatter_veins);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(result)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
t_vein* v_buf = NULL;
|
|
|
|
|
|
|
|
t_frozenliquidvein* fv_buf = NULL;
|
|
|
|
|
|
|
|
t_spattervein* sv_buf = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(veins.size() > 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
((*alloc_vein_buffer_callback)(v_buf, veins.size()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
copy(veins.begin(), veins.end(), v_buf);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(frozen_veins.size() > 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
((*alloc_frozenliquidvein_callback)(fv_buf, frozen_veins.size()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
copy(frozen_veins.begin(), frozen_veins.end(), fv_buf);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(spatter_veins.size() > 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
((*alloc_spattervein_callback)(sv_buf, spatter_veins.size()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
copy(spatter_veins.begin(), spatter_veins.end(), sv_buf);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int Maps_ReadStandardVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z, t_vein* vein_buffer)
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(maps != NULL)
|
|
|
|
if(maps != NULL)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(alloc_vein_buffer_callback == NULL)
|
|
|
|
if(alloc_vein_buffer_callback == NULL)
|
|
|
|
return 0;
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
|
|
vector<t_vein> veins;
|
|
|
|
vector<t_vein> veins;
|
|
|
|
bool result = ((DFHack::Maps*)maps)->ReadVeins(x, y, z, &veins);
|
|
|
|
bool result = ((DFHack::Maps*)maps)->ReadVeins(x, y, z, &veins);
|
|
|
@ -343,21 +295,21 @@ int Maps_ReadStandardVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t
|
|
|
|
copy(veins.begin(), veins.end(), v_buf);
|
|
|
|
copy(veins.begin(), veins.end(), v_buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
return v_buf;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int Maps_ReadFrozenVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z, t_frozenliquidvein* frozenvein_buffer)
|
|
|
|
t_frozenliquidvein* Maps_ReadFrozenVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(maps != NULL)
|
|
|
|
if(maps != NULL)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(alloc_vein_buffer_callback == NULL || alloc_frozenliquidvein_callback == NULL)
|
|
|
|
if(alloc_frozenliquidvein_callback == NULL)
|
|
|
|
return 0;
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
|
|
vector<t_vein> veins;
|
|
|
|
vector<t_vein> veins;
|
|
|
|
vector<t_frozenliquidvein> frozen_veins;
|
|
|
|
vector<t_frozenliquidvein> frozen_veins;
|
|
|
@ -365,38 +317,30 @@ int Maps_ReadFrozenVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z,
|
|
|
|
|
|
|
|
|
|
|
|
if(result)
|
|
|
|
if(result)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
t_vein* v_buf = NULL;
|
|
|
|
|
|
|
|
t_frozenliquidvein* fv_buf = NULL;
|
|
|
|
t_frozenliquidvein* fv_buf = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
if(veins.size() > 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
((*alloc_vein_buffer_callback)(v_buf, veins.size()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
copy(veins.begin(), veins.end(), v_buf);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(frozen_veins.size() > 0)
|
|
|
|
if(frozen_veins.size() > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((*alloc_frozenliquidvein_callback)(fv_buf, frozen_veins.size()));
|
|
|
|
((*alloc_frozenliquidvein_buffer_callback)(fv_buf, frozen_veins.size()));
|
|
|
|
|
|
|
|
|
|
|
|
copy(frozen_veins.begin(), frozen_veins.end(), fv_buf);
|
|
|
|
copy(frozen_veins.begin(), frozen_veins.end(), fv_buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
return fv_buf;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int Maps_ReadSpatterVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z, t_spattervein* spattervein_buffer)
|
|
|
|
t_spattervein* Maps_ReadSpatterVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(maps != NULL)
|
|
|
|
if(maps != NULL)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(alloc_vein_buffer_callback == NULL || alloc_spattervein_callback == NULL)
|
|
|
|
if(alloc_spattervein_callback == NULL)
|
|
|
|
return 0;
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
|
|
vector<t_vein> veins;
|
|
|
|
vector<t_vein> veins;
|
|
|
|
vector<t_spattervein> spatter_veins;
|
|
|
|
vector<t_spattervein> spatter_veins;
|
|
|
@ -404,30 +348,22 @@ int Maps_ReadSpatterVeins(DFHackObject* maps, uint32_t x, uint32_t y, uint32_t z
|
|
|
|
|
|
|
|
|
|
|
|
if(result)
|
|
|
|
if(result)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
t_vein* v_buf = NULL;
|
|
|
|
|
|
|
|
t_spattervein* sv_buf = NULL;
|
|
|
|
t_spattervein* sv_buf = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
if(veins.size() > 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
((*alloc_vein_buffer_callback)(v_buf, veins.size()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
copy(veins.begin(), veins.end(), v_buf);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(spatter_veins.size() > 0)
|
|
|
|
if(spatter_veins.size() > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
((*alloc_spattervein_callback)(sv_buf, spatter_veins.size()));
|
|
|
|
((*alloc_spattervein_buffer_callback)(sv_buf, spatter_veins.size()));
|
|
|
|
|
|
|
|
|
|
|
|
copy(spatter_veins.begin(), spatter_veins.end(), sv_buf);
|
|
|
|
copy(spatter_veins.begin(), spatter_veins.end(), sv_buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
return sv_buf;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
#ifdef __cplusplus
|
|
|
|