--- deliantra/server/include/define.h 2007/10/07 15:52:05 1.76 +++ deliantra/server/include/define.h 2008/03/15 13:52:37 1.78 @@ -1,11 +1,11 @@ /* - * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2003-2005,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * - * Crossfire TRT is free software: you can redistribute it and/or modify + * Deliantra is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * The authors can be reached via e-mail to + * The authors can be reached via e-mail to */ /* This file is best viewed with a window width of about 100 character */ @@ -44,25 +44,12 @@ #ifdef __NetBSD__ # include #endif -#ifndef MIN -# define MIN(x,y) min (x, y) -#endif -#ifndef MAX -# define MAX(x,y) max (x, y) -#endif // maximum length of an object name in the protocol #define NAME_LEN 127 -/* MAX3 is basically like MAX, but instead does 3 values. */ -#ifndef MAX3 -# define MAX3(x,y, z) (MAX(x, MAX(y,z))) -#endif - -/* MIN3 is basically like MIN, but instead does 3 values. */ -#ifndef MIN3 -# define MIN3(x,y, z) (MIN(x, MIN(y,z))) -#endif +#undef MIN +#undef MAX #define MAX_STAT 30 /* The maximum legal value of any stat */ #define MIN_STAT 1 /* The minimum legal value of any stat */