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.7 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.16 by root, Thu Aug 9 21:35:05 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23
24 23
25#include <global.h> 24#include <global.h>
26#include <random_map.h> 25#include <random_map.h>
27#include <rproto.h> 26#include <rproto.h>
28 27
29/* make a map and layout the floor. */ 28/* make a map and layout the floor. */
30 29void
31maptile *
32make_map_floor (char **layout, char *floorstyle, RMParms * RP) 30maptile::make_map_floor (char **layout, char *floorstyle, random_map_params *RP)
33{ 31{
34 char styledirname[256]; 32 char styledirname[1024];
35 char stylefilepath[256]; 33 char stylefilepath[1024];
36 maptile *style_map = 0; 34 maptile *style_map = 0;
37 object *the_floor; 35 object *the_floor;
38 maptile *newMap = 0;
39 36
40 /* allocate the map */ 37 clear ();
41 newMap = new maptile (RP->Xsize, RP->Ysize); 38
39 width = RP->Xsize;
40 height = RP->Ysize;
41
42 alloc ();
42 43
43 /* get the style map */ 44 /* get the style map */
44 sprintf (styledirname, "%s", "/styles/floorstyles"); 45 sprintf (styledirname, "%s", "/styles/floorstyles");
45 sprintf (stylefilepath, "%s/%s", styledirname, floorstyle); 46 sprintf (stylefilepath, "%s/%s", styledirname, floorstyle);
47
46 style_map = find_style (styledirname, floorstyle, -1); 48 style_map = find_style (styledirname, floorstyle, -1);
49
47 if (style_map == 0) 50 if (!style_map)
48 return newMap; 51 return;
49 52
50 /* fill up the map with the given floor style */ 53 /* fill up the map with the given floor style */
51 if ((the_floor = pick_random_object (style_map)) != NULL) 54 if ((the_floor = style_map->pick_random_object ()))
52 { 55 for (int x = 0; x < width; x++)
53 int i, j; 56 for (int y = 0; y < height; y++)
54 57 insert (the_floor->clone (), x, y, 0, INS_NO_MERGE | INS_NO_WALK_ON);
55 for (i = 0; i < RP->Xsize; i++)
56 for (j = 0; j < RP->Ysize; j++)
57 {
58 object *thisfloor = arch_to_object (the_floor->arch);
59
60 thisfloor->x = i;
61 thisfloor->y = j;
62 insert_ob_in_map (thisfloor, newMap, thisfloor, INS_NO_MERGE | INS_NO_WALK_ON);
63 }
64 }
65 return newMap;
66} 58}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines