Avoid DataStaticsFields dependency on PluginManager.h

develop
lethosor 2015-08-11 22:59:19 -04:00
parent ffe29d366c
commit 2aba2da56d
4 changed files with 8 additions and 3 deletions

@ -39,6 +39,7 @@ distribution.
#include "DataIdentity.h" #include "DataIdentity.h"
#include "DataFuncs.h" #include "DataFuncs.h"
#include "DFHackVersion.h" #include "DFHackVersion.h"
#include "PluginManager.h"
#include "modules/World.h" #include "modules/World.h"
#include "modules/Gui.h" #include "modules/Gui.h"

@ -49,6 +49,7 @@ distribution.
#include "MiscUtils.h" #include "MiscUtils.h"
#include "DFHackVersion.h" #include "DFHackVersion.h"
#include "PluginManager.h"
#include "df/job.h" #include "df/job.h"
#include "df/job_item.h" #include "df/job_item.h"

@ -40,6 +40,7 @@ distribution.
#include "LuaTools.h" #include "LuaTools.h"
#include "DataFuncs.h" #include "DataFuncs.h"
#include "PluginManager.h"
#include "MiscUtils.h" #include "MiscUtils.h"
#include <lua.h> #include <lua.h>

@ -30,7 +30,6 @@ distribution.
#include <map> #include <map>
#include "DataDefs.h" #include "DataDefs.h"
#include "PluginManager.h"
#include <lua.h> #include <lua.h>
#include <lauxlib.h> #include <lauxlib.h>
@ -39,7 +38,10 @@ distribution.
* Internal header file of the lua wrapper. * Internal header file of the lua wrapper.
*/ */
namespace DFHack { namespace LuaWrapper {
namespace DFHack {
struct FunctionReg;
namespace LuaWrapper {
struct LuaToken; struct LuaToken;
/** /**
@ -232,7 +234,7 @@ namespace DFHack { namespace LuaWrapper {
/** /**
* Wrap functions and add them to the table on the top of the stack. * Wrap functions and add them to the table on the top of the stack.
*/ */
using DFHack::FunctionReg; typedef DFHack::FunctionReg FunctionReg;
void SetFunctionWrappers(lua_State *state, const FunctionReg *reg); void SetFunctionWrappers(lua_State *state, const FunctionReg *reg);
int method_wrapper_core(lua_State *state, function_identity_base *id); int method_wrapper_core(lua_State *state, function_identity_base *id);