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.14 by root, Sat Feb 17 23:32:11 2007 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
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>
77 for (i = 0; i < RP->Xsize; i++) 76 for (i = 0; i < RP->Xsize; i++)
78 for (j = 0; j < RP->Ysize; j++) 77 for (j = 0; j < RP->Ysize; j++)
79 { 78 {
80 if (maze[i][j] == 'D') 79 if (maze[i][j] == 'D')
81 { 80 {
82 int sindex; 81 int sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
83 object *this_door, *new_door;
84 82
85 sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize); 83 object *this_door = (sindex == 3 ? hdoors : vdoors)
86 if (sindex == 3) 84 ->pick_random_object ();
87 this_door = hdoors->pick_random_object ();
88 else
89 this_door = vdoors->pick_random_object ();
90 85
91 if (!this_door) 86 if (!this_door)//TODO not necessary?
92 abort (); 87 abort ();
93 88
94 new_door = arch_to_object (this_door->arch); 89 object *new_door = this_door->clone ();
95 this_door->copy_to (new_door);
96 new_door->x = i; 90 new_door->x = i;
97 new_door->y = j; 91 new_door->y = j;
98 insert_ob_in_map (new_door, the_map, NULL, 0); 92 insert_ob_in_map (new_door, the_map, NULL, 0);
99 } 93 }
100 } 94 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines