matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-add tpt.display_mode, check element id's in tpt.set_property, tpt.get_script error with no args

Browse Source
This commit is contained in:
jacob1 2013-01-08 23:28:41 -05:00
parent 162a8ecba5
commit 9d67dd61e8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cat/LegacyLuaAPI.cpp
View File

@ -1004,12 +1004,10 @@ int luatpt_set_property(lua_State* l)
} else {
t = luaL_optint(l, 2, 0);
}
//TODO Element ID check
//if (format == 3 && (t<0 || t>=PT_NUM))
// return luaL_error(l, "Unrecognised element number '%d'", t);
if (format == CommandInterface::FormatInt && (t<0 || t>=PT_NUM || !luacon_sim->elements[t].Enabled))
return luaL_error(l, "Unrecognised element number '%d'", t);
} else {
name = (char*)luaL_optstring(l, 2, "dust");
//if (!console_parse_type(name, &t, NULL))
if((t = luacon_ci->GetParticleType(std::string(name)))==-1)
return luaL_error(l, "Unrecognised element '%s'", name);
}
@ -1690,11 +1688,17 @@ int luatpt_heat(lua_State* l)
luacon_sim->legacy_enable = (heatstate==1?0:1);
return 0;
}
int luatpt_cmode_set(lua_State* l)
{
//TODO IMPLEMENT
return luaL_error(l, "cmode_set: Deprecated");
int cmode = luaL_optint(l, 1, 0);
if (cmode >= 0 && cmode <= 10)
luacon_controller->LoadRenderPreset(cmode);
else
return luaL_error(l, "Invalid display mode");
return 0;
}
int luatpt_setfire(lua_State* l)
{
int firesize = luaL_optint(l, 2, 4);
@ -1725,7 +1729,10 @@ int luatpt_getscript(lua_State* l)
fileid = std::string(luaL_optstring(l, 2, ""));
run_script = luaL_optint(l, 3, 0);
if(!fileauthor.length() || !fileid.length())
{
lastError = "Script Author or ID not given";
goto fin;
}
if(!ConfirmPrompt::Blocking("Do you want to install script?", fileid, "Install"))
goto fin;