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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.127 by elmex, Mon Jan 29 21:04:32 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38UUID UUID::cur;
39static UUID uuid; 39static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
41 41
42objectvec objects; 42objectvec objects;
43activevec actives; 43activevec actives;
44 44
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 50};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50}; 56};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 57int maxfree[SIZEOFFREE] = {
58 0,
59 9, 10, 13, 14, 17, 18, 21, 22,
60 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 62};
54int freedir[SIZEOFFREE] = { 63int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 64 0,
65 1, 2, 3, 4, 5, 6, 7, 8,
66 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 67 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 68};
58 69
59static void 70static void
60write_uuid (void) 71write_uuid (uval64 skip, bool sync)
61{ 72{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
63 74 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 77 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 78}
79 79
80static void 80static void
81read_uuid (void) 81read_uuid (void)
82{ 82{
83 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
84 84
85 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
86 86
87 seq_next_save = 0;
88
87 FILE *fp; 89 FILE *fp;
88 90
89 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
90 { 92 {
91 if (errno == ENOENT) 93 if (errno == ENOENT)
92 { 94 {
93 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 96 UUID::cur.seq = 0;
95 write_uuid (); 97 write_uuid (UUID_GAP, true);
96 return; 98 return;
97 } 99 }
98 100
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 102 _exit (1);
101 } 103 }
102 104
103 int version; 105 UUID::BUF buf;
104 unsigned long long uid; 106 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
106 { 110 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 112 _exit (1);
109 } 113 }
110 114
111 uuid.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 116
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
114 fclose (fp); 118 fclose (fp);
115} 119}
116 120
117UUID 121UUID
118gen_uuid () 122UUID::gen ()
119{ 123{
120 UUID uid; 124 UUID uid;
121 125
122 uid.seq = ++uuid.seq; 126 uid.seq = ++cur.seq;
123 127
124 if (!(uuid.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
126 134
127 return uid; 135 return uid;
128} 136}
129 137
130void 138void
131init_uuid () 139UUID::init ()
132{ 140{
133 read_uuid (); 141 read_uuid ();
134} 142}
135 143
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 144/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
254 /* This is really a spellbook check - really, we should 262 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 263 * check all objects in the inventory.
256 */ 264 */
257 if (ob1->inv || ob2->inv) 265 if (ob1->inv || ob2->inv)
258 { 266 {
259 /* if one object has inventory but the other doesn't, not equiv */ 267 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 268 return 0; /* inventories differ in length */
261 return 0;
262 269
263 /* Now check to see if the two inventory objects could merge */ 270 if (ob1->inv->below || ob2->inv->below)
271 return 0; /* more than one object in inv */
272
264 if (!object::can_merge (ob1->inv, ob2->inv)) 273 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 274 return 0; /* inventory objexts differ */
266 275
267 /* inventory ok - still need to check rest of this object to see 276 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 277 * if it is valid.
269 */ 278 */
270 } 279 }
299 return 0; 308 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 309 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 310 return 0;
302 } 311 }
303 312
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 313 if (ob1->self || ob2->self)
306 { 314 {
307 ob1->optimise (); 315 ob1->optimise ();
308 ob2->optimise (); 316 ob2->optimise ();
309 317
310 if (ob1->self || ob2->self) 318 if (ob1->self || ob2->self)
319 {
320 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322
323 if (k1 != k2)
311 return 0; 324 return 0;
325 else if (k1 == 0)
326 return 1;
327 else if (!cfperl_can_merge (ob1, ob2))
328 return 0;
329 }
312 } 330 }
313 331
314 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
315 return 1; 333 return 1;
316} 334}
324sum_weight (object *op) 342sum_weight (object *op)
325{ 343{
326 long sum; 344 long sum;
327 object *inv; 345 object *inv;
328 346
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 347 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 348 {
331 if (inv->inv) 349 if (inv->inv)
332 sum_weight (inv); 350 sum_weight (inv);
351
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 352 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 353 }
335 354
336 if (op->type == CONTAINER && op->stats.Str) 355 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 356 sum = (sum * (100 - op->stats.Str)) / 100;
357/* 376/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 377 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 378 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 379 * The result of the dump is stored in the static global errmsg array.
361 */ 380 */
362
363char * 381char *
364dump_object (object *op) 382dump_object (object *op)
365{ 383{
366 if (!op) 384 if (!op)
367 return strdup ("[NULLOBJ]"); 385 return strdup ("[NULLOBJ]");
368 386
369 object_freezer freezer; 387 object_freezer freezer;
370 save_object (freezer, op, 1); 388 op->write (freezer);
371 return freezer.as_string (); 389 return freezer.as_string ();
372} 390}
373 391
374/* 392/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 393 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 395 * If it's not a multi-object, it is returned.
378 */ 396 */
379
380object * 397object *
381get_nearest_part (object *op, const object *pl) 398get_nearest_part (object *op, const object *pl)
382{ 399{
383 object *tmp, *closest; 400 object *tmp, *closest;
384 int last_dist, i; 401 int last_dist, i;
420 break; 437 break;
421 438
422 return op; 439 return op;
423} 440}
424 441
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 442/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 443 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 444 * skill and experience objects.
445 * ACTUALLY NO! investigate! TODO
434 */ 446 */
435void 447void
436object::set_owner (object *owner) 448object::set_owner (object *owner)
437{ 449{
450 // allow objects which own objects
438 if (!owner) 451 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 452 while (owner->owner)
449 owner = owner->owner; 453 owner = owner->owner;
454
455 if (flag [FLAG_FREED])
456 {
457 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
458 return;
459 }
450 460
451 this->owner = owner; 461 this->owner = owner;
462}
463
464int
465object::slottype () const
466{
467 if (type == SKILL)
468 {
469 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
470 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
471 }
472 else
473 {
474 if (slot [body_combat].info) return slot_combat;
475 if (slot [body_range ].info) return slot_ranged;
476 }
477
478 return slot_none;
479}
480
481bool
482object::change_weapon (object *ob)
483{
484 if (current_weapon == ob)
485 return true;
486
487 if (chosen_skill)
488 chosen_skill->flag [FLAG_APPLIED] = false;
489
490 current_weapon = ob;
491 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
492
493 if (chosen_skill)
494 chosen_skill->flag [FLAG_APPLIED] = true;
495
496 update_stats ();
497
498 if (ob)
499 {
500 // now check wether any body locations became invalid, in which case
501 // we cannot apply the weapon at the moment.
502 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
503 if (slot[i].used < 0)
504 {
505 current_weapon = chosen_skill = 0;
506 update_stats ();
507
508 new_draw_info_format (NDI_UNIQUE, 0, this,
509 "You try to balance all your items at once, "
510 "but the %s is just too much for your body. "
511 "[You need to unapply some items first.]", &ob->name);
512 return false;
513 }
514
515 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
516 }
517 else
518 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
519
520 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
521 {
522 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
523 &name, ob->debug_desc ());
524 return false;
525 }
526
527 return true;
452} 528}
453 529
454/* Zero the key_values on op, decrementing the shared-string 530/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 531 * refcounts and freeing the links.
456 */ 532 */
457static void 533static void
458free_key_values (object *op) 534free_key_values (object *op)
459{ 535{
460 for (key_value *i = op->key_values; i != 0;) 536 for (key_value *i = op->key_values; i; )
461 { 537 {
462 key_value *next = i->next; 538 key_value *next = i->next;
463 delete i; 539 delete i;
464 540
465 i = next; 541 i = next;
466 } 542 }
467 543
468 op->key_values = 0; 544 op->key_values = 0;
469} 545}
470 546
471/* 547object &
472 * copy_to first frees everything allocated by the dst object, 548object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 549{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 550 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 551 bool is_removed = flag [FLAG_REMOVED];
484 552
485 *(object_copy *)dst = *this; 553 *(object_copy *)this = src;
486 554
487 if (is_freed) 555 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 556 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - rndm ();
495 557
496 /* Copy over key_values, if any. */ 558 /* Copy over key_values, if any. */
497 if (key_values) 559 if (src.key_values)
498 { 560 {
499 key_value *tail = 0; 561 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 562 key_values = 0;
503 563
504 for (i = key_values; i; i = i->next) 564 for (key_value *i = src.key_values; i; i = i->next)
505 { 565 {
506 key_value *new_link = new key_value; 566 key_value *new_link = new key_value;
507 567
508 new_link->next = 0; 568 new_link->next = 0;
509 new_link->key = i->key; 569 new_link->key = i->key;
510 new_link->value = i->value; 570 new_link->value = i->value;
511 571
512 /* Try and be clever here, too. */ 572 /* Try and be clever here, too. */
513 if (!dst->key_values) 573 if (!key_values)
514 { 574 {
515 dst->key_values = new_link; 575 key_values = new_link;
516 tail = new_link; 576 tail = new_link;
517 } 577 }
518 else 578 else
519 { 579 {
520 tail->next = new_link; 580 tail->next = new_link;
521 tail = new_link; 581 tail = new_link;
522 } 582 }
523 } 583 }
524 } 584 }
585}
586
587/*
588 * copy_to first frees everything allocated by the dst object,
589 * and then copies the contents of itself into the second
590 * object, allocating what needs to be allocated. Basically, any
591 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
592 * if the first object is freed, the pointers in the new object
593 * will point at garbage.
594 */
595void
596object::copy_to (object *dst)
597{
598 *dst = *this;
599
600 if (speed < 0)
601 dst->speed_left -= rndm ();
525 602
526 dst->set_speed (dst->speed); 603 dst->set_speed (dst->speed);
604}
605
606void
607object::instantiate ()
608{
609 if (!uuid.seq) // HACK
610 uuid = UUID::gen ();
611
612 speed_left = -0.1f;
613 /* copy the body_info to the body_used - this is only really
614 * need for monsters, but doesn't hurt to do it for everything.
615 * by doing so, when a monster is created, it has good starting
616 * values for the body_used info, so when items are created
617 * for it, they can be properly equipped.
618 */
619 for (int i = NUM_BODY_LOCATIONS; i--; )
620 slot[i].used = slot[i].info;
621
622 attachable::instantiate ();
527} 623}
528 624
529object * 625object *
530object::clone () 626object::clone ()
531{ 627{
589 * UP_OBJ_FACE: only the objects face has changed. 685 * UP_OBJ_FACE: only the objects face has changed.
590 */ 686 */
591void 687void
592update_object (object *op, int action) 688update_object (object *op, int action)
593{ 689{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 690 if (op == NULL)
597 { 691 {
598 /* this should never happen */ 692 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 693 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 694 return;
680static int object_count; 774static int object_count;
681 775
682void object::link () 776void object::link ()
683{ 777{
684 assert (!index);//D 778 assert (!index);//D
685 uuid = gen_uuid (); 779 uuid = UUID::gen ();
686 count = ++object_count; 780 count = ++object_count;
687 781
688 refcnt_inc (); 782 refcnt_inc ();
689 objects.insert (this); 783 objects.insert (this);
690} 784}
819 913
820 if (flag [FLAG_IS_LINKED]) 914 if (flag [FLAG_IS_LINKED])
821 remove_button_link (this); 915 remove_button_link (this);
822 916
823 if (flag [FLAG_FRIENDLY]) 917 if (flag [FLAG_FRIENDLY])
824 {
825 remove_friendly_object (this); 918 remove_friendly_object (this);
826
827 if (type == GOLEM
828 && owner
829 && owner->type == PLAYER
830 && owner->contr->ranges[range_golem] == this)
831 owner->contr->ranges[range_golem] = 0;
832 }
833 919
834 if (!flag [FLAG_REMOVED]) 920 if (!flag [FLAG_REMOVED])
835 remove (); 921 remove ();
836 922
837 destroy_inv (true); 923 destroy_inv (true);
847 933
848 if (!freed_map) 934 if (!freed_map)
849 { 935 {
850 freed_map = new maptile; 936 freed_map = new maptile;
851 937
938 freed_map->path = "<freed objects map>";
852 freed_map->name = "/internal/freed_objects_map"; 939 freed_map->name = "/internal/freed_objects_map";
853 freed_map->width = 3; 940 freed_map->width = 3;
854 freed_map->height = 3; 941 freed_map->height = 3;
942 freed_map->nodrop = 1;
855 943
856 freed_map->alloc (); 944 freed_map->alloc ();
857 freed_map->in_memory = MAP_IN_MEMORY; 945 freed_map->in_memory = MAP_IN_MEMORY;
858 } 946 }
859 947
860 map = freed_map; 948 map = freed_map;
861 x = 1; 949 x = 1;
862 y = 1; 950 y = 1;
863 } 951 }
864 952
865 head = 0;
866
867 if (more) 953 if (more)
868 { 954 {
869 more->destroy (); 955 more->destroy ();
870 more = 0; 956 more = 0;
871 } 957 }
872 958
959 head = 0;
960
873 // clear those pointers that likely might have circular references to us 961 // clear those pointers that likely might cause circular references
874 owner = 0; 962 owner = 0;
875 enemy = 0; 963 enemy = 0;
876 attacked_by = 0; 964 attacked_by = 0;
965 current_weapon = 0;
877} 966}
878 967
879void 968void
880object::destroy (bool destroy_inventory) 969object::destroy (bool destroy_inventory)
881{ 970{
882 if (destroyed ()) 971 if (destroyed ())
883 return; 972 return;
884 973
885 if (destroy_inventory) 974 if (destroy_inventory)
886 destroy_inv (false); 975 destroy_inv (false);
976
977 if (is_head ())
978 if (sound_destroy)
979 play_sound (sound_destroy);
980 else if (flag [FLAG_MONSTER])
981 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
887 982
888 attachable::destroy (); 983 attachable::destroy ();
889} 984}
890 985
891/* 986/*
911 * object will have no environment. If the object previously had an 1006 * object will have no environment. If the object previously had an
912 * environment, the x and y coordinates will be updated to 1007 * environment, the x and y coordinates will be updated to
913 * the previous environment. 1008 * the previous environment.
914 */ 1009 */
915void 1010void
916object::remove_slow () 1011object::do_remove ()
917{ 1012{
918 object *tmp, *last = 0; 1013 object *tmp, *last = 0;
919 object *otmp; 1014 object *otmp;
920 1015
921 if (QUERY_FLAG (this, FLAG_REMOVED)) 1016 if (QUERY_FLAG (this, FLAG_REMOVED))
964 } 1059 }
965 else if (map) 1060 else if (map)
966 { 1061 {
967 if (type == PLAYER) 1062 if (type == PLAYER)
968 { 1063 {
1064 // leaving a spot always closes any open container on the ground
1065 if (container && !container->env)
1066 // this causes spurious floorbox updates, but it ensures
1067 // that the CLOSE event is being sent.
1068 close_container ();
1069
969 --map->players; 1070 --map->players;
970 map->touch (); 1071 map->touch ();
971 } 1072 }
972 1073
973 map->dirty = true; 1074 map->dirty = true;
1000 if (map->in_memory == MAP_SAVING) 1101 if (map->in_memory == MAP_SAVING)
1001 return; 1102 return;
1002 1103
1003 int check_walk_off = !flag [FLAG_NO_APPLY]; 1104 int check_walk_off = !flag [FLAG_NO_APPLY];
1004 1105
1106 if (object *pl = ms.player ())
1107 {
1108 if (pl->container == this)
1109 /* If a container that the player is currently using somehow gets
1110 * removed (most likely destroyed), update the player view
1111 * appropriately.
1112 */
1113 pl->close_container ();
1114
1115 pl->contr->ns->floorbox_update ();
1116 }
1117
1005 for (tmp = ms.bot; tmp; tmp = tmp->above) 1118 for (tmp = ms.bot; tmp; tmp = tmp->above)
1006 { 1119 {
1007 /* No point updating the players look faces if he is the object 1120 /* No point updating the players look faces if he is the object
1008 * being removed. 1121 * being removed.
1009 */ 1122 */
1010
1011 if (tmp->type == PLAYER && tmp != this)
1012 {
1013 /* If a container that the player is currently using somehow gets
1014 * removed (most likely destroyed), update the player view
1015 * appropriately.
1016 */
1017 if (tmp->container == this)
1018 {
1019 flag [FLAG_APPLIED] = 0;
1020 tmp->container = 0;
1021 }
1022
1023 if (tmp->contr->ns)
1024 tmp->contr->ns->floorbox_update ();
1025 }
1026 1123
1027 /* See if object moving off should effect something */ 1124 /* See if object moving off should effect something */
1028 if (check_walk_off 1125 if (check_walk_off
1029 && ((move_type & tmp->move_off) 1126 && ((move_type & tmp->move_off)
1030 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1127 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1033 1130
1034 if (destroyed ()) 1131 if (destroyed ())
1035 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1132 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1036 } 1133 }
1037 1134
1038 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1039 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1040 if (tmp->above == tmp)
1041 tmp->above = 0;
1042
1043 last = tmp; 1135 last = tmp;
1044 } 1136 }
1045 1137
1046 /* last == NULL if there are no objects on this space */ 1138 /* last == NULL if there are no objects on this space */
1047 //TODO: this makes little sense, why only update the topmost object? 1139 //TODO: this makes little sense, why only update the topmost object?
1067merge_ob (object *op, object *top) 1159merge_ob (object *op, object *top)
1068{ 1160{
1069 if (!op->nrof) 1161 if (!op->nrof)
1070 return 0; 1162 return 0;
1071 1163
1072 if (top) 1164 if (!top)
1073 for (top = op; top && top->above; top = top->above) 1165 for (top = op; top && top->above; top = top->above)
1074 ; 1166 ;
1075 1167
1076 for (; top; top = top->below) 1168 for (; top; top = top->below)
1077 { 1169 {
1090 } 1182 }
1091 1183
1092 return 0; 1184 return 0;
1093} 1185}
1094 1186
1187void
1188object::expand_tail ()
1189{
1190 if (more)
1191 return;
1192
1193 object *prev = this;
1194
1195 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1196 {
1197 object *op = arch_to_object (at);
1198
1199 op->name = name;
1200 op->name_pl = name_pl;
1201 op->title = title;
1202
1203 op->head = this;
1204 prev->more = op;
1205
1206 prev = op;
1207 }
1208}
1209
1095/* 1210/*
1096 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1211 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1097 * job preparing multi-part monsters. 1212 * job preparing multi-part monsters.
1098 */ 1213 */
1099object * 1214object *
1100insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1215insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1101{ 1216{
1102 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1217 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1103 { 1218 {
1104 tmp->x = x + tmp->arch->clone.x; 1219 tmp->x = x + tmp->arch->x;
1105 tmp->y = y + tmp->arch->clone.y; 1220 tmp->y = y + tmp->arch->y;
1106 } 1221 }
1107 1222
1108 return insert_ob_in_map (op, m, originator, flag); 1223 return insert_ob_in_map (op, m, originator, flag);
1109} 1224}
1110 1225
1129 * just 'op' otherwise 1244 * just 'op' otherwise
1130 */ 1245 */
1131object * 1246object *
1132insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1247insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1133{ 1248{
1249 assert (!op->flag [FLAG_FREED]);
1250
1134 object *tmp, *top, *floor = NULL; 1251 object *top, *floor = NULL;
1135
1136 if (QUERY_FLAG (op, FLAG_FREED))
1137 {
1138 LOG (llevError, "Trying to insert freed object!\n");
1139 return NULL;
1140 }
1141
1142 if (!QUERY_FLAG (op, FLAG_REMOVED))
1143 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1144 1252
1145 op->remove (); 1253 op->remove ();
1146
1147 if (!m)
1148 {
1149 char *dump = dump_object (op);
1150 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1151 free (dump);
1152 return op;
1153 }
1154
1155 if (out_of_map (m, op->x, op->y))
1156 {
1157 char *dump = dump_object (op);
1158 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1159#ifdef MANY_CORES
1160 /* Better to catch this here, as otherwise the next use of this object
1161 * is likely to cause a crash. Better to find out where it is getting
1162 * improperly inserted.
1163 */
1164 abort ();
1165#endif
1166 free (dump);
1167 return op;
1168 }
1169
1170 if (object *more = op->more)
1171 {
1172 if (!insert_ob_in_map (more, m, originator, flag))
1173 {
1174 if (!op->head)
1175 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1176
1177 return 0;
1178 }
1179 }
1180
1181 CLEAR_FLAG (op, FLAG_REMOVED);
1182 1254
1183 /* Ideally, the caller figures this out. However, it complicates a lot 1255 /* Ideally, the caller figures this out. However, it complicates a lot
1184 * of areas of callers (eg, anything that uses find_free_spot would now 1256 * of areas of callers (eg, anything that uses find_free_spot would now
1185 * need extra work 1257 * need extra work
1186 */ 1258 */
1187 if (!xy_normalise (m, op->x, op->y)) 1259 if (!xy_normalise (m, op->x, op->y))
1260 {
1261 op->destroy ();
1188 return 0; 1262 return 0;
1263 }
1264
1265 if (object *more = op->more)
1266 if (!insert_ob_in_map (more, m, originator, flag))
1267 return 0;
1268
1269 CLEAR_FLAG (op, FLAG_REMOVED);
1189 1270
1190 op->map = m; 1271 op->map = m;
1191 mapspace &ms = op->ms (); 1272 mapspace &ms = op->ms ();
1192 1273
1193 /* this has to be done after we translate the coordinates. 1274 /* this has to be done after we translate the coordinates.
1194 */ 1275 */
1195 if (op->nrof && !(flag & INS_NO_MERGE)) 1276 if (op->nrof && !(flag & INS_NO_MERGE))
1196 for (tmp = ms.bot; tmp; tmp = tmp->above) 1277 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1197 if (object::can_merge (op, tmp)) 1278 if (object::can_merge (op, tmp))
1198 { 1279 {
1199 op->nrof += tmp->nrof; 1280 op->nrof += tmp->nrof;
1200 tmp->destroy (); 1281 tmp->destroy ();
1201 } 1282 }
1228 else 1309 else
1229 { 1310 {
1230 top = ms.bot; 1311 top = ms.bot;
1231 1312
1232 /* If there are other objects, then */ 1313 /* If there are other objects, then */
1233 if ((!(flag & INS_MAP_LOAD)) && top) 1314 if (top)
1234 { 1315 {
1235 object *last = 0; 1316 object *last = 0;
1236 1317
1237 /* 1318 /*
1238 * If there are multiple objects on this space, we do some trickier handling. 1319 * If there are multiple objects on this space, we do some trickier handling.
1268 * looks like instead of lots of conditions here. 1349 * looks like instead of lots of conditions here.
1269 * makes things faster, and effectively the same result. 1350 * makes things faster, and effectively the same result.
1270 */ 1351 */
1271 1352
1272 /* Have object 'fall below' other objects that block view. 1353 /* Have object 'fall below' other objects that block view.
1273 * Unless those objects are exits, type 66 1354 * Unless those objects are exits.
1274 * If INS_ON_TOP is used, don't do this processing 1355 * If INS_ON_TOP is used, don't do this processing
1275 * Need to find the object that in fact blocks view, otherwise 1356 * Need to find the object that in fact blocks view, otherwise
1276 * stacking is a bit odd. 1357 * stacking is a bit odd.
1277 */ 1358 */
1278 if (!(flag & INS_ON_TOP) 1359 if (!(flag & INS_ON_TOP)
1279 && ms.flags () & P_BLOCKSVIEW 1360 && ms.flags () & P_BLOCKSVIEW
1280 && (op->face && !op->face->visibility)) 1361 && (op->face && !faces [op->face].visibility))
1281 { 1362 {
1282 for (last = top; last != floor; last = last->below) 1363 for (last = top; last != floor; last = last->below)
1283 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1364 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1284 break; 1365 break;
1285 1366
1291 if (last && last->below && last != floor) 1372 if (last && last->below && last != floor)
1292 top = last->below; 1373 top = last->below;
1293 } 1374 }
1294 } /* If objects on this space */ 1375 } /* If objects on this space */
1295 1376
1296 if (flag & INS_MAP_LOAD)
1297 top = ms.top;
1298
1299 if (flag & INS_ABOVE_FLOOR_ONLY) 1377 if (flag & INS_ABOVE_FLOOR_ONLY)
1300 top = floor; 1378 top = floor;
1301 1379
1302 /* Top is the object that our object (op) is going to get inserted above. 1380 /* Top is the object that our object (op) is going to get inserted above.
1303 */ 1381 */
1335 op->map->touch (); 1413 op->map->touch ();
1336 } 1414 }
1337 1415
1338 op->map->dirty = true; 1416 op->map->dirty = true;
1339 1417
1340 /* If we have a floor, we know the player, if any, will be above
1341 * it, so save a few ticks and start from there.
1342 */
1343 if (!(flag & INS_MAP_LOAD))
1344 if (object *pl = ms.player ()) 1418 if (object *pl = ms.player ())
1345 if (pl->contr->ns)
1346 pl->contr->ns->floorbox_update (); 1419 pl->contr->ns->floorbox_update ();
1347 1420
1348 /* If this object glows, it may affect lighting conditions that are 1421 /* If this object glows, it may affect lighting conditions that are
1349 * visible to others on this map. But update_all_los is really 1422 * visible to others on this map. But update_all_los is really
1350 * an inefficient way to do this, as it means los for all players 1423 * an inefficient way to do this, as it means los for all players
1351 * on the map will get recalculated. The players could very well 1424 * on the map will get recalculated. The players could very well
1370 * blocked() and wall() work properly), and these flags are updated by 1443 * blocked() and wall() work properly), and these flags are updated by
1371 * update_object(). 1444 * update_object().
1372 */ 1445 */
1373 1446
1374 /* if this is not the head or flag has been passed, don't check walk on status */ 1447 /* if this is not the head or flag has been passed, don't check walk on status */
1375 if (!(flag & INS_NO_WALK_ON) && !op->head) 1448 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1376 { 1449 {
1377 if (check_move_on (op, originator)) 1450 if (check_move_on (op, originator))
1378 return 0; 1451 return 0;
1379 1452
1380 /* If we are a multi part object, lets work our way through the check 1453 /* If we are a multi part object, lets work our way through the check
1381 * walk on's. 1454 * walk on's.
1382 */ 1455 */
1383 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1456 for (object *tmp = op->more; tmp; tmp = tmp->more)
1384 if (check_move_on (tmp, originator)) 1457 if (check_move_on (tmp, originator))
1385 return 0; 1458 return 0;
1386 } 1459 }
1387 1460
1388 return op; 1461 return op;
1398 object *tmp, *tmp1; 1471 object *tmp, *tmp1;
1399 1472
1400 /* first search for itself and remove any old instances */ 1473 /* first search for itself and remove any old instances */
1401 1474
1402 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1475 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1403 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1476 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1404 tmp->destroy (); 1477 tmp->destroy ();
1405 1478
1406 tmp1 = arch_to_object (archetype::find (arch_string)); 1479 tmp1 = arch_to_object (archetype::find (arch_string));
1407 1480
1408 tmp1->x = op->x; 1481 tmp1->x = op->x;
1411} 1484}
1412 1485
1413object * 1486object *
1414object::insert_at (object *where, object *originator, int flags) 1487object::insert_at (object *where, object *originator, int flags)
1415{ 1488{
1416 where->map->insert (this, where->x, where->y, originator, flags); 1489 return where->map->insert (this, where->x, where->y, originator, flags);
1417} 1490}
1418 1491
1419/* 1492/*
1420 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1493 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1421 * is returned contains nr objects, and the remaining parts contains 1494 * is returned contains nr objects, and the remaining parts contains
1461 * the amount of an object. If the amount reaches 0, the object 1534 * the amount of an object. If the amount reaches 0, the object
1462 * is subsequently removed and freed. 1535 * is subsequently removed and freed.
1463 * 1536 *
1464 * Return value: 'op' if something is left, NULL if the amount reached 0 1537 * Return value: 'op' if something is left, NULL if the amount reached 0
1465 */ 1538 */
1466
1467object * 1539object *
1468decrease_ob_nr (object *op, uint32 i) 1540decrease_ob_nr (object *op, uint32 i)
1469{ 1541{
1470 object *tmp; 1542 object *tmp;
1471 1543
1546 1618
1547/* 1619/*
1548 * add_weight(object, weight) adds the specified weight to an object, 1620 * add_weight(object, weight) adds the specified weight to an object,
1549 * and also updates how much the environment(s) is/are carrying. 1621 * and also updates how much the environment(s) is/are carrying.
1550 */ 1622 */
1551
1552void 1623void
1553add_weight (object *op, signed long weight) 1624add_weight (object *op, signed long weight)
1554{ 1625{
1555 while (op != NULL) 1626 while (op != NULL)
1556 { 1627 {
1571 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1642 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1572 free (dump); 1643 free (dump);
1573 return op; 1644 return op;
1574 } 1645 }
1575 1646
1576 if (where->head) 1647 if (where->head_ () != where)
1577 { 1648 {
1578 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1649 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1579 where = where->head; 1650 where = where->head;
1580 } 1651 }
1581 1652
1582 return where->insert (op); 1653 return where->insert (op);
1583} 1654}
1588 * inside the object environment. 1659 * inside the object environment.
1589 * 1660 *
1590 * The function returns now pointer to inserted item, and return value can 1661 * The function returns now pointer to inserted item, and return value can
1591 * be != op, if items are merged. -Tero 1662 * be != op, if items are merged. -Tero
1592 */ 1663 */
1593
1594object * 1664object *
1595object::insert (object *op) 1665object::insert (object *op)
1596{ 1666{
1597 object *tmp, *otmp;
1598
1599 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1667 if (!QUERY_FLAG (op, FLAG_REMOVED))
1600 op->remove (); 1668 op->remove ();
1601 1669
1602 if (op->more) 1670 if (op->more)
1603 { 1671 {
1605 return op; 1673 return op;
1606 } 1674 }
1607 1675
1608 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1676 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1609 CLEAR_FLAG (op, FLAG_REMOVED); 1677 CLEAR_FLAG (op, FLAG_REMOVED);
1678
1610 if (op->nrof) 1679 if (op->nrof)
1611 { 1680 {
1612 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1681 for (object *tmp = inv; tmp; tmp = tmp->below)
1613 if (object::can_merge (tmp, op)) 1682 if (object::can_merge (tmp, op))
1614 { 1683 {
1615 /* return the original object and remove inserted object 1684 /* return the original object and remove inserted object
1616 (client needs the original object) */ 1685 (client needs the original object) */
1617 tmp->nrof += op->nrof; 1686 tmp->nrof += op->nrof;
1636 add_weight (this, op->weight * op->nrof); 1705 add_weight (this, op->weight * op->nrof);
1637 } 1706 }
1638 else 1707 else
1639 add_weight (this, (op->weight + op->carrying)); 1708 add_weight (this, (op->weight + op->carrying));
1640 1709
1641 otmp = this->in_player (); 1710 if (object *otmp = this->in_player ())
1642 if (otmp && otmp->contr)
1643 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1711 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1644 otmp->update_stats (); 1712 otmp->update_stats ();
1645 1713
1714 op->owner = 0; // its his/hers now. period.
1646 op->map = 0; 1715 op->map = 0;
1647 op->env = this; 1716 op->env = this;
1648 op->above = 0; 1717 op->above = 0;
1649 op->below = 0; 1718 op->below = 0;
1650 op->x = 0, op->y = 0; 1719 op->x = op->y = 0;
1651 1720
1652 /* reset the light list and los of the players on the map */ 1721 /* reset the light list and los of the players on the map */
1653 if ((op->glow_radius != 0) && map) 1722 if (op->glow_radius && map)
1654 { 1723 {
1655#ifdef DEBUG_LIGHTS 1724#ifdef DEBUG_LIGHTS
1656 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1725 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1657#endif /* DEBUG_LIGHTS */ 1726#endif /* DEBUG_LIGHTS */
1658 if (map->darkness) 1727 if (map->darkness)
1892 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
1893 */ 1962 */
1894void 1963void
1895flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
1896{ 1965{
1897 if (op->inv)
1898 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1966 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899 { 1967 {
1900 SET_FLAG (tmp, flag); 1968 SET_FLAG (tmp, flag);
1901 flag_inv (tmp, flag); 1969 flag_inv (tmp, flag);
1902 } 1970 }
1903} 1971}
1904 1972
1905/* 1973/*
1906 * deactivate recursively a flag on an object inventory 1974 * deactivate recursively a flag on an object inventory
1907 */ 1975 */
1908void 1976void
1909unflag_inv (object *op, int flag) 1977unflag_inv (object *op, int flag)
1910{ 1978{
1911 if (op->inv)
1912 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1979 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1913 { 1980 {
1914 CLEAR_FLAG (tmp, flag); 1981 CLEAR_FLAG (tmp, flag);
1915 unflag_inv (tmp, flag); 1982 unflag_inv (tmp, flag);
1916 } 1983 }
1917}
1918
1919/*
1920 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1921 * all it's inventory (recursively).
1922 * If checksums are used, a player will get set_cheat called for
1923 * him/her-self and all object carried by a call to this function.
1924 */
1925void
1926set_cheat (object *op)
1927{
1928 SET_FLAG (op, FLAG_WAS_WIZ);
1929 flag_inv (op, FLAG_WAS_WIZ);
1930} 1984}
1931 1985
1932/* 1986/*
1933 * find_free_spot(object, map, x, y, start, stop) will search for 1987 * find_free_spot(object, map, x, y, start, stop) will search for
1934 * a spot at the given map and coordinates which will be able to contain 1988 * a spot at the given map and coordinates which will be able to contain
1936 * to search (see the freearr_x/y[] definition). 1990 * to search (see the freearr_x/y[] definition).
1937 * It returns a random choice among the alternatives found. 1991 * It returns a random choice among the alternatives found.
1938 * start and stop are where to start relative to the free_arr array (1,9 1992 * start and stop are where to start relative to the free_arr array (1,9
1939 * does all 4 immediate directions). This returns the index into the 1993 * does all 4 immediate directions). This returns the index into the
1940 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1994 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1941 * Note - this only checks to see if there is space for the head of the
1942 * object - if it is a multispace object, this should be called for all
1943 * pieces.
1944 * Note2: This function does correctly handle tiled maps, but does not 1995 * Note: This function does correctly handle tiled maps, but does not
1945 * inform the caller. However, insert_ob_in_map will update as 1996 * inform the caller. However, insert_ob_in_map will update as
1946 * necessary, so the caller shouldn't need to do any special work. 1997 * necessary, so the caller shouldn't need to do any special work.
1947 * Note - updated to take an object instead of archetype - this is necessary 1998 * Note - updated to take an object instead of archetype - this is necessary
1948 * because arch_blocked (now ob_blocked) needs to know the movement type 1999 * because arch_blocked (now ob_blocked) needs to know the movement type
1949 * to know if the space in question will block the object. We can't use 2000 * to know if the space in question will block the object. We can't use
1951 * customized, changed states, etc. 2002 * customized, changed states, etc.
1952 */ 2003 */
1953int 2004int
1954find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2005find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1955{ 2006{
2007 int altern[SIZEOFFREE];
1956 int index = 0, flag; 2008 int index = 0, flag;
1957 int altern[SIZEOFFREE];
1958 2009
1959 for (int i = start; i < stop; i++) 2010 for (int i = start; i < stop; i++)
1960 { 2011 {
1961 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2012 mapxy pos (m, x, y); pos.move (i);
1962 if (!flag) 2013
2014 if (!pos.normalise ())
2015 continue;
2016
2017 mapspace &ms = *pos;
2018
2019 if (ms.flags () & P_IS_ALIVE)
2020 continue;
2021
2022 /* However, often
2023 * ob doesn't have any move type (when used to place exits)
2024 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2025 */
2026 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2027 {
1963 altern [index++] = i; 2028 altern [index++] = i;
2029 continue;
2030 }
1964 2031
1965 /* Basically, if we find a wall on a space, we cut down the search size. 2032 /* Basically, if we find a wall on a space, we cut down the search size.
1966 * In this way, we won't return spaces that are on another side of a wall. 2033 * In this way, we won't return spaces that are on another side of a wall.
1967 * This mostly work, but it cuts down the search size in all directions - 2034 * This mostly work, but it cuts down the search size in all directions -
1968 * if the space being examined only has a wall to the north and empty 2035 * if the space being examined only has a wall to the north and empty
1969 * spaces in all the other directions, this will reduce the search space 2036 * spaces in all the other directions, this will reduce the search space
1970 * to only the spaces immediately surrounding the target area, and 2037 * to only the spaces immediately surrounding the target area, and
1971 * won't look 2 spaces south of the target space. 2038 * won't look 2 spaces south of the target space.
1972 */ 2039 */
1973 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2040 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2041 {
1974 stop = maxfree[i]; 2042 stop = maxfree[i];
2043 continue;
2044 }
2045
2046 /* Note it is intentional that we check ob - the movement type of the
2047 * head of the object should correspond for the entire object.
2048 */
2049 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2050 continue;
2051
2052 if (ob->blocked (m, pos.x, pos.y))
2053 continue;
2054
2055 altern [index++] = i;
1975 } 2056 }
1976 2057
1977 if (!index) 2058 if (!index)
1978 return -1; 2059 return -1;
1979 2060
1988 */ 2069 */
1989int 2070int
1990find_first_free_spot (const object *ob, maptile *m, int x, int y) 2071find_first_free_spot (const object *ob, maptile *m, int x, int y)
1991{ 2072{
1992 for (int i = 0; i < SIZEOFFREE; i++) 2073 for (int i = 0; i < SIZEOFFREE; i++)
1993 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2074 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
1994 return i; 2075 return i;
1995 2076
1996 return -1; 2077 return -1;
1997} 2078}
1998 2079
2052 object *tmp; 2133 object *tmp;
2053 maptile *mp; 2134 maptile *mp;
2054 2135
2055 MoveType blocked, move_type; 2136 MoveType blocked, move_type;
2056 2137
2057 if (exclude && exclude->head) 2138 if (exclude && exclude->head_ () != exclude)
2058 { 2139 {
2059 exclude = exclude->head; 2140 exclude = exclude->head;
2060 move_type = exclude->move_type; 2141 move_type = exclude->move_type;
2061 } 2142 }
2062 else 2143 else
2085 max = maxfree[i]; 2166 max = maxfree[i];
2086 else if (mflags & P_IS_ALIVE) 2167 else if (mflags & P_IS_ALIVE)
2087 { 2168 {
2088 for (tmp = ms.bot; tmp; tmp = tmp->above) 2169 for (tmp = ms.bot; tmp; tmp = tmp->above)
2089 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2170 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2090 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2171 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2091 break; 2172 break;
2092 2173
2093 if (tmp) 2174 if (tmp)
2094 return freedir[i]; 2175 return freedir[i];
2095 } 2176 }
2275 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2356 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2276 * core dumps if they do. 2357 * core dumps if they do.
2277 * 2358 *
2278 * Add a check so we can't pick up invisible objects (0.93.8) 2359 * Add a check so we can't pick up invisible objects (0.93.8)
2279 */ 2360 */
2280
2281int 2361int
2282can_pick (const object *who, const object *item) 2362can_pick (const object *who, const object *item)
2283{ 2363{
2284 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2285 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2290 * create clone from object to another 2370 * create clone from object to another
2291 */ 2371 */
2292object * 2372object *
2293object_create_clone (object *asrc) 2373object_create_clone (object *asrc)
2294{ 2374{
2295 object *dst = 0, *tmp, *src, *part, *prev, *item; 2375 object *dst = 0, *tmp, *src, *prev, *item;
2296 2376
2297 if (!asrc) 2377 if (!asrc)
2298 return 0; 2378 return 0;
2299 2379
2300 src = asrc;
2301 if (src->head)
2302 src = src->head; 2380 src = asrc->head_ ();
2303 2381
2304 prev = 0; 2382 prev = 0;
2305 for (part = src; part; part = part->more) 2383 for (object *part = src; part; part = part->more)
2306 { 2384 {
2307 tmp = part->clone (); 2385 tmp = part->clone ();
2308 tmp->x -= src->x; 2386 tmp->x -= src->x;
2309 tmp->y -= src->y; 2387 tmp->y -= src->y;
2310 2388
2326 2404
2327 for (item = src->inv; item; item = item->below) 2405 for (item = src->inv; item; item = item->below)
2328 insert_ob_in_ob (object_create_clone (item), dst); 2406 insert_ob_in_ob (object_create_clone (item), dst);
2329 2407
2330 return dst; 2408 return dst;
2331}
2332
2333/* GROS - Creates an object using a string representing its content. */
2334/* Basically, we save the content of the string to a temp file, then call */
2335/* load_object on it. I admit it is a highly inefficient way to make things, */
2336/* but it was simple to make and allows reusing the load_object function. */
2337/* Remember not to use load_object_str in a time-critical situation. */
2338/* Also remember that multiparts objects are not supported for now. */
2339object *
2340load_object_str (const char *obstr)
2341{
2342 object *op;
2343 char filename[MAX_BUF];
2344
2345 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2346
2347 FILE *tempfile = fopen (filename, "w");
2348
2349 if (tempfile == NULL)
2350 {
2351 LOG (llevError, "Error - Unable to access load object temp file\n");
2352 return NULL;
2353 }
2354
2355 fprintf (tempfile, obstr);
2356 fclose (tempfile);
2357
2358 op = object::create ();
2359
2360 object_thawer thawer (filename);
2361
2362 if (thawer)
2363 load_object (thawer, op, 0);
2364
2365 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2366 CLEAR_FLAG (op, FLAG_REMOVED);
2367
2368 return op;
2369} 2409}
2370 2410
2371/* This returns the first object in who's inventory that 2411/* This returns the first object in who's inventory that
2372 * has the same type and subtype match. 2412 * has the same type and subtype match.
2373 * returns NULL if no match. 2413 * returns NULL if no match.
2428 if (link->key == canonical_key) 2468 if (link->key == canonical_key)
2429 return link->value; 2469 return link->value;
2430 2470
2431 return 0; 2471 return 0;
2432} 2472}
2433
2434 2473
2435/* 2474/*
2436 * Updates the canonical_key in op to value. 2475 * Updates the canonical_key in op to value.
2437 * 2476 *
2438 * canonical_key is a shared string (value doesn't have to be). 2477 * canonical_key is a shared string (value doesn't have to be).
2462 /* Basically, if the archetype has this key set, 2501 /* Basically, if the archetype has this key set,
2463 * we need to store the null value so when we save 2502 * we need to store the null value so when we save
2464 * it, we save the empty value so that when we load, 2503 * it, we save the empty value so that when we load,
2465 * we get this value back again. 2504 * we get this value back again.
2466 */ 2505 */
2467 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2506 if (get_ob_key_link (op->arch, canonical_key))
2468 field->value = 0; 2507 field->value = 0;
2469 else 2508 else
2470 { 2509 {
2471 if (last) 2510 if (last)
2472 last->next = field->next; 2511 last->next = field->next;
2541 } 2580 }
2542 else 2581 else
2543 item = item->env; 2582 item = item->env;
2544} 2583}
2545 2584
2546
2547const char * 2585const char *
2548object::flag_desc (char *desc, int len) const 2586object::flag_desc (char *desc, int len) const
2549{ 2587{
2550 char *p = desc; 2588 char *p = desc;
2551 bool first = true; 2589 bool first = true;
2578{ 2616{
2579 char flagdesc[512]; 2617 char flagdesc[512];
2580 char info2[256 * 4]; 2618 char info2[256 * 4];
2581 char *p = info; 2619 char *p = info;
2582 2620
2583 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2621 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2584 count, uuid.seq, 2622 count,
2623 uuid.c_str (),
2585 &name, 2624 &name,
2586 title ? "\",title:\"" : "", 2625 title ? "\",title:\"" : "",
2587 title ? (const char *)title : "", 2626 title ? (const char *)title : "",
2588 flag_desc (flagdesc, 512), type); 2627 flag_desc (flagdesc, 512), type);
2589 2628
2590 if (env) 2629 if (!this->flag[FLAG_REMOVED] && env)
2591 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2630 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2592 2631
2593 if (map) 2632 if (map)
2594 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2633 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2595 2634
2597} 2636}
2598 2637
2599const char * 2638const char *
2600object::debug_desc () const 2639object::debug_desc () const
2601{ 2640{
2602 static char info[256 * 4]; 2641 static char info[3][256 * 4];
2642 static int info_idx;
2643
2603 return debug_desc (info); 2644 return debug_desc (info [++info_idx % 3]);
2604}
2605
2606const char *
2607object::debug_desc2 () const
2608{
2609 static char info[256 * 4];
2610 return debug_desc (info);
2611} 2645}
2612 2646
2613struct region * 2647struct region *
2614object::region () const 2648object::region () const
2615{ 2649{
2616 return map ? map->region (x, y) 2650 return map ? map->region (x, y)
2617 : region::default_region (); 2651 : region::default_region ();
2618} 2652}
2619 2653
2654const materialtype_t *
2655object::dominant_material () const
2656{
2657 if (materialtype_t *mt = name_to_material (materialname))
2658 return mt;
2659
2660 return name_to_material (shstr_unknown);
2661}
2662
2663void
2664object::open_container (object *new_container)
2665{
2666 if (container == new_container)
2667 return;
2668
2669 if (object *old_container = container)
2670 {
2671 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2672 return;
2673
2674#if 0
2675 // remove the "Close old_container" object.
2676 if (object *closer = old_container->inv)
2677 if (closer->type == CLOSE_CON)
2678 closer->destroy ();
2679#endif
2680
2681 old_container->flag [FLAG_APPLIED] = 0;
2682 container = 0;
2683
2684 esrv_update_item (UPD_FLAGS, this, old_container);
2685 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2686 play_sound (sound_find ("chest_close"));
2687 }
2688
2689 if (new_container)
2690 {
2691 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2692 return;
2693
2694 // TODO: this does not seem to serve any purpose anymore?
2695#if 0
2696 // insert the "Close Container" object.
2697 if (archetype *closer = new_container->other_arch)
2698 {
2699 object *closer = arch_to_object (new_container->other_arch);
2700 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2701 new_container->insert (closer);
2702 }
2703#endif
2704
2705 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2706
2707 new_container->flag [FLAG_APPLIED] = 1;
2708 container = new_container;
2709
2710 esrv_update_item (UPD_FLAGS, this, new_container);
2711 esrv_send_inventory (this, new_container);
2712 play_sound (sound_find ("chest_open"));
2713 }
2714}
2715
2716object *
2717object::force_find (const shstr name)
2718{
2719 /* cycle through his inventory to look for the MARK we want to
2720 * place
2721 */
2722 for (object *tmp = inv; tmp; tmp = tmp->below)
2723 if (tmp->type == FORCE && tmp->slaying == name)
2724 return splay (tmp);
2725
2726 return 0;
2727}
2728
2729void
2730object::force_add (const shstr name, int duration)
2731{
2732 if (object *force = force_find (name))
2733 force->destroy ();
2734
2735 object *force = get_archetype (FORCE_NAME);
2736
2737 force->slaying = name;
2738 force->stats.food = 1;
2739 force->speed_left = -1.f;
2740
2741 force->set_speed (duration ? 1.f / duration : 0.f);
2742 force->flag [FLAG_IS_USED_UP] = true;
2743 force->flag [FLAG_APPLIED] = true;
2744
2745 insert (force);
2746}
2747
2748void
2749object::play_sound (faceidx sound) const
2750{
2751 if (!sound)
2752 return;
2753
2754 if (flag [FLAG_REMOVED])
2755 return;
2756
2757 if (env)
2758 {
2759 if (object *pl = in_player ())
2760 pl->contr->play_sound (sound);
2761 }
2762 else
2763 map->play_sound (sound, x, y);
2764}
2765

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines