[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.261,1.262 akos.cpp,1.82,1.83

Max Horn fingolfin at users.sourceforge.net
Thu Jun 26 15:51:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8655

Modified Files:
	scumm.h akos.cpp 
Log Message:
Moved out akos_compare (no reason for it to be member of class Scumm)

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- scumm.h	26 Jun 2003 01:46:41 -0000	1.261
+++ scumm.h	26 Jun 2003 22:50:01 -0000	1.262
@@ -797,7 +797,6 @@
 	bool akos_increaseAnims(const byte *akos, Actor *a);
 	bool akos_increaseAnim(Actor *a, int i, const byte *aksq, const uint16 *akfo, int numakfo);
 	void akos_queCommand(byte cmd, Actor *a, int param_1, int param_2);
-	bool akos_compare(int a, int b, byte cmd);
 	void akos_decodeData(Actor *a, int frame, uint usemask);
 	int akos_frameToAnim(Actor *a, int frame);
 	bool akos_hasManyDirections(Actor *a);

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- akos.cpp	19 Jun 2003 16:03:12 -0000	1.82
+++ akos.cpp	26 Jun 2003 22:50:01 -0000	1.83
@@ -95,6 +95,23 @@
 	AKC_EndSeq = 0xC0FF
 };
 
+static bool akos_compare(int a, int b, byte cmd) {
+	switch (cmd) {
+	case 0:
+		return a == b;
+	case 1:
+		return a != b;
+	case 2:
+		return a < b;
+	case 3:
+		return a <= b;
+	case 4:
+		return a > b;
+	default:
+		return a >= b;
+	}
+}
+
 bool Scumm::akos_hasManyDirections(Actor *a) {
 	byte *akos;
 	const AkosHeader *akhd;
@@ -1345,23 +1362,6 @@
 		break;
 	default:
 		warning("akos_queCommand(%d,%d,%d,%d)", cmd, a->number, param_1, param_2);
-	}
-}
-
-bool Scumm::akos_compare(int a, int b, byte cmd) {
-	switch (cmd) {
-	case 0:
-		return a == b;
-	case 1:
-		return a != b;
-	case 2:
-		return a < b;
-	case 3:
-		return a <= b;
-	case 4:
-		return a > b;
-	default:
-		return a >= b;
 	}
 }
 





More information about the Scummvm-git-logs mailing list