diff options
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/lua_api/l_noise.cpp | 36 | ||||
-rw-r--r-- | src/script/lua_api/l_noise.h | 18 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp index 35d3bbb6e..7e76001c1 100644 --- a/src/script/lua_api/l_noise.cpp +++ b/src/script/lua_api/l_noise.cpp @@ -36,7 +36,7 @@ LuaPerlinNoise::LuaPerlinNoise(NoiseParams *params) : } -int LuaPerlinNoise::l_get2d(lua_State *L) +int LuaPerlinNoise::l_get_2d(lua_State *L) { NO_MAP_LOCK_REQUIRED; LuaPerlinNoise *o = checkobject(L, 1); @@ -47,7 +47,7 @@ int LuaPerlinNoise::l_get2d(lua_State *L) } -int LuaPerlinNoise::l_get3d(lua_State *L) +int LuaPerlinNoise::l_get_3d(lua_State *L) { NO_MAP_LOCK_REQUIRED; LuaPerlinNoise *o = checkobject(L, 1); @@ -131,8 +131,8 @@ void LuaPerlinNoise::Register(lua_State *L) const char LuaPerlinNoise::className[] = "PerlinNoise"; const luaL_Reg LuaPerlinNoise::methods[] = { - luamethod(LuaPerlinNoise, get2d), - luamethod(LuaPerlinNoise, get3d), + luamethod_aliased(LuaPerlinNoise, get_2d, get2d), + luamethod_aliased(LuaPerlinNoise, get_3d, get3d), {0,0} }; @@ -159,7 +159,7 @@ LuaPerlinNoiseMap::~LuaPerlinNoiseMap() } -int LuaPerlinNoiseMap::l_get2dMap(lua_State *L) +int LuaPerlinNoiseMap::l_get_2d_map(lua_State *L) { NO_MAP_LOCK_REQUIRED; size_t i = 0; @@ -183,7 +183,7 @@ int LuaPerlinNoiseMap::l_get2dMap(lua_State *L) } -int LuaPerlinNoiseMap::l_get2dMap_flat(lua_State *L) +int LuaPerlinNoiseMap::l_get_2d_map_flat(lua_State *L) { NO_MAP_LOCK_REQUIRED; @@ -209,7 +209,7 @@ int LuaPerlinNoiseMap::l_get2dMap_flat(lua_State *L) } -int LuaPerlinNoiseMap::l_get3dMap(lua_State *L) +int LuaPerlinNoiseMap::l_get_3d_map(lua_State *L) { NO_MAP_LOCK_REQUIRED; size_t i = 0; @@ -240,7 +240,7 @@ int LuaPerlinNoiseMap::l_get3dMap(lua_State *L) } -int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L) +int LuaPerlinNoiseMap::l_get_3d_map_flat(lua_State *L) { NO_MAP_LOCK_REQUIRED; @@ -269,7 +269,7 @@ int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L) } -int LuaPerlinNoiseMap::l_calc2dMap(lua_State *L) +int LuaPerlinNoiseMap::l_calc_2d_map(lua_State *L) { NO_MAP_LOCK_REQUIRED; @@ -282,7 +282,7 @@ int LuaPerlinNoiseMap::l_calc2dMap(lua_State *L) return 0; } -int LuaPerlinNoiseMap::l_calc3dMap(lua_State *L) +int LuaPerlinNoiseMap::l_calc_3d_map(lua_State *L) { NO_MAP_LOCK_REQUIRED; @@ -299,7 +299,7 @@ int LuaPerlinNoiseMap::l_calc3dMap(lua_State *L) } -int LuaPerlinNoiseMap::l_getMapSlice(lua_State *L) +int LuaPerlinNoiseMap::l_get_map_slice(lua_State *L) { NO_MAP_LOCK_REQUIRED; @@ -389,13 +389,13 @@ void LuaPerlinNoiseMap::Register(lua_State *L) const char LuaPerlinNoiseMap::className[] = "PerlinNoiseMap"; const luaL_Reg LuaPerlinNoiseMap::methods[] = { - luamethod(LuaPerlinNoiseMap, get2dMap), - luamethod(LuaPerlinNoiseMap, get2dMap_flat), - luamethod(LuaPerlinNoiseMap, calc2dMap), - luamethod(LuaPerlinNoiseMap, get3dMap), - luamethod(LuaPerlinNoiseMap, get3dMap_flat), - luamethod(LuaPerlinNoiseMap, calc3dMap), - luamethod(LuaPerlinNoiseMap, getMapSlice), + luamethod_aliased(LuaPerlinNoiseMap, get_2d_map, get2dMap), + luamethod_aliased(LuaPerlinNoiseMap, get_2d_map_flat, get2dMap_flat), + luamethod_aliased(LuaPerlinNoiseMap, calc_2d_map, calc2dMap), + luamethod_aliased(LuaPerlinNoiseMap, get_3d_map, get3dMap), + luamethod_aliased(LuaPerlinNoiseMap, get_3d_map_flat, get3dMap_flat), + luamethod_aliased(LuaPerlinNoiseMap, calc_3d_map, calc3dMap), + luamethod_aliased(LuaPerlinNoiseMap, get_map_slice, getMapSlice), {0,0} }; diff --git a/src/script/lua_api/l_noise.h b/src/script/lua_api/l_noise.h index 552d67db9..13e668507 100644 --- a/src/script/lua_api/l_noise.h +++ b/src/script/lua_api/l_noise.h @@ -38,8 +38,8 @@ private: // garbage collector static int gc_object(lua_State *L); - static int l_get2d(lua_State *L); - static int l_get3d(lua_State *L); + static int l_get_2d(lua_State *L); + static int l_get_3d(lua_State *L); public: LuaPerlinNoise(NoiseParams *params); @@ -70,14 +70,14 @@ class LuaPerlinNoiseMap : public ModApiBase // garbage collector static int gc_object(lua_State *L); - static int l_get2dMap(lua_State *L); - static int l_get2dMap_flat(lua_State *L); - static int l_get3dMap(lua_State *L); - static int l_get3dMap_flat(lua_State *L); + static int l_get_2d_map(lua_State *L); + static int l_get_2d_map_flat(lua_State *L); + static int l_get_3d_map(lua_State *L); + static int l_get_3d_map_flat(lua_State *L); - static int l_calc2dMap(lua_State *L); - static int l_calc3dMap(lua_State *L); - static int l_getMapSlice(lua_State *L); + static int l_calc_2d_map(lua_State *L); + static int l_calc_3d_map(lua_State *L); + static int l_get_map_slice(lua_State *L); public: LuaPerlinNoiseMap(NoiseParams *np, s32 seed, v3s16 size); |