ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 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 */
… …
354 op = op->env; 352 op = op->env;
355 return op; 353 return op;
356} 354}
357 355
358/* 356/*
359 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
360 * a better check. We basically keeping traversing up until we can't
361 * or find a player.
362 */
363
364object *
365is_player_inv (object *op)
366{
367 for (; op != NULL && op->type != PLAYER; op = op->env)
368 if (op->env == op)
369 op->env = NULL;
370 return op;
371}
372
373/*
374 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375 * Some error messages. 358 * Some error messages.
376 * The result of the dump is stored in the static global errmsg array. 359 * The result of the dump is stored in the static global errmsg array.
377 */ 360 */
378 361
379void 362char *
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) 363dump_object (object *op)
435{ 364{
436 if (op == NULL) 365 if (!op)
437 { 366 return strdup ("[NULLOBJ]");
438 strcpy (errmsg, "[NULL pointer]");
439 return;
440 }
441 errmsg[0] = '\0';
442 dump_object2 (op);
443}
444 367
445void 368 object_freezer freezer;
446dump_all_objects (void) 369 save_object (freezer, op, 3);
447{ 370 return freezer.as_string ();
448 object *op;
449
450 for (op = object::first; op != NULL; op = op->next)
451 {
452 dump_object (op);
453 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
454 }
455} 371}
456 372
457/* 373/*
458 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
459 * multi-object 1 which is closest to the second object. 375 * multi-object 1 which is closest to the second object.
… …
479 */ 395 */
480 396
481object * 397object *
482find_object (tag_t i) 398find_object (tag_t i)
483{ 399{
484 object *op;
485
486 for (op = object::first; op != NULL; op = op->next) 400 for (object *op = object::first; op; op = op->next)
487 if (op->count == i) 401 if (op->count == i)
488 break; 402 return op;
403
489 return op; 404 return 0;
490} 405}
491 406
492/* 407/*
493 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
494 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
594 509
595 if (settings.casting_time) 510 if (settings.casting_time)
596 casting_time = -1; 511 casting_time = -1;
597} 512}
598 513
599void object::clone (object *destination)
600{
601 *(object_copy *)destination = *this;
602 *(object_pod *)destination = *this;
603
604 if (self || cb)
605 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
606}
607
608/* 514/*
609 * copy object first frees everything allocated by the second object, 515 * copy_to first frees everything allocated by the dst object,
610 * and then copies the contends of the first object into the second 516 * and then copies the contents of itself into the second
611 * object, allocating what needs to be allocated. Basically, any 517 * object, allocating what needs to be allocated. Basically, any
612 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 518 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
613 * if the first object is freed, the pointers in the new object 519 * if the first object is freed, the pointers in the new object
614 * will point at garbage. 520 * will point at garbage.
615 */ 521 */
616void 522void
617copy_object (object *op2, object *op) 523object::copy_to (object *dst)
618{ 524{
619 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
620 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
621 527
622 op2->clone (op); 528 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
623 533
624 if (is_freed) 534 if (is_freed)
625 SET_FLAG (op, FLAG_FREED); 535 SET_FLAG (dst, FLAG_FREED);
536
626 if (is_removed) 537 if (is_removed)
627 SET_FLAG (op, FLAG_REMOVED); 538 SET_FLAG (dst, FLAG_REMOVED);
628 539
629 if (op2->speed < 0) 540 if (speed < 0)
630 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 541 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
631 542
632 /* Copy over key_values, if any. */ 543 /* Copy over key_values, if any. */
633 if (op2->key_values) 544 if (key_values)
634 { 545 {
635 key_value *tail = 0; 546 key_value *tail = 0;
636 key_value *i; 547 key_value *i;
637 548
638 op->key_values = 0; 549 dst->key_values = 0;
639 550
640 for (i = op2->key_values; i; i = i->next) 551 for (i = key_values; i; i = i->next)
641 { 552 {
642 key_value *new_link = new key_value; 553 key_value *new_link = new key_value;
643 554
644 new_link->next = 0; 555 new_link->next = 0;
645 new_link->key = i->key; 556 new_link->key = i->key;
646 new_link->value = i->value; 557 new_link->value = i->value;
647 558
648 /* Try and be clever here, too. */ 559 /* Try and be clever here, too. */
649 if (!op->key_values) 560 if (!dst->key_values)
650 { 561 {
651 op->key_values = new_link; 562 dst->key_values = new_link;
652 tail = new_link; 563 tail = new_link;
653 } 564 }
654 else 565 else
655 { 566 {
656 tail->next = new_link; 567 tail->next = new_link;
657 tail = new_link; 568 tail = new_link;
658 } 569 }
659 } 570 }
660 } 571 }
661 572
662 update_ob_speed (op); 573 update_ob_speed (dst);
574}
575
576object *
577object::clone ()
578{
579 object *neu = create ();
580 copy_to (neu);
581 return neu;
663} 582}
664 583
665/* 584/*
666 * If an object with the IS_TURNABLE() flag needs to be turned due 585 * If an object with the IS_TURNABLE() flag needs to be turned due
667 * to the closest player being on the other side, this function can 586 * to the closest player being on the other side, this function can
… …
872 update_now = 1; 791 update_now = 1;
873 792
874 if ((move_slow | op->move_slow) != move_slow) 793 if ((move_slow | op->move_slow) != move_slow)
875 update_now = 1; 794 update_now = 1;
876 } 795 }
796
877 /* if the object is being removed, we can't make intelligent 797 /* if the object is being removed, we can't make intelligent
878 * decisions, because remove_ob can't really pass the object 798 * decisions, because remove_ob can't really pass the object
879 * that is being removed. 799 * that is being removed.
880 */ 800 */
881 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 801 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
907 else 827 else
908 { 828 {
909 delete *i; 829 delete *i;
910 mortals.erase (i); 830 mortals.erase (i);
911 } 831 }
912
913 static int lastmortals = 0;//D
914
915 if (mortals.size() != lastmortals)//D
916 {
917 lastmortals = mortals.size ();//D
918 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919 }
920} 832}
921 833
922object::object () 834object::object ()
923{ 835{
924 SET_FLAG (this, FLAG_REMOVED); 836 SET_FLAG (this, FLAG_REMOVED);
… …
946 object::first = this; 858 object::first = this;
947} 859}
948 860
949void object::unlink () 861void object::unlink ()
950{ 862{
951 //count = 0;//D
952 if (!prev && !next) return;//D
953
954 if (this == object::first) 863 if (this == object::first)
955 object::first = next; 864 object::first = next;
956 865
957 /* Remove this object from the list of used objects */ 866 /* Remove this object from the list of used objects */
958 if (prev) prev->next = next; 867 if (prev) prev->next = next;
… …
974 * it from the list of used objects, and puts it on the list of 883 * it from the list of used objects, and puts it on the list of
975 * free objects. The IS_FREED() flag is set in the object. 884 * free objects. The IS_FREED() flag is set in the object.
976 * The object must have been removed by remove_ob() first for 885 * The object must have been removed by remove_ob() first for
977 * this function to succeed. 886 * this function to succeed.
978 * 887 *
979 * If free_inventory is set, free inventory as well. Else drop items in 888 * If destroy_inventory is set, free inventory as well. Else drop items in
980 * inventory to the ground. 889 * inventory to the ground.
981 */ 890 */
982void object::free (bool free_inventory) 891void object::destroy (bool destroy_inventory)
983{ 892{
984 if (QUERY_FLAG (this, FLAG_FREED)) 893 if (QUERY_FLAG (this, FLAG_FREED))
985 return; 894 return;
986 895
987 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 896 if (QUERY_FLAG (this, FLAG_FRIENDLY))
988 remove_friendly_object (this); 897 remove_friendly_object (this);
989 898
990 if (!QUERY_FLAG (this, FLAG_REMOVED)) 899 if (!QUERY_FLAG (this, FLAG_REMOVED))
991 remove_ob (this); 900 remove ();
992 901
993 SET_FLAG (this, FLAG_FREED); 902 SET_FLAG (this, FLAG_FREED);
994 903
995 if (more) 904 if (more)
996 { 905 {
997 more->free (free_inventory); 906 more->destroy (destroy_inventory);
998 more = 0; 907 more = 0;
999 } 908 }
1000 909
1001 if (inv) 910 if (inv)
1002 { 911 {
1003 /* Only if the space blocks everything do we not process - 912 /* Only if the space blocks everything do we not process -
1004 * if some form of movement is allowed, let objects 913 * if some form of movement is allowed, let objects
1005 * drop on that space. 914 * drop on that space.
1006 */ 915 */
1007 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 916 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1008 { 917 {
1009 object *op = inv; 918 object *op = inv;
1010 919
1011 while (op) 920 while (op)
1012 { 921 {
1013 object *tmp = op->below; 922 object *tmp = op->below;
1014 op->free (free_inventory); 923 op->destroy (destroy_inventory);
1015 op = tmp; 924 op = tmp;
1016 } 925 }
1017 } 926 }
1018 else 927 else
1019 { /* Put objects in inventory onto this space */ 928 { /* Put objects in inventory onto this space */
… …
1021 930
1022 while (op) 931 while (op)
1023 { 932 {
1024 object *tmp = op->below; 933 object *tmp = op->below;
1025 934
1026 remove_ob (op); 935 op->remove ();
1027 936
1028 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 937 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1029 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 938 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1030 free_object (op); 939 op->destroy ();
1031 else 940 else
1032 { 941 {
1033 op->x = x; 942 op->x = x;
1034 op->y = y; 943 op->y = y;
1035 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 944 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1038 op = tmp; 947 op = tmp;
1039 } 948 }
1040 } 949 }
1041 } 950 }
1042 951
952 // hack to ensure that freed objects still have a valid map
953 {
954 static maptile *freed_map; // freed objects are moved here to avoid crashes
955
956 if (!freed_map)
957 {
958 freed_map = new maptile;
959
960 freed_map->name = "/internal/freed_objects_map";
961 freed_map->width = 3;
962 freed_map->height = 3;
963
964 freed_map->allocate ();
965 }
966
967 map = freed_map;
968 x = 1;
969 y = 1;
970 }
971
1043 // clear those pointers that likely might have circular references to us 972 // clear those pointers that likely might have circular references to us
1044 owner = 0; 973 owner = 0;
1045 enemy = 0; 974 enemy = 0;
1046 attacked_by = 0; 975 attacked_by = 0;
1047 976
977 // only relevant for players(?), but make sure of it anyways
978 contr = 0;
979
1048 /* Remove object from the active list */ 980 /* Remove object from the active list */
1049 speed = 0; 981 speed = 0;
1050 update_ob_speed (this); 982 update_ob_speed (this);
1051 983
1052 unlink (); 984 unlink ();
… …
1056 988
1057/* 989/*
1058 * sub_weight() recursively (outwards) subtracts a number from the 990 * sub_weight() recursively (outwards) subtracts a number from the
1059 * weight of an object (and what is carried by it's environment(s)). 991 * weight of an object (and what is carried by it's environment(s)).
1060 */ 992 */
1061
1062void 993void
1063sub_weight (object *op, signed long weight) 994sub_weight (object *op, signed long weight)
1064{ 995{
1065 while (op != NULL) 996 while (op != NULL)
1066 { 997 {
… …
1070 op->carrying -= weight; 1001 op->carrying -= weight;
1071 op = op->env; 1002 op = op->env;
1072 } 1003 }
1073} 1004}
1074 1005
1075/* remove_ob(op): 1006/* op->remove ():
1076 * This function removes the object op from the linked list of objects 1007 * This function removes the object op from the linked list of objects
1077 * which it is currently tied to. When this function is done, the 1008 * which it is currently tied to. When this function is done, the
1078 * object will have no environment. If the object previously had an 1009 * object will have no environment. If the object previously had an
1079 * environment, the x and y coordinates will be updated to 1010 * environment, the x and y coordinates will be updated to
1080 * the previous environment. 1011 * the previous environment.
1081 * Beware: This function is called from the editor as well! 1012 * Beware: This function is called from the editor as well!
1082 */ 1013 */
1083
1084void 1014void
1085remove_ob (object *op) 1015object::remove ()
1086{ 1016{
1087 object *tmp, *last = 0; 1017 object *tmp, *last = 0;
1088 object *otmp; 1018 object *otmp;
1089 1019
1090 tag_t tag;
1091 int check_walk_off; 1020 int check_walk_off;
1092 mapstruct *m;
1093 1021
1094 sint16 x, y;
1095
1096 if (QUERY_FLAG (op, FLAG_REMOVED)) 1022 if (QUERY_FLAG (this, FLAG_REMOVED))
1097 return; 1023 return;
1098 1024
1099 SET_FLAG (op, FLAG_REMOVED); 1025 SET_FLAG (this, FLAG_REMOVED);
1100 1026
1101 if (op->more != NULL) 1027 if (more)
1102 remove_ob (op->more); 1028 more->remove ();
1103 1029
1104 /* 1030 /*
1105 * In this case, the object to be removed is in someones 1031 * In this case, the object to be removed is in someones
1106 * inventory. 1032 * inventory.
1107 */ 1033 */
1108 if (op->env != NULL) 1034 if (env)
1109 { 1035 {
1110 if (op->nrof) 1036 if (nrof)
1111 sub_weight (op->env, op->weight * op->nrof); 1037 sub_weight (env, weight * nrof);
1112 else 1038 else
1113 sub_weight (op->env, op->weight + op->carrying); 1039 sub_weight (env, weight + carrying);
1114 1040
1115 /* NO_FIX_PLAYER is set when a great many changes are being 1041 /* NO_FIX_PLAYER is set when a great many changes are being
1116 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
1117 * to save cpu time. 1043 * to save cpu time.
1118 */ 1044 */
1119 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1120 fix_player (otmp); 1046 fix_player (otmp);
1121 1047
1122 if (op->above != NULL) 1048 if (above != NULL)
1123 op->above->below = op->below; 1049 above->below = below;
1124 else 1050 else
1125 op->env->inv = op->below; 1051 env->inv = below;
1126 1052
1127 if (op->below != NULL) 1053 if (below != NULL)
1128 op->below->above = op->above; 1054 below->above = above;
1129 1055
1130 /* we set up values so that it could be inserted into 1056 /* we set up values so that it could be inserted into
1131 * the map, but we don't actually do that - it is up 1057 * the map, but we don't actually do that - it is up
1132 * to the caller to decide what we want to do. 1058 * to the caller to decide what we want to do.
1133 */ 1059 */
1134 op->x = op->env->x, op->y = op->env->y; 1060 x = env->x, y = env->y;
1135 op->map = op->env->map; 1061 map = env->map;
1136 op->above = NULL, op->below = NULL; 1062 above = 0, below = 0;
1137 op->env = NULL; 1063 env = 0;
1138 } 1064 }
1139 else if (op->map) 1065 else if (map)
1140 { 1066 {
1141 x = op->x;
1142 y = op->y;
1143 m = get_map_from_coord (op->map, &x, &y);
1144
1145 if (!m)
1146 {
1147 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1148 op->map->path, op->x, op->y);
1149 /* in old days, we used to set x and y to 0 and continue.
1150 * it seems if we get into this case, something is probablye
1151 * screwed up and should be fixed.
1152 */
1153 abort ();
1154 }
1155
1156 if (op->map != m)
1157 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1158 op->map->path, m->path, op->x, op->y, x, y);
1159
1160 /* Re did the following section of code - it looks like it had 1067 /* Re did the following section of code - it looks like it had
1161 * lots of logic for things we no longer care about 1068 * lots of logic for things we no longer care about
1162 */ 1069 */
1163 1070
1164 /* link the object above us */ 1071 /* link the object above us */
1165 if (op->above) 1072 if (above)
1166 op->above->below = op->below; 1073 above->below = below;
1167 else 1074 else
1168 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1075 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1169 1076
1170 /* Relink the object below us, if there is one */ 1077 /* Relink the object below us, if there is one */
1171 if (op->below) 1078 if (below)
1172 op->below->above = op->above; 1079 below->above = above;
1173 else 1080 else
1174 { 1081 {
1175 /* Nothing below, which means we need to relink map object for this space 1082 /* Nothing below, which means we need to relink map object for this space
1176 * use translated coordinates in case some oddness with map tiling is 1083 * use translated coordinates in case some oddness with map tiling is
1177 * evident 1084 * evident
1178 */ 1085 */
1179 if (GET_MAP_OB (m, x, y) != op) 1086 if (GET_MAP_OB (map, x, y) != this)
1180 { 1087 {
1181 dump_object (op); 1088 char *dump = dump_object (this);
1182 LOG (llevError, 1089 LOG (llevError,
1183 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1090 "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);
1091 free (dump);
1184 dump_object (GET_MAP_OB (m, x, y)); 1092 dump = dump_object (GET_MAP_OB (map, x, y));
1185 LOG (llevError, "%s\n", errmsg); 1093 LOG (llevError, "%s\n", dump);
1094 free (dump);
1186 } 1095 }
1187 1096
1188 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1097 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1189 } 1098 }
1190 1099
1191 op->above = 0; 1100 above = 0;
1192 op->below = 0; 1101 below = 0;
1193 1102
1194 if (op->map->in_memory == MAP_SAVING) 1103 if (map->in_memory == MAP_SAVING)
1195 return; 1104 return;
1196 1105
1197 tag = op->count;
1198 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1106 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1199 1107
1200 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1108 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1201 { 1109 {
1202 /* No point updating the players look faces if he is the object 1110 /* No point updating the players look faces if he is the object
1203 * being removed. 1111 * being removed.
1204 */ 1112 */
1205 1113
1206 if (tmp->type == PLAYER && tmp != op) 1114 if (tmp->type == PLAYER && tmp != this)
1207 { 1115 {
1208 /* If a container that the player is currently using somehow gets 1116 /* If a container that the player is currently using somehow gets
1209 * removed (most likely destroyed), update the player view 1117 * removed (most likely destroyed), update the player view
1210 * appropriately. 1118 * appropriately.
1211 */ 1119 */
1212 if (tmp->container == op) 1120 if (tmp->container == this)
1213 { 1121 {
1214 CLEAR_FLAG (op, FLAG_APPLIED); 1122 CLEAR_FLAG (this, FLAG_APPLIED);
1215 tmp->container = NULL; 1123 tmp->container = 0;
1216 } 1124 }
1217 1125
1218 tmp->contr->socket.update_look = 1; 1126 tmp->contr->socket->floorbox_update ();
1219 } 1127 }
1220 1128
1221 /* See if player moving off should effect something */ 1129 /* See if player moving off should effect something */
1222 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1130 if (check_walk_off
1131 && ((move_type & tmp->move_off)
1132 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1223 { 1133 {
1224 move_apply (tmp, op, NULL); 1134 move_apply (tmp, this, 0);
1225 1135
1226 if (was_destroyed (op, tag)) 1136 if (destroyed ())
1227 {
1228 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1137 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1229 }
1230 } 1138 }
1231 1139
1232 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1140 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1233 1141
1234 if (tmp->above == tmp) 1142 if (tmp->above == tmp)
1235 tmp->above = NULL; 1143 tmp->above = 0;
1236 1144
1237 last = tmp; 1145 last = tmp;
1238 } 1146 }
1239 1147
1240 /* last == NULL of there are no objects on this space */ 1148 /* last == NULL of there are no objects on this space */
1241 if (last == NULL) 1149 if (!last)
1242 { 1150 {
1243 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1151 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1244 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1152 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1245 * those out anyways, and if there are any flags set right now, they won't 1153 * those out anyways, and if there are any flags set right now, they won't
1246 * be correct anyways. 1154 * be correct anyways.
1247 */ 1155 */
1248 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1156 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1249 update_position (op->map, op->x, op->y); 1157 update_position (map, x, y);
1250 } 1158 }
1251 else 1159 else
1252 update_object (last, UP_OBJ_REMOVE); 1160 update_object (last, UP_OBJ_REMOVE);
1253 1161
1254 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1162 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1255 update_all_los (op->map, op->x, op->y); 1163 update_all_los (map, x, y);
1256 } 1164 }
1257} 1165}
1258 1166
1259/* 1167/*
1260 * merge_ob(op,top): 1168 * merge_ob(op,top):
… …
1275 1183
1276 for (; top != NULL; top = top->below) 1184 for (; top != NULL; top = top->below)
1277 { 1185 {
1278 if (top == op) 1186 if (top == op)
1279 continue; 1187 continue;
1280 if (CAN_MERGE (op, top)) 1188
1189 if (object::can_merge (op, top))
1281 { 1190 {
1282 top->nrof += op->nrof; 1191 top->nrof += op->nrof;
1283 1192
1284/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1193/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1285 op->weight = 0; /* Don't want any adjustements now */ 1194 op->weight = 0; /* Don't want any adjustements now */
1286 remove_ob (op); 1195 op->destroy ();
1287 free_object (op);
1288 return top; 1196 return top;
1289 } 1197 }
1290 } 1198 }
1291 1199
1292 return 0; 1200 return 0;
… …
1295/* 1203/*
1296 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1204 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1297 * job preparing multi-part monsters 1205 * job preparing multi-part monsters
1298 */ 1206 */
1299object * 1207object *
1300insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1208insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1301{ 1209{
1302 object *tmp; 1210 object *tmp;
1303 1211
1304 if (op->head) 1212 if (op->head)
1305 op = op->head; 1213 op = op->head;
… …
1333 * NULL if 'op' was destroyed 1241 * NULL if 'op' was destroyed
1334 * just 'op' otherwise 1242 * just 'op' otherwise
1335 */ 1243 */
1336 1244
1337object * 1245object *
1338insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1246insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1339{ 1247{
1340 object *tmp, *top, *floor = NULL; 1248 object *tmp, *top, *floor = NULL;
1341 sint16 x, y; 1249 sint16 x, y;
1342 1250
1343 if (QUERY_FLAG (op, FLAG_FREED)) 1251 if (QUERY_FLAG (op, FLAG_FREED))
… …
1346 return NULL; 1254 return NULL;
1347 } 1255 }
1348 1256
1349 if (m == NULL) 1257 if (m == NULL)
1350 { 1258 {
1351 dump_object (op); 1259 char *dump = dump_object (op);
1352 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1260 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1261 free (dump);
1353 return op; 1262 return op;
1354 } 1263 }
1355 1264
1356 if (out_of_map (m, op->x, op->y)) 1265 if (out_of_map (m, op->x, op->y))
1357 { 1266 {
1358 dump_object (op); 1267 char *dump = dump_object (op);
1359 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1268 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1360#ifdef MANY_CORES 1269#ifdef MANY_CORES
1361 /* Better to catch this here, as otherwise the next use of this object 1270 /* Better to catch this here, as otherwise the next use of this object
1362 * is likely to cause a crash. Better to find out where it is getting 1271 * is likely to cause a crash. Better to find out where it is getting
1363 * improperly inserted. 1272 * improperly inserted.
1364 */ 1273 */
1365 abort (); 1274 abort ();
1366#endif 1275#endif
1276 free (dump);
1367 return op; 1277 return op;
1368 } 1278 }
1369 1279
1370 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1280 if (!QUERY_FLAG (op, FLAG_REMOVED))
1371 { 1281 {
1372 dump_object (op); 1282 char *dump = dump_object (op);
1373 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1283 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1284 free (dump);
1374 return op; 1285 return op;
1375 } 1286 }
1376 1287
1377 if (op->more != NULL) 1288 if (op->more != NULL)
1378 { 1289 {
… …
1416 1327
1417 /* this has to be done after we translate the coordinates. 1328 /* this has to be done after we translate the coordinates.
1418 */ 1329 */
1419 if (op->nrof && !(flag & INS_NO_MERGE)) 1330 if (op->nrof && !(flag & INS_NO_MERGE))
1420 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1331 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1421 if (CAN_MERGE (op, tmp)) 1332 if (object::can_merge (op, tmp))
1422 { 1333 {
1423 op->nrof += tmp->nrof; 1334 op->nrof += tmp->nrof;
1424 remove_ob (tmp); 1335 tmp->destroy ();
1425 free_object (tmp);
1426 } 1336 }
1427 1337
1428 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1338 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1429 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1339 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1430 1340
… …
1558 * it, so save a few ticks and start from there. 1468 * it, so save a few ticks and start from there.
1559 */ 1469 */
1560 if (!(flag & INS_MAP_LOAD)) 1470 if (!(flag & INS_MAP_LOAD))
1561 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1471 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1562 if (tmp->type == PLAYER) 1472 if (tmp->type == PLAYER)
1563 tmp->contr->socket.update_look = 1; 1473 tmp->contr->socket->floorbox_update ();
1564 1474
1565 /* If this object glows, it may affect lighting conditions that are 1475 /* If this object glows, it may affect lighting conditions that are
1566 * visible to others on this map. But update_all_los is really 1476 * visible to others on this map. But update_all_los is really
1567 * an inefficient way to do this, as it means los for all players 1477 * an inefficient way to do this, as it means los for all players
1568 * on the map will get recalculated. The players could very well 1478 * on the map will get recalculated. The players could very well
… …
1576 1486
1577 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1487 /* updates flags (blocked, alive, no magic, etc) for this map space */
1578 update_object (op, UP_OBJ_INSERT); 1488 update_object (op, UP_OBJ_INSERT);
1579 1489
1580 /* Don't know if moving this to the end will break anything. However, 1490 /* Don't know if moving this to the end will break anything. However,
1581 * we want to have update_look set above before calling this. 1491 * we want to have floorbox_update called before calling this.
1582 * 1492 *
1583 * check_move_on() must be after this because code called from 1493 * check_move_on() must be after this because code called from
1584 * check_move_on() depends on correct map flags (so functions like 1494 * check_move_on() depends on correct map flags (so functions like
1585 * blocked() and wall() work properly), and these flags are updated by 1495 * blocked() and wall() work properly), and these flags are updated by
1586 * update_object(). 1496 * update_object().
… …
1616 tmp1; 1526 tmp1;
1617 1527
1618 /* first search for itself and remove any old instances */ 1528 /* first search for itself and remove any old instances */
1619 1529
1620 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1530 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1621 {
1622 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1531 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1623 { 1532 tmp->destroy ();
1624 remove_ob (tmp);
1625 free_object (tmp);
1626 }
1627 }
1628 1533
1629 tmp1 = arch_to_object (archetype::find (arch_string)); 1534 tmp1 = arch_to_object (archetype::find (arch_string));
1630 1535
1631 tmp1->x = op->x; 1536 tmp1->x = op->x;
1632 tmp1->y = op->y; 1537 tmp1->y = op->y;
… …
1642 */ 1547 */
1643 1548
1644object * 1549object *
1645get_split_ob (object *orig_ob, uint32 nr) 1550get_split_ob (object *orig_ob, uint32 nr)
1646{ 1551{
1647 object * 1552 object *newob;
1648 newob;
1649 int
1650 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1553 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1651 1554
1652 if (orig_ob->nrof < nr) 1555 if (orig_ob->nrof < nr)
1653 { 1556 {
1654 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1557 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1655 return NULL; 1558 return NULL;
1656 } 1559 }
1657 1560
1658 newob = object_create_clone (orig_ob); 1561 newob = object_create_clone (orig_ob);
1659 1562
1660 if ((orig_ob->nrof -= nr) < 1) 1563 if ((orig_ob->nrof -= nr) < 1)
1661 { 1564 orig_ob->destroy (1);
1662 if (!is_removed)
1663 remove_ob (orig_ob);
1664 free_object2 (orig_ob, 1);
1665 }
1666 else if (!is_removed) 1565 else if (!is_removed)
1667 { 1566 {
1668 if (orig_ob->env != NULL) 1567 if (orig_ob->env != NULL)
1669 sub_weight (orig_ob->env, orig_ob->weight * nr); 1568 sub_weight (orig_ob->env, orig_ob->weight * nr);
1670 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1569 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1700 if (i > op->nrof) 1599 if (i > op->nrof)
1701 i = op->nrof; 1600 i = op->nrof;
1702 1601
1703 if (QUERY_FLAG (op, FLAG_REMOVED)) 1602 if (QUERY_FLAG (op, FLAG_REMOVED))
1704 op->nrof -= i; 1603 op->nrof -= i;
1705 else if (op->env != NULL) 1604 else if (op->env)
1706 { 1605 {
1707 /* is this object in the players inventory, or sub container 1606 /* is this object in the players inventory, or sub container
1708 * therein? 1607 * therein?
1709 */ 1608 */
1710 tmp = is_player_inv (op->env); 1609 tmp = op->in_player ();
1711 /* nope. Is this a container the player has opened? 1610 /* nope. Is this a container the player has opened?
1712 * If so, set tmp to that player. 1611 * If so, set tmp to that player.
1713 * IMO, searching through all the players will mostly 1612 * IMO, searching through all the players will mostly
1714 * likely be quicker than following op->env to the map, 1613 * likely be quicker than following op->env to the map,
1715 * and then searching the map for a player. 1614 * and then searching the map for a player.
1716 */ 1615 */
1717 if (!tmp) 1616 if (!tmp)
1718 { 1617 {
1719 for (pl = first_player; pl; pl = pl->next) 1618 for (pl = first_player; pl; pl = pl->next)
1720 if (pl->ob->container == op->env) 1619 if (pl->ob->container == op->env)
1620 {
1621 tmp = pl->ob;
1721 break; 1622 break;
1722 if (pl) 1623 }
1723 tmp = pl->ob;
1724 else
1725 tmp = NULL;
1726 } 1624 }
1727 1625
1728 if (i < op->nrof) 1626 if (i < op->nrof)
1729 { 1627 {
1730 sub_weight (op->env, op->weight * i); 1628 sub_weight (op->env, op->weight * i);
1731 op->nrof -= i; 1629 op->nrof -= i;
1732 if (tmp) 1630 if (tmp)
1733 {
1734 esrv_send_item (tmp, op); 1631 esrv_send_item (tmp, op);
1735 }
1736 } 1632 }
1737 else 1633 else
1738 { 1634 {
1739 remove_ob (op); 1635 op->remove ();
1740 op->nrof = 0; 1636 op->nrof = 0;
1741 if (tmp) 1637 if (tmp)
1742 {
1743 esrv_del_item (tmp->contr, op->count); 1638 esrv_del_item (tmp->contr, op->count);
1744 }
1745 } 1639 }
1746 } 1640 }
1747 else 1641 else
1748 { 1642 {
1749 object *above = op->above; 1643 object *above = op->above;
1750 1644
1751 if (i < op->nrof) 1645 if (i < op->nrof)
1752 op->nrof -= i; 1646 op->nrof -= i;
1753 else 1647 else
1754 { 1648 {
1755 remove_ob (op); 1649 op->remove ();
1756 op->nrof = 0; 1650 op->nrof = 0;
1757 } 1651 }
1758 1652
1759 /* Since we just removed op, op->above is null */ 1653 /* Since we just removed op, op->above is null */
1760 for (tmp = above; tmp != NULL; tmp = tmp->above) 1654 for (tmp = above; tmp; tmp = tmp->above)
1761 if (tmp->type == PLAYER) 1655 if (tmp->type == PLAYER)
1762 { 1656 {
1763 if (op->nrof) 1657 if (op->nrof)
1764 esrv_send_item (tmp, op); 1658 esrv_send_item (tmp, op);
1765 else 1659 else
… …
1769 1663
1770 if (op->nrof) 1664 if (op->nrof)
1771 return op; 1665 return op;
1772 else 1666 else
1773 { 1667 {
1774 free_object (op); 1668 op->destroy ();
1775 return NULL; 1669 return 0;
1776 } 1670 }
1777} 1671}
1778 1672
1779/* 1673/*
1780 * add_weight(object, weight) adds the specified weight to an object, 1674 * add_weight(object, weight) adds the specified weight to an object,
… …
1792 op->carrying += weight; 1686 op->carrying += weight;
1793 op = op->env; 1687 op = op->env;
1794 } 1688 }
1795} 1689}
1796 1690
1691object *
1692insert_ob_in_ob (object *op, object *where)
1693{
1694 if (!where)
1695 {
1696 char *dump = dump_object (op);
1697 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1698 free (dump);
1699 return op;
1700 }
1701
1702 if (where->head)
1703 {
1704 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1705 where = where->head;
1706 }
1707
1708 return where->insert (op);
1709}
1710
1797/* 1711/*
1798 * insert_ob_in_ob(op,environment): 1712 * env->insert (op)
1799 * This function inserts the object op in the linked list 1713 * This function inserts the object op in the linked list
1800 * inside the object environment. 1714 * inside the object environment.
1801 * 1715 *
1802 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1803 * the inventory at the last position or next to other objects of the same
1804 * type.
1805 * Frank: Now sorted by type, archetype and magic!
1806 *
1807 * The function returns now pointer to inserted item, and return value can 1716 * The function returns now pointer to inserted item, and return value can
1808 * be != op, if items are merged. -Tero 1717 * be != op, if items are merged. -Tero
1809 */ 1718 */
1810 1719
1811object * 1720object *
1812insert_ob_in_ob (object *op, object *where) 1721object::insert (object *op)
1813{ 1722{
1814 object * 1723 object *tmp, *otmp;
1815 tmp, *
1816 otmp;
1817 1724
1818 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1725 if (!QUERY_FLAG (op, FLAG_REMOVED))
1819 { 1726 op->remove ();
1820 dump_object (op);
1821 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1822 return op;
1823 }
1824
1825 if (where == NULL)
1826 {
1827 dump_object (op);
1828 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1829 return op;
1830 }
1831
1832 if (where->head)
1833 {
1834 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1835 where = where->head;
1836 }
1837 1727
1838 if (op->more) 1728 if (op->more)
1839 { 1729 {
1840 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1730 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1841 return op; 1731 return op;
… …
1843 1733
1844 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1734 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1845 CLEAR_FLAG (op, FLAG_REMOVED); 1735 CLEAR_FLAG (op, FLAG_REMOVED);
1846 if (op->nrof) 1736 if (op->nrof)
1847 { 1737 {
1848 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1738 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1849 if (CAN_MERGE (tmp, op)) 1739 if (object::can_merge (tmp, op))
1850 { 1740 {
1851 /* return the original object and remove inserted object 1741 /* return the original object and remove inserted object
1852 (client needs the original object) */ 1742 (client needs the original object) */
1853 tmp->nrof += op->nrof; 1743 tmp->nrof += op->nrof;
1854 /* Weight handling gets pretty funky. Since we are adding to 1744 /* Weight handling gets pretty funky. Since we are adding to
1855 * tmp->nrof, we need to increase the weight. 1745 * tmp->nrof, we need to increase the weight.
1856 */ 1746 */
1857 add_weight (where, op->weight * op->nrof); 1747 add_weight (this, op->weight * op->nrof);
1858 SET_FLAG (op, FLAG_REMOVED); 1748 SET_FLAG (op, FLAG_REMOVED);
1859 free_object (op); /* free the inserted object */ 1749 op->destroy (); /* free the inserted object */
1860 op = tmp; 1750 op = tmp;
1861 remove_ob (op); /* and fix old object's links */ 1751 op->remove (); /* and fix old object's links */
1862 CLEAR_FLAG (op, FLAG_REMOVED); 1752 CLEAR_FLAG (op, FLAG_REMOVED);
1863 break; 1753 break;
1864 } 1754 }
1865 1755
1866 /* I assume combined objects have no inventory 1756 /* I assume combined objects have no inventory
1867 * We add the weight - this object could have just been removed 1757 * We add the weight - this object could have just been removed
1868 * (if it was possible to merge). calling remove_ob will subtract 1758 * (if it was possible to merge). calling remove_ob will subtract
1869 * the weight, so we need to add it in again, since we actually do 1759 * the weight, so we need to add it in again, since we actually do
1870 * the linking below 1760 * the linking below
1871 */ 1761 */
1872 add_weight (where, op->weight * op->nrof); 1762 add_weight (this, op->weight * op->nrof);
1873 } 1763 }
1874 else 1764 else
1875 add_weight (where, (op->weight + op->carrying)); 1765 add_weight (this, (op->weight + op->carrying));
1876 1766
1877 otmp = is_player_inv (where); 1767 otmp = this->in_player ();
1878 if (otmp && otmp->contr != NULL) 1768 if (otmp && otmp->contr)
1879 {
1880 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1769 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1881 fix_player (otmp); 1770 fix_player (otmp);
1882 }
1883 1771
1884 op->map = NULL; 1772 op->map = 0;
1885 op->env = where; 1773 op->env = this;
1886 op->above = NULL; 1774 op->above = 0;
1887 op->below = NULL; 1775 op->below = 0;
1888 op->x = 0, op->y = 0; 1776 op->x = 0, op->y = 0;
1889 1777
1890 /* reset the light list and los of the players on the map */ 1778 /* reset the light list and los of the players on the map */
1891 if ((op->glow_radius != 0) && where->map) 1779 if ((op->glow_radius != 0) && map)
1892 { 1780 {
1893#ifdef DEBUG_LIGHTS 1781#ifdef DEBUG_LIGHTS
1894 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1782 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1895#endif /* DEBUG_LIGHTS */ 1783#endif /* DEBUG_LIGHTS */
1896 if (MAP_DARKNESS (where->map)) 1784 if (MAP_DARKNESS (map))
1897 update_all_los (where->map, where->x, where->y); 1785 update_all_los (map, x, y);
1898 } 1786 }
1899 1787
1900 /* Client has no idea of ordering so lets not bother ordering it here. 1788 /* Client has no idea of ordering so lets not bother ordering it here.
1901 * It sure simplifies this function... 1789 * It sure simplifies this function...
1902 */ 1790 */
1903 if (where->inv == NULL) 1791 if (!inv)
1904 where->inv = op; 1792 inv = op;
1905 else 1793 else
1906 { 1794 {
1907 op->below = where->inv; 1795 op->below = inv;
1908 op->below->above = op; 1796 op->below->above = op;
1909 where->inv = op; 1797 inv = op;
1910 } 1798 }
1799
1911 return op; 1800 return op;
1912} 1801}
1913 1802
1914/* 1803/*
1915 * Checks if any objects has a move_type that matches objects 1804 * Checks if any objects has a move_type that matches objects
… …
1933 */ 1822 */
1934 1823
1935int 1824int
1936check_move_on (object *op, object *originator) 1825check_move_on (object *op, object *originator)
1937{ 1826{
1938 object * 1827 object *tmp;
1939 tmp; 1828 maptile *m = op->map;
1940 tag_t
1941 tag;
1942 mapstruct *
1943 m = op->map;
1944 int
1945 x = op->x, y = op->y; 1829 int x = op->x, y = op->y;
1946 1830
1947 MoveType 1831 MoveType move_on, move_slow, move_block;
1948 move_on,
1949 move_slow,
1950 move_block;
1951 1832
1952 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1833 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1953 return 0; 1834 return 0;
1954
1955 tag = op->count;
1956 1835
1957 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1836 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1958 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1837 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1959 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1838 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1960 1839
… …
2021 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1900 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2022 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1901 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2023 { 1902 {
2024 move_apply (tmp, op, originator); 1903 move_apply (tmp, op, originator);
2025 1904
2026 if (was_destroyed (op, tag)) 1905 if (op->destroyed ())
2027 return 1; 1906 return 1;
2028 1907
2029 /* what the person/creature stepped onto has moved the object 1908 /* what the person/creature stepped onto has moved the object
2030 * someplace new. Don't process any further - if we did, 1909 * someplace new. Don't process any further - if we did,
2031 * have a feeling strange problems would result. 1910 * have a feeling strange problems would result.
… …
2043 * a matching archetype at the given map and coordinates. 1922 * a matching archetype at the given map and coordinates.
2044 * The first matching object is returned, or NULL if none. 1923 * The first matching object is returned, or NULL if none.
2045 */ 1924 */
2046 1925
2047object * 1926object *
2048present_arch (const archetype *at, mapstruct *m, int x, int y) 1927present_arch (const archetype *at, maptile *m, int x, int y)
2049{ 1928{
2050 object * 1929 object *
2051 tmp; 1930 tmp;
2052 1931
2053 if (m == NULL || out_of_map (m, x, y)) 1932 if (m == NULL || out_of_map (m, x, y))
… …
2066 * a matching type variable at the given map and coordinates. 1945 * a matching type variable at the given map and coordinates.
2067 * The first matching object is returned, or NULL if none. 1946 * The first matching object is returned, or NULL if none.
2068 */ 1947 */
2069 1948
2070object * 1949object *
2071present (unsigned char type, mapstruct *m, int x, int y) 1950present (unsigned char type, maptile *m, int x, int y)
2072{ 1951{
2073 object * 1952 object *
2074 tmp; 1953 tmp;
2075 1954
2076 if (out_of_map (m, x, y)) 1955 if (out_of_map (m, x, y))
… …
2216 * the archetype because that isn't correct if the monster has been 2095 * the archetype because that isn't correct if the monster has been
2217 * customized, changed states, etc. 2096 * customized, changed states, etc.
2218 */ 2097 */
2219 2098
2220int 2099int
2221find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2100find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2222{ 2101{
2223 int 2102 int
2224 i, 2103 i,
2225 index = 0, flag; 2104 index = 0, flag;
2226 static int 2105 static int
… …
2238 * if the space being examined only has a wall to the north and empty 2117 * if the space being examined only has a wall to the north and empty
2239 * spaces in all the other directions, this will reduce the search space 2118 * spaces in all the other directions, this will reduce the search space
2240 * to only the spaces immediately surrounding the target area, and 2119 * to only the spaces immediately surrounding the target area, and
2241 * won't look 2 spaces south of the target space. 2120 * won't look 2 spaces south of the target space.
2242 */ 2121 */
2243 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2122 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2244 stop = maxfree[i]; 2123 stop = maxfree[i];
2245 } 2124 }
2125
2246 if (!index) 2126 if (!index)
2247 return -1; 2127 return -1;
2128
2248 return altern[RANDOM () % index]; 2129 return altern[RANDOM () % index];
2249} 2130}
2250 2131
2251/* 2132/*
2252 * find_first_free_spot(archetype, mapstruct, x, y) works like 2133 * find_first_free_spot(archetype, maptile, x, y) works like
2253 * find_free_spot(), but it will search max number of squares. 2134 * find_free_spot(), but it will search max number of squares.
2254 * But it will return the first available spot, not a random choice. 2135 * But it will return the first available spot, not a random choice.
2255 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2136 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2256 */ 2137 */
2257 2138
2258int 2139int
2259find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2140find_first_free_spot (const object *ob, maptile *m, int x, int y)
2260{ 2141{
2261 int 2142 int
2262 i; 2143 i;
2263 2144
2264 for (i = 0; i < SIZEOFFREE; i++) 2145 for (i = 0; i < SIZEOFFREE; i++)
… …
2328 * because we have to know what movement the thing looking to move 2209 * because we have to know what movement the thing looking to move
2329 * there is capable of. 2210 * there is capable of.
2330 */ 2211 */
2331 2212
2332int 2213int
2333find_dir (mapstruct *m, int x, int y, object *exclude) 2214find_dir (maptile *m, int x, int y, object *exclude)
2334{ 2215{
2335 int 2216 int
2336 i, 2217 i,
2337 max = SIZEOFFREE, mflags; 2218 max = SIZEOFFREE, mflags;
2338 2219
2339 sint16 nx, ny; 2220 sint16 nx, ny;
2340 object * 2221 object *
2341 tmp; 2222 tmp;
2342 mapstruct * 2223 maptile *
2343 mp; 2224 mp;
2344 2225
2345 MoveType blocked, move_type; 2226 MoveType blocked, move_type;
2346 2227
2347 if (exclude && exclude->head) 2228 if (exclude && exclude->head)
… …
2555 * Modified to be map tile aware -.MSW 2436 * Modified to be map tile aware -.MSW
2556 */ 2437 */
2557 2438
2558 2439
2559int 2440int
2560can_see_monsterP (mapstruct *m, int x, int y, int dir) 2441can_see_monsterP (maptile *m, int x, int y, int dir)
2561{ 2442{
2562 sint16 dx, dy; 2443 sint16 dx, dy;
2563 int 2444 int
2564 mflags; 2445 mflags;
2565 2446
… …
2614 * create clone from object to another 2495 * create clone from object to another
2615 */ 2496 */
2616object * 2497object *
2617object_create_clone (object *asrc) 2498object_create_clone (object *asrc)
2618{ 2499{
2619 object *
2620 dst = NULL, *tmp, *src, *part, *prev, *item; 2500 object *dst = 0, *tmp, *src, *part, *prev, *item;
2621 2501
2622 if (!asrc) 2502 if (!asrc)
2623 return NULL; 2503 return 0;
2504
2624 src = asrc; 2505 src = asrc;
2625 if (src->head) 2506 if (src->head)
2626 src = src->head; 2507 src = src->head;
2627 2508
2628 prev = NULL; 2509 prev = 0;
2629 for (part = src; part; part = part->more) 2510 for (part = src; part; part = part->more)
2630 { 2511 {
2631 tmp = get_object (); 2512 tmp = part->clone ();
2632 copy_object (part, tmp);
2633 tmp->x -= src->x; 2513 tmp->x -= src->x;
2634 tmp->y -= src->y; 2514 tmp->y -= src->y;
2515
2635 if (!part->head) 2516 if (!part->head)
2636 { 2517 {
2637 dst = tmp; 2518 dst = tmp;
2638 tmp->head = NULL; 2519 tmp->head = 0;
2639 } 2520 }
2640 else 2521 else
2641 { 2522 {
2642 tmp->head = dst; 2523 tmp->head = dst;
2643 } 2524 }
2525
2644 tmp->more = NULL; 2526 tmp->more = 0;
2527
2645 if (prev) 2528 if (prev)
2646 prev->more = tmp; 2529 prev->more = tmp;
2530
2647 prev = tmp; 2531 prev = tmp;
2648 } 2532 }
2649 2533
2650 /*** copy inventory ***/
2651 for (item = src->inv; item; item = item->below) 2534 for (item = src->inv; item; item = item->below)
2652 {
2653 (void) insert_ob_in_ob (object_create_clone (item), dst); 2535 insert_ob_in_ob (object_create_clone (item), dst);
2654 }
2655 2536
2656 return dst; 2537 return dst;
2657} 2538}
2658 2539
2659/* return true if the object was destroyed, 0 otherwise */
2660int
2661was_destroyed (const object *op, tag_t old_tag)
2662{
2663 /* checking for FLAG_FREED isn't necessary, but makes this function more
2664 * robust */
2665 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2666}
2667
2668/* GROS - Creates an object using a string representing its content. */ 2540/* GROS - Creates an object using a string representing its content. */
2669
2670/* Basically, we save the content of the string to a temp file, then call */ 2541/* Basically, we save the content of the string to a temp file, then call */
2671
2672/* load_object on it. I admit it is a highly inefficient way to make things, */ 2542/* load_object on it. I admit it is a highly inefficient way to make things, */
2673
2674/* but it was simple to make and allows reusing the load_object function. */ 2543/* but it was simple to make and allows reusing the load_object function. */
2675
2676/* Remember not to use load_object_str in a time-critical situation. */ 2544/* Remember not to use load_object_str in a time-critical situation. */
2677
2678/* Also remember that multiparts objects are not supported for now. */ 2545/* Also remember that multiparts objects are not supported for now. */
2679 2546
2680object * 2547object *
2681load_object_str (const char *obstr) 2548load_object_str (const char *obstr)
2682{ 2549{
2683 object * 2550 object *op;
2684 op;
2685 char
2686 filename[MAX_BUF]; 2551 char filename[MAX_BUF];
2687 2552
2688 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2553 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2689 2554
2690 FILE *
2691 tempfile = fopen (filename, "w"); 2555 FILE *tempfile = fopen (filename, "w");
2692 2556
2693 if (tempfile == NULL) 2557 if (tempfile == NULL)
2694 { 2558 {
2695 LOG (llevError, "Error - Unable to access load object temp file\n"); 2559 LOG (llevError, "Error - Unable to access load object temp file\n");
2696 return NULL; 2560 return NULL;
2697 } 2561 }
2698 2562
2699 fprintf (tempfile, obstr); 2563 fprintf (tempfile, obstr);
2700 fclose (tempfile); 2564 fclose (tempfile);
2701 2565
2702 op = get_object (); 2566 op = object::create ();
2703 2567
2704 object_thawer thawer (filename); 2568 object_thawer thawer (filename);
2705 2569
2706 if (thawer) 2570 if (thawer)
2707 load_object (thawer, op, 0); 2571 load_object (thawer, op, 0);
… …
2717 * returns NULL if no match. 2581 * returns NULL if no match.
2718 */ 2582 */
2719object * 2583object *
2720find_obj_by_type_subtype (const object *who, int type, int subtype) 2584find_obj_by_type_subtype (const object *who, int type, int subtype)
2721{ 2585{
2722 object * 2586 object *tmp;
2723 tmp;
2724 2587
2725 for (tmp = who->inv; tmp; tmp = tmp->below) 2588 for (tmp = who->inv; tmp; tmp = tmp->below)
2726 if (tmp->type == type && tmp->subtype == subtype) 2589 if (tmp->type == type && tmp->subtype == subtype)
2727 return tmp; 2590 return tmp;
2728 2591
… …
2736 * do the desired thing. 2599 * do the desired thing.
2737 */ 2600 */
2738key_value * 2601key_value *
2739get_ob_key_link (const object *ob, const char *key) 2602get_ob_key_link (const object *ob, const char *key)
2740{ 2603{
2741 key_value * 2604 key_value *link;
2742 link;
2743 2605
2744 for (link = ob->key_values; link != NULL; link = link->next) 2606 for (link = ob->key_values; link != NULL; link = link->next)
2745 {
2746 if (link->key == key) 2607 if (link->key == key)
2747 {
2748 return link; 2608 return link;
2749 }
2750 }
2751 2609
2752 return NULL; 2610 return NULL;
2753} 2611}
2754 2612
2755/* 2613/*

Diff Legend

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