diff options
| -rw-r--r-- | sword1/screen.cpp | 9 |
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; } |