[Scummvm-cvs-logs] CVS: scummvm/sword1 screen.cpp,1.2,1.3

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv26015

Modified Files:
	screen.cpp 
Log Message:
there is allready definitions for MIN/MAX

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screen.cpp	16 Dec 2003 06:20:16 -0000	1.2
+++ screen.cpp	16 Dec 2003 06:37:12 -0000	1.3
@@ -837,22 +837,17 @@
     }
 }
 
-#ifdef __FreeBSD__
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 void SwordScreen::drawLine(uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
 	if ((x1 == x2) && (y1 == y2)) {
 		_screenBuf[x1 + y1 * _scrnSizeX] = 0;
 	}
     if (x1 == x2) {
-		vline(x1, min(y1, y2), max(y1, y2));
+		vline(x1, MIN(y1, y2), MAX(y1, y2));
 		return;
     }
     
     if (y1 == y2) {
-		hline(min(x1, x2), max(x1, x2), y1);
+		hline(MIN(x1, x2), MAX(x1, x2), y1);
 		return;
     }