From 4166f1e1946edcb409caf283f9ff8625b5aea5ad Mon Sep 17 00:00:00 2001 From: doomchild Date: Fri, 30 Apr 2010 16:01:29 -0500 Subject: [PATCH] added EXPORT definition, because I'm lazy and don't like typing __declspec(dllexport) everywhere --- dfhack/include/Export.h | 2 + dfhack/include/modules/Position_C.h | 48 +++++++++++ dfhack/modules/Position_C.cpp | 127 ++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) create mode 100644 dfhack/include/modules/Position_C.h create mode 100644 dfhack/modules/Position_C.cpp diff --git a/dfhack/include/Export.h b/dfhack/include/Export.h index 820c046ab..a3984c372 100644 --- a/dfhack/include/Export.h +++ b/dfhack/include/Export.h @@ -41,3 +41,5 @@ distribution. #endif #endif #endif + +#define EXPORT __declspec(dllexport) diff --git a/dfhack/include/modules/Position_C.h b/dfhack/include/modules/Position_C.h new file mode 100644 index 000000000..4879116c8 --- /dev/null +++ b/dfhack/include/modules/Position_C.h @@ -0,0 +1,48 @@ +/* +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 POSITION_C_API +#define POSITION_C_API + +#include "Export.h" + +#include "DFHackAPI_C.h" + +#ifdef __cplusplus +extern "C" { +#endif + +EXPORT int Position_getViewCoords(DFHackObject* pos, int32_t* x, int32_t* y, int32_t* z); +EXPORT int Position_setViewCoords(DFHackObject* pos, const int32_t x, const int32_t y, const int32_t z); + +EXPORT int Position_getCursorCoords(DFHackObject* pos, int32_t* x, int32_t* y, int32_t* z); +EXPORT int Position_setCursorCoords(DFHackObject* pos, const int32_t x, const int32_t y, const int32_t z); + +EXPORT int Position_getWindowSize(DFHackObject* pos, int32_t* width, int32_t* height); + +#ifdef __cplusplus +} +#endif + +#endif \ No newline at end of file diff --git a/dfhack/modules/Position_C.cpp b/dfhack/modules/Position_C.cpp new file mode 100644 index 000000000..2c38e8be5 --- /dev/null +++ b/dfhack/modules/Position_C.cpp @@ -0,0 +1,127 @@ +/* +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 "modules/Position_C.h" +#include "integers.h" + +#include "modules/Position.h" + +using namespace DFHack; + +#ifdef __cplusplus +extern "C" { +#endif + +int Position_getViewCoords(DFHackObject* pos, int32_t* x, int32_t* y, int32_t* z) +{ + if(pos != 0) + { + int32_t tx, ty, tz; + + if(((DFHack::Position*)pos)->getViewCoords(tx, ty, tz)) + { + *x = tx; + *y = ty; + *z = tz; + + return 1; + } + else + return 0; + } + + return -1; +} + +int Position_setViewCoords(DFHackObject* pos, int32_t x, int32_t y, int32_t z) +{ + if(pos != 0) + { + if(((DFHack::Position*)pos)->setViewCoords(x, y, z)) + return 1; + else + return 0; + } + + return -1; +} + + +int Position_getCursorCoords(DFHackObject* pos, int32_t* x, int32_t* y, int32_t* z) +{ + if(pos != 0) + { + int32_t tx, ty, tz; + + if(((DFHack::Position*)pos)->getCursorCoords(tx, ty, tz)) + { + *x = tx; + *y = ty; + *z = tz; + + return 1; + } + else + return 0; + } + + return -1; +} + +int Position_setCursorCoords(DFHackObject* pos, int32_t x, int32_t y, int32_t z) +{ + if(pos != 0) + { + if(((DFHack::Position*)pos)->setCursorCoords(x, y, z)) + return 1; + else + return 0; + } + + return -1; +} + +int Position_getWindowSize(DFHackObject* pos, int32_t* width, int32_t* height) +{ + if(pos != 0) + { + int32_t tw, th; + + if(((DFHack::Position*)pos)->getWindowSize(tw, th)) + { + *width = tw; + *height = th; + + return 1; + } + else + return 0; + } + + return -1; +} + +#ifdef __cplusplus +} +#endif \ No newline at end of file