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

Comparing deliantra/server/random_maps/wall.C (file contents):
Revision 1.2 by root, Tue Aug 29 08:01:36 2006 UTC vs.
Revision 1.29 by root, Mon Oct 12 14:00:58 2009 UTC

1/* 1/*
2 * static char *rcsid_wall_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: wall.C,v 1.2 2006/08/29 08:01:36 root Exp $"; 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
4 */ 23 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen
11
12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version.
16
17 This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details.
21
22 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25
26 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/
28 24
29#include <global.h> 25#include <global.h>
30#include <random_map.h> 26#include <random_map.h>
31#include <rproto.h> 27#include <rproto.h>
32 28
33/* Put in the walls and autojoin them. */ 29/* Put in the walls and autojoin them. */
34 30
35
36/* given a layout and a coordinate, tell me which squares up/down/right/left 31/* given a layout and a coordinate, tell me which squares up/down/right/left
37 are occupied. */ 32 are occupied. */
38 33int
39int surround_flag(char **layout,int i,int j,RMParms *RP){ 34surround_flag (char **layout, int i, int j, random_map_params *RP)
35{
40 /* 1 = wall to left, 36 /* 1 = wall to left,
41 2 = wall to right, 37 2 = wall to right,
42 4 = wall above 38 4 = wall above
43 8 = wall below */ 39 8 = wall below */
40 int surround_index = 0;
41
42 if ((i > 0) && layout[i - 1][j] != 0)
44 int surround_index = 0; 43 surround_index |= 1;
45 if((i > 0) && layout[i-1][j]!=0) surround_index |=1;
46 if((i < RP->Xsize-1) && layout[i+1][j]!=0) surround_index |=2; 44 if ((i < RP->Xsize - 1) && layout[i + 1][j] != 0)
47 if((j > 0) && layout[i][j-1]!=0) surround_index |=4; 45 surround_index |= 2;
46 if ((j > 0) && layout[i][j - 1] != 0)
47 surround_index |= 4;
48 if((j < RP->Ysize-1) && layout[i][j+1]!=0) surround_index |=8; 48 if ((j < RP->Ysize - 1) && layout[i][j + 1] != 0)
49 surround_index |= 8;
49 return surround_index; 50 return surround_index;
50} 51}
51 52
52 53
53/* like surround_flag, but only walls count. 54/* like surround_flag, but only walls count.
54 */ 55 */
55 56
57int
56int surround_flag2(char **layout,int i,int j,RMParms *RP){ 58surround_flag2 (char **layout, int i, int j, random_map_params *RP)
59{
57 /* 1 = wall to left, 60 /* 1 = wall to left,
58 2 = wall to right, 61 2 = wall to right,
59 4 = wall above 62 4 = wall above
60 8 = wall below */ 63 8 = wall below */
64 int surround_index = 0;
65
66 if ((i > 0) && layout[i - 1][j] == '#')
61 int surround_index = 0; 67 surround_index |= 1;
62 if((i > 0) && layout[i-1][j]=='#') surround_index |=1;
63 if((i < RP->Xsize-1) && layout[i+1][j]=='#') surround_index |=2; 68 if ((i < RP->Xsize - 1) && layout[i + 1][j] == '#')
64 if((j > 0) && layout[i][j-1]=='#') surround_index |=4; 69 surround_index |= 2;
70 if ((j > 0) && layout[i][j - 1] == '#')
71 surround_index |= 4;
65 if((j < RP->Ysize-1) && layout[i][j+1]=='#') surround_index |=8; 72 if ((j < RP->Ysize - 1) && layout[i][j + 1] == '#')
73 surround_index |= 8;
66 return surround_index; 74 return surround_index;
67} 75}
68 76
69 77
70/* like surround_flag, except it checks a map, not a layout. 78/* like surround_flag, except it checks a map, not a layout.
71 * Since this is part of the random map code, presumption 79 * Since this is part of the random map code, presumption
72 * is that this is not a tiled map. 80 * is that this is not a tiled map.
73 * What is considered blocking and not is somewhat hard coded. 81 * What is considered blocking and not is somewhat hard coded.
74 */ 82 */
83int
75int surround_flag3(mapstruct *map,sint16 i,sint16 j,RMParms *RP){ 84surround_flag3 (maptile *map, sint16 i, sint16 j, random_map_params *RP)
85{
76 /* 86 /*
77 * 1 = blocked to left, 87 * 1 = blocked to left,
78 * 2 = blocked to right, 88 * 2 = blocked to right,
79 * 4 = blocked above 89 * 4 = blocked above
80 * 8 = blocked below 90 * 8 = blocked below
81 */ 91 */
82 92
83 int surround_index = 0; 93 int surround_index = 0;
84 94
95 // don't forget to update the mapspace!
96 if (i > 0) map->at (i - 1, j ).update ();
97 if (i < RP->Xsize - 1) map->at (i + 1, j ).update ();
98 if (j > 0) map->at (i , j - 1).update ();
99 if (j < RP->Ysize - 1) map->at (i , j + 1).update ();
100
85 if((i > 0) && (GET_MAP_MOVE_BLOCK(map, i-1,j) & ~MOVE_BLOCK_DEFAULT)) 101 if ((i > 0) && (GET_MAP_MOVE_BLOCK (map, i - 1, j) & MOVE_WALK))
86 surround_index |=1; 102 surround_index |= 1;
87 if((i < RP->Xsize-1) && (GET_MAP_MOVE_BLOCK(map, i+1,j) & ~MOVE_BLOCK_DEFAULT)) 103 if ((i < RP->Xsize - 1) && (GET_MAP_MOVE_BLOCK (map, i + 1, j) & MOVE_WALK))
88 surround_index |=2; 104 surround_index |= 2;
89 if((j > 0) && (GET_MAP_MOVE_BLOCK(map, i,j-1) & ~MOVE_BLOCK_DEFAULT)) 105 if ((j > 0) && (GET_MAP_MOVE_BLOCK (map, i, j - 1) & MOVE_WALK))
90 surround_index |=4; 106 surround_index |= 4;
91 if((j < RP->Ysize-1) && (GET_MAP_MOVE_BLOCK(map,i,j+1) & ~MOVE_BLOCK_DEFAULT)) 107 if ((j < RP->Ysize - 1) && (GET_MAP_MOVE_BLOCK (map, i, j + 1) & MOVE_WALK))
92 surround_index |=8; 108 surround_index |= 8;
93 109
94 return surround_index; 110 return surround_index;
95} 111}
96 112
97/* like surround_flag2, except it checks a map, not a layout. */ 113/* like surround_flag2, except it checks a map, not a layout. */
98 114
99int surround_flag4(mapstruct *map,int i,int j,RMParms *RP){ 115int
116surround_flag4 (maptile *map, int i, int j, random_map_params *RP)
117{
100 /* 1 = blocked to left, 118 /* 1 = blocked to left,
101 2 = blocked to right, 119 2 = blocked to right,
102 4 = blocked above 120 4 = blocked above
103 8 = blocked below */ 121 8 = blocked below */
122 int surround_index = 0;
123
124 if ((i > 0) && wall_blocked (map, i - 1, j))
104 int surround_index = 0; 125 surround_index |= 1;
105
106 if((i > 0) && wall_blocked(map,i-1,j)) surround_index |=1;
107 if((i < RP->Xsize-1) && wall_blocked(map,i+1,j)) surround_index |=2; 126 if ((i < RP->Xsize - 1) && wall_blocked (map, i + 1, j))
127 surround_index |= 2;
108 if((j > 0) && wall_blocked(map,i,j-1)) surround_index |=4; 128 if ((j > 0) && wall_blocked (map, i, j - 1))
129 surround_index |= 4;
109 if((j < RP->Ysize-1) && wall_blocked(map,i,j+1)) surround_index |=8; 130 if ((j < RP->Ysize - 1) && wall_blocked (map, i, j + 1))
131 surround_index |= 8;
110 132
111 return surround_index; 133 return surround_index;
112} 134}
113 135
114/* takes a map and a layout, and puts walls in the map (picked from 136/* takes a map and a layout, and puts walls in the map (picked from
115 w_style) at '#' marks. */ 137 w_style) at '#' marks. */
116 138
139void
117void make_map_walls(mapstruct *map,char **layout, char *w_style,RMParms *RP) { 140make_map_walls (maptile *map, char **layout, char *w_style, random_map_params *RP)
141{
118 char styledirname[256]; 142 char styledirname[1024];
119 char stylefilepath[256]; 143 char stylefilepath[1024];
120 mapstruct *style_map=0; 144 maptile *style_map = 0;
121 object *the_wall; 145 object *the_wall;
122 146
123 /* get the style map */ 147 /* get the style map */
124 if(!strcmp(w_style,"none")) return; 148 if (!strcmp (w_style, "none"))
149 return;
125 sprintf(styledirname,"%s","/styles/wallstyles"); 150 sprintf (styledirname, "%s", "/styles/wallstyles");
126 sprintf(stylefilepath,"%s/%s",styledirname,w_style); 151 sprintf (stylefilepath, "%s/%s", styledirname, w_style);
127 style_map = find_style(styledirname,w_style,-1); 152 style_map = find_style (styledirname, w_style, -1);
128 if(style_map == 0) return; 153 if (!style_map)
154 return;
129 155
130 /* fill up the map with the given floor style */ 156 /* fill up the map with the given floor style */
131 if((the_wall=pick_random_object(style_map))!=NULL) { 157 if ((the_wall = style_map->pick_random_object (rmg_rndm)))
158 {
132 int i,j; 159 int i, j;
133 char *cp; 160 char *cp;
134 int joinedwalls=0; 161 int joinedwalls = 0;
135 object *thiswall; 162 object *thiswall;
136 163
137 sprintf(RP->wall_name,"%s",the_wall->arch->name); 164 sprintf (RP->wall_name, "%s", &the_wall->arch->archname);
138 if ((cp=strchr(RP->wall_name,'_'))!=NULL) { 165 if ((cp = strchr (RP->wall_name, '_')) != NULL)
166 {
139 *cp=0; 167 *cp = 0;
140 joinedwalls=1; 168 joinedwalls = 1;
141 } 169 }
142 170
143 for(i=0;i<RP->Xsize;i++) 171 for (i = 0; i < RP->Xsize; i++)
144 for(j=0;j<RP->Ysize;j++) { 172 for (j = 0; j < RP->Ysize; j++)
173 {
145 if(layout[i][j]=='#') { 174 if (layout[i][j] == '#')
175 {
146 if(joinedwalls) 176 if (joinedwalls)
147 thiswall=pick_joined_wall(the_wall,layout,i,j,RP); 177 thiswall = pick_joined_wall (the_wall, layout, i, j, RP);
148 else 178 else
149 thiswall=arch_to_object(the_wall->arch); 179 thiswall = arch_to_object (the_wall->arch);
150 thiswall->x = i; 180 thiswall->x = i;
151 thiswall->y = j; 181 thiswall->y = j;
152 thiswall->move_block = MOVE_ALL; 182 thiswall->move_block = MOVE_ALL;
153 insert_ob_in_map(thiswall,map,thiswall,INS_NO_MERGE | INS_NO_WALK_ON); 183 insert_ob_in_map (thiswall, map, thiswall, INS_NO_MERGE | INS_NO_WALK_ON);
154 } 184 }
155 } 185 }
156 } 186 }
157} 187}
158 188
159 189
160/* picks the right wall type for this square, to make it look nice, 190/* picks the right wall type for this square, to make it look nice,
161 and have everything nicely joined. It uses the layout. */ 191 and have everything nicely joined. It uses the layout. */
162 192
193object *
163object *pick_joined_wall(object *the_wall,char **layout,int i,int j,RMParms *RP) { 194pick_joined_wall (object *the_wall, char **layout, int i, int j, random_map_params *RP)
195{
164 /* 1 = wall to left, 196 /* 1 = wall to left,
165 2 = wall to right, 197 2 = wall to right,
166 4 = wall above 198 4 = wall above
167 8 = wall below */ 199 8 = wall below */
168 int surround_index=0; 200 int surround_index = 0;
169 int l; 201 int l;
170 char wall_name[64]; 202 char wall_name[1024];
171 archetype *wall_arch=0; 203 archetype *wall_arch = 0;
172 204
173 strcpy(wall_name,the_wall->arch->name); 205 assign (wall_name, the_wall->arch->archname);
174 206
175 /* conventionally, walls are named like this: 207 /* conventionally, walls are named like this:
176 wallname_wallcode, where wallcode indicates 208 wallname_wallcode, where wallcode indicates
177 a joinedness, and wallname is the wall. 209 a joinedness, and wallname is the wall.
178 this code depends on the convention for 210 this code depends on the convention for
179 finding the right wall. */ 211 finding the right wall. */
180 212
181 /* extract the wall name, which is the text up to the leading _ */ 213 /* extract the wall name, which is the text up to the leading _ */
182 for(l=0;l<64;l++) { 214 for (l = 0; l < 64; l++)
215 {
183 if(wall_name[l]=='_') { 216 if (wall_name[l] == '_')
217 {
184 wall_name[l] = 0; 218 wall_name[l] = 0;
185 break;
186 }
187 }
188
189 surround_index = surround_flag2(layout,i,j,RP);
190
191 switch(surround_index) {
192 case 0:
193 strcat(wall_name,"_0");
194 break; 219 break;
195 case 1: 220 }
221 }
222
223 surround_index = surround_flag2 (layout, i, j, RP);
224
225 switch (surround_index)
226 {
227 case 0:
196 strcat(wall_name,"_1_3"); 228 strcat (wall_name, "_0");
197 break; 229 break;
198 case 2: 230 case 1:
199 strcat(wall_name,"_1_4"); 231 strcat (wall_name, "_1_3");
200 break; 232 break;
201 case 3: 233 case 2:
202 strcat(wall_name,"_2_1_2"); 234 strcat (wall_name, "_1_4");
203 break; 235 break;
204 case 4: 236 case 3:
205 strcat(wall_name,"_1_2"); 237 strcat (wall_name, "_2_1_2");
206 break; 238 break;
207 case 5: 239 case 4:
208 strcat(wall_name,"_2_2_4"); 240 strcat (wall_name, "_1_2");
209 break; 241 break;
210 case 6: 242 case 5:
211 strcat(wall_name,"_2_2_1"); 243 strcat (wall_name, "_2_2_4");
212 break; 244 break;
213 case 7: 245 case 6:
214 strcat(wall_name,"_3_1"); 246 strcat (wall_name, "_2_2_1");
215 break; 247 break;
216 case 8: 248 case 7:
217 strcat(wall_name,"_1_1"); 249 strcat (wall_name, "_3_1");
218 break; 250 break;
219 case 9: 251 case 8:
220 strcat(wall_name,"_2_2_3"); 252 strcat (wall_name, "_1_1");
221 break; 253 break;
222 case 10: 254 case 9:
223 strcat(wall_name,"_2_2_2"); 255 strcat (wall_name, "_2_2_3");
224 break; 256 break;
225 case 11: 257 case 10:
226 strcat(wall_name,"_3_3"); 258 strcat (wall_name, "_2_2_2");
227 break; 259 break;
228 case 12: 260 case 11:
229 strcat(wall_name,"_2_1_1"); 261 strcat (wall_name, "_3_3");
230 break; 262 break;
231 case 13: 263 case 12:
232 strcat(wall_name,"_3_4"); 264 strcat (wall_name, "_2_1_1");
233 break; 265 break;
234 case 14: 266 case 13:
235 strcat(wall_name,"_3_2"); 267 strcat (wall_name, "_3_4");
236 break; 268 break;
237 case 15: 269 case 14:
238 strcat(wall_name,"_4"); 270 strcat (wall_name, "_3_2");
239 break; 271 break;
272 case 15:
273 strcat (wall_name, "_4");
274 break;
240 } 275 }
241 wall_arch = find_archetype(wall_name); 276 wall_arch = archetype::find (wall_name);
242 if(wall_arch) return arch_to_object(wall_arch);
243 else {
244 nroferrors--;
245 return arch_to_object(the_wall->arch);
246 }
247 277
248 278 return wall_arch ? arch_to_object (wall_arch) : arch_to_object (the_wall->arch);
249} 279}
250 280
251 281
252/* this takes a map, and changes an existing wall to match what's blocked 282/* this takes a map, and changes an existing wall to match what's blocked
253 * around it, counting only doors and walls as blocked. If insert_flag is 283 * around it, counting only doors and walls as blocked. If insert_flag is
254 * 1, it will go ahead and insert the wall into the map. If not, it 284 * 1, it will go ahead and insert the wall into the map. If not, it
255 * will only return the wall which would belong there, and doesn't 285 * will only return the wall which would belong there, and doesn't
256 * remove anything. It depends on the 286 * remove anything. It depends on the
257 * global, previously-set variable, "wall_name" 287 * global, previously-set variable, "wall_name"
258 */ 288 */
259 289
290object *
260object * retrofit_joined_wall(mapstruct *the_map,int i,int j,int insert_flag,RMParms *RP) { 291retrofit_joined_wall (maptile *the_map, int i, int j, int insert_flag, random_map_params *RP)
292{
261 /* 1 = wall to left, 293 /* 1 = wall to left,
262 * 2 = wall to right, 294 * 2 = wall to right,
263 * 4 = wall above 295 * 4 = wall above
264 * 8 = wall below 296 * 8 = wall below
265 */ 297 */
266 int surround_index=0; 298 int surround_index = 0;
267 int l; 299 int l;
268 object *the_wall=0; 300 object *the_wall = 0;
269 object *new_wall=0; 301 object *new_wall = 0;
270 archetype * wall_arch=0; 302 archetype *wall_arch = 0;
271 303
272 /* first find the wall */ 304 /* first find the wall */
273 for(the_wall = get_map_ob(the_map,i,j);the_wall!=NULL;the_wall=the_wall->above) 305 for (the_wall = GET_MAP_OB (the_map, i, j); the_wall != NULL; the_wall = the_wall->above)
274 if ((the_wall->move_type & MOVE_WALK) && the_wall->type!=EXIT && the_wall->type!=TELEPORTER) 306 if ((the_wall->move_type & MOVE_WALK) && the_wall->type != EXIT && the_wall->type != TELEPORTER)
275 break; 307 break;
276 308
277 309
278 /* if what we found is a door, don't remove it, set the_wall to NULL to 310 /* if what we found is a door, don't remove it, set the_wall to NULL to
279 * signal that later. 311 * signal that later.
280 */ 312 */
281 if(the_wall && (the_wall->type==DOOR || the_wall->type==LOCKED_DOOR) ) { 313 if (the_wall && (the_wall->type == DOOR || the_wall->type == LOCKED_DOOR))
314 {
282 the_wall=NULL; 315 the_wall = NULL;
283 /* if we're not supposed to insert a new wall where there wasn't one, 316 /* if we're not supposed to insert a new wall where there wasn't one,
284 * we've gotta leave. 317 * we've gotta leave.
285 */ 318 */
286 if(insert_flag==0) return 0; 319 if (insert_flag == 0)
320 return 0;
287 } 321 }
288 else if(the_wall==NULL) return NULL; 322 else if (the_wall == NULL)
323 return NULL;
289 324
290 /* canonicalize the wall name */ 325 /* canonicalize the wall name */
291 for(l=0;l<64;l++) { 326 for (l = 0; l < 64; l++)
327 {
292 if(RP->wall_name[l]=='_') { 328 if (RP->wall_name[l] == '_')
329 {
293 RP->wall_name[l] = 0; 330 RP->wall_name[l] = 0;
294 break; 331 break;
295 } 332 }
296 } 333 }
297 334
298 surround_index = surround_flag4(the_map,i,j,RP); 335 surround_index = surround_flag4 (the_map, i, j, RP);
299 /* This would be a lot cleaner to just us a lookup table, 336 /* This would be a lot cleaner to just us a lookup table,
300 * eg, wall_suffix[surround_index] 337 * eg, wall_suffix[surround_index]
301 */ 338 */
302 switch(surround_index) { 339 switch (surround_index)
340 {
303 case 0: 341 case 0:
304 strcat(RP->wall_name,"_0"); 342 strcat (RP->wall_name, "_0");
305 break; 343 break;
306 case 1: 344 case 1:
307 strcat(RP->wall_name,"_1_3"); 345 strcat (RP->wall_name, "_1_3");
308 break; 346 break;
309 case 2: 347 case 2:
310 strcat(RP->wall_name,"_1_4"); 348 strcat (RP->wall_name, "_1_4");
311 break; 349 break;
312 case 3: 350 case 3:
313 strcat(RP->wall_name,"_2_1_2"); 351 strcat (RP->wall_name, "_2_1_2");
314 break; 352 break;
315 case 4: 353 case 4:
316 strcat(RP->wall_name,"_1_2"); 354 strcat (RP->wall_name, "_1_2");
317 break; 355 break;
318 case 5: 356 case 5:
319 strcat(RP->wall_name,"_2_2_4"); 357 strcat (RP->wall_name, "_2_2_4");
320 break; 358 break;
321 case 6: 359 case 6:
322 strcat(RP->wall_name,"_2_2_1"); 360 strcat (RP->wall_name, "_2_2_1");
323 break; 361 break;
324 case 7: 362 case 7:
325 strcat(RP->wall_name,"_3_1"); 363 strcat (RP->wall_name, "_3_1");
326 break; 364 break;
327 case 8: 365 case 8:
328 strcat(RP->wall_name,"_1_1"); 366 strcat (RP->wall_name, "_1_1");
329 break; 367 break;
330 case 9: 368 case 9:
331 strcat(RP->wall_name,"_2_2_3"); 369 strcat (RP->wall_name, "_2_2_3");
332 break; 370 break;
333 case 10: 371 case 10:
334 strcat(RP->wall_name,"_2_2_2"); 372 strcat (RP->wall_name, "_2_2_2");
335 break; 373 break;
336 case 11: 374 case 11:
337 strcat(RP->wall_name,"_3_3"); 375 strcat (RP->wall_name, "_3_3");
338 break; 376 break;
339 case 12: 377 case 12:
340 strcat(RP->wall_name,"_2_1_1"); 378 strcat (RP->wall_name, "_2_1_1");
341 break; 379 break;
342 case 13: 380 case 13:
343 strcat(RP->wall_name,"_3_4"); 381 strcat (RP->wall_name, "_3_4");
344 break; 382 break;
345 case 14: 383 case 14:
346 strcat(RP->wall_name,"_3_2"); 384 strcat (RP->wall_name, "_3_2");
347 break; 385 break;
348 case 15: 386 case 15:
349 strcat(RP->wall_name,"_4"); 387 strcat (RP->wall_name, "_4");
350 break; 388 break;
351 } 389 }
390
352 wall_arch = find_archetype(RP->wall_name); 391 wall_arch = archetype::find (RP->wall_name);
353 if(wall_arch!=NULL) { 392
393 if (!wall_arch)
394 {
354 new_wall=arch_to_object(wall_arch); 395 new_wall = arch_to_object (wall_arch);
355 new_wall->x = i; 396 new_wall->x = i;
356 new_wall->y = j; 397 new_wall->y = j;
398
357 if(the_wall && the_wall->map) { 399 if (the_wall && the_wall->map)
358 remove_ob(the_wall); 400 the_wall->destroy ();
359 free_object(the_wall); 401
360 }
361 the_wall->move_block = MOVE_ALL; 402 the_wall->move_block = MOVE_ALL;
362 insert_ob_in_map(new_wall,the_map,new_wall,INS_NO_MERGE | INS_NO_WALK_ON); 403 insert_ob_in_map (new_wall, the_map, new_wall, INS_NO_MERGE | INS_NO_WALK_ON);
363 } 404 }
364 else 405
365 nroferrors--; /* it's OK not to find an arch. */
366 return new_wall; 406 return new_wall;
367} 407}
368
369

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines