cleaned up header includes

develop
doomchild 2010-05-26 14:46:06 -05:00
parent af1a41712e
commit a962299c20
25 changed files with 285 additions and 157 deletions

@ -25,12 +25,20 @@ distribution.
#ifndef DFHACK_C_API
#define DFHACK_C_API
typedef void DFHackObject;
#include <cstdio>
#include <string>
#include <vector>
#include <map>
#include <algorithm>
#include "dfhack/DFGlobal.h"
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "dfhack-c/DFContext_C.h"
#include "dfhack-c/DFTypes_C.h"
using namespace std;
using namespace DFHack;
typedef void DFHackObject;
#ifdef __cplusplus
extern "C" {

@ -25,10 +25,7 @@ distribution.
#ifndef DFHACK_C_CONTEXT
#define DFHACK_C_CONTEXT
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
typedef void DFHackObject;
#include "DFHack_C.h"
#ifdef __cplusplus
extern "C" {

@ -25,13 +25,10 @@ distribution.
#ifndef TYPES_C_API
#define TYPES_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Materials.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {
#endif

@ -25,13 +25,9 @@ distribution.
#ifndef BUILDINGS_C_API
#define BUILDINGS_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Buildings.h"
#include "DFHack_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {

@ -25,13 +25,9 @@ distribution.
#ifndef CONSTRUCTIONS_C_API
#define CONSTRUCTIONS_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Constructions.h"
#include "DFHack_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {

@ -25,15 +25,11 @@ distribution.
#ifndef CREATURES_C_API
#define CREATURES_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Materials.h"
#include "dfhack/modules/Creatures.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {
#endif

@ -25,11 +25,9 @@ distribution.
#ifndef GUI_C_API
#define GUI_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
using namespace DFHack;
#include "dfhack/modules/Gui.h"
#ifdef __cplusplus
extern "C" {

@ -25,15 +25,10 @@ distribution.
#ifndef ITEMS_C_API
#define ITEMS_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "Internal.h"
using namespace DFHack;
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Items.h"
#include "DFHack_C.h"
#include "dfhack/DFProcess.h"
#include "dfhack-c/DFTypes_C.h"
#include "dfhack/modules/Items.h"
#ifdef __cplusplus
extern "C" {

@ -25,19 +25,9 @@ distribution.
#ifndef MAPS_C_API
#define MAPS_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include <vector>
#include <map>
#include <string>
using namespace std;
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Maps.h"
#include "DFHack_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {

@ -25,14 +25,9 @@ distribution.
#ifndef MATERIALS_C_API
#define MATERIALS_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Materials.h"
#include "DFHack_C.h"
#include "dfhack-c/DFTypes_C.h"
using namespace DFHack;
#include "dfhack/modules/Materials.h"
#ifdef __cplusplus
extern "C" {

@ -25,8 +25,8 @@ distribution.
#ifndef POSITION_C_API
#define POSITION_C_API
#include "dfhack/DFExport.h"
#include "DFHack_C.h"
#include "dfhack/modules/Position.h"
#ifdef __cplusplus
extern "C" {

@ -25,13 +25,9 @@ distribution.
#ifndef TRANSLATION_C_API
#define TRANSLATION_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Translation.h"
#include "DFHack_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {

@ -25,13 +25,9 @@ distribution.
#ifndef VEGETATION_C_API
#define VEGETATION_C_API
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Vegetation.h"
#include "DFHack_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {

@ -0,0 +1,43 @@
/*
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 WINDOWIO_C_API
#define WINDOWIO_C_API
#include "DFHack_C.h"
#include "dfhack/modules/WindowIO.h"
#ifdef __cplusplus
extern "C" {
#endif
DFHACK_EXPORT int WindowIO_TypeStr(DFHackObject* window, const char* input, int delay, bool useShift);
DFHACK_EXPORT int WindowIO_TypeSpecial(DFHackObject* window, t_special command, int count, int delay);
#ifdef __cplusplus
}
#endif
#endif

@ -0,0 +1,47 @@
/*
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 WORLD_C_API
#define WORLD_C_API
#include "DFHack_C.h"
#include "dfhack/modules/World.h"
#ifdef __cplusplus
extern "C" {
#endif
DFHACK_EXPORT int World_Start(DFHackObject* world);
DFHACK_EXPORT int World_Finish(DFHackObject* world);
DFHACK_EXPORT int World_ReadCurrentTick(DFHackObject* world, uint32_t* tick);
DFHACK_EXPORT int World_ReadCurrentYear(DFHackObject* world, uint32_t* year);
DFHACK_EXPORT int World_ReadCurrentMonth(DFHackObject* world, uint32_t* month);
DFHACK_EXPORT int World_ReadCurrentDay(DFHackObject* world, uint32_t* day);
#ifdef __cplusplus
}
#endif
#endif

@ -22,20 +22,8 @@ must not be misrepresented as being the original software.
distribution.
*/
#include "dfhack/DFIntegers.h"
#include <string>
#include <map>
#include "stdio.h"
using namespace std;
#include "Internal.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Buildings.h"
#include "dfhack-c/modules/Buildings_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {
#endif

@ -22,15 +22,8 @@ must not be misrepresented as being the original software.
distribution.
*/
#include "dfhack/DFIntegers.h"
#include "Internal.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Constructions.h"
#include "dfhack-c/modules/Constructions_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {
#endif

@ -22,21 +22,7 @@ must not be misrepresented as being the original software.
distribution.
*/
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include <string>
#include <vector>
#include <algorithm>
using namespace std;
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Materials.h"
#include "dfhack/modules/Creatures.h"
#include "dfhack-c/modules/Creatures_C.h"
#include "DFHack_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {

@ -21,16 +21,8 @@ must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*/
#include <vector>
#include <string>
#include "DFHack_C.h"
#include "dfhack-c/modules/Gui_C.h"
#include "dfhack/DFIntegers.h"
#include "Internal.h"
#include "dfhack/modules/Gui.h"
using namespace DFHack;
#include "dfhack-c/modules/Gui_C.h"
#ifdef __cplusplus
extern "C" {

@ -22,25 +22,8 @@ must not be misrepresented as being the original software.
distribution.
*/
#include <map>
#include <vector>
#include <string>
#include "dfhack/DFExport.h"
#include "dfhack/DFIntegers.h"
#include "DFHack_C.h"
#include "dfhack/DFTypes.h"
using namespace std;
using namespace DFHack;
#include "dfhack/DFProcess.h"
#include "dfhack/modules/Materials.h"
#include "dfhack/modules/Items.h"
#include "dfhack-c/DFTypes_C.h"
#include "dfhack-c/modules/Items_C.h"
#ifdef __cplusplus
extern "C" {
#endif

@ -22,20 +22,8 @@ must not be misrepresented as being the original software.
distribution.
*/
#include "dfhack/DFIntegers.h"
#include <vector>
#include <map>
#include <string>
using namespace std;
#include "Internal.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Maps.h"
#include "dfhack-c/modules/Maps_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {
#endif

@ -22,21 +22,8 @@ must not be misrepresented as being the original software.
distribution.
*/
#include "dfhack/DFIntegers.h"
#include <string>
#include <vector>
#include <algorithm>
using namespace std;
#include "Internal.h"
#include "dfhack/DFTypes.h"
#include "dfhack/modules/Materials.h"
#include "dfhack-c/DFTypes_C.h"
#include "dfhack-c/modules/Materials_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {
#endif

@ -22,15 +22,7 @@ must not be misrepresented as being the original software.
distribution.
*/
#include <vector>
#include <string>
#include "dfhack-c/modules/Position_C.h"
#include "dfhack/DFIntegers.h"
#include "Internal.h"
#include "dfhack/modules/Position.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {

@ -0,0 +1,64 @@
/*
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.
*/
using namespace std;
#include "dfhack/DFIntegers.h"
#include "DFHack.h"
#include "DFHack_C.h"
#include "dfhack/modules/WindowIO.h"
#include "dfhack-c/modules/WindowIO_C.h"
using namespace DFHack;
#ifdef __cplusplus
extern "C" {
#endif
int WindowIO_TypeStr(DFHackObject* window, const char* input, int delay, bool useShift)
{
if(window != NULL)
{
((DFHack::WindowIO*)window)->TypeStr(input, delay, useShift);
return 1;
}
return -1;
}
int WindowIO_TypeSpecial(DFHackObject* window, t_special command, int count, int delay)
{
if(window != NULL)
{
((DFHack::WindowIO*)window)->TypeSpecial(command, count, delay);
return 1;
}
return -1;
}
#ifdef __cplusplus
}
#endif

@ -0,0 +1,105 @@
/*
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 "DFHack_C.h"
#include "dfhack/modules/World.h"
#include "dfhack-c/modules/World_C.h"
#ifdef __cplusplus
extern "C" {
#endif
int World_Start(DFHackObject* world)
{
if(world != NULL)
{
if(((DFHack::World*)world)->Start())
return 1;
else
return 0;
}
return -1;
}
int World_Finish(DFHackObject* world)
{
if(world != NULL)
{
if(((DFHack::World*)world)->Finish())
return 1;
else
return 0;
}
return -1;
}
int World_ReadCurrentTick(DFHackObject* world, uint32_t* tick)
{
if(world != NULL)
{
*tick = ((DFHack::World*)world)->ReadCurrentTick();
return 1;
}
return -1;
}
int World_ReadCurrentYear(DFHackObject* world, uint32_t* year)
{
if(world != NULL)
{
*year = ((DFHack::World*)world)->ReadCurrentYear();
return 1;
}
return -1;
}
int World_ReadCurrentMonth(DFHackObject* world, uint32_t* month)
{
if(world != NULL)
{
*month = ((DFHack::World*)world)->ReadCurrentMonth();
return 1;
}
return -1;
}
int World_ReadCurrentDay(DFHackObject* world, uint32_t* day)
{
if(world != NULL)
{
*day = ((DFHack::World*)world)->ReadCurrentDay();
return 1;
}
return -1;
}
#ifdef __cplusplus
}
#endif