MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pulled out callback declarations added getRaceEx

develop
doomchild 2010-05-25 15:38:51 -05:00
parent 54ea6420c7
commit 9908ae3a87
2 changed files with 48 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dfhack/include/modules/Materials_C.h
Unescape Escape View File

@ -38,14 +38,6 @@ using namespace DFHack;
extern "C" { extern "C" {
#endif #endif
typedef t_matgloss* (*MatglossBufferFunc)(int);
typedef t_descriptor_color* (*DescriptorColorBufferFunc)(int);
typedef t_matglossOther* (*MatglossOtherBufferFunc)(int);
MatglossBufferFunc alloc_matgloss_buffer_callback;
DescriptorColorBufferFunc alloc_descriptor_buffer_callback;
MatglossOtherBufferFunc alloc_matgloss_other_buffer_callback;
DFHACK_EXPORT int Materials_ReadInorganicMaterials(DFHackObject* mat); DFHACK_EXPORT int Materials_ReadInorganicMaterials(DFHackObject* mat);
DFHACK_EXPORT int Materials_ReadOrganicMaterials(DFHackObject* mat); DFHACK_EXPORT int Materials_ReadOrganicMaterials(DFHackObject* mat);
DFHACK_EXPORT int Materials_ReadWoodMaterials(DFHackObject* mat); DFHACK_EXPORT int Materials_ReadWoodMaterials(DFHackObject* mat);
@ -68,20 +60,16 @@ DFHACK_EXPORT int Materials_getRaceExSize(DFHackObject* mat);
DFHACK_EXPORT int Materials_getColorSize(DFHackObject* mat); DFHACK_EXPORT int Materials_getColorSize(DFHackObject* mat);
DFHACK_EXPORT int Materials_getOtherSize(DFHackObject* mat); DFHACK_EXPORT int Materials_getOtherSize(DFHackObject* mat);
DFHACK_EXPORT int Materials_getInorganic(DFHackObject* mat); DFHACK_EXPORT t_matgloss* Materials_getInorganic(DFHackObject* mat);
DFHACK_EXPORT int Materials_getOrganic(DFHackObject* mat); DFHACK_EXPORT t_matgloss* Materials_getOrganic(DFHackObject* mat);
DFHACK_EXPORT int Materials_getTree(DFHackObject* mat); DFHACK_EXPORT t_matgloss* Materials_getTree(DFHackObject* mat);
DFHACK_EXPORT int Materials_getPlant(DFHackObject* mat); DFHACK_EXPORT t_matgloss* Materials_getPlant(DFHackObject* mat);
DFHACK_EXPORT int Materials_getRace(DFHackObject* mat); DFHACK_EXPORT t_matgloss* Materials_getRace(DFHackObject* mat);
/*doomchild: DFHACK_EXPORT c_creaturetype* Materials_getRaceEx(DFHackObject* mat);
I haven't done getRaceEx yet, because I'm not sure about the best way to make the t_creaturetype struct
accessible from C.
*/
//DFHACK_EXPORT int Materials_getRaceEx(DFHackObject* mat, c_creaturetype* (*c_creaturetype_buffer_create)(c_creaturetype_descriptor*, int));
DFHACK_EXPORT int Materials_getColor(DFHackObject* mat); DFHACK_EXPORT t_descriptor_color* Materials_getColor(DFHackObject* mat);
DFHACK_EXPORT int Materials_getOther(DFHackObject* mat); DFHACK_EXPORT t_matglossOther* Materials_getOther(DFHackObject* mat);
#ifdef __cplusplus #ifdef __cplusplus
} }

125
dfhack/modules/Materials_C.cpp
Unescape Escape View File

@ -225,7 +225,7 @@ int Materials_getOtherSize(DFHackObject* mat)
//vector getters //vector getters
int Materials_getInorganic(DFHackObject* mat) t_matgloss* Materials_getInorganic(DFHackObject* mat)
{ {
if(mat != NULL) if(mat != NULL)
{ {
@ -239,19 +239,15 @@ int Materials_getInorganic(DFHackObject* mat)
{ {
copy(materials->inorganic.begin(), materials->inorganic.end(), buf); copy(materials->inorganic.begin(), materials->inorganic.end(), buf);
return 1; return buf;
} }
else
return -1;
} }
else
return 0;
} }
return -1; return NULL;
} }
int Materials_getOrganic(DFHackObject* mat) t_matgloss* Materials_getOrganic(DFHackObject* mat)
{ {
if(mat != NULL) if(mat != NULL)
{ {
@ -265,19 +261,15 @@ int Materials_getOrganic(DFHackObject* mat)
{ {
copy(materials->organic.begin(), materials->organic.end(), buf); copy(materials->organic.begin(), materials->organic.end(), buf);
return 1; return buf;
} }
else
return -1;
} }
else
return 0;
} }
return -1; return NULL;
} }
int Materials_getTree(DFHackObject* mat) t_matgloss* Materials_getTree(DFHackObject* mat)
{ {
if(mat != NULL) if(mat != NULL)
{ {
@ -291,19 +283,15 @@ int Materials_getTree(DFHackObject* mat)
{ {
copy(materials->tree.begin(), materials->tree.end(), buf); copy(materials->tree.begin(), materials->tree.end(), buf);
return 1; return buf;
} }
else
return -1;
} }
else
return 0;
} }
return -1; return NULL;
} }
int Materials_getPlant(DFHackObject* mat) t_matgloss* Materials_getPlant(DFHackObject* mat)
{ {
if(mat != NULL) if(mat != NULL)
{ {
@ -317,19 +305,15 @@ int Materials_getPlant(DFHackObject* mat)
{ {
copy(materials->plant.begin(), materials->plant.end(), buf); copy(materials->plant.begin(), materials->plant.end(), buf);
return 1; return buf;
} }
else
return -1;
} }
else
return 0;
} }
return -1; return NULL;
} }
int Materials_getRace(DFHackObject* mat) t_matgloss* Materials_getRace(DFHackObject* mat)
{ {
if(mat != NULL) if(mat != NULL)
{ {
@ -343,61 +327,40 @@ int Materials_getRace(DFHackObject* mat)
{ {
copy(materials->race.begin(), materials->race.end(), buf); copy(materials->race.begin(), materials->race.end(), buf);
return 1; return buf;
} }
else
return -1;
} }
else
return 0;
} }
return -1; return NULL;
} }
//race_ex getter goes here... //race_ex getter goes here...
// int Materials_getRaceEx(DFHackObject* mat, c_creaturetype* (*c_creaturetype_buffer_create)(c_creaturetype_descriptor*, int)) c_creaturetype* Materials_getRaceEx(DFHackObject* mat)
// { {
// if(mat != NULL) if(mat != NULL)
// { {
// DFHack::Materials* materials = (DFHack::Materials*)mat; DFHack::Materials* materials = (DFHack::Materials*)mat;
int matSize = materials->raceEx.size();
// if(materials->raceEx.size() > 0)
// {
// std::vector<t_creaturetype> types = materials->raceEx;
// int typessize = types.size();
// c_creaturetype_descriptor* descriptors = (c_creaturetype_descriptor*)malloc(sizeof(c_creaturetype_descriptor) * typessize);
// for(int i = 0; i < typessize; i++)
// {
// descriptors[i].castesCount = types[i].castes.size();
// descriptors[i].extractCount = types[i].extract.size();
// }
// c_creaturetype* buf = ((*c_creaturetype_buffer_create)(descriptors, typessize));
// for(int i = 0; i < typessize; i++)
// {
// t_creaturetype current = types[i];
// strncpy(buf[i].rawname, current.rawname, 128);
// buf[i].rawname[127] = '\0';
// buf[i].tile_character = current.tile_character; if(matSize > 0)
// buf[i].tilecolor = current.tilecolor; {
c_creaturetype* buf = ((*alloc_creaturetype_buffer_callback)(matSize));
// current.extract.copy(buf[i].extract, current.extract.size()); if(buf != NULL)
// } {
for(int i = 0; i < matSize; i++)
CreatureTypeConvert(&materials->raceEx[i], &buf[i]);
// free(descriptors); return buf;
// } }
// } }
}
// return -1; return NULL;
// } }
int Materials_getColor(DFHackObject* mat) t_descriptor_color* Materials_getColor(DFHackObject* mat)
{ {
if(mat != NULL) if(mat != NULL)
{ {
@ -411,19 +374,15 @@ int Materials_getColor(DFHackObject* mat)
{ {
copy(materials->color.begin(), materials->color.end(), buf); copy(materials->color.begin(), materials->color.end(), buf);
return 1; return buf;
} }
else
return -1;
} }
else
return 0;
} }
return -1; return NULL;
} }
int Materials_getOther(DFHackObject* mat) t_matglossOther* Materials_getOther(DFHackObject* mat)
{ {
if(mat != NULL) if(mat != NULL)
{ {
@ -437,16 +396,12 @@ int Materials_getOther(DFHackObject* mat)
{ {
copy(materials->other.begin(), materials->other.end(), buf); copy(materials->other.begin(), materials->other.end(), buf);
return 1; return buf;
} }
else
return -1;
} }
else
return 0;
} }
return -1; return NULL;
} }
#ifdef __cplusplus #ifdef __cplusplus