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.41 by root, Thu Sep 14 01:12:28 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;
923static std::vector<object *, slice_allocator <object *> > freed; 835object::vector object::objects; // not yet used
836object *object::first;
924 837
925void object::free_mortals () 838void object::free_mortals ()
926{ 839{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 840 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 841 if ((*i)->refcnt)
929 ++i; // further delay freeing 842 ++i; // further delay freeing
930 else 843 else
931 { 844 {
932 //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D
933 //freed.push_back (*i);//D
934 delete *i; 845 delete *i;
935 mortals.erase (i); 846 mortals.erase (i);
936 } 847 }
937
938 if (mortals.size() && 0)//D
939 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
940} 848}
941 849
942object::object () 850object::object ()
943{ 851{
944 SET_FLAG (this, FLAG_REMOVED); 852 SET_FLAG (this, FLAG_REMOVED);
945 853
946 expmul = 1.0; 854 expmul = 1.0;
947 face = blank_face; 855 face = blank_face;
948 attacked_by_count = -1;
949} 856}
950 857
951object::~object () 858object::~object ()
952{ 859{
953 free_key_values (this); 860 free_key_values (this);
… …
957{ 864{
958 count = ++ob_count; 865 count = ++ob_count;
959 uuid = gen_uuid (); 866 uuid = gen_uuid ();
960 867
961 prev = 0; 868 prev = 0;
962 next = objects; 869 next = object::first;
963 870
964 if (objects) 871 if (object::first)
965 objects->prev = this; 872 object::first->prev = this;
966 873
967 objects = this; 874 object::first = this;
968} 875}
969 876
970void object::unlink () 877void object::unlink ()
971{ 878{
972 //count = 0;//D
973 if (!prev && !next) return;//D
974
975 if (this == objects) 879 if (this == object::first)
976 objects = next; 880 object::first = next;
977 881
978 /* Remove this object from the list of used objects */ 882 /* Remove this object from the list of used objects */
979 if (prev) prev->next = next; 883 if (prev) prev->next = next;
980 if (next) next->prev = prev; 884 if (next) next->prev = prev;
981 885
… …
983 next = 0; 887 next = 0;
984} 888}
985 889
986object *object::create () 890object *object::create ()
987{ 891{
988 object *op;
989
990 if (freed.empty ())
991 op = new object; 892 object *op = new object;
992 else
993 {
994 // highly annoying, but the only way to get it stable right now
995 op = freed.back ();
996 freed.pop_back ();
997 op->~object ();
998 new ((void *) op) object;
999 }
1000
1001 op->link (); 893 op->link ();
1002 return op; 894 return op;
1003} 895}
1004 896
1005/* 897/*
… …
1007 * 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
1008 * free objects. The IS_FREED() flag is set in the object. 900 * free objects. The IS_FREED() flag is set in the object.
1009 * The object must have been removed by remove_ob() first for 901 * The object must have been removed by remove_ob() first for
1010 * this function to succeed. 902 * this function to succeed.
1011 * 903 *
1012 * 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
1013 * inventory to the ground. 905 * inventory to the ground.
1014 */ 906 */
1015void object::free (bool free_inventory) 907void object::destroy (bool destroy_inventory)
1016{ 908{
1017 if (QUERY_FLAG (this, FLAG_FREED)) 909 if (QUERY_FLAG (this, FLAG_FREED))
1018 return; 910 return;
1019 911
1020 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 912 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021 remove_friendly_object (this); 913 remove_friendly_object (this);
1022 914
1023 if (!QUERY_FLAG (this, FLAG_REMOVED)) 915 if (!QUERY_FLAG (this, FLAG_REMOVED))
1024 remove_ob (this); 916 remove ();
1025 917
1026 SET_FLAG (this, FLAG_FREED); 918 SET_FLAG (this, FLAG_FREED);
1027 919
1028 //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
1029
1030 if (more) 920 if (more)
1031 { 921 {
1032 more->free (free_inventory); 922 more->destroy (destroy_inventory);
1033 more = 0; 923 more = 0;
1034 } 924 }
1035 925
1036 if (inv) 926 if (inv)
1037 { 927 {
1038 /* Only if the space blocks everything do we not process - 928 /* Only if the space blocks everything do we not process -
1039 * if some form of movement is allowed, let objects 929 * if some form of movement is allowed, let objects
1040 * drop on that space. 930 * drop on that space.
1041 */ 931 */
1042 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)
1043 { 933 {
1044 object *op = inv; 934 object *op = inv;
1045 935
1046 while (op) 936 while (op)
1047 { 937 {
1048 object *tmp = op->below; 938 object *tmp = op->below;
1049 op->free (free_inventory); 939 op->destroy (destroy_inventory);
1050 op = tmp; 940 op = tmp;
1051 } 941 }
1052 } 942 }
1053 else 943 else
1054 { /* Put objects in inventory onto this space */ 944 { /* Put objects in inventory onto this space */
… …
1056 946
1057 while (op) 947 while (op)
1058 { 948 {
1059 object *tmp = op->below; 949 object *tmp = op->below;
1060 950
1061 remove_ob (op); 951 op->remove ();
1062 952
1063 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 953 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1064 || 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))
1065 free_object (op); 955 op->destroy ();
1066 else 956 else
1067 { 957 {
1068 op->x = x; 958 op->x = x;
1069 op->y = y; 959 op->y = y;
1070 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 */
… …
1073 op = tmp; 963 op = tmp;
1074 } 964 }
1075 } 965 }
1076 } 966 }
1077 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
1078 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;
1079 995
1080 /* Remove object from the active list */ 996 /* Remove object from the active list */
1081 speed = 0; 997 speed = 0;
1082 update_ob_speed (this); 998 update_ob_speed (this);
1083 999
… …
1088 1004
1089/* 1005/*
1090 * sub_weight() recursively (outwards) subtracts a number from the 1006 * sub_weight() recursively (outwards) subtracts a number from the
1091 * 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)).
1092 */ 1008 */
1093
1094void 1009void
1095sub_weight (object *op, signed long weight) 1010sub_weight (object *op, signed long weight)
1096{ 1011{
1097 while (op != NULL) 1012 while (op != NULL)
1098 { 1013 {
1099 if (op->type == CONTAINER) 1014 if (op->type == CONTAINER)
1100 {
1101 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1015 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1102 } 1016
1103 op->carrying -= weight; 1017 op->carrying -= weight;
1104 op = op->env; 1018 op = op->env;
1105 } 1019 }
1106} 1020}
1107 1021
1108/* remove_ob(op): 1022/* op->remove ():
1109 * 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
1110 * 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
1111 * object will have no environment. If the object previously had an 1025 * object will have no environment. If the object previously had an
1112 * environment, the x and y coordinates will be updated to 1026 * environment, the x and y coordinates will be updated to
1113 * the previous environment. 1027 * the previous environment.
1114 * Beware: This function is called from the editor as well! 1028 * Beware: This function is called from the editor as well!
1115 */ 1029 */
1116
1117void 1030void
1118remove_ob (object *op) 1031object::remove ()
1119{ 1032{
1033 object *tmp, *last = 0;
1120 object * 1034 object *otmp;
1121 tmp, *
1122 last = NULL;
1123 object *
1124 otmp;
1125 1035
1126 tag_t
1127 tag;
1128 int
1129 check_walk_off; 1036 int check_walk_off;
1130 mapstruct *
1131 m;
1132 1037
1133 sint16
1134 x,
1135 y;
1136
1137 if (QUERY_FLAG (op, FLAG_REMOVED)) 1038 if (QUERY_FLAG (this, FLAG_REMOVED))
1138 return; 1039 return;
1139 1040
1140 SET_FLAG (op, FLAG_REMOVED); 1041 SET_FLAG (this, FLAG_REMOVED);
1141 1042
1142 if (op->more != NULL) 1043 if (more)
1143 remove_ob (op->more); 1044 more->remove ();
1144 1045
1145 /* 1046 /*
1146 * In this case, the object to be removed is in someones 1047 * In this case, the object to be removed is in someones
1147 * inventory. 1048 * inventory.
1148 */ 1049 */
1149 if (op->env != NULL) 1050 if (env)
1150 { 1051 {
1151 if (op->nrof) 1052 if (nrof)
1152 sub_weight (op->env, op->weight * op->nrof); 1053 sub_weight (env, weight * nrof);
1153 else 1054 else
1154 sub_weight (op->env, op->weight + op->carrying); 1055 sub_weight (env, weight + carrying);
1155 1056
1156 /* 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
1157 * made to players inventory. If set, avoiding the call 1058 * made to players inventory. If set, avoiding the call
1158 * to save cpu time. 1059 * to save cpu time.
1159 */ 1060 */
1160 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))
1161 fix_player (otmp); 1062 fix_player (otmp);
1162 1063
1163 if (op->above != NULL) 1064 if (above != NULL)
1164 op->above->below = op->below; 1065 above->below = below;
1165 else 1066 else
1166 op->env->inv = op->below; 1067 env->inv = below;
1167 1068
1168 if (op->below != NULL) 1069 if (below != NULL)
1169 op->below->above = op->above; 1070 below->above = above;
1170 1071
1171 /* we set up values so that it could be inserted into 1072 /* we set up values so that it could be inserted into
1172 * 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
1173 * to the caller to decide what we want to do. 1074 * to the caller to decide what we want to do.
1174 */ 1075 */
1175 op->x = op->env->x, op->y = op->env->y; 1076 x = env->x, y = env->y;
1176 op->map = op->env->map; 1077 map = env->map;
1177 op->above = NULL, op->below = NULL; 1078 above = 0, below = 0;
1178 op->env = NULL; 1079 env = 0;
1179 } 1080 }
1180 else if (op->map) 1081 else if (map)
1181 { 1082 {
1182 x = op->x;
1183 y = op->y;
1184 m = get_map_from_coord (op->map, &x, &y);
1185
1186 if (!m)
1187 {
1188 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1189 op->map->path, op->x, op->y);
1190 /* in old days, we used to set x and y to 0 and continue.
1191 * it seems if we get into this case, something is probablye
1192 * screwed up and should be fixed.
1193 */
1194 abort ();
1195 }
1196
1197 if (op->map != m)
1198 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1199 op->map->path, m->path, op->x, op->y, x, y);
1200
1201 /* 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
1202 * lots of logic for things we no longer care about 1084 * lots of logic for things we no longer care about
1203 */ 1085 */
1204 1086
1205 /* link the object above us */ 1087 /* link the object above us */
1206 if (op->above) 1088 if (above)
1207 op->above->below = op->below; 1089 above->below = below;
1208 else 1090 else
1209 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 */
1210 1092
1211 /* Relink the object below us, if there is one */ 1093 /* Relink the object below us, if there is one */
1212 if (op->below) 1094 if (below)
1213 op->below->above = op->above; 1095 below->above = above;
1214 else 1096 else
1215 { 1097 {
1216 /* 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
1217 * use translated coordinates in case some oddness with map tiling is 1099 * use translated coordinates in case some oddness with map tiling is
1218 * evident 1100 * evident
1219 */ 1101 */
1220 if (GET_MAP_OB (m, x, y) != op) 1102 if (GET_MAP_OB (map, x, y) != this)
1221 { 1103 {
1222 dump_object (op); 1104 char *dump = dump_object (this);
1223 LOG (llevError, 1105 LOG (llevError,
1224 "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);
1225 dump_object (GET_MAP_OB (m, x, y)); 1108 dump = dump_object (GET_MAP_OB (map, x, y));
1226 LOG (llevError, "%s\n", errmsg); 1109 LOG (llevError, "%s\n", dump);
1110 free (dump);
1227 } 1111 }
1228 1112
1229 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1113 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1230 } 1114 }
1231 1115
1232 op->above = 0; 1116 above = 0;
1233 op->below = 0; 1117 below = 0;
1234 1118
1235 if (op->map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
1236 return; 1120 return;
1237 1121
1238 tag = op->count;
1239 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1122 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1240 1123
1241 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)
1242 { 1125 {
1243 /* 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
1244 * being removed. 1127 * being removed.
1245 */ 1128 */
1246 1129
1247 if (tmp->type == PLAYER && tmp != op) 1130 if (tmp->type == PLAYER && tmp != this)
1248 { 1131 {
1249 /* If a container that the player is currently using somehow gets 1132 /* If a container that the player is currently using somehow gets
1250 * removed (most likely destroyed), update the player view 1133 * removed (most likely destroyed), update the player view
1251 * appropriately. 1134 * appropriately.
1252 */ 1135 */
1253 if (tmp->container == op) 1136 if (tmp->container == this)
1254 { 1137 {
1255 CLEAR_FLAG (op, FLAG_APPLIED); 1138 CLEAR_FLAG (this, FLAG_APPLIED);
1256 tmp->container = NULL; 1139 tmp->container = 0;
1257 } 1140 }
1258 1141
1259 tmp->contr->socket.update_look = 1; 1142 tmp->contr->socket->update_look = 1;
1260 } 1143 }
1261 1144
1262 /* See if player moving off should effect something */ 1145 /* See if player moving off should effect something */
1263 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))
1264 { 1149 {
1265 move_apply (tmp, op, NULL); 1150 move_apply (tmp, this, 0);
1266 1151
1267 if (was_destroyed (op, tag)) 1152 if (destroyed ())
1268 {
1269 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 ());
1270 }
1271 } 1154 }
1272 1155
1273 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1156 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1274 1157
1275 if (tmp->above == tmp) 1158 if (tmp->above == tmp)
1276 tmp->above = NULL; 1159 tmp->above = 0;
1277 1160
1278 last = tmp; 1161 last = tmp;
1279 } 1162 }
1280 1163
1281 /* last == NULL of there are no objects on this space */ 1164 /* last == NULL of there are no objects on this space */
1282 if (last == NULL) 1165 if (!last)
1283 { 1166 {
1284 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1167 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1285 * 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
1286 * 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
1287 * be correct anyways. 1170 * be correct anyways.
1288 */ 1171 */
1289 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1172 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1290 update_position (op->map, op->x, op->y); 1173 update_position (map, x, y);
1291 } 1174 }
1292 else 1175 else
1293 update_object (last, UP_OBJ_REMOVE); 1176 update_object (last, UP_OBJ_REMOVE);
1294 1177
1295 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1178 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1296 update_all_los (op->map, op->x, op->y); 1179 update_all_los (map, x, y);
1297 } 1180 }
1298} 1181}
1299 1182
1300/* 1183/*
1301 * merge_ob(op,top): 1184 * merge_ob(op,top):
… …
1316 1199
1317 for (; top != NULL; top = top->below) 1200 for (; top != NULL; top = top->below)
1318 { 1201 {
1319 if (top == op) 1202 if (top == op)
1320 continue; 1203 continue;
1321 if (CAN_MERGE (op, top)) 1204
1205 if (object::can_merge (op, top))
1322 { 1206 {
1323 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1324 1208
1325/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1326 op->weight = 0; /* Don't want any adjustements now */ 1210 op->weight = 0; /* Don't want any adjustements now */
1327 remove_ob (op); 1211 op->destroy ();
1328 free_object (op);
1329 return top; 1212 return top;
1330 } 1213 }
1331 } 1214 }
1332 1215
1333 return NULL; 1216 return 0;
1334} 1217}
1335 1218
1336/* 1219/*
1337 * 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
1338 * job preparing multi-part monsters 1221 * job preparing multi-part monsters
1339 */ 1222 */
1340object * 1223object *
1341insert_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)
1342{ 1225{
1343 object *tmp; 1226 object *tmp;
1344 1227
1345 if (op->head) 1228 if (op->head)
1346 op = op->head; 1229 op = op->head;
… …
1374 * NULL if 'op' was destroyed 1257 * NULL if 'op' was destroyed
1375 * just 'op' otherwise 1258 * just 'op' otherwise
1376 */ 1259 */
1377 1260
1378object * 1261object *
1379insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1262insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1380{ 1263{
1381 object *tmp, *top, *floor = NULL; 1264 object *tmp, *top, *floor = NULL;
1382 sint16 x, y; 1265 sint16 x, y;
1383 1266
1384 if (QUERY_FLAG (op, FLAG_FREED)) 1267 if (QUERY_FLAG (op, FLAG_FREED))
… …
1387 return NULL; 1270 return NULL;
1388 } 1271 }
1389 1272
1390 if (m == NULL) 1273 if (m == NULL)
1391 { 1274 {
1392 dump_object (op); 1275 char *dump = dump_object (op);
1393 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);
1394 return op; 1278 return op;
1395 } 1279 }
1396 1280
1397 if (out_of_map (m, op->x, op->y)) 1281 if (out_of_map (m, op->x, op->y))
1398 { 1282 {
1399 dump_object (op); 1283 char *dump = dump_object (op);
1400 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);
1401#ifdef MANY_CORES 1285#ifdef MANY_CORES
1402 /* 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
1403 * 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
1404 * improperly inserted. 1288 * improperly inserted.
1405 */ 1289 */
1406 abort (); 1290 abort ();
1407#endif 1291#endif
1292 free (dump);
1408 return op; 1293 return op;
1409 } 1294 }
1410 1295
1411 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1296 if (!QUERY_FLAG (op, FLAG_REMOVED))
1412 { 1297 {
1413 dump_object (op); 1298 char *dump = dump_object (op);
1414 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);
1415 return op; 1301 return op;
1416 } 1302 }
1417 1303
1418 if (op->more != NULL) 1304 if (op->more != NULL)
1419 { 1305 {
… …
1457 1343
1458 /* this has to be done after we translate the coordinates. 1344 /* this has to be done after we translate the coordinates.
1459 */ 1345 */
1460 if (op->nrof && !(flag & INS_NO_MERGE)) 1346 if (op->nrof && !(flag & INS_NO_MERGE))
1461 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)
1462 if (CAN_MERGE (op, tmp)) 1348 if (object::can_merge (op, tmp))
1463 { 1349 {
1464 op->nrof += tmp->nrof; 1350 op->nrof += tmp->nrof;
1465 remove_ob (tmp); 1351 tmp->destroy ();
1466 free_object (tmp);
1467 } 1352 }
1468 1353
1469 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 */
1470 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1355 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1471 1356
… …
1599 * it, so save a few ticks and start from there. 1484 * it, so save a few ticks and start from there.
1600 */ 1485 */
1601 if (!(flag & INS_MAP_LOAD)) 1486 if (!(flag & INS_MAP_LOAD))
1602 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)
1603 if (tmp->type == PLAYER) 1488 if (tmp->type == PLAYER)
1604 tmp->contr->socket.update_look = 1; 1489 tmp->contr->socket->update_look = 1;
1605 1490
1606 /* If this object glows, it may affect lighting conditions that are 1491 /* If this object glows, it may affect lighting conditions that are
1607 * 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
1608 * 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
1609 * on the map will get recalculated. The players could very well 1494 * on the map will get recalculated. The players could very well
… …
1657 tmp1; 1542 tmp1;
1658 1543
1659 /* first search for itself and remove any old instances */ 1544 /* first search for itself and remove any old instances */
1660 1545
1661 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)
1662 {
1663 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1664 { 1548 tmp->destroy ();
1665 remove_ob (tmp);
1666 free_object (tmp);
1667 }
1668 }
1669 1549
1670 tmp1 = arch_to_object (find_archetype (arch_string)); 1550 tmp1 = arch_to_object (archetype::find (arch_string));
1671 1551
1672 tmp1->x = op->x; 1552 tmp1->x = op->x;
1673 tmp1->y = op->y; 1553 tmp1->y = op->y;
1674 insert_ob_in_map (tmp1, op->map, op, 0); 1554 insert_ob_in_map (tmp1, op->map, op, 0);
1675} 1555}
… …
1683 */ 1563 */
1684 1564
1685object * 1565object *
1686get_split_ob (object *orig_ob, uint32 nr) 1566get_split_ob (object *orig_ob, uint32 nr)
1687{ 1567{
1688 object * 1568 object *newob;
1689 newob;
1690 int
1691 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1692 1570
1693 if (orig_ob->nrof < nr) 1571 if (orig_ob->nrof < nr)
1694 { 1572 {
1695 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);
1696 return NULL; 1574 return NULL;
1697 } 1575 }
1698 1576
1699 newob = object_create_clone (orig_ob); 1577 newob = object_create_clone (orig_ob);
1700 1578
1701 if ((orig_ob->nrof -= nr) < 1) 1579 if ((orig_ob->nrof -= nr) < 1)
1702 { 1580 orig_ob->destroy (1);
1703 if (!is_removed)
1704 remove_ob (orig_ob);
1705 free_object2 (orig_ob, 1);
1706 }
1707 else if (!is_removed) 1581 else if (!is_removed)
1708 { 1582 {
1709 if (orig_ob->env != NULL) 1583 if (orig_ob->env != NULL)
1710 sub_weight (orig_ob->env, orig_ob->weight * nr); 1584 sub_weight (orig_ob->env, orig_ob->weight * nr);
1711 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)
… …
1775 esrv_send_item (tmp, op); 1649 esrv_send_item (tmp, op);
1776 } 1650 }
1777 } 1651 }
1778 else 1652 else
1779 { 1653 {
1780 remove_ob (op); 1654 op->remove ();
1781 op->nrof = 0; 1655 op->nrof = 0;
1782 if (tmp) 1656 if (tmp)
1783 { 1657 {
1784 esrv_del_item (tmp->contr, op->count); 1658 esrv_del_item (tmp->contr, op->count);
1785 } 1659 }
… …
1791 1665
1792 if (i < op->nrof) 1666 if (i < op->nrof)
1793 op->nrof -= i; 1667 op->nrof -= i;
1794 else 1668 else
1795 { 1669 {
1796 remove_ob (op); 1670 op->remove ();
1797 op->nrof = 0; 1671 op->nrof = 0;
1798 } 1672 }
1799 1673
1800 /* Since we just removed op, op->above is null */ 1674 /* Since we just removed op, op->above is null */
1801 for (tmp = above; tmp != NULL; tmp = tmp->above) 1675 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1810 1684
1811 if (op->nrof) 1685 if (op->nrof)
1812 return op; 1686 return op;
1813 else 1687 else
1814 { 1688 {
1815 free_object (op); 1689 op->destroy ();
1816 return NULL; 1690 return NULL;
1817 } 1691 }
1818} 1692}
1819 1693
1820/* 1694/*
… …
1833 op->carrying += weight; 1707 op->carrying += weight;
1834 op = op->env; 1708 op = op->env;
1835 } 1709 }
1836} 1710}
1837 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
1838/* 1732/*
1839 * insert_ob_in_ob(op,environment): 1733 * env->insert (op)
1840 * This function inserts the object op in the linked list 1734 * This function inserts the object op in the linked list
1841 * inside the object environment. 1735 * inside the object environment.
1842 * 1736 *
1843 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1844 * the inventory at the last position or next to other objects of the same
1845 * type.
1846 * Frank: Now sorted by type, archetype and magic!
1847 *
1848 * 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
1849 * be != op, if items are merged. -Tero 1738 * be != op, if items are merged. -Tero
1850 */ 1739 */
1851 1740
1852object * 1741object *
1853insert_ob_in_ob (object *op, object *where) 1742object::insert (object *op)
1854{ 1743{
1855 object * 1744 object *tmp, *otmp;
1856 tmp, *
1857 otmp;
1858 1745
1859 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1746 if (!QUERY_FLAG (op, FLAG_REMOVED))
1860 { 1747 op->remove ();
1861 dump_object (op);
1862 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1863 return op;
1864 }
1865
1866 if (where == NULL)
1867 {
1868 dump_object (op);
1869 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870 return op;
1871 }
1872
1873 if (where->head)
1874 {
1875 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1876 where = where->head;
1877 }
1878 1748
1879 if (op->more) 1749 if (op->more)
1880 { 1750 {
1881 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);
1882 return op; 1752 return op;
… …
1884 1754
1885 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1755 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1886 CLEAR_FLAG (op, FLAG_REMOVED); 1756 CLEAR_FLAG (op, FLAG_REMOVED);
1887 if (op->nrof) 1757 if (op->nrof)
1888 { 1758 {
1889 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1759 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1890 if (CAN_MERGE (tmp, op)) 1760 if (object::can_merge (tmp, op))
1891 { 1761 {
1892 /* return the original object and remove inserted object 1762 /* return the original object and remove inserted object
1893 (client needs the original object) */ 1763 (client needs the original object) */
1894 tmp->nrof += op->nrof; 1764 tmp->nrof += op->nrof;
1895 /* Weight handling gets pretty funky. Since we are adding to 1765 /* Weight handling gets pretty funky. Since we are adding to
1896 * tmp->nrof, we need to increase the weight. 1766 * tmp->nrof, we need to increase the weight.
1897 */ 1767 */
1898 add_weight (where, op->weight * op->nrof); 1768 add_weight (this, op->weight * op->nrof);
1899 SET_FLAG (op, FLAG_REMOVED); 1769 SET_FLAG (op, FLAG_REMOVED);
1900 free_object (op); /* free the inserted object */ 1770 op->destroy (); /* free the inserted object */
1901 op = tmp; 1771 op = tmp;
1902 remove_ob (op); /* and fix old object's links */ 1772 op->remove (); /* and fix old object's links */
1903 CLEAR_FLAG (op, FLAG_REMOVED); 1773 CLEAR_FLAG (op, FLAG_REMOVED);
1904 break; 1774 break;
1905 } 1775 }
1906 1776
1907 /* I assume combined objects have no inventory 1777 /* I assume combined objects have no inventory
1908 * We add the weight - this object could have just been removed 1778 * We add the weight - this object could have just been removed
1909 * (if it was possible to merge). calling remove_ob will subtract 1779 * (if it was possible to merge). calling remove_ob will subtract
1910 * 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
1911 * the linking below 1781 * the linking below
1912 */ 1782 */
1913 add_weight (where, op->weight * op->nrof); 1783 add_weight (this, op->weight * op->nrof);
1914 } 1784 }
1915 else 1785 else
1916 add_weight (where, (op->weight + op->carrying)); 1786 add_weight (this, (op->weight + op->carrying));
1917 1787
1918 otmp = is_player_inv (where); 1788 otmp = is_player_inv (this);
1919 if (otmp && otmp->contr != NULL) 1789 if (otmp && otmp->contr)
1920 {
1921 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1922 fix_player (otmp); 1791 fix_player (otmp);
1923 }
1924 1792
1925 op->map = NULL; 1793 op->map = NULL;
1926 op->env = where; 1794 op->env = this;
1927 op->above = NULL; 1795 op->above = NULL;
1928 op->below = NULL; 1796 op->below = NULL;
1929 op->x = 0, op->y = 0; 1797 op->x = 0, op->y = 0;
1930 1798
1931 /* 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 */
1932 if ((op->glow_radius != 0) && where->map) 1800 if ((op->glow_radius != 0) && map)
1933 { 1801 {
1934#ifdef DEBUG_LIGHTS 1802#ifdef DEBUG_LIGHTS
1935 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);
1936#endif /* DEBUG_LIGHTS */ 1804#endif /* DEBUG_LIGHTS */
1937 if (MAP_DARKNESS (where->map)) 1805 if (MAP_DARKNESS (map))
1938 update_all_los (where->map, where->x, where->y); 1806 update_all_los (map, x, y);
1939 } 1807 }
1940 1808
1941 /* 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.
1942 * It sure simplifies this function... 1810 * It sure simplifies this function...
1943 */ 1811 */
1944 if (where->inv == NULL) 1812 if (!inv)
1945 where->inv = op; 1813 inv = op;
1946 else 1814 else
1947 { 1815 {
1948 op->below = where->inv; 1816 op->below = inv;
1949 op->below->above = op; 1817 op->below->above = op;
1950 where->inv = op; 1818 inv = op;
1951 } 1819 }
1820
1952 return op; 1821 return op;
1953} 1822}
1954 1823
1955/* 1824/*
1956 * Checks if any objects has a move_type that matches objects 1825 * Checks if any objects has a move_type that matches objects
… …
1974 */ 1843 */
1975 1844
1976int 1845int
1977check_move_on (object *op, object *originator) 1846check_move_on (object *op, object *originator)
1978{ 1847{
1979 object * 1848 object *tmp;
1980 tmp; 1849 maptile *m = op->map;
1981 tag_t
1982 tag;
1983 mapstruct *
1984 m = op->map;
1985 int
1986 x = op->x, y = op->y; 1850 int x = op->x, y = op->y;
1987 1851
1988 MoveType 1852 MoveType move_on, move_slow, move_block;
1989 move_on,
1990 move_slow,
1991 move_block;
1992 1853
1993 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1854 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1994 return 0; 1855 return 0;
1995
1996 tag = op->count;
1997 1856
1998 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);
1999 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);
2000 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);
2001 1860
… …
2062 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1921 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2063 ((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))
2064 { 1923 {
2065 move_apply (tmp, op, originator); 1924 move_apply (tmp, op, originator);
2066 1925
2067 if (was_destroyed (op, tag)) 1926 if (op->destroyed ())
2068 return 1; 1927 return 1;
2069 1928
2070 /* what the person/creature stepped onto has moved the object 1929 /* what the person/creature stepped onto has moved the object
2071 * someplace new. Don't process any further - if we did, 1930 * someplace new. Don't process any further - if we did,
2072 * have a feeling strange problems would result. 1931 * have a feeling strange problems would result.
… …
2084 * a matching archetype at the given map and coordinates. 1943 * a matching archetype at the given map and coordinates.
2085 * The first matching object is returned, or NULL if none. 1944 * The first matching object is returned, or NULL if none.
2086 */ 1945 */
2087 1946
2088object * 1947object *
2089present_arch (const archetype *at, mapstruct *m, int x, int y) 1948present_arch (const archetype *at, maptile *m, int x, int y)
2090{ 1949{
2091 object * 1950 object *
2092 tmp; 1951 tmp;
2093 1952
2094 if (m == NULL || out_of_map (m, x, y)) 1953 if (m == NULL || out_of_map (m, x, y))
… …
2107 * a matching type variable at the given map and coordinates. 1966 * a matching type variable at the given map and coordinates.
2108 * The first matching object is returned, or NULL if none. 1967 * The first matching object is returned, or NULL if none.
2109 */ 1968 */
2110 1969
2111object * 1970object *
2112present (unsigned char type, mapstruct *m, int x, int y) 1971present (unsigned char type, maptile *m, int x, int y)
2113{ 1972{
2114 object * 1973 object *
2115 tmp; 1974 tmp;
2116 1975
2117 if (out_of_map (m, x, y)) 1976 if (out_of_map (m, x, y))
… …
2257 * 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
2258 * customized, changed states, etc. 2117 * customized, changed states, etc.
2259 */ 2118 */
2260 2119
2261int 2120int
2262find_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)
2263{ 2122{
2264 int 2123 int
2265 i, 2124 i,
2266 index = 0, flag; 2125 index = 0, flag;
2267 static int 2126 static int
… …
2288 return -1; 2147 return -1;
2289 return altern[RANDOM () % index]; 2148 return altern[RANDOM () % index];
2290} 2149}
2291 2150
2292/* 2151/*
2293 * find_first_free_spot(archetype, mapstruct, x, y) works like 2152 * find_first_free_spot(archetype, maptile, x, y) works like
2294 * find_free_spot(), but it will search max number of squares. 2153 * find_free_spot(), but it will search max number of squares.
2295 * 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.
2296 * 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.
2297 */ 2156 */
2298 2157
2299int 2158int
2300find_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)
2301{ 2160{
2302 int 2161 int
2303 i; 2162 i;
2304 2163
2305 for (i = 0; i < SIZEOFFREE; i++) 2164 for (i = 0; i < SIZEOFFREE; i++)
… …
2369 * 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
2370 * there is capable of. 2229 * there is capable of.
2371 */ 2230 */
2372 2231
2373int 2232int
2374find_dir (mapstruct *m, int x, int y, object *exclude) 2233find_dir (maptile *m, int x, int y, object *exclude)
2375{ 2234{
2376 int 2235 int
2377 i, 2236 i,
2378 max = SIZEOFFREE, mflags; 2237 max = SIZEOFFREE, mflags;
2379 2238
2380 sint16 nx, ny; 2239 sint16 nx, ny;
2381 object * 2240 object *
2382 tmp; 2241 tmp;
2383 mapstruct * 2242 maptile *
2384 mp; 2243 mp;
2385 2244
2386 MoveType blocked, move_type; 2245 MoveType blocked, move_type;
2387 2246
2388 if (exclude && exclude->head) 2247 if (exclude && exclude->head)
… …
2596 * Modified to be map tile aware -.MSW 2455 * Modified to be map tile aware -.MSW
2597 */ 2456 */
2598 2457
2599 2458
2600int 2459int
2601can_see_monsterP (mapstruct *m, int x, int y, int dir) 2460can_see_monsterP (maptile *m, int x, int y, int dir)
2602{ 2461{
2603 sint16 dx, dy; 2462 sint16 dx, dy;
2604 int 2463 int
2605 mflags; 2464 mflags;
2606 2465
… …
2655 * create clone from object to another 2514 * create clone from object to another
2656 */ 2515 */
2657object * 2516object *
2658object_create_clone (object *asrc) 2517object_create_clone (object *asrc)
2659{ 2518{
2660 object *
2661 dst = NULL, *tmp, *src, *part, *prev, *item; 2519 object *dst = 0, *tmp, *src, *part, *prev, *item;
2662 2520
2663 if (!asrc) 2521 if (!asrc)
2664 return NULL; 2522 return 0;
2523
2665 src = asrc; 2524 src = asrc;
2666 if (src->head) 2525 if (src->head)
2667 src = src->head; 2526 src = src->head;
2668 2527
2669 prev = NULL; 2528 prev = 0;
2670 for (part = src; part; part = part->more) 2529 for (part = src; part; part = part->more)
2671 { 2530 {
2672 tmp = get_object (); 2531 tmp = part->clone ();
2673 copy_object (part, tmp);
2674 tmp->x -= src->x; 2532 tmp->x -= src->x;
2675 tmp->y -= src->y; 2533 tmp->y -= src->y;
2534
2676 if (!part->head) 2535 if (!part->head)
2677 { 2536 {
2678 dst = tmp; 2537 dst = tmp;
2679 tmp->head = NULL; 2538 tmp->head = 0;
2680 } 2539 }
2681 else 2540 else
2682 { 2541 {
2683 tmp->head = dst; 2542 tmp->head = dst;
2684 } 2543 }
2544
2685 tmp->more = NULL; 2545 tmp->more = 0;
2546
2686 if (prev) 2547 if (prev)
2687 prev->more = tmp; 2548 prev->more = tmp;
2549
2688 prev = tmp; 2550 prev = tmp;
2689 } 2551 }
2690 2552
2691 /*** copy inventory ***/
2692 for (item = src->inv; item; item = item->below) 2553 for (item = src->inv; item; item = item->below)
2693 {
2694 (void) insert_ob_in_ob (object_create_clone (item), dst); 2554 insert_ob_in_ob (object_create_clone (item), dst);
2695 }
2696 2555
2697 return dst; 2556 return dst;
2698} 2557}
2699 2558
2700/* return true if the object was destroyed, 0 otherwise */
2701int
2702was_destroyed (const object *op, tag_t old_tag)
2703{
2704 /* checking for FLAG_FREED isn't necessary, but makes this function more
2705 * robust */
2706 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2707}
2708
2709/* GROS - Creates an object using a string representing its content. */ 2559/* GROS - Creates an object using a string representing its content. */
2710
2711/* 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 */
2712
2713/* 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, */
2714
2715/* 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. */
2716
2717/* 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. */
2718
2719/* Also remember that multiparts objects are not supported for now. */ 2564/* Also remember that multiparts objects are not supported for now. */
2720 2565
2721object * 2566object *
2722load_object_str (const char *obstr) 2567load_object_str (const char *obstr)
2723{ 2568{
2724 object * 2569 object *op;
2725 op;
2726 char
2727 filename[MAX_BUF]; 2570 char filename[MAX_BUF];
2728 2571
2729 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2572 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2730 2573
2731 FILE *
2732 tempfile = fopen (filename, "w"); 2574 FILE *tempfile = fopen (filename, "w");
2733 2575
2734 if (tempfile == NULL) 2576 if (tempfile == NULL)
2735 { 2577 {
2736 LOG (llevError, "Error - Unable to access load object temp file\n"); 2578 LOG (llevError, "Error - Unable to access load object temp file\n");
2737 return NULL; 2579 return NULL;
2738 } 2580 }
2739 2581
2740 fprintf (tempfile, obstr); 2582 fprintf (tempfile, obstr);
2741 fclose (tempfile); 2583 fclose (tempfile);
2742 2584
2743 op = get_object (); 2585 op = object::create ();
2744 2586
2745 object_thawer thawer (filename); 2587 object_thawer thawer (filename);
2746 2588
2747 if (thawer) 2589 if (thawer)
2748 load_object (thawer, op, 0); 2590 load_object (thawer, op, 0);
… …
2758 * returns NULL if no match. 2600 * returns NULL if no match.
2759 */ 2601 */
2760object * 2602object *
2761find_obj_by_type_subtype (const object *who, int type, int subtype) 2603find_obj_by_type_subtype (const object *who, int type, int subtype)
2762{ 2604{
2763 object * 2605 object *tmp;
2764 tmp;
2765 2606
2766 for (tmp = who->inv; tmp; tmp = tmp->below) 2607 for (tmp = who->inv; tmp; tmp = tmp->below)
2767 if (tmp->type == type && tmp->subtype == subtype) 2608 if (tmp->type == type && tmp->subtype == subtype)
2768 return tmp; 2609 return tmp;
2769 2610
… …
2777 * do the desired thing. 2618 * do the desired thing.
2778 */ 2619 */
2779key_value * 2620key_value *
2780get_ob_key_link (const object *ob, const char *key) 2621get_ob_key_link (const object *ob, const char *key)
2781{ 2622{
2782 key_value * 2623 key_value *link;
2783 link;
2784 2624
2785 for (link = ob->key_values; link != NULL; link = link->next) 2625 for (link = ob->key_values; link != NULL; link = link->next)
2786 {
2787 if (link->key == key) 2626 if (link->key == key)
2788 {
2789 return link; 2627 return link;
2790 }
2791 }
2792 2628
2793 return NULL; 2629 return NULL;
2794} 2630}
2795 2631
2796/* 2632/*

Diff Legend

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