diff options
Diffstat (limited to 'src/shared/lua_api')
| -rw-r--r-- | src/shared/lua_api/common.cpp (renamed from src/shared/lua_api/common.c) | 2 | ||||
| -rw-r--r-- | src/shared/lua_api/common.hpp (renamed from src/shared/lua_api/common.h) | 0 | ||||
| -rw-r--r-- | src/shared/lua_api/load_net.cpp | 2 | ||||
| -rw-r--r-- | src/shared/lua_api/phys/bphysbox.cpp | 2 | ||||
| -rw-r--r-- | src/shared/lua_api/phys/bphysbox.hpp | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/src/shared/lua_api/common.c b/src/shared/lua_api/common.cpp index 2eeee11..68bf203 100644 --- a/src/shared/lua_api/common.c +++ b/src/shared/lua_api/common.cpp @@ -5,7 +5,7 @@ extern "C" { #include <lualib.h> } -#include "common.h" +#include "common.hpp" //Expose things to the lua state void loadLLibs(lua_State* L){ diff --git a/src/shared/lua_api/common.h b/src/shared/lua_api/common.hpp index 6086065..6086065 100644 --- a/src/shared/lua_api/common.h +++ b/src/shared/lua_api/common.hpp diff --git a/src/shared/lua_api/load_net.cpp b/src/shared/lua_api/load_net.cpp index 5280d42..740d997 100644 --- a/src/shared/lua_api/load_net.cpp +++ b/src/shared/lua_api/load_net.cpp @@ -20,7 +20,7 @@ extern "C" { #include "load_net.hpp" -#include "../util/hashmap.h" +#include <shared/util/hashmap.hpp> #include "stream.hpp" std::map<int,std::map<std::string,int>> netfuncs; diff --git a/src/shared/lua_api/phys/bphysbox.cpp b/src/shared/lua_api/phys/bphysbox.cpp index 0fe9f72..728b6d1 100644 --- a/src/shared/lua_api/phys/bphysbox.cpp +++ b/src/shared/lua_api/phys/bphysbox.cpp @@ -9,7 +9,7 @@ extern "C" { } #include <btBulletDynamicsCommon.h> #include "bphysbox.hpp" -#include "../common.h" +#include <shared/lua_api/common.hpp> extern btDiscreteDynamicsWorld* World; extern std::list<btRigidBody*> Objects; diff --git a/src/shared/lua_api/phys/bphysbox.hpp b/src/shared/lua_api/phys/bphysbox.hpp index 96b58a7..1471381 100644 --- a/src/shared/lua_api/phys/bphysbox.hpp +++ b/src/shared/lua_api/phys/bphysbox.hpp @@ -8,7 +8,6 @@ extern "C" { #include <lualib.h> } #include <irrlicht.h> -#include "../common.h" void bphysbox_register(lua_State* L); void makenewbphysbox(lua_State* L); |
