ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/random_map.h
(Generate patch)

Comparing deliantra/server/random_maps/random_map.h (file contents):
Revision 1.20 by root, Tue Apr 15 18:43:11 2008 UTC vs.
Revision 1.25 by root, Tue Apr 13 02:39:53 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#ifndef RANDOM_MAP_H 25#ifndef RANDOM_MAP_H
25#define RANDOM_MAP_H 26#define RANDOM_MAP_H
26 27
27#include "util.h" 28#include "util.h"
28 29
29struct random_map_params 30struct random_map_params : zero_initialised
30{ 31{
31 char wallstyle[512]; 32 char wallstyle[512];
33 char miningstyle[512];
32 char wall_name[512]; 34 char wall_name[512];
33 char floorstyle[512]; 35 char floorstyle[512];
34 char monsterstyle[512]; 36 char monsterstyle[512];
35 char treasurestyle[512]; 37 char treasurestyle[512];
36 char layoutstyle[512]; 38 char layoutstyle[512];
… …
193 ::swap (layout.ptr->w , ptr->w ); 195 ::swap (layout.ptr->w , ptr->w );
194 ::swap (layout.ptr->h , ptr->h ); 196 ::swap (layout.ptr->h , ptr->h );
195 } 197 }
196}; 198};
197 199
200// utility functions, to use rmg_rndm instead of rndm.
201static inline int
202rmg_find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
203{
204 swap (rmg_rndm, rndm);
205 int i = find_free_spot (ob, m, x, y, start, stop);
206 swap (rmg_rndm, rndm);
207 return i;
208}
209
198#endif 210#endif
199 211

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines