aboutsummaryrefslogtreecommitdiff
path: root/src/client/lua_api
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/lua_api')
-rw-r--r--src/client/lua_api/load_scene.cpp (renamed from src/client/lua_api/load_core.cpp)2
-rw-r--r--src/client/lua_api/load_scene.hpp (renamed from src/client/lua_api/load_core.hpp)6
-rw-r--r--src/client/lua_api/phys/bphysbox.cpp3
-rw-r--r--src/client/lua_api/phys/bphysmodel.cpp3
4 files changed, 8 insertions, 6 deletions
diff --git a/src/client/lua_api/load_core.cpp b/src/client/lua_api/load_scene.cpp
index 4a74d39..285cba0 100644
--- a/src/client/lua_api/load_core.cpp
+++ b/src/client/lua_api/load_scene.cpp
@@ -18,7 +18,7 @@ using namespace irr;
extern IrrlichtDevice* device;
-void load_corefuncs(lua_State* L){
+void load_scenefuncs(lua_State* L){
icamera_register(L,device);
imesh_register(L,device);
ilight_register(L,device);
diff --git a/src/client/lua_api/load_core.hpp b/src/client/lua_api/load_scene.hpp
index b3b42ff..7602d08 100644
--- a/src/client/lua_api/load_core.hpp
+++ b/src/client/lua_api/load_scene.hpp
@@ -1,5 +1,5 @@
-#ifndef __H_loadcore
-#define __H_loadcore
+#ifndef __H_loadscene
+#define __H_loadscene
#include <stdio.h>
#include <stdlib.h>
#include <vector>
@@ -10,5 +10,5 @@ extern "C" {
}
#include <irrlicht.h>
-void load_corefuncs(lua_State* L);
+void load_scenefuncs(lua_State* L);
#endif
diff --git a/src/client/lua_api/phys/bphysbox.cpp b/src/client/lua_api/phys/bphysbox.cpp
index 80cd2eb..a03b488 100644
--- a/src/client/lua_api/phys/bphysbox.cpp
+++ b/src/client/lua_api/phys/bphysbox.cpp
@@ -5,6 +5,7 @@
#include <memory>
#include <map>
#include <functional>
+#include <list>
extern "C" {
#include <lua.h>
#include <lauxlib.h>
@@ -24,7 +25,7 @@ using namespace video;
extern IrrlichtDevice* device;
extern btDiscreteDynamicsWorld* World;
-extern core::list<btRigidBody*> Objects;
+extern std::list<btRigidBody*> Objects;
static LBPhysNode* checkisbphysbox(lua_State* L, int index){
void* ud = luaL_checkudata(L,index,"phys.physbox");
diff --git a/src/client/lua_api/phys/bphysmodel.cpp b/src/client/lua_api/phys/bphysmodel.cpp
index 7bdc483..b76b336 100644
--- a/src/client/lua_api/phys/bphysmodel.cpp
+++ b/src/client/lua_api/phys/bphysmodel.cpp
@@ -5,6 +5,7 @@
#include <memory>
#include <map>
#include <functional>
+#include <list>
extern "C" {
#include <lua.h>
#include <lauxlib.h>
@@ -25,7 +26,7 @@ using namespace video;
extern IrrlichtDevice* device;
extern btDiscreteDynamicsWorld* World;
-extern core::list<btRigidBody*> Objects;
+extern std::list<btRigidBody*> Objects;
static LBPhysNode* checkisbphysmodel(lua_State* L, int index){
void* ud = luaL_checkudata(L,index,"phys.physmodel");