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

Comparing deliantra/server/random_maps/expand2x.C (file contents):
Revision 1.4 by root, Thu Sep 14 22:34:02 2006 UTC vs.
Revision 1.9 by root, Sat Nov 7 18:32:45 2009 UTC

1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) Crossfire Development Team (restored, original file without copyright notice)
6 *
7 * Deliantra is free software: you can redistribute it and/or modify it under
8 * the terms of the Affero GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the Affero GNU General Public License
18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */
23
1/* 24/*
2 * Expands a layout by 2x in each dimension. 25 * Expands a layout by 2x in each dimension.
3 * H. S. Teoh 26 * H. S. Teoh
4 * -------------------------------------------------------------------------- 27 * --------------------------------------------------------------------------
5 * $Id: expand2x.C,v 1.4 2006/09/14 22:34:02 root Exp $ 28 * $Id: expand2x.C,v 1.9 2009/11/07 18:32:45 root Exp $
6 * 29 *
7 * ALGORITHM 30 * ALGORITHM
8 * 31 *
9 * ... (TBW) 32 * ... (TBW)
10 */ 33 */
11 34
12#include <stdlib.h> /* just in case */ 35#include "global.h"
13#include <expand2x.h> /* use compiler to do sanity check */ 36#include "random_map.h"
14 37#include "rproto.h"
15
16/* PROTOTYPES */
17
18static void expand_misc (char **newlayout, int i, int j, char **layout, int xsize, int ysize);
19static void expand_wall (char **newlayout, int i, int j, char **layout, int xsize, int ysize);
20static void expand_door (char **newlayout, int i, int j, char **layout, int xsize, int ysize);
21
22
23/* FUNCTIONS */
24
25char **
26expand2x (char **layout, int xsize, int ysize)
27{
28 int i, j;
29 int nxsize = xsize * 2 - 1;
30 int nysize = ysize * 2 - 1;
31
32 /* Allocate new layout */
33 char **newlayout = (char **) calloc (sizeof (char *), nxsize);
34
35 for (i = 0; i < nxsize; i++)
36 {
37 newlayout[i] = (char *) calloc (sizeof (char), nysize);
38 }
39
40 for (i = 0; i < xsize; i++)
41 {
42 for (j = 0; j < ysize; j++)
43 {
44 switch (layout[i][j])
45 {
46 case '#':
47 expand_wall (newlayout, i, j, layout, xsize, ysize);
48 break;
49 case 'D':
50 expand_door (newlayout, i, j, layout, xsize, ysize);
51 break;
52 default:
53 expand_misc (newlayout, i, j, layout, xsize, ysize);
54 }
55 }
56 }
57
58 /* Dump old layout */
59 for (i = 0; i < xsize; i++)
60 {
61 free (layout[i]);
62 }
63 free (layout);
64
65 return newlayout;
66}
67 38
68/* Copy the old tile X into the new one at location (i*2, j*2) and 39/* Copy the old tile X into the new one at location (i*2, j*2) and
69 * fill up the rest of the 2x2 result with \0: 40 * fill up the rest of the 2x2 result with \0:
70 * X ---> X \0 41 * X ---> X \0
71 * \0 \0 42 * \0 \0
72 */ 43 */
73static void 44static void
74expand_misc (char **newlayout, int i, int j, char **layout, int xsize, int ysize) 45expand_misc (Layout newlayout, int i, int j, Layout layout)
75{ 46{
76 newlayout[i * 2][j * 2] = layout[i][j]; 47 newlayout[i * 2][j * 2] = layout[i][j];
77 /* (Note: no need to reset rest of 2x2 area to \0 because calloc does that 48 /* (Note: no need to reset rest of 2x2 area to \0 because calloc does that
78 * for us.) */ 49 * for us.) */
79} 50}
… …
84 * 2 match on (i, j+1) 55 * 2 match on (i, j+1)
85 * 4 match on (i+1, j+1) 56 * 4 match on (i+1, j+1)
86 * and the possible combinations thereof. 57 * and the possible combinations thereof.
87 */ 58 */
88static int 59static int
89calc_pattern (char ch, char **layout, int i, int j, int xsize, int ysize) 60calc_pattern (char ch, Layout layout, int i, int j)
90{ 61{
91 int pattern = 0; 62 int pattern = 0;
92 63
93 if (i + 1 < xsize && layout[i + 1][j] == ch) 64 if (i + 1 < layout->w && layout[i + 1][j] == ch)
94 pattern |= 1; 65 pattern |= 1;
95 66
96 if (j + 1 < ysize) 67 if (j + 1 < layout->h)
97 { 68 {
98 if (layout[i][j + 1] == ch) 69 if (layout[i][j + 1] == ch)
99 pattern |= 2; 70 pattern |= 2;
71
100 if (i + 1 < xsize && layout[i + 1][j + 1] == ch) 72 if (i + 1 < layout->w && layout[i + 1][j + 1] == ch)
101 pattern |= 4; 73 pattern |= 4;
102 } 74 }
103 75
104 return pattern; 76 return pattern;
105} 77}
… …
107/* Expand a wall. This function will try to sensibly connect the resulting 79/* Expand a wall. This function will try to sensibly connect the resulting
108 * wall to adjacent wall squares, so that the result won't have disconnected 80 * wall to adjacent wall squares, so that the result won't have disconnected
109 * walls. 81 * walls.
110 */ 82 */
111static void 83static void
112expand_wall (char **newlayout, int i, int j, char **layout, int xsize, int ysize) 84expand_wall (Layout newlayout, int i, int j, Layout layout)
113{ 85{
114 int wall_pattern = calc_pattern ('#', layout, i, j, xsize, ysize); 86 int wall_pattern = calc_pattern ('#', layout, i, j);
115 int door_pattern = calc_pattern ('D', layout, i, j, xsize, ysize); 87 int door_pattern = calc_pattern ('D', layout, i, j);
116 int both_pattern = wall_pattern | door_pattern; 88 int both_pattern = wall_pattern | door_pattern;
117 89
118 newlayout[i * 2][j * 2] = '#'; 90 newlayout[i * 2][j * 2] = '#';
119 if (i + 1 < xsize) 91
92 if (i + 1 < layout->w)
120 { 93 {
121 if (both_pattern & 1) 94 if (both_pattern & 1)
122 { /* join walls/doors to the right */ 95 { /* join walls/doors to the right */
123
124/* newlayout[i*2+1][j*2] = '#'; */ 96/* newlayout[i*2+1][j*2] = '#'; */
125 newlayout[i * 2 + 1][j * 2] = layout[i + 1][j]; 97 newlayout[i * 2 + 1][j * 2] = layout[i + 1][j];
126 } 98 }
127 } 99 }
128 100
129 if (j + 1 < ysize) 101 if (j + 1 < layout->h)
130 { 102 {
131 if (both_pattern & 2) 103 if (both_pattern & 2)
132 { /* join walls/doors to the bottom */ 104 { /* join walls/doors to the bottom */
133
134/* newlayout[i*2][j*2+1] = '#'; */ 105/* newlayout[i*2][j*2+1] = '#'; */
135 newlayout[i * 2][j * 2 + 1] = layout[i][j + 1]; 106 newlayout[i * 2][j * 2 + 1] = layout[i][j + 1];
136 } 107 }
137 108
138 if (wall_pattern == 7) 109 if (wall_pattern == 7)
… …
146/* This function will try to sensibly connect doors so that they meet up with 117/* This function will try to sensibly connect doors so that they meet up with
147 * adjacent walls. Note that it will also presumptuously delete (ignore) doors 118 * adjacent walls. Note that it will also presumptuously delete (ignore) doors
148 * that it doesn't know how to correctly expand. 119 * that it doesn't know how to correctly expand.
149 */ 120 */
150static void 121static void
151expand_door (char **newlayout, int i, int j, char **layout, int xsize, int ysize) 122expand_door (Layout newlayout, int i, int j, Layout layout)
152{ 123{
153 int wall_pattern = calc_pattern ('#', layout, i, j, xsize, ysize); 124 int wall_pattern = calc_pattern ('#', layout, i, j);
154 int door_pattern = calc_pattern ('D', layout, i, j, xsize, ysize); 125 int door_pattern = calc_pattern ('D', layout, i, j);
155 int join_pattern; 126 int join_pattern;
156 127
157 /* Doors "like" to connect to walls more than other doors. If there is 128 /* Doors "like" to connect to walls more than other doors. If there is
158 * a wall and another door, this door will connect to the wall and 129 * a wall and another door, this door will connect to the wall and
159 * disconnect from the other door. */ 130 * disconnect from the other door. */
160 if (wall_pattern & 3) 131 if (wall_pattern & 3)
161 {
162 join_pattern = wall_pattern; 132 join_pattern = wall_pattern;
163 }
164 else 133 else
165 {
166 join_pattern = door_pattern; 134 join_pattern = door_pattern;
167 }
168 135
169 newlayout[i * 2][j * 2] = 'D'; 136 newlayout[i * 2][j * 2] = 'D';
170 if (i + 1 < xsize) 137
171 { 138 if (i + 1 < layout->w)
172 if (join_pattern & 1) 139 if (join_pattern & 1)
173 { /* there is a door/wall to the right */ 140 /* there is a door/wall to the right */
174 newlayout[i * 2 + 1][j * 2] = 'D'; 141 newlayout[i * 2 + 1][j * 2] = 'D';
142
143 if (j + 1 < layout->h)
144 if (join_pattern & 2)
145 /* there is a door/wall below */
146 newlayout[i * 2][j * 2 + 1] = 'D';
147}
148
149void
150expand2x (Layout layout)
151{
152 Layout newlayout (layout->w * 2 - 1, layout->h * 2 - 1);
153 newlayout->clear ();
154
155 for (int i = 0; i < layout->w; i++)
156 for (int j = 0; j < layout->h; j++)
157 switch (layout[i][j])
158 {
159 case '#': expand_wall (newlayout, i, j, layout); break;
160 case 'D': expand_door (newlayout, i, j, layout); break;
161 default: expand_misc (newlayout, i, j, layout); break;
175 } 162 }
176 }
177 163
178 if (j + 1 < ysize) 164 layout.swap (newlayout);
179 { 165 newlayout.free ();
180 if (join_pattern & 2)
181 { /* there is a door/wall below */
182 newlayout[i * 2][j * 2 + 1] = 'D';
183 }
184 }
185} 166}
167

Diff Legend

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