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

Comparing deliantra/server/random_maps/floor.C (file contents):
Revision 1.14 by root, Sat Feb 17 23:32:11 2007 UTC vs.
Revision 1.23 by root, Sun Mar 28 22:29:50 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <random_map.h> 26#include <random_map.h>
27#include <rproto.h> 27#include <rproto.h>
28 28
29/* make a map and layout the floor. */ 29/* make a map and layout the floor. */
30void 30void
31maptile::make_map_floor (char **layout, char *floorstyle, random_map_params *RP) 31maptile::make_map_floor (char **layout, char *floorstyle, random_map_params *RP)
32{ 32{
33 char styledirname[1024];
34 char stylefilepath[1024];
35 maptile *style_map = 0;
36 object *the_floor; 33 object *the_floor;
37 34
38 clear (); 35 clear ();
39 36
40 width = RP->Xsize; 37 width = RP->Xsize;
41 height = RP->Ysize; 38 height = RP->Ysize;
42 39
43 alloc (); 40 alloc ();
44 41
45 /* get the style map */ 42 /* get the style map */
46 sprintf (styledirname, "%s", "/styles/floorstyles");
47 sprintf (stylefilepath, "%s/%s", styledirname, floorstyle);
48
49 style_map = find_style (styledirname, floorstyle, -1); 43 maptile *style_map = find_style ("/styles/floorstyles", floorstyle, -1);
50
51 if (!style_map) 44 if (!style_map)
52 return; 45 return;
53 46
54 /* fill up the map with the given floor style */ 47 /* fill up the map with the given floor style */
55 if ((the_floor = style_map->pick_random_object ())) 48 if ((the_floor = style_map->pick_random_object (rmg_rndm)))
56 for (int x = 0; x < width; x++) 49 for (int x = 0; x < width; x++)
57 for (int y = 0; y < height; y++) 50 for (int y = 0; y < height; y++)
58 insert (arch_to_object (the_floor->arch), x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON); 51 insert (the_floor->clone (), x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON);
59} 52}

Diff Legend

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