Merge branch 'master' of git://github.com/peterix/dfhack
simon
commit
94af7264ce
@ -0,0 +1,226 @@
|
||||
/*
|
||||
www.sourceforge.net/projects/dfhack
|
||||
Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf, doomchild
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any
|
||||
damages arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any
|
||||
purpose, including commercial applications, and to alter it and
|
||||
redistribute it freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must
|
||||
not claim that you wrote the original software. If you use this
|
||||
software in a product, an acknowledgment in the product documentation
|
||||
would be appreciated but is not required.
|
||||
|
||||
2. Altered source versions must be plainly marked as such, and
|
||||
must not be misrepresented as being the original software.
|
||||
|
||||
3. This notice may not be removed or altered from any source
|
||||
distribution.
|
||||
*/
|
||||
|
||||
#include "integers.h"
|
||||
#include <stdlib.h>
|
||||
#include "string.h"
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
using namespace std;
|
||||
|
||||
#include "DFCommonInternal.h"
|
||||
#include "DFTypes.h"
|
||||
#include "modules/Materials.h"
|
||||
#include "DFTypes_C.h"
|
||||
|
||||
using namespace DFHack;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
c_colormodifier* ColorModifier_New()
|
||||
{
|
||||
c_colormodifier* temp;
|
||||
|
||||
temp = (c_colormodifier*)malloc(sizeof(c_colormodifier));
|
||||
|
||||
if(temp == NULL)
|
||||
return NULL;
|
||||
|
||||
temp->part[0] = '\0';
|
||||
temp->colorlist = NULL;
|
||||
temp->colorlistLength = 0;
|
||||
|
||||
return temp;
|
||||
}
|
||||
|
||||
void ColorModifier_Free(c_colormodifier* src)
|
||||
{
|
||||
if(src != NULL)
|
||||
{
|
||||
if(src->colorlist != NULL)
|
||||
free(src->colorlist);
|
||||
|
||||
free(src);
|
||||
}
|
||||
}
|
||||
|
||||
c_creaturecaste* CreatureCaste_New()
|
||||
{
|
||||
c_creaturecaste* temp;
|
||||
|
||||
temp = (c_creaturecaste*)malloc(sizeof(c_creaturecaste));
|
||||
|
||||
if(temp == NULL)
|
||||
return NULL;
|
||||
|
||||
temp->rawname[0] = '\0';
|
||||
temp->singular[0] = '\0';
|
||||
temp->plural[0] = '\0';
|
||||
temp->adjective[0] = '\0';
|
||||
|
||||
temp->ColorModifier = NULL;
|
||||
temp->colorModifierLength = 0;
|
||||
|
||||
temp->bodypart = NULL;
|
||||
temp->bodypartLength = 0;
|
||||
|
||||
return temp;
|
||||
}
|
||||
|
||||
void CreatureCaste_Free(c_creaturecaste* src)
|
||||
{
|
||||
if(src != NULL)
|
||||
{
|
||||
if(src->bodypart != NULL)
|
||||
free(src->bodypart);
|
||||
|
||||
if(src->ColorModifier != NULL)
|
||||
{
|
||||
for(int i = 0; i < src->colorModifierLength; i++)
|
||||
ColorModifier_Free(&src->ColorModifier[i]);
|
||||
|
||||
free(src->ColorModifier);
|
||||
}
|
||||
|
||||
free(src);
|
||||
}
|
||||
}
|
||||
|
||||
c_creaturetype* CreatureType_New()
|
||||
{
|
||||
c_creaturetype* temp;
|
||||
|
||||
temp = (c_creaturetype*)malloc(sizeof(c_creaturetype));
|
||||
|
||||
if(temp == NULL)
|
||||
return NULL;
|
||||
|
||||
temp->rawname[0] = '\0';
|
||||
|
||||
temp->castes = NULL;
|
||||
temp->castesCount = 0;
|
||||
|
||||
temp->extract = NULL;
|
||||
temp->extractCount = 0;
|
||||
|
||||
temp->tile_character = 0;
|
||||
|
||||
temp->tilecolor.fore = 0;
|
||||
temp->tilecolor.back = 0;
|
||||
temp->tilecolor.bright = 0;
|
||||
|
||||
return temp;
|
||||
}
|
||||
|
||||
void CreatureType_Free(c_creaturetype* src)
|
||||
{
|
||||
if(src != NULL)
|
||||
{
|
||||
if(src->castes != NULL)
|
||||
{
|
||||
for(int i = 0; i < src->castesCount; i++)
|
||||
CreatureCaste_Free(&src->castes[i]);
|
||||
|
||||
free(src->castes);
|
||||
}
|
||||
|
||||
if(src->extract != NULL)
|
||||
free(src->extract);
|
||||
|
||||
free(src);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
int ColorListConvert(t_colormodifier* src, c_colormodifier* dest)
|
||||
{
|
||||
if(src == NULL || dest == NULL)
|
||||
return -1;
|
||||
|
||||
strcpy(dest->part, src->part);
|
||||
|
||||
dest->colorlistLength = src->colorlist.size();
|
||||
dest->colorlist = (uint32_t*)malloc(sizeof(uint32_t) * dest->colorlistLength);
|
||||
|
||||
copy(src->colorlist.begin(), src->colorlist.end(), dest->colorlist);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int CreatureCasteConvert(t_creaturecaste* src, c_creaturecaste* dest)
|
||||
{
|
||||
if(src == NULL || dest == NULL)
|
||||
return -1;
|
||||
|
||||
strcpy(dest->rawname, src->rawname);
|
||||
strcpy(dest->singular, src->singular);
|
||||
strcpy(dest->plural, src->plural);
|
||||
strcpy(dest->adjective, src->adjective);
|
||||
|
||||
dest->colorModifierLength = src->ColorModifier.size();
|
||||
dest->ColorModifier = (c_colormodifier*)malloc(sizeof(c_colormodifier) * dest->colorModifierLength);
|
||||
|
||||
for(int i = 0; i < dest->colorModifierLength; i++)
|
||||
ColorListConvert(&src->ColorModifier[i], &dest->ColorModifier[i]);
|
||||
|
||||
dest->bodypartLength = src->bodypart.size();
|
||||
dest->bodypart = (t_bodypart*)malloc(sizeof(t_bodypart) * dest->bodypartLength);
|
||||
|
||||
copy(src->bodypart.begin(), src->bodypart.end(), dest->bodypart);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int CreatureTypeConvert(t_creaturetype* src, c_creaturetype* dest)
|
||||
{
|
||||
if(src == NULL || dest == NULL)
|
||||
return -1;
|
||||
|
||||
strcpy(dest->rawname, src->rawname);
|
||||
|
||||
dest->tilecolor.fore = src->tilecolor.fore;
|
||||
dest->tilecolor.back = src->tilecolor.back;
|
||||
dest->tilecolor.bright = src->tilecolor.bright;
|
||||
|
||||
dest->tile_character = src->tile_character;
|
||||
|
||||
dest->castesCount = src->castes.size();
|
||||
dest->castes = (c_creaturecaste*)malloc(sizeof(c_creaturecaste) * dest->castesCount);
|
||||
|
||||
for(int i = 0; i < dest->castesCount; i++)
|
||||
CreatureCasteConvert(&src->castes[i], &dest->castes[i]);
|
||||
|
||||
dest->extractCount = src->extract.size();
|
||||
dest->extract = (t_creatureextract*)malloc(sizeof(t_creatureextract) * dest->extractCount);
|
||||
|
||||
copy(src->extract.begin(), src->extract.end(), dest->extract);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -0,0 +1,98 @@
|
||||
/*
|
||||
www.sourceforge.net/projects/dfhack
|
||||
Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf, doomchild
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any
|
||||
damages arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any
|
||||
purpose, including commercial applications, and to alter it and
|
||||
redistribute it freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must
|
||||
not claim that you wrote the original software. If you use this
|
||||
software in a product, an acknowledgment in the product documentation
|
||||
would be appreciated but is not required.
|
||||
|
||||
2. Altered source versions must be plainly marked as such, and
|
||||
must not be misrepresented as being the original software.
|
||||
|
||||
3. This notice may not be removed or altered from any source
|
||||
distribution.
|
||||
*/
|
||||
|
||||
#ifndef TYPES_C_API
|
||||
#define TYPES_C_API
|
||||
|
||||
#include "Export.h"
|
||||
#include "integers.h"
|
||||
#include "DFTypes.h"
|
||||
#include "modules/Materials.h"
|
||||
#include "DFHackAPI_C.h"
|
||||
|
||||
using namespace DFHack;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
struct c_colormodifier
|
||||
{
|
||||
char part[128];
|
||||
uint32_t* colorlist;
|
||||
uint32_t colorlistLength;
|
||||
};
|
||||
|
||||
c_colormodifier* ColorModifier_New();
|
||||
void ColorModifier_Free(c_colormodifier* src);
|
||||
|
||||
struct c_creaturecaste
|
||||
{
|
||||
char rawname[128];
|
||||
char singular[128];
|
||||
char plural[128];
|
||||
char adjective[128];
|
||||
|
||||
c_colormodifier* ColorModifier;
|
||||
uint32_t colorModifierLength;
|
||||
|
||||
t_bodypart* bodypart;
|
||||
uint32_t bodypartLength;
|
||||
};
|
||||
|
||||
c_creaturecaste* CreatureCaste_New();
|
||||
void CreatureCaste_Free(c_creaturecaste* src);
|
||||
|
||||
struct c_creaturetype
|
||||
{
|
||||
char rawname[128];
|
||||
|
||||
c_creaturecaste* castes;
|
||||
uint32_t castesCount;
|
||||
|
||||
t_creatureextract* extract;
|
||||
uint32_t extractCount;
|
||||
|
||||
uint8_t tile_character;
|
||||
|
||||
struct
|
||||
{
|
||||
uint16_t fore;
|
||||
uint16_t back;
|
||||
uint16_t bright;
|
||||
} tilecolor;
|
||||
};
|
||||
|
||||
c_creaturetype* CreatureType_New();
|
||||
void CreatureType_Free(c_creaturetype* src);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
int CreatureTypeConvert(t_creaturetype* src, c_creaturetype* dest);
|
||||
int CreatureCasteConvert(t_creaturecaste* src, c_creaturecaste* dest);
|
||||
int ColorListConvert(t_colormodifier* src, c_colormodifier* dest);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue