[Scummvm-cvs-logs] CVS: residual bits.h,1.11,1.12 lua.cpp,1.39,1.40

[Pawel Kolodziejski]

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

Modified Files:
	bits.h lua.cpp 
Log Message:
implementation of round func

Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- bits.h	1 Feb 2004 09:00:05 -0000	1.11
+++ bits.h	22 Feb 2004 18:40:29 -0000	1.12
@@ -40,8 +40,9 @@
 template<typename T> inline T MIN (T a, T b)	{ return (a<b) ? a : b; }
 template<typename T> inline T MAX (T a, T b)	{ return (a>b) ? a : b; }
 
-// Default definition. See _MSVC_VER & FreeBSD for OS specific stuff
-#define ROUND(x) round(x)
+#ifndef round
+#define round(x) ((x > 0.0) ? floor((x) + 0.5) : ceil((x) - 0.5))
+#endif
 
 #if defined(_MSC_VER)
 
@@ -72,9 +73,6 @@
 	#define END_PACK_STRUCTS	 pack(pop)
 	#define GCC_PACK
 
-	#undef ROUND
-	#define ROUND(x) (x)
-
 #elif defined(__MINGW32__)
 
 	#define CHECK_HEAP

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- lua.cpp	22 Feb 2004 18:09:34 -0000	1.39
+++ lua.cpp	22 Feb 2004 18:40:29 -0000	1.40
@@ -78,7 +78,7 @@
 static inline int check_int(int num) {
   double val = luaL_check_number(num);
 
-  return int(ROUND(val));
+  return int(round(val));
 }
 
 static inline int check_control(int num) {