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

Diff Legend

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