diff options
Diffstat (limited to 'src/lua/modules')
| -rw-r--r-- | src/lua/modules/graphics/je_lua_graphics.cpp | 8 | ||||
| -rw-r--r-- | src/lua/modules/graphics/je_lua_particle_system.cpp | 4 | ||||
| -rw-r--r-- | src/lua/modules/thread/je_lua_thread.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index c6e6e13..40bb4fa 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -737,7 +737,7 @@ namespace JinEngine int o = luax_checkinteger(L, 3); Origin origin = static_cast<Origin>(o); LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared<Sprite>(new Sprite(graphic, quad, origin), Jin_Lua_Sprite)); - p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getSharedBase()); + p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getShared()); } else if (n == 4) { @@ -749,21 +749,21 @@ namespace JinEngine int ox = luax_checkinteger(L, 3); int oy = luax_checkinteger(L, 4); LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared<Sprite>(new Sprite(graphic, quad, ox, oy), Jin_Lua_Sprite)); - p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getSharedBase()); + p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getShared()); } else if (n == 2) { int o = luax_checkinteger(L, 2); Origin origin = static_cast<Origin>(o); LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared<Sprite>(new Sprite(graphic, origin), Jin_Lua_Sprite)); - p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getSharedBase()); + p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getShared()); } else if (n == 3) { int ox = luax_checkinteger(L, 2); int oy = luax_checkinteger(L, 3); LuaObject* p = luax_newinstance(L, Jin_Lua_Sprite, new Shared<Sprite>(new Sprite(graphic, ox, oy), Jin_Lua_Sprite)); - p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getSharedBase()); + p->setDependency((int)SpriteDependency::DEP_GRAPHIC, objGraphic->getShared()); } else { diff --git a/src/lua/modules/graphics/je_lua_particle_system.cpp b/src/lua/modules/graphics/je_lua_particle_system.cpp index 8c2e4c7..05be4b7 100644 --- a/src/lua/modules/graphics/je_lua_particle_system.cpp +++ b/src/lua/modules/graphics/je_lua_particle_system.cpp @@ -244,7 +244,7 @@ namespace JinEngine Sprite* spr = objSpr->getObject<Sprite>(); ps->addParticleSprite(spr); int depn = (*obj).getDependenciesCount(); - (*obj).setDependency((int)ParticleSystemDependency::DEP_SPRITES + depn, objSpr->getSharedBase()); + (*obj).setDependency((int)ParticleSystemDependency::DEP_SPRITES + depn, objSpr->getShared()); return 0; } @@ -266,7 +266,7 @@ namespace JinEngine luax_pop(L, 1); Sprite* spr = objSpr->getObject<Sprite>(); ps->addParticleSprite(spr); - (*obj).setDependency((int)ParticleSystemDependency::DEP_SPRITES + depn + i - 1, objSpr->getSharedBase()); + (*obj).setDependency((int)ParticleSystemDependency::DEP_SPRITES + depn + i - 1, objSpr->getShared()); } return 0; } diff --git a/src/lua/modules/thread/je_lua_thread.cpp b/src/lua/modules/thread/je_lua_thread.cpp index dc6a27a..566d0ff 100644 --- a/src/lua/modules/thread/je_lua_thread.cpp +++ b/src/lua/modules/thread/je_lua_thread.cpp @@ -1,7 +1,7 @@ #include "common/je_lua_object.h" #include "libjin/jin.h" -#include "lua/jin.h" +#include "lua/je_lua_jin.h" #include "common/je_lua_common.h" #include "je_lua_thread.h" |