[Scummvm-cvs-logs] CVS: scummvm/saga actor.h,1.27,1.28

Max Horn fingolfin at users.sourceforge.net
Sat Dec 25 05:20:05 CET 2004


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

Modified Files:
	actor.h 
Log Message:
There is no 'max' function on some of our targets

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- actor.h	25 Dec 2004 11:17:03 -0000	1.27
+++ actor.h	25 Dec 2004 13:19:45 -0000	1.28
@@ -126,7 +126,7 @@
 	int y;					// 
 	int z;					// 
 	int distance(const ActorLocation &location) {
-		return max(abs(x - location.x), abs(y - location.y));
+		return MAX(abs(x - location.x), abs(y - location.y));
 	}
 };
 struct ActorData {





More information about the Scummvm-git-logs mailing list