--- deliantra/server/random_maps/random_map.h 2007/01/11 00:41:08 1.10 +++ deliantra/server/random_maps/random_map.h 2007/05/28 21:15:57 1.14 @@ -1,25 +1,25 @@ /* - * CrossFire, A Multiplayer game for X-windows - * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2001 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen - * - * This program 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 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at crossfire@schmorp.de + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen + * + * Crossfire TRT 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 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to */ #ifndef RANDOM_MAP_H @@ -42,8 +42,7 @@ char exit_on_final_map[512]; char *custom; - int Xsize; - int Ysize; + int xsize, ysize; int expand2x; int layoutoptions1; int layoutoptions2; @@ -60,13 +59,17 @@ int orientation; int origin_y; int origin_x; - int random_seed; + uint32_t random_seed; uint64_t total_map_hp; int map_layout_style; int treasureoptions; int symmetry_used; struct region *region; + + // "private", adjusted sizes + int Xsize; + int Ysize; }; enum { @@ -117,11 +120,10 @@ SYMMETRY_XY, }; -#define MIN_RANDOM_MAP_SIZE 10 - -/* a macro to get a strongly centered random distribution, - from 0 to x, centered at x/2 */ -#define BC_RANDOM(x) ((int) ((RANDOM() % (x)+RANDOM()%(x)+RANDOM()%(x))/3.)) +// 12 has been experimentally :( determined ot be a lot more stable +// than 11 or 10, leading to the assumption that something inherently +// needs a minimum size of at least 12 +#define MIN_RANDOM_MAP_SIZE 12 #endif