aboutsummaryrefslogtreecommitdiff
path: root/sword1/screen.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-12-16 06:37:12 +0000
committerPaweł Kołodziejski2003-12-16 06:37:12 +0000
commit1cf3accb14bbd9b52aaf0d1f5ac2a9e67dce25c2 (patch)
tree7075247a5df94cda83bf9ec6814ea884add37f15 /sword1/screen.cpp
parenta8eae425101e71c18e3ed6d2d3d00870552ee970 (diff)
downloadscummvm-rg350-1cf3accb14bbd9b52aaf0d1f5ac2a9e67dce25c2.tar.gz
scummvm-rg350-1cf3accb14bbd9b52aaf0d1f5ac2a9e67dce25c2.tar.bz2
scummvm-rg350-1cf3accb14bbd9b52aaf0d1f5ac2a9e67dce25c2.zip
there is allready definitions for MIN/MAX
svn-id: r11676
Diffstat (limited to 'sword1/screen.cpp')
-rw-r--r--sword1/screen.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/sword1/screen.cpp b/sword1/screen.cpp
index ed0503ade4..cfacea2c82 100644
--- a/sword1/screen.cpp
+++ b/sword1/screen.cpp
@@ -837,22 +837,17 @@ void SwordScreen::bsubline_4(uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
}
}
-#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;
}