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.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.66 by root, Wed Dec 13 03:28:42 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
35 34
36int nrofallocobjects = 0; 35int nrofallocobjects = 0;
37static UUID uuid; 36static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 37const uint64 UUID_SKIP = 1<<19;
39 38
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
42 40
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, 41short 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 42 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}; 43};
… …
106 _exit (1); 104 _exit (1);
107 } 105 }
108 106
109 uuid.seq = uid; 107 uuid.seq = uid;
110 write_uuid (); 108 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112 fclose (fp); 110 fclose (fp);
113} 111}
114 112
115UUID 113UUID
116gen_uuid () 114gen_uuid ()
… …
185 * 183 *
186 * Note that this function appears a lot longer than the macro it 184 * Note that this function appears a lot longer than the macro it
187 * replaces - this is mostly for clarity - a decent compiler should hopefully 185 * replaces - this is mostly for clarity - a decent compiler should hopefully
188 * reduce this to the same efficiency. 186 * reduce this to the same efficiency.
189 * 187 *
190 * Check nrof variable *before* calling CAN_MERGE() 188 * Check nrof variable *before* calling can_merge()
191 * 189 *
192 * Improvements made with merge: Better checking on potion, and also 190 * Improvements made with merge: Better checking on potion, and also
193 * check weight 191 * check weight
194 */ 192 */
195 193
196bool object::can_merge (object *ob1, object *ob2) 194bool object::can_merge_slow (object *ob1, object *ob2)
197{ 195{
198 /* A couple quicksanity checks */ 196 /* A couple quicksanity checks */
199 if ((ob1 == ob2) || (ob1->type != ob2->type)) 197 if (ob1 == ob2
198 || ob1->type != ob2->type
199 || ob1->speed != ob2->speed
200 || ob1->value != ob2->value
201 || ob1->name != ob2->name)
200 return 0; 202 return 0;
201 203
202 if (ob1->speed != ob2->speed) 204 //TODO: this ain't working well, use nicer and correct overflow check
203 return 0;
204
205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206 * value could not be stored in a sint32 (which unfortunately sometimes is 206 * value could not be stored in a sint32 (which unfortunately sometimes is
207 * used to store nrof). 207 * used to store nrof).
208 */ 208 */
209 if (ob1->nrof + ob2->nrof >= 1UL << 31) 209 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
262 /* if one object has inventory but the other doesn't, not equiv */ 262 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0; 264 return 0;
265 265
266 /* Now check to see if the two inventory objects could merge */ 266 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 267 if (!object::can_merge (ob1->inv, ob2->inv))
268 return 0; 268 return 0;
269 269
270 /* inventory ok - still need to check rest of this object to see 270 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 271 * if it is valid.
272 */ 272 */
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 377 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 378 * The result of the dump is stored in the static global errmsg array.
379 */ 379 */
380 380
381void 381char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 382dump_object (object *op)
437{ 383{
438 if (op == NULL) 384 if (!op)
439 { 385 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 386
447void 387 object_freezer freezer;
448dump_all_objects (void) 388 save_object (freezer, op, 3);
449{ 389 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 390}
458 391
459/* 392/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 393 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
… …
481 */ 414 */
482 415
483object * 416object *
484find_object (tag_t i) 417find_object (tag_t i)
485{ 418{
486 object *op; 419 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 420 if (op->count == i)
490 break; 421 return op;
422
491 return op; 423 return 0;
492} 424}
493 425
494/* 426/*
495 * Returns the first object which has a name equal to the argument. 427 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 428 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 433find_object_name (const char *str)
502{ 434{
503 shstr_cmp str_ (str); 435 shstr_cmp str_ (str);
504 object *op; 436 object *op;
505 437
506 for (op = objects; op != NULL; op = op->next) 438 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 439 if (op->name == str_)
508 break; 440 break;
509 441
510 return op; 442 return op;
511} 443}
512 444
513void 445void
514free_all_object_data () 446free_all_object_data ()
515{ 447{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 448 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 449}
539 450
540/* 451/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 453 * skill and experience objects.
… …
612 523
613 /* What is not cleared is next, prev, and count */ 524 /* What is not cleared is next, prev, and count */
614 525
615 expmul = 1.0; 526 expmul = 1.0;
616 face = blank_face; 527 face = blank_face;
617 attacked_by_count = -1;
618 528
619 if (settings.casting_time) 529 if (settings.casting_time)
620 casting_time = -1; 530 casting_time = -1;
621} 531}
622 532
623void object::clone (object *destination)
624{
625 *(object_copy *)destination = *this;
626 *(object_pod *)destination = *this;
627
628 if (self || cb)
629 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
630}
631
632/* 533/*
633 * copy object first frees everything allocated by the second object, 534 * copy_to first frees everything allocated by the dst object,
634 * and then copies the contends of the first object into the second 535 * and then copies the contents of itself into the second
635 * object, allocating what needs to be allocated. Basically, any 536 * object, allocating what needs to be allocated. Basically, any
636 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 537 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
637 * if the first object is freed, the pointers in the new object 538 * if the first object is freed, the pointers in the new object
638 * will point at garbage. 539 * will point at garbage.
639 */ 540 */
640void 541void
641copy_object (object *op2, object *op) 542object::copy_to (object *dst)
642{ 543{
643 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 544 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 545 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645 546
646 op2->clone (op); 547 *(object_copy *)dst = *this;
548 *(object_pod *)dst = *this;
549
550 if (self || cb)
551 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
647 552
648 if (is_freed) 553 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 554 SET_FLAG (dst, FLAG_FREED);
555
650 if (is_removed) 556 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 557 SET_FLAG (dst, FLAG_REMOVED);
652 558
653 if (op2->speed < 0) 559 if (speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 560 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655 561
656 /* Copy over key_values, if any. */ 562 /* Copy over key_values, if any. */
657 if (op2->key_values) 563 if (key_values)
658 { 564 {
659 key_value *tail = 0; 565 key_value *tail = 0;
660 key_value *i; 566 key_value *i;
661 567
662 op->key_values = 0; 568 dst->key_values = 0;
663 569
664 for (i = op2->key_values; i; i = i->next) 570 for (i = key_values; i; i = i->next)
665 { 571 {
666 key_value *new_link = new key_value; 572 key_value *new_link = new key_value;
667 573
668 new_link->next = 0; 574 new_link->next = 0;
669 new_link->key = i->key; 575 new_link->key = i->key;
670 new_link->value = i->value; 576 new_link->value = i->value;
671 577
672 /* Try and be clever here, too. */ 578 /* Try and be clever here, too. */
673 if (!op->key_values) 579 if (!dst->key_values)
674 { 580 {
675 op->key_values = new_link; 581 dst->key_values = new_link;
676 tail = new_link; 582 tail = new_link;
677 } 583 }
678 else 584 else
679 { 585 {
680 tail->next = new_link; 586 tail->next = new_link;
681 tail = new_link; 587 tail = new_link;
682 } 588 }
683 } 589 }
684 } 590 }
685 591
686 update_ob_speed (op); 592 update_ob_speed (dst);
593}
594
595object *
596object::clone ()
597{
598 object *neu = create ();
599 copy_to (neu);
600 return neu;
687} 601}
688 602
689/* 603/*
690 * If an object with the IS_TURNABLE() flag needs to be turned due 604 * If an object with the IS_TURNABLE() flag needs to be turned due
691 * to the closest player being on the other side, this function can 605 * to the closest player being on the other side, this function can
… …
896 update_now = 1; 810 update_now = 1;
897 811
898 if ((move_slow | op->move_slow) != move_slow) 812 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1; 813 update_now = 1;
900 } 814 }
815
901 /* if the object is being removed, we can't make intelligent 816 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 817 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 818 * that is being removed.
904 */ 819 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
917 832
918 if (op->more != NULL) 833 if (op->more != NULL)
919 update_object (op->more, action); 834 update_object (op->more, action);
920} 835}
921 836
922static unordered_vector<object *> mortals; 837object::vector object::mortals;
838object::vector object::objects; // not yet used
839object *object::first;
923 840
924void object::free_mortals () 841void object::free_mortals ()
925{ 842{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 843 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 844 if ((*i)->refcnt)
928 ++i; // further delay freeing 845 ++i; // further delay freeing
929 else 846 else
930 { 847 {
931 delete *i; 848 delete *i;
932 mortals.erase (i); 849 mortals.erase (i);
933 } 850 }
934
935 static int lastmortals = 0;//D
936
937 if (mortals.size() != lastmortals)//D
938 {
939 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 }
942} 851}
943 852
944object::object () 853object::object ()
945{ 854{
946 SET_FLAG (this, FLAG_REMOVED); 855 SET_FLAG (this, FLAG_REMOVED);
947 856
948 expmul = 1.0; 857 expmul = 1.0;
949 face = blank_face; 858 face = blank_face;
950 attacked_by_count = -1;
951} 859}
952 860
953object::~object () 861object::~object ()
954{ 862{
955 free_key_values (this); 863 free_key_values (this);
… …
959{ 867{
960 count = ++ob_count; 868 count = ++ob_count;
961 uuid = gen_uuid (); 869 uuid = gen_uuid ();
962 870
963 prev = 0; 871 prev = 0;
964 next = objects; 872 next = object::first;
965 873
966 if (objects) 874 if (object::first)
967 objects->prev = this; 875 object::first->prev = this;
968 876
969 objects = this; 877 object::first = this;
970} 878}
971 879
972void object::unlink () 880void object::unlink ()
973{ 881{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 882 if (this == object::first)
978 objects = next; 883 object::first = next;
979 884
980 /* Remove this object from the list of used objects */ 885 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 886 if (prev) prev->next = next;
982 if (next) next->prev = prev; 887 if (next) next->prev = prev;
983 888
… …
997 * it from the list of used objects, and puts it on the list of 902 * it from the list of used objects, and puts it on the list of
998 * free objects. The IS_FREED() flag is set in the object. 903 * free objects. The IS_FREED() flag is set in the object.
999 * The object must have been removed by remove_ob() first for 904 * The object must have been removed by remove_ob() first for
1000 * this function to succeed. 905 * this function to succeed.
1001 * 906 *
1002 * If free_inventory is set, free inventory as well. Else drop items in 907 * If destroy_inventory is set, free inventory as well. Else drop items in
1003 * inventory to the ground. 908 * inventory to the ground.
1004 */ 909 */
1005void object::free (bool free_inventory) 910void object::destroy (bool destroy_inventory)
1006{ 911{
1007 if (QUERY_FLAG (this, FLAG_FREED)) 912 if (QUERY_FLAG (this, FLAG_FREED))
1008 return; 913 return;
1009 914
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 915 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011 remove_friendly_object (this); 916 remove_friendly_object (this);
1012 917
1013 if (!QUERY_FLAG (this, FLAG_REMOVED)) 918 if (!QUERY_FLAG (this, FLAG_REMOVED))
1014 remove_ob (this); 919 remove ();
1015 920
1016 SET_FLAG (this, FLAG_FREED); 921 SET_FLAG (this, FLAG_FREED);
1017 922
1018 if (more) 923 if (more)
1019 { 924 {
1020 more->free (free_inventory); 925 more->destroy (destroy_inventory);
1021 more = 0; 926 more = 0;
1022 } 927 }
1023 928
1024 if (inv) 929 if (inv)
1025 { 930 {
1026 /* Only if the space blocks everything do we not process - 931 /* Only if the space blocks everything do we not process -
1027 * if some form of movement is allowed, let objects 932 * if some form of movement is allowed, let objects
1028 * drop on that space. 933 * drop on that space.
1029 */ 934 */
1030 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 935 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1031 { 936 {
1032 object *op = inv; 937 object *op = inv;
1033 938
1034 while (op) 939 while (op)
1035 { 940 {
1036 object *tmp = op->below; 941 object *tmp = op->below;
1037 op->free (free_inventory); 942 op->destroy (destroy_inventory);
1038 op = tmp; 943 op = tmp;
1039 } 944 }
1040 } 945 }
1041 else 946 else
1042 { /* Put objects in inventory onto this space */ 947 { /* Put objects in inventory onto this space */
… …
1044 949
1045 while (op) 950 while (op)
1046 { 951 {
1047 object *tmp = op->below; 952 object *tmp = op->below;
1048 953
1049 remove_ob (op); 954 op->remove ();
1050 955
1051 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 956 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1052 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 957 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1053 free_object (op); 958 op->destroy ();
1054 else 959 else
1055 { 960 {
1056 op->x = x; 961 op->x = x;
1057 op->y = y; 962 op->y = y;
1058 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 963 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1061 op = tmp; 966 op = tmp;
1062 } 967 }
1063 } 968 }
1064 } 969 }
1065 970
971 // hack to ensure that freed objects still have a valid map
972 {
973 static maptile *freed_map; // freed objects are moved here to avoid crashes
974
975 if (!freed_map)
976 {
977 freed_map = new maptile;
978
979 freed_map->name = "/internal/freed_objects_map";
980 freed_map->width = 3;
981 freed_map->height = 3;
982
983 freed_map->allocate ();
984 }
985
986 map = freed_map;
987 x = 1;
988 y = 1;
989 }
990
991 // clear those pointers that likely might have circular references to us
1066 owner = 0; 992 owner = 0;
993 enemy = 0;
994 attacked_by = 0;
995
996 // only relevant for players(?), but make sure of it anyways
997 contr = 0;
1067 998
1068 /* Remove object from the active list */ 999 /* Remove object from the active list */
1069 speed = 0; 1000 speed = 0;
1070 update_ob_speed (this); 1001 update_ob_speed (this);
1071 1002
… …
1076 1007
1077/* 1008/*
1078 * sub_weight() recursively (outwards) subtracts a number from the 1009 * sub_weight() recursively (outwards) subtracts a number from the
1079 * weight of an object (and what is carried by it's environment(s)). 1010 * weight of an object (and what is carried by it's environment(s)).
1080 */ 1011 */
1081
1082void 1012void
1083sub_weight (object *op, signed long weight) 1013sub_weight (object *op, signed long weight)
1084{ 1014{
1085 while (op != NULL) 1015 while (op != NULL)
1086 { 1016 {
1087 if (op->type == CONTAINER) 1017 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1018 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1019
1091 op->carrying -= weight; 1020 op->carrying -= weight;
1092 op = op->env; 1021 op = op->env;
1093 } 1022 }
1094} 1023}
1095 1024
1096/* remove_ob(op): 1025/* op->remove ():
1097 * This function removes the object op from the linked list of objects 1026 * This function removes the object op from the linked list of objects
1098 * which it is currently tied to. When this function is done, the 1027 * which it is currently tied to. When this function is done, the
1099 * object will have no environment. If the object previously had an 1028 * object will have no environment. If the object previously had an
1100 * environment, the x and y coordinates will be updated to 1029 * environment, the x and y coordinates will be updated to
1101 * the previous environment. 1030 * the previous environment.
1102 * Beware: This function is called from the editor as well! 1031 * Beware: This function is called from the editor as well!
1103 */ 1032 */
1104
1105void 1033void
1106remove_ob (object *op) 1034object::remove ()
1107{ 1035{
1036 object *tmp, *last = 0;
1108 object * 1037 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1038
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1039 int check_walk_off;
1118 mapstruct *
1119 m;
1120 1040
1121 sint16
1122 x,
1123 y;
1124
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1041 if (QUERY_FLAG (this, FLAG_REMOVED))
1126 return; 1042 return;
1127 1043
1128 SET_FLAG (op, FLAG_REMOVED); 1044 SET_FLAG (this, FLAG_REMOVED);
1129 1045
1130 if (op->more != NULL) 1046 if (more)
1131 remove_ob (op->more); 1047 more->remove ();
1132 1048
1133 /* 1049 /*
1134 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1135 * inventory. 1051 * inventory.
1136 */ 1052 */
1137 if (op->env != NULL) 1053 if (env)
1138 { 1054 {
1139 if (op->nrof) 1055 if (nrof)
1140 sub_weight (op->env, op->weight * op->nrof); 1056 sub_weight (env, weight * nrof);
1141 else 1057 else
1142 sub_weight (op->env, op->weight + op->carrying); 1058 sub_weight (env, weight + carrying);
1143 1059
1144 /* NO_FIX_PLAYER is set when a great many changes are being 1060 /* NO_FIX_PLAYER is set when a great many changes are being
1145 * made to players inventory. If set, avoiding the call 1061 * made to players inventory. If set, avoiding the call
1146 * to save cpu time. 1062 * to save cpu time.
1147 */ 1063 */
1148 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1064 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1149 fix_player (otmp); 1065 fix_player (otmp);
1150 1066
1151 if (op->above != NULL) 1067 if (above != NULL)
1152 op->above->below = op->below; 1068 above->below = below;
1153 else 1069 else
1154 op->env->inv = op->below; 1070 env->inv = below;
1155 1071
1156 if (op->below != NULL) 1072 if (below != NULL)
1157 op->below->above = op->above; 1073 below->above = above;
1158 1074
1159 /* we set up values so that it could be inserted into 1075 /* we set up values so that it could be inserted into
1160 * the map, but we don't actually do that - it is up 1076 * the map, but we don't actually do that - it is up
1161 * to the caller to decide what we want to do. 1077 * to the caller to decide what we want to do.
1162 */ 1078 */
1163 op->x = op->env->x, op->y = op->env->y; 1079 x = env->x, y = env->y;
1164 op->map = op->env->map; 1080 map = env->map;
1165 op->above = NULL, op->below = NULL; 1081 above = 0, below = 0;
1166 op->env = NULL; 1082 env = 0;
1167 } 1083 }
1168 else if (op->map) 1084 else if (map)
1169 { 1085 {
1170 x = op->x;
1171 y = op->y;
1172 m = get_map_from_coord (op->map, &x, &y);
1173
1174 if (!m)
1175 {
1176 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177 op->map->path, op->x, op->y);
1178 /* in old days, we used to set x and y to 0 and continue.
1179 * it seems if we get into this case, something is probablye
1180 * screwed up and should be fixed.
1181 */
1182 abort ();
1183 }
1184
1185 if (op->map != m)
1186 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187 op->map->path, m->path, op->x, op->y, x, y);
1188
1189 /* Re did the following section of code - it looks like it had 1086 /* Re did the following section of code - it looks like it had
1190 * lots of logic for things we no longer care about 1087 * lots of logic for things we no longer care about
1191 */ 1088 */
1192 1089
1193 /* link the object above us */ 1090 /* link the object above us */
1194 if (op->above) 1091 if (above)
1195 op->above->below = op->below; 1092 above->below = below;
1196 else 1093 else
1197 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1094 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1198 1095
1199 /* Relink the object below us, if there is one */ 1096 /* Relink the object below us, if there is one */
1200 if (op->below) 1097 if (below)
1201 op->below->above = op->above; 1098 below->above = above;
1202 else 1099 else
1203 { 1100 {
1204 /* Nothing below, which means we need to relink map object for this space 1101 /* Nothing below, which means we need to relink map object for this space
1205 * use translated coordinates in case some oddness with map tiling is 1102 * use translated coordinates in case some oddness with map tiling is
1206 * evident 1103 * evident
1207 */ 1104 */
1208 if (GET_MAP_OB (m, x, y) != op) 1105 if (GET_MAP_OB (map, x, y) != this)
1209 { 1106 {
1210 dump_object (op); 1107 char *dump = dump_object (this);
1211 LOG (llevError, 1108 LOG (llevError,
1212 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1109 "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);
1110 free (dump);
1213 dump_object (GET_MAP_OB (m, x, y)); 1111 dump = dump_object (GET_MAP_OB (map, x, y));
1214 LOG (llevError, "%s\n", errmsg); 1112 LOG (llevError, "%s\n", dump);
1113 free (dump);
1215 } 1114 }
1216 1115
1217 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1116 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1218 } 1117 }
1219 1118
1220 op->above = 0; 1119 above = 0;
1221 op->below = 0; 1120 below = 0;
1222 1121
1223 if (op->map->in_memory == MAP_SAVING) 1122 if (map->in_memory == MAP_SAVING)
1224 return; 1123 return;
1225 1124
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1125 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228 1126
1229 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1127 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1230 { 1128 {
1231 /* No point updating the players look faces if he is the object 1129 /* No point updating the players look faces if he is the object
1232 * being removed. 1130 * being removed.
1233 */ 1131 */
1234 1132
1235 if (tmp->type == PLAYER && tmp != op) 1133 if (tmp->type == PLAYER && tmp != this)
1236 { 1134 {
1237 /* If a container that the player is currently using somehow gets 1135 /* If a container that the player is currently using somehow gets
1238 * removed (most likely destroyed), update the player view 1136 * removed (most likely destroyed), update the player view
1239 * appropriately. 1137 * appropriately.
1240 */ 1138 */
1241 if (tmp->container == op) 1139 if (tmp->container == this)
1242 { 1140 {
1243 CLEAR_FLAG (op, FLAG_APPLIED); 1141 CLEAR_FLAG (this, FLAG_APPLIED);
1244 tmp->container = NULL; 1142 tmp->container = 0;
1245 } 1143 }
1246 1144
1247 tmp->contr->socket.update_look = 1; 1145 tmp->contr->socket.update_look = 1;
1248 } 1146 }
1249 1147
1250 /* See if player moving off should effect something */ 1148 /* See if player moving off should effect something */
1251 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1149 if (check_walk_off
1150 && ((move_type & tmp->move_off)
1151 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1252 { 1152 {
1253 move_apply (tmp, op, NULL); 1153 move_apply (tmp, this, 0);
1254 1154
1255 if (was_destroyed (op, tag)) 1155 if (destroyed ())
1256 {
1257 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1156 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1258 }
1259 } 1157 }
1260 1158
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1159 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1160
1263 if (tmp->above == tmp) 1161 if (tmp->above == tmp)
1264 tmp->above = NULL; 1162 tmp->above = 0;
1265 1163
1266 last = tmp; 1164 last = tmp;
1267 } 1165 }
1268 1166
1269 /* last == NULL of there are no objects on this space */ 1167 /* last == NULL of there are no objects on this space */
1270 if (last == NULL) 1168 if (!last)
1271 { 1169 {
1272 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1171 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1274 * those out anyways, and if there are any flags set right now, they won't 1172 * those out anyways, and if there are any flags set right now, they won't
1275 * be correct anyways. 1173 * be correct anyways.
1276 */ 1174 */
1277 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1175 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1278 update_position (op->map, op->x, op->y); 1176 update_position (map, x, y);
1279 } 1177 }
1280 else 1178 else
1281 update_object (last, UP_OBJ_REMOVE); 1179 update_object (last, UP_OBJ_REMOVE);
1282 1180
1283 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1181 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284 update_all_los (op->map, op->x, op->y); 1182 update_all_los (map, x, y);
1285 } 1183 }
1286} 1184}
1287 1185
1288/* 1186/*
1289 * merge_ob(op,top): 1187 * merge_ob(op,top):
… …
1304 1202
1305 for (; top != NULL; top = top->below) 1203 for (; top != NULL; top = top->below)
1306 { 1204 {
1307 if (top == op) 1205 if (top == op)
1308 continue; 1206 continue;
1309 if (CAN_MERGE (op, top)) 1207
1208 if (object::can_merge (op, top))
1310 { 1209 {
1311 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1312 1211
1313/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1314 op->weight = 0; /* Don't want any adjustements now */ 1213 op->weight = 0; /* Don't want any adjustements now */
1315 remove_ob (op); 1214 op->destroy ();
1316 free_object (op);
1317 return top; 1215 return top;
1318 } 1216 }
1319 } 1217 }
1320 1218
1321 return NULL; 1219 return 0;
1322} 1220}
1323 1221
1324/* 1222/*
1325 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1223 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1326 * job preparing multi-part monsters 1224 * job preparing multi-part monsters
1327 */ 1225 */
1328object * 1226object *
1329insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1227insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1330{ 1228{
1331 object *tmp; 1229 object *tmp;
1332 1230
1333 if (op->head) 1231 if (op->head)
1334 op = op->head; 1232 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1260 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1261 * just 'op' otherwise
1364 */ 1262 */
1365 1263
1366object * 1264object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1265insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1266{
1369 object *tmp, *top, *floor = NULL; 1267 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1268 sint16 x, y;
1371 1269
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1270 if (QUERY_FLAG (op, FLAG_FREED))
… …
1375 return NULL; 1273 return NULL;
1376 } 1274 }
1377 1275
1378 if (m == NULL) 1276 if (m == NULL)
1379 { 1277 {
1380 dump_object (op); 1278 char *dump = dump_object (op);
1381 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1279 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1280 free (dump);
1382 return op; 1281 return op;
1383 } 1282 }
1384 1283
1385 if (out_of_map (m, op->x, op->y)) 1284 if (out_of_map (m, op->x, op->y))
1386 { 1285 {
1387 dump_object (op); 1286 char *dump = dump_object (op);
1388 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1287 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1389#ifdef MANY_CORES 1288#ifdef MANY_CORES
1390 /* Better to catch this here, as otherwise the next use of this object 1289 /* Better to catch this here, as otherwise the next use of this object
1391 * is likely to cause a crash. Better to find out where it is getting 1290 * is likely to cause a crash. Better to find out where it is getting
1392 * improperly inserted. 1291 * improperly inserted.
1393 */ 1292 */
1394 abort (); 1293 abort ();
1395#endif 1294#endif
1295 free (dump);
1396 return op; 1296 return op;
1397 } 1297 }
1398 1298
1399 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1299 if (!QUERY_FLAG (op, FLAG_REMOVED))
1400 { 1300 {
1401 dump_object (op); 1301 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1302 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1303 free (dump);
1403 return op; 1304 return op;
1404 } 1305 }
1405 1306
1406 if (op->more != NULL) 1307 if (op->more != NULL)
1407 { 1308 {
… …
1445 1346
1446 /* this has to be done after we translate the coordinates. 1347 /* this has to be done after we translate the coordinates.
1447 */ 1348 */
1448 if (op->nrof && !(flag & INS_NO_MERGE)) 1349 if (op->nrof && !(flag & INS_NO_MERGE))
1449 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1350 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1450 if (CAN_MERGE (op, tmp)) 1351 if (object::can_merge (op, tmp))
1451 { 1352 {
1452 op->nrof += tmp->nrof; 1353 op->nrof += tmp->nrof;
1453 remove_ob (tmp); 1354 tmp->destroy ();
1454 free_object (tmp);
1455 } 1355 }
1456 1356
1457 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1357 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1458 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1358 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1459 1359
… …
1645 tmp1; 1545 tmp1;
1646 1546
1647 /* first search for itself and remove any old instances */ 1547 /* first search for itself and remove any old instances */
1648 1548
1649 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1549 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1650 {
1651 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1550 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1652 { 1551 tmp->destroy ();
1653 remove_ob (tmp);
1654 free_object (tmp);
1655 }
1656 }
1657 1552
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1553 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1554
1660 tmp1->x = op->x; 1555 tmp1->x = op->x;
1661 tmp1->y = op->y; 1556 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1557 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1558}
… …
1671 */ 1566 */
1672 1567
1673object * 1568object *
1674get_split_ob (object *orig_ob, uint32 nr) 1569get_split_ob (object *orig_ob, uint32 nr)
1675{ 1570{
1676 object * 1571 object *newob;
1677 newob;
1678 int
1679 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1572 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1680 1573
1681 if (orig_ob->nrof < nr) 1574 if (orig_ob->nrof < nr)
1682 { 1575 {
1683 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1576 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1684 return NULL; 1577 return NULL;
1685 } 1578 }
1686 1579
1687 newob = object_create_clone (orig_ob); 1580 newob = object_create_clone (orig_ob);
1688 1581
1689 if ((orig_ob->nrof -= nr) < 1) 1582 if ((orig_ob->nrof -= nr) < 1)
1690 { 1583 orig_ob->destroy (1);
1691 if (!is_removed)
1692 remove_ob (orig_ob);
1693 free_object2 (orig_ob, 1);
1694 }
1695 else if (!is_removed) 1584 else if (!is_removed)
1696 { 1585 {
1697 if (orig_ob->env != NULL) 1586 if (orig_ob->env != NULL)
1698 sub_weight (orig_ob->env, orig_ob->weight * nr); 1587 sub_weight (orig_ob->env, orig_ob->weight * nr);
1699 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1588 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1763 esrv_send_item (tmp, op); 1652 esrv_send_item (tmp, op);
1764 } 1653 }
1765 } 1654 }
1766 else 1655 else
1767 { 1656 {
1768 remove_ob (op); 1657 op->remove ();
1769 op->nrof = 0; 1658 op->nrof = 0;
1770 if (tmp) 1659 if (tmp)
1771 { 1660 {
1772 esrv_del_item (tmp->contr, op->count); 1661 esrv_del_item (tmp->contr, op->count);
1773 } 1662 }
… …
1779 1668
1780 if (i < op->nrof) 1669 if (i < op->nrof)
1781 op->nrof -= i; 1670 op->nrof -= i;
1782 else 1671 else
1783 { 1672 {
1784 remove_ob (op); 1673 op->remove ();
1785 op->nrof = 0; 1674 op->nrof = 0;
1786 } 1675 }
1787 1676
1788 /* Since we just removed op, op->above is null */ 1677 /* Since we just removed op, op->above is null */
1789 for (tmp = above; tmp != NULL; tmp = tmp->above) 1678 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1798 1687
1799 if (op->nrof) 1688 if (op->nrof)
1800 return op; 1689 return op;
1801 else 1690 else
1802 { 1691 {
1803 free_object (op); 1692 op->destroy ();
1804 return NULL; 1693 return NULL;
1805 } 1694 }
1806} 1695}
1807 1696
1808/* 1697/*
… …
1821 op->carrying += weight; 1710 op->carrying += weight;
1822 op = op->env; 1711 op = op->env;
1823 } 1712 }
1824} 1713}
1825 1714
1715object *
1716insert_ob_in_ob (object *op, object *where)
1717{
1718 if (!where)
1719 {
1720 char *dump = dump_object (op);
1721 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1722 free (dump);
1723 return op;
1724 }
1725
1726 if (where->head)
1727 {
1728 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1729 where = where->head;
1730 }
1731
1732 return where->insert (op);
1733}
1734
1826/* 1735/*
1827 * insert_ob_in_ob(op,environment): 1736 * env->insert (op)
1828 * This function inserts the object op in the linked list 1737 * This function inserts the object op in the linked list
1829 * inside the object environment. 1738 * inside the object environment.
1830 * 1739 *
1831 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832 * the inventory at the last position or next to other objects of the same
1833 * type.
1834 * Frank: Now sorted by type, archetype and magic!
1835 *
1836 * The function returns now pointer to inserted item, and return value can 1740 * The function returns now pointer to inserted item, and return value can
1837 * be != op, if items are merged. -Tero 1741 * be != op, if items are merged. -Tero
1838 */ 1742 */
1839 1743
1840object * 1744object *
1841insert_ob_in_ob (object *op, object *where) 1745object::insert (object *op)
1842{ 1746{
1843 object * 1747 object *tmp, *otmp;
1844 tmp, *
1845 otmp;
1846 1748
1847 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1749 if (!QUERY_FLAG (op, FLAG_REMOVED))
1848 { 1750 op->remove ();
1849 dump_object (op);
1850 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851 return op;
1852 }
1853
1854 if (where == NULL)
1855 {
1856 dump_object (op);
1857 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858 return op;
1859 }
1860
1861 if (where->head)
1862 {
1863 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864 where = where->head;
1865 }
1866 1751
1867 if (op->more) 1752 if (op->more)
1868 { 1753 {
1869 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1754 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1870 return op; 1755 return op;
… …
1872 1757
1873 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1758 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874 CLEAR_FLAG (op, FLAG_REMOVED); 1759 CLEAR_FLAG (op, FLAG_REMOVED);
1875 if (op->nrof) 1760 if (op->nrof)
1876 { 1761 {
1877 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1762 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878 if (CAN_MERGE (tmp, op)) 1763 if (object::can_merge (tmp, op))
1879 { 1764 {
1880 /* return the original object and remove inserted object 1765 /* return the original object and remove inserted object
1881 (client needs the original object) */ 1766 (client needs the original object) */
1882 tmp->nrof += op->nrof; 1767 tmp->nrof += op->nrof;
1883 /* Weight handling gets pretty funky. Since we are adding to 1768 /* Weight handling gets pretty funky. Since we are adding to
1884 * tmp->nrof, we need to increase the weight. 1769 * tmp->nrof, we need to increase the weight.
1885 */ 1770 */
1886 add_weight (where, op->weight * op->nrof); 1771 add_weight (this, op->weight * op->nrof);
1887 SET_FLAG (op, FLAG_REMOVED); 1772 SET_FLAG (op, FLAG_REMOVED);
1888 free_object (op); /* free the inserted object */ 1773 op->destroy (); /* free the inserted object */
1889 op = tmp; 1774 op = tmp;
1890 remove_ob (op); /* and fix old object's links */ 1775 op->remove (); /* and fix old object's links */
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1776 CLEAR_FLAG (op, FLAG_REMOVED);
1892 break; 1777 break;
1893 } 1778 }
1894 1779
1895 /* I assume combined objects have no inventory 1780 /* I assume combined objects have no inventory
1896 * We add the weight - this object could have just been removed 1781 * We add the weight - this object could have just been removed
1897 * (if it was possible to merge). calling remove_ob will subtract 1782 * (if it was possible to merge). calling remove_ob will subtract
1898 * the weight, so we need to add it in again, since we actually do 1783 * the weight, so we need to add it in again, since we actually do
1899 * the linking below 1784 * the linking below
1900 */ 1785 */
1901 add_weight (where, op->weight * op->nrof); 1786 add_weight (this, op->weight * op->nrof);
1902 } 1787 }
1903 else 1788 else
1904 add_weight (where, (op->weight + op->carrying)); 1789 add_weight (this, (op->weight + op->carrying));
1905 1790
1906 otmp = is_player_inv (where); 1791 otmp = is_player_inv (this);
1907 if (otmp && otmp->contr != NULL) 1792 if (otmp && otmp->contr)
1908 {
1909 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1793 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910 fix_player (otmp); 1794 fix_player (otmp);
1911 }
1912 1795
1913 op->map = NULL; 1796 op->map = NULL;
1914 op->env = where; 1797 op->env = this;
1915 op->above = NULL; 1798 op->above = NULL;
1916 op->below = NULL; 1799 op->below = NULL;
1917 op->x = 0, op->y = 0; 1800 op->x = 0, op->y = 0;
1918 1801
1919 /* reset the light list and los of the players on the map */ 1802 /* reset the light list and los of the players on the map */
1920 if ((op->glow_radius != 0) && where->map) 1803 if ((op->glow_radius != 0) && map)
1921 { 1804 {
1922#ifdef DEBUG_LIGHTS 1805#ifdef DEBUG_LIGHTS
1923 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1806 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1924#endif /* DEBUG_LIGHTS */ 1807#endif /* DEBUG_LIGHTS */
1925 if (MAP_DARKNESS (where->map)) 1808 if (MAP_DARKNESS (map))
1926 update_all_los (where->map, where->x, where->y); 1809 update_all_los (map, x, y);
1927 } 1810 }
1928 1811
1929 /* Client has no idea of ordering so lets not bother ordering it here. 1812 /* Client has no idea of ordering so lets not bother ordering it here.
1930 * It sure simplifies this function... 1813 * It sure simplifies this function...
1931 */ 1814 */
1932 if (where->inv == NULL) 1815 if (!inv)
1933 where->inv = op; 1816 inv = op;
1934 else 1817 else
1935 { 1818 {
1936 op->below = where->inv; 1819 op->below = inv;
1937 op->below->above = op; 1820 op->below->above = op;
1938 where->inv = op; 1821 inv = op;
1939 } 1822 }
1823
1940 return op; 1824 return op;
1941} 1825}
1942 1826
1943/* 1827/*
1944 * Checks if any objects has a move_type that matches objects 1828 * Checks if any objects has a move_type that matches objects
… …
1962 */ 1846 */
1963 1847
1964int 1848int
1965check_move_on (object *op, object *originator) 1849check_move_on (object *op, object *originator)
1966{ 1850{
1967 object * 1851 object *tmp;
1968 tmp; 1852 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1853 int x = op->x, y = op->y;
1975 1854
1976 MoveType 1855 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1856
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1857 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1858 return 0;
1983
1984 tag = op->count;
1985 1859
1986 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1860 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1987 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1861 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1988 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1862 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1989 1863
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1924 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1925 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2052 { 1926 {
2053 move_apply (tmp, op, originator); 1927 move_apply (tmp, op, originator);
2054 1928
2055 if (was_destroyed (op, tag)) 1929 if (op->destroyed ())
2056 return 1; 1930 return 1;
2057 1931
2058 /* what the person/creature stepped onto has moved the object 1932 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 1933 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 1934 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 1946 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1947 * The first matching object is returned, or NULL if none.
2074 */ 1948 */
2075 1949
2076object * 1950object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 1951present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 1952{
2079 object * 1953 object *
2080 tmp; 1954 tmp;
2081 1955
2082 if (m == NULL || out_of_map (m, x, y)) 1956 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 1969 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 1970 * The first matching object is returned, or NULL if none.
2097 */ 1971 */
2098 1972
2099object * 1973object *
2100present (unsigned char type, mapstruct *m, int x, int y) 1974present (unsigned char type, maptile *m, int x, int y)
2101{ 1975{
2102 object * 1976 object *
2103 tmp; 1977 tmp;
2104 1978
2105 if (out_of_map (m, x, y)) 1979 if (out_of_map (m, x, y))
… …
2245 * the archetype because that isn't correct if the monster has been 2119 * the archetype because that isn't correct if the monster has been
2246 * customized, changed states, etc. 2120 * customized, changed states, etc.
2247 */ 2121 */
2248 2122
2249int 2123int
2250find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2124find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2251{ 2125{
2252 int 2126 int
2253 i, 2127 i,
2254 index = 0, flag; 2128 index = 0, flag;
2255 static int 2129 static int
… …
2276 return -1; 2150 return -1;
2277 return altern[RANDOM () % index]; 2151 return altern[RANDOM () % index];
2278} 2152}
2279 2153
2280/* 2154/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2155 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2156 * find_free_spot(), but it will search max number of squares.
2283 * But it will return the first available spot, not a random choice. 2157 * But it will return the first available spot, not a random choice.
2284 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2158 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2285 */ 2159 */
2286 2160
2287int 2161int
2288find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2162find_first_free_spot (const object *ob, maptile *m, int x, int y)
2289{ 2163{
2290 int 2164 int
2291 i; 2165 i;
2292 2166
2293 for (i = 0; i < SIZEOFFREE; i++) 2167 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * because we have to know what movement the thing looking to move 2231 * because we have to know what movement the thing looking to move
2358 * there is capable of. 2232 * there is capable of.
2359 */ 2233 */
2360 2234
2361int 2235int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2236find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2237{
2364 int 2238 int
2365 i, 2239 i,
2366 max = SIZEOFFREE, mflags; 2240 max = SIZEOFFREE, mflags;
2367 2241
2368 sint16 nx, ny; 2242 sint16 nx, ny;
2369 object * 2243 object *
2370 tmp; 2244 tmp;
2371 mapstruct * 2245 maptile *
2372 mp; 2246 mp;
2373 2247
2374 MoveType blocked, move_type; 2248 MoveType blocked, move_type;
2375 2249
2376 if (exclude && exclude->head) 2250 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2458 * Modified to be map tile aware -.MSW
2585 */ 2459 */
2586 2460
2587 2461
2588int 2462int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2463can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2464{
2591 sint16 dx, dy; 2465 sint16 dx, dy;
2592 int 2466 int
2593 mflags; 2467 mflags;
2594 2468
… …
2643 * create clone from object to another 2517 * create clone from object to another
2644 */ 2518 */
2645object * 2519object *
2646object_create_clone (object *asrc) 2520object_create_clone (object *asrc)
2647{ 2521{
2648 object *
2649 dst = NULL, *tmp, *src, *part, *prev, *item; 2522 object *dst = 0, *tmp, *src, *part, *prev, *item;
2650 2523
2651 if (!asrc) 2524 if (!asrc)
2652 return NULL; 2525 return 0;
2526
2653 src = asrc; 2527 src = asrc;
2654 if (src->head) 2528 if (src->head)
2655 src = src->head; 2529 src = src->head;
2656 2530
2657 prev = NULL; 2531 prev = 0;
2658 for (part = src; part; part = part->more) 2532 for (part = src; part; part = part->more)
2659 { 2533 {
2660 tmp = get_object (); 2534 tmp = part->clone ();
2661 copy_object (part, tmp);
2662 tmp->x -= src->x; 2535 tmp->x -= src->x;
2663 tmp->y -= src->y; 2536 tmp->y -= src->y;
2537
2664 if (!part->head) 2538 if (!part->head)
2665 { 2539 {
2666 dst = tmp; 2540 dst = tmp;
2667 tmp->head = NULL; 2541 tmp->head = 0;
2668 } 2542 }
2669 else 2543 else
2670 { 2544 {
2671 tmp->head = dst; 2545 tmp->head = dst;
2672 } 2546 }
2547
2673 tmp->more = NULL; 2548 tmp->more = 0;
2549
2674 if (prev) 2550 if (prev)
2675 prev->more = tmp; 2551 prev->more = tmp;
2552
2676 prev = tmp; 2553 prev = tmp;
2677 } 2554 }
2678 2555
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2556 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2557 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2558
2685 return dst; 2559 return dst;
2686} 2560}
2687 2561
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2562/* GROS - Creates an object using a string representing its content. */
2698
2699/* Basically, we save the content of the string to a temp file, then call */ 2563/* Basically, we save the content of the string to a temp file, then call */
2700
2701/* load_object on it. I admit it is a highly inefficient way to make things, */ 2564/* load_object on it. I admit it is a highly inefficient way to make things, */
2702
2703/* but it was simple to make and allows reusing the load_object function. */ 2565/* but it was simple to make and allows reusing the load_object function. */
2704
2705/* Remember not to use load_object_str in a time-critical situation. */ 2566/* Remember not to use load_object_str in a time-critical situation. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2567/* Also remember that multiparts objects are not supported for now. */
2708 2568
2709object * 2569object *
2710load_object_str (const char *obstr) 2570load_object_str (const char *obstr)
2711{ 2571{
2712 object * 2572 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2573 char filename[MAX_BUF];
2716 2574
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2575 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2576
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2577 FILE *tempfile = fopen (filename, "w");
2721 2578
2722 if (tempfile == NULL) 2579 if (tempfile == NULL)
2723 { 2580 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2581 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2582 return NULL;
2726 } 2583 }
2727 2584
2728 fprintf (tempfile, obstr); 2585 fprintf (tempfile, obstr);
2729 fclose (tempfile); 2586 fclose (tempfile);
2730 2587
2731 op = get_object (); 2588 op = object::create ();
2732 2589
2733 object_thawer thawer (filename); 2590 object_thawer thawer (filename);
2734 2591
2735 if (thawer) 2592 if (thawer)
2736 load_object (thawer, op, 0); 2593 load_object (thawer, op, 0);
… …
2746 * returns NULL if no match. 2603 * returns NULL if no match.
2747 */ 2604 */
2748object * 2605object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2606find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2607{
2751 object * 2608 object *tmp;
2752 tmp;
2753 2609
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2610 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2611 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2612 return tmp;
2757 2613
… …
2765 * do the desired thing. 2621 * do the desired thing.
2766 */ 2622 */
2767key_value * 2623key_value *
2768get_ob_key_link (const object *ob, const char *key) 2624get_ob_key_link (const object *ob, const char *key)
2769{ 2625{
2770 key_value * 2626 key_value *link;
2771 link;
2772 2627
2773 for (link = ob->key_values; link != NULL; link = link->next) 2628 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2629 if (link->key == key)
2776 {
2777 return link; 2630 return link;
2778 }
2779 }
2780 2631
2781 return NULL; 2632 return NULL;
2782} 2633}
2783 2634
2784/* 2635/*

Diff Legend

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