Merge remote-tracking branch 'wolfy852/next' into next

This commit is contained in:
Alam Ed Arias 2014-07-23 18:34:42 -04:00
commit 6b112a3bfd

View file

@ -85,6 +85,13 @@ static int lib_print(lua_State *L)
return 0; return 0;
} }
static int lib_evalMath(lua_State *L)
{
const char *word = luaL_checkstring(L, 1);
lua_pushinteger(L, LUA_EvalMath(word));
return 1;
}
// M_RANDOM // M_RANDOM
////////////// //////////////
@ -1633,6 +1640,7 @@ static int lib_gTicsToMilliseconds(lua_State *L)
static luaL_Reg lib[] = { static luaL_Reg lib[] = {
{"print", lib_print}, {"print", lib_print},
{"EvalMath", lib_evalMath,},
// m_random // m_random
{"P_Random",lib_pRandom}, {"P_Random",lib_pRandom},