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.4 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 for X-windows
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#include <global.h> 25#include <global.h>
25#include <random_map.h> 26#include <random_map.h>
26#include <rproto.h> 27#include <rproto.h>
27 28
45 surround_index += 8; 46 surround_index += 8;
46 return surround_index; 47 return surround_index;
47} 48}
48 49
49void 50void
50put_doors (mapstruct *the_map, char **maze, const char *doorstyle, RMParms * RP) 51put_doors (maptile *the_map, char **maze, const char *doorstyle, random_map_params *RP)
51{ 52{
52 int i, j; 53 int i, j;
53 mapstruct *vdoors; 54 maptile *vdoors;
54 mapstruct *hdoors; 55 maptile *hdoors;
55 char doorpath[128]; 56 char doorpath[1024];
56 57
57 if (!strcmp (doorstyle, "none")) 58 if (!strcmp (doorstyle, "none"))
58 return; 59 return;
60
59 vdoors = find_style ("/styles/doorstyles", doorstyle, -1); 61 vdoors = find_style ("/styles/doorstyles", doorstyle, -1);
62
60 if (vdoors) 63 if (vdoors)
61 hdoors = vdoors; 64 hdoors = vdoors;
62 else 65 else
63 { 66 {
64 vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, -1); 67 vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, -1);
65 if (!vdoors) 68 if (!vdoors)
66 return; 69 return;
70
67 sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/')); 71 sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/'));
68 hdoors = find_style (doorpath, 0, -1); 72 hdoors = find_style (doorpath, 0, -1);
73 if (!hdoors)
74 return;
69 } 75 }
76
70 for (i = 0; i < RP->Xsize; i++) 77 for (i = 0; i < RP->Xsize; i++)
71 for (j = 0; j < RP->Ysize; j++) 78 for (j = 0; j < RP->Ysize; j++)
72 { 79 {
73 if (maze[i][j] == 'D') 80 if (maze[i][j] == 'D')
74 { 81 {
75 int sindex; 82 int sindex;
76 object *this_door, *new_door; 83 object *this_door, *new_door;
77 84
78 sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize); 85 sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
79 if (sindex == 3) 86 if (sindex == 3)
80 this_door = pick_random_object (hdoors); 87 this_door = hdoors->pick_random_object ();
81 else 88 else
82 this_door = pick_random_object (vdoors); 89 this_door = vdoors->pick_random_object ();
90
91 if (!this_door)
92 abort ();
93
83 new_door = arch_to_object (this_door->arch); 94 new_door = arch_to_object (this_door->arch);
84 copy_object (this_door, new_door); 95 this_door->copy_to (new_door);
85 new_door->x = i; 96 new_door->x = i;
86 new_door->y = j; 97 new_door->y = j;
87 insert_ob_in_map (new_door, the_map, NULL, 0); 98 insert_ob_in_map (new_door, the_map, NULL, 0);
88 } 99 }
89 } 100 }
90} 101}
102

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines