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.11 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.12 by root, Sat Jan 13 23:06:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines