[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.124,1.125 list.h,1.8,1.9

[Max Horn]

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

Modified Files:
	actor.cpp list.h 
Log Message:
Small tweak to silence yet another Doxygen complaint

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- actor.cpp	8 May 2005 14:04:02 -0000	1.124
+++ actor.cpp	10 May 2005 13:56:23 -0000	1.125
@@ -1203,7 +1203,7 @@
 	int i;
 	ActorData *actor;
 	ObjectData *obj;
-	CommonObjectOrderList::CompareFunction *compareFunction;
+	CommonObjectOrderList::CompareFunction compareFunction;
 
 	if (_vm->_scene->getFlags() & kSceneFlagISO) {
 		compareFunction = &tileCommonObjectCompare;

Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/list.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- list.h	8 May 2005 21:49:43 -0000	1.8
+++ list.h	10 May 2005 13:56:25 -0000	1.9
@@ -29,7 +29,7 @@
 template <class T>
 class SortedList : public Common::List<T> {
 public:
-	typedef int ( CompareFunction ) (const T& , const T&);
+	typedef int (*CompareFunction) (const T& a, const T& b);
 
 	typedef typename Common::List<T>::iterator        iterator;
 	typedef typename Common::List<T>::const_iterator  const_iterator;
@@ -62,15 +62,15 @@
 		return insert(pos, init);
 	}
 
-	iterator pushFront(const T& element, CompareFunction* compareFunction) {
+	iterator pushFront(const T& element, CompareFunction compareFunction) {
 		return insert(Common::List<T>::begin(), element, compareFunction);
 	}
 
-	iterator pushBack(const T& element, CompareFunction* compareFunction) {
+	iterator pushBack(const T& element, CompareFunction compareFunction) {
 		return insert(Common::List<T>::end(), element, compareFunction);
 	}
 
-	iterator insert(iterator pos, const T& element, CompareFunction* compareFunction) {
+	iterator insert(iterator pos, const T& element, CompareFunction compareFunction) {
 		int res;
 
 		for (iterator i = Common::List<T>::begin(); i != Common::List<T>::end(); ++i) {
@@ -82,7 +82,7 @@
 		return pushBack(element);
 	}
 
-	iterator reorderUp(iterator pos, CompareFunction* compareFunction) {
+	iterator reorderUp(iterator pos, CompareFunction compareFunction) {
 		iterator i(pos);		
 		int res;
 
@@ -101,7 +101,7 @@
 		return pos;
 	}
 
-	iterator reorderDown(iterator pos, CompareFunction* compareFunction) {
+	iterator reorderDown(iterator pos, CompareFunction compareFunction) {
 		iterator i(pos);		
 		int res;