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.68 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.160 by root, Tue Jun 5 13:05:02 2007 UTC

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

Diff Legend

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