From b9512cab1b995e74c11b12139fe9320c02ff2060 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Wed, 6 Mar 2013 09:31:06 -0500 Subject: [PATCH] Fix Irrlicht includes in scriptapi_* --- src/scriptapi.h | 2 ++ src/scriptapi_inventory.h | 2 -- src/scriptapi_item.h | 1 - src/scriptapi_node.h | 1 - src/scriptapi_nodemeta.h | 2 -- src/scriptapi_nodetimer.h | 2 -- src/scriptapi_noise.cpp | 3 --- 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/scriptapi.h b/src/scriptapi.h index 4a0b0789..7f19bcef 100644 --- a/src/scriptapi.h +++ b/src/scriptapi.h @@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include +#include "irr_v3d.h" +#include "irr_v2d.h" extern "C" { #include diff --git a/src/scriptapi_inventory.h b/src/scriptapi_inventory.h index 02900735..14f4fe02 100644 --- a/src/scriptapi_inventory.h +++ b/src/scriptapi_inventory.h @@ -20,8 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_INVENTORY_H_ #define LUA_INVENTORY_H_ -#include - extern "C" { #include #include diff --git a/src/scriptapi_item.h b/src/scriptapi_item.h index 38d64a2c..e0f21399 100644 --- a/src/scriptapi_item.h +++ b/src/scriptapi_item.h @@ -25,7 +25,6 @@ extern "C" { #include } -#include #include #include "itemdef.h" diff --git a/src/scriptapi_node.h b/src/scriptapi_node.h index c00df9dc..665b58bf 100644 --- a/src/scriptapi_node.h +++ b/src/scriptapi_node.h @@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_NODE_H_ #define LUA_NODE_H_ -#include #include #include diff --git a/src/scriptapi_nodemeta.h b/src/scriptapi_nodemeta.h index 6d1802a9..017abe18 100644 --- a/src/scriptapi_nodemeta.h +++ b/src/scriptapi_nodemeta.h @@ -19,8 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_NODEMETA_H_ #define LUA_NODEMETA_H_ -#include - extern "C" { #include #include diff --git a/src/scriptapi_nodetimer.h b/src/scriptapi_nodetimer.h index 184ff8cc..a4536d94 100644 --- a/src/scriptapi_nodetimer.h +++ b/src/scriptapi_nodetimer.h @@ -20,8 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef LUA_NODETIMER_H_ #define LUA_NODETIMER_H_ -#include - extern "C" { #include #include diff --git a/src/scriptapi_noise.cpp b/src/scriptapi_noise.cpp index 86f6e309..1dd6ef8e 100644 --- a/src/scriptapi_noise.cpp +++ b/src/scriptapi_noise.cpp @@ -22,9 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "scriptapi_types.h" #include "script.h" -#include - - // garbage collector int LuaPerlinNoise::gc_object(lua_State *L) {