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

… …
104 _exit (1); 104 _exit (1);
105 } 105 }
106 106
107 uuid.seq = uid; 107 uuid.seq = uid;
108 write_uuid (); 108 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 109 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 110 fclose (fp);
111} 111}
112 112
113UUID 113UUID
114gen_uuid () 114gen_uuid ()
… …
183 * 183 *
184 * 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
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 185 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 186 * reduce this to the same efficiency.
187 * 187 *
188 * Check nrof variable *before* calling CAN_MERGE() 188 * Check nrof variable *before* calling can_merge()
189 * 189 *
190 * Improvements made with merge: Better checking on potion, and also 190 * Improvements made with merge: Better checking on potion, and also
191 * check weight 191 * check weight
192 */ 192 */
193 193
194bool object::can_merge (object *ob1, object *ob2) 194bool object::can_merge_slow (object *ob1, object *ob2)
195{ 195{
196 /* A couple quicksanity checks */ 196 /* A couple quicksanity checks */
197 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)
198 return 0; 202 return 0;
199 203
200 if (ob1->speed != ob2->speed) 204 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* 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
204 * 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
205 * used to store nrof). 207 * used to store nrof).
206 */ 208 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 209 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
260 /* 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 */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 264 return 0;
263 265
264 /* Now check to see if the two inventory objects could merge */ 266 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 267 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 268 return 0;
267 269
268 /* 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
269 * if it is valid. 271 * if it is valid.
270 */ 272 */
… …
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 377 * Some error messages.
376 * 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.
377 */ 379 */
378 380
379void 381char *
380dump_object2 (object *op)
381{
382 errmsg[0] = 0;
383 return;
384 //TODO//D#d#
385#if 0
386 char *cp;
387
388/* object *tmp;*/
389
390 if (op->arch != NULL)
391 {
392 strcat (errmsg, "arch ");
393 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
394 strcat (errmsg, "\n");
395 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
396 strcat (errmsg, cp);
397# if 0
398 /* Don't dump player diffs - they are too long, mostly meaningless, and
399 * will overflow the buffer.
400 * Changed so that we don't dump inventory either. This may
401 * also overflow the buffer.
402 */
403 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
404 strcat (errmsg, cp);
405 for (tmp = op->inv; tmp; tmp = tmp->below)
406 dump_object2 (tmp);
407# endif
408 strcat (errmsg, "end\n");
409 }
410 else
411 {
412 strcat (errmsg, "Object ");
413 if (op->name == NULL)
414 strcat (errmsg, "(null)");
415 else
416 strcat (errmsg, op->name);
417 strcat (errmsg, "\n");
418# if 0
419 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
420 strcat (errmsg, cp);
421 for (tmp = op->inv; tmp; tmp = tmp->below)
422 dump_object2 (tmp);
423# endif
424 strcat (errmsg, "end\n");
425 }
426#endif
427}
428
429/*
430 * Dumps an object. Returns output in the static global errmsg array.
431 */
432
433void
434dump_object (object *op) 382dump_object (object *op)
435{ 383{
436 if (op == NULL) 384 if (!op)
437 { 385 return strdup ("[NULLOBJ]");
438 strcpy (errmsg, "[NULL pointer]");
439 return;
440 }
441 errmsg[0] = '\0';
442 dump_object2 (op);
443}
444 386
445void 387 object_freezer freezer;
446dump_all_objects (void) 388 save_object (freezer, op, 3);
447{ 389 return freezer.as_string ();
448 object *op;
449
450 for (op = object::first; op != NULL; op = op->next)
451 {
452 dump_object (op);
453 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
454 }
455} 390}
456 391
457/* 392/*
458 * 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
459 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
… …
479 */ 414 */
480 415
481object * 416object *
482find_object (tag_t i) 417find_object (tag_t i)
483{ 418{
484 object *op;
485
486 for (op = object::first; op != NULL; op = op->next) 419 for (object *op = object::first; op; op = op->next)
487 if (op->count == i) 420 if (op->count == i)
488 break; 421 return op;
422
489 return op; 423 return 0;
490} 424}
491 425
492/* 426/*
493 * 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.
494 * Used only by the patch command, but not all that useful. 428 * Used only by the patch command, but not all that useful.
… …
594 528
595 if (settings.casting_time) 529 if (settings.casting_time)
596 casting_time = -1; 530 casting_time = -1;
597} 531}
598 532
599void object::clone (object *destination)
600{
601 *(object_copy *)destination = *this;
602 *(object_pod *)destination = *this;
603
604 if (self || cb)
605 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
606}
607
608/* 533/*
609 * copy object first frees everything allocated by the second object, 534 * copy_to first frees everything allocated by the dst object,
610 * and then copies the contends of the first object into the second 535 * and then copies the contents of itself into the second
611 * object, allocating what needs to be allocated. Basically, any 536 * object, allocating what needs to be allocated. Basically, any
612 * 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,
613 * 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
614 * will point at garbage. 539 * will point at garbage.
615 */ 540 */
616void 541void
617copy_object (object *op2, object *op) 542object::copy_to (object *dst)
618{ 543{
619 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 544 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
620 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 545 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
621 546
622 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));
623 552
624 if (is_freed) 553 if (is_freed)
625 SET_FLAG (op, FLAG_FREED); 554 SET_FLAG (dst, FLAG_FREED);
555
626 if (is_removed) 556 if (is_removed)
627 SET_FLAG (op, FLAG_REMOVED); 557 SET_FLAG (dst, FLAG_REMOVED);
628 558
629 if (op2->speed < 0) 559 if (speed < 0)
630 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 560 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
631 561
632 /* Copy over key_values, if any. */ 562 /* Copy over key_values, if any. */
633 if (op2->key_values) 563 if (key_values)
634 { 564 {
635 key_value *tail = 0; 565 key_value *tail = 0;
636 key_value *i; 566 key_value *i;
637 567
638 op->key_values = 0; 568 dst->key_values = 0;
639 569
640 for (i = op2->key_values; i; i = i->next) 570 for (i = key_values; i; i = i->next)
641 { 571 {
642 key_value *new_link = new key_value; 572 key_value *new_link = new key_value;
643 573
644 new_link->next = 0; 574 new_link->next = 0;
645 new_link->key = i->key; 575 new_link->key = i->key;
646 new_link->value = i->value; 576 new_link->value = i->value;
647 577
648 /* Try and be clever here, too. */ 578 /* Try and be clever here, too. */
649 if (!op->key_values) 579 if (!dst->key_values)
650 { 580 {
651 op->key_values = new_link; 581 dst->key_values = new_link;
652 tail = new_link; 582 tail = new_link;
653 } 583 }
654 else 584 else
655 { 585 {
656 tail->next = new_link; 586 tail->next = new_link;
657 tail = new_link; 587 tail = new_link;
658 } 588 }
659 } 589 }
660 } 590 }
661 591
662 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;
663} 601}
664 602
665/* 603/*
666 * 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
667 * 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
… …
872 update_now = 1; 810 update_now = 1;
873 811
874 if ((move_slow | op->move_slow) != move_slow) 812 if ((move_slow | op->move_slow) != move_slow)
875 update_now = 1; 813 update_now = 1;
876 } 814 }
815
877 /* if the object is being removed, we can't make intelligent 816 /* if the object is being removed, we can't make intelligent
878 * decisions, because remove_ob can't really pass the object 817 * decisions, because remove_ob can't really pass the object
879 * that is being removed. 818 * that is being removed.
880 */ 819 */
881 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 820 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
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);
… …
946 object::first = 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 == object::first) 882 if (this == object::first)
955 object::first = 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;
… …
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 {
… …
1070 op->carrying -= weight; 1020 op->carrying -= weight;
1071 op = op->env; 1021 op = op->env;
1072 } 1022 }
1073} 1023}
1074 1024
1075/* remove_ob(op): 1025/* op->remove ():
1076 * 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
1077 * 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
1078 * object will have no environment. If the object previously had an 1028 * object will have no environment. If the object previously had an
1079 * environment, the x and y coordinates will be updated to 1029 * environment, the x and y coordinates will be updated to
1080 * the previous environment. 1030 * the previous environment.
1081 * Beware: This function is called from the editor as well! 1031 * Beware: This function is called from the editor as well!
1082 */ 1032 */
1083
1084void 1033void
1085remove_ob (object *op) 1034object::remove ()
1086{ 1035{
1087 object *tmp, *last = 0; 1036 object *tmp, *last = 0;
1088 object *otmp; 1037 object *otmp;
1089 1038
1090 tag_t tag;
1091 int check_walk_off; 1039 int check_walk_off;
1092 mapstruct *m;
1093 1040
1094 sint16 x, y;
1095
1096 if (QUERY_FLAG (op, FLAG_REMOVED)) 1041 if (QUERY_FLAG (this, FLAG_REMOVED))
1097 return; 1042 return;
1098 1043
1099 SET_FLAG (op, FLAG_REMOVED); 1044 SET_FLAG (this, FLAG_REMOVED);
1100 1045
1101 if (op->more != NULL) 1046 if (more)
1102 remove_ob (op->more); 1047 more->remove ();
1103 1048
1104 /* 1049 /*
1105 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1106 * inventory. 1051 * inventory.
1107 */ 1052 */
1108 if (op->env != NULL) 1053 if (env)
1109 { 1054 {
1110 if (op->nrof) 1055 if (nrof)
1111 sub_weight (op->env, op->weight * op->nrof); 1056 sub_weight (env, weight * nrof);
1112 else 1057 else
1113 sub_weight (op->env, op->weight + op->carrying); 1058 sub_weight (env, weight + carrying);
1114 1059
1115 /* 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
1116 * made to players inventory. If set, avoiding the call 1061 * made to players inventory. If set, avoiding the call
1117 * to save cpu time. 1062 * to save cpu time.
1118 */ 1063 */
1119 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))
1120 fix_player (otmp); 1065 fix_player (otmp);
1121 1066
1122 if (op->above != NULL) 1067 if (above != NULL)
1123 op->above->below = op->below; 1068 above->below = below;
1124 else 1069 else
1125 op->env->inv = op->below; 1070 env->inv = below;
1126 1071
1127 if (op->below != NULL) 1072 if (below != NULL)
1128 op->below->above = op->above; 1073 below->above = above;
1129 1074
1130 /* we set up values so that it could be inserted into 1075 /* we set up values so that it could be inserted into
1131 * 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
1132 * to the caller to decide what we want to do. 1077 * to the caller to decide what we want to do.
1133 */ 1078 */
1134 op->x = op->env->x, op->y = op->env->y; 1079 x = env->x, y = env->y;
1135 op->map = op->env->map; 1080 map = env->map;
1136 op->above = NULL, op->below = NULL; 1081 above = 0, below = 0;
1137 op->env = NULL; 1082 env = 0;
1138 } 1083 }
1139 else if (op->map) 1084 else if (map)
1140 { 1085 {
1141 x = op->x;
1142 y = op->y;
1143 m = get_map_from_coord (op->map, &x, &y);
1144
1145 if (!m)
1146 {
1147 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1148 op->map->path, op->x, op->y);
1149 /* in old days, we used to set x and y to 0 and continue.
1150 * it seems if we get into this case, something is probablye
1151 * screwed up and should be fixed.
1152 */
1153 abort ();
1154 }
1155
1156 if (op->map != m)
1157 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1158 op->map->path, m->path, op->x, op->y, x, y);
1159
1160 /* 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
1161 * lots of logic for things we no longer care about 1087 * lots of logic for things we no longer care about
1162 */ 1088 */
1163 1089
1164 /* link the object above us */ 1090 /* link the object above us */
1165 if (op->above) 1091 if (above)
1166 op->above->below = op->below; 1092 above->below = below;
1167 else 1093 else
1168 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 */
1169 1095
1170 /* Relink the object below us, if there is one */ 1096 /* Relink the object below us, if there is one */
1171 if (op->below) 1097 if (below)
1172 op->below->above = op->above; 1098 below->above = above;
1173 else 1099 else
1174 { 1100 {
1175 /* 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
1176 * use translated coordinates in case some oddness with map tiling is 1102 * use translated coordinates in case some oddness with map tiling is
1177 * evident 1103 * evident
1178 */ 1104 */
1179 if (GET_MAP_OB (m, x, y) != op) 1105 if (GET_MAP_OB (map, x, y) != this)
1180 { 1106 {
1181 dump_object (op); 1107 char *dump = dump_object (this);
1182 LOG (llevError, 1108 LOG (llevError,
1183 "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);
1184 dump_object (GET_MAP_OB (m, x, y)); 1111 dump = dump_object (GET_MAP_OB (map, x, y));
1185 LOG (llevError, "%s\n", errmsg); 1112 LOG (llevError, "%s\n", dump);
1113 free (dump);
1186 } 1114 }
1187 1115
1188 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1116 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1189 } 1117 }
1190 1118
1191 op->above = 0; 1119 above = 0;
1192 op->below = 0; 1120 below = 0;
1193 1121
1194 if (op->map->in_memory == MAP_SAVING) 1122 if (map->in_memory == MAP_SAVING)
1195 return; 1123 return;
1196 1124
1197 tag = op->count;
1198 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1125 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1199 1126
1200 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)
1201 { 1128 {
1202 /* 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
1203 * being removed. 1130 * being removed.
1204 */ 1131 */
1205 1132
1206 if (tmp->type == PLAYER && tmp != op) 1133 if (tmp->type == PLAYER && tmp != this)
1207 { 1134 {
1208 /* If a container that the player is currently using somehow gets 1135 /* If a container that the player is currently using somehow gets
1209 * removed (most likely destroyed), update the player view 1136 * removed (most likely destroyed), update the player view
1210 * appropriately. 1137 * appropriately.
1211 */ 1138 */
1212 if (tmp->container == op) 1139 if (tmp->container == this)
1213 { 1140 {
1214 CLEAR_FLAG (op, FLAG_APPLIED); 1141 CLEAR_FLAG (this, FLAG_APPLIED);
1215 tmp->container = NULL; 1142 tmp->container = 0;
1216 } 1143 }
1217 1144
1218 tmp->contr->socket.update_look = 1; 1145 tmp->contr->socket.update_look = 1;
1219 } 1146 }
1220 1147
1221 /* See if player moving off should effect something */ 1148 /* See if player moving off should effect something */
1222 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))
1223 { 1152 {
1224 move_apply (tmp, op, NULL); 1153 move_apply (tmp, this, 0);
1225 1154
1226 if (was_destroyed (op, tag)) 1155 if (destroyed ())
1227 {
1228 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 ());
1229 }
1230 } 1157 }
1231 1158
1232 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1159 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1233 1160
1234 if (tmp->above == tmp) 1161 if (tmp->above == tmp)
1235 tmp->above = NULL; 1162 tmp->above = 0;
1236 1163
1237 last = tmp; 1164 last = tmp;
1238 } 1165 }
1239 1166
1240 /* last == NULL of there are no objects on this space */ 1167 /* last == NULL of there are no objects on this space */
1241 if (last == NULL) 1168 if (!last)
1242 { 1169 {
1243 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1244 * 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
1245 * 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
1246 * be correct anyways. 1173 * be correct anyways.
1247 */ 1174 */
1248 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1175 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1249 update_position (op->map, op->x, op->y); 1176 update_position (map, x, y);
1250 } 1177 }
1251 else 1178 else
1252 update_object (last, UP_OBJ_REMOVE); 1179 update_object (last, UP_OBJ_REMOVE);
1253 1180
1254 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1181 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1255 update_all_los (op->map, op->x, op->y); 1182 update_all_los (map, x, y);
1256 } 1183 }
1257} 1184}
1258 1185
1259/* 1186/*
1260 * merge_ob(op,top): 1187 * merge_ob(op,top):
… …
1275 1202
1276 for (; top != NULL; top = top->below) 1203 for (; top != NULL; top = top->below)
1277 { 1204 {
1278 if (top == op) 1205 if (top == op)
1279 continue; 1206 continue;
1280 if (CAN_MERGE (op, top)) 1207
1208 if (object::can_merge (op, top))
1281 { 1209 {
1282 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1283 1211
1284/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1285 op->weight = 0; /* Don't want any adjustements now */ 1213 op->weight = 0; /* Don't want any adjustements now */
1286 remove_ob (op); 1214 op->destroy ();
1287 free_object (op);
1288 return top; 1215 return top;
1289 } 1216 }
1290 } 1217 }
1291 1218
1292 return 0; 1219 return 0;
… …
1295/* 1222/*
1296 * 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
1297 * job preparing multi-part monsters 1224 * job preparing multi-part monsters
1298 */ 1225 */
1299object * 1226object *
1300insert_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)
1301{ 1228{
1302 object *tmp; 1229 object *tmp;
1303 1230
1304 if (op->head) 1231 if (op->head)
1305 op = op->head; 1232 op = op->head;
… …
1333 * NULL if 'op' was destroyed 1260 * NULL if 'op' was destroyed
1334 * just 'op' otherwise 1261 * just 'op' otherwise
1335 */ 1262 */
1336 1263
1337object * 1264object *
1338insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1265insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1339{ 1266{
1340 object *tmp, *top, *floor = NULL; 1267 object *tmp, *top, *floor = NULL;
1341 sint16 x, y; 1268 sint16 x, y;
1342 1269
1343 if (QUERY_FLAG (op, FLAG_FREED)) 1270 if (QUERY_FLAG (op, FLAG_FREED))
… …
1346 return NULL; 1273 return NULL;
1347 } 1274 }
1348 1275
1349 if (m == NULL) 1276 if (m == NULL)
1350 { 1277 {
1351 dump_object (op); 1278 char *dump = dump_object (op);
1352 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);
1353 return op; 1281 return op;
1354 } 1282 }
1355 1283
1356 if (out_of_map (m, op->x, op->y)) 1284 if (out_of_map (m, op->x, op->y))
1357 { 1285 {
1358 dump_object (op); 1286 char *dump = dump_object (op);
1359 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);
1360#ifdef MANY_CORES 1288#ifdef MANY_CORES
1361 /* 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
1362 * 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
1363 * improperly inserted. 1291 * improperly inserted.
1364 */ 1292 */
1365 abort (); 1293 abort ();
1366#endif 1294#endif
1295 free (dump);
1367 return op; 1296 return op;
1368 } 1297 }
1369 1298
1370 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1299 if (!QUERY_FLAG (op, FLAG_REMOVED))
1371 { 1300 {
1372 dump_object (op); 1301 char *dump = dump_object (op);
1373 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);
1374 return op; 1304 return op;
1375 } 1305 }
1376 1306
1377 if (op->more != NULL) 1307 if (op->more != NULL)
1378 { 1308 {
… …
1416 1346
1417 /* this has to be done after we translate the coordinates. 1347 /* this has to be done after we translate the coordinates.
1418 */ 1348 */
1419 if (op->nrof && !(flag & INS_NO_MERGE)) 1349 if (op->nrof && !(flag & INS_NO_MERGE))
1420 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)
1421 if (CAN_MERGE (op, tmp)) 1351 if (object::can_merge (op, tmp))
1422 { 1352 {
1423 op->nrof += tmp->nrof; 1353 op->nrof += tmp->nrof;
1424 remove_ob (tmp); 1354 tmp->destroy ();
1425 free_object (tmp);
1426 } 1355 }
1427 1356
1428 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 */
1429 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1358 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1430 1359
… …
1616 tmp1; 1545 tmp1;
1617 1546
1618 /* first search for itself and remove any old instances */ 1547 /* first search for itself and remove any old instances */
1619 1548
1620 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)
1621 {
1622 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1550 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1623 { 1551 tmp->destroy ();
1624 remove_ob (tmp);
1625 free_object (tmp);
1626 }
1627 }
1628 1552
1629 tmp1 = arch_to_object (archetype::find (arch_string)); 1553 tmp1 = arch_to_object (archetype::find (arch_string));
1630 1554
1631 tmp1->x = op->x; 1555 tmp1->x = op->x;
1632 tmp1->y = op->y; 1556 tmp1->y = op->y;
… …
1642 */ 1566 */
1643 1567
1644object * 1568object *
1645get_split_ob (object *orig_ob, uint32 nr) 1569get_split_ob (object *orig_ob, uint32 nr)
1646{ 1570{
1647 object * 1571 object *newob;
1648 newob;
1649 int
1650 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1572 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1651 1573
1652 if (orig_ob->nrof < nr) 1574 if (orig_ob->nrof < nr)
1653 { 1575 {
1654 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);
1655 return NULL; 1577 return NULL;
1656 } 1578 }
1657 1579
1658 newob = object_create_clone (orig_ob); 1580 newob = object_create_clone (orig_ob);
1659 1581
1660 if ((orig_ob->nrof -= nr) < 1) 1582 if ((orig_ob->nrof -= nr) < 1)
1661 { 1583 orig_ob->destroy (1);
1662 if (!is_removed)
1663 remove_ob (orig_ob);
1664 free_object2 (orig_ob, 1);
1665 }
1666 else if (!is_removed) 1584 else if (!is_removed)
1667 { 1585 {
1668 if (orig_ob->env != NULL) 1586 if (orig_ob->env != NULL)
1669 sub_weight (orig_ob->env, orig_ob->weight * nr); 1587 sub_weight (orig_ob->env, orig_ob->weight * nr);
1670 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)
… …
1734 esrv_send_item (tmp, op); 1652 esrv_send_item (tmp, op);
1735 } 1653 }
1736 } 1654 }
1737 else 1655 else
1738 { 1656 {
1739 remove_ob (op); 1657 op->remove ();
1740 op->nrof = 0; 1658 op->nrof = 0;
1741 if (tmp) 1659 if (tmp)
1742 { 1660 {
1743 esrv_del_item (tmp->contr, op->count); 1661 esrv_del_item (tmp->contr, op->count);
1744 } 1662 }
… …
1750 1668
1751 if (i < op->nrof) 1669 if (i < op->nrof)
1752 op->nrof -= i; 1670 op->nrof -= i;
1753 else 1671 else
1754 { 1672 {
1755 remove_ob (op); 1673 op->remove ();
1756 op->nrof = 0; 1674 op->nrof = 0;
1757 } 1675 }
1758 1676
1759 /* Since we just removed op, op->above is null */ 1677 /* Since we just removed op, op->above is null */
1760 for (tmp = above; tmp != NULL; tmp = tmp->above) 1678 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1769 1687
1770 if (op->nrof) 1688 if (op->nrof)
1771 return op; 1689 return op;
1772 else 1690 else
1773 { 1691 {
1774 free_object (op); 1692 op->destroy ();
1775 return NULL; 1693 return NULL;
1776 } 1694 }
1777} 1695}
1778 1696
1779/* 1697/*
… …
1792 op->carrying += weight; 1710 op->carrying += weight;
1793 op = op->env; 1711 op = op->env;
1794 } 1712 }
1795} 1713}
1796 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
1797/* 1735/*
1798 * insert_ob_in_ob(op,environment): 1736 * env->insert (op)
1799 * This function inserts the object op in the linked list 1737 * This function inserts the object op in the linked list
1800 * inside the object environment. 1738 * inside the object environment.
1801 * 1739 *
1802 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1803 * the inventory at the last position or next to other objects of the same
1804 * type.
1805 * Frank: Now sorted by type, archetype and magic!
1806 *
1807 * 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
1808 * be != op, if items are merged. -Tero 1741 * be != op, if items are merged. -Tero
1809 */ 1742 */
1810 1743
1811object * 1744object *
1812insert_ob_in_ob (object *op, object *where) 1745object::insert (object *op)
1813{ 1746{
1814 object * 1747 object *tmp, *otmp;
1815 tmp, *
1816 otmp;
1817 1748
1818 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1749 if (!QUERY_FLAG (op, FLAG_REMOVED))
1819 { 1750 op->remove ();
1820 dump_object (op);
1821 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1822 return op;
1823 }
1824
1825 if (where == NULL)
1826 {
1827 dump_object (op);
1828 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1829 return op;
1830 }
1831
1832 if (where->head)
1833 {
1834 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1835 where = where->head;
1836 }
1837 1751
1838 if (op->more) 1752 if (op->more)
1839 { 1753 {
1840 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);
1841 return op; 1755 return op;
… …
1843 1757
1844 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1758 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1845 CLEAR_FLAG (op, FLAG_REMOVED); 1759 CLEAR_FLAG (op, FLAG_REMOVED);
1846 if (op->nrof) 1760 if (op->nrof)
1847 { 1761 {
1848 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1762 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1849 if (CAN_MERGE (tmp, op)) 1763 if (object::can_merge (tmp, op))
1850 { 1764 {
1851 /* return the original object and remove inserted object 1765 /* return the original object and remove inserted object
1852 (client needs the original object) */ 1766 (client needs the original object) */
1853 tmp->nrof += op->nrof; 1767 tmp->nrof += op->nrof;
1854 /* Weight handling gets pretty funky. Since we are adding to 1768 /* Weight handling gets pretty funky. Since we are adding to
1855 * tmp->nrof, we need to increase the weight. 1769 * tmp->nrof, we need to increase the weight.
1856 */ 1770 */
1857 add_weight (where, op->weight * op->nrof); 1771 add_weight (this, op->weight * op->nrof);
1858 SET_FLAG (op, FLAG_REMOVED); 1772 SET_FLAG (op, FLAG_REMOVED);
1859 free_object (op); /* free the inserted object */ 1773 op->destroy (); /* free the inserted object */
1860 op = tmp; 1774 op = tmp;
1861 remove_ob (op); /* and fix old object's links */ 1775 op->remove (); /* and fix old object's links */
1862 CLEAR_FLAG (op, FLAG_REMOVED); 1776 CLEAR_FLAG (op, FLAG_REMOVED);
1863 break; 1777 break;
1864 } 1778 }
1865 1779
1866 /* I assume combined objects have no inventory 1780 /* I assume combined objects have no inventory
1867 * We add the weight - this object could have just been removed 1781 * We add the weight - this object could have just been removed
1868 * (if it was possible to merge). calling remove_ob will subtract 1782 * (if it was possible to merge). calling remove_ob will subtract
1869 * 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
1870 * the linking below 1784 * the linking below
1871 */ 1785 */
1872 add_weight (where, op->weight * op->nrof); 1786 add_weight (this, op->weight * op->nrof);
1873 } 1787 }
1874 else 1788 else
1875 add_weight (where, (op->weight + op->carrying)); 1789 add_weight (this, (op->weight + op->carrying));
1876 1790
1877 otmp = is_player_inv (where); 1791 otmp = is_player_inv (this);
1878 if (otmp && otmp->contr != NULL) 1792 if (otmp && otmp->contr)
1879 {
1880 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1793 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1881 fix_player (otmp); 1794 fix_player (otmp);
1882 }
1883 1795
1884 op->map = NULL; 1796 op->map = NULL;
1885 op->env = where; 1797 op->env = this;
1886 op->above = NULL; 1798 op->above = NULL;
1887 op->below = NULL; 1799 op->below = NULL;
1888 op->x = 0, op->y = 0; 1800 op->x = 0, op->y = 0;
1889 1801
1890 /* 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 */
1891 if ((op->glow_radius != 0) && where->map) 1803 if ((op->glow_radius != 0) && map)
1892 { 1804 {
1893#ifdef DEBUG_LIGHTS 1805#ifdef DEBUG_LIGHTS
1894 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);
1895#endif /* DEBUG_LIGHTS */ 1807#endif /* DEBUG_LIGHTS */
1896 if (MAP_DARKNESS (where->map)) 1808 if (MAP_DARKNESS (map))
1897 update_all_los (where->map, where->x, where->y); 1809 update_all_los (map, x, y);
1898 } 1810 }
1899 1811
1900 /* 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.
1901 * It sure simplifies this function... 1813 * It sure simplifies this function...
1902 */ 1814 */
1903 if (where->inv == NULL) 1815 if (!inv)
1904 where->inv = op; 1816 inv = op;
1905 else 1817 else
1906 { 1818 {
1907 op->below = where->inv; 1819 op->below = inv;
1908 op->below->above = op; 1820 op->below->above = op;
1909 where->inv = op; 1821 inv = op;
1910 } 1822 }
1823
1911 return op; 1824 return op;
1912} 1825}
1913 1826
1914/* 1827/*
1915 * Checks if any objects has a move_type that matches objects 1828 * Checks if any objects has a move_type that matches objects
… …
1933 */ 1846 */
1934 1847
1935int 1848int
1936check_move_on (object *op, object *originator) 1849check_move_on (object *op, object *originator)
1937{ 1850{
1938 object * 1851 object *tmp;
1939 tmp; 1852 maptile *m = op->map;
1940 tag_t
1941 tag;
1942 mapstruct *
1943 m = op->map;
1944 int
1945 x = op->x, y = op->y; 1853 int x = op->x, y = op->y;
1946 1854
1947 MoveType 1855 MoveType move_on, move_slow, move_block;
1948 move_on,
1949 move_slow,
1950 move_block;
1951 1856
1952 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1857 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1953 return 0; 1858 return 0;
1954
1955 tag = op->count;
1956 1859
1957 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);
1958 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);
1959 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);
1960 1863
… …
2021 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1924 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2022 ((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))
2023 { 1926 {
2024 move_apply (tmp, op, originator); 1927 move_apply (tmp, op, originator);
2025 1928
2026 if (was_destroyed (op, tag)) 1929 if (op->destroyed ())
2027 return 1; 1930 return 1;
2028 1931
2029 /* what the person/creature stepped onto has moved the object 1932 /* what the person/creature stepped onto has moved the object
2030 * someplace new. Don't process any further - if we did, 1933 * someplace new. Don't process any further - if we did,
2031 * have a feeling strange problems would result. 1934 * have a feeling strange problems would result.
… …
2043 * a matching archetype at the given map and coordinates. 1946 * a matching archetype at the given map and coordinates.
2044 * The first matching object is returned, or NULL if none. 1947 * The first matching object is returned, or NULL if none.
2045 */ 1948 */
2046 1949
2047object * 1950object *
2048present_arch (const archetype *at, mapstruct *m, int x, int y) 1951present_arch (const archetype *at, maptile *m, int x, int y)
2049{ 1952{
2050 object * 1953 object *
2051 tmp; 1954 tmp;
2052 1955
2053 if (m == NULL || out_of_map (m, x, y)) 1956 if (m == NULL || out_of_map (m, x, y))
… …
2066 * a matching type variable at the given map and coordinates. 1969 * a matching type variable at the given map and coordinates.
2067 * The first matching object is returned, or NULL if none. 1970 * The first matching object is returned, or NULL if none.
2068 */ 1971 */
2069 1972
2070object * 1973object *
2071present (unsigned char type, mapstruct *m, int x, int y) 1974present (unsigned char type, maptile *m, int x, int y)
2072{ 1975{
2073 object * 1976 object *
2074 tmp; 1977 tmp;
2075 1978
2076 if (out_of_map (m, x, y)) 1979 if (out_of_map (m, x, y))
… …
2216 * 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
2217 * customized, changed states, etc. 2120 * customized, changed states, etc.
2218 */ 2121 */
2219 2122
2220int 2123int
2221find_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)
2222{ 2125{
2223 int 2126 int
2224 i, 2127 i,
2225 index = 0, flag; 2128 index = 0, flag;
2226 static int 2129 static int
… …
2247 return -1; 2150 return -1;
2248 return altern[RANDOM () % index]; 2151 return altern[RANDOM () % index];
2249} 2152}
2250 2153
2251/* 2154/*
2252 * find_first_free_spot(archetype, mapstruct, x, y) works like 2155 * find_first_free_spot(archetype, maptile, x, y) works like
2253 * find_free_spot(), but it will search max number of squares. 2156 * find_free_spot(), but it will search max number of squares.
2254 * 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.
2255 * 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.
2256 */ 2159 */
2257 2160
2258int 2161int
2259find_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)
2260{ 2163{
2261 int 2164 int
2262 i; 2165 i;
2263 2166
2264 for (i = 0; i < SIZEOFFREE; i++) 2167 for (i = 0; i < SIZEOFFREE; i++)
… …
2328 * 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
2329 * there is capable of. 2232 * there is capable of.
2330 */ 2233 */
2331 2234
2332int 2235int
2333find_dir (mapstruct *m, int x, int y, object *exclude) 2236find_dir (maptile *m, int x, int y, object *exclude)
2334{ 2237{
2335 int 2238 int
2336 i, 2239 i,
2337 max = SIZEOFFREE, mflags; 2240 max = SIZEOFFREE, mflags;
2338 2241
2339 sint16 nx, ny; 2242 sint16 nx, ny;
2340 object * 2243 object *
2341 tmp; 2244 tmp;
2342 mapstruct * 2245 maptile *
2343 mp; 2246 mp;
2344 2247
2345 MoveType blocked, move_type; 2248 MoveType blocked, move_type;
2346 2249
2347 if (exclude && exclude->head) 2250 if (exclude && exclude->head)
… …
2555 * Modified to be map tile aware -.MSW 2458 * Modified to be map tile aware -.MSW
2556 */ 2459 */
2557 2460
2558 2461
2559int 2462int
2560can_see_monsterP (mapstruct *m, int x, int y, int dir) 2463can_see_monsterP (maptile *m, int x, int y, int dir)
2561{ 2464{
2562 sint16 dx, dy; 2465 sint16 dx, dy;
2563 int 2466 int
2564 mflags; 2467 mflags;
2565 2468
… …
2614 * create clone from object to another 2517 * create clone from object to another
2615 */ 2518 */
2616object * 2519object *
2617object_create_clone (object *asrc) 2520object_create_clone (object *asrc)
2618{ 2521{
2619 object *
2620 dst = NULL, *tmp, *src, *part, *prev, *item; 2522 object *dst = 0, *tmp, *src, *part, *prev, *item;
2621 2523
2622 if (!asrc) 2524 if (!asrc)
2623 return NULL; 2525 return 0;
2526
2624 src = asrc; 2527 src = asrc;
2625 if (src->head) 2528 if (src->head)
2626 src = src->head; 2529 src = src->head;
2627 2530
2628 prev = NULL; 2531 prev = 0;
2629 for (part = src; part; part = part->more) 2532 for (part = src; part; part = part->more)
2630 { 2533 {
2631 tmp = get_object (); 2534 tmp = part->clone ();
2632 copy_object (part, tmp);
2633 tmp->x -= src->x; 2535 tmp->x -= src->x;
2634 tmp->y -= src->y; 2536 tmp->y -= src->y;
2537
2635 if (!part->head) 2538 if (!part->head)
2636 { 2539 {
2637 dst = tmp; 2540 dst = tmp;
2638 tmp->head = NULL; 2541 tmp->head = 0;
2639 } 2542 }
2640 else 2543 else
2641 { 2544 {
2642 tmp->head = dst; 2545 tmp->head = dst;
2643 } 2546 }
2547
2644 tmp->more = NULL; 2548 tmp->more = 0;
2549
2645 if (prev) 2550 if (prev)
2646 prev->more = tmp; 2551 prev->more = tmp;
2552
2647 prev = tmp; 2553 prev = tmp;
2648 } 2554 }
2649 2555
2650 /*** copy inventory ***/
2651 for (item = src->inv; item; item = item->below) 2556 for (item = src->inv; item; item = item->below)
2652 {
2653 (void) insert_ob_in_ob (object_create_clone (item), dst); 2557 insert_ob_in_ob (object_create_clone (item), dst);
2654 }
2655 2558
2656 return dst; 2559 return dst;
2657} 2560}
2658 2561
2659/* return true if the object was destroyed, 0 otherwise */
2660int
2661was_destroyed (const object *op, tag_t old_tag)
2662{
2663 /* checking for FLAG_FREED isn't necessary, but makes this function more
2664 * robust */
2665 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2666}
2667
2668/* GROS - Creates an object using a string representing its content. */ 2562/* GROS - Creates an object using a string representing its content. */
2669
2670/* 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 */
2671
2672/* 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, */
2673
2674/* 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. */
2675
2676/* 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. */
2677
2678/* Also remember that multiparts objects are not supported for now. */ 2567/* Also remember that multiparts objects are not supported for now. */
2679 2568
2680object * 2569object *
2681load_object_str (const char *obstr) 2570load_object_str (const char *obstr)
2682{ 2571{
2683 object * 2572 object *op;
2684 op;
2685 char
2686 filename[MAX_BUF]; 2573 char filename[MAX_BUF];
2687 2574
2688 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2575 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2689 2576
2690 FILE *
2691 tempfile = fopen (filename, "w"); 2577 FILE *tempfile = fopen (filename, "w");
2692 2578
2693 if (tempfile == NULL) 2579 if (tempfile == NULL)
2694 { 2580 {
2695 LOG (llevError, "Error - Unable to access load object temp file\n"); 2581 LOG (llevError, "Error - Unable to access load object temp file\n");
2696 return NULL; 2582 return NULL;
2697 } 2583 }
2698 2584
2699 fprintf (tempfile, obstr); 2585 fprintf (tempfile, obstr);
2700 fclose (tempfile); 2586 fclose (tempfile);
2701 2587
2702 op = get_object (); 2588 op = object::create ();
2703 2589
2704 object_thawer thawer (filename); 2590 object_thawer thawer (filename);
2705 2591
2706 if (thawer) 2592 if (thawer)
2707 load_object (thawer, op, 0); 2593 load_object (thawer, op, 0);
… …
2717 * returns NULL if no match. 2603 * returns NULL if no match.
2718 */ 2604 */
2719object * 2605object *
2720find_obj_by_type_subtype (const object *who, int type, int subtype) 2606find_obj_by_type_subtype (const object *who, int type, int subtype)
2721{ 2607{
2722 object * 2608 object *tmp;
2723 tmp;
2724 2609
2725 for (tmp = who->inv; tmp; tmp = tmp->below) 2610 for (tmp = who->inv; tmp; tmp = tmp->below)
2726 if (tmp->type == type && tmp->subtype == subtype) 2611 if (tmp->type == type && tmp->subtype == subtype)
2727 return tmp; 2612 return tmp;
2728 2613
… …
2736 * do the desired thing. 2621 * do the desired thing.
2737 */ 2622 */
2738key_value * 2623key_value *
2739get_ob_key_link (const object *ob, const char *key) 2624get_ob_key_link (const object *ob, const char *key)
2740{ 2625{
2741 key_value * 2626 key_value *link;
2742 link;
2743 2627
2744 for (link = ob->key_values; link != NULL; link = link->next) 2628 for (link = ob->key_values; link != NULL; link = link->next)
2745 {
2746 if (link->key == key) 2629 if (link->key == key)
2747 {
2748 return link; 2630 return link;
2749 }
2750 }
2751 2631
2752 return NULL; 2632 return NULL;
2753} 2633}
2754 2634
2755/* 2635/*

Diff Legend

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