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

Diff Legend

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