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.44 by root, Thu Sep 14 17:29:27 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}
… …
596 528
597 if (settings.casting_time) 529 if (settings.casting_time)
598 casting_time = -1; 530 casting_time = -1;
599} 531}
600 532
601void object::clone (object *destination)
602{
603 *(object_copy *)destination = *this;
604 *(object_pod *)destination = *this;
605
606 if (self || cb)
607 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
608}
609
610/* 533/*
611 * copy object first frees everything allocated by the second object, 534 * copy_to first frees everything allocated by the dst object,
612 * and then copies the contends of the first object into the second 535 * and then copies the contents of itself into the second
613 * object, allocating what needs to be allocated. Basically, any 536 * object, allocating what needs to be allocated. Basically, any
614 * 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,
615 * 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
616 * will point at garbage. 539 * will point at garbage.
617 */ 540 */
618void 541void
619copy_object (object *op2, object *op) 542object::copy_to (object *dst)
620{ 543{
621 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 544 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
622 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 545 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
623 546
624 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));
625 552
626 if (is_freed) 553 if (is_freed)
627 SET_FLAG (op, FLAG_FREED); 554 SET_FLAG (dst, FLAG_FREED);
555
628 if (is_removed) 556 if (is_removed)
629 SET_FLAG (op, FLAG_REMOVED); 557 SET_FLAG (dst, FLAG_REMOVED);
630 558
631 if (op2->speed < 0) 559 if (speed < 0)
632 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 560 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
633 561
634 /* Copy over key_values, if any. */ 562 /* Copy over key_values, if any. */
635 if (op2->key_values) 563 if (key_values)
636 { 564 {
637 key_value *tail = 0; 565 key_value *tail = 0;
638 key_value *i; 566 key_value *i;
639 567
640 op->key_values = 0; 568 dst->key_values = 0;
641 569
642 for (i = op2->key_values; i; i = i->next) 570 for (i = key_values; i; i = i->next)
643 { 571 {
644 key_value *new_link = new key_value; 572 key_value *new_link = new key_value;
645 573
646 new_link->next = 0; 574 new_link->next = 0;
647 new_link->key = i->key; 575 new_link->key = i->key;
648 new_link->value = i->value; 576 new_link->value = i->value;
649 577
650 /* Try and be clever here, too. */ 578 /* Try and be clever here, too. */
651 if (!op->key_values) 579 if (!dst->key_values)
652 { 580 {
653 op->key_values = new_link; 581 dst->key_values = new_link;
654 tail = new_link; 582 tail = new_link;
655 } 583 }
656 else 584 else
657 { 585 {
658 tail->next = new_link; 586 tail->next = new_link;
659 tail = new_link; 587 tail = new_link;
660 } 588 }
661 } 589 }
662 } 590 }
663 591
664 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;
665} 601}
666 602
667/* 603/*
668 * 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
669 * 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
… …
874 update_now = 1; 810 update_now = 1;
875 811
876 if ((move_slow | op->move_slow) != move_slow) 812 if ((move_slow | op->move_slow) != move_slow)
877 update_now = 1; 813 update_now = 1;
878 } 814 }
815
879 /* if the object is being removed, we can't make intelligent 816 /* if the object is being removed, we can't make intelligent
880 * decisions, because remove_ob can't really pass the object 817 * decisions, because remove_ob can't really pass the object
881 * that is being removed. 818 * that is being removed.
882 */ 819 */
883 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
895 832
896 if (op->more != NULL) 833 if (op->more != NULL)
897 update_object (op->more, action); 834 update_object (op->more, action);
898} 835}
899 836
900static unordered_vector<object *> mortals; 837object::vector object::mortals;
838object::vector object::objects; // not yet used
839object *object::first;
901 840
902void object::free_mortals () 841void object::free_mortals ()
903{ 842{
904 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 843 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905 if ((*i)->refcnt) 844 if ((*i)->refcnt)
906 ++i; // further delay freeing 845 ++i; // further delay freeing
907 else 846 else
908 { 847 {
909 delete *i; 848 delete *i;
910 mortals.erase (i); 849 mortals.erase (i);
911 } 850 }
912
913 static int lastmortals = 0;//D
914
915 if (mortals.size() != lastmortals)//D
916 {
917 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 }
920} 851}
921 852
922object::object () 853object::object ()
923{ 854{
924 SET_FLAG (this, FLAG_REMOVED); 855 SET_FLAG (this, FLAG_REMOVED);
… …
936{ 867{
937 count = ++ob_count; 868 count = ++ob_count;
938 uuid = gen_uuid (); 869 uuid = gen_uuid ();
939 870
940 prev = 0; 871 prev = 0;
941 next = objects; 872 next = object::first;
942 873
943 if (objects) 874 if (object::first)
944 objects->prev = this; 875 object::first->prev = this;
945 876
946 objects = this; 877 object::first = this;
947} 878}
948 879
949void object::unlink () 880void object::unlink ()
950{ 881{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == objects) 882 if (this == object::first)
955 objects = next; 883 object::first = next;
956 884
957 /* Remove this object from the list of used objects */ 885 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 886 if (prev) prev->next = next;
959 if (next) next->prev = prev; 887 if (next) next->prev = prev;
960 888
… …
974 * 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
975 * free objects. The IS_FREED() flag is set in the object. 903 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 904 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 905 * this function to succeed.
978 * 906 *
979 * 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
980 * inventory to the ground. 908 * inventory to the ground.
981 */ 909 */
982void object::free (bool free_inventory) 910void object::destroy (bool destroy_inventory)
983{ 911{
984 if (QUERY_FLAG (this, FLAG_FREED)) 912 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 913 return;
986 914
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 915 if (QUERY_FLAG (this, FLAG_FRIENDLY))
988 remove_friendly_object (this); 916 remove_friendly_object (this);
989 917
990 if (!QUERY_FLAG (this, FLAG_REMOVED)) 918 if (!QUERY_FLAG (this, FLAG_REMOVED))
991 remove_ob (this); 919 remove ();
992 920
993 SET_FLAG (this, FLAG_FREED); 921 SET_FLAG (this, FLAG_FREED);
994 922
995 if (more) 923 if (more)
996 { 924 {
997 more->free (free_inventory); 925 more->destroy (destroy_inventory);
998 more = 0; 926 more = 0;
999 } 927 }
1000 928
1001 if (inv) 929 if (inv)
1002 { 930 {
1003 /* Only if the space blocks everything do we not process - 931 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 932 * if some form of movement is allowed, let objects
1005 * drop on that space. 933 * drop on that space.
1006 */ 934 */
1007 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)
1008 { 936 {
1009 object *op = inv; 937 object *op = inv;
1010 938
1011 while (op) 939 while (op)
1012 { 940 {
1013 object *tmp = op->below; 941 object *tmp = op->below;
1014 op->free (free_inventory); 942 op->destroy (destroy_inventory);
1015 op = tmp; 943 op = tmp;
1016 } 944 }
1017 } 945 }
1018 else 946 else
1019 { /* Put objects in inventory onto this space */ 947 { /* Put objects in inventory onto this space */
… …
1021 949
1022 while (op) 950 while (op)
1023 { 951 {
1024 object *tmp = op->below; 952 object *tmp = op->below;
1025 953
1026 remove_ob (op); 954 op->remove ();
1027 955
1028 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 956 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1029 || 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))
1030 free_object (op); 958 op->destroy ();
1031 else 959 else
1032 { 960 {
1033 op->x = x; 961 op->x = x;
1034 op->y = y; 962 op->y = y;
1035 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 */
… …
1038 op = tmp; 966 op = tmp;
1039 } 967 }
1040 } 968 }
1041 } 969 }
1042 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
1043 // clear those pointers that likely might have circular references to us 991 // clear those pointers that likely might have circular references to us
1044 owner = 0; 992 owner = 0;
1045 enemy = 0; 993 enemy = 0;
1046 attacked_by = 0; 994 attacked_by = 0;
1047 995
996 // only relevant for players(?), but make sure of it anyways
997 contr = 0;
998
1048 /* Remove object from the active list */ 999 /* Remove object from the active list */
1049 speed = 0; 1000 speed = 0;
1050 update_ob_speed (this); 1001 update_ob_speed (this);
1051 1002
1052 unlink (); 1003 unlink ();
… …
1056 1007
1057/* 1008/*
1058 * sub_weight() recursively (outwards) subtracts a number from the 1009 * sub_weight() recursively (outwards) subtracts a number from the
1059 * 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)).
1060 */ 1011 */
1061
1062void 1012void
1063sub_weight (object *op, signed long weight) 1013sub_weight (object *op, signed long weight)
1064{ 1014{
1065 while (op != NULL) 1015 while (op != NULL)
1066 { 1016 {
1067 if (op->type == CONTAINER) 1017 if (op->type == CONTAINER)
1068 {
1069 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1018 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070 } 1019
1071 op->carrying -= weight; 1020 op->carrying -= weight;
1072 op = op->env; 1021 op = op->env;
1073 } 1022 }
1074} 1023}
1075 1024
1076/* remove_ob(op): 1025/* op->remove ():
1077 * 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
1078 * 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
1079 * object will have no environment. If the object previously had an 1028 * object will have no environment. If the object previously had an
1080 * environment, the x and y coordinates will be updated to 1029 * environment, the x and y coordinates will be updated to
1081 * the previous environment. 1030 * the previous environment.
1082 * Beware: This function is called from the editor as well! 1031 * Beware: This function is called from the editor as well!
1083 */ 1032 */
1084
1085void 1033void
1086remove_ob (object *op) 1034object::remove ()
1087{ 1035{
1036 object *tmp, *last = 0;
1088 object * 1037 object *otmp;
1089 tmp, *
1090 last = NULL;
1091 object *
1092 otmp;
1093 1038
1094 tag_t
1095 tag;
1096 int
1097 check_walk_off; 1039 int check_walk_off;
1098 mapstruct *
1099 m;
1100 1040
1101 sint16
1102 x,
1103 y;
1104
1105 if (QUERY_FLAG (op, FLAG_REMOVED)) 1041 if (QUERY_FLAG (this, FLAG_REMOVED))
1106 return; 1042 return;
1107 1043
1108 SET_FLAG (op, FLAG_REMOVED); 1044 SET_FLAG (this, FLAG_REMOVED);
1109 1045
1110 if (op->more != NULL) 1046 if (more)
1111 remove_ob (op->more); 1047 more->remove ();
1112 1048
1113 /* 1049 /*
1114 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1115 * inventory. 1051 * inventory.
1116 */ 1052 */
1117 if (op->env != NULL) 1053 if (env)
1118 { 1054 {
1119 if (op->nrof) 1055 if (nrof)
1120 sub_weight (op->env, op->weight * op->nrof); 1056 sub_weight (env, weight * nrof);
1121 else 1057 else
1122 sub_weight (op->env, op->weight + op->carrying); 1058 sub_weight (env, weight + carrying);
1123 1059
1124 /* 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
1125 * made to players inventory. If set, avoiding the call 1061 * made to players inventory. If set, avoiding the call
1126 * to save cpu time. 1062 * to save cpu time.
1127 */ 1063 */
1128 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))
1129 fix_player (otmp); 1065 fix_player (otmp);
1130 1066
1131 if (op->above != NULL) 1067 if (above != NULL)
1132 op->above->below = op->below; 1068 above->below = below;
1133 else 1069 else
1134 op->env->inv = op->below; 1070 env->inv = below;
1135 1071
1136 if (op->below != NULL) 1072 if (below != NULL)
1137 op->below->above = op->above; 1073 below->above = above;
1138 1074
1139 /* we set up values so that it could be inserted into 1075 /* we set up values so that it could be inserted into
1140 * 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
1141 * to the caller to decide what we want to do. 1077 * to the caller to decide what we want to do.
1142 */ 1078 */
1143 op->x = op->env->x, op->y = op->env->y; 1079 x = env->x, y = env->y;
1144 op->map = op->env->map; 1080 map = env->map;
1145 op->above = NULL, op->below = NULL; 1081 above = 0, below = 0;
1146 op->env = NULL; 1082 env = 0;
1147 } 1083 }
1148 else if (op->map) 1084 else if (map)
1149 { 1085 {
1150 x = op->x;
1151 y = op->y;
1152 m = get_map_from_coord (op->map, &x, &y);
1153
1154 if (!m)
1155 {
1156 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1157 op->map->path, op->x, op->y);
1158 /* in old days, we used to set x and y to 0 and continue.
1159 * it seems if we get into this case, something is probablye
1160 * screwed up and should be fixed.
1161 */
1162 abort ();
1163 }
1164
1165 if (op->map != m)
1166 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1167 op->map->path, m->path, op->x, op->y, x, y);
1168
1169 /* 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
1170 * lots of logic for things we no longer care about 1087 * lots of logic for things we no longer care about
1171 */ 1088 */
1172 1089
1173 /* link the object above us */ 1090 /* link the object above us */
1174 if (op->above) 1091 if (above)
1175 op->above->below = op->below; 1092 above->below = below;
1176 else 1093 else
1177 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 */
1178 1095
1179 /* Relink the object below us, if there is one */ 1096 /* Relink the object below us, if there is one */
1180 if (op->below) 1097 if (below)
1181 op->below->above = op->above; 1098 below->above = above;
1182 else 1099 else
1183 { 1100 {
1184 /* 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
1185 * use translated coordinates in case some oddness with map tiling is 1102 * use translated coordinates in case some oddness with map tiling is
1186 * evident 1103 * evident
1187 */ 1104 */
1188 if (GET_MAP_OB (m, x, y) != op) 1105 if (GET_MAP_OB (map, x, y) != this)
1189 { 1106 {
1190 dump_object (op); 1107 char *dump = dump_object (this);
1191 LOG (llevError, 1108 LOG (llevError,
1192 "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);
1193 dump_object (GET_MAP_OB (m, x, y)); 1111 dump = dump_object (GET_MAP_OB (map, x, y));
1194 LOG (llevError, "%s\n", errmsg); 1112 LOG (llevError, "%s\n", dump);
1113 free (dump);
1195 } 1114 }
1196 1115
1197 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1116 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1198 } 1117 }
1199 1118
1200 op->above = 0; 1119 above = 0;
1201 op->below = 0; 1120 below = 0;
1202 1121
1203 if (op->map->in_memory == MAP_SAVING) 1122 if (map->in_memory == MAP_SAVING)
1204 return; 1123 return;
1205 1124
1206 tag = op->count;
1207 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1125 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1208 1126
1209 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)
1210 { 1128 {
1211 /* 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
1212 * being removed. 1130 * being removed.
1213 */ 1131 */
1214 1132
1215 if (tmp->type == PLAYER && tmp != op) 1133 if (tmp->type == PLAYER && tmp != this)
1216 { 1134 {
1217 /* If a container that the player is currently using somehow gets 1135 /* If a container that the player is currently using somehow gets
1218 * removed (most likely destroyed), update the player view 1136 * removed (most likely destroyed), update the player view
1219 * appropriately. 1137 * appropriately.
1220 */ 1138 */
1221 if (tmp->container == op) 1139 if (tmp->container == this)
1222 { 1140 {
1223 CLEAR_FLAG (op, FLAG_APPLIED); 1141 CLEAR_FLAG (this, FLAG_APPLIED);
1224 tmp->container = NULL; 1142 tmp->container = 0;
1225 } 1143 }
1226 1144
1227 tmp->contr->socket.update_look = 1; 1145 tmp->contr->socket.update_look = 1;
1228 } 1146 }
1229 1147
1230 /* See if player moving off should effect something */ 1148 /* See if player moving off should effect something */
1231 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))
1232 { 1152 {
1233 move_apply (tmp, op, NULL); 1153 move_apply (tmp, this, 0);
1234 1154
1235 if (was_destroyed (op, tag)) 1155 if (destroyed ())
1236 {
1237 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 ());
1238 }
1239 } 1157 }
1240 1158
1241 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1159 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242 1160
1243 if (tmp->above == tmp) 1161 if (tmp->above == tmp)
1244 tmp->above = NULL; 1162 tmp->above = 0;
1245 1163
1246 last = tmp; 1164 last = tmp;
1247 } 1165 }
1248 1166
1249 /* last == NULL of there are no objects on this space */ 1167 /* last == NULL of there are no objects on this space */
1250 if (last == NULL) 1168 if (!last)
1251 { 1169 {
1252 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1253 * 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
1254 * 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
1255 * be correct anyways. 1173 * be correct anyways.
1256 */ 1174 */
1257 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1175 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1258 update_position (op->map, op->x, op->y); 1176 update_position (map, x, y);
1259 } 1177 }
1260 else 1178 else
1261 update_object (last, UP_OBJ_REMOVE); 1179 update_object (last, UP_OBJ_REMOVE);
1262 1180
1263 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1181 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1264 update_all_los (op->map, op->x, op->y); 1182 update_all_los (map, x, y);
1265 } 1183 }
1266} 1184}
1267 1185
1268/* 1186/*
1269 * merge_ob(op,top): 1187 * merge_ob(op,top):
… …
1284 1202
1285 for (; top != NULL; top = top->below) 1203 for (; top != NULL; top = top->below)
1286 { 1204 {
1287 if (top == op) 1205 if (top == op)
1288 continue; 1206 continue;
1289 if (CAN_MERGE (op, top)) 1207
1208 if (object::can_merge (op, top))
1290 { 1209 {
1291 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1292 1211
1293/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1294 op->weight = 0; /* Don't want any adjustements now */ 1213 op->weight = 0; /* Don't want any adjustements now */
1295 remove_ob (op); 1214 op->destroy ();
1296 free_object (op);
1297 return top; 1215 return top;
1298 } 1216 }
1299 } 1217 }
1300 1218
1301 return NULL; 1219 return 0;
1302} 1220}
1303 1221
1304/* 1222/*
1305 * 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
1306 * job preparing multi-part monsters 1224 * job preparing multi-part monsters
1307 */ 1225 */
1308object * 1226object *
1309insert_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)
1310{ 1228{
1311 object *tmp; 1229 object *tmp;
1312 1230
1313 if (op->head) 1231 if (op->head)
1314 op = op->head; 1232 op = op->head;
… …
1342 * NULL if 'op' was destroyed 1260 * NULL if 'op' was destroyed
1343 * just 'op' otherwise 1261 * just 'op' otherwise
1344 */ 1262 */
1345 1263
1346object * 1264object *
1347insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1265insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1348{ 1266{
1349 object *tmp, *top, *floor = NULL; 1267 object *tmp, *top, *floor = NULL;
1350 sint16 x, y; 1268 sint16 x, y;
1351 1269
1352 if (QUERY_FLAG (op, FLAG_FREED)) 1270 if (QUERY_FLAG (op, FLAG_FREED))
… …
1355 return NULL; 1273 return NULL;
1356 } 1274 }
1357 1275
1358 if (m == NULL) 1276 if (m == NULL)
1359 { 1277 {
1360 dump_object (op); 1278 char *dump = dump_object (op);
1361 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);
1362 return op; 1281 return op;
1363 } 1282 }
1364 1283
1365 if (out_of_map (m, op->x, op->y)) 1284 if (out_of_map (m, op->x, op->y))
1366 { 1285 {
1367 dump_object (op); 1286 char *dump = dump_object (op);
1368 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);
1369#ifdef MANY_CORES 1288#ifdef MANY_CORES
1370 /* 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
1371 * 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
1372 * improperly inserted. 1291 * improperly inserted.
1373 */ 1292 */
1374 abort (); 1293 abort ();
1375#endif 1294#endif
1295 free (dump);
1376 return op; 1296 return op;
1377 } 1297 }
1378 1298
1379 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1299 if (!QUERY_FLAG (op, FLAG_REMOVED))
1380 { 1300 {
1381 dump_object (op); 1301 char *dump = dump_object (op);
1382 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);
1383 return op; 1304 return op;
1384 } 1305 }
1385 1306
1386 if (op->more != NULL) 1307 if (op->more != NULL)
1387 { 1308 {
… …
1425 1346
1426 /* this has to be done after we translate the coordinates. 1347 /* this has to be done after we translate the coordinates.
1427 */ 1348 */
1428 if (op->nrof && !(flag & INS_NO_MERGE)) 1349 if (op->nrof && !(flag & INS_NO_MERGE))
1429 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)
1430 if (CAN_MERGE (op, tmp)) 1351 if (object::can_merge (op, tmp))
1431 { 1352 {
1432 op->nrof += tmp->nrof; 1353 op->nrof += tmp->nrof;
1433 remove_ob (tmp); 1354 tmp->destroy ();
1434 free_object (tmp);
1435 } 1355 }
1436 1356
1437 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 */
1438 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1358 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1439 1359
… …
1625 tmp1; 1545 tmp1;
1626 1546
1627 /* first search for itself and remove any old instances */ 1547 /* first search for itself and remove any old instances */
1628 1548
1629 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)
1630 {
1631 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1550 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1632 { 1551 tmp->destroy ();
1633 remove_ob (tmp);
1634 free_object (tmp);
1635 }
1636 }
1637 1552
1638 tmp1 = arch_to_object (find_archetype (arch_string)); 1553 tmp1 = arch_to_object (archetype::find (arch_string));
1639 1554
1640 tmp1->x = op->x; 1555 tmp1->x = op->x;
1641 tmp1->y = op->y; 1556 tmp1->y = op->y;
1642 insert_ob_in_map (tmp1, op->map, op, 0); 1557 insert_ob_in_map (tmp1, op->map, op, 0);
1643} 1558}
… …
1651 */ 1566 */
1652 1567
1653object * 1568object *
1654get_split_ob (object *orig_ob, uint32 nr) 1569get_split_ob (object *orig_ob, uint32 nr)
1655{ 1570{
1656 object * 1571 object *newob;
1657 newob;
1658 int
1659 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1572 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1660 1573
1661 if (orig_ob->nrof < nr) 1574 if (orig_ob->nrof < nr)
1662 { 1575 {
1663 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);
1664 return NULL; 1577 return NULL;
1665 } 1578 }
1666 1579
1667 newob = object_create_clone (orig_ob); 1580 newob = object_create_clone (orig_ob);
1668 1581
1669 if ((orig_ob->nrof -= nr) < 1) 1582 if ((orig_ob->nrof -= nr) < 1)
1670 { 1583 orig_ob->destroy (1);
1671 if (!is_removed)
1672 remove_ob (orig_ob);
1673 free_object2 (orig_ob, 1);
1674 }
1675 else if (!is_removed) 1584 else if (!is_removed)
1676 { 1585 {
1677 if (orig_ob->env != NULL) 1586 if (orig_ob->env != NULL)
1678 sub_weight (orig_ob->env, orig_ob->weight * nr); 1587 sub_weight (orig_ob->env, orig_ob->weight * nr);
1679 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)
… …
1743 esrv_send_item (tmp, op); 1652 esrv_send_item (tmp, op);
1744 } 1653 }
1745 } 1654 }
1746 else 1655 else
1747 { 1656 {
1748 remove_ob (op); 1657 op->remove ();
1749 op->nrof = 0; 1658 op->nrof = 0;
1750 if (tmp) 1659 if (tmp)
1751 { 1660 {
1752 esrv_del_item (tmp->contr, op->count); 1661 esrv_del_item (tmp->contr, op->count);
1753 } 1662 }
… …
1759 1668
1760 if (i < op->nrof) 1669 if (i < op->nrof)
1761 op->nrof -= i; 1670 op->nrof -= i;
1762 else 1671 else
1763 { 1672 {
1764 remove_ob (op); 1673 op->remove ();
1765 op->nrof = 0; 1674 op->nrof = 0;
1766 } 1675 }
1767 1676
1768 /* Since we just removed op, op->above is null */ 1677 /* Since we just removed op, op->above is null */
1769 for (tmp = above; tmp != NULL; tmp = tmp->above) 1678 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1778 1687
1779 if (op->nrof) 1688 if (op->nrof)
1780 return op; 1689 return op;
1781 else 1690 else
1782 { 1691 {
1783 free_object (op); 1692 op->destroy ();
1784 return NULL; 1693 return NULL;
1785 } 1694 }
1786} 1695}
1787 1696
1788/* 1697/*
… …
1801 op->carrying += weight; 1710 op->carrying += weight;
1802 op = op->env; 1711 op = op->env;
1803 } 1712 }
1804} 1713}
1805 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
1806/* 1735/*
1807 * insert_ob_in_ob(op,environment): 1736 * env->insert (op)
1808 * This function inserts the object op in the linked list 1737 * This function inserts the object op in the linked list
1809 * inside the object environment. 1738 * inside the object environment.
1810 * 1739 *
1811 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1812 * the inventory at the last position or next to other objects of the same
1813 * type.
1814 * Frank: Now sorted by type, archetype and magic!
1815 *
1816 * 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
1817 * be != op, if items are merged. -Tero 1741 * be != op, if items are merged. -Tero
1818 */ 1742 */
1819 1743
1820object * 1744object *
1821insert_ob_in_ob (object *op, object *where) 1745object::insert (object *op)
1822{ 1746{
1823 object * 1747 object *tmp, *otmp;
1824 tmp, *
1825 otmp;
1826 1748
1827 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1749 if (!QUERY_FLAG (op, FLAG_REMOVED))
1828 { 1750 op->remove ();
1829 dump_object (op);
1830 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1831 return op;
1832 }
1833
1834 if (where == NULL)
1835 {
1836 dump_object (op);
1837 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1838 return op;
1839 }
1840
1841 if (where->head)
1842 {
1843 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1844 where = where->head;
1845 }
1846 1751
1847 if (op->more) 1752 if (op->more)
1848 { 1753 {
1849 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);
1850 return op; 1755 return op;
… …
1852 1757
1853 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1758 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1854 CLEAR_FLAG (op, FLAG_REMOVED); 1759 CLEAR_FLAG (op, FLAG_REMOVED);
1855 if (op->nrof) 1760 if (op->nrof)
1856 { 1761 {
1857 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1762 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1858 if (CAN_MERGE (tmp, op)) 1763 if (object::can_merge (tmp, op))
1859 { 1764 {
1860 /* return the original object and remove inserted object 1765 /* return the original object and remove inserted object
1861 (client needs the original object) */ 1766 (client needs the original object) */
1862 tmp->nrof += op->nrof; 1767 tmp->nrof += op->nrof;
1863 /* Weight handling gets pretty funky. Since we are adding to 1768 /* Weight handling gets pretty funky. Since we are adding to
1864 * tmp->nrof, we need to increase the weight. 1769 * tmp->nrof, we need to increase the weight.
1865 */ 1770 */
1866 add_weight (where, op->weight * op->nrof); 1771 add_weight (this, op->weight * op->nrof);
1867 SET_FLAG (op, FLAG_REMOVED); 1772 SET_FLAG (op, FLAG_REMOVED);
1868 free_object (op); /* free the inserted object */ 1773 op->destroy (); /* free the inserted object */
1869 op = tmp; 1774 op = tmp;
1870 remove_ob (op); /* and fix old object's links */ 1775 op->remove (); /* and fix old object's links */
1871 CLEAR_FLAG (op, FLAG_REMOVED); 1776 CLEAR_FLAG (op, FLAG_REMOVED);
1872 break; 1777 break;
1873 } 1778 }
1874 1779
1875 /* I assume combined objects have no inventory 1780 /* I assume combined objects have no inventory
1876 * We add the weight - this object could have just been removed 1781 * We add the weight - this object could have just been removed
1877 * (if it was possible to merge). calling remove_ob will subtract 1782 * (if it was possible to merge). calling remove_ob will subtract
1878 * 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
1879 * the linking below 1784 * the linking below
1880 */ 1785 */
1881 add_weight (where, op->weight * op->nrof); 1786 add_weight (this, op->weight * op->nrof);
1882 } 1787 }
1883 else 1788 else
1884 add_weight (where, (op->weight + op->carrying)); 1789 add_weight (this, (op->weight + op->carrying));
1885 1790
1886 otmp = is_player_inv (where); 1791 otmp = is_player_inv (this);
1887 if (otmp && otmp->contr != NULL) 1792 if (otmp && otmp->contr)
1888 {
1889 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1793 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1890 fix_player (otmp); 1794 fix_player (otmp);
1891 }
1892 1795
1893 op->map = NULL; 1796 op->map = NULL;
1894 op->env = where; 1797 op->env = this;
1895 op->above = NULL; 1798 op->above = NULL;
1896 op->below = NULL; 1799 op->below = NULL;
1897 op->x = 0, op->y = 0; 1800 op->x = 0, op->y = 0;
1898 1801
1899 /* 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 */
1900 if ((op->glow_radius != 0) && where->map) 1803 if ((op->glow_radius != 0) && map)
1901 { 1804 {
1902#ifdef DEBUG_LIGHTS 1805#ifdef DEBUG_LIGHTS
1903 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);
1904#endif /* DEBUG_LIGHTS */ 1807#endif /* DEBUG_LIGHTS */
1905 if (MAP_DARKNESS (where->map)) 1808 if (MAP_DARKNESS (map))
1906 update_all_los (where->map, where->x, where->y); 1809 update_all_los (map, x, y);
1907 } 1810 }
1908 1811
1909 /* 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.
1910 * It sure simplifies this function... 1813 * It sure simplifies this function...
1911 */ 1814 */
1912 if (where->inv == NULL) 1815 if (!inv)
1913 where->inv = op; 1816 inv = op;
1914 else 1817 else
1915 { 1818 {
1916 op->below = where->inv; 1819 op->below = inv;
1917 op->below->above = op; 1820 op->below->above = op;
1918 where->inv = op; 1821 inv = op;
1919 } 1822 }
1823
1920 return op; 1824 return op;
1921} 1825}
1922 1826
1923/* 1827/*
1924 * Checks if any objects has a move_type that matches objects 1828 * Checks if any objects has a move_type that matches objects
… …
1942 */ 1846 */
1943 1847
1944int 1848int
1945check_move_on (object *op, object *originator) 1849check_move_on (object *op, object *originator)
1946{ 1850{
1947 object * 1851 object *tmp;
1948 tmp; 1852 maptile *m = op->map;
1949 tag_t
1950 tag;
1951 mapstruct *
1952 m = op->map;
1953 int
1954 x = op->x, y = op->y; 1853 int x = op->x, y = op->y;
1955 1854
1956 MoveType 1855 MoveType move_on, move_slow, move_block;
1957 move_on,
1958 move_slow,
1959 move_block;
1960 1856
1961 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1857 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962 return 0; 1858 return 0;
1963
1964 tag = op->count;
1965 1859
1966 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);
1967 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);
1968 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);
1969 1863
… …
2030 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1924 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2031 ((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))
2032 { 1926 {
2033 move_apply (tmp, op, originator); 1927 move_apply (tmp, op, originator);
2034 1928
2035 if (was_destroyed (op, tag)) 1929 if (op->destroyed ())
2036 return 1; 1930 return 1;
2037 1931
2038 /* what the person/creature stepped onto has moved the object 1932 /* what the person/creature stepped onto has moved the object
2039 * someplace new. Don't process any further - if we did, 1933 * someplace new. Don't process any further - if we did,
2040 * have a feeling strange problems would result. 1934 * have a feeling strange problems would result.
… …
2052 * a matching archetype at the given map and coordinates. 1946 * a matching archetype at the given map and coordinates.
2053 * The first matching object is returned, or NULL if none. 1947 * The first matching object is returned, or NULL if none.
2054 */ 1948 */
2055 1949
2056object * 1950object *
2057present_arch (const archetype *at, mapstruct *m, int x, int y) 1951present_arch (const archetype *at, maptile *m, int x, int y)
2058{ 1952{
2059 object * 1953 object *
2060 tmp; 1954 tmp;
2061 1955
2062 if (m == NULL || out_of_map (m, x, y)) 1956 if (m == NULL || out_of_map (m, x, y))
… …
2075 * a matching type variable at the given map and coordinates. 1969 * a matching type variable at the given map and coordinates.
2076 * The first matching object is returned, or NULL if none. 1970 * The first matching object is returned, or NULL if none.
2077 */ 1971 */
2078 1972
2079object * 1973object *
2080present (unsigned char type, mapstruct *m, int x, int y) 1974present (unsigned char type, maptile *m, int x, int y)
2081{ 1975{
2082 object * 1976 object *
2083 tmp; 1977 tmp;
2084 1978
2085 if (out_of_map (m, x, y)) 1979 if (out_of_map (m, x, y))
… …
2225 * 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
2226 * customized, changed states, etc. 2120 * customized, changed states, etc.
2227 */ 2121 */
2228 2122
2229int 2123int
2230find_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)
2231{ 2125{
2232 int 2126 int
2233 i, 2127 i,
2234 index = 0, flag; 2128 index = 0, flag;
2235 static int 2129 static int
… …
2256 return -1; 2150 return -1;
2257 return altern[RANDOM () % index]; 2151 return altern[RANDOM () % index];
2258} 2152}
2259 2153
2260/* 2154/*
2261 * find_first_free_spot(archetype, mapstruct, x, y) works like 2155 * find_first_free_spot(archetype, maptile, x, y) works like
2262 * find_free_spot(), but it will search max number of squares. 2156 * find_free_spot(), but it will search max number of squares.
2263 * 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.
2264 * 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.
2265 */ 2159 */
2266 2160
2267int 2161int
2268find_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)
2269{ 2163{
2270 int 2164 int
2271 i; 2165 i;
2272 2166
2273 for (i = 0; i < SIZEOFFREE; i++) 2167 for (i = 0; i < SIZEOFFREE; i++)
… …
2337 * 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
2338 * there is capable of. 2232 * there is capable of.
2339 */ 2233 */
2340 2234
2341int 2235int
2342find_dir (mapstruct *m, int x, int y, object *exclude) 2236find_dir (maptile *m, int x, int y, object *exclude)
2343{ 2237{
2344 int 2238 int
2345 i, 2239 i,
2346 max = SIZEOFFREE, mflags; 2240 max = SIZEOFFREE, mflags;
2347 2241
2348 sint16 nx, ny; 2242 sint16 nx, ny;
2349 object * 2243 object *
2350 tmp; 2244 tmp;
2351 mapstruct * 2245 maptile *
2352 mp; 2246 mp;
2353 2247
2354 MoveType blocked, move_type; 2248 MoveType blocked, move_type;
2355 2249
2356 if (exclude && exclude->head) 2250 if (exclude && exclude->head)
… …
2564 * Modified to be map tile aware -.MSW 2458 * Modified to be map tile aware -.MSW
2565 */ 2459 */
2566 2460
2567 2461
2568int 2462int
2569can_see_monsterP (mapstruct *m, int x, int y, int dir) 2463can_see_monsterP (maptile *m, int x, int y, int dir)
2570{ 2464{
2571 sint16 dx, dy; 2465 sint16 dx, dy;
2572 int 2466 int
2573 mflags; 2467 mflags;
2574 2468
… …
2623 * create clone from object to another 2517 * create clone from object to another
2624 */ 2518 */
2625object * 2519object *
2626object_create_clone (object *asrc) 2520object_create_clone (object *asrc)
2627{ 2521{
2628 object *
2629 dst = NULL, *tmp, *src, *part, *prev, *item; 2522 object *dst = 0, *tmp, *src, *part, *prev, *item;
2630 2523
2631 if (!asrc) 2524 if (!asrc)
2632 return NULL; 2525 return 0;
2526
2633 src = asrc; 2527 src = asrc;
2634 if (src->head) 2528 if (src->head)
2635 src = src->head; 2529 src = src->head;
2636 2530
2637 prev = NULL; 2531 prev = 0;
2638 for (part = src; part; part = part->more) 2532 for (part = src; part; part = part->more)
2639 { 2533 {
2640 tmp = get_object (); 2534 tmp = part->clone ();
2641 copy_object (part, tmp);
2642 tmp->x -= src->x; 2535 tmp->x -= src->x;
2643 tmp->y -= src->y; 2536 tmp->y -= src->y;
2537
2644 if (!part->head) 2538 if (!part->head)
2645 { 2539 {
2646 dst = tmp; 2540 dst = tmp;
2647 tmp->head = NULL; 2541 tmp->head = 0;
2648 } 2542 }
2649 else 2543 else
2650 { 2544 {
2651 tmp->head = dst; 2545 tmp->head = dst;
2652 } 2546 }
2547
2653 tmp->more = NULL; 2548 tmp->more = 0;
2549
2654 if (prev) 2550 if (prev)
2655 prev->more = tmp; 2551 prev->more = tmp;
2552
2656 prev = tmp; 2553 prev = tmp;
2657 } 2554 }
2658 2555
2659 /*** copy inventory ***/
2660 for (item = src->inv; item; item = item->below) 2556 for (item = src->inv; item; item = item->below)
2661 {
2662 (void) insert_ob_in_ob (object_create_clone (item), dst); 2557 insert_ob_in_ob (object_create_clone (item), dst);
2663 }
2664 2558
2665 return dst; 2559 return dst;
2666} 2560}
2667 2561
2668/* return true if the object was destroyed, 0 otherwise */
2669int
2670was_destroyed (const object *op, tag_t old_tag)
2671{
2672 /* checking for FLAG_FREED isn't necessary, but makes this function more
2673 * robust */
2674 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2675}
2676
2677/* GROS - Creates an object using a string representing its content. */ 2562/* GROS - Creates an object using a string representing its content. */
2678
2679/* 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 */
2680
2681/* 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, */
2682
2683/* 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. */
2684
2685/* 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. */
2686
2687/* Also remember that multiparts objects are not supported for now. */ 2567/* Also remember that multiparts objects are not supported for now. */
2688 2568
2689object * 2569object *
2690load_object_str (const char *obstr) 2570load_object_str (const char *obstr)
2691{ 2571{
2692 object * 2572 object *op;
2693 op;
2694 char
2695 filename[MAX_BUF]; 2573 char filename[MAX_BUF];
2696 2574
2697 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2575 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698 2576
2699 FILE *
2700 tempfile = fopen (filename, "w"); 2577 FILE *tempfile = fopen (filename, "w");
2701 2578
2702 if (tempfile == NULL) 2579 if (tempfile == NULL)
2703 { 2580 {
2704 LOG (llevError, "Error - Unable to access load object temp file\n"); 2581 LOG (llevError, "Error - Unable to access load object temp file\n");
2705 return NULL; 2582 return NULL;
2706 } 2583 }
2707 2584
2708 fprintf (tempfile, obstr); 2585 fprintf (tempfile, obstr);
2709 fclose (tempfile); 2586 fclose (tempfile);
2710 2587
2711 op = get_object (); 2588 op = object::create ();
2712 2589
2713 object_thawer thawer (filename); 2590 object_thawer thawer (filename);
2714 2591
2715 if (thawer) 2592 if (thawer)
2716 load_object (thawer, op, 0); 2593 load_object (thawer, op, 0);
… …
2726 * returns NULL if no match. 2603 * returns NULL if no match.
2727 */ 2604 */
2728object * 2605object *
2729find_obj_by_type_subtype (const object *who, int type, int subtype) 2606find_obj_by_type_subtype (const object *who, int type, int subtype)
2730{ 2607{
2731 object * 2608 object *tmp;
2732 tmp;
2733 2609
2734 for (tmp = who->inv; tmp; tmp = tmp->below) 2610 for (tmp = who->inv; tmp; tmp = tmp->below)
2735 if (tmp->type == type && tmp->subtype == subtype) 2611 if (tmp->type == type && tmp->subtype == subtype)
2736 return tmp; 2612 return tmp;
2737 2613
… …
2745 * do the desired thing. 2621 * do the desired thing.
2746 */ 2622 */
2747key_value * 2623key_value *
2748get_ob_key_link (const object *ob, const char *key) 2624get_ob_key_link (const object *ob, const char *key)
2749{ 2625{
2750 key_value * 2626 key_value *link;
2751 link;
2752 2627
2753 for (link = ob->key_values; link != NULL; link = link->next) 2628 for (link = ob->key_values; link != NULL; link = link->next)
2754 {
2755 if (link->key == key) 2629 if (link->key == key)
2756 {
2757 return link; 2630 return link;
2758 }
2759 }
2760 2631
2761 return NULL; 2632 return NULL;
2762} 2633}
2763 2634
2764/* 2635/*

Diff Legend

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