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

fix tpt.message_box, fix compiling error

Browse Source
This commit is contained in:
jacob1 2013-05-09 18:52:13 -04:00
parent e53f2bf0b5
commit 67e1213905
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cat/LegacyLuaAPI.cpp
View File

@ -1739,7 +1739,7 @@ int luatpt_message_box(lua_State* l)
{ {
std::string title = std::string(luaL_optstring(l, 1, "Title")); std::string title = std::string(luaL_optstring(l, 1, "Title"));
std::string message = std::string(luaL_optstring(l, 2, "Message")); std::string message = std::string(luaL_optstring(l, 2, "Message"));
int large = luaL_optint(l, 1, 0); int large = luaL_optint(l, 3, 0);
new InformationMessage(title, message, large); new InformationMessage(title, message, large);
return 0; return 0;
} }

4
src/simulation/elements/STKM.cpp
View File

@ -130,13 +130,13 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
float rbx = gvx; float rbx = gvx;
float rby = gvy; float rby = gvy;
bool rbLowGrav = false; bool rbLowGrav = false;
float tmp = fmaxf(fabsf(rbx), fabsf(rby)); float tmp = fabsf(rbx) > fabsf(rby)?fabsf(rbx):fabsf(rby);
if (tmp < 0.001f) if (tmp < 0.001f)
{ {
rbLowGrav = true; rbLowGrav = true;
rbx = -parts[i].vx; rbx = -parts[i].vx;
rby = -parts[i].vy; rby = -parts[i].vy;
tmp = fmaxf(fabsf(rbx), fabsf(rby)); tmp = fabsf(rbx) > fabsf(rby)?fabsf(rbx):fabsf(rby);
} }
if (tmp < 0.001f) if (tmp < 0.001f)
{ {