[Scummvm-cvs-logs] CVS: residual lua.cpp,1.60,1.61

James Brown ender at users.sourceforge.net
Mon Mar 29 23:21:03 CEST 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26847

Modified Files:
	lua.cpp 
Log Message:
Cleanup


Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- lua.cpp	28 Mar 2004 15:25:39 -0000	1.60
+++ lua.cpp	30 Mar 2004 07:08:40 -0000	1.61
@@ -87,6 +87,13 @@
 	return static_cast<Sound *>(lua_getuserdata(lua_getparam(num)));
 }
 
+static inline float check_float(int num) {
+        float val = luaL_check_number(num);
+        val = get_float((const char *)&val);
+
+        return val;
+}
+
 static inline int check_int(int num) {
 	double val = luaL_check_number(num);
 
@@ -345,12 +352,10 @@
 
 static void PutActorAt() {
 	Actor *act = check_actor(1);
-	float x = luaL_check_number(2);
-	float y = luaL_check_number(3);
-	float z = luaL_check_number(4);
-	x = get_float((const char *)&x);
-	y = get_float((const char *)&y);
-	z = get_float((const char *)&z);
+	float x = check_float(2);
+	float y = check_float(3);
+	float z = check_float(4);
+
 	act->setPos(Vector3d(x, y, z));
 }
 
@@ -364,12 +369,10 @@
 
 static void SetActorRot() {
 	Actor *act = check_actor(1);
-	float pitch = luaL_check_number(2);
-	float yaw = luaL_check_number(3);
-	float roll = luaL_check_number(4);
-	pitch = get_float((const char *)&pitch);
-	yaw = get_float((const char *)&yaw);
-	roll = get_float((const char *)&roll);
+	float pitch = check_float(2);
+	float yaw = check_float(3);
+	float roll = check_float(4);
+
 	if (getbool(5))
 		act->turnTo(pitch, yaw, roll);
 	else
@@ -412,8 +415,8 @@
 
 static void SetActorWalkRate() {
 	Actor *act = check_actor(1);
-	float rate = luaL_check_number(2);
-	rate = get_float((const char *)&rate);
+	float rate = check_float(2);
+
 	act->setWalkRate(rate);
 }
 
@@ -443,12 +446,10 @@
 
 static void WalkActorTo() {
 	Actor *act = check_actor(1);
-	float x = luaL_check_number(2);
-	float y = luaL_check_number(3);
-	float z = luaL_check_number(4);
-	x = get_float((const char *)&x);
-	y = get_float((const char *)&y);
-	z = get_float((const char *)&z);
+	float x = check_float(2);
+	float y = check_float(3);
+	float z = check_float(4);
+
 	act->walkTo(Vector3d(x, y, z));
 }
 





More information about the Scummvm-git-logs mailing list