Fun and games. Also turning old DFWindow class into a module tracked by Context.
Petr Mrázek
parent
966a145b3e
commit
04b71f154c
@ -1,293 +0,0 @@
|
|||||||
/*
|
|
||||||
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 "DFPragma.h"
|
|
||||||
#include "DFExport.h"
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
#include <map>
|
|
||||||
#include "DFIntegers.h"
|
|
||||||
#include "DFTileTypes.h"
|
|
||||||
#include "DFTypes.h"
|
|
||||||
#include "DFWindow.h"
|
|
||||||
#include "DFHackAPI.h"
|
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
using namespace DFHack;
|
|
||||||
|
|
||||||
#include "DFHackAPI_C.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DFHackObject* API_Alloc(const char* path_to_xml)
|
|
||||||
{
|
|
||||||
DFHack::ContextManager* api = new DFHack::ContextManager(std::string(path_to_xml));
|
|
||||||
return (DFHackObject*)api;
|
|
||||||
}
|
|
||||||
|
|
||||||
//FIXME: X:\dfhack\DFHackAPI_C.cpp:56: warning: deleting `DFHackObject* ' is undefined
|
|
||||||
//DC: Yeah, I forgot that trying to delete a void pointer might be a bad idea. This works now.
|
|
||||||
void API_Free(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
DFHack::ContextManager* a = (DFHack::ContextManager*)api;
|
|
||||||
delete a;
|
|
||||||
|
|
||||||
api = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_Attach(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->Attach();
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_Detach(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->Detach();
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_isAttached(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->isAttached();
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_Suspend(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->Suspend();
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_Resume(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->Resume();
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_isSuspended(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->isSuspended();
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_ForceResume(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->ForceResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int API_AsyncSuspend(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return ((DFHack::ContextManager*)api)->AsyncSuspend();
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
//module getters
|
|
||||||
|
|
||||||
DFHackObject* API_getMemoryInfo(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getMemoryInfo();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getProcess(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getProcess();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getWindow(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getWindow();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getCreatures(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getCreatures();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getMaps(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getMaps();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getGui(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getGui();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getPosition(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getPosition();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getMaterials(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getMaterials();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getTranslation(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getTranslation();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getVegetation(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getVegetation();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getBuildings(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getBuildings();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getConstructions(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getConstructions();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
DFHackObject* API_getItems(DFHackObject* api)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
return (DFHackObject*)((DFHack::ContextManager*)api)->getItems();
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void API_ReadRaw(DFHackObject* api, const uint32_t offset, const uint32_t size, uint8_t* target)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
((DFHack::ContextManager*)api)->ReadRaw(offset, size, target);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void API_WriteRaw(DFHackObject* api, const uint32_t offset, const uint32_t size, uint8_t* source)
|
|
||||||
{
|
|
||||||
if(api != NULL)
|
|
||||||
{
|
|
||||||
((DFHack::ContextManager*)api)->WriteRaw(offset, size, source);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
www.sourceforge.net/projects/dfhack
|
|
||||||
Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf
|
|
||||||
|
|
||||||
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/DFCommonInternal.h"
|
|
||||||
#include "dfhack/DFTileTypes.h"
|
|
||||||
|
|
||||||
using namespace DFHack;
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
www.sourceforge.net/projects/dfhack
|
|
||||||
Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf
|
|
||||||
|
|
||||||
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/DFPragma.h"
|
|
||||||
#include "dfhack/DFCommonInternal.h"
|
|
||||||
#include "dfhack/DFMemInfo.h"
|
|
||||||
#include "dfhack/DFProcess.h"
|
|
||||||
#include "dfhack/DFVector.h"
|
|
||||||
using namespace DFHack;
|
|
||||||
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
# don't use this file directly. use the one in the root folder of the project
|
|
||||||
|
|
||||||
SET(PROJECT_HDRS
|
|
||||||
shms.h
|
|
||||||
mod-core.h
|
|
||||||
mod-maps.h
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(PROJECT_SRCS
|
|
||||||
mod-core.cpp
|
|
||||||
mod-maps.cpp
|
|
||||||
#mod-creature40d.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(PROJECT_HDRS_LINUX
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(PROJECT_HDRS_WINDOWS
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(PROJECT_SRCS_LINUX
|
|
||||||
shms-linux.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(PROJECT_SRCS_WINDOWS
|
|
||||||
shms-windows.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
IF(UNIX)
|
|
||||||
LIST(APPEND PROJECT_HDRS ${PROJECT_HDRS_LINUX})
|
|
||||||
LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_LINUX})
|
|
||||||
ELSE(UNIX)
|
|
||||||
LIST(APPEND PROJECT_HDRS ${PROJECT_HDRS_WINDOWS})
|
|
||||||
LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_WINDOWS})
|
|
||||||
ENDIF(UNIX)
|
|
||||||
|
|
||||||
|
|
||||||
SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE )
|
|
||||||
|
|
||||||
LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
|
|
||||||
|
|
||||||
#IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
||||||
IF(UNIX)
|
|
||||||
add_definitions(-DLINUX_BUILD)
|
|
||||||
SET(PROJECT_LIBS rt)
|
|
||||||
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden")
|
|
||||||
ADD_LIBRARY(dfconnect SHARED ${PROJECT_SRCS})
|
|
||||||
TARGET_LINK_LIBRARIES(dfconnect ${PROJECT_LIBS})
|
|
||||||
ELSE(UNIX)
|
|
||||||
# SET(PROJECT_LIBS psapi)
|
|
||||||
ADD_LIBRARY(SDL SHARED ${PROJECT_SRCS})
|
|
||||||
TARGET_LINK_LIBRARIES(SDL ${PROJECT_LIBS})
|
|
||||||
ENDIF(UNIX)
|
|
||||||
#ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
||||||
Loading…
Reference in New Issue