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

Comparing deliantra/server/random_maps/door.C (file contents):
Revision 1.6 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.18 by root, Fri May 2 21:01:53 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 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 (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 * Deliantra 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 to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <random_map.h> 25#include <random_map.h>
26#include <rproto.h> 26#include <rproto.h>
27 27
45 surround_index += 8; 45 surround_index += 8;
46 return surround_index; 46 return surround_index;
47} 47}
48 48
49void 49void
50put_doors (maptile *the_map, char **maze, const char *doorstyle, RMParms * RP) 50put_doors (maptile *the_map, char **maze, const char *doorstyle, random_map_params *RP)
51{ 51{
52 int i, j; 52 int i, j;
53 maptile *vdoors; 53 maptile *vdoors;
54 maptile *hdoors; 54 maptile *hdoors;
55 char doorpath[128]; 55 char doorpath[1024];
56 56
57 if (!strcmp (doorstyle, "none")) 57 if (!strcmp (doorstyle, "none"))
58 return; 58 return;
59
59 vdoors = find_style ("/styles/doorstyles", doorstyle, -1); 60 vdoors = find_style ("/styles/doorstyles", doorstyle, -1);
61
60 if (vdoors) 62 if (vdoors)
61 hdoors = vdoors; 63 hdoors = vdoors;
62 else 64 else
63 { 65 {
64 vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, -1); 66 vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, -1);
65 if (!vdoors) 67 if (!vdoors)
66 return; 68 return;
69
67 sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/')); 70 sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/'));
68 hdoors = find_style (doorpath, 0, -1); 71 hdoors = find_style (doorpath, 0, -1);
72 if (!hdoors)
73 return;
69 } 74 }
75
70 for (i = 0; i < RP->Xsize; i++) 76 for (i = 0; i < RP->Xsize; i++)
71 for (j = 0; j < RP->Ysize; j++) 77 for (j = 0; j < RP->Ysize; j++)
72 { 78 {
73 if (maze[i][j] == 'D') 79 if (maze[i][j] == 'D')
74 { 80 {
75 int sindex; 81 int sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
76 object *this_door, *new_door;
77 82
78 sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize); 83 object *this_door = (sindex == 3 ? hdoors : vdoors)
79 if (sindex == 3) 84 ->pick_random_object ();
80 this_door = pick_random_object (hdoors); 85
81 else 86 if (!this_door)//TODO not necessary?
82 this_door = pick_random_object (vdoors); 87 abort ();
83 new_door = arch_to_object (this_door->arch); 88
84 this_door->copy_to (new_door); 89 object *new_door = this_door->clone ();
85 new_door->x = i; 90 new_door->x = i;
86 new_door->y = j; 91 new_door->y = j;
87 insert_ob_in_map (new_door, the_map, NULL, 0); 92 insert_ob_in_map (new_door, the_map, NULL, 0);
88 } 93 }
89 } 94 }
90} 95}
96

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines