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.81 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.193 by root, Mon Oct 15 17:50:27 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your 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 GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
27#include <global.h> 27#include <global.h>
28#include <stdio.h> 28#include <stdio.h>
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
33#include <loader.h> 34#include <loader.h>
34 35
35#include <bitset> 36#include <bitset>
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short 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] = { 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,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -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
45}; 47};
46short 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, 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,
141 * objects with lists are rare, and lists stay short. If not, use a 143 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 144 * different structure or at least keep the lists sorted...
143 */ 145 */
144 146
145 /* For each field in wants, */ 147 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 149 {
148 key_value *has_field; 150 key_value *has_field;
149 151
150 /* Look for a field in has with the same key. */ 152 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 153 has_field = get_ob_key_link (has, wants_field->key);
190 * Check nrof variable *before* calling can_merge() 192 * Check nrof variable *before* calling can_merge()
191 * 193 *
192 * Improvements made with merge: Better checking on potion, and also 194 * Improvements made with merge: Better checking on potion, and also
193 * check weight 195 * check weight
194 */ 196 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 197bool object::can_merge_slow (object *ob1, object *ob2)
197{ 198{
198 /* A couple quicksanity checks */ 199 /* A couple quicksanity checks */
199 if (ob1 == ob2 200 if (ob1 == ob2
200 || ob1->type != ob2->type 201 || ob1->type != ob2->type
253 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
254 * check all objects in the inventory. 255 * check all objects in the inventory.
255 */ 256 */
256 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
257 { 258 {
258 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
260 return 0;
261 261
262 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
263 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
264 return 0; 266 return 0; /* inventory objexts differ */
265 267
266 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
267 * if it is valid. 269 * if it is valid.
268 */ 270 */
269 } 271 }
277 279
278 /* Note sure why the following is the case - either the object has to 280 /* Note sure why the following is the case - either the object has to
279 * be animated or have a very low speed. Is this an attempted monster 281 * be animated or have a very low speed. Is this an attempted monster
280 * check? 282 * check?
281 */ 283 */
282 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283 return 0; 285 return 0;
284 286
285 switch (ob1->type) 287 switch (ob1->type)
286 { 288 {
287 case SCROLL: 289 case SCROLL:
298 return 0; 300 return 0;
299 else if (!compare_ob_value_lists (ob1, ob2)) 301 else if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 302 return 0;
301 } 303 }
302 304
303 //TODO: generate an event or call into perl for additional checks
304 if (ob1->self || ob2->self) 305 if (ob1->self || ob2->self)
305 { 306 {
306 ob1->optimise (); 307 ob1->optimise ();
307 ob2->optimise (); 308 ob2->optimise ();
308 309
309 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 {
312 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
314
315 if (k1 != k2)
310 return 0; 316 return 0;
317 else if (k1 == 0)
318 return 1;
319 else if (!cfperl_can_merge (ob1, ob2))
320 return 0;
321 }
311 } 322 }
312 323
313 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
314 return 1; 325 return 1;
315} 326}
323sum_weight (object *op) 334sum_weight (object *op)
324{ 335{
325 long sum; 336 long sum;
326 object *inv; 337 object *inv;
327 338
328 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 339 for (sum = 0, inv = op->inv; inv; inv = inv->below)
329 { 340 {
330 if (inv->inv) 341 if (inv->inv)
331 sum_weight (inv); 342 sum_weight (inv);
343
332 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 344 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333 } 345 }
334 346
335 if (op->type == CONTAINER && op->stats.Str) 347 if (op->type == CONTAINER && op->stats.Str)
336 sum = (sum * (100 - op->stats.Str)) / 100; 348 sum = (sum * (100 - op->stats.Str)) / 100;
356/* 368/*
357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 369 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358 * Some error messages. 370 * Some error messages.
359 * The result of the dump is stored in the static global errmsg array. 371 * The result of the dump is stored in the static global errmsg array.
360 */ 372 */
361
362char * 373char *
363dump_object (object *op) 374dump_object (object *op)
364{ 375{
365 if (!op) 376 if (!op)
366 return strdup ("[NULLOBJ]"); 377 return strdup ("[NULLOBJ]");
367 378
368 object_freezer freezer; 379 object_freezer freezer;
369 save_object (freezer, op, 3); 380 op->write (freezer);
370 return freezer.as_string (); 381 return freezer.as_string ();
371} 382}
372 383
373/* 384/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 385 * get_nearest_part(multi-object, object 2) returns the part of the
375 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
377 */ 388 */
378
379object * 389object *
380get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
381{ 391{
382 object *tmp, *closest; 392 object *tmp, *closest;
383 int last_dist, i; 393 int last_dist, i;
391} 401}
392 402
393/* 403/*
394 * Returns the object which has the count-variable equal to the argument. 404 * Returns the object which has the count-variable equal to the argument.
395 */ 405 */
396
397object * 406object *
398find_object (tag_t i) 407find_object (tag_t i)
399{ 408{
400 for (object *op = object::first; op; op = op->next) 409 for_all_objects (op)
401 if (op->count == i) 410 if (op->count == i)
402 return op; 411 return op;
403 412
404 return 0; 413 return 0;
405} 414}
406 415
407/* 416/*
408 * Returns the first object which has a name equal to the argument. 417 * Returns the first object which has a name equal to the argument.
409 * Used only by the patch command, but not all that useful. 418 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 419 * Enables features like "patch <name-of-other-player> food 999"
411 */ 420 */
412
413object * 421object *
414find_object_name (const char *str) 422find_object_name (const char *str)
415{ 423{
416 shstr_cmp str_ (str); 424 shstr_cmp str_ (str);
417 object *op; 425 object *op;
418 426
419 for (op = object::first; op != NULL; op = op->next) 427 for_all_objects (op)
420 if (op->name == str_) 428 if (op->name == str_)
421 break; 429 break;
422 430
423 return op; 431 return op;
424} 432}
430} 438}
431 439
432/* 440/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 441 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
435 */ 444 */
436void 445void
437object::set_owner (object *owner) 446object::set_owner (object *owner)
438{ 447{
448 // allow objects which own objects
439 if (!owner) 449 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 450 while (owner->owner)
450 owner = owner->owner; 451 owner = owner->owner;
451 452
452 this->owner = owner; 453 this->owner = owner;
454}
455
456int
457object::slottype () const
458{
459 if (type == SKILL)
460 {
461 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
462 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
463 }
464 else
465 {
466 if (slot [body_combat].info) return slot_combat;
467 if (slot [body_range ].info) return slot_ranged;
468 }
469
470 return slot_none;
471}
472
473bool
474object::change_weapon (object *ob)
475{
476 if (current_weapon == ob)
477 return true;
478
479 if (chosen_skill)
480 chosen_skill->flag [FLAG_APPLIED] = false;
481
482 current_weapon = ob;
483 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
484
485 if (chosen_skill)
486 chosen_skill->flag [FLAG_APPLIED] = true;
487
488 update_stats ();
489
490 if (ob)
491 {
492 // now check wether any body locations became invalid, in which case
493 // we cannot apply the weapon at the moment.
494 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
495 if (slot[i].used < 0)
496 {
497 current_weapon = chosen_skill = 0;
498 update_stats ();
499
500 new_draw_info_format (NDI_UNIQUE, 0, this,
501 "You try to balance all your items at once, "
502 "but the %s is just too much for your body. "
503 "[You need to unapply some items first.]", &ob->name);
504 return false;
505 }
506
507 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
508 }
509 else
510 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
511
512 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
513 {
514 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
515 &name, ob->debug_desc ());
516 return false;
517 }
518
519 return true;
453} 520}
454 521
455/* Zero the key_values on op, decrementing the shared-string 522/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 523 * refcounts and freeing the links.
457 */ 524 */
458static void 525static void
459free_key_values (object *op) 526free_key_values (object *op)
460{ 527{
461 for (key_value *i = op->key_values; i != 0;) 528 for (key_value *i = op->key_values; i; )
462 { 529 {
463 key_value *next = i->next; 530 key_value *next = i->next;
464 delete i; 531 delete i;
465 532
466 i = next; 533 i = next;
467 } 534 }
468 535
469 op->key_values = 0; 536 op->key_values = 0;
470} 537}
471 538
472/* 539object &
473 * copy_to first frees everything allocated by the dst object, 540object::operator =(const object &src)
474 * and then copies the contents of itself into the second
475 * object, allocating what needs to be allocated. Basically, any
476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
477 * if the first object is freed, the pointers in the new object
478 * will point at garbage.
479 */
480void
481object::copy_to (object *dst)
482{ 541{
483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 542 bool is_freed = flag [FLAG_FREED];
484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 543 bool is_removed = flag [FLAG_REMOVED];
485 544
486 *(object_copy *)dst = *this; 545 *(object_copy *)this = src;
487 546
488 if (self || cb) 547 flag [FLAG_FREED] = is_freed;
489 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 548 flag [FLAG_REMOVED] = is_removed;
490
491 if (is_freed)
492 SET_FLAG (dst, FLAG_FREED);
493
494 if (is_removed)
495 SET_FLAG (dst, FLAG_REMOVED);
496
497 if (speed < 0)
498 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
499 549
500 /* Copy over key_values, if any. */ 550 /* Copy over key_values, if any. */
501 if (key_values) 551 if (src.key_values)
502 { 552 {
503 key_value *tail = 0; 553 key_value *tail = 0;
504 key_value *i;
505
506 dst->key_values = 0; 554 key_values = 0;
507 555
508 for (i = key_values; i; i = i->next) 556 for (key_value *i = src.key_values; i; i = i->next)
509 { 557 {
510 key_value *new_link = new key_value; 558 key_value *new_link = new key_value;
511 559
512 new_link->next = 0; 560 new_link->next = 0;
513 new_link->key = i->key; 561 new_link->key = i->key;
514 new_link->value = i->value; 562 new_link->value = i->value;
515 563
516 /* Try and be clever here, too. */ 564 /* Try and be clever here, too. */
517 if (!dst->key_values) 565 if (!key_values)
518 { 566 {
519 dst->key_values = new_link; 567 key_values = new_link;
520 tail = new_link; 568 tail = new_link;
521 } 569 }
522 else 570 else
523 { 571 {
524 tail->next = new_link; 572 tail->next = new_link;
525 tail = new_link; 573 tail = new_link;
526 } 574 }
527 } 575 }
528 } 576 }
577}
529 578
530 update_ob_speed (dst); 579/*
580 * copy_to first frees everything allocated by the dst object,
581 * and then copies the contents of itself into the second
582 * object, allocating what needs to be allocated. Basically, any
583 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
584 * if the first object is freed, the pointers in the new object
585 * will point at garbage.
586 */
587void
588object::copy_to (object *dst)
589{
590 *dst = *this;
591
592 if (speed < 0)
593 dst->speed_left -= rndm ();
594
595 dst->set_speed (dst->speed);
596}
597
598void
599object::instantiate ()
600{
601 if (!uuid.seq) // HACK
602 uuid = gen_uuid ();
603
604 speed_left = -0.1f;
605 /* copy the body_info to the body_used - this is only really
606 * need for monsters, but doesn't hurt to do it for everything.
607 * by doing so, when a monster is created, it has good starting
608 * values for the body_used info, so when items are created
609 * for it, they can be properly equipped.
610 */
611 for (int i = NUM_BODY_LOCATIONS; i--; )
612 slot[i].used = slot[i].info;
613
614 attachable::instantiate ();
531} 615}
532 616
533object * 617object *
534object::clone () 618object::clone ()
535{ 619{
541/* 625/*
542 * If an object with the IS_TURNABLE() flag needs to be turned due 626 * If an object with the IS_TURNABLE() flag needs to be turned due
543 * to the closest player being on the other side, this function can 627 * to the closest player being on the other side, this function can
544 * be called to update the face variable, _and_ how it looks on the map. 628 * be called to update the face variable, _and_ how it looks on the map.
545 */ 629 */
546
547void 630void
548update_turn_face (object *op) 631update_turn_face (object *op)
549{ 632{
550 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 633 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551 return; 634 return;
635
552 SET_ANIMATION (op, op->direction); 636 SET_ANIMATION (op, op->direction);
553 update_object (op, UP_OBJ_FACE); 637 update_object (op, UP_OBJ_FACE);
554} 638}
555 639
556/* 640/*
557 * Updates the speed of an object. If the speed changes from 0 to another 641 * Updates the speed of an object. If the speed changes from 0 to another
558 * value, or vice versa, then add/remove the object from the active list. 642 * value, or vice versa, then add/remove the object from the active list.
559 * This function needs to be called whenever the speed of an object changes. 643 * This function needs to be called whenever the speed of an object changes.
560 */ 644 */
561void 645void
562update_ob_speed (object *op) 646object::set_speed (float speed)
563{ 647{
564 extern int arch_init; 648 if (flag [FLAG_FREED] && speed)
565
566 /* No reason putting the archetypes objects on the speed list,
567 * since they never really need to be updated.
568 */
569
570 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571 { 649 {
572 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 650 LOG (llevError, "Object %s is freed but has speed.\n", &name);
573#ifdef MANY_CORES
574 abort ();
575#else
576 op->speed = 0; 651 speed = 0;
577#endif
578 }
579
580 if (arch_init)
581 return;
582
583 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584 { 652 }
585 /* If already on active list, don't do anything */
586 if (op->active_next || op->active_prev || op == active_objects)
587 return;
588 653
589 /* process_events() expects us to insert the object at the beginning 654 this->speed = speed;
590 * of the list. */
591 op->active_next = active_objects;
592 655
593 if (op->active_next != NULL) 656 if (has_active_speed ())
594 op->active_next->active_prev = op; 657 activate ();
595
596 active_objects = op;
597 }
598 else 658 else
599 { 659 deactivate ();
600 /* If not on the active list, nothing needs to be done */
601 if (!op->active_next && !op->active_prev && op != active_objects)
602 return;
603
604 if (op->active_prev == NULL)
605 {
606 active_objects = op->active_next;
607
608 if (op->active_next != NULL)
609 op->active_next->active_prev = NULL;
610 }
611 else
612 {
613 op->active_prev->active_next = op->active_next;
614
615 if (op->active_next)
616 op->active_next->active_prev = op->active_prev;
617 }
618
619 op->active_next = NULL;
620 op->active_prev = NULL;
621 }
622}
623
624/* This function removes object 'op' from the list of active
625 * objects.
626 * This should only be used for style maps or other such
627 * reference maps where you don't want an object that isn't
628 * in play chewing up cpu time getting processed.
629 * The reverse of this is to call update_ob_speed, which
630 * will do the right thing based on the speed of the object.
631 */
632void
633remove_from_active_list (object *op)
634{
635 /* If not on the active list, nothing needs to be done */
636 if (!op->active_next && !op->active_prev && op != active_objects)
637 return;
638
639 if (op->active_prev == NULL)
640 {
641 active_objects = op->active_next;
642 if (op->active_next != NULL)
643 op->active_next->active_prev = NULL;
644 }
645 else
646 {
647 op->active_prev->active_next = op->active_next;
648 if (op->active_next)
649 op->active_next->active_prev = op->active_prev;
650 }
651 op->active_next = NULL;
652 op->active_prev = NULL;
653} 660}
654 661
655/* 662/*
656 * update_object() updates the the map. 663 * update_object() updates the the map.
657 * It takes into account invisible objects (and represent squares covered 664 * It takes into account invisible objects (and represent squares covered
670 * UP_OBJ_FACE: only the objects face has changed. 677 * UP_OBJ_FACE: only the objects face has changed.
671 */ 678 */
672void 679void
673update_object (object *op, int action) 680update_object (object *op, int action)
674{ 681{
675 MoveType move_on, move_off, move_block, move_slow;
676
677 if (op == NULL) 682 if (op == NULL)
678 { 683 {
679 /* this should never happen */ 684 /* this should never happen */
680 LOG (llevDebug, "update_object() called for NULL object.\n"); 685 LOG (llevDebug, "update_object() called for NULL object.\n");
681 return; 686 return;
694 */ 699 */
695 if (!op->map || op->map->in_memory == MAP_SAVING) 700 if (!op->map || op->map->in_memory == MAP_SAVING)
696 return; 701 return;
697 702
698 /* make sure the object is within map boundaries */ 703 /* make sure the object is within map boundaries */
699 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 704 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700 { 705 {
701 LOG (llevError, "update_object() called for object out of map!\n"); 706 LOG (llevError, "update_object() called for object out of map!\n");
702#ifdef MANY_CORES 707#ifdef MANY_CORES
703 abort (); 708 abort ();
704#endif 709#endif
705 return; 710 return;
706 } 711 }
707 712
708 mapspace &m = op->ms (); 713 mapspace &m = op->ms ();
709 714
710 if (m.flags_ & P_NEED_UPDATE) 715 if (!(m.flags_ & P_UPTODATE))
711 /* nop */; 716 /* nop */;
712 else if (action == UP_OBJ_INSERT) 717 else if (action == UP_OBJ_INSERT)
713 { 718 {
714 // this is likely overkill, TODO: revisit (schmorp) 719 // this is likely overkill, TODO: revisit (schmorp)
715 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 720 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
724 /* This isn't perfect, but I don't expect a lot of objects to 729 /* This isn't perfect, but I don't expect a lot of objects to
725 * to have move_allow right now. 730 * to have move_allow right now.
726 */ 731 */
727 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 732 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
728 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 733 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729 m.flags_ = P_NEED_UPDATE; 734 m.flags_ = 0;
730 } 735 }
731 /* if the object is being removed, we can't make intelligent 736 /* if the object is being removed, we can't make intelligent
732 * decisions, because remove_ob can't really pass the object 737 * decisions, because remove_ob can't really pass the object
733 * that is being removed. 738 * that is being removed.
734 */ 739 */
735 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 740 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736 m.flags_ = P_NEED_UPDATE; 741 m.flags_ = 0;
737 else if (action == UP_OBJ_FACE) 742 else if (action == UP_OBJ_FACE)
738 /* Nothing to do for that case */ ; 743 /* Nothing to do for that case */ ;
739 else 744 else
740 LOG (llevError, "update_object called with invalid action: %d\n", action); 745 LOG (llevError, "update_object called with invalid action: %d\n", action);
741 746
742 if (op->more) 747 if (op->more)
743 update_object (op->more, action); 748 update_object (op->more, action);
744} 749}
745 750
746object::vector object::mortals;
747object::vector object::objects; // not yet used
748object *object::first;
749
750void object::free_mortals ()
751{
752 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753 if ((*i)->refcnt)
754 ++i; // further delay freeing
755 else
756 {
757 delete *i;
758 mortals.erase (i);
759 }
760}
761
762object::object () 751object::object ()
763{ 752{
764 SET_FLAG (this, FLAG_REMOVED); 753 SET_FLAG (this, FLAG_REMOVED);
765 754
766 expmul = 1.0; 755 expmul = 1.0;
767 face = blank_face; 756 face = blank_face;
768} 757}
769 758
770object::~object () 759object::~object ()
771{ 760{
761 unlink ();
762
772 free_key_values (this); 763 free_key_values (this);
773} 764}
774 765
766static int object_count;
767
775void object::link () 768void object::link ()
776{ 769{
777 count = ++ob_count; 770 assert (!index);//D
778 uuid = gen_uuid (); 771 uuid = gen_uuid ();
772 count = ++object_count;
779 773
780 prev = 0; 774 refcnt_inc ();
781 next = object::first; 775 objects.insert (this);
782
783 if (object::first)
784 object::first->prev = this;
785
786 object::first = this;
787} 776}
788 777
789void object::unlink () 778void object::unlink ()
790{ 779{
791 if (this == object::first) 780 if (!index)
792 object::first = next; 781 return;
793 782
794 /* Remove this object from the list of used objects */ 783 objects.erase (this);
795 if (prev) prev->next = next; 784 refcnt_dec ();
796 if (next) next->prev = prev; 785}
797 786
798 prev = 0; 787void
799 next = 0; 788object::activate ()
789{
790 /* If already on active list, don't do anything */
791 if (active)
792 return;
793
794 if (has_active_speed ())
795 actives.insert (this);
796}
797
798void
799object::activate_recursive ()
800{
801 activate ();
802
803 for (object *op = inv; op; op = op->below)
804 op->activate_recursive ();
805}
806
807/* This function removes object 'op' from the list of active
808 * objects.
809 * This should only be used for style maps or other such
810 * reference maps where you don't want an object that isn't
811 * in play chewing up cpu time getting processed.
812 * The reverse of this is to call update_ob_speed, which
813 * will do the right thing based on the speed of the object.
814 */
815void
816object::deactivate ()
817{
818 /* If not on the active list, nothing needs to be done */
819 if (!active)
820 return;
821
822 actives.erase (this);
823}
824
825void
826object::deactivate_recursive ()
827{
828 for (object *op = inv; op; op = op->below)
829 op->deactivate_recursive ();
830
831 deactivate ();
832}
833
834void
835object::set_flag_inv (int flag, int value)
836{
837 for (object *op = inv; op; op = op->below)
838 {
839 op->flag [flag] = value;
840 op->set_flag_inv (flag, value);
841 }
842}
843
844/*
845 * Remove and free all objects in the inventory of the given object.
846 * object.c ?
847 */
848void
849object::destroy_inv (bool drop_to_ground)
850{
851 // need to check first, because the checks below might segfault
852 // as we might be on an invalid mapspace and crossfire code
853 // is too buggy to ensure that the inventory is empty.
854 // corollary: if you create arrows etc. with stuff in tis inventory,
855 // cf will crash below with off-map x and y
856 if (!inv)
857 return;
858
859 /* Only if the space blocks everything do we not process -
860 * if some form of movement is allowed, let objects
861 * drop on that space.
862 */
863 if (!drop_to_ground
864 || !map
865 || map->in_memory != MAP_IN_MEMORY
866 || map->nodrop
867 || ms ().move_block == MOVE_ALL)
868 {
869 while (inv)
870 {
871 inv->destroy_inv (drop_to_ground);
872 inv->destroy ();
873 }
874 }
875 else
876 { /* Put objects in inventory onto this space */
877 while (inv)
878 {
879 object *op = inv;
880
881 if (op->flag [FLAG_STARTEQUIP]
882 || op->flag [FLAG_NO_DROP]
883 || op->type == RUNE
884 || op->type == TRAP
885 || op->flag [FLAG_IS_A_TEMPLATE]
886 || op->flag [FLAG_DESTROY_ON_DEATH])
887 op->destroy ();
888 else
889 map->insert (op, x, y);
890 }
891 }
800} 892}
801 893
802object *object::create () 894object *object::create ()
803{ 895{
804 object *op = new object; 896 object *op = new object;
805 op->link (); 897 op->link ();
806 return op; 898 return op;
807} 899}
808 900
809/* 901void
810 * free_object() frees everything allocated by an object, removes 902object::do_destroy ()
811 * it from the list of used objects, and puts it on the list of
812 * free objects. The IS_FREED() flag is set in the object.
813 * The object must have been removed by remove_ob() first for
814 * this function to succeed.
815 *
816 * If destroy_inventory is set, free inventory as well. Else drop items in
817 * inventory to the ground.
818 */
819void object::destroy (bool destroy_inventory)
820{ 903{
821 if (QUERY_FLAG (this, FLAG_FREED)) 904 attachable::do_destroy ();
822 return;
823 905
824 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 906 if (flag [FLAG_IS_LINKED])
907 remove_button_link (this);
908
909 if (flag [FLAG_FRIENDLY])
825 remove_friendly_object (this); 910 remove_friendly_object (this);
826 911
827 if (!QUERY_FLAG (this, FLAG_REMOVED)) 912 if (!flag [FLAG_REMOVED])
828 remove (); 913 remove ();
829 914
830 SET_FLAG (this, FLAG_FREED); 915 destroy_inv (true);
831 916
832 if (more) 917 deactivate ();
833 { 918 unlink ();
834 more->destroy (destroy_inventory);
835 more = 0;
836 }
837 919
838 if (inv) 920 flag [FLAG_FREED] = 1;
839 {
840 /* Only if the space blocks everything do we not process -
841 * if some form of movement is allowed, let objects
842 * drop on that space.
843 */
844 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845 {
846 object *op = inv;
847
848 while (op)
849 {
850 object *tmp = op->below;
851 op->destroy (destroy_inventory);
852 op = tmp;
853 }
854 }
855 else
856 { /* Put objects in inventory onto this space */
857 object *op = inv;
858
859 while (op)
860 {
861 object *tmp = op->below;
862
863 op->remove ();
864
865 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867 op->destroy ();
868 else
869 {
870 op->x = x;
871 op->y = y;
872 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873 }
874
875 op = tmp;
876 }
877 }
878 }
879 921
880 // hack to ensure that freed objects still have a valid map 922 // hack to ensure that freed objects still have a valid map
881 { 923 {
882 static maptile *freed_map; // freed objects are moved here to avoid crashes 924 static maptile *freed_map; // freed objects are moved here to avoid crashes
883 925
884 if (!freed_map) 926 if (!freed_map)
885 { 927 {
886 freed_map = new maptile; 928 freed_map = new maptile;
887 929
930 freed_map->path = "<freed objects map>";
888 freed_map->name = "/internal/freed_objects_map"; 931 freed_map->name = "/internal/freed_objects_map";
889 freed_map->width = 3; 932 freed_map->width = 3;
890 freed_map->height = 3; 933 freed_map->height = 3;
891 934
892 freed_map->allocate (); 935 freed_map->alloc ();
936 freed_map->in_memory = MAP_IN_MEMORY;
893 } 937 }
894 938
895 map = freed_map; 939 map = freed_map;
896 x = 1; 940 x = 1;
897 y = 1; 941 y = 1;
898 } 942 }
899 943
944 if (more)
945 {
946 more->destroy ();
947 more = 0;
948 }
949
950 head = 0;
951
900 // clear those pointers that likely might have circular references to us 952 // clear those pointers that likely might cause circular references
901 owner = 0; 953 owner = 0;
902 enemy = 0; 954 enemy = 0;
903 attacked_by = 0; 955 attacked_by = 0;
956 current_weapon = 0;
957}
904 958
905 // only relevant for players(?), but make sure of it anyways 959void
906 contr = 0; 960object::destroy (bool destroy_inventory)
961{
962 if (destroyed ())
963 return;
907 964
908 /* Remove object from the active list */ 965 if (destroy_inventory)
909 speed = 0; 966 destroy_inv (false);
910 update_ob_speed (this);
911 967
912 unlink (); 968 if (is_head ())
969 if (sound_destroy)
970 play_sound (sound_destroy);
971 else if (flag [FLAG_MONSTER])
972 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
913 973
914 mortals.push_back (this); 974 attachable::destroy ();
915} 975}
916 976
917/* 977/*
918 * sub_weight() recursively (outwards) subtracts a number from the 978 * sub_weight() recursively (outwards) subtracts a number from the
919 * weight of an object (and what is carried by it's environment(s)). 979 * weight of an object (and what is carried by it's environment(s)).
935 * This function removes the object op from the linked list of objects 995 * This function removes the object op from the linked list of objects
936 * which it is currently tied to. When this function is done, the 996 * which it is currently tied to. When this function is done, the
937 * object will have no environment. If the object previously had an 997 * object will have no environment. If the object previously had an
938 * environment, the x and y coordinates will be updated to 998 * environment, the x and y coordinates will be updated to
939 * the previous environment. 999 * the previous environment.
940 * Beware: This function is called from the editor as well!
941 */ 1000 */
942void 1001void
943object::remove () 1002object::do_remove ()
944{ 1003{
945 object *tmp, *last = 0; 1004 object *tmp, *last = 0;
946 object *otmp; 1005 object *otmp;
947 1006
948 int check_walk_off;
949
950 if (QUERY_FLAG (this, FLAG_REMOVED)) 1007 if (QUERY_FLAG (this, FLAG_REMOVED))
951 return; 1008 return;
952 1009
953 SET_FLAG (this, FLAG_REMOVED); 1010 SET_FLAG (this, FLAG_REMOVED);
1011 INVOKE_OBJECT (REMOVE, this);
954 1012
955 if (more) 1013 if (more)
956 more->remove (); 1014 more->remove ();
957 1015
958 /* 1016 /*
971 * to save cpu time. 1029 * to save cpu time.
972 */ 1030 */
973 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1031 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974 otmp->update_stats (); 1032 otmp->update_stats ();
975 1033
976 if (above != NULL) 1034 if (above)
977 above->below = below; 1035 above->below = below;
978 else 1036 else
979 env->inv = below; 1037 env->inv = below;
980 1038
981 if (below != NULL) 1039 if (below)
982 below->above = above; 1040 below->above = above;
983 1041
984 /* we set up values so that it could be inserted into 1042 /* we set up values so that it could be inserted into
985 * the map, but we don't actually do that - it is up 1043 * the map, but we don't actually do that - it is up
986 * to the caller to decide what we want to do. 1044 * to the caller to decide what we want to do.
990 above = 0, below = 0; 1048 above = 0, below = 0;
991 env = 0; 1049 env = 0;
992 } 1050 }
993 else if (map) 1051 else if (map)
994 { 1052 {
995 /* Re did the following section of code - it looks like it had 1053 if (type == PLAYER)
996 * lots of logic for things we no longer care about
997 */ 1054 {
1055 // leaving a spot always closes any open container on the ground
1056 if (container && !container->env)
1057 // this causes spurious floorbox updates, but it ensures
1058 // that the CLOSE event is being sent.
1059 close_container ();
1060
1061 --map->players;
1062 map->touch ();
1063 }
1064
1065 map->dirty = true;
1066 mapspace &ms = this->ms ();
998 1067
999 /* link the object above us */ 1068 /* link the object above us */
1000 if (above) 1069 if (above)
1001 above->below = below; 1070 above->below = below;
1002 else 1071 else
1003 map->at (x, y).top = below; /* we were top, set new top */ 1072 ms.top = below; /* we were top, set new top */
1004 1073
1005 /* Relink the object below us, if there is one */ 1074 /* Relink the object below us, if there is one */
1006 if (below) 1075 if (below)
1007 below->above = above; 1076 below->above = above;
1008 else 1077 else
1010 /* Nothing below, which means we need to relink map object for this space 1079 /* Nothing below, which means we need to relink map object for this space
1011 * use translated coordinates in case some oddness with map tiling is 1080 * use translated coordinates in case some oddness with map tiling is
1012 * evident 1081 * evident
1013 */ 1082 */
1014 if (GET_MAP_OB (map, x, y) != this) 1083 if (GET_MAP_OB (map, x, y) != this)
1015 {
1016 char *dump = dump_object (this);
1017 LOG (llevError,
1018 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1084 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1019 free (dump);
1020 dump = dump_object (GET_MAP_OB (map, x, y));
1021 LOG (llevError, "%s\n", dump);
1022 free (dump);
1023 }
1024 1085
1025 map->at (x, y).bottom = above; /* goes on above it. */ 1086 ms.bot = above; /* goes on above it. */
1026 } 1087 }
1027 1088
1028 above = 0; 1089 above = 0;
1029 below = 0; 1090 below = 0;
1030 1091
1031 if (map->in_memory == MAP_SAVING) 1092 if (map->in_memory == MAP_SAVING)
1032 return; 1093 return;
1033 1094
1034 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1095 int check_walk_off = !flag [FLAG_NO_APPLY];
1035 1096
1097 if (object *pl = ms.player ())
1098 {
1099 if (pl->container == this)
1100 /* If a container that the player is currently using somehow gets
1101 * removed (most likely destroyed), update the player view
1102 * appropriately.
1103 */
1104 pl->close_container ();
1105
1106 pl->contr->ns->floorbox_update ();
1107 }
1108
1036 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1109 for (tmp = ms.bot; tmp; tmp = tmp->above)
1037 { 1110 {
1038 /* No point updating the players look faces if he is the object 1111 /* No point updating the players look faces if he is the object
1039 * being removed. 1112 * being removed.
1040 */ 1113 */
1041 1114
1042 if (tmp->type == PLAYER && tmp != this)
1043 {
1044 /* If a container that the player is currently using somehow gets
1045 * removed (most likely destroyed), update the player view
1046 * appropriately.
1047 */
1048 if (tmp->container == this)
1049 {
1050 CLEAR_FLAG (this, FLAG_APPLIED);
1051 tmp->container = 0;
1052 }
1053
1054 tmp->contr->ns->floorbox_update ();
1055 }
1056
1057 /* See if player moving off should effect something */ 1115 /* See if object moving off should effect something */
1058 if (check_walk_off 1116 if (check_walk_off
1059 && ((move_type & tmp->move_off) 1117 && ((move_type & tmp->move_off)
1060 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1118 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061 { 1119 {
1062 move_apply (tmp, this, 0); 1120 move_apply (tmp, this, 0);
1063 1121
1064 if (destroyed ()) 1122 if (destroyed ())
1065 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1123 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066 } 1124 }
1067 1125
1068 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069
1070 if (tmp->above == tmp)
1071 tmp->above = 0;
1072
1073 last = tmp; 1126 last = tmp;
1074 } 1127 }
1075 1128
1076 /* last == NULL of there are no objects on this space */ 1129 /* last == NULL if there are no objects on this space */
1130 //TODO: this makes little sense, why only update the topmost object?
1077 if (!last) 1131 if (!last)
1078 map->at (x, y).flags_ = P_NEED_UPDATE; 1132 map->at (x, y).flags_ = 0;
1079 else 1133 else
1080 update_object (last, UP_OBJ_REMOVE); 1134 update_object (last, UP_OBJ_REMOVE);
1081 1135
1082 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1136 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083 update_all_los (map, x, y); 1137 update_all_los (map, x, y);
1084 } 1138 }
1085} 1139}
1086 1140
1087/* 1141/*
1096merge_ob (object *op, object *top) 1150merge_ob (object *op, object *top)
1097{ 1151{
1098 if (!op->nrof) 1152 if (!op->nrof)
1099 return 0; 1153 return 0;
1100 1154
1101 if (top == NULL) 1155 if (top)
1102 for (top = op; top != NULL && top->above != NULL; top = top->above); 1156 for (top = op; top && top->above; top = top->above)
1157 ;
1103 1158
1104 for (; top != NULL; top = top->below) 1159 for (; top; top = top->below)
1105 { 1160 {
1106 if (top == op) 1161 if (top == op)
1107 continue; 1162 continue;
1108 1163
1109 if (object::can_merge (op, top)) 1164 if (object::can_merge (op, top))
1118 } 1173 }
1119 1174
1120 return 0; 1175 return 0;
1121} 1176}
1122 1177
1178void
1179object::expand_tail ()
1180{
1181 if (more)
1182 return;
1183
1184 object *prev = this;
1185
1186 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1187 {
1188 object *op = arch_to_object (at);
1189
1190 op->name = name;
1191 op->name_pl = name_pl;
1192 op->title = title;
1193
1194 op->head = this;
1195 prev->more = op;
1196
1197 prev = op;
1198 }
1199}
1200
1123/* 1201/*
1124 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1202 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1125 * job preparing multi-part monsters 1203 * job preparing multi-part monsters.
1126 */ 1204 */
1127object * 1205object *
1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1206insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129{ 1207{
1130 object *tmp;
1131
1132 if (op->head)
1133 op = op->head;
1134
1135 for (tmp = op; tmp; tmp = tmp->more) 1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136 { 1209 {
1137 tmp->x = x + tmp->arch->clone.x; 1210 tmp->x = x + tmp->arch->x;
1138 tmp->y = y + tmp->arch->clone.y; 1211 tmp->y = y + tmp->arch->y;
1139 } 1212 }
1140 1213
1141 return insert_ob_in_map (op, m, originator, flag); 1214 return insert_ob_in_map (op, m, originator, flag);
1142} 1215}
1143 1216
1159 * Return value: 1232 * Return value:
1160 * new object if 'op' was merged with other object 1233 * new object if 'op' was merged with other object
1161 * NULL if 'op' was destroyed 1234 * NULL if 'op' was destroyed
1162 * just 'op' otherwise 1235 * just 'op' otherwise
1163 */ 1236 */
1164
1165object * 1237object *
1166insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1238insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167{ 1239{
1240 assert (!op->flag [FLAG_FREED]);
1241
1168 object *tmp, *top, *floor = NULL; 1242 object *top, *floor = NULL;
1169 sint16 x, y;
1170 1243
1171 if (QUERY_FLAG (op, FLAG_FREED)) 1244 op->remove ();
1172 {
1173 LOG (llevError, "Trying to insert freed object!\n");
1174 return NULL;
1175 }
1176
1177 if (m == NULL)
1178 {
1179 char *dump = dump_object (op);
1180 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1181 free (dump);
1182 return op;
1183 }
1184
1185 if (out_of_map (m, op->x, op->y))
1186 {
1187 char *dump = dump_object (op);
1188 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1189#ifdef MANY_CORES
1190 /* Better to catch this here, as otherwise the next use of this object
1191 * is likely to cause a crash. Better to find out where it is getting
1192 * improperly inserted.
1193 */
1194 abort ();
1195#endif
1196 free (dump);
1197 return op;
1198 }
1199
1200 if (!QUERY_FLAG (op, FLAG_REMOVED))
1201 {
1202 char *dump = dump_object (op);
1203 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204 free (dump);
1205 return op;
1206 }
1207
1208 if (op->more != NULL)
1209 {
1210 /* The part may be on a different map. */
1211
1212 object *more = op->more;
1213
1214 /* We really need the caller to normalize coordinates - if
1215 * we set the map, that doesn't work if the location is within
1216 * a map and this is straddling an edge. So only if coordinate
1217 * is clear wrong do we normalize it.
1218 */
1219 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220 more->map = get_map_from_coord (m, &more->x, &more->y);
1221 else if (!more->map)
1222 {
1223 /* For backwards compatibility - when not dealing with tiled maps,
1224 * more->map should always point to the parent.
1225 */
1226 more->map = m;
1227 }
1228
1229 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1230 {
1231 if (!op->head)
1232 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233
1234 return NULL;
1235 }
1236 }
1237
1238 CLEAR_FLAG (op, FLAG_REMOVED);
1239 1245
1240 /* Ideally, the caller figures this out. However, it complicates a lot 1246 /* Ideally, the caller figures this out. However, it complicates a lot
1241 * of areas of callers (eg, anything that uses find_free_spot would now 1247 * of areas of callers (eg, anything that uses find_free_spot would now
1242 * need extra work 1248 * need extra work
1243 */ 1249 */
1244 op->map = get_map_from_coord (m, &op->x, &op->y); 1250 if (!xy_normalise (m, op->x, op->y))
1245 x = op->x; 1251 {
1246 y = op->y; 1252 op->destroy ();
1253 return 0;
1254 }
1255
1256 if (object *more = op->more)
1257 if (!insert_ob_in_map (more, m, originator, flag))
1258 return 0;
1259
1260 CLEAR_FLAG (op, FLAG_REMOVED);
1261
1262 op->map = m;
1263 mapspace &ms = op->ms ();
1247 1264
1248 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
1249 */ 1266 */
1250 if (op->nrof && !(flag & INS_NO_MERGE)) 1267 if (op->nrof && !(flag & INS_NO_MERGE))
1251 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1268 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1252 if (object::can_merge (op, tmp)) 1269 if (object::can_merge (op, tmp))
1253 { 1270 {
1254 op->nrof += tmp->nrof; 1271 op->nrof += tmp->nrof;
1255 tmp->destroy (); 1272 tmp->destroy ();
1256 } 1273 }
1273 op->below = originator->below; 1290 op->below = originator->below;
1274 1291
1275 if (op->below) 1292 if (op->below)
1276 op->below->above = op; 1293 op->below->above = op;
1277 else 1294 else
1278 op->ms ().bottom = op; 1295 ms.bot = op;
1279 1296
1280 /* since *below* originator, no need to update top */ 1297 /* since *below* originator, no need to update top */
1281 originator->below = op; 1298 originator->below = op;
1282 } 1299 }
1283 else 1300 else
1284 { 1301 {
1302 top = ms.bot;
1303
1285 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1286 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1305 if (top)
1287 { 1306 {
1288 object *last = NULL; 1307 object *last = 0;
1289 1308
1290 /* 1309 /*
1291 * If there are multiple objects on this space, we do some trickier handling. 1310 * If there are multiple objects on this space, we do some trickier handling.
1292 * We've already dealt with merging if appropriate. 1311 * We've already dealt with merging if appropriate.
1293 * Generally, we want to put the new object on top. But if 1312 * Generally, we want to put the new object on top. But if
1297 * once we get to them. This reduces the need to traverse over all of 1316 * once we get to them. This reduces the need to traverse over all of
1298 * them when adding another one - this saves quite a bit of cpu time 1317 * them when adding another one - this saves quite a bit of cpu time
1299 * when lots of spells are cast in one area. Currently, it is presumed 1318 * when lots of spells are cast in one area. Currently, it is presumed
1300 * that flying non pickable objects are spell objects. 1319 * that flying non pickable objects are spell objects.
1301 */ 1320 */
1302 1321 for (top = ms.bot; top; top = top->above)
1303 while (top != NULL)
1304 { 1322 {
1305 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1323 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306 floor = top; 1324 floor = top;
1307 1325
1308 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1326 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1311 top = top->below; 1329 top = top->below;
1312 break; 1330 break;
1313 } 1331 }
1314 1332
1315 last = top; 1333 last = top;
1316 top = top->above;
1317 } 1334 }
1318 1335
1319 /* Don't want top to be NULL, so set it to the last valid object */ 1336 /* Don't want top to be NULL, so set it to the last valid object */
1320 top = last; 1337 top = last;
1321 1338
1323 * looks like instead of lots of conditions here. 1340 * looks like instead of lots of conditions here.
1324 * makes things faster, and effectively the same result. 1341 * makes things faster, and effectively the same result.
1325 */ 1342 */
1326 1343
1327 /* Have object 'fall below' other objects that block view. 1344 /* Have object 'fall below' other objects that block view.
1328 * Unless those objects are exits, type 66 1345 * Unless those objects are exits.
1329 * If INS_ON_TOP is used, don't do this processing 1346 * If INS_ON_TOP is used, don't do this processing
1330 * Need to find the object that in fact blocks view, otherwise 1347 * Need to find the object that in fact blocks view, otherwise
1331 * stacking is a bit odd. 1348 * stacking is a bit odd.
1332 */ 1349 */
1333 if (!(flag & INS_ON_TOP) && 1350 if (!(flag & INS_ON_TOP)
1334 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1351 && ms.flags () & P_BLOCKSVIEW
1352 && (op->face && !faces [op->face].visibility))
1335 { 1353 {
1336 for (last = top; last != floor; last = last->below) 1354 for (last = top; last != floor; last = last->below)
1337 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1355 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338 break; 1356 break;
1357
1339 /* Check to see if we found the object that blocks view, 1358 /* Check to see if we found the object that blocks view,
1340 * and make sure we have a below pointer for it so that 1359 * and make sure we have a below pointer for it so that
1341 * we can get inserted below this one, which requires we 1360 * we can get inserted below this one, which requires we
1342 * set top to the object below us. 1361 * set top to the object below us.
1343 */ 1362 */
1344 if (last && last->below && last != floor) 1363 if (last && last->below && last != floor)
1345 top = last->below; 1364 top = last->below;
1346 } 1365 }
1347 } /* If objects on this space */ 1366 } /* If objects on this space */
1348 1367
1349 if (flag & INS_MAP_LOAD)
1350 top = GET_MAP_TOP (op->map, op->x, op->y);
1351
1352 if (flag & INS_ABOVE_FLOOR_ONLY) 1368 if (flag & INS_ABOVE_FLOOR_ONLY)
1353 top = floor; 1369 top = floor;
1354 1370
1355 /* Top is the object that our object (op) is going to get inserted above. 1371 /* Top is the object that our object (op) is going to get inserted above.
1356 */ 1372 */
1357 1373
1358 /* First object on this space */ 1374 /* First object on this space */
1359 if (!top) 1375 if (!top)
1360 { 1376 {
1361 op->above = GET_MAP_OB (op->map, op->x, op->y); 1377 op->above = ms.bot;
1362 1378
1363 if (op->above) 1379 if (op->above)
1364 op->above->below = op; 1380 op->above->below = op;
1365 1381
1366 op->below = NULL; 1382 op->below = 0;
1367 op->ms ().bottom = op; 1383 ms.bot = op;
1368 } 1384 }
1369 else 1385 else
1370 { /* get inserted into the stack above top */ 1386 { /* get inserted into the stack above top */
1371 op->above = top->above; 1387 op->above = top->above;
1372 1388
1375 1391
1376 op->below = top; 1392 op->below = top;
1377 top->above = op; 1393 top->above = op;
1378 } 1394 }
1379 1395
1380 if (op->above == NULL) 1396 if (!op->above)
1381 op->ms ().top = op; 1397 ms.top = op;
1382 } /* else not INS_BELOW_ORIGINATOR */ 1398 } /* else not INS_BELOW_ORIGINATOR */
1383 1399
1384 if (op->type == PLAYER) 1400 if (op->type == PLAYER)
1401 {
1385 op->contr->do_los = 1; 1402 op->contr->do_los = 1;
1403 ++op->map->players;
1404 op->map->touch ();
1405 }
1386 1406
1387 /* If we have a floor, we know the player, if any, will be above 1407 op->map->dirty = true;
1388 * it, so save a few ticks and start from there. 1408
1389 */
1390 if (!(flag & INS_MAP_LOAD))
1391 if (object *pl = op->ms ().player ()) 1409 if (object *pl = ms.player ())
1392 pl->contr->ns->floorbox_update (); 1410 pl->contr->ns->floorbox_update ();
1393 1411
1394 /* If this object glows, it may affect lighting conditions that are 1412 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1413 * visible to others on this map. But update_all_los is really
1396 * an inefficient way to do this, as it means los for all players 1414 * an inefficient way to do this, as it means los for all players
1397 * on the map will get recalculated. The players could very well 1415 * on the map will get recalculated. The players could very well
1398 * be far away from this change and not affected in any way - 1416 * be far away from this change and not affected in any way -
1399 * this should get redone to only look for players within range, 1417 * this should get redone to only look for players within range,
1400 * or just updating the P_NEED_UPDATE for spaces within this area 1418 * or just updating the P_UPTODATE for spaces within this area
1401 * of effect may be sufficient. 1419 * of effect may be sufficient.
1402 */ 1420 */
1403 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1421 if (op->map->darkness && (op->glow_radius != 0))
1404 update_all_los (op->map, op->x, op->y); 1422 update_all_los (op->map, op->x, op->y);
1405 1423
1406 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1424 /* updates flags (blocked, alive, no magic, etc) for this map space */
1407 update_object (op, UP_OBJ_INSERT); 1425 update_object (op, UP_OBJ_INSERT);
1426
1427 INVOKE_OBJECT (INSERT, op);
1408 1428
1409 /* Don't know if moving this to the end will break anything. However, 1429 /* Don't know if moving this to the end will break anything. However,
1410 * we want to have floorbox_update called before calling this. 1430 * we want to have floorbox_update called before calling this.
1411 * 1431 *
1412 * check_move_on() must be after this because code called from 1432 * check_move_on() must be after this because code called from
1414 * blocked() and wall() work properly), and these flags are updated by 1434 * blocked() and wall() work properly), and these flags are updated by
1415 * update_object(). 1435 * update_object().
1416 */ 1436 */
1417 1437
1418 /* if this is not the head or flag has been passed, don't check walk on status */ 1438 /* if this is not the head or flag has been passed, don't check walk on status */
1419 if (!(flag & INS_NO_WALK_ON) && !op->head) 1439 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1420 { 1440 {
1421 if (check_move_on (op, originator)) 1441 if (check_move_on (op, originator))
1422 return NULL; 1442 return 0;
1423 1443
1424 /* If we are a multi part object, lets work our way through the check 1444 /* If we are a multi part object, lets work our way through the check
1425 * walk on's. 1445 * walk on's.
1426 */ 1446 */
1427 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1447 for (object *tmp = op->more; tmp; tmp = tmp->more)
1428 if (check_move_on (tmp, originator)) 1448 if (check_move_on (tmp, originator))
1429 return NULL; 1449 return 0;
1430 } 1450 }
1431 1451
1432 return op; 1452 return op;
1433} 1453}
1434 1454
1441{ 1461{
1442 object *tmp, *tmp1; 1462 object *tmp, *tmp1;
1443 1463
1444 /* first search for itself and remove any old instances */ 1464 /* first search for itself and remove any old instances */
1445 1465
1446 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1466 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1467 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1448 tmp->destroy (); 1468 tmp->destroy ();
1449 1469
1450 tmp1 = arch_to_object (archetype::find (arch_string)); 1470 tmp1 = arch_to_object (archetype::find (arch_string));
1451 1471
1452 tmp1->x = op->x; 1472 tmp1->x = op->x;
1453 tmp1->y = op->y; 1473 tmp1->y = op->y;
1454 insert_ob_in_map (tmp1, op->map, op, 0); 1474 insert_ob_in_map (tmp1, op->map, op, 0);
1475}
1476
1477object *
1478object::insert_at (object *where, object *originator, int flags)
1479{
1480 return where->map->insert (this, where->x, where->y, originator, flags);
1455} 1481}
1456 1482
1457/* 1483/*
1458 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1484 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1459 * is returned contains nr objects, and the remaining parts contains 1485 * is returned contains nr objects, and the remaining parts contains
1460 * the rest (or is removed and freed if that number is 0). 1486 * the rest (or is removed and freed if that number is 0).
1461 * On failure, NULL is returned, and the reason put into the 1487 * On failure, NULL is returned, and the reason put into the
1462 * global static errmsg array. 1488 * global static errmsg array.
1463 */ 1489 */
1464
1465object * 1490object *
1466get_split_ob (object *orig_ob, uint32 nr) 1491get_split_ob (object *orig_ob, uint32 nr)
1467{ 1492{
1468 object *newob; 1493 object *newob;
1469 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1494 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1500 * the amount of an object. If the amount reaches 0, the object 1525 * the amount of an object. If the amount reaches 0, the object
1501 * is subsequently removed and freed. 1526 * is subsequently removed and freed.
1502 * 1527 *
1503 * Return value: 'op' if something is left, NULL if the amount reached 0 1528 * Return value: 'op' if something is left, NULL if the amount reached 0
1504 */ 1529 */
1505
1506object * 1530object *
1507decrease_ob_nr (object *op, uint32 i) 1531decrease_ob_nr (object *op, uint32 i)
1508{ 1532{
1509 object *tmp; 1533 object *tmp;
1510 1534
1585 1609
1586/* 1610/*
1587 * add_weight(object, weight) adds the specified weight to an object, 1611 * add_weight(object, weight) adds the specified weight to an object,
1588 * and also updates how much the environment(s) is/are carrying. 1612 * and also updates how much the environment(s) is/are carrying.
1589 */ 1613 */
1590
1591void 1614void
1592add_weight (object *op, signed long weight) 1615add_weight (object *op, signed long weight)
1593{ 1616{
1594 while (op != NULL) 1617 while (op != NULL)
1595 { 1618 {
1610 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1633 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1611 free (dump); 1634 free (dump);
1612 return op; 1635 return op;
1613 } 1636 }
1614 1637
1615 if (where->head) 1638 if (where->head_ () != where)
1616 { 1639 {
1617 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1640 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1618 where = where->head; 1641 where = where->head;
1619 } 1642 }
1620 1643
1621 return where->insert (op); 1644 return where->insert (op);
1622} 1645}
1627 * inside the object environment. 1650 * inside the object environment.
1628 * 1651 *
1629 * The function returns now pointer to inserted item, and return value can 1652 * The function returns now pointer to inserted item, and return value can
1630 * be != op, if items are merged. -Tero 1653 * be != op, if items are merged. -Tero
1631 */ 1654 */
1632
1633object * 1655object *
1634object::insert (object *op) 1656object::insert (object *op)
1635{ 1657{
1636 object *tmp, *otmp;
1637
1638 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1658 if (!QUERY_FLAG (op, FLAG_REMOVED))
1639 op->remove (); 1659 op->remove ();
1640 1660
1641 if (op->more) 1661 if (op->more)
1642 { 1662 {
1644 return op; 1664 return op;
1645 } 1665 }
1646 1666
1647 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1667 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1648 CLEAR_FLAG (op, FLAG_REMOVED); 1668 CLEAR_FLAG (op, FLAG_REMOVED);
1669
1649 if (op->nrof) 1670 if (op->nrof)
1650 { 1671 {
1651 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1672 for (object *tmp = inv; tmp; tmp = tmp->below)
1652 if (object::can_merge (tmp, op)) 1673 if (object::can_merge (tmp, op))
1653 { 1674 {
1654 /* return the original object and remove inserted object 1675 /* return the original object and remove inserted object
1655 (client needs the original object) */ 1676 (client needs the original object) */
1656 tmp->nrof += op->nrof; 1677 tmp->nrof += op->nrof;
1675 add_weight (this, op->weight * op->nrof); 1696 add_weight (this, op->weight * op->nrof);
1676 } 1697 }
1677 else 1698 else
1678 add_weight (this, (op->weight + op->carrying)); 1699 add_weight (this, (op->weight + op->carrying));
1679 1700
1680 otmp = this->in_player (); 1701 if (object *otmp = this->in_player ())
1681 if (otmp && otmp->contr)
1682 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1702 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1683 otmp->update_stats (); 1703 otmp->update_stats ();
1684 1704
1705 op->owner = 0; // its his/hers now. period.
1685 op->map = 0; 1706 op->map = 0;
1686 op->env = this; 1707 op->env = this;
1687 op->above = 0; 1708 op->above = 0;
1688 op->below = 0; 1709 op->below = 0;
1689 op->x = 0, op->y = 0; 1710 op->x = op->y = 0;
1690 1711
1691 /* reset the light list and los of the players on the map */ 1712 /* reset the light list and los of the players on the map */
1692 if ((op->glow_radius != 0) && map) 1713 if (op->glow_radius && map)
1693 { 1714 {
1694#ifdef DEBUG_LIGHTS 1715#ifdef DEBUG_LIGHTS
1695 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1716 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1696#endif /* DEBUG_LIGHTS */ 1717#endif /* DEBUG_LIGHTS */
1697 if (MAP_DARKNESS (map)) 1718 if (map->darkness)
1698 update_all_los (map, x, y); 1719 update_all_los (map, x, y);
1699 } 1720 }
1700 1721
1701 /* Client has no idea of ordering so lets not bother ordering it here. 1722 /* Client has no idea of ordering so lets not bother ordering it here.
1702 * It sure simplifies this function... 1723 * It sure simplifies this function...
1707 { 1728 {
1708 op->below = inv; 1729 op->below = inv;
1709 op->below->above = op; 1730 op->below->above = op;
1710 inv = op; 1731 inv = op;
1711 } 1732 }
1733
1734 INVOKE_OBJECT (INSERT, this);
1712 1735
1713 return op; 1736 return op;
1714} 1737}
1715 1738
1716/* 1739/*
1731 * 1754 *
1732 * MSW 2001-07-08: Check all objects on space, not just those below 1755 * MSW 2001-07-08: Check all objects on space, not just those below
1733 * object being inserted. insert_ob_in_map may not put new objects 1756 * object being inserted. insert_ob_in_map may not put new objects
1734 * on top. 1757 * on top.
1735 */ 1758 */
1736
1737int 1759int
1738check_move_on (object *op, object *originator) 1760check_move_on (object *op, object *originator)
1739{ 1761{
1740 object *tmp; 1762 object *tmp;
1741 maptile *m = op->map; 1763 maptile *m = op->map;
1768 1790
1769 /* The objects have to be checked from top to bottom. 1791 /* The objects have to be checked from top to bottom.
1770 * Hence, we first go to the top: 1792 * Hence, we first go to the top:
1771 */ 1793 */
1772 1794
1773 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1795 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1774 { 1796 {
1775 /* Trim the search when we find the first other spell effect 1797 /* Trim the search when we find the first other spell effect
1776 * this helps performance so that if a space has 50 spell objects, 1798 * this helps performance so that if a space has 50 spell objects,
1777 * we don't need to check all of them. 1799 * we don't need to check all of them.
1778 */ 1800 */
1796 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1818 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1797 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1819 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1798 { 1820 {
1799 1821
1800 float 1822 float
1801 diff = tmp->move_slow_penalty * FABS (op->speed); 1823 diff = tmp->move_slow_penalty * fabs (op->speed);
1802 1824
1803 if (op->type == PLAYER) 1825 if (op->type == PLAYER)
1804 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1826 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1805 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1827 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1806 diff /= 4.0; 1828 diff /= 4.0;
1833/* 1855/*
1834 * present_arch(arch, map, x, y) searches for any objects with 1856 * present_arch(arch, map, x, y) searches for any objects with
1835 * a matching archetype at the given map and coordinates. 1857 * a matching archetype at the given map and coordinates.
1836 * The first matching object is returned, or NULL if none. 1858 * The first matching object is returned, or NULL if none.
1837 */ 1859 */
1838
1839object * 1860object *
1840present_arch (const archetype *at, maptile *m, int x, int y) 1861present_arch (const archetype *at, maptile *m, int x, int y)
1841{ 1862{
1842 object *
1843 tmp;
1844
1845 if (m == NULL || out_of_map (m, x, y)) 1863 if (!m || out_of_map (m, x, y))
1846 { 1864 {
1847 LOG (llevError, "Present_arch called outside map.\n"); 1865 LOG (llevError, "Present_arch called outside map.\n");
1848 return NULL; 1866 return NULL;
1849 } 1867 }
1850 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1868
1869 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1851 if (tmp->arch == at) 1870 if (tmp->arch == at)
1852 return tmp; 1871 return tmp;
1872
1853 return NULL; 1873 return NULL;
1854} 1874}
1855 1875
1856/* 1876/*
1857 * present(type, map, x, y) searches for any objects with 1877 * present(type, map, x, y) searches for any objects with
1858 * a matching type variable at the given map and coordinates. 1878 * a matching type variable at the given map and coordinates.
1859 * The first matching object is returned, or NULL if none. 1879 * The first matching object is returned, or NULL if none.
1860 */ 1880 */
1861
1862object * 1881object *
1863present (unsigned char type, maptile *m, int x, int y) 1882present (unsigned char type, maptile *m, int x, int y)
1864{ 1883{
1865 object *
1866 tmp;
1867
1868 if (out_of_map (m, x, y)) 1884 if (out_of_map (m, x, y))
1869 { 1885 {
1870 LOG (llevError, "Present called outside map.\n"); 1886 LOG (llevError, "Present called outside map.\n");
1871 return NULL; 1887 return NULL;
1872 } 1888 }
1873 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1889
1890 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1874 if (tmp->type == type) 1891 if (tmp->type == type)
1875 return tmp; 1892 return tmp;
1893
1876 return NULL; 1894 return NULL;
1877} 1895}
1878 1896
1879/* 1897/*
1880 * present_in_ob(type, object) searches for any objects with 1898 * present_in_ob(type, object) searches for any objects with
1881 * a matching type variable in the inventory of the given object. 1899 * a matching type variable in the inventory of the given object.
1882 * The first matching object is returned, or NULL if none. 1900 * The first matching object is returned, or NULL if none.
1883 */ 1901 */
1884
1885object * 1902object *
1886present_in_ob (unsigned char type, const object *op) 1903present_in_ob (unsigned char type, const object *op)
1887{ 1904{
1888 object *
1889 tmp;
1890
1891 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1905 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1892 if (tmp->type == type) 1906 if (tmp->type == type)
1893 return tmp; 1907 return tmp;
1908
1894 return NULL; 1909 return NULL;
1895} 1910}
1896 1911
1897/* 1912/*
1898 * present_in_ob (type, str, object) searches for any objects with 1913 * present_in_ob (type, str, object) searches for any objects with
1906 * str is the string to match against. Note that we match against 1921 * str is the string to match against. Note that we match against
1907 * the object name, not the archetype name. this is so that the 1922 * the object name, not the archetype name. this is so that the
1908 * spell code can use one object type (force), but change it's name 1923 * spell code can use one object type (force), but change it's name
1909 * to be unique. 1924 * to be unique.
1910 */ 1925 */
1911
1912object * 1926object *
1913present_in_ob_by_name (int type, const char *str, const object *op) 1927present_in_ob_by_name (int type, const char *str, const object *op)
1914{ 1928{
1915 object *
1916 tmp;
1917
1918 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1929 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919 {
1920 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1930 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1921 return tmp; 1931 return tmp;
1922 } 1932
1923 return NULL; 1933 return 0;
1924} 1934}
1925 1935
1926/* 1936/*
1927 * present_arch_in_ob(archetype, object) searches for any objects with 1937 * present_arch_in_ob(archetype, object) searches for any objects with
1928 * a matching archetype in the inventory of the given object. 1938 * a matching archetype in the inventory of the given object.
1929 * The first matching object is returned, or NULL if none. 1939 * The first matching object is returned, or NULL if none.
1930 */ 1940 */
1931
1932object * 1941object *
1933present_arch_in_ob (const archetype *at, const object *op) 1942present_arch_in_ob (const archetype *at, const object *op)
1934{ 1943{
1935 object *
1936 tmp;
1937
1938 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1944 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1939 if (tmp->arch == at) 1945 if (tmp->arch == at)
1940 return tmp; 1946 return tmp;
1947
1941 return NULL; 1948 return NULL;
1942} 1949}
1943 1950
1944/* 1951/*
1945 * activate recursively a flag on an object inventory 1952 * activate recursively a flag on an object inventory
1946 */ 1953 */
1947void 1954void
1948flag_inv (object *op, int flag) 1955flag_inv (object *op, int flag)
1949{ 1956{
1950 object *
1951 tmp;
1952
1953 if (op->inv) 1957 if (op->inv)
1954 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1955 { 1959 {
1956 SET_FLAG (tmp, flag); 1960 SET_FLAG (tmp, flag);
1957 flag_inv (tmp, flag); 1961 flag_inv (tmp, flag);
1958 } 1962 }
1959} /* 1963}
1964
1965/*
1960 * desactivate recursively a flag on an object inventory 1966 * deactivate recursively a flag on an object inventory
1961 */ 1967 */
1962void 1968void
1963unflag_inv (object *op, int flag) 1969unflag_inv (object *op, int flag)
1964{ 1970{
1965 object *
1966 tmp;
1967
1968 if (op->inv) 1971 if (op->inv)
1969 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1972 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1970 { 1973 {
1971 CLEAR_FLAG (tmp, flag); 1974 CLEAR_FLAG (tmp, flag);
1972 unflag_inv (tmp, flag); 1975 unflag_inv (tmp, flag);
1973 } 1976 }
1974}
1975
1976/*
1977 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1978 * all it's inventory (recursively).
1979 * If checksums are used, a player will get set_cheat called for
1980 * him/her-self and all object carried by a call to this function.
1981 */
1982
1983void
1984set_cheat (object *op)
1985{
1986 SET_FLAG (op, FLAG_WAS_WIZ);
1987 flag_inv (op, FLAG_WAS_WIZ);
1988} 1977}
1989 1978
1990/* 1979/*
1991 * find_free_spot(object, map, x, y, start, stop) will search for 1980 * find_free_spot(object, map, x, y, start, stop) will search for
1992 * a spot at the given map and coordinates which will be able to contain 1981 * a spot at the given map and coordinates which will be able to contain
2006 * because arch_blocked (now ob_blocked) needs to know the movement type 1995 * because arch_blocked (now ob_blocked) needs to know the movement type
2007 * to know if the space in question will block the object. We can't use 1996 * to know if the space in question will block the object. We can't use
2008 * the archetype because that isn't correct if the monster has been 1997 * the archetype because that isn't correct if the monster has been
2009 * customized, changed states, etc. 1998 * customized, changed states, etc.
2010 */ 1999 */
2011
2012int 2000int
2013find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2001find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2014{ 2002{
2015 int
2016 i,
2017 index = 0, flag;
2018 static int
2019 altern[SIZEOFFREE]; 2003 int altern[SIZEOFFREE];
2004 int index = 0, flag;
2020 2005
2021 for (i = start; i < stop; i++) 2006 for (int i = start; i < stop; i++)
2022 { 2007 {
2023 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2008 mapxy pos (m, x, y); pos.move (i);
2024 if (!flag) 2009
2010 if (!pos.normalise ())
2011 continue;
2012
2013 mapspace &ms = *pos;
2014
2015 if (ms.flags () & P_IS_ALIVE)
2016 continue;
2017
2018 /* However, often
2019 * ob doesn't have any move type (when used to place exits)
2020 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2021 */
2022 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2023 {
2025 altern[index++] = i; 2024 altern [index++] = i;
2025 continue;
2026 }
2026 2027
2027 /* Basically, if we find a wall on a space, we cut down the search size. 2028 /* Basically, if we find a wall on a space, we cut down the search size.
2028 * In this way, we won't return spaces that are on another side of a wall. 2029 * In this way, we won't return spaces that are on another side of a wall.
2029 * This mostly work, but it cuts down the search size in all directions - 2030 * This mostly work, but it cuts down the search size in all directions -
2030 * if the space being examined only has a wall to the north and empty 2031 * if the space being examined only has a wall to the north and empty
2031 * spaces in all the other directions, this will reduce the search space 2032 * spaces in all the other directions, this will reduce the search space
2032 * to only the spaces immediately surrounding the target area, and 2033 * to only the spaces immediately surrounding the target area, and
2033 * won't look 2 spaces south of the target space. 2034 * won't look 2 spaces south of the target space.
2034 */ 2035 */
2035 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2036 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2037 {
2036 stop = maxfree[i]; 2038 stop = maxfree[i];
2039 continue;
2040 }
2041
2042 /* Note it is intentional that we check ob - the movement type of the
2043 * head of the object should correspond for the entire object.
2044 */
2045 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2046 continue;
2047
2048 altern [index++] = i;
2037 } 2049 }
2038 2050
2039 if (!index) 2051 if (!index)
2040 return -1; 2052 return -1;
2041 2053
2042 return altern[RANDOM () % index]; 2054 return altern [rndm (index)];
2043} 2055}
2044 2056
2045/* 2057/*
2046 * find_first_free_spot(archetype, maptile, x, y) works like 2058 * find_first_free_spot(archetype, maptile, x, y) works like
2047 * find_free_spot(), but it will search max number of squares. 2059 * find_free_spot(), but it will search max number of squares.
2048 * But it will return the first available spot, not a random choice. 2060 * But it will return the first available spot, not a random choice.
2049 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2061 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2050 */ 2062 */
2051
2052int 2063int
2053find_first_free_spot (const object *ob, maptile *m, int x, int y) 2064find_first_free_spot (const object *ob, maptile *m, int x, int y)
2054{ 2065{
2055 int
2056 i;
2057
2058 for (i = 0; i < SIZEOFFREE; i++) 2066 for (int i = 0; i < SIZEOFFREE; i++)
2059 {
2060 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2067 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2061 return i; 2068 return i;
2062 } 2069
2063 return -1; 2070 return -1;
2064} 2071}
2065 2072
2066/* 2073/*
2067 * The function permute(arr, begin, end) randomly reorders the array 2074 * The function permute(arr, begin, end) randomly reorders the array
2068 * arr[begin..end-1]. 2075 * arr[begin..end-1].
2076 * now uses a fisher-yates shuffle, old permute was broken
2069 */ 2077 */
2070static void 2078static void
2071permute (int *arr, int begin, int end) 2079permute (int *arr, int begin, int end)
2072{ 2080{
2073 int 2081 arr += begin;
2074 i,
2075 j,
2076 tmp,
2077 len;
2078
2079 len = end - begin; 2082 end -= begin;
2080 for (i = begin; i < end; i++)
2081 {
2082 j = begin + RANDOM () % len;
2083 2083
2084 tmp = arr[i]; 2084 while (--end)
2085 arr[i] = arr[j]; 2085 swap (arr [end], arr [rndm (end + 1)]);
2086 arr[j] = tmp;
2087 }
2088} 2086}
2089 2087
2090/* new function to make monster searching more efficient, and effective! 2088/* new function to make monster searching more efficient, and effective!
2091 * This basically returns a randomized array (in the passed pointer) of 2089 * This basically returns a randomized array (in the passed pointer) of
2092 * the spaces to find monsters. In this way, it won't always look for 2090 * the spaces to find monsters. In this way, it won't always look for
2095 * the 3x3 area will be searched, just not in a predictable order. 2093 * the 3x3 area will be searched, just not in a predictable order.
2096 */ 2094 */
2097void 2095void
2098get_search_arr (int *search_arr) 2096get_search_arr (int *search_arr)
2099{ 2097{
2100 int 2098 int i;
2101 i;
2102 2099
2103 for (i = 0; i < SIZEOFFREE; i++) 2100 for (i = 0; i < SIZEOFFREE; i++)
2104 {
2105 search_arr[i] = i; 2101 search_arr[i] = i;
2106 }
2107 2102
2108 permute (search_arr, 1, SIZEOFFREE1 + 1); 2103 permute (search_arr, 1, SIZEOFFREE1 + 1);
2109 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2104 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2110 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2105 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2111} 2106}
2120 * Perhaps incorrectly, but I'm making the assumption that exclude 2115 * Perhaps incorrectly, but I'm making the assumption that exclude
2121 * is actually want is going to try and move there. We need this info 2116 * is actually want is going to try and move there. We need this info
2122 * because we have to know what movement the thing looking to move 2117 * because we have to know what movement the thing looking to move
2123 * there is capable of. 2118 * there is capable of.
2124 */ 2119 */
2125
2126int 2120int
2127find_dir (maptile *m, int x, int y, object *exclude) 2121find_dir (maptile *m, int x, int y, object *exclude)
2128{ 2122{
2129 int
2130 i,
2131 max = SIZEOFFREE, mflags; 2123 int i, max = SIZEOFFREE, mflags;
2132 2124
2133 sint16 nx, ny; 2125 sint16 nx, ny;
2134 object * 2126 object *tmp;
2135 tmp;
2136 maptile * 2127 maptile *mp;
2137 mp;
2138 2128
2139 MoveType blocked, move_type; 2129 MoveType blocked, move_type;
2140 2130
2141 if (exclude && exclude->head) 2131 if (exclude && exclude->head_ () != exclude)
2142 { 2132 {
2143 exclude = exclude->head; 2133 exclude = exclude->head;
2144 move_type = exclude->move_type; 2134 move_type = exclude->move_type;
2145 } 2135 }
2146 else 2136 else
2159 2149
2160 if (mflags & P_OUT_OF_MAP) 2150 if (mflags & P_OUT_OF_MAP)
2161 max = maxfree[i]; 2151 max = maxfree[i];
2162 else 2152 else
2163 { 2153 {
2164 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2154 mapspace &ms = mp->at (nx, ny);
2155
2156 blocked = ms.move_block;
2165 2157
2166 if ((move_type & blocked) == move_type) 2158 if ((move_type & blocked) == move_type)
2167 max = maxfree[i]; 2159 max = maxfree[i];
2168 else if (mflags & P_IS_ALIVE) 2160 else if (mflags & P_IS_ALIVE)
2169 { 2161 {
2170 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2162 for (tmp = ms.bot; tmp; tmp = tmp->above)
2171 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2163 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2164 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2172 break; 2165 break;
2173 2166
2174 if (tmp) 2167 if (tmp)
2175 return freedir[i]; 2168 return freedir[i];
2176 } 2169 }
2182 2175
2183/* 2176/*
2184 * distance(object 1, object 2) will return the square of the 2177 * distance(object 1, object 2) will return the square of the
2185 * distance between the two given objects. 2178 * distance between the two given objects.
2186 */ 2179 */
2187
2188int 2180int
2189distance (const object *ob1, const object *ob2) 2181distance (const object *ob1, const object *ob2)
2190{ 2182{
2191 int i;
2192
2193 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2183 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2194 return i;
2195} 2184}
2196 2185
2197/* 2186/*
2198 * find_dir_2(delta-x,delta-y) will return a direction in which 2187 * find_dir_2(delta-x,delta-y) will return a direction in which
2199 * an object which has subtracted the x and y coordinates of another 2188 * an object which has subtracted the x and y coordinates of another
2200 * object, needs to travel toward it. 2189 * object, needs to travel toward it.
2201 */ 2190 */
2202
2203int 2191int
2204find_dir_2 (int x, int y) 2192find_dir_2 (int x, int y)
2205{ 2193{
2206 int q; 2194 int q;
2207 2195
2236 2224
2237 return 3; 2225 return 3;
2238} 2226}
2239 2227
2240/* 2228/*
2241 * absdir(int): Returns a number between 1 and 8, which represent
2242 * the "absolute" direction of a number (it actually takes care of
2243 * "overflow" in previous calculations of a direction).
2244 */
2245
2246int
2247absdir (int d)
2248{
2249 while (d < 1)
2250 d += 8;
2251 while (d > 8)
2252 d -= 8;
2253 return d;
2254}
2255
2256/*
2257 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2229 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2258 * between two directions (which are expected to be absolute (see absdir()) 2230 * between two directions (which are expected to be absolute (see absdir())
2259 */ 2231 */
2260
2261int 2232int
2262dirdiff (int dir1, int dir2) 2233dirdiff (int dir1, int dir2)
2263{ 2234{
2264 int 2235 int d;
2265 d;
2266 2236
2267 d = abs (dir1 - dir2); 2237 d = abs (dir1 - dir2);
2268 if (d > 4) 2238 if (d > 4)
2269 d = 8 - d; 2239 d = 8 - d;
2240
2270 return d; 2241 return d;
2271} 2242}
2272 2243
2273/* peterm: 2244/* peterm:
2274 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2245 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2277 * This basically means that if direction is 15, then it could either go 2248 * This basically means that if direction is 15, then it could either go
2278 * direction 4, 14, or 16 to get back to where we are. 2249 * direction 4, 14, or 16 to get back to where we are.
2279 * Moved from spell_util.c to object.c with the other related direction 2250 * Moved from spell_util.c to object.c with the other related direction
2280 * functions. 2251 * functions.
2281 */ 2252 */
2282
2283int
2284 reduction_dir[SIZEOFFREE][3] = { 2253int reduction_dir[SIZEOFFREE][3] = {
2285 {0, 0, 0}, /* 0 */ 2254 {0, 0, 0}, /* 0 */
2286 {0, 0, 0}, /* 1 */ 2255 {0, 0, 0}, /* 1 */
2287 {0, 0, 0}, /* 2 */ 2256 {0, 0, 0}, /* 2 */
2288 {0, 0, 0}, /* 3 */ 2257 {0, 0, 0}, /* 3 */
2289 {0, 0, 0}, /* 4 */ 2258 {0, 0, 0}, /* 4 */
2380 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2349 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2381 * core dumps if they do. 2350 * core dumps if they do.
2382 * 2351 *
2383 * Add a check so we can't pick up invisible objects (0.93.8) 2352 * Add a check so we can't pick up invisible objects (0.93.8)
2384 */ 2353 */
2385
2386int 2354int
2387can_pick (const object *who, const object *item) 2355can_pick (const object *who, const object *item)
2388{ 2356{
2389 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2357 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2390 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2358 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2395 * create clone from object to another 2363 * create clone from object to another
2396 */ 2364 */
2397object * 2365object *
2398object_create_clone (object *asrc) 2366object_create_clone (object *asrc)
2399{ 2367{
2400 object *dst = 0, *tmp, *src, *part, *prev, *item; 2368 object *dst = 0, *tmp, *src, *prev, *item;
2401 2369
2402 if (!asrc) 2370 if (!asrc)
2403 return 0; 2371 return 0;
2404 2372
2405 src = asrc;
2406 if (src->head)
2407 src = src->head; 2373 src = asrc->head_ ();
2408 2374
2409 prev = 0; 2375 prev = 0;
2410 for (part = src; part; part = part->more) 2376 for (object *part = src; part; part = part->more)
2411 { 2377 {
2412 tmp = part->clone (); 2378 tmp = part->clone ();
2413 tmp->x -= src->x; 2379 tmp->x -= src->x;
2414 tmp->y -= src->y; 2380 tmp->y -= src->y;
2415 2381
2433 insert_ob_in_ob (object_create_clone (item), dst); 2399 insert_ob_in_ob (object_create_clone (item), dst);
2434 2400
2435 return dst; 2401 return dst;
2436} 2402}
2437 2403
2438/* GROS - Creates an object using a string representing its content. */
2439/* Basically, we save the content of the string to a temp file, then call */
2440/* load_object on it. I admit it is a highly inefficient way to make things, */
2441/* but it was simple to make and allows reusing the load_object function. */
2442/* Remember not to use load_object_str in a time-critical situation. */
2443/* Also remember that multiparts objects are not supported for now. */
2444
2445object *
2446load_object_str (const char *obstr)
2447{
2448 object *op;
2449 char filename[MAX_BUF];
2450
2451 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2452
2453 FILE *tempfile = fopen (filename, "w");
2454
2455 if (tempfile == NULL)
2456 {
2457 LOG (llevError, "Error - Unable to access load object temp file\n");
2458 return NULL;
2459 }
2460
2461 fprintf (tempfile, obstr);
2462 fclose (tempfile);
2463
2464 op = object::create ();
2465
2466 object_thawer thawer (filename);
2467
2468 if (thawer)
2469 load_object (thawer, op, 0);
2470
2471 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2472 CLEAR_FLAG (op, FLAG_REMOVED);
2473
2474 return op;
2475}
2476
2477/* This returns the first object in who's inventory that 2404/* This returns the first object in who's inventory that
2478 * has the same type and subtype match. 2405 * has the same type and subtype match.
2479 * returns NULL if no match. 2406 * returns NULL if no match.
2480 */ 2407 */
2481object * 2408object *
2482find_obj_by_type_subtype (const object *who, int type, int subtype) 2409find_obj_by_type_subtype (const object *who, int type, int subtype)
2483{ 2410{
2484 object *tmp;
2485
2486 for (tmp = who->inv; tmp; tmp = tmp->below) 2411 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2487 if (tmp->type == type && tmp->subtype == subtype) 2412 if (tmp->type == type && tmp->subtype == subtype)
2488 return tmp; 2413 return tmp;
2489 2414
2490 return NULL; 2415 return 0;
2491} 2416}
2492 2417
2493/* If ob has a field named key, return the link from the list, 2418/* If ob has a field named key, return the link from the list,
2494 * otherwise return NULL. 2419 * otherwise return NULL.
2495 * 2420 *
2497 * do the desired thing. 2422 * do the desired thing.
2498 */ 2423 */
2499key_value * 2424key_value *
2500get_ob_key_link (const object *ob, const char *key) 2425get_ob_key_link (const object *ob, const char *key)
2501{ 2426{
2502 key_value *link;
2503
2504 for (link = ob->key_values; link != NULL; link = link->next) 2427 for (key_value *link = ob->key_values; link; link = link->next)
2505 if (link->key == key) 2428 if (link->key == key)
2506 return link; 2429 return link;
2507 2430
2508 return NULL; 2431 return 0;
2509} 2432}
2510 2433
2511/* 2434/*
2512 * Returns the value of op has an extra_field for key, or NULL. 2435 * Returns the value of op has an extra_field for key, or NULL.
2513 * 2436 *
2538 if (link->key == canonical_key) 2461 if (link->key == canonical_key)
2539 return link->value; 2462 return link->value;
2540 2463
2541 return 0; 2464 return 0;
2542} 2465}
2543
2544 2466
2545/* 2467/*
2546 * Updates the canonical_key in op to value. 2468 * Updates the canonical_key in op to value.
2547 * 2469 *
2548 * canonical_key is a shared string (value doesn't have to be). 2470 * canonical_key is a shared string (value doesn't have to be).
2553 * Returns TRUE on success. 2475 * Returns TRUE on success.
2554 */ 2476 */
2555int 2477int
2556set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2478set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2557{ 2479{
2558 key_value *
2559 field = NULL, *last = NULL; 2480 key_value *field = NULL, *last = NULL;
2560 2481
2561 for (field = op->key_values; field != NULL; field = field->next) 2482 for (field = op->key_values; field != NULL; field = field->next)
2562 { 2483 {
2563 if (field->key != canonical_key) 2484 if (field->key != canonical_key)
2564 { 2485 {
2573 /* Basically, if the archetype has this key set, 2494 /* Basically, if the archetype has this key set,
2574 * we need to store the null value so when we save 2495 * we need to store the null value so when we save
2575 * it, we save the empty value so that when we load, 2496 * it, we save the empty value so that when we load,
2576 * we get this value back again. 2497 * we get this value back again.
2577 */ 2498 */
2578 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2499 if (get_ob_key_link (op->arch, canonical_key))
2579 field->value = 0; 2500 field->value = 0;
2580 else 2501 else
2581 { 2502 {
2582 if (last) 2503 if (last)
2583 last->next = field->next; 2504 last->next = field->next;
2592 /* IF we get here, key doesn't exist */ 2513 /* IF we get here, key doesn't exist */
2593 2514
2594 /* No field, we'll have to add it. */ 2515 /* No field, we'll have to add it. */
2595 2516
2596 if (!add_key) 2517 if (!add_key)
2597 {
2598 return FALSE; 2518 return FALSE;
2599 } 2519
2600 /* There isn't any good reason to store a null 2520 /* There isn't any good reason to store a null
2601 * value in the key/value list. If the archetype has 2521 * value in the key/value list. If the archetype has
2602 * this key, then we should also have it, so shouldn't 2522 * this key, then we should also have it, so shouldn't
2603 * be here. If user wants to store empty strings, 2523 * be here. If user wants to store empty strings,
2604 * should pass in "" 2524 * should pass in ""
2653 } 2573 }
2654 else 2574 else
2655 item = item->env; 2575 item = item->env;
2656} 2576}
2657 2577
2578const char *
2579object::flag_desc (char *desc, int len) const
2580{
2581 char *p = desc;
2582 bool first = true;
2583
2584 *p = 0;
2585
2586 for (int i = 0; i < NUM_FLAGS; i++)
2587 {
2588 if (len <= 10) // magic constant!
2589 {
2590 snprintf (p, len, ",...");
2591 break;
2592 }
2593
2594 if (flag [i])
2595 {
2596 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2597 len -= cnt;
2598 p += cnt;
2599 first = false;
2600 }
2601 }
2602
2603 return desc;
2604}
2605
2658// return a suitable string describing an objetc in enough detail to find it 2606// return a suitable string describing an object in enough detail to find it
2659const char * 2607const char *
2660object::debug_desc (char *info) const 2608object::debug_desc (char *info) const
2661{ 2609{
2610 char flagdesc[512];
2662 char info2[256 * 3]; 2611 char info2[256 * 4];
2663 char *p = info; 2612 char *p = info;
2664 2613
2665 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2614 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2666 count, 2615 count, uuid.seq,
2667 &name, 2616 &name,
2668 title ? " " : "", 2617 title ? "\",title:\"" : "",
2669 title ? (const char *)title : ""); 2618 title ? (const char *)title : "",
2619 flag_desc (flagdesc, 512), type);
2670 2620
2671 if (env) 2621 if (!this->flag[FLAG_REMOVED] && env)
2672 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2622 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2673 2623
2674 if (map) 2624 if (map)
2675 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2625 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2676 2626
2677 return info; 2627 return info;
2678} 2628}
2679 2629
2680const char * 2630const char *
2681object::debug_desc () const 2631object::debug_desc () const
2682{ 2632{
2683 static char info[256 * 3]; 2633 static char info[3][256 * 4];
2634 static int info_idx;
2635
2684 return debug_desc (info); 2636 return debug_desc (info [++info_idx % 3]);
2685} 2637}
2686 2638
2639struct region *
2640object::region () const
2641{
2642 return map ? map->region (x, y)
2643 : region::default_region ();
2644}
2645
2646const materialtype_t *
2647object::dominant_material () const
2648{
2649 if (materialtype_t *mt = name_to_material (materialname))
2650 return mt;
2651
2652 return name_to_material (shstr_unknown);
2653}
2654
2655void
2656object::open_container (object *new_container)
2657{
2658 if (container == new_container)
2659 return;
2660
2661 if (object *old_container = container)
2662 {
2663 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2664 return;
2665
2666#if 0
2667 // remove the "Close old_container" object.
2668 if (object *closer = old_container->inv)
2669 if (closer->type == CLOSE_CON)
2670 closer->destroy ();
2671#endif
2672
2673 old_container->flag [FLAG_APPLIED] = 0;
2674 container = 0;
2675
2676 esrv_update_item (UPD_FLAGS, this, old_container);
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2678 play_sound (sound_find ("chest_close"));
2679 }
2680
2681 if (new_container)
2682 {
2683 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2684 return;
2685
2686 // TODO: this does not seem to serve any purpose anymore?
2687#if 0
2688 // insert the "Close Container" object.
2689 if (archetype *closer = new_container->other_arch)
2690 {
2691 object *closer = arch_to_object (new_container->other_arch);
2692 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2693 new_container->insert (closer);
2694 }
2695#endif
2696
2697 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2698
2699 new_container->flag [FLAG_APPLIED] = 1;
2700 container = new_container;
2701
2702 esrv_update_item (UPD_FLAGS, this, new_container);
2703 esrv_send_inventory (this, new_container);
2704 play_sound (sound_find ("chest_open"));
2705 }
2706}
2707
2708object *
2709object::force_find (const shstr name)
2710{
2711 /* cycle through his inventory to look for the MARK we want to
2712 * place
2713 */
2714 for (object *tmp = inv; tmp; tmp = tmp->below)
2715 if (tmp->type == FORCE && tmp->slaying == name)
2716 return splay (tmp);
2717
2718 return 0;
2719}
2720
2721void
2722object::force_add (const shstr name, int duration)
2723{
2724 if (object *force = force_find (name))
2725 force->destroy ();
2726
2727 object *force = get_archetype (FORCE_NAME);
2728
2729 force->slaying = name;
2730 force->stats.food = 1;
2731 force->speed_left = -1.f;
2732
2733 force->set_speed (duration ? 1.f / duration : 0.f);
2734 force->flag [FLAG_IS_USED_UP] = true;
2735 force->flag [FLAG_APPLIED] = true;
2736
2737 insert (force);
2738}
2739
2740void
2741object::play_sound (faceidx sound) const
2742{
2743 if (!sound)
2744 return;
2745
2746 if (flag [FLAG_REMOVED])
2747 return;
2748
2749 if (env)
2750 {
2751 if (object *pl = in_player ())
2752 pl->contr->play_sound (sound);
2753 }
2754 else
2755 map->play_sound (sound, x, y);
2756}
2757

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines