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.2 by root, Tue Aug 29 08:01:36 2006 UTC vs.
Revision 1.3 by root, Sun Sep 10 16:06:37 2006 UTC

1
1/* 2/*
2 * static char *rcsid_door_c = 3 * static char *rcsid_door_c =
3 * "$Id: door.C,v 1.2 2006/08/29 08:01:36 root Exp $"; 4 * "$Id: door.C,v 1.3 2006/09/10 16:06:37 root Exp $";
4 */ 5 */
5 6
6/* 7/*
7 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
8 9
… …
29#include <global.h> 30#include <global.h>
30#include <random_map.h> 31#include <random_map.h>
31#include <rproto.h> 32#include <rproto.h>
32 33
33/* where are there adjacent doors or walls? */ 34/* where are there adjacent doors or walls? */
35int
34int surround_check2(char **layout,int i,int j,int Xsize, int Ysize){ 36surround_check2 (char **layout, int i, int j, int Xsize, int Ysize)
37{
35 /* 1 = door or wall to left, 38 /* 1 = door or wall to left,
36 2 = door or wall to right, 39 2 = door or wall to right,
37 4 = door or wall above 40 4 = door or wall above
38 8 = door or wall below */ 41 8 = door or wall below */
39 int surround_index = 0; 42 int surround_index = 0;
43
40 if((i > 0) && (layout[i-1][j]=='D'||layout[i-1][j]=='#')) surround_index +=1; 44 if ((i > 0) && (layout[i - 1][j] == 'D' || layout[i - 1][j] == '#'))
45 surround_index += 1;
41 if((i < Xsize-1) && (layout[i+1][j]=='D'||layout[i+1][j]=='#')) surround_index +=2; 46 if ((i < Xsize - 1) && (layout[i + 1][j] == 'D' || layout[i + 1][j] == '#'))
47 surround_index += 2;
42 if((j > 0) && (layout[i][j-1]=='D'||layout[i][j-1]=='#')) surround_index +=4; 48 if ((j > 0) && (layout[i][j - 1] == 'D' || layout[i][j - 1] == '#'))
49 surround_index += 4;
43 if((j < Ysize-1) && (layout[i][j+1]=='D'&&layout[i][j+1]=='#')) surround_index +=8; 50 if ((j < Ysize - 1) && (layout[i][j + 1] == 'D' && layout[i][j + 1] == '#'))
51 surround_index += 8;
44 return surround_index; 52 return surround_index;
45} 53}
46 54
55void
47void put_doors(mapstruct *the_map, char **maze, const char *doorstyle, RMParms *RP) { 56put_doors (mapstruct *the_map, char **maze, const char *doorstyle, RMParms * RP)
48 int i,j; 57{
58 int i, j;
49 mapstruct *vdoors; 59 mapstruct *vdoors;
50 mapstruct *hdoors; 60 mapstruct *hdoors;
51 char doorpath[128]; 61 char doorpath[128];
52 62
53 if(!strcmp(doorstyle,"none")) return; 63 if (!strcmp (doorstyle, "none"))
64 return;
54 vdoors=find_style("/styles/doorstyles", doorstyle, -1); 65 vdoors = find_style ("/styles/doorstyles", doorstyle, -1);
55 if(vdoors) 66 if (vdoors)
56 hdoors=vdoors; 67 hdoors = vdoors;
57 else{ 68 else
69 {
58 vdoors = find_style("/styles/doorstyles/vdoors", doorstyle, -1); 70 vdoors = find_style ("/styles/doorstyles/vdoors", doorstyle, -1);
59 if(!vdoors) return; 71 if (!vdoors)
72 return;
60 sprintf(doorpath,"/styles/doorstyles/hdoors%s", strrchr(vdoors->path, '/')); 73 sprintf (doorpath, "/styles/doorstyles/hdoors%s", strrchr (vdoors->path, '/'));
61 hdoors = find_style(doorpath, 0, -1); 74 hdoors = find_style (doorpath, 0, -1);
75 }
76 for (i = 0; i < RP->Xsize; i++)
77 for (j = 0; j < RP->Ysize; j++)
78 {
79 if (maze[i][j] == 'D')
80 {
81 int sindex;
82 object *this_door, *new_door;
83
84 sindex = surround_check2 (maze, i, j, RP->Xsize, RP->Ysize);
85 if (sindex == 3)
86 this_door = pick_random_object (hdoors);
87 else
88 this_door = pick_random_object (vdoors);
89 new_door = arch_to_object (this_door->arch);
90 copy_object (this_door, new_door);
91 new_door->x = i;
92 new_door->y = j;
93 insert_ob_in_map (new_door, the_map, NULL, 0);
62 } 94 }
63 for(i=0; i<RP->Xsize; i++) 95 }
64 for(j=0; j<RP->Ysize; j++) {
65 if(maze[i][j]=='D') {
66 int sindex;
67 object *this_door, *new_door;
68 sindex = surround_check2(maze, i, j, RP->Xsize, RP->Ysize);
69 if(sindex==3)
70 this_door=pick_random_object(hdoors);
71 else
72 this_door=pick_random_object(vdoors);
73 new_door = arch_to_object(this_door->arch);
74 copy_object(this_door, new_door);
75 new_door->x = i;
76 new_door->y = j;
77 insert_ob_in_map(new_door, the_map, NULL, 0);
78 }
79 }
80} 96}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines