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.51 by root, Sun Sep 17 16:21:53 2006 UTC vs.
Revision 1.70 by root, Tue Dec 19 05:12:52 2006 UTC

… …
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <loader.h> 33#include <loader.h>
34
35#include <bitset>
34 36
35int nrofallocobjects = 0; 37int nrofallocobjects = 0;
36static UUID uuid; 38static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
38 40
… …
104 _exit (1); 106 _exit (1);
105 } 107 }
106 108
107 uuid.seq = uid; 109 uuid.seq = uid;
108 write_uuid (); 110 write_uuid ();
109 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 112 fclose (fp);
111} 113}
112 114
113UUID 115UUID
114gen_uuid () 116gen_uuid ()
… …
183 * 185 *
184 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
187 * 189 *
188 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
189 * 191 *
190 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
191 * check weight 193 * check weight
192 */ 194 */
193 195
194bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
195{ 197{
196 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
198 return 0; 204 return 0;
199 205
200 if (ob1->speed != ob2->speed) 206 //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 207 /* 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 208 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 209 * used to store nrof).
206 */ 210 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 222
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 225
222 226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 251 return 0;
254 252
255 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 254 * check all objects in the inventory.
257 */ 255 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 260 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 264 return 0;
267 265
268 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 267 * if it is valid.
270 */ 268 */
… …
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 373 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array. 374 * The result of the dump is stored in the static global errmsg array.
377 */ 375 */
378 376
379void 377char *
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) 378dump_object (object *op)
435{ 379{
436 if (op == NULL) 380 if (!op)
437 { 381 return strdup ("[NULLOBJ]");
438 strcpy (errmsg, "[NULL pointer]");
439 return;
440 }
441 errmsg[0] = '\0';
442 dump_object2 (op);
443}
444 382
445void 383 object_freezer freezer;
446dump_all_objects (void) 384 save_object (freezer, op, 3);
447{ 385 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 %s\n", errmsg);
454 }
455} 386}
456 387
457/* 388/*
458 * get_nearest_part(multi-object, object 2) returns the part of the 389 * get_nearest_part(multi-object, object 2) returns the part of the
459 * multi-object 1 which is closest to the second object. 390 * multi-object 1 which is closest to the second object.
… …
479 */ 410 */
480 411
481object * 412object *
482find_object (tag_t i) 413find_object (tag_t i)
483{ 414{
484 object *op;
485
486 for (op = object::first; op != NULL; op = op->next) 415 for (object *op = object::first; op; op = op->next)
487 if (op->count == i) 416 if (op->count == i)
488 break; 417 return op;
489 418
490 return op; 419 return 0;
491} 420}
492 421
493/* 422/*
494 * Returns the first object which has a name equal to the argument. 423 * Returns the first object which has a name equal to the argument.
495 * Used only by the patch command, but not all that useful. 424 * Used only by the patch command, but not all that useful.
… …
595 524
596 if (settings.casting_time) 525 if (settings.casting_time)
597 casting_time = -1; 526 casting_time = -1;
598} 527}
599 528
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/* 529/*
610 * copy object first frees everything allocated by the second object, 530 * copy_to first frees everything allocated by the dst object,
611 * and then copies the contends of the first object into the second 531 * and then copies the contents of itself into the second
612 * object, allocating what needs to be allocated. Basically, any 532 * object, allocating what needs to be allocated. Basically, any
613 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 533 * 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 534 * if the first object is freed, the pointers in the new object
615 * will point at garbage. 535 * will point at garbage.
616 */ 536 */
617void 537void
618copy_object (object *op2, object *op) 538object::copy_to (object *dst)
619{ 539{
620 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 540 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 541 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622 542
623 op2->clone (op); 543 *(object_copy *)dst = *this;
544 *(object_pod *)dst = *this;
545
546 if (self || cb)
547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
624 548
625 if (is_freed) 549 if (is_freed)
626 SET_FLAG (op, FLAG_FREED); 550 SET_FLAG (dst, FLAG_FREED);
551
627 if (is_removed) 552 if (is_removed)
628 SET_FLAG (op, FLAG_REMOVED); 553 SET_FLAG (dst, FLAG_REMOVED);
629 554
630 if (op2->speed < 0) 555 if (speed < 0)
631 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 556 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632 557
633 /* Copy over key_values, if any. */ 558 /* Copy over key_values, if any. */
634 if (op2->key_values) 559 if (key_values)
635 { 560 {
636 key_value *tail = 0; 561 key_value *tail = 0;
637 key_value *i; 562 key_value *i;
638 563
639 op->key_values = 0; 564 dst->key_values = 0;
640 565
641 for (i = op2->key_values; i; i = i->next) 566 for (i = key_values; i; i = i->next)
642 { 567 {
643 key_value *new_link = new key_value; 568 key_value *new_link = new key_value;
644 569
645 new_link->next = 0; 570 new_link->next = 0;
646 new_link->key = i->key; 571 new_link->key = i->key;
647 new_link->value = i->value; 572 new_link->value = i->value;
648 573
649 /* Try and be clever here, too. */ 574 /* Try and be clever here, too. */
650 if (!op->key_values) 575 if (!dst->key_values)
651 { 576 {
652 op->key_values = new_link; 577 dst->key_values = new_link;
653 tail = new_link; 578 tail = new_link;
654 } 579 }
655 else 580 else
656 { 581 {
657 tail->next = new_link; 582 tail->next = new_link;
658 tail = new_link; 583 tail = new_link;
659 } 584 }
660 } 585 }
661 } 586 }
662 587
663 update_ob_speed (op); 588 update_ob_speed (dst);
589}
590
591object *
592object::clone ()
593{
594 object *neu = create ();
595 copy_to (neu);
596 return neu;
664} 597}
665 598
666/* 599/*
667 * If an object with the IS_TURNABLE() flag needs to be turned due 600 * 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 601 * to the closest player being on the other side, this function can
… …
873 update_now = 1; 806 update_now = 1;
874 807
875 if ((move_slow | op->move_slow) != move_slow) 808 if ((move_slow | op->move_slow) != move_slow)
876 update_now = 1; 809 update_now = 1;
877 } 810 }
811
878 /* if the object is being removed, we can't make intelligent 812 /* if the object is being removed, we can't make intelligent
879 * decisions, because remove_ob can't really pass the object 813 * decisions, because remove_ob can't really pass the object
880 * that is being removed. 814 * that is being removed.
881 */ 815 */
882 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 816 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
908 else 842 else
909 { 843 {
910 delete *i; 844 delete *i;
911 mortals.erase (i); 845 mortals.erase (i);
912 } 846 }
913
914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals && lastmortals > 100)//D
917 {
918 lastmortals = mortals.size ();//D
919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
921} 847}
922 848
923object::object () 849object::object ()
924{ 850{
925 SET_FLAG (this, FLAG_REMOVED); 851 SET_FLAG (this, FLAG_REMOVED);
… …
972 * it from the list of used objects, and puts it on the list of 898 * it from the list of used objects, and puts it on the list of
973 * free objects. The IS_FREED() flag is set in the object. 899 * free objects. The IS_FREED() flag is set in the object.
974 * The object must have been removed by remove_ob() first for 900 * The object must have been removed by remove_ob() first for
975 * this function to succeed. 901 * this function to succeed.
976 * 902 *
977 * If free_inventory is set, free inventory as well. Else drop items in 903 * If destroy_inventory is set, free inventory as well. Else drop items in
978 * inventory to the ground. 904 * inventory to the ground.
979 */ 905 */
980void object::free (bool free_inventory) 906void object::destroy (bool destroy_inventory)
981{ 907{
982 if (QUERY_FLAG (this, FLAG_FREED)) 908 if (QUERY_FLAG (this, FLAG_FREED))
983 return; 909 return;
984 910
985 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 911 if (QUERY_FLAG (this, FLAG_FRIENDLY))
986 remove_friendly_object (this); 912 remove_friendly_object (this);
987 913
988 if (!QUERY_FLAG (this, FLAG_REMOVED)) 914 if (!QUERY_FLAG (this, FLAG_REMOVED))
989 remove_ob (this); 915 remove ();
990 916
991 SET_FLAG (this, FLAG_FREED); 917 SET_FLAG (this, FLAG_FREED);
992 918
993 if (more) 919 if (more)
994 { 920 {
995 more->free (free_inventory); 921 more->destroy (destroy_inventory);
996 more = 0; 922 more = 0;
997 } 923 }
998 924
999 if (inv) 925 if (inv)
1000 { 926 {
1001 /* Only if the space blocks everything do we not process - 927 /* Only if the space blocks everything do we not process -
1002 * if some form of movement is allowed, let objects 928 * if some form of movement is allowed, let objects
1003 * drop on that space. 929 * drop on that space.
1004 */ 930 */
1005 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 931 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1006 { 932 {
1007 object *op = inv; 933 object *op = inv;
1008 934
1009 while (op) 935 while (op)
1010 { 936 {
1011 object *tmp = op->below; 937 object *tmp = op->below;
1012 op->free (free_inventory); 938 op->destroy (destroy_inventory);
1013 op = tmp; 939 op = tmp;
1014 } 940 }
1015 } 941 }
1016 else 942 else
1017 { /* Put objects in inventory onto this space */ 943 { /* Put objects in inventory onto this space */
… …
1019 945
1020 while (op) 946 while (op)
1021 { 947 {
1022 object *tmp = op->below; 948 object *tmp = op->below;
1023 949
1024 remove_ob (op); 950 op->remove ();
1025 951
1026 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 952 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1027 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 953 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1028 free_object (op); 954 op->destroy ();
1029 else 955 else
1030 { 956 {
1031 op->x = x; 957 op->x = x;
1032 op->y = y; 958 op->y = y;
1033 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 959 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1036 op = tmp; 962 op = tmp;
1037 } 963 }
1038 } 964 }
1039 } 965 }
1040 966
967 // hack to ensure that freed objects still have a valid map
968 {
969 static maptile *freed_map; // freed objects are moved here to avoid crashes
970
971 if (!freed_map)
972 {
973 freed_map = new maptile;
974
975 freed_map->name = "/internal/freed_objects_map";
976 freed_map->width = 3;
977 freed_map->height = 3;
978
979 freed_map->allocate ();
980 }
981
982 map = freed_map;
983 x = 1;
984 y = 1;
985 }
986
1041 // clear those pointers that likely might have circular references to us 987 // clear those pointers that likely might have circular references to us
1042 owner = 0; 988 owner = 0;
1043 enemy = 0; 989 enemy = 0;
1044 attacked_by = 0; 990 attacked_by = 0;
1045 991
992 // only relevant for players(?), but make sure of it anyways
993 contr = 0;
994
1046 /* Remove object from the active list */ 995 /* Remove object from the active list */
1047 speed = 0; 996 speed = 0;
1048 update_ob_speed (this); 997 update_ob_speed (this);
1049 998
1050 unlink (); 999 unlink ();
… …
1054 1003
1055/* 1004/*
1056 * sub_weight() recursively (outwards) subtracts a number from the 1005 * sub_weight() recursively (outwards) subtracts a number from the
1057 * weight of an object (and what is carried by it's environment(s)). 1006 * weight of an object (and what is carried by it's environment(s)).
1058 */ 1007 */
1059
1060void 1008void
1061sub_weight (object *op, signed long weight) 1009sub_weight (object *op, signed long weight)
1062{ 1010{
1063 while (op != NULL) 1011 while (op != NULL)
1064 { 1012 {
… …
1068 op->carrying -= weight; 1016 op->carrying -= weight;
1069 op = op->env; 1017 op = op->env;
1070 } 1018 }
1071} 1019}
1072 1020
1073/* remove_ob(op): 1021/* op->remove ():
1074 * This function removes the object op from the linked list of objects 1022 * This function removes the object op from the linked list of objects
1075 * which it is currently tied to. When this function is done, the 1023 * which it is currently tied to. When this function is done, the
1076 * object will have no environment. If the object previously had an 1024 * object will have no environment. If the object previously had an
1077 * environment, the x and y coordinates will be updated to 1025 * environment, the x and y coordinates will be updated to
1078 * the previous environment. 1026 * the previous environment.
1079 * Beware: This function is called from the editor as well! 1027 * Beware: This function is called from the editor as well!
1080 */ 1028 */
1081
1082void 1029void
1083remove_ob (object *op) 1030object::remove ()
1084{ 1031{
1085 object *tmp, *last = 0; 1032 object *tmp, *last = 0;
1086 object *otmp; 1033 object *otmp;
1087 1034
1088 int check_walk_off; 1035 int check_walk_off;
1089 maptile *m;
1090 1036
1091 sint16 x, y;
1092
1093 if (QUERY_FLAG (op, FLAG_REMOVED)) 1037 if (QUERY_FLAG (this, FLAG_REMOVED))
1094 return; 1038 return;
1095 1039
1096 SET_FLAG (op, FLAG_REMOVED); 1040 SET_FLAG (this, FLAG_REMOVED);
1097 1041
1098 if (op->more != NULL) 1042 if (more)
1099 remove_ob (op->more); 1043 more->remove ();
1100 1044
1101 /* 1045 /*
1102 * In this case, the object to be removed is in someones 1046 * In this case, the object to be removed is in someones
1103 * inventory. 1047 * inventory.
1104 */ 1048 */
1105 if (op->env != NULL) 1049 if (env)
1106 { 1050 {
1107 if (op->nrof) 1051 if (nrof)
1108 sub_weight (op->env, op->weight * op->nrof); 1052 sub_weight (env, weight * nrof);
1109 else 1053 else
1110 sub_weight (op->env, op->weight + op->carrying); 1054 sub_weight (env, weight + carrying);
1111 1055
1112 /* NO_FIX_PLAYER is set when a great many changes are being 1056 /* NO_FIX_PLAYER is set when a great many changes are being
1113 * made to players inventory. If set, avoiding the call 1057 * made to players inventory. If set, avoiding the call
1114 * to save cpu time. 1058 * to save cpu time.
1115 */ 1059 */
1116 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1060 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1117 fix_player (otmp); 1061 fix_player (otmp);
1118 1062
1119 if (op->above != NULL) 1063 if (above != NULL)
1120 op->above->below = op->below; 1064 above->below = below;
1121 else 1065 else
1122 op->env->inv = op->below; 1066 env->inv = below;
1123 1067
1124 if (op->below != NULL) 1068 if (below != NULL)
1125 op->below->above = op->above; 1069 below->above = above;
1126 1070
1127 /* we set up values so that it could be inserted into 1071 /* we set up values so that it could be inserted into
1128 * the map, but we don't actually do that - it is up 1072 * the map, but we don't actually do that - it is up
1129 * to the caller to decide what we want to do. 1073 * to the caller to decide what we want to do.
1130 */ 1074 */
1131 op->x = op->env->x, op->y = op->env->y; 1075 x = env->x, y = env->y;
1132 op->map = op->env->map; 1076 map = env->map;
1133 op->above = NULL, op->below = NULL; 1077 above = 0, below = 0;
1134 op->env = NULL; 1078 env = 0;
1135 } 1079 }
1136 else if (op->map) 1080 else if (map)
1137 { 1081 {
1138 x = op->x;
1139 y = op->y;
1140 m = get_map_from_coord (op->map, &x, &y);
1141
1142 if (!m)
1143 {
1144 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1145 op->map->path, op->x, op->y);
1146 /* in old days, we used to set x and y to 0 and continue.
1147 * it seems if we get into this case, something is probablye
1148 * screwed up and should be fixed.
1149 */
1150 abort ();
1151 }
1152
1153 if (op->map != m)
1154 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1155 op->map->path, m->path, op->x, op->y, x, y);
1156
1157 /* Re did the following section of code - it looks like it had 1082 /* Re did the following section of code - it looks like it had
1158 * lots of logic for things we no longer care about 1083 * lots of logic for things we no longer care about
1159 */ 1084 */
1160 1085
1161 /* link the object above us */ 1086 /* link the object above us */
1162 if (op->above) 1087 if (above)
1163 op->above->below = op->below; 1088 above->below = below;
1164 else 1089 else
1165 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1090 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1166 1091
1167 /* Relink the object below us, if there is one */ 1092 /* Relink the object below us, if there is one */
1168 if (op->below) 1093 if (below)
1169 op->below->above = op->above; 1094 below->above = above;
1170 else 1095 else
1171 { 1096 {
1172 /* Nothing below, which means we need to relink map object for this space 1097 /* Nothing below, which means we need to relink map object for this space
1173 * use translated coordinates in case some oddness with map tiling is 1098 * use translated coordinates in case some oddness with map tiling is
1174 * evident 1099 * evident
1175 */ 1100 */
1176 if (GET_MAP_OB (m, x, y) != op) 1101 if (GET_MAP_OB (map, x, y) != this)
1177 { 1102 {
1178 dump_object (op); 1103 char *dump = dump_object (this);
1179 LOG (llevError, 1104 LOG (llevError,
1180 "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); 1105 "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);
1106 free (dump);
1181 dump_object (GET_MAP_OB (m, x, y)); 1107 dump = dump_object (GET_MAP_OB (map, x, y));
1182 LOG (llevError, "%s\n", errmsg); 1108 LOG (llevError, "%s\n", dump);
1109 free (dump);
1183 } 1110 }
1184 1111
1185 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1186 } 1113 }
1187 1114
1188 op->above = 0; 1115 above = 0;
1189 op->below = 0; 1116 below = 0;
1190 1117
1191 if (op->map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1192 return; 1119 return;
1193 1120
1194 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1121 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1195 1122
1196 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1123 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1197 { 1124 {
1198 /* No point updating the players look faces if he is the object 1125 /* No point updating the players look faces if he is the object
1199 * being removed. 1126 * being removed.
1200 */ 1127 */
1201 1128
1202 if (tmp->type == PLAYER && tmp != op) 1129 if (tmp->type == PLAYER && tmp != this)
1203 { 1130 {
1204 /* If a container that the player is currently using somehow gets 1131 /* If a container that the player is currently using somehow gets
1205 * removed (most likely destroyed), update the player view 1132 * removed (most likely destroyed), update the player view
1206 * appropriately. 1133 * appropriately.
1207 */ 1134 */
1208 if (tmp->container == op) 1135 if (tmp->container == this)
1209 { 1136 {
1210 CLEAR_FLAG (op, FLAG_APPLIED); 1137 CLEAR_FLAG (this, FLAG_APPLIED);
1211 tmp->container = NULL; 1138 tmp->container = 0;
1212 } 1139 }
1213 1140
1214 tmp->contr->socket.update_look = 1; 1141 tmp->contr->socket->floorbox_update ();
1215 } 1142 }
1216 1143
1217 /* See if player moving off should effect something */ 1144 /* See if player moving off should effect something */
1218 if (check_walk_off 1145 if (check_walk_off
1219 && ((op->move_type & tmp->move_off) 1146 && ((move_type & tmp->move_off)
1220 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1147 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1221 { 1148 {
1222 move_apply (tmp, op, NULL); 1149 move_apply (tmp, this, 0);
1223 1150
1224 if (op->destroyed ()) 1151 if (destroyed ())
1225 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1152 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1226 } 1153 }
1227 1154
1228 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1155 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1229 1156
1230 if (tmp->above == tmp) 1157 if (tmp->above == tmp)
1231 tmp->above = NULL; 1158 tmp->above = 0;
1232 1159
1233 last = tmp; 1160 last = tmp;
1234 } 1161 }
1235 1162
1236 /* last == NULL of there are no objects on this space */ 1163 /* last == NULL of there are no objects on this space */
1237 if (last == NULL) 1164 if (!last)
1238 { 1165 {
1239 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1240 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1167 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1241 * those out anyways, and if there are any flags set right now, they won't 1168 * those out anyways, and if there are any flags set right now, they won't
1242 * be correct anyways. 1169 * be correct anyways.
1243 */ 1170 */
1244 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1245 update_position (op->map, op->x, op->y); 1172 update_position (map, x, y);
1246 } 1173 }
1247 else 1174 else
1248 update_object (last, UP_OBJ_REMOVE); 1175 update_object (last, UP_OBJ_REMOVE);
1249 1176
1250 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1251 update_all_los (op->map, op->x, op->y); 1178 update_all_los (map, x, y);
1252 } 1179 }
1253} 1180}
1254 1181
1255/* 1182/*
1256 * merge_ob(op,top): 1183 * merge_ob(op,top):
… …
1271 1198
1272 for (; top != NULL; top = top->below) 1199 for (; top != NULL; top = top->below)
1273 { 1200 {
1274 if (top == op) 1201 if (top == op)
1275 continue; 1202 continue;
1276 if (CAN_MERGE (op, top)) 1203
1204 if (object::can_merge (op, top))
1277 { 1205 {
1278 top->nrof += op->nrof; 1206 top->nrof += op->nrof;
1279 1207
1280/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1208/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1281 op->weight = 0; /* Don't want any adjustements now */ 1209 op->weight = 0; /* Don't want any adjustements now */
1282 remove_ob (op); 1210 op->destroy ();
1283 free_object (op);
1284 return top; 1211 return top;
1285 } 1212 }
1286 } 1213 }
1287 1214
1288 return 0; 1215 return 0;
… …
1342 return NULL; 1269 return NULL;
1343 } 1270 }
1344 1271
1345 if (m == NULL) 1272 if (m == NULL)
1346 { 1273 {
1347 dump_object (op); 1274 char *dump = dump_object (op);
1348 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1275 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1276 free (dump);
1349 return op; 1277 return op;
1350 } 1278 }
1351 1279
1352 if (out_of_map (m, op->x, op->y)) 1280 if (out_of_map (m, op->x, op->y))
1353 { 1281 {
1354 dump_object (op); 1282 char *dump = dump_object (op);
1355 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1283 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1356#ifdef MANY_CORES 1284#ifdef MANY_CORES
1357 /* Better to catch this here, as otherwise the next use of this object 1285 /* Better to catch this here, as otherwise the next use of this object
1358 * is likely to cause a crash. Better to find out where it is getting 1286 * is likely to cause a crash. Better to find out where it is getting
1359 * improperly inserted. 1287 * improperly inserted.
1360 */ 1288 */
1361 abort (); 1289 abort ();
1362#endif 1290#endif
1291 free (dump);
1363 return op; 1292 return op;
1364 } 1293 }
1365 1294
1366 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1295 if (!QUERY_FLAG (op, FLAG_REMOVED))
1367 { 1296 {
1368 dump_object (op); 1297 char *dump = dump_object (op);
1369 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1298 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1299 free (dump);
1370 return op; 1300 return op;
1371 } 1301 }
1372 1302
1373 if (op->more != NULL) 1303 if (op->more != NULL)
1374 { 1304 {
… …
1412 1342
1413 /* this has to be done after we translate the coordinates. 1343 /* this has to be done after we translate the coordinates.
1414 */ 1344 */
1415 if (op->nrof && !(flag & INS_NO_MERGE)) 1345 if (op->nrof && !(flag & INS_NO_MERGE))
1416 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1346 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1417 if (CAN_MERGE (op, tmp)) 1347 if (object::can_merge (op, tmp))
1418 { 1348 {
1419 op->nrof += tmp->nrof; 1349 op->nrof += tmp->nrof;
1420 remove_ob (tmp); 1350 tmp->destroy ();
1421 free_object (tmp);
1422 } 1351 }
1423 1352
1424 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1425 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1426 1355
… …
1554 * it, so save a few ticks and start from there. 1483 * it, so save a few ticks and start from there.
1555 */ 1484 */
1556 if (!(flag & INS_MAP_LOAD)) 1485 if (!(flag & INS_MAP_LOAD))
1557 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1558 if (tmp->type == PLAYER) 1487 if (tmp->type == PLAYER)
1559 tmp->contr->socket.update_look = 1; 1488 tmp->contr->socket->floorbox_update ();
1560 1489
1561 /* If this object glows, it may affect lighting conditions that are 1490 /* If this object glows, it may affect lighting conditions that are
1562 * visible to others on this map. But update_all_los is really 1491 * visible to others on this map. But update_all_los is really
1563 * an inefficient way to do this, as it means los for all players 1492 * an inefficient way to do this, as it means los for all players
1564 * on the map will get recalculated. The players could very well 1493 * on the map will get recalculated. The players could very well
… …
1572 1501
1573 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1502 /* updates flags (blocked, alive, no magic, etc) for this map space */
1574 update_object (op, UP_OBJ_INSERT); 1503 update_object (op, UP_OBJ_INSERT);
1575 1504
1576 /* Don't know if moving this to the end will break anything. However, 1505 /* Don't know if moving this to the end will break anything. However,
1577 * we want to have update_look set above before calling this. 1506 * we want to have floorbox_update called before calling this.
1578 * 1507 *
1579 * check_move_on() must be after this because code called from 1508 * check_move_on() must be after this because code called from
1580 * check_move_on() depends on correct map flags (so functions like 1509 * check_move_on() depends on correct map flags (so functions like
1581 * blocked() and wall() work properly), and these flags are updated by 1510 * blocked() and wall() work properly), and these flags are updated by
1582 * update_object(). 1511 * update_object().
… …
1612 tmp1; 1541 tmp1;
1613 1542
1614 /* first search for itself and remove any old instances */ 1543 /* first search for itself and remove any old instances */
1615 1544
1616 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1617 {
1618 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1619 { 1547 tmp->destroy ();
1620 remove_ob (tmp);
1621 free_object (tmp);
1622 }
1623 }
1624 1548
1625 tmp1 = arch_to_object (archetype::find (arch_string)); 1549 tmp1 = arch_to_object (archetype::find (arch_string));
1626 1550
1627 tmp1->x = op->x; 1551 tmp1->x = op->x;
1628 tmp1->y = op->y; 1552 tmp1->y = op->y;
… …
1638 */ 1562 */
1639 1563
1640object * 1564object *
1641get_split_ob (object *orig_ob, uint32 nr) 1565get_split_ob (object *orig_ob, uint32 nr)
1642{ 1566{
1643 object * 1567 object *newob;
1644 newob;
1645 int
1646 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1647 1569
1648 if (orig_ob->nrof < nr) 1570 if (orig_ob->nrof < nr)
1649 { 1571 {
1650 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1572 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1651 return NULL; 1573 return NULL;
1652 } 1574 }
1653 1575
1654 newob = object_create_clone (orig_ob); 1576 newob = object_create_clone (orig_ob);
1655 1577
1656 if ((orig_ob->nrof -= nr) < 1) 1578 if ((orig_ob->nrof -= nr) < 1)
1657 { 1579 orig_ob->destroy (1);
1658 if (!is_removed)
1659 remove_ob (orig_ob);
1660 free_object2 (orig_ob, 1);
1661 }
1662 else if (!is_removed) 1580 else if (!is_removed)
1663 { 1581 {
1664 if (orig_ob->env != NULL) 1582 if (orig_ob->env != NULL)
1665 sub_weight (orig_ob->env, orig_ob->weight * nr); 1583 sub_weight (orig_ob->env, orig_ob->weight * nr);
1666 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1584 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1730 esrv_send_item (tmp, op); 1648 esrv_send_item (tmp, op);
1731 } 1649 }
1732 } 1650 }
1733 else 1651 else
1734 { 1652 {
1735 remove_ob (op); 1653 op->remove ();
1736 op->nrof = 0; 1654 op->nrof = 0;
1737 if (tmp) 1655 if (tmp)
1738 { 1656 {
1739 esrv_del_item (tmp->contr, op->count); 1657 esrv_del_item (tmp->contr, op->count);
1740 } 1658 }
… …
1746 1664
1747 if (i < op->nrof) 1665 if (i < op->nrof)
1748 op->nrof -= i; 1666 op->nrof -= i;
1749 else 1667 else
1750 { 1668 {
1751 remove_ob (op); 1669 op->remove ();
1752 op->nrof = 0; 1670 op->nrof = 0;
1753 } 1671 }
1754 1672
1755 /* Since we just removed op, op->above is null */ 1673 /* Since we just removed op, op->above is null */
1756 for (tmp = above; tmp != NULL; tmp = tmp->above) 1674 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1765 1683
1766 if (op->nrof) 1684 if (op->nrof)
1767 return op; 1685 return op;
1768 else 1686 else
1769 { 1687 {
1770 free_object (op); 1688 op->destroy ();
1771 return NULL; 1689 return NULL;
1772 } 1690 }
1773} 1691}
1774 1692
1775/* 1693/*
… …
1788 op->carrying += weight; 1706 op->carrying += weight;
1789 op = op->env; 1707 op = op->env;
1790 } 1708 }
1791} 1709}
1792 1710
1711object *
1712insert_ob_in_ob (object *op, object *where)
1713{
1714 if (!where)
1715 {
1716 char *dump = dump_object (op);
1717 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1718 free (dump);
1719 return op;
1720 }
1721
1722 if (where->head)
1723 {
1724 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1725 where = where->head;
1726 }
1727
1728 return where->insert (op);
1729}
1730
1793/* 1731/*
1794 * insert_ob_in_ob(op,environment): 1732 * env->insert (op)
1795 * This function inserts the object op in the linked list 1733 * This function inserts the object op in the linked list
1796 * inside the object environment. 1734 * inside the object environment.
1797 * 1735 *
1798 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1799 * the inventory at the last position or next to other objects of the same
1800 * type.
1801 * Frank: Now sorted by type, archetype and magic!
1802 *
1803 * The function returns now pointer to inserted item, and return value can 1736 * The function returns now pointer to inserted item, and return value can
1804 * be != op, if items are merged. -Tero 1737 * be != op, if items are merged. -Tero
1805 */ 1738 */
1806 1739
1807object * 1740object *
1808insert_ob_in_ob (object *op, object *where) 1741object::insert (object *op)
1809{ 1742{
1810 object * 1743 object *tmp, *otmp;
1811 tmp, *
1812 otmp;
1813 1744
1814 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1745 if (!QUERY_FLAG (op, FLAG_REMOVED))
1815 { 1746 op->remove ();
1816 dump_object (op);
1817 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1818 return op;
1819 }
1820
1821 if (where == NULL)
1822 {
1823 dump_object (op);
1824 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1825 return op;
1826 }
1827
1828 if (where->head)
1829 {
1830 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1831 where = where->head;
1832 }
1833 1747
1834 if (op->more) 1748 if (op->more)
1835 { 1749 {
1836 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1750 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1837 return op; 1751 return op;
… …
1839 1753
1840 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1841 CLEAR_FLAG (op, FLAG_REMOVED); 1755 CLEAR_FLAG (op, FLAG_REMOVED);
1842 if (op->nrof) 1756 if (op->nrof)
1843 { 1757 {
1844 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1758 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1845 if (CAN_MERGE (tmp, op)) 1759 if (object::can_merge (tmp, op))
1846 { 1760 {
1847 /* return the original object and remove inserted object 1761 /* return the original object and remove inserted object
1848 (client needs the original object) */ 1762 (client needs the original object) */
1849 tmp->nrof += op->nrof; 1763 tmp->nrof += op->nrof;
1850 /* Weight handling gets pretty funky. Since we are adding to 1764 /* Weight handling gets pretty funky. Since we are adding to
1851 * tmp->nrof, we need to increase the weight. 1765 * tmp->nrof, we need to increase the weight.
1852 */ 1766 */
1853 add_weight (where, op->weight * op->nrof); 1767 add_weight (this, op->weight * op->nrof);
1854 SET_FLAG (op, FLAG_REMOVED); 1768 SET_FLAG (op, FLAG_REMOVED);
1855 free_object (op); /* free the inserted object */ 1769 op->destroy (); /* free the inserted object */
1856 op = tmp; 1770 op = tmp;
1857 remove_ob (op); /* and fix old object's links */ 1771 op->remove (); /* and fix old object's links */
1858 CLEAR_FLAG (op, FLAG_REMOVED); 1772 CLEAR_FLAG (op, FLAG_REMOVED);
1859 break; 1773 break;
1860 } 1774 }
1861 1775
1862 /* I assume combined objects have no inventory 1776 /* I assume combined objects have no inventory
1863 * We add the weight - this object could have just been removed 1777 * We add the weight - this object could have just been removed
1864 * (if it was possible to merge). calling remove_ob will subtract 1778 * (if it was possible to merge). calling remove_ob will subtract
1865 * the weight, so we need to add it in again, since we actually do 1779 * the weight, so we need to add it in again, since we actually do
1866 * the linking below 1780 * the linking below
1867 */ 1781 */
1868 add_weight (where, op->weight * op->nrof); 1782 add_weight (this, op->weight * op->nrof);
1869 } 1783 }
1870 else 1784 else
1871 add_weight (where, (op->weight + op->carrying)); 1785 add_weight (this, (op->weight + op->carrying));
1872 1786
1873 otmp = is_player_inv (where); 1787 otmp = is_player_inv (this);
1874 if (otmp && otmp->contr != NULL) 1788 if (otmp && otmp->contr)
1875 {
1876 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1877 fix_player (otmp); 1790 fix_player (otmp);
1878 }
1879 1791
1880 op->map = NULL; 1792 op->map = NULL;
1881 op->env = where; 1793 op->env = this;
1882 op->above = NULL; 1794 op->above = NULL;
1883 op->below = NULL; 1795 op->below = NULL;
1884 op->x = 0, op->y = 0; 1796 op->x = 0, op->y = 0;
1885 1797
1886 /* reset the light list and los of the players on the map */ 1798 /* reset the light list and los of the players on the map */
1887 if ((op->glow_radius != 0) && where->map) 1799 if ((op->glow_radius != 0) && map)
1888 { 1800 {
1889#ifdef DEBUG_LIGHTS 1801#ifdef DEBUG_LIGHTS
1890 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1802 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1891#endif /* DEBUG_LIGHTS */ 1803#endif /* DEBUG_LIGHTS */
1892 if (MAP_DARKNESS (where->map)) 1804 if (MAP_DARKNESS (map))
1893 update_all_los (where->map, where->x, where->y); 1805 update_all_los (map, x, y);
1894 } 1806 }
1895 1807
1896 /* Client has no idea of ordering so lets not bother ordering it here. 1808 /* Client has no idea of ordering so lets not bother ordering it here.
1897 * It sure simplifies this function... 1809 * It sure simplifies this function...
1898 */ 1810 */
1899 if (where->inv == NULL) 1811 if (!inv)
1900 where->inv = op; 1812 inv = op;
1901 else 1813 else
1902 { 1814 {
1903 op->below = where->inv; 1815 op->below = inv;
1904 op->below->above = op; 1816 op->below->above = op;
1905 where->inv = op; 1817 inv = op;
1906 } 1818 }
1819
1907 return op; 1820 return op;
1908} 1821}
1909 1822
1910/* 1823/*
1911 * Checks if any objects has a move_type that matches objects 1824 * Checks if any objects has a move_type that matches objects
… …
2600 * create clone from object to another 2513 * create clone from object to another
2601 */ 2514 */
2602object * 2515object *
2603object_create_clone (object *asrc) 2516object_create_clone (object *asrc)
2604{ 2517{
2605 object *
2606 dst = NULL, *tmp, *src, *part, *prev, *item; 2518 object *dst = 0, *tmp, *src, *part, *prev, *item;
2607 2519
2608 if (!asrc) 2520 if (!asrc)
2609 return NULL; 2521 return 0;
2522
2610 src = asrc; 2523 src = asrc;
2611 if (src->head) 2524 if (src->head)
2612 src = src->head; 2525 src = src->head;
2613 2526
2614 prev = NULL; 2527 prev = 0;
2615 for (part = src; part; part = part->more) 2528 for (part = src; part; part = part->more)
2616 { 2529 {
2617 tmp = get_object (); 2530 tmp = part->clone ();
2618 copy_object (part, tmp);
2619 tmp->x -= src->x; 2531 tmp->x -= src->x;
2620 tmp->y -= src->y; 2532 tmp->y -= src->y;
2533
2621 if (!part->head) 2534 if (!part->head)
2622 { 2535 {
2623 dst = tmp; 2536 dst = tmp;
2624 tmp->head = NULL; 2537 tmp->head = 0;
2625 } 2538 }
2626 else 2539 else
2627 { 2540 {
2628 tmp->head = dst; 2541 tmp->head = dst;
2629 } 2542 }
2543
2630 tmp->more = NULL; 2544 tmp->more = 0;
2545
2631 if (prev) 2546 if (prev)
2632 prev->more = tmp; 2547 prev->more = tmp;
2548
2633 prev = tmp; 2549 prev = tmp;
2634 } 2550 }
2635 2551
2636 for (item = src->inv; item; item = item->below) 2552 for (item = src->inv; item; item = item->below)
2637 insert_ob_in_ob (object_create_clone (item), dst); 2553 insert_ob_in_ob (object_create_clone (item), dst);
… …
2663 } 2579 }
2664 2580
2665 fprintf (tempfile, obstr); 2581 fprintf (tempfile, obstr);
2666 fclose (tempfile); 2582 fclose (tempfile);
2667 2583
2668 op = get_object (); 2584 op = object::create ();
2669 2585
2670 object_thawer thawer (filename); 2586 object_thawer thawer (filename);
2671 2587
2672 if (thawer) 2588 if (thawer)
2673 load_object (thawer, op, 0); 2589 load_object (thawer, op, 0);

Diff Legend

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