libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

there is allready definitions for MIN/MAX

Browse Source 
svn-id: r11676
This commit is contained in:
Paweł Kołodziejski 2003-12-16 06:37:12 +00:00
parent a8eae42510
commit 1cf3accb14
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sword1/screen.cpp
View File

@ -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;
}