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.5 by root, Thu Sep 14 22:34:02 2006 UTC vs.
Revision 1.14 by root, Sat Feb 17 23:32:11 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 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
31maptile::make_map_floor (char **layout, char *floorstyle, random_map_params *RP)
32{
33 char styledirname[1024];
34 char stylefilepath[1024];
35 maptile *style_map = 0;
36 object *the_floor;
30 37
31mapstruct * 38 clear ();
32make_map_floor (char **layout, char *floorstyle, RMParms * RP)
33{
34 char styledirname[256];
35 char stylefilepath[256];
36 mapstruct *style_map = 0;
37 object *the_floor;
38 mapstruct *newMap = 0;
39 39
40 /* allocate the map */ 40 width = RP->Xsize;
41 newMap = get_empty_map (RP->Xsize, RP->Ysize); 41 height = RP->Ysize;
42
43 alloc ();
42 44
43 /* get the style map */ 45 /* get the style map */
44 sprintf (styledirname, "%s", "/styles/floorstyles"); 46 sprintf (styledirname, "%s", "/styles/floorstyles");
45 sprintf (stylefilepath, "%s/%s", styledirname, floorstyle); 47 sprintf (stylefilepath, "%s/%s", styledirname, floorstyle);
48
46 style_map = find_style (styledirname, floorstyle, -1); 49 style_map = find_style (styledirname, floorstyle, -1);
50
47 if (style_map == 0) 51 if (!style_map)
48 return newMap; 52 return;
49 53
50 /* fill up the map with the given floor style */ 54 /* fill up the map with the given floor style */
51 if ((the_floor = pick_random_object (style_map)) != NULL) 55 if ((the_floor = style_map->pick_random_object ()))
52 { 56 for (int x = 0; x < width; x++)
53 int i, j; 57 for (int y = 0; y < height; y++)
54 58 insert (arch_to_object (the_floor->arch), 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} 59}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines