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.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <loader.h> 33#include <loader.h>
35 34
35#include <bitset>
36
36int nrofallocobjects = 0; 37int nrofallocobjects = 0;
37static UUID uuid; 38static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
39 40
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 41object *active_objects; /* List of active objects that need to be processed */
42 42
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 45};
… …
106 _exit (1); 106 _exit (1);
107 } 107 }
108 108
109 uuid.seq = uid; 109 uuid.seq = uid;
110 write_uuid (); 110 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112 fclose (fp); 112 fclose (fp);
113} 113}
114 114
115UUID 115UUID
116gen_uuid () 116gen_uuid ()
… …
185 * 185 *
186 * 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
187 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
188 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
189 * 189 *
190 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
191 * 191 *
192 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
193 * check weight 193 * check weight
194 */ 194 */
195 195
196bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
197{ 197{
198 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
199 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)
200 return 0; 204 return 0;
201 205
202 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
203 return 0;
204
205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
207 * used to store nrof). 209 * used to store nrof).
208 */ 210 */
209 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
220 222
221 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223 225
224 226
225 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
226 * being locked in inventory should prevent merging. 228 || ob1->arch != ob2->arch
227 * 0x4 in flags3 is CLIENT_SENT
228 */
229 if ((ob1->arch != ob2->arch) ||
230 (ob1->flags[0] != ob2->flags[0]) ||
231 (ob1->flags[1] != ob2->flags[1]) ||
232 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234 (ob1->name != ob2->name) || 229 || ob1->name != ob2->name
235 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
236 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
237 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
238 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
241 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
242 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
243 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
244 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
245 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
246 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
247 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
248 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
249 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
250 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
251 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
252 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
253 (ob1->move_on != ob2->move_on) || 248 || ob1->move_on != ob2->move_on
254 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
255 return 0; 252 return 0;
256 253
257 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
258 * check all objects in the inventory. 255 * check all objects in the inventory.
259 */ 256 */
… …
262 /* if one object has inventory but the other doesn't, not equiv */ 259 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0; 261 return 0;
265 262
266 /* Now check to see if the two inventory objects could merge */ 263 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
268 return 0; 265 return 0;
269 266
270 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 268 * if it is valid.
272 */ 269 */
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 373 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 374 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 375 * The result of the dump is stored in the static global errmsg array.
379 */ 376 */
380 377
381void 378char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 379dump_object (object *op)
437{ 380{
438 if (op == NULL) 381 if (!op)
439 { 382 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 383
447void 384 object_freezer freezer;
448dump_all_objects (void) 385 save_object (freezer, op, 3);
449{ 386 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 387}
458 388
459/* 389/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 390 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 391 * multi-object 1 which is closest to the second object.
… …
481 */ 411 */
482 412
483object * 413object *
484find_object (tag_t i) 414find_object (tag_t i)
485{ 415{
486 object *op; 416 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 417 if (op->count == i)
490 break; 418 return op;
419
491 return op; 420 return 0;
492} 421}
493 422
494/* 423/*
495 * Returns the first object which has a name equal to the argument. 424 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 425 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 430find_object_name (const char *str)
502{ 431{
503 shstr_cmp str_ (str); 432 shstr_cmp str_ (str);
504 object *op; 433 object *op;
505 434
506 for (op = objects; op != NULL; op = op->next) 435 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 436 if (op->name == str_)
508 break; 437 break;
509 438
510 return op; 439 return op;
511} 440}
512 441
513void 442void
514free_all_object_data () 443free_all_object_data ()
515{ 444{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 445 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 446}
539 447
540/* 448/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 449 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 450 * skill and experience objects.
… …
612 520
613 /* What is not cleared is next, prev, and count */ 521 /* What is not cleared is next, prev, and count */
614 522
615 expmul = 1.0; 523 expmul = 1.0;
616 face = blank_face; 524 face = blank_face;
617 attacked_by_count = -1;
618 525
619 if (settings.casting_time) 526 if (settings.casting_time)
620 casting_time = -1; 527 casting_time = -1;
621} 528}
622 529
623void object::clone (object *destination)
624{
625 *(object_copy *)destination = *this;
626 *(object_pod *)destination = *this;
627
628 if (self || cb)
629 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
630}
631
632/* 530/*
633 * copy object first frees everything allocated by the second object, 531 * copy_to first frees everything allocated by the dst object,
634 * and then copies the contends of the first object into the second 532 * and then copies the contents of itself into the second
635 * object, allocating what needs to be allocated. Basically, any 533 * object, allocating what needs to be allocated. Basically, any
636 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 534 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
637 * if the first object is freed, the pointers in the new object 535 * if the first object is freed, the pointers in the new object
638 * will point at garbage. 536 * will point at garbage.
639 */ 537 */
640void 538void
641copy_object (object *op2, object *op) 539object::copy_to (object *dst)
642{ 540{
643 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 541 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 542 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645 543
646 op2->clone (op); 544 *(object_copy *)dst = *this;
545 *(object_pod *)dst = *this;
546
547 if (self || cb)
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
647 549
648 if (is_freed) 550 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 551 SET_FLAG (dst, FLAG_FREED);
552
650 if (is_removed) 553 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 554 SET_FLAG (dst, FLAG_REMOVED);
652 555
653 if (op2->speed < 0) 556 if (speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 557 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655 558
656 /* Copy over key_values, if any. */ 559 /* Copy over key_values, if any. */
657 if (op2->key_values) 560 if (key_values)
658 { 561 {
659 key_value *tail = 0; 562 key_value *tail = 0;
660 key_value *i; 563 key_value *i;
661 564
662 op->key_values = 0; 565 dst->key_values = 0;
663 566
664 for (i = op2->key_values; i; i = i->next) 567 for (i = key_values; i; i = i->next)
665 { 568 {
666 key_value *new_link = new key_value; 569 key_value *new_link = new key_value;
667 570
668 new_link->next = 0; 571 new_link->next = 0;
669 new_link->key = i->key; 572 new_link->key = i->key;
670 new_link->value = i->value; 573 new_link->value = i->value;
671 574
672 /* Try and be clever here, too. */ 575 /* Try and be clever here, too. */
673 if (!op->key_values) 576 if (!dst->key_values)
674 { 577 {
675 op->key_values = new_link; 578 dst->key_values = new_link;
676 tail = new_link; 579 tail = new_link;
677 } 580 }
678 else 581 else
679 { 582 {
680 tail->next = new_link; 583 tail->next = new_link;
681 tail = new_link; 584 tail = new_link;
682 } 585 }
683 } 586 }
684 } 587 }
685 588
686 update_ob_speed (op); 589 update_ob_speed (dst);
590}
591
592object *
593object::clone ()
594{
595 object *neu = create ();
596 copy_to (neu);
597 return neu;
687} 598}
688 599
689/* 600/*
690 * If an object with the IS_TURNABLE() flag needs to be turned due 601 * If an object with the IS_TURNABLE() flag needs to be turned due
691 * to the closest player being on the other side, this function can 602 * to the closest player being on the other side, this function can
… …
896 update_now = 1; 807 update_now = 1;
897 808
898 if ((move_slow | op->move_slow) != move_slow) 809 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1; 810 update_now = 1;
900 } 811 }
812
901 /* if the object is being removed, we can't make intelligent 813 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 814 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 815 * that is being removed.
904 */ 816 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 817 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
917 829
918 if (op->more != NULL) 830 if (op->more != NULL)
919 update_object (op->more, action); 831 update_object (op->more, action);
920} 832}
921 833
922static unordered_vector<object *> mortals; 834object::vector object::mortals;
835object::vector object::objects; // not yet used
836object *object::first;
923 837
924void object::free_mortals () 838void object::free_mortals ()
925{ 839{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 840 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 841 if ((*i)->refcnt)
928 ++i; // further delay freeing 842 ++i; // further delay freeing
929 else 843 else
930 { 844 {
931 delete *i; 845 delete *i;
932 mortals.erase (i); 846 mortals.erase (i);
933 } 847 }
934
935 static int lastmortals = 0;//D
936
937 if (mortals.size() != lastmortals)//D
938 {
939 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 }
942} 848}
943 849
944object::object () 850object::object ()
945{ 851{
946 SET_FLAG (this, FLAG_REMOVED); 852 SET_FLAG (this, FLAG_REMOVED);
947 853
948 expmul = 1.0; 854 expmul = 1.0;
949 face = blank_face; 855 face = blank_face;
950 attacked_by_count = -1;
951} 856}
952 857
953object::~object () 858object::~object ()
954{ 859{
955 free_key_values (this); 860 free_key_values (this);
… …
959{ 864{
960 count = ++ob_count; 865 count = ++ob_count;
961 uuid = gen_uuid (); 866 uuid = gen_uuid ();
962 867
963 prev = 0; 868 prev = 0;
964 next = objects; 869 next = object::first;
965 870
966 if (objects) 871 if (object::first)
967 objects->prev = this; 872 object::first->prev = this;
968 873
969 objects = this; 874 object::first = this;
970} 875}
971 876
972void object::unlink () 877void object::unlink ()
973{ 878{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 879 if (this == object::first)
978 objects = next; 880 object::first = next;
979 881
980 /* Remove this object from the list of used objects */ 882 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 883 if (prev) prev->next = next;
982 if (next) next->prev = prev; 884 if (next) next->prev = prev;
983 885
… …
997 * it from the list of used objects, and puts it on the list of 899 * it from the list of used objects, and puts it on the list of
998 * free objects. The IS_FREED() flag is set in the object. 900 * free objects. The IS_FREED() flag is set in the object.
999 * The object must have been removed by remove_ob() first for 901 * The object must have been removed by remove_ob() first for
1000 * this function to succeed. 902 * this function to succeed.
1001 * 903 *
1002 * If free_inventory is set, free inventory as well. Else drop items in 904 * If destroy_inventory is set, free inventory as well. Else drop items in
1003 * inventory to the ground. 905 * inventory to the ground.
1004 */ 906 */
1005void object::free (bool free_inventory) 907void object::destroy (bool destroy_inventory)
1006{ 908{
1007 if (QUERY_FLAG (this, FLAG_FREED)) 909 if (QUERY_FLAG (this, FLAG_FREED))
1008 return; 910 return;
1009 911
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 912 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011 remove_friendly_object (this); 913 remove_friendly_object (this);
1012 914
1013 if (!QUERY_FLAG (this, FLAG_REMOVED)) 915 if (!QUERY_FLAG (this, FLAG_REMOVED))
1014 remove_ob (this); 916 remove ();
1015 917
1016 SET_FLAG (this, FLAG_FREED); 918 SET_FLAG (this, FLAG_FREED);
1017 919
1018 if (more) 920 if (more)
1019 { 921 {
1020 more->free (free_inventory); 922 more->destroy (destroy_inventory);
1021 more = 0; 923 more = 0;
1022 } 924 }
1023 925
1024 if (inv) 926 if (inv)
1025 { 927 {
1026 /* Only if the space blocks everything do we not process - 928 /* Only if the space blocks everything do we not process -
1027 * if some form of movement is allowed, let objects 929 * if some form of movement is allowed, let objects
1028 * drop on that space. 930 * drop on that space.
1029 */ 931 */
1030 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 932 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1031 { 933 {
1032 object *op = inv; 934 object *op = inv;
1033 935
1034 while (op) 936 while (op)
1035 { 937 {
1036 object *tmp = op->below; 938 object *tmp = op->below;
1037 op->free (free_inventory); 939 op->destroy (destroy_inventory);
1038 op = tmp; 940 op = tmp;
1039 } 941 }
1040 } 942 }
1041 else 943 else
1042 { /* Put objects in inventory onto this space */ 944 { /* Put objects in inventory onto this space */
… …
1044 946
1045 while (op) 947 while (op)
1046 { 948 {
1047 object *tmp = op->below; 949 object *tmp = op->below;
1048 950
1049 remove_ob (op); 951 op->remove ();
1050 952
1051 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 953 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1052 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 954 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1053 free_object (op); 955 op->destroy ();
1054 else 956 else
1055 { 957 {
1056 op->x = x; 958 op->x = x;
1057 op->y = y; 959 op->y = y;
1058 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 960 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1061 op = tmp; 963 op = tmp;
1062 } 964 }
1063 } 965 }
1064 } 966 }
1065 967
968 // hack to ensure that freed objects still have a valid map
969 {
970 static maptile *freed_map; // freed objects are moved here to avoid crashes
971
972 if (!freed_map)
973 {
974 freed_map = new maptile;
975
976 freed_map->name = "/internal/freed_objects_map";
977 freed_map->width = 3;
978 freed_map->height = 3;
979
980 freed_map->allocate ();
981 }
982
983 map = freed_map;
984 x = 1;
985 y = 1;
986 }
987
988 // clear those pointers that likely might have circular references to us
1066 owner = 0; 989 owner = 0;
990 enemy = 0;
991 attacked_by = 0;
992
993 // only relevant for players(?), but make sure of it anyways
994 contr = 0;
1067 995
1068 /* Remove object from the active list */ 996 /* Remove object from the active list */
1069 speed = 0; 997 speed = 0;
1070 update_ob_speed (this); 998 update_ob_speed (this);
1071 999
… …
1076 1004
1077/* 1005/*
1078 * sub_weight() recursively (outwards) subtracts a number from the 1006 * sub_weight() recursively (outwards) subtracts a number from the
1079 * weight of an object (and what is carried by it's environment(s)). 1007 * weight of an object (and what is carried by it's environment(s)).
1080 */ 1008 */
1081
1082void 1009void
1083sub_weight (object *op, signed long weight) 1010sub_weight (object *op, signed long weight)
1084{ 1011{
1085 while (op != NULL) 1012 while (op != NULL)
1086 { 1013 {
1087 if (op->type == CONTAINER) 1014 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1015 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1016
1091 op->carrying -= weight; 1017 op->carrying -= weight;
1092 op = op->env; 1018 op = op->env;
1093 } 1019 }
1094} 1020}
1095 1021
1096/* remove_ob(op): 1022/* op->remove ():
1097 * This function removes the object op from the linked list of objects 1023 * This function removes the object op from the linked list of objects
1098 * which it is currently tied to. When this function is done, the 1024 * which it is currently tied to. When this function is done, the
1099 * object will have no environment. If the object previously had an 1025 * object will have no environment. If the object previously had an
1100 * environment, the x and y coordinates will be updated to 1026 * environment, the x and y coordinates will be updated to
1101 * the previous environment. 1027 * the previous environment.
1102 * Beware: This function is called from the editor as well! 1028 * Beware: This function is called from the editor as well!
1103 */ 1029 */
1104
1105void 1030void
1106remove_ob (object *op) 1031object::remove ()
1107{ 1032{
1033 object *tmp, *last = 0;
1108 object * 1034 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1035
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1036 int check_walk_off;
1118 mapstruct *
1119 m;
1120 1037
1121 sint16
1122 x,
1123 y;
1124
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1038 if (QUERY_FLAG (this, FLAG_REMOVED))
1126 return; 1039 return;
1127 1040
1128 SET_FLAG (op, FLAG_REMOVED); 1041 SET_FLAG (this, FLAG_REMOVED);
1129 1042
1130 if (op->more != NULL) 1043 if (more)
1131 remove_ob (op->more); 1044 more->remove ();
1132 1045
1133 /* 1046 /*
1134 * In this case, the object to be removed is in someones 1047 * In this case, the object to be removed is in someones
1135 * inventory. 1048 * inventory.
1136 */ 1049 */
1137 if (op->env != NULL) 1050 if (env)
1138 { 1051 {
1139 if (op->nrof) 1052 if (nrof)
1140 sub_weight (op->env, op->weight * op->nrof); 1053 sub_weight (env, weight * nrof);
1141 else 1054 else
1142 sub_weight (op->env, op->weight + op->carrying); 1055 sub_weight (env, weight + carrying);
1143 1056
1144 /* NO_FIX_PLAYER is set when a great many changes are being 1057 /* NO_FIX_PLAYER is set when a great many changes are being
1145 * made to players inventory. If set, avoiding the call 1058 * made to players inventory. If set, avoiding the call
1146 * to save cpu time. 1059 * to save cpu time.
1147 */ 1060 */
1148 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1061 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1149 fix_player (otmp); 1062 fix_player (otmp);
1150 1063
1151 if (op->above != NULL) 1064 if (above != NULL)
1152 op->above->below = op->below; 1065 above->below = below;
1153 else 1066 else
1154 op->env->inv = op->below; 1067 env->inv = below;
1155 1068
1156 if (op->below != NULL) 1069 if (below != NULL)
1157 op->below->above = op->above; 1070 below->above = above;
1158 1071
1159 /* we set up values so that it could be inserted into 1072 /* we set up values so that it could be inserted into
1160 * the map, but we don't actually do that - it is up 1073 * the map, but we don't actually do that - it is up
1161 * to the caller to decide what we want to do. 1074 * to the caller to decide what we want to do.
1162 */ 1075 */
1163 op->x = op->env->x, op->y = op->env->y; 1076 x = env->x, y = env->y;
1164 op->map = op->env->map; 1077 map = env->map;
1165 op->above = NULL, op->below = NULL; 1078 above = 0, below = 0;
1166 op->env = NULL; 1079 env = 0;
1167 } 1080 }
1168 else if (op->map) 1081 else if (map)
1169 { 1082 {
1170 x = op->x;
1171 y = op->y;
1172 m = get_map_from_coord (op->map, &x, &y);
1173
1174 if (!m)
1175 {
1176 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177 op->map->path, op->x, op->y);
1178 /* in old days, we used to set x and y to 0 and continue.
1179 * it seems if we get into this case, something is probablye
1180 * screwed up and should be fixed.
1181 */
1182 abort ();
1183 }
1184
1185 if (op->map != m)
1186 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187 op->map->path, m->path, op->x, op->y, x, y);
1188
1189 /* Re did the following section of code - it looks like it had 1083 /* Re did the following section of code - it looks like it had
1190 * lots of logic for things we no longer care about 1084 * lots of logic for things we no longer care about
1191 */ 1085 */
1192 1086
1193 /* link the object above us */ 1087 /* link the object above us */
1194 if (op->above) 1088 if (above)
1195 op->above->below = op->below; 1089 above->below = below;
1196 else 1090 else
1197 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1091 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1198 1092
1199 /* Relink the object below us, if there is one */ 1093 /* Relink the object below us, if there is one */
1200 if (op->below) 1094 if (below)
1201 op->below->above = op->above; 1095 below->above = above;
1202 else 1096 else
1203 { 1097 {
1204 /* Nothing below, which means we need to relink map object for this space 1098 /* Nothing below, which means we need to relink map object for this space
1205 * use translated coordinates in case some oddness with map tiling is 1099 * use translated coordinates in case some oddness with map tiling is
1206 * evident 1100 * evident
1207 */ 1101 */
1208 if (GET_MAP_OB (m, x, y) != op) 1102 if (GET_MAP_OB (map, x, y) != this)
1209 { 1103 {
1210 dump_object (op); 1104 char *dump = dump_object (this);
1211 LOG (llevError, 1105 LOG (llevError,
1212 "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); 1106 "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);
1107 free (dump);
1213 dump_object (GET_MAP_OB (m, x, y)); 1108 dump = dump_object (GET_MAP_OB (map, x, y));
1214 LOG (llevError, "%s\n", errmsg); 1109 LOG (llevError, "%s\n", dump);
1110 free (dump);
1215 } 1111 }
1216 1112
1217 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1113 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1218 } 1114 }
1219 1115
1220 op->above = 0; 1116 above = 0;
1221 op->below = 0; 1117 below = 0;
1222 1118
1223 if (op->map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
1224 return; 1120 return;
1225 1121
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1122 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228 1123
1229 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1124 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1230 { 1125 {
1231 /* No point updating the players look faces if he is the object 1126 /* No point updating the players look faces if he is the object
1232 * being removed. 1127 * being removed.
1233 */ 1128 */
1234 1129
1235 if (tmp->type == PLAYER && tmp != op) 1130 if (tmp->type == PLAYER && tmp != this)
1236 { 1131 {
1237 /* If a container that the player is currently using somehow gets 1132 /* If a container that the player is currently using somehow gets
1238 * removed (most likely destroyed), update the player view 1133 * removed (most likely destroyed), update the player view
1239 * appropriately. 1134 * appropriately.
1240 */ 1135 */
1241 if (tmp->container == op) 1136 if (tmp->container == this)
1242 { 1137 {
1243 CLEAR_FLAG (op, FLAG_APPLIED); 1138 CLEAR_FLAG (this, FLAG_APPLIED);
1244 tmp->container = NULL; 1139 tmp->container = 0;
1245 } 1140 }
1246 1141
1247 tmp->contr->socket.update_look = 1; 1142 tmp->contr->socket->update_look = 1;
1248 } 1143 }
1249 1144
1250 /* See if player moving off should effect something */ 1145 /* See if player moving off should effect something */
1251 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1146 if (check_walk_off
1147 && ((move_type & tmp->move_off)
1148 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1252 { 1149 {
1253 move_apply (tmp, op, NULL); 1150 move_apply (tmp, this, 0);
1254 1151
1255 if (was_destroyed (op, tag)) 1152 if (destroyed ())
1256 {
1257 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1153 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1258 }
1259 } 1154 }
1260 1155
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1156 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1157
1263 if (tmp->above == tmp) 1158 if (tmp->above == tmp)
1264 tmp->above = NULL; 1159 tmp->above = 0;
1265 1160
1266 last = tmp; 1161 last = tmp;
1267 } 1162 }
1268 1163
1269 /* last == NULL of there are no objects on this space */ 1164 /* last == NULL of there are no objects on this space */
1270 if (last == NULL) 1165 if (!last)
1271 { 1166 {
1272 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1167 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1168 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1274 * those out anyways, and if there are any flags set right now, they won't 1169 * those out anyways, and if there are any flags set right now, they won't
1275 * be correct anyways. 1170 * be correct anyways.
1276 */ 1171 */
1277 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1172 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1278 update_position (op->map, op->x, op->y); 1173 update_position (map, x, y);
1279 } 1174 }
1280 else 1175 else
1281 update_object (last, UP_OBJ_REMOVE); 1176 update_object (last, UP_OBJ_REMOVE);
1282 1177
1283 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1178 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284 update_all_los (op->map, op->x, op->y); 1179 update_all_los (map, x, y);
1285 } 1180 }
1286} 1181}
1287 1182
1288/* 1183/*
1289 * merge_ob(op,top): 1184 * merge_ob(op,top):
… …
1304 1199
1305 for (; top != NULL; top = top->below) 1200 for (; top != NULL; top = top->below)
1306 { 1201 {
1307 if (top == op) 1202 if (top == op)
1308 continue; 1203 continue;
1309 if (CAN_MERGE (op, top)) 1204
1205 if (object::can_merge (op, top))
1310 { 1206 {
1311 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1312 1208
1313/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1314 op->weight = 0; /* Don't want any adjustements now */ 1210 op->weight = 0; /* Don't want any adjustements now */
1315 remove_ob (op); 1211 op->destroy ();
1316 free_object (op);
1317 return top; 1212 return top;
1318 } 1213 }
1319 } 1214 }
1320 1215
1321 return NULL; 1216 return 0;
1322} 1217}
1323 1218
1324/* 1219/*
1325 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1220 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1326 * job preparing multi-part monsters 1221 * job preparing multi-part monsters
1327 */ 1222 */
1328object * 1223object *
1329insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1224insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1330{ 1225{
1331 object *tmp; 1226 object *tmp;
1332 1227
1333 if (op->head) 1228 if (op->head)
1334 op = op->head; 1229 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1257 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1258 * just 'op' otherwise
1364 */ 1259 */
1365 1260
1366object * 1261object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1262insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1263{
1369 object *tmp, *top, *floor = NULL; 1264 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1265 sint16 x, y;
1371 1266
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1267 if (QUERY_FLAG (op, FLAG_FREED))
… …
1375 return NULL; 1270 return NULL;
1376 } 1271 }
1377 1272
1378 if (m == NULL) 1273 if (m == NULL)
1379 { 1274 {
1380 dump_object (op); 1275 char *dump = dump_object (op);
1381 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1276 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1277 free (dump);
1382 return op; 1278 return op;
1383 } 1279 }
1384 1280
1385 if (out_of_map (m, op->x, op->y)) 1281 if (out_of_map (m, op->x, op->y))
1386 { 1282 {
1387 dump_object (op); 1283 char *dump = dump_object (op);
1388 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1284 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1389#ifdef MANY_CORES 1285#ifdef MANY_CORES
1390 /* Better to catch this here, as otherwise the next use of this object 1286 /* Better to catch this here, as otherwise the next use of this object
1391 * is likely to cause a crash. Better to find out where it is getting 1287 * is likely to cause a crash. Better to find out where it is getting
1392 * improperly inserted. 1288 * improperly inserted.
1393 */ 1289 */
1394 abort (); 1290 abort ();
1395#endif 1291#endif
1292 free (dump);
1396 return op; 1293 return op;
1397 } 1294 }
1398 1295
1399 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1296 if (!QUERY_FLAG (op, FLAG_REMOVED))
1400 { 1297 {
1401 dump_object (op); 1298 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1299 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300 free (dump);
1403 return op; 1301 return op;
1404 } 1302 }
1405 1303
1406 if (op->more != NULL) 1304 if (op->more != NULL)
1407 { 1305 {
… …
1445 1343
1446 /* this has to be done after we translate the coordinates. 1344 /* this has to be done after we translate the coordinates.
1447 */ 1345 */
1448 if (op->nrof && !(flag & INS_NO_MERGE)) 1346 if (op->nrof && !(flag & INS_NO_MERGE))
1449 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1347 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1450 if (CAN_MERGE (op, tmp)) 1348 if (object::can_merge (op, tmp))
1451 { 1349 {
1452 op->nrof += tmp->nrof; 1350 op->nrof += tmp->nrof;
1453 remove_ob (tmp); 1351 tmp->destroy ();
1454 free_object (tmp);
1455 } 1352 }
1456 1353
1457 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1354 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1458 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1355 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1459 1356
… …
1587 * it, so save a few ticks and start from there. 1484 * it, so save a few ticks and start from there.
1588 */ 1485 */
1589 if (!(flag & INS_MAP_LOAD)) 1486 if (!(flag & INS_MAP_LOAD))
1590 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1487 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1591 if (tmp->type == PLAYER) 1488 if (tmp->type == PLAYER)
1592 tmp->contr->socket.update_look = 1; 1489 tmp->contr->socket->update_look = 1;
1593 1490
1594 /* If this object glows, it may affect lighting conditions that are 1491 /* If this object glows, it may affect lighting conditions that are
1595 * visible to others on this map. But update_all_los is really 1492 * visible to others on this map. But update_all_los is really
1596 * an inefficient way to do this, as it means los for all players 1493 * an inefficient way to do this, as it means los for all players
1597 * on the map will get recalculated. The players could very well 1494 * on the map will get recalculated. The players could very well
… …
1645 tmp1; 1542 tmp1;
1646 1543
1647 /* first search for itself and remove any old instances */ 1544 /* first search for itself and remove any old instances */
1648 1545
1649 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1546 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1650 {
1651 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1652 { 1548 tmp->destroy ();
1653 remove_ob (tmp);
1654 free_object (tmp);
1655 }
1656 }
1657 1549
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1550 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1551
1660 tmp1->x = op->x; 1552 tmp1->x = op->x;
1661 tmp1->y = op->y; 1553 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1554 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1555}
… …
1671 */ 1563 */
1672 1564
1673object * 1565object *
1674get_split_ob (object *orig_ob, uint32 nr) 1566get_split_ob (object *orig_ob, uint32 nr)
1675{ 1567{
1676 object * 1568 object *newob;
1677 newob;
1678 int
1679 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1680 1570
1681 if (orig_ob->nrof < nr) 1571 if (orig_ob->nrof < nr)
1682 { 1572 {
1683 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1573 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1684 return NULL; 1574 return NULL;
1685 } 1575 }
1686 1576
1687 newob = object_create_clone (orig_ob); 1577 newob = object_create_clone (orig_ob);
1688 1578
1689 if ((orig_ob->nrof -= nr) < 1) 1579 if ((orig_ob->nrof -= nr) < 1)
1690 { 1580 orig_ob->destroy (1);
1691 if (!is_removed)
1692 remove_ob (orig_ob);
1693 free_object2 (orig_ob, 1);
1694 }
1695 else if (!is_removed) 1581 else if (!is_removed)
1696 { 1582 {
1697 if (orig_ob->env != NULL) 1583 if (orig_ob->env != NULL)
1698 sub_weight (orig_ob->env, orig_ob->weight * nr); 1584 sub_weight (orig_ob->env, orig_ob->weight * nr);
1699 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1585 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1763 esrv_send_item (tmp, op); 1649 esrv_send_item (tmp, op);
1764 } 1650 }
1765 } 1651 }
1766 else 1652 else
1767 { 1653 {
1768 remove_ob (op); 1654 op->remove ();
1769 op->nrof = 0; 1655 op->nrof = 0;
1770 if (tmp) 1656 if (tmp)
1771 { 1657 {
1772 esrv_del_item (tmp->contr, op->count); 1658 esrv_del_item (tmp->contr, op->count);
1773 } 1659 }
… …
1779 1665
1780 if (i < op->nrof) 1666 if (i < op->nrof)
1781 op->nrof -= i; 1667 op->nrof -= i;
1782 else 1668 else
1783 { 1669 {
1784 remove_ob (op); 1670 op->remove ();
1785 op->nrof = 0; 1671 op->nrof = 0;
1786 } 1672 }
1787 1673
1788 /* Since we just removed op, op->above is null */ 1674 /* Since we just removed op, op->above is null */
1789 for (tmp = above; tmp != NULL; tmp = tmp->above) 1675 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1798 1684
1799 if (op->nrof) 1685 if (op->nrof)
1800 return op; 1686 return op;
1801 else 1687 else
1802 { 1688 {
1803 free_object (op); 1689 op->destroy ();
1804 return NULL; 1690 return NULL;
1805 } 1691 }
1806} 1692}
1807 1693
1808/* 1694/*
… …
1821 op->carrying += weight; 1707 op->carrying += weight;
1822 op = op->env; 1708 op = op->env;
1823 } 1709 }
1824} 1710}
1825 1711
1712object *
1713insert_ob_in_ob (object *op, object *where)
1714{
1715 if (!where)
1716 {
1717 char *dump = dump_object (op);
1718 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1719 free (dump);
1720 return op;
1721 }
1722
1723 if (where->head)
1724 {
1725 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1726 where = where->head;
1727 }
1728
1729 return where->insert (op);
1730}
1731
1826/* 1732/*
1827 * insert_ob_in_ob(op,environment): 1733 * env->insert (op)
1828 * This function inserts the object op in the linked list 1734 * This function inserts the object op in the linked list
1829 * inside the object environment. 1735 * inside the object environment.
1830 * 1736 *
1831 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832 * the inventory at the last position or next to other objects of the same
1833 * type.
1834 * Frank: Now sorted by type, archetype and magic!
1835 *
1836 * The function returns now pointer to inserted item, and return value can 1737 * The function returns now pointer to inserted item, and return value can
1837 * be != op, if items are merged. -Tero 1738 * be != op, if items are merged. -Tero
1838 */ 1739 */
1839 1740
1840object * 1741object *
1841insert_ob_in_ob (object *op, object *where) 1742object::insert (object *op)
1842{ 1743{
1843 object * 1744 object *tmp, *otmp;
1844 tmp, *
1845 otmp;
1846 1745
1847 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1746 if (!QUERY_FLAG (op, FLAG_REMOVED))
1848 { 1747 op->remove ();
1849 dump_object (op);
1850 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851 return op;
1852 }
1853
1854 if (where == NULL)
1855 {
1856 dump_object (op);
1857 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858 return op;
1859 }
1860
1861 if (where->head)
1862 {
1863 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864 where = where->head;
1865 }
1866 1748
1867 if (op->more) 1749 if (op->more)
1868 { 1750 {
1869 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1751 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1870 return op; 1752 return op;
… …
1872 1754
1873 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1755 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874 CLEAR_FLAG (op, FLAG_REMOVED); 1756 CLEAR_FLAG (op, FLAG_REMOVED);
1875 if (op->nrof) 1757 if (op->nrof)
1876 { 1758 {
1877 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1759 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878 if (CAN_MERGE (tmp, op)) 1760 if (object::can_merge (tmp, op))
1879 { 1761 {
1880 /* return the original object and remove inserted object 1762 /* return the original object and remove inserted object
1881 (client needs the original object) */ 1763 (client needs the original object) */
1882 tmp->nrof += op->nrof; 1764 tmp->nrof += op->nrof;
1883 /* Weight handling gets pretty funky. Since we are adding to 1765 /* Weight handling gets pretty funky. Since we are adding to
1884 * tmp->nrof, we need to increase the weight. 1766 * tmp->nrof, we need to increase the weight.
1885 */ 1767 */
1886 add_weight (where, op->weight * op->nrof); 1768 add_weight (this, op->weight * op->nrof);
1887 SET_FLAG (op, FLAG_REMOVED); 1769 SET_FLAG (op, FLAG_REMOVED);
1888 free_object (op); /* free the inserted object */ 1770 op->destroy (); /* free the inserted object */
1889 op = tmp; 1771 op = tmp;
1890 remove_ob (op); /* and fix old object's links */ 1772 op->remove (); /* and fix old object's links */
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1773 CLEAR_FLAG (op, FLAG_REMOVED);
1892 break; 1774 break;
1893 } 1775 }
1894 1776
1895 /* I assume combined objects have no inventory 1777 /* I assume combined objects have no inventory
1896 * We add the weight - this object could have just been removed 1778 * We add the weight - this object could have just been removed
1897 * (if it was possible to merge). calling remove_ob will subtract 1779 * (if it was possible to merge). calling remove_ob will subtract
1898 * the weight, so we need to add it in again, since we actually do 1780 * the weight, so we need to add it in again, since we actually do
1899 * the linking below 1781 * the linking below
1900 */ 1782 */
1901 add_weight (where, op->weight * op->nrof); 1783 add_weight (this, op->weight * op->nrof);
1902 } 1784 }
1903 else 1785 else
1904 add_weight (where, (op->weight + op->carrying)); 1786 add_weight (this, (op->weight + op->carrying));
1905 1787
1906 otmp = is_player_inv (where); 1788 otmp = is_player_inv (this);
1907 if (otmp && otmp->contr != NULL) 1789 if (otmp && otmp->contr)
1908 {
1909 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910 fix_player (otmp); 1791 fix_player (otmp);
1911 }
1912 1792
1913 op->map = NULL; 1793 op->map = NULL;
1914 op->env = where; 1794 op->env = this;
1915 op->above = NULL; 1795 op->above = NULL;
1916 op->below = NULL; 1796 op->below = NULL;
1917 op->x = 0, op->y = 0; 1797 op->x = 0, op->y = 0;
1918 1798
1919 /* reset the light list and los of the players on the map */ 1799 /* reset the light list and los of the players on the map */
1920 if ((op->glow_radius != 0) && where->map) 1800 if ((op->glow_radius != 0) && map)
1921 { 1801 {
1922#ifdef DEBUG_LIGHTS 1802#ifdef DEBUG_LIGHTS
1923 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1803 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1924#endif /* DEBUG_LIGHTS */ 1804#endif /* DEBUG_LIGHTS */
1925 if (MAP_DARKNESS (where->map)) 1805 if (MAP_DARKNESS (map))
1926 update_all_los (where->map, where->x, where->y); 1806 update_all_los (map, x, y);
1927 } 1807 }
1928 1808
1929 /* Client has no idea of ordering so lets not bother ordering it here. 1809 /* Client has no idea of ordering so lets not bother ordering it here.
1930 * It sure simplifies this function... 1810 * It sure simplifies this function...
1931 */ 1811 */
1932 if (where->inv == NULL) 1812 if (!inv)
1933 where->inv = op; 1813 inv = op;
1934 else 1814 else
1935 { 1815 {
1936 op->below = where->inv; 1816 op->below = inv;
1937 op->below->above = op; 1817 op->below->above = op;
1938 where->inv = op; 1818 inv = op;
1939 } 1819 }
1820
1940 return op; 1821 return op;
1941} 1822}
1942 1823
1943/* 1824/*
1944 * Checks if any objects has a move_type that matches objects 1825 * Checks if any objects has a move_type that matches objects
… …
1962 */ 1843 */
1963 1844
1964int 1845int
1965check_move_on (object *op, object *originator) 1846check_move_on (object *op, object *originator)
1966{ 1847{
1967 object * 1848 object *tmp;
1968 tmp; 1849 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1850 int x = op->x, y = op->y;
1975 1851
1976 MoveType 1852 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1853
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1854 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1855 return 0;
1983
1984 tag = op->count;
1985 1856
1986 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1857 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1987 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1858 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1988 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1859 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1989 1860
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1921 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1922 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2052 { 1923 {
2053 move_apply (tmp, op, originator); 1924 move_apply (tmp, op, originator);
2054 1925
2055 if (was_destroyed (op, tag)) 1926 if (op->destroyed ())
2056 return 1; 1927 return 1;
2057 1928
2058 /* what the person/creature stepped onto has moved the object 1929 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 1930 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 1931 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 1943 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1944 * The first matching object is returned, or NULL if none.
2074 */ 1945 */
2075 1946
2076object * 1947object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 1948present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 1949{
2079 object * 1950 object *
2080 tmp; 1951 tmp;
2081 1952
2082 if (m == NULL || out_of_map (m, x, y)) 1953 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 1966 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 1967 * The first matching object is returned, or NULL if none.
2097 */ 1968 */
2098 1969
2099object * 1970object *
2100present (unsigned char type, mapstruct *m, int x, int y) 1971present (unsigned char type, maptile *m, int x, int y)
2101{ 1972{
2102 object * 1973 object *
2103 tmp; 1974 tmp;
2104 1975
2105 if (out_of_map (m, x, y)) 1976 if (out_of_map (m, x, y))
… …
2245 * the archetype because that isn't correct if the monster has been 2116 * the archetype because that isn't correct if the monster has been
2246 * customized, changed states, etc. 2117 * customized, changed states, etc.
2247 */ 2118 */
2248 2119
2249int 2120int
2250find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2121find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2251{ 2122{
2252 int 2123 int
2253 i, 2124 i,
2254 index = 0, flag; 2125 index = 0, flag;
2255 static int 2126 static int
… …
2276 return -1; 2147 return -1;
2277 return altern[RANDOM () % index]; 2148 return altern[RANDOM () % index];
2278} 2149}
2279 2150
2280/* 2151/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2152 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2153 * find_free_spot(), but it will search max number of squares.
2283 * But it will return the first available spot, not a random choice. 2154 * But it will return the first available spot, not a random choice.
2284 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2155 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2285 */ 2156 */
2286 2157
2287int 2158int
2288find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2159find_first_free_spot (const object *ob, maptile *m, int x, int y)
2289{ 2160{
2290 int 2161 int
2291 i; 2162 i;
2292 2163
2293 for (i = 0; i < SIZEOFFREE; i++) 2164 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * because we have to know what movement the thing looking to move 2228 * because we have to know what movement the thing looking to move
2358 * there is capable of. 2229 * there is capable of.
2359 */ 2230 */
2360 2231
2361int 2232int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2233find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2234{
2364 int 2235 int
2365 i, 2236 i,
2366 max = SIZEOFFREE, mflags; 2237 max = SIZEOFFREE, mflags;
2367 2238
2368 sint16 nx, ny; 2239 sint16 nx, ny;
2369 object * 2240 object *
2370 tmp; 2241 tmp;
2371 mapstruct * 2242 maptile *
2372 mp; 2243 mp;
2373 2244
2374 MoveType blocked, move_type; 2245 MoveType blocked, move_type;
2375 2246
2376 if (exclude && exclude->head) 2247 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2455 * Modified to be map tile aware -.MSW
2585 */ 2456 */
2586 2457
2587 2458
2588int 2459int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2460can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2461{
2591 sint16 dx, dy; 2462 sint16 dx, dy;
2592 int 2463 int
2593 mflags; 2464 mflags;
2594 2465
… …
2643 * create clone from object to another 2514 * create clone from object to another
2644 */ 2515 */
2645object * 2516object *
2646object_create_clone (object *asrc) 2517object_create_clone (object *asrc)
2647{ 2518{
2648 object *
2649 dst = NULL, *tmp, *src, *part, *prev, *item; 2519 object *dst = 0, *tmp, *src, *part, *prev, *item;
2650 2520
2651 if (!asrc) 2521 if (!asrc)
2652 return NULL; 2522 return 0;
2523
2653 src = asrc; 2524 src = asrc;
2654 if (src->head) 2525 if (src->head)
2655 src = src->head; 2526 src = src->head;
2656 2527
2657 prev = NULL; 2528 prev = 0;
2658 for (part = src; part; part = part->more) 2529 for (part = src; part; part = part->more)
2659 { 2530 {
2660 tmp = get_object (); 2531 tmp = part->clone ();
2661 copy_object (part, tmp);
2662 tmp->x -= src->x; 2532 tmp->x -= src->x;
2663 tmp->y -= src->y; 2533 tmp->y -= src->y;
2534
2664 if (!part->head) 2535 if (!part->head)
2665 { 2536 {
2666 dst = tmp; 2537 dst = tmp;
2667 tmp->head = NULL; 2538 tmp->head = 0;
2668 } 2539 }
2669 else 2540 else
2670 { 2541 {
2671 tmp->head = dst; 2542 tmp->head = dst;
2672 } 2543 }
2544
2673 tmp->more = NULL; 2545 tmp->more = 0;
2546
2674 if (prev) 2547 if (prev)
2675 prev->more = tmp; 2548 prev->more = tmp;
2549
2676 prev = tmp; 2550 prev = tmp;
2677 } 2551 }
2678 2552
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2553 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2554 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2555
2685 return dst; 2556 return dst;
2686} 2557}
2687 2558
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2559/* GROS - Creates an object using a string representing its content. */
2698
2699/* Basically, we save the content of the string to a temp file, then call */ 2560/* Basically, we save the content of the string to a temp file, then call */
2700
2701/* load_object on it. I admit it is a highly inefficient way to make things, */ 2561/* load_object on it. I admit it is a highly inefficient way to make things, */
2702
2703/* but it was simple to make and allows reusing the load_object function. */ 2562/* but it was simple to make and allows reusing the load_object function. */
2704
2705/* Remember not to use load_object_str in a time-critical situation. */ 2563/* Remember not to use load_object_str in a time-critical situation. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2564/* Also remember that multiparts objects are not supported for now. */
2708 2565
2709object * 2566object *
2710load_object_str (const char *obstr) 2567load_object_str (const char *obstr)
2711{ 2568{
2712 object * 2569 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2570 char filename[MAX_BUF];
2716 2571
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2572 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2573
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2574 FILE *tempfile = fopen (filename, "w");
2721 2575
2722 if (tempfile == NULL) 2576 if (tempfile == NULL)
2723 { 2577 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2578 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2579 return NULL;
2726 } 2580 }
2727 2581
2728 fprintf (tempfile, obstr); 2582 fprintf (tempfile, obstr);
2729 fclose (tempfile); 2583 fclose (tempfile);
2730 2584
2731 op = get_object (); 2585 op = object::create ();
2732 2586
2733 object_thawer thawer (filename); 2587 object_thawer thawer (filename);
2734 2588
2735 if (thawer) 2589 if (thawer)
2736 load_object (thawer, op, 0); 2590 load_object (thawer, op, 0);
… …
2746 * returns NULL if no match. 2600 * returns NULL if no match.
2747 */ 2601 */
2748object * 2602object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2603find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2604{
2751 object * 2605 object *tmp;
2752 tmp;
2753 2606
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2607 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2608 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2609 return tmp;
2757 2610
… …
2765 * do the desired thing. 2618 * do the desired thing.
2766 */ 2619 */
2767key_value * 2620key_value *
2768get_ob_key_link (const object *ob, const char *key) 2621get_ob_key_link (const object *ob, const char *key)
2769{ 2622{
2770 key_value * 2623 key_value *link;
2771 link;
2772 2624
2773 for (link = ob->key_values; link != NULL; link = link->next) 2625 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2626 if (link->key == key)
2776 {
2777 return link; 2627 return link;
2778 }
2779 }
2780 2628
2781 return NULL; 2629 return NULL;
2782} 2630}
2783 2631
2784/* 2632/*

Diff Legend

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