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

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.9 by elmex, Mon Dec 4 15:15:34 2006 UTC vs.
Revision 1.60 by root, Wed Apr 14 21:36:32 2010 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 (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * 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 Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <living.h> 26#include <living.h>
26#include <spells.h> 27#include <spells.h>
27#include <skills.h> 28#include <skills.h>
28#include <tod.h> 29#include <tod.h>
29#include <sproto.h> 30#include <sproto.h>
30 31
32// macro for this check, it had been inconsistent in this file.
33#define IS_FLOOR(x) x->flag [FLAG_IS_FLOOR]
34
31/** 35/**
32 * Check if objects on a square interfere with building 36 * Check if objects on a square interfere with building
33 */ 37 */
34int 38static int
35can_build_over (maptile *map, object *tmp, short x, short y) 39can_build_over (maptile *map, object *tmp, int x, int y)
36{ 40{
37 object *ob; 41 object *ob;
38 42
39 ob = GET_MAP_OB (map, x, y); 43 ob = GET_MAP_OB (map, x, y);
40 while (ob) 44 while (ob)
41 { 45 {
42 /* if ob is not a marking rune or floor, then check special cases */ 46 /* if ob is not a marking rune or floor, then check special cases */
43 if (strcmp (ob->arch->name, "rune_mark") && ob->type != FLOOR) 47 if (ob->arch->archname != shstr_rune_mark && !IS_FLOOR (ob))
44 { 48 {
45 switch (tmp->type) 49 switch (tmp->type)
46 { 50 {
47 case SIGN: 51 case SIGN:
48 case MAGIC_EAR: 52 case MAGIC_EAR:
49 /* Allow signs and magic ears to be built on books */ 53 /* Allow signs and magic ears to be built on books */
50 if (ob->type != BOOK) 54 if (ob->type != BOOK)
51 {
52 return 0;
53 }
54 break;
55 case BUTTON:
56 case DETECTOR:
57 case PEDESTAL:
58 case CF_HANDLE:
59 /* Allow buttons and levers to be built under gates */
60 if (ob->type != GATE && ob->type != DOOR)
61 {
62 return 0;
63 }
64 break;
65 default:
66 return 0; 55 return 0;
56 break;
57 case BUTTON:
58 case DETECTOR:
59 case PEDESTAL:
60 case T_HANDLE:
61 /* Allow buttons and levers to be built under gates */
62 if (ob->type != GATE && ob->type != DOOR)
63 return 0;
64 break;
65 default:
66 return 0;
67 } 67 }
68 } 68 }
69
69 ob = ob->above; 70 ob = ob->above;
70 } 71 }
72
71 return 1; 73 return 1;
72} 74}
73 75
74/** 76/**
75 * Erases marking runes at specified location 77 * Erases marking runes at specified location
76 */ 78 */
77void 79static void
78remove_marking_runes (maptile *map, short x, short y) 80remove_marking_runes (maptile *map, int x, int y)
79{ 81{
80 object *rune; 82 object *rune;
81 object *next; 83 object *next;
82 84
83 rune = GET_MAP_OB (map, x, y); 85 rune = GET_MAP_OB (map, x, y);
84 while (rune) 86 while (rune)
85 { 87 {
86 next = rune->above; 88 next = rune->above;
89
87 if ((rune->type == SIGN) && (!strcmp (rune->arch->name, "rune_mark"))) 90 if (rune->type == SIGN && rune->arch->archname == shstr_rune_mark)
88 { 91 rune->destroy ();
89 remove_ob (rune); 92
90 free_object (rune);
91 }
92 rune = next; 93 rune = next;
93 } 94 }
94} 95}
95 96
96/** 97/**
98 * \param map: map for which to find a value 99 * \param map: map for which to find a value
99 * \return 'connected' value with no item, or -1 if failure. 100 * \return 'connected' value with no item, or -1 if failure.
100 * 101 *
101 * Tries 1000 random values, then returns -1. 102 * Tries 1000 random values, then returns -1.
102 */ 103 */
103int 104static shstr_tmp
104find_unused_connected_value (maptile *map) 105find_unused_connected_value (maptile *map)
105{ 106{
106 int connected = 0; 107 for (int i = 1000; --i; )
107 int itest = 0;
108 oblinkpt *obp;
109
110 while (itest++ < 1000)
111 {
112 connected = 1 + rand () % 20000;
113 for (obp = map->buttons; obp && (obp->value != connected); obp = obp->next);
114
115 if (!obp)
116 return connected;
117 } 108 {
109 char buf[64];
118 110
111 snprintf (buf, sizeof (buf), "built-%x", rndm (0xf0000000U) + 0x10000000U);
112
113 shstr id (buf);
114
115 if (!map->find_link (id))
116 return id;
117 }
118
119 return shstr_tmp ();
120}
121
122/**
123 * Returns the marking rune on the square, for purposes of building connections
124 */
125static object *
126get_connection_rune (object *pl, int x, int y)
127{
128 object *rune = GET_MAP_OB (pl->map, x, y);
129
130 while (rune && (rune->type != SIGN || rune->arch->archname != shstr_rune_mark))
131 rune = rune->above;
132
119 return -1; 133 return rune;
120} 134}
121
122 135
123/** 136/**
124 * Helper function for door/button/connected item building. 137 * Helper function for door/button/connected item building.
125 * 138 *
126 * Will search the specified spot for a marking rune. 139 * Will search the specified spot for a marking rune.
128 * Else, searches a force in op's inventory matching the map's name 141 * Else, searches a force in op's inventory matching the map's name
129 * and the rune's text. 142 * and the rune's text.
130 * If found, returns the connection value associated 143 * If found, returns the connection value associated
131 * else searches a new connection value, and adds the force to the player. 144 * else searches a new connection value, and adds the force to the player.
132 */ 145 */
133int 146static shstr_tmp
134find_or_create_connection_for_map (object *pl, short x, short y, object *rune) 147find_or_create_connection_for_map (object *pl, int x, int y, object *rune)
135{ 148{
136 object *force; 149 object *force;
137 int connected;
138 150
139 if (!rune) 151 if (!rune)
140 rune = get_connection_rune (pl, x, y); 152 rune = get_connection_rune (pl, x, y);
141 153
142 if (!rune) 154 if (!rune)
143 { 155 {
144 new_draw_info (NDI_UNIQUE, 0, pl, "You need to put a marking rune with the group name."); 156 new_draw_info (NDI_UNIQUE, 0, pl, "You need to put a marking rune with the group name.");
145 return -1; 157 return shstr_tmp ();
146 } 158 }
147 159
148 /* Now, find force in player's inventory */ 160 /* Now, find force in player's inventory */
149 force = pl->inv; 161 force = pl->inv;
150 while (force 162 while (force
151 && ((force->type != FORCE) || (!force->slaying) || (strcmp (force->slaying, pl->map->path)) || (!force->msg) 163 && ((force->type != FORCE) || !force->slaying || force->slaying != pl->map->path || !force->msg
152 || (strcmp (force->msg, rune->msg)))) 164 || force->msg != rune->msg))
153 force = force->below; 165 force = force->below;
154 166
155 if (!force) 167 if (!force)
156 /* No force, need to create & insert one */ 168 /* No force, need to create & insert one */
157 { 169 {
158 /* Find unused value */ 170 /* Find unused value */
159 connected = find_unused_connected_value (pl->map); 171 shstr_tmp id = find_unused_connected_value (pl->map);
160 if (connected == -1) 172
173 if (!id)
161 { 174 {
162 new_draw_info (NDI_UNIQUE, 0, pl, "Could not create more groups."); 175 new_draw_info (NDI_UNIQUE, 0, pl, "Could not create more groups.");
163 return -1; 176 return shstr_tmp ();
164 } 177 }
165 178
166 force = get_archetype (FORCE_NAME); 179 force = get_archetype (FORCE_NAME);
167 force->speed = 0;
168 update_ob_speed (force);
169 force->slaying = pl->map->path; 180 force->slaying = pl->map->path;
170 force->msg = rune->msg; 181 force->msg = rune->msg;
171 force->path_attuned = connected; 182 force->race = id;
183 force->set_speed (0);
184
172 insert_ob_in_ob (force, pl); 185 insert_ob_in_ob (force, pl);
173 186
174 return connected; 187 return id;
175 } 188 }
176 189
177 /* Found the force, everything's easy. */ 190 /* Found the force, everything's easy. */
178 return force->path_attuned; 191 return force->race;
179}
180
181/**
182 * Returns the marking rune on the square, for purposes of building connections
183 */
184object *
185get_connection_rune (object *pl, short x, short y)
186{
187 object *rune;
188
189 rune = GET_MAP_OB (pl->map, x, y);
190 while (rune && ((rune->type != SIGN) || (strcmp (rune->arch->name, "rune_mark"))))
191 rune = rune->above;
192 return rune;
193} 192}
194 193
195/** 194/**
196 * Returns the book/scroll on the current square, for purposes of building 195 * Returns the book/scroll on the current square, for purposes of building
197 */ 196 */
198object * 197static object *
199get_msg_book (object *pl, short x, short y) 198get_msg_book (object *pl, int x, int y)
200{ 199{
201 object *book;
202
203 book = GET_MAP_OB (pl->map, x, y); 200 object *book = GET_MAP_OB (pl->map, x, y);
201
204 while (book && (book->type != BOOK)) 202 while (book && (book->type != BOOK))
205 book = book->above; 203 book = book->above;
204
206 return book; 205 return book;
207} 206}
208 207
209/** 208/**
209 * Make the built object inherit the msg of books that are used with it.
210 * For objects already invisible (i.e. magic mouths & ears), also make it
211 * it inherit the face and the name with "talking " prepended.
212 */
213static int
214adjust_sign_msg (object *pl, int x, int y, object *tmp)
215{
216 object *book;
217 char buf[MAX_BUF];
218 char buf2[MAX_BUF];
219
220 book = get_msg_book (pl, x, y);
221 if (!book)
222 {
223 new_draw_info (NDI_UNIQUE, 0, pl, "You need to put a book or scroll with the message.");
224 return -1;
225 }
226
227 tmp->msg = book->msg;
228
229 if (tmp->invisible)
230 {
231 if (book->custom_name)
232 snprintf (buf, sizeof (buf), "talking %s", &book->custom_name);
233 else
234 snprintf (buf, sizeof (buf), "talking %s", &book->name);
235
236 tmp->name = buf;
237
238 if (book->name_pl)
239 {
240 snprintf (buf2, sizeof (buf2), "talking %s", &book->name_pl);
241 tmp->name_pl = buf2;
242 }
243
244 tmp->face = book->face;
245 tmp->invisible = 0;
246 }
247
248 book->destroy ();
249 return 0;
250}
251
252/**
210 * Returns first item of type WALL. 253 * Returns first item of type BUILDABLE_WALL.
211 */ 254 */
212object * 255static object *
213get_wall (maptile *map, int x, int y) 256get_wall (maptile *map, int x, int y)
214{ 257{
215 object *wall;
216
217 wall = GET_MAP_OB (map, x, y); 258 object *wall = GET_MAP_OB (map, x, y);
259
218 while (wall && (WALL != wall->type)) 260 while (wall && (BUILDABLE_WALL != wall->type))
219 {
220 wall = wall->above; 261 wall = wall->above;
221 }
222 262
223 return wall; 263 return wall;
224} 264}
225 265
226/** 266/**
232 * 272 *
233 * Basically it ensures the correct wall is put where needed. 273 * Basically it ensures the correct wall is put where needed.
234 * 274 *
235 * Note: x & y must be valid map coordinates. 275 * Note: x & y must be valid map coordinates.
236 */ 276 */
237void 277static void
238fix_walls (maptile *map, int x, int y) 278fix_walls (maptile *map, int x, int y)
239{ 279{
240 int connect;
241 object *wall;
242 char archetype[MAX_BUF]; 280 char archetype[MAX_BUF];
243 char *underscore; 281 char *underscore;
244 uint32 old_flags[4];
245 struct archetype *new_arch; 282 struct archetype *new_arch;
246 int flag;
247
248 283
249 /* First, find the wall on that spot */ 284 /* First, find the wall on that spot */
250 wall = get_wall (map, x, y); 285 object *wall = get_wall (map, x, y);
251 if (!wall) 286 if (!wall)
252 /* Nothing -> bail out */ 287 /* Nothing -> bail out */
253 return; 288 return;
254 289
255 /* Find base name */ 290 /* Find base name */
256 strcpy (archetype, wall->arch->name); 291 assign (archetype, wall->arch->archname);
257 underscore = strchr (archetype, '_'); 292 underscore = strchr (archetype, '_');
258 293
294 /* search for the first _ before a number */
295 while (underscore && !isdigit (*(underscore + 1)))
296 underscore = strchr (underscore + 1, '_');
297
259 if (!underscore || (!isdigit (*(underscore + 1)))) 298 if (!underscore || !isdigit (*(underscore + 1)))
260 /* Not in a format we can change, bail out */ 299 /* Not in a format we can change, bail out */
261 return; 300 return;
262 301
263 underscore++; 302 underscore++;
264 *underscore = '\0'; 303 *underscore = '\0';
265 304
266 connect = 0; 305 int connect = 0;
267 306
268 if ((x > 0) && get_wall (map, x - 1, y)) 307 if (x > 0 && get_wall (map, x - 1, y)) connect |= 1;
269 connect |= 1; 308 if (x < map->width - 1 && get_wall (map, x + 1, y)) connect |= 2;
270 if ((x < MAP_WIDTH (map) - 1) && get_wall (map, x + 1, y)) 309 if (y > 0 && get_wall (map, x, y - 1)) connect |= 4;
271 connect |= 2; 310 if (y < map->height - 1 && get_wall (map, x, y + 1)) connect |= 8;
272 311
273 if ((y > 0) && get_wall (map, x, y - 1)) 312 // one bit per dir, 1 left, 2 right, 4 up, 8 down
274 connect |= 4; 313 static const char *walltype[16] = {
314 "0",
315 "1_3",
316 "1_4",
317 "2_1_2",
318 "1_2",
319 "2_2_4",
320 "2_2_1",
321 "3_1",
322 "1_1",
323 "2_2_3",
324 "2_2_2",
325 "3_3",
326 "2_1_1",
327 "3_4",
328 "3_2",
329 "4"
330 };
275 331
276 if ((y < MAP_HEIGHT (map) - 1) && get_wall (map, x, y + 1)) 332 strcat (archetype, walltype [connect]);
277 connect |= 8;
278
279 switch (connect)
280 {
281 case 0:
282 strcat (archetype, "0");
283
284 break;
285 case 1:
286 strcat (archetype, "1_3");
287
288 break;
289 case 2:
290 strcat (archetype, "1_4");
291
292 break;
293 case 3:
294 strcat (archetype, "2_1_2");
295
296 break;
297 case 4:
298 strcat (archetype, "1_2");
299
300 break;
301 case 5:
302 strcat (archetype, "2_2_4");
303
304 break;
305 case 6:
306 strcat (archetype, "2_2_1");
307
308 break;
309 case 7:
310 strcat (archetype, "3_1");
311
312 break;
313 case 8:
314 strcat (archetype, "1_1");
315
316 break;
317 case 9:
318 strcat (archetype, "2_2_3");
319
320 break;
321 case 10:
322 strcat (archetype, "2_2_2");
323
324 break;
325 case 11:
326 strcat (archetype, "3_3");
327
328 break;
329 case 12:
330 strcat (archetype, "2_1_1");
331
332 break;
333 case 13:
334 strcat (archetype, "3_4");
335
336 break;
337 case 14:
338 strcat (archetype, "3_2");
339
340 break;
341 case 15:
342 strcat (archetype, "4");
343
344 break;
345 }
346 333
347 /* 334 /*
348 * Before anything, make sure the archetype does exist... 335 * Before anything, make sure the archetype does exist...
349 * If not, prolly an error... 336 * If not, prolly an error...
350 */ 337 */
354 return; 341 return;
355 342
356 /* Now delete current wall, and insert new one 343 /* Now delete current wall, and insert new one
357 * We save flags to avoid any trouble with buildable/non buildable, and so on 344 * We save flags to avoid any trouble with buildable/non buildable, and so on
358 */ 345 */
359 for (flag = 0; flag < 4; flag++) 346 object::flags_t old_flags = wall->flag; // elmex: this is where C++ pays off
360 old_flags[flag] = wall->flags[flag];
361 remove_ob (wall);
362 free_object (wall);
363 347
364 wall = arch_to_object (new_arch); 348 wall->destroy ();
349
350 wall = new_arch->instance ();
365 wall->type = WALL; 351 wall->type = BUILDABLE_WALL;
366 insert_ob_in_map_at (wall, map, NULL, INS_ABOVE_FLOOR_ONLY, x, y); 352 insert_ob_in_map_at (wall, map, NULL, INS_ABOVE_FLOOR_ONLY, x, y);
367 for (flag = 0; flag < 4; flag++)
368 wall->flags[flag] = old_flags[flag]; 353 wall->flag = old_flags;
369} 354}
370 355
371/** 356/**
372 * \brief Floor building function 357 * \brief Floor building function
373 * 358 *
376 * - on an existing wall, with or without a floor under it 361 * - on an existing wall, with or without a floor under it
377 * 362 *
378 * Note: this function will inconditionally change squares around (x, y) 363 * Note: this function will inconditionally change squares around (x, y)
379 * so don't call it with x == 0 for instance! 364 * so don't call it with x == 0 for instance!
380 */ 365 */
381void 366static void
382apply_builder_floor (object *pl, object *material, short x, short y) 367apply_builder_floor (object *pl, object *material, int x, int y)
383{ 368{
384 object *tmp, *above; 369 object *tmp, *above;
385 object *above_floor; /* Item above floor, if any */ 370 object *above_floor; /* Item above floor, if any */
386 struct archetype *new_floor; 371 struct archetype *new_floor;
387 struct archetype *new_wall; 372 struct archetype *new_wall;
401 if (tmp) 386 if (tmp)
402 { 387 {
403 while (tmp) 388 while (tmp)
404 { 389 {
405 above = tmp->above; 390 above = tmp->above;
406 if (WALL == tmp->type) 391 if (BUILDABLE_WALL == tmp->type)
407 { 392 {
408 /* There was a wall, remove it & keep its archetype to make new walls */ 393 /* There was a wall, remove it & keep its archetype to make new walls */
409 new_wall = tmp->arch; 394 new_wall = tmp->arch;
410 remove_ob (tmp); 395 tmp->destroy ();
411 free_object (tmp);
412 sprintf (message, "You destroy the wall and redo the floor."); 396 sprintf (message, "You destroy the wall and redo the floor.");
413 } 397 }
414 else if ((FLOOR == tmp->type) || (QUERY_FLAG (tmp, FLAG_IS_FLOOR))) 398 else if (IS_FLOOR (tmp))
415 { 399 {
416 remove_ob (tmp); 400 tmp->destroy ();
417 free_object (tmp);
418 floor_removed = 1; 401 floor_removed = 1;
419 } 402 }
420 else 403 else
421 { 404 {
422 if (floor_removed) 405 if (floor_removed)
406 {
407 /* This is the first item that was above the floor */
423 above_floor = tmp; 408 above_floor = tmp;
409 floor_removed = 0;
410 }
424 } 411 }
425 412
426 tmp = above; 413 tmp = above;
427 } 414 }
428 } 415 }
434 /* Not found, log & bail out */ 421 /* Not found, log & bail out */
435 LOG (llevError, "apply_builder_floor: unable to find archetype %s.\n", &material->slaying); 422 LOG (llevError, "apply_builder_floor: unable to find archetype %s.\n", &material->slaying);
436 return; 423 return;
437 } 424 }
438 425
439 tmp = arch_to_object (new_floor); 426 tmp = new_floor->instance ();
440 SET_FLAG (tmp, FLAG_IS_BUILDABLE); 427 tmp->set_flag (FLAG_IS_BUILDABLE);
441 SET_FLAG (tmp, FLAG_UNIQUE); 428 tmp->set_flag (FLAG_UNIQUE);
442 SET_FLAG (tmp, FLAG_IS_FLOOR); 429 tmp->set_flag (FLAG_IS_FLOOR);
443 tmp->type = FLOOR; 430 //tmp->type = FLOOR;
444 insert_ob_in_map_at (tmp, pl->map, above_floor, above_floor ? INS_BELOW_ORIGINATOR : INS_ON_TOP, x, y); 431 insert_ob_in_map_at (tmp, pl->map, above_floor, above_floor ? INS_BELOW_ORIGINATOR : INS_ON_TOP, x, y);
445 432
446 /* 433 /*
447 * Next step: make sure there are either walls or floors around the new square 434 * Next step: make sure there are either walls or floors around the new square
448 * Since building, you can have: blocking view / floor / wall / nothing 435 * Since building, you can have: blocking view / floor / wall / nothing
453 yt = y + freearr_y[i]; 440 yt = y + freearr_y[i];
454 tmp = GET_MAP_OB (pl->map, xt, yt); 441 tmp = GET_MAP_OB (pl->map, xt, yt);
455 if (!tmp) 442 if (!tmp)
456 { 443 {
457 /* Must insert floor & wall */ 444 /* Must insert floor & wall */
458 tmp = arch_to_object (new_floor); 445 tmp = new_floor->instance ();
459 /* Better make the floor unique */ 446 /* Better make the floor unique */
460 SET_FLAG (tmp, FLAG_UNIQUE); 447 tmp->set_flag (FLAG_UNIQUE);
461 SET_FLAG (tmp, FLAG_IS_BUILDABLE); 448 tmp->set_flag (FLAG_IS_BUILDABLE);
462 tmp->type = FLOOR; 449 //tmp->type = FLOOR;
463 insert_ob_in_map_at (tmp, pl->map, 0, 0, xt, yt); 450 insert_ob_in_map_at (tmp, pl->map, 0, 0, xt, yt);
464 /* Insert wall if exists. Note: if it doesn't, the map is weird... */ 451 /* Insert wall if exists. Note: if it doesn't, the map is weird... */
465 if (new_wall) 452 if (new_wall)
466 { 453 {
467 tmp = arch_to_object (new_wall); 454 tmp = new_wall->instance ();
468 SET_FLAG (tmp, FLAG_IS_BUILDABLE); 455 tmp->set_flag (FLAG_IS_BUILDABLE);
469 tmp->type = WALL; 456 tmp->type = BUILDABLE_WALL;
470 insert_ob_in_map_at (tmp, pl->map, 0, 0, xt, yt); 457 insert_ob_in_map_at (tmp, pl->map, 0, 0, xt, yt);
471 } 458 }
472 } 459 }
473 } 460 }
474 461
476 * Note: 2 squares around are checked, because potentially we added walls around the building 463 * Note: 2 squares around are checked, because potentially we added walls around the building
477 * spot, so need to check that those new walls connect correctly 464 * spot, so need to check that those new walls connect correctly
478 */ 465 */
479 for (xt = x - 2; xt <= x + 2; xt++) 466 for (xt = x - 2; xt <= x + 2; xt++)
480 for (yt = y - 2; yt <= y + 2; yt++) 467 for (yt = y - 2; yt <= y + 2; yt++)
481 {
482 if (!OUT_OF_REAL_MAP (pl->map, xt, yt)) 468 if (!OUT_OF_REAL_MAP (pl->map, xt, yt))
483 fix_walls (pl->map, xt, yt); 469 fix_walls (pl->map, xt, yt);
484 }
485 470
486 /* Now remove raw item from inventory */ 471 /* Now remove raw item from inventory */
487 decrease_ob (material); 472 material->decrease ();
488 473
489 /* And tell player about the fix */ 474 /* And tell player about the fix */
490 new_draw_info (NDI_UNIQUE, 0, pl, message); 475 new_draw_info (NDI_UNIQUE, 0, pl, message);
491}
492
493/**
494 * Wall radius fix function
495 */
496void fix_walls_around (maptile *map, int x, int y)
497{
498 for (int xt = x - 1; xt <= x + 1; xt++)
499 for (int yt = y - 1; yt <= y + 1; yt++)
500 {
501 if (OUT_OF_REAL_MAP (map, xt, yt))
502 continue;
503
504 fix_walls (map, xt, yt);
505 }
506} 476}
507 477
508/** 478/**
509 * Wall building function 479 * Wall building function
510 * 480 *
511 * Walls can be build: 481 * Walls can be build:
512 * - on a floor without anything else 482 * - on a floor without anything else
513 * - on an existing wall, with or without a floor 483 * - on an existing wall, with or without a floor
514 */ 484 */
515void 485static void
516apply_builder_wall (object *pl, object *material, short x, short y) 486apply_builder_wall (object *pl, object *material, int x, int y)
517{ 487{
518 object *current_wall; 488 object *current_wall;
519 object *tmp; 489 object *tmp;
520 int xt, yt; 490 int xt, yt;
521 struct archetype *new_wall; 491 struct archetype *new_wall;
526 /* Grab existing wall, if any */ 496 /* Grab existing wall, if any */
527 current_wall = NULL; 497 current_wall = NULL;
528 tmp = GET_MAP_OB (pl->map, x, y); 498 tmp = GET_MAP_OB (pl->map, x, y);
529 while (tmp && !current_wall) 499 while (tmp && !current_wall)
530 { 500 {
531 if (WALL == tmp->type) 501 if (BUILDABLE_WALL == tmp->type)
532 current_wall = tmp; 502 current_wall = tmp;
533 503
534 tmp = tmp->above; 504 tmp = tmp->above;
535 } 505 }
536 506
543 { 513 {
544 LOG (llevError, "apply_builder_wall: unable to find archetype %s\n", &material->slaying); 514 LOG (llevError, "apply_builder_wall: unable to find archetype %s\n", &material->slaying);
545 return; 515 return;
546 } 516 }
547 517
548 tmp = arch_to_object (new_wall); 518 tmp = new_wall->instance ();
549 tmp->type = WALL; 519 tmp->type = BUILDABLE_WALL;
550 SET_FLAG (tmp, FLAG_IS_BUILDABLE); 520 tmp->set_flag (FLAG_IS_BUILDABLE);
551 insert_ob_in_map_at (tmp, pl->map, 0, INS_ABOVE_FLOOR_ONLY, x, y); 521 insert_ob_in_map_at (tmp, pl->map, 0, INS_ABOVE_FLOOR_ONLY, x, y);
552 522
553 /* If existing wall, remove it, no need to fix other walls */ 523 /* If existing wall, remove it, no need to fix other walls */
554 if (current_wall) 524 if (current_wall)
555 { 525 {
556 remove_ob (current_wall); 526 current_wall->destroy ();
557 free_object (current_wall);
558 fix_walls (pl->map, x, y); 527 fix_walls (pl->map, x, y);
559 sprintf (message, "You redecorate the wall to better suit your tastes."); 528 sprintf (message, "You redecorate the wall to better suit your tastes.");
560 } 529 }
561 else 530 else
562 { 531 {
570 fix_walls (pl->map, xt, yt); 539 fix_walls (pl->map, xt, yt);
571 } 540 }
572 } 541 }
573 542
574 /* Now remove item from inventory */ 543 /* Now remove item from inventory */
575 decrease_ob (material); 544 material->decrease ();
576 545
577 /* And tell player what happened */ 546 /* And tell player what happened */
578 new_draw_info (NDI_UNIQUE, 0, pl, message); 547 new_draw_info (NDI_UNIQUE, 0, pl, message);
579} 548}
580 549
584 * Item must be put on a square with a floor, you can have something under. 553 * Item must be put on a square with a floor, you can have something under.
585 * Archetype of created object is item->slaying (raw material). 554 * Archetype of created object is item->slaying (raw material).
586 * Type of inserted item is tested for specific cases (doors & such). 555 * Type of inserted item is tested for specific cases (doors & such).
587 * Item is inserted above the floor, unless Str == 1 (only for detectors i guess) 556 * Item is inserted above the floor, unless Str == 1 (only for detectors i guess)
588 */ 557 */
589void 558static void
590apply_builder_item (object *pl, object *item, short x, short y) 559apply_builder_item (object *pl, object *item, int x, int y)
591{ 560{
592 object *tmp; 561 object *tmp;
593 struct archetype *arch; 562 struct archetype *arch;
594 int insert_flag; 563 int insert_flag;
595 object *floor; 564 object *floor;
596 object *con_rune; 565 object *con_rune;
597 int connected;
598 566
599 /* Find floor */ 567 /* Find floor */
600 floor = GET_MAP_OB (pl->map, x, y); 568 floor = GET_MAP_OB (pl->map, x, y);
601 if (!floor) 569 if (!floor)
602 { 570 {
603 new_draw_info (NDI_UNIQUE, 0, pl, "Invalid square."); 571 new_draw_info (NDI_UNIQUE, 0, pl, "Invalid square.");
604 return; 572 return;
605 } 573 }
606 574
607 while (floor && (floor->type != FLOOR) && (!QUERY_FLAG (floor, FLAG_IS_FLOOR))) 575 while (floor && !IS_FLOOR (floor))
608 floor = floor->above; 576 floor = floor->above;
609 577
610 if (!floor) 578 if (!floor)
611 { 579 {
612 new_draw_info (NDI_UNIQUE, 0, pl, "This square has no floor, you can't build here."); 580 new_draw_info (NDI_UNIQUE, 0, pl, "This square has no floor, you can't build here.");
615 /* Create item, set flag, insert in map */ 583 /* Create item, set flag, insert in map */
616 arch = archetype::find (item->slaying); 584 arch = archetype::find (item->slaying);
617 if (!arch) 585 if (!arch)
618 return; 586 return;
619 587
620 tmp = arch_to_object (arch); 588 tmp = arch->instance ();
621 589
622 if ((floor->above) && (!can_build_over (pl->map, tmp, x, y))) 590 if (!floor->flag[FLAG_IS_BUILDABLE] || floor->above && !can_build_over (pl->map, tmp, x, y))
623 /* Floor has something on top that interferes with building */ 591 /* Floor has something on top that interferes with building */
624 { 592 {
625 new_draw_info (NDI_UNIQUE, 0, pl, "You can't build here."); 593 new_draw_info (NDI_UNIQUE, 0, pl, "You can't build here.");
626 return; 594 return;
627 } 595 }
628 596
629 SET_FLAG (tmp, FLAG_IS_BUILDABLE); 597 tmp->set_flag (FLAG_IS_BUILDABLE);
630 SET_FLAG (tmp, FLAG_NO_PICK); 598 tmp->set_flag (FLAG_NO_PICK);
631 599
632 /* 600 /*
633 * This doesn't work on non unique maps. pedestals under floor will not be saved... 601 * Str 1 is a flag that the item [pedestal] should go below the floor.
634 insert_flag = ( item->stats.Str == 1 ) ? INS_BELOW_ORIGINATOR : INS_ABOVE_FLOOR_ONLY; 602 * Items under the floor on non-unique maps will not be saved,
603 * so make the item itself unique in this situation.
635 */ 604 */
636 insert_flag = INS_ABOVE_FLOOR_ONLY; 605 insert_flag = item->stats.Str == 1 ? INS_BELOW_ORIGINATOR : INS_ABOVE_FLOOR_ONLY;
606 if (insert_flag == INS_BELOW_ORIGINATOR && !pl->map->no_reset)
607 tmp->set_flag (FLAG_UNIQUE);
637 608
638 connected = 0; 609 shstr_tmp connected;
610
639 switch (tmp->type) 611 switch (tmp->type)
640 { 612 {
641 case DOOR: 613 case DOOR:
642 case GATE: 614 case GATE:
643 case BUTTON: 615 case BUTTON:
644 case DETECTOR: 616 case DETECTOR:
645 case TIMED_GATE: 617 case TIMED_GATE:
646 case PEDESTAL: 618 case PEDESTAL:
647 case CF_HANDLE: 619 case T_HANDLE:
648 case MAGIC_EAR: 620 case MAGIC_EAR:
649 case SIGN: 621 case SIGN:
650 /* Signs don't need a connection, but but magic mouths do. */ 622 /* Signs don't need a connection, but but magic mouths do. */
651 if (tmp->type == SIGN && strcmp (tmp->arch->name, "magic_mouth")) 623 if (tmp->type == SIGN && tmp->arch->archname != shstr_magic_mouth)
652 break; 624 break;
625
653 con_rune = get_connection_rune (pl, x, y); 626 con_rune = get_connection_rune (pl, x, y);
654 connected = find_or_create_connection_for_map (pl, x, y, con_rune); 627 connected = find_or_create_connection_for_map (pl, x, y, con_rune);
655 if (connected == -1) 628 if (!connected)
656 { 629 {
657 /* Player already informed of failure by the previous function */ 630 /* Player already informed of failure by the previous function */
658 free_object (tmp); 631 tmp->destroy ();
659 return; 632 return;
660 } 633 }
634
661 /* Remove marking rune */ 635 /* Remove marking rune */
662 remove_ob (con_rune); 636 con_rune->destroy ();
663 free_object (con_rune);
664 } 637 }
665 638
666 /* For magic mouths/ears, and signs, take the msg from a book of scroll */ 639 /* For magic mouths/ears, and signs, take the msg from a book of scroll */
667 if ((tmp->type == SIGN) || (tmp->type == MAGIC_EAR)) 640 if ((tmp->type == SIGN) || (tmp->type == MAGIC_EAR))
668 {
669 if (adjust_sign_msg (pl, x, y, tmp) == -1) 641 if (adjust_sign_msg (pl, x, y, tmp) == -1)
670 { 642 {
671 free_object (tmp); 643 tmp->destroy ();
672 return; 644 return;
673 } 645 }
674 }
675 646
676 insert_ob_in_map_at (tmp, pl->map, floor, insert_flag, x, y); 647 insert_ob_in_map_at (tmp, pl->map, floor, insert_flag, x, y);
677 if (connected != 0) 648 if (connected)
678 add_button_link (tmp, pl->map, connected); 649 tmp->add_link (pl->map, connected);
679 650
680 new_draw_info_format (NDI_UNIQUE, 0, pl, "You build the %s", query_name (tmp)); 651 new_draw_info_format (NDI_UNIQUE, 0, pl, "You build the %s", query_name (tmp));
681 decrease_ob_nr (item, 1); 652 item->decrease ();
682} 653}
683 654
684/** 655/**
685 * Item remover. 656 * Item remover.
686 * 657 *
687 * Removes first buildable item, either under or above the floor 658 * Removes first buildable item, either under or above the floor
688 */ 659 */
689void 660static void
690apply_builder_remove (object *pl, int dir) 661apply_builder_remove (object *pl, int dir)
691{ 662{
692 object *item; 663 object *item;
693 short x, y; 664 int x, y;
694 665
695 x = pl->x + freearr_x[dir]; 666 x = pl->x + freearr_x[dir];
696 y = pl->y + freearr_y[dir]; 667 y = pl->y + freearr_y[dir];
697 668
698 /* Check square */ 669 /* Check square */
699 item = GET_MAP_OB (pl->map, x, y); 670 item = GET_MAP_OB (pl->map, x, y);
700 if (!item) 671 if (!item)
701 { 672 {
702 /* Should not happen with previous tests, but we never know */ 673 /* Should not happen with previous tests, but we never know */
703 new_draw_info (NDI_UNIQUE, 0, pl, "Invalid square."); 674 new_draw_info (NDI_UNIQUE, 0, pl, "Invalid square.");
704 LOG (llevError, "apply_builder_remove: (null) square at (%d, %d, %s)\n", x, y, pl->map->path); 675 LOG (llevError, "apply_builder_remove: (null) square at (%d, %d, %s)\n", x, y, &pl->map->path);
705 return; 676 return;
706 } 677 }
707 678
708 if (item->type == FLOOR || QUERY_FLAG (item, FLAG_IS_FLOOR)) 679 if (IS_FLOOR (item))
709 item = item->above; 680 item = item->above;
710 681
711 if (!item) 682 if (!item)
712 {
713 new_draw_info (NDI_UNIQUE, 0, pl, "Nothing to remove."); 683 new_draw_info (NDI_UNIQUE, 0, pl, "Nothing to remove.");
714 return; 684 else if (item->type == BUILDABLE_WALL)
715 }
716
717 /* Now remove object, with special cases (buttons & such) */
718 switch (item->type)
719 {
720 case WALL:
721 new_draw_info (NDI_UNIQUE, 0, pl, "Can't remove a wall with that, build a floor."); 685 new_draw_info (NDI_UNIQUE, 0, pl, "Can't remove a wall with that, build a floor.");
722 return; 686 else if (!item->flag [FLAG_IS_BUILDABLE])
723 687 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't remove the %s, it's not buildable!", query_name (item));
724 case DOOR: 688 else
725 case BUTTON: 689 {
726 case GATE:
727 case TIMED_GATE:
728 case DETECTOR:
729 case PEDESTAL:
730 case CF_HANDLE:
731 case MAGIC_EAR:
732 case SIGN:
733 /* Special case: must unconnect */
734 if (QUERY_FLAG (item, FLAG_IS_LINKED))
735 remove_button_link (item);
736
737 /* Fall through */
738
739 default:
740 /* Remove generic item */
741 new_draw_info_format (NDI_UNIQUE, 0, pl, "You remove the %s", query_name (item)); 690 new_draw_info_format (NDI_UNIQUE, 0, pl, "You remove the %s", query_name (item));
742 remove_ob (item); 691 item->destroy ();
743 free_object (item);
744 } 692 }
745} 693}
746 694
747/** 695/**
748 * Global building function 696 * Global building function
751 * or remover object. 699 * or remover object.
752 */ 700 */
753void 701void
754apply_map_builder (object *pl, int dir) 702apply_map_builder (object *pl, int dir)
755{ 703{
756 object *builder;
757 object *tmp;
758 object *tmp2;
759 short x, y; 704 int x, y;
760 705
761 if (!pl->type == PLAYER) 706 if (!pl->type == PLAYER)
762 return; 707 return;
763 708
764 /*if ( !player->map->unique ) 709 /*if ( !player->map->unique )
774 } 719 }
775 720
776 x = pl->x + freearr_x[dir]; 721 x = pl->x + freearr_x[dir];
777 y = pl->y + freearr_y[dir]; 722 y = pl->y + freearr_y[dir];
778 723
779 if ((1 > x) || (1 > y) || ((MAP_WIDTH (pl->map) - 2) < x) || ((MAP_HEIGHT (pl->map) - 2) < y)) 724 if ((1 > x) || (1 > y) || ((pl->map->width - 2) < x) || ((pl->map->height - 2) < y))
780 { 725 {
781 new_draw_info (NDI_UNIQUE, 0, pl, "Can't build on map edge..."); 726 new_draw_info (NDI_UNIQUE, 0, pl, "Can't build on map edge...");
782 return; 727 return;
783 } 728 }
784 729
787 * The square must have only buildable items 732 * The square must have only buildable items
788 * Exception: marking runes are all right, 733 * Exception: marking runes are all right,
789 * since they are used for special things like connecting doors / buttons 734 * since they are used for special things like connecting doors / buttons
790 */ 735 */
791 736
792 tmp = GET_MAP_OB (pl->map, x, y); 737 object *tmp = GET_MAP_OB (pl->map, x, y);
793 if (!tmp) 738 if (!tmp)
794 { 739 {
795 /* Nothing, meaning player is standing next to an undefined square... */ 740 /* Nothing, meaning player is standing next to an undefined square... */
796 LOG (llevError, "apply_map_builder: undefined square at (%d, %d, %s)\n", x, y, pl->map->path); 741 LOG (llevError, "apply_map_builder: undefined square at (%d, %d, %s)\n", x, y, &pl->map->path);
797 new_draw_info (NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird."); 742 new_draw_info (NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird.");
798 return; 743 return;
799 } 744 }
800 tmp2 = find_marked_object (pl); 745
746 object *builder = pl->contr->ranged_ob;
747
748 object *tmp2 = pl->mark ();
749
801 while (tmp) 750 while (tmp)
802 { 751 {
803 if (!QUERY_FLAG (tmp, FLAG_IS_BUILDABLE) && ((tmp->type != SIGN) || (strcmp (tmp->arch->name, "rune_mark")))) 752 if (!tmp->flag [FLAG_IS_BUILDABLE] && (tmp->type != SIGN || tmp->arch->archname != shstr_rune_mark))
804 { 753 {
805 /* The item building function already has it's own special 754 /* The item building function already has it's own special
806 * checks for this 755 * checks for this
807 */ 756 */
808 if ((!tmp2) || (tmp2->subtype != ST_MAT_ITEM)) 757 if (!tmp2 || tmp2->subtype != ST_MAT_ITEM)
809 { 758 {
759 if (!INVOKE_PLAYER (BUILD, pl->contr, ARG_OBJECT (builder), ARG_MAP (pl->map), ARG_INT (x), ARG_INT (y), ARG_INT (0)))
810 new_draw_info (NDI_UNIQUE, 0, pl, "You can't build here."); 760 new_draw_info (NDI_UNIQUE, 0, pl, "You can't build here.");
761
811 return; 762 return;
812 } 763 }
813 } 764 }
765
814 tmp = tmp->above; 766 tmp = tmp->above;
815 } 767 }
816 768
817 /* Now we know the square is ok */ 769 /* Now we know the square is ok */
818 builder = pl->contr->ranges[range_builder]; 770 if (INVOKE_PLAYER (BUILD, pl->contr, ARG_OBJECT (builder), ARG_MAP (pl->map), ARG_INT (x), ARG_INT (y), ARG_INT (1)))
771 return;
819 772
820 if (builder->subtype == ST_BD_REMOVE) 773 if (builder->subtype == ST_BD_REMOVE)
821 /* Remover -> call specific function and bail out */ 774 /* Remover -> call specific function and bail out */
822 { 775 {
823 apply_builder_remove (pl, dir); 776 apply_builder_remove (pl, dir);
843 return; 796 return;
844 } 797 }
845 798
846 switch (tmp->subtype) 799 switch (tmp->subtype)
847 { 800 {
848 case ST_MAT_FLOOR: 801 case ST_MAT_FLOOR:
849 apply_builder_floor (pl, tmp, x, y); 802 apply_builder_floor (pl, tmp, x, y);
850 return; 803 return;
851 804
852 case ST_MAT_WALL: 805 case ST_MAT_WALL:
853 apply_builder_wall (pl, tmp, x, y); 806 apply_builder_wall (pl, tmp, x, y);
854 return; 807 return;
855 808
856 case ST_MAT_ITEM: 809 case ST_MAT_ITEM:
857 apply_builder_item (pl, tmp, x, y); 810 apply_builder_item (pl, tmp, x, y);
858 return; 811 return;
859 812
860 default: 813 default:
861 new_draw_info (NDI_UNIQUE, 0, pl, "Don't know how to apply this material, sorry."); 814 new_draw_info (NDI_UNIQUE, 0, pl, "Don't know how to apply this material, sorry.");
862 LOG (llevError, "apply_map_builder: invalid material subtype %d\n", tmp->subtype); 815 LOG (llevError, "apply_map_builder: invalid material subtype %d\n", tmp->subtype);
863 return; 816 return;
864 } 817 }
865 } 818 }
866 819
867 /* Here, it means the builder has an invalid type */ 820 /* Here, it means the builder has an invalid type */
868 new_draw_info (NDI_UNIQUE, 0, pl, "Don't know how to apply this tool, sorry."); 821 new_draw_info (NDI_UNIQUE, 0, pl, "Don't know how to apply this tool, sorry.");
869 LOG (llevError, "apply_map_builder: invalid builder subtype %d\n", builder->subtype); 822 LOG (llevError, "apply_map_builder: invalid builder subtype %d\n", builder->subtype);
870} 823}
871 824
872/**
873 * Make the built object inherit the msg of books that are used with it.
874 * For objects already invisible (i.e. magic mouths & ears), also make it
875 * it inherit the face and the name with "talking " prepended.
876 */
877int
878adjust_sign_msg (object *pl, short x, short y, object *tmp)
879{
880 object *book;
881 char buf[MAX_BUF];
882 char buf2[MAX_BUF];
883
884 book = get_msg_book (pl, x, y);
885 if (!book)
886 {
887 new_draw_info (NDI_UNIQUE, 0, pl, "You need to put a book or scroll with the message.");
888 return -1;
889 }
890
891 tmp->msg = book->msg;
892
893 if (tmp->invisible)
894 {
895 if (book->custom_name != NULL)
896 {
897 snprintf (buf, sizeof (buf), "talking %s", &book->custom_name);
898 }
899 else
900 {
901 snprintf (buf, sizeof (buf), "talking %s", &book->name);
902 }
903 tmp->name = buf;
904
905 if (book->name_pl != NULL)
906 {
907 snprintf (buf2, sizeof (buf2), "talking %s", &book->name_pl);
908 tmp->name_pl = buf2;
909 }
910
911 tmp->face = book->face;
912 tmp->invisible = 0;
913 }
914 remove_ob (book);
915 free_object (book);
916 return 0;
917}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines