From 67e1213905edbd248ef4d434c3e5e53c151828a7 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Thu, 9 May 2013 18:52:13 -0400
Subject: [PATCH] fix tpt.message_box, fix compiling error

---
 src/cat/LegacyLuaAPI.cpp         | 2 +-
 src/simulation/elements/STKM.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index 4d3c0c84a..cb6fd9af4 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -1739,7 +1739,7 @@ int luatpt_message_box(lua_State* l)
 {
 	std::string title = std::string(luaL_optstring(l, 1, "Title"));
 	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);
 	return 0;
 }
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp
index 55fac92a7..65fe189f7 100644
--- a/src/simulation/elements/STKM.cpp
+++ b/src/simulation/elements/STKM.cpp
@@ -130,13 +130,13 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
 	float rbx = gvx;
 	float rby = gvy;
 	bool rbLowGrav = false;
-	float tmp = fmaxf(fabsf(rbx), fabsf(rby));
+	float tmp = fabsf(rbx) > fabsf(rby)?fabsf(rbx):fabsf(rby);
 	if (tmp < 0.001f)
 	{
 		rbLowGrav = true;
 		rbx = -parts[i].vx;
 		rby = -parts[i].vy;
-		tmp = fmaxf(fabsf(rbx), fabsf(rby));
+		tmp = fabsf(rbx) > fabsf(rby)?fabsf(rbx):fabsf(rby);
 	}
 	if (tmp < 0.001f)
 	{