forked from Mirrors/openclonk
Remove C4Script.h from C4Aul.h
parent
c3c402061b
commit
234101ddbc
|
@ -25,7 +25,6 @@
|
||||||
// add functions to engine
|
// add functions to engine
|
||||||
void InitGameFunctionMap(C4AulScriptEngine *pEngine);
|
void InitGameFunctionMap(C4AulScriptEngine *pEngine);
|
||||||
void InitObjectFunctionMap(C4AulScriptEngine *pEngine);
|
void InitObjectFunctionMap(C4AulScriptEngine *pEngine);
|
||||||
void InitCoreFunctionMap(C4AulScriptEngine *pEngine);
|
|
||||||
|
|
||||||
bool C4ValueToMatrix(C4Value& value, StdMeshMatrix* matrix);
|
bool C4ValueToMatrix(C4Value& value, StdMeshMatrix* matrix);
|
||||||
bool C4ValueToMatrix(const C4ValueArray& array, StdMeshMatrix* matrix);
|
bool C4ValueToMatrix(const C4ValueArray& array, StdMeshMatrix* matrix);
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include <C4Def.h>
|
#include <C4Def.h>
|
||||||
#include <C4GraphicsResource.h>
|
#include <C4GraphicsResource.h>
|
||||||
#include <C4Application.h>
|
#include <C4Application.h>
|
||||||
|
#include <C4Script.h>
|
||||||
|
|
||||||
#include <C4DrawGL.h>
|
#include <C4DrawGL.h>
|
||||||
#include <StdRegistry.h>
|
#include <StdRegistry.h>
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <C4Landscape.h>
|
#include <C4Landscape.h>
|
||||||
#include <C4Texture.h>
|
#include <C4Texture.h>
|
||||||
#include <C4Random.h>
|
#include <C4Random.h>
|
||||||
|
#include <C4Script.h>
|
||||||
|
|
||||||
C4MapScriptAlgo *FnParAlgo(C4PropList *algo_par);
|
C4MapScriptAlgo *FnParAlgo(C4PropList *algo_par);
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,8 @@
|
||||||
#include <C4Config.h>
|
#include <C4Config.h>
|
||||||
|
|
||||||
#ifndef USE_CONSOLE
|
#ifndef USE_CONSOLE
|
||||||
// headers for particle excution
|
// headers for particle execution
|
||||||
#include <C4Application.h>
|
#include <C4Application.h>
|
||||||
#include <C4AulDefFunc.h>
|
|
||||||
#include <C4Value.h>
|
#include <C4Value.h>
|
||||||
#include <C4ValueArray.h>
|
#include <C4ValueArray.h>
|
||||||
#include <C4Material.h>
|
#include <C4Material.h>
|
||||||
|
@ -33,6 +32,7 @@
|
||||||
#include <C4Random.h>
|
#include <C4Random.h>
|
||||||
#include <C4Landscape.h>
|
#include <C4Landscape.h>
|
||||||
#include <C4Weather.h>
|
#include <C4Weather.h>
|
||||||
|
#include <C4Object.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <C4FileMonitor.h>
|
#include <C4FileMonitor.h>
|
||||||
#include <C4GameVersion.h>
|
#include <C4GameVersion.h>
|
||||||
#include <C4Language.h>
|
#include <C4Language.h>
|
||||||
|
#include <C4Script.h>
|
||||||
#include <C4Record.h>
|
#include <C4Record.h>
|
||||||
|
|
||||||
#include <StdMeshLoader.h>
|
#include <StdMeshLoader.h>
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include "C4PropList.h"
|
#include "C4PropList.h"
|
||||||
#include "C4ObjectPtr.h"
|
#include "C4ObjectPtr.h"
|
||||||
#include "StdMesh.h"
|
#include "StdMesh.h"
|
||||||
|
#include <C4Script.h>
|
||||||
|
|
||||||
/* Object status */
|
/* Object status */
|
||||||
|
|
||||||
|
|
|
@ -17,11 +17,10 @@
|
||||||
#ifndef INC_C4Aul
|
#ifndef INC_C4Aul
|
||||||
#define INC_C4Aul
|
#define INC_C4Aul
|
||||||
|
|
||||||
#include <C4ValueMap.h>
|
|
||||||
#include <C4Id.h>
|
#include <C4Id.h>
|
||||||
#include <C4Script.h>
|
|
||||||
#include <C4StringTable.h>
|
#include <C4StringTable.h>
|
||||||
#include "C4AulFunc.h"
|
#include <C4Value.h>
|
||||||
|
#include <C4ValueMap.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -250,4 +249,6 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
extern C4AulScriptEngine ScriptEngine;
|
extern C4AulScriptEngine ScriptEngine;
|
||||||
|
void InitCoreFunctionMap(C4AulScriptEngine *pEngine);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -18,9 +18,10 @@
|
||||||
#ifndef INC_C4AulDefFunc
|
#ifndef INC_C4AulDefFunc
|
||||||
#define INC_C4AulDefFunc
|
#define INC_C4AulDefFunc
|
||||||
|
|
||||||
#include <C4Object.h>
|
#include <C4Aul.h>
|
||||||
#include <C4Effect.h>
|
#include <C4Def.h>
|
||||||
#include <C4DefList.h>
|
#include <C4DefList.h>
|
||||||
|
#include <C4Effect.h>
|
||||||
|
|
||||||
inline const static char *FnStringPar(C4String *pString)
|
inline const static char *FnStringPar(C4String *pString)
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
#include "lib/C4Random.h"
|
#include "lib/C4Random.h"
|
||||||
#include "c4group/C4Group.h"
|
#include "c4group/C4Group.h"
|
||||||
#include "gamescript/C4Script.h"
|
|
||||||
#include "script/C4Aul.h"
|
#include "script/C4Aul.h"
|
||||||
#include "script/C4ScriptHost.h"
|
#include "script/C4ScriptHost.h"
|
||||||
#include <C4DefList.h>
|
#include <C4DefList.h>
|
||||||
|
|
Loading…
Reference in New Issue