[Scummvm-cvs-logs] CVS: scummvm/scumm logic_he.cpp,2.19,2.20 logic_he.h,2.12,2.13

[Max Horn]

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

Modified Files:
	logic_he.cpp logic_he.h 
Log Message:
No need to declare a full method if all you need is a tiny local function

Index: logic_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/logic_he.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- logic_he.cpp	18 May 2005 07:59:45 -0000	2.19
+++ logic_he.cpp	18 May 2005 08:50:06 -0000	2.20
@@ -37,11 +37,8 @@
 	free(_userDataD);
 }
 
-double LogicHE::round(double arg) {
-	if (floor(arg) + 0.5 > arg)
-		return floor(arg);
-	else
-		return ceil(arg);
+static int32 scumm_round(double arg) {
+	return (int32)(arg + 0.5);
 }
 
 int LogicHE::versionID() {
@@ -449,8 +446,8 @@
 		data[i] -= data[minx];
 		data[i + 1] -= data[miny];
 
-		putInArray(args[0], 0, 519 + i, (int32)round(data[i]));
-		putInArray(args[0], 0, 519 + i + 1, (int32)round(data[i + 1]));
+		putInArray(args[0], 0, 519 + i, scumm_round(data[i]));
+		putInArray(args[0], 0, 519 + i + 1, scumm_round(data[i + 1]));
 	}
 }
 
@@ -472,8 +469,8 @@
 	}
 	
 	for (int i = 520; i <= 526; i += 2) {
-		putInArray(args[0], 0, i - 1, (int32)round(data[i - 520]));
-		putInArray(args[0], 0, i, (int32)round(data[i - 520 + 1]));
+		putInArray(args[0], 0, i - 1, scumm_round(data[i - 520]));
+		putInArray(args[0], 0, i, scumm_round(data[i - 520 + 1]));
 	}
 }
 

Index: logic_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/logic_he.h,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- logic_he.h	18 May 2005 07:59:45 -0000	2.12
+++ logic_he.h	18 May 2005 08:50:06 -0000	2.13
@@ -49,8 +49,6 @@
 
 	virtual int versionID();
 	virtual int32 dispatch(int op, int numArgs, int32 *args);
-
-	double round(double arg);
 };
 
 class LogicHErace : public LogicHE {