LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 16:20:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved error checking for some enum strings (resolves issue #690).

Browse Source 
Also moved love.audio.newSource from Lua code into C++ code
This commit is contained in:
Alex Szpakowski
2013-08-03 21:24:43 -03:00
parent 0c053e09d4
commit a4ff39e0d4
9 changed files with 44 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/wrap_Physics.cpp
+7 -4
View File
@@ -68,11 +68,14 @@ int w_newBody(lua_State *L)
World *world = luax_checktype<World>(L, 1, "World", PHYSICS_WORLD_T);
float x = (float)luaL_optnumber(L, 2, 0.0);
float y = (float)luaL_optnumber(L, 3, 0.0);
const char *type = luaL_optstring(L, 4, "static");
Body::Type bodyType;
Body::getConstant(type, bodyType);
Body::Type btype = Body::BODY_STATIC;
const char *typestr = lua_isnoneornil(L, 4) ? 0 : lua_tostring(L, 4);
if (typestr && !Body::getConstant(typestr, btype))
return luaL_error(L, "Invalid Body type: %s", typestr);
Body *body;
ASSERT_GUARD(body = instance->newBody(world, x, y, bodyType);)
ASSERT_GUARD(body = instance->newBody(world, x, y, btype);)
luax_newtype(L, "Body", PHYSICS_BODY_T, (void *)body);
return 1;
}