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.69 by root, Mon Dec 18 03:00:02 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)
… …
219 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
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 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
226 * being locked in inventory should prevent merging.
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) || 228 || ob1->name != ob2->name
235 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
236 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
237 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
238 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
241 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
242 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
243 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
244 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
245 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
246 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
247 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
248 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
249 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
250 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
251 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
252 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
253 (ob1->move_on != ob2->move_on) || 247 || 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)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
255 return 0; 251 return 0;
256 252
257 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
258 * check all objects in the inventory. 254 * check all objects in the inventory.
259 */ 255 */
… …
262 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0; 260 return 0;
265 261
266 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
268 return 0; 264 return 0;
269 265
270 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 267 * if it is valid.
272 */ 268 */
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 373 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 374 * The result of the dump is stored in the static global errmsg array.
379 */ 375 */
380 376
381void 377char *
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) 378dump_object (object *op)
437{ 379{
438 if (op == NULL) 380 if (!op)
439 { 381 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 382
447void 383 object_freezer freezer;
448dump_all_objects (void) 384 save_object (freezer, op, 3);
449{ 385 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} 386}
458 387
459/* 388/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 389 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 390 * multi-object 1 which is closest to the second object.
… …
481 */ 410 */
482 411
483object * 412object *
484find_object (tag_t i) 413find_object (tag_t i)
485{ 414{
486 object *op; 415 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 416 if (op->count == i)
490 break; 417 return op;
418
491 return op; 419 return 0;
492} 420}
493 421
494/* 422/*
495 * Returns the first object which has a name equal to the argument. 423 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 424 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 429find_object_name (const char *str)
502{ 430{
503 shstr_cmp str_ (str); 431 shstr_cmp str_ (str);
504 object *op; 432 object *op;
505 433
506 for (op = objects; op != NULL; op = op->next) 434 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 435 if (op->name == str_)
508 break; 436 break;
509 437
510 return op; 438 return op;
511} 439}
512 440
513void 441void
514free_all_object_data () 442free_all_object_data ()
515{ 443{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 444 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} 445}
539 446
540/* 447/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 448 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 449 * skill and experience objects.
… …
612 519
613 /* What is not cleared is next, prev, and count */ 520 /* What is not cleared is next, prev, and count */
614 521
615 expmul = 1.0; 522 expmul = 1.0;
616 face = blank_face; 523 face = blank_face;
617 attacked_by_count = -1;
618 524
619 if (settings.casting_time) 525 if (settings.casting_time)
620 casting_time = -1; 526 casting_time = -1;
621} 527}
622 528
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/* 529/*
633 * copy object first frees everything allocated by the second object, 530 * copy_to first frees everything allocated by the dst object,
634 * and then copies the contends of the first object into the second 531 * and then copies the contents of itself into the second
635 * object, allocating what needs to be allocated. Basically, any 532 * object, allocating what needs to be allocated. Basically, any
636 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 533 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
637 * if the first object is freed, the pointers in the new object 534 * if the first object is freed, the pointers in the new object
638 * will point at garbage. 535 * will point at garbage.
639 */ 536 */
640void 537void
641copy_object (object *op2, object *op) 538object::copy_to (object *dst)
642{ 539{
643 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 540 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 541 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645 542
646 op2->clone (op); 543 *(object_copy *)dst = *this;
544 *(object_pod *)dst = *this;
545
546 if (self || cb)
547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
647 548
648 if (is_freed) 549 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 550 SET_FLAG (dst, FLAG_FREED);
551
650 if (is_removed) 552 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 553 SET_FLAG (dst, FLAG_REMOVED);
652 554
653 if (op2->speed < 0) 555 if (speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 556 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655 557
656 /* Copy over key_values, if any. */ 558 /* Copy over key_values, if any. */
657 if (op2->key_values) 559 if (key_values)
658 { 560 {
659 key_value *tail = 0; 561 key_value *tail = 0;
660 key_value *i; 562 key_value *i;
661 563
662 op->key_values = 0; 564 dst->key_values = 0;
663 565
664 for (i = op2->key_values; i; i = i->next) 566 for (i = key_values; i; i = i->next)
665 { 567 {
666 key_value *new_link = new key_value; 568 key_value *new_link = new key_value;
667 569
668 new_link->next = 0; 570 new_link->next = 0;
669 new_link->key = i->key; 571 new_link->key = i->key;
670 new_link->value = i->value; 572 new_link->value = i->value;
671 573
672 /* Try and be clever here, too. */ 574 /* Try and be clever here, too. */
673 if (!op->key_values) 575 if (!dst->key_values)
674 { 576 {
675 op->key_values = new_link; 577 dst->key_values = new_link;
676 tail = new_link; 578 tail = new_link;
677 } 579 }
678 else 580 else
679 { 581 {
680 tail->next = new_link; 582 tail->next = new_link;
681 tail = new_link; 583 tail = new_link;
682 } 584 }
683 } 585 }
684 } 586 }
685 587
686 update_ob_speed (op); 588 update_ob_speed (dst);
589}
590
591object *
592object::clone ()
593{
594 object *neu = create ();
595 copy_to (neu);
596 return neu;
687} 597}
688 598
689/* 599/*
690 * If an object with the IS_TURNABLE() flag needs to be turned due 600 * If an object with the IS_TURNABLE() flag needs to be turned due
691 * to the closest player being on the other side, this function can 601 * to the closest player being on the other side, this function can
… …
896 update_now = 1; 806 update_now = 1;
897 807
898 if ((move_slow | op->move_slow) != move_slow) 808 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1; 809 update_now = 1;
900 } 810 }
811
901 /* if the object is being removed, we can't make intelligent 812 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 813 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 814 * that is being removed.
904 */ 815 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 816 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
917 828
918 if (op->more != NULL) 829 if (op->more != NULL)
919 update_object (op->more, action); 830 update_object (op->more, action);
920} 831}
921 832
922static unordered_vector<object *> mortals; 833object::vector object::mortals;
923static std::vector<object *, slice_allocator <object *> > freed; 834object::vector object::objects; // not yet used
835object *object::first;
924 836
925void object::free_mortals () 837void object::free_mortals ()
926{ 838{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 839 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928 if ((*i)->refcnt) 840 if ((*i)->refcnt)
929 ++i; // further delay freeing 841 ++i; // further delay freeing
930 else 842 else
931 { 843 {
932 //printf ("free_mortal(%p,%ld,%ld)\n", *i, pticks, (*i)->count);//D
933 //freed.push_back (*i);//D
934 delete *i; 844 delete *i;
935 mortals.erase (i); 845 mortals.erase (i);
936 } 846 }
937
938 if (mortals.size() && 0)//D
939 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
940} 847}
941 848
942object::object () 849object::object ()
943{ 850{
944 SET_FLAG (this, FLAG_REMOVED); 851 SET_FLAG (this, FLAG_REMOVED);
945 852
946 expmul = 1.0; 853 expmul = 1.0;
947 face = blank_face; 854 face = blank_face;
948 attacked_by_count = -1;
949} 855}
950 856
951object::~object () 857object::~object ()
952{ 858{
953 free_key_values (this); 859 free_key_values (this);
… …
957{ 863{
958 count = ++ob_count; 864 count = ++ob_count;
959 uuid = gen_uuid (); 865 uuid = gen_uuid ();
960 866
961 prev = 0; 867 prev = 0;
962 next = objects; 868 next = object::first;
963 869
964 if (objects) 870 if (object::first)
965 objects->prev = this; 871 object::first->prev = this;
966 872
967 objects = this; 873 object::first = this;
968} 874}
969 875
970void object::unlink () 876void object::unlink ()
971{ 877{
972 //count = 0;//D
973 if (!prev && !next) return;//D
974
975 if (this == objects) 878 if (this == object::first)
976 objects = next; 879 object::first = next;
977 880
978 /* Remove this object from the list of used objects */ 881 /* Remove this object from the list of used objects */
979 if (prev) prev->next = next; 882 if (prev) prev->next = next;
980 if (next) next->prev = prev; 883 if (next) next->prev = prev;
981 884
… …
983 next = 0; 886 next = 0;
984} 887}
985 888
986object *object::create () 889object *object::create ()
987{ 890{
988 object *op;
989
990 if (freed.empty ())
991 op = new object; 891 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 (); 892 op->link ();
1002 return op; 893 return op;
1003} 894}
1004 895
1005/* 896/*
… …
1007 * it from the list of used objects, and puts it on the list of 898 * it from the list of used objects, and puts it on the list of
1008 * free objects. The IS_FREED() flag is set in the object. 899 * free objects. The IS_FREED() flag is set in the object.
1009 * The object must have been removed by remove_ob() first for 900 * The object must have been removed by remove_ob() first for
1010 * this function to succeed. 901 * this function to succeed.
1011 * 902 *
1012 * If free_inventory is set, free inventory as well. Else drop items in 903 * If destroy_inventory is set, free inventory as well. Else drop items in
1013 * inventory to the ground. 904 * inventory to the ground.
1014 */ 905 */
1015void object::free (bool free_inventory) 906void object::destroy (bool destroy_inventory)
1016{ 907{
1017 if (QUERY_FLAG (this, FLAG_FREED)) 908 if (QUERY_FLAG (this, FLAG_FREED))
1018 return; 909 return;
1019 910
1020 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 911 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021 remove_friendly_object (this); 912 remove_friendly_object (this);
1022 913
1023 if (!QUERY_FLAG (this, FLAG_REMOVED)) 914 if (!QUERY_FLAG (this, FLAG_REMOVED))
1024 remove_ob (this); 915 remove ();
1025 916
1026 SET_FLAG (this, FLAG_FREED); 917 SET_FLAG (this, FLAG_FREED);
1027 918
1028 //printf ("free(%p,%ld,%ld)\n", this, pticks, count);//D
1029
1030 if (more) 919 if (more)
1031 { 920 {
1032 more->free (free_inventory); 921 more->destroy (destroy_inventory);
1033 more = 0; 922 more = 0;
1034 } 923 }
1035 924
1036 if (inv) 925 if (inv)
1037 { 926 {
1038 /* Only if the space blocks everything do we not process - 927 /* Only if the space blocks everything do we not process -
1039 * if some form of movement is allowed, let objects 928 * if some form of movement is allowed, let objects
1040 * drop on that space. 929 * drop on that space.
1041 */ 930 */
1042 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 931 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1043 { 932 {
1044 object *op = inv; 933 object *op = inv;
1045 934
1046 while (op) 935 while (op)
1047 { 936 {
1048 object *tmp = op->below; 937 object *tmp = op->below;
1049 op->free (free_inventory); 938 op->destroy (destroy_inventory);
1050 op = tmp; 939 op = tmp;
1051 } 940 }
1052 } 941 }
1053 else 942 else
1054 { /* Put objects in inventory onto this space */ 943 { /* Put objects in inventory onto this space */
… …
1056 945
1057 while (op) 946 while (op)
1058 { 947 {
1059 object *tmp = op->below; 948 object *tmp = op->below;
1060 949
1061 remove_ob (op); 950 op->remove ();
1062 951
1063 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 952 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)) 953 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1065 free_object (op); 954 op->destroy ();
1066 else 955 else
1067 { 956 {
1068 op->x = x; 957 op->x = x;
1069 op->y = y; 958 op->y = y;
1070 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 959 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1073 op = tmp; 962 op = tmp;
1074 } 963 }
1075 } 964 }
1076 } 965 }
1077 966
967 // hack to ensure that freed objects still have a valid map
968 {
969 static maptile *freed_map; // freed objects are moved here to avoid crashes
970
971 if (!freed_map)
972 {
973 freed_map = new maptile;
974
975 freed_map->name = "/internal/freed_objects_map";
976 freed_map->width = 3;
977 freed_map->height = 3;
978
979 freed_map->allocate ();
980 }
981
982 map = freed_map;
983 x = 1;
984 y = 1;
985 }
986
987 // clear those pointers that likely might have circular references to us
1078 owner = 0; 988 owner = 0;
989 enemy = 0;
990 attacked_by = 0;
991
992 // only relevant for players(?), but make sure of it anyways
993 contr = 0;
1079 994
1080 /* Remove object from the active list */ 995 /* Remove object from the active list */
1081 speed = 0; 996 speed = 0;
1082 update_ob_speed (this); 997 update_ob_speed (this);
1083 998
… …
1088 1003
1089/* 1004/*
1090 * sub_weight() recursively (outwards) subtracts a number from the 1005 * sub_weight() recursively (outwards) subtracts a number from the
1091 * weight of an object (and what is carried by it's environment(s)). 1006 * weight of an object (and what is carried by it's environment(s)).
1092 */ 1007 */
1093
1094void 1008void
1095sub_weight (object *op, signed long weight) 1009sub_weight (object *op, signed long weight)
1096{ 1010{
1097 while (op != NULL) 1011 while (op != NULL)
1098 { 1012 {
1099 if (op->type == CONTAINER) 1013 if (op->type == CONTAINER)
1100 {
1101 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1014 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1102 } 1015
1103 op->carrying -= weight; 1016 op->carrying -= weight;
1104 op = op->env; 1017 op = op->env;
1105 } 1018 }
1106} 1019}
1107 1020
1108/* remove_ob(op): 1021/* op->remove ():
1109 * This function removes the object op from the linked list of objects 1022 * This function removes the object op from the linked list of objects
1110 * which it is currently tied to. When this function is done, the 1023 * which it is currently tied to. When this function is done, the
1111 * object will have no environment. If the object previously had an 1024 * object will have no environment. If the object previously had an
1112 * environment, the x and y coordinates will be updated to 1025 * environment, the x and y coordinates will be updated to
1113 * the previous environment. 1026 * the previous environment.
1114 * Beware: This function is called from the editor as well! 1027 * Beware: This function is called from the editor as well!
1115 */ 1028 */
1116
1117void 1029void
1118remove_ob (object *op) 1030object::remove ()
1119{ 1031{
1032 object *tmp, *last = 0;
1120 object * 1033 object *otmp;
1121 tmp, *
1122 last = NULL;
1123 object *
1124 otmp;
1125 1034
1126 tag_t
1127 tag;
1128 int
1129 check_walk_off; 1035 int check_walk_off;
1130 mapstruct *
1131 m;
1132 1036
1133 sint16
1134 x,
1135 y;
1136
1137 if (QUERY_FLAG (op, FLAG_REMOVED)) 1037 if (QUERY_FLAG (this, FLAG_REMOVED))
1138 return; 1038 return;
1139 1039
1140 SET_FLAG (op, FLAG_REMOVED); 1040 SET_FLAG (this, FLAG_REMOVED);
1141 1041
1142 if (op->more != NULL) 1042 if (more)
1143 remove_ob (op->more); 1043 more->remove ();
1144 1044
1145 /* 1045 /*
1146 * In this case, the object to be removed is in someones 1046 * In this case, the object to be removed is in someones
1147 * inventory. 1047 * inventory.
1148 */ 1048 */
1149 if (op->env != NULL) 1049 if (env)
1150 { 1050 {
1151 if (op->nrof) 1051 if (nrof)
1152 sub_weight (op->env, op->weight * op->nrof); 1052 sub_weight (env, weight * nrof);
1153 else 1053 else
1154 sub_weight (op->env, op->weight + op->carrying); 1054 sub_weight (env, weight + carrying);
1155 1055
1156 /* NO_FIX_PLAYER is set when a great many changes are being 1056 /* NO_FIX_PLAYER is set when a great many changes are being
1157 * made to players inventory. If set, avoiding the call 1057 * made to players inventory. If set, avoiding the call
1158 * to save cpu time. 1058 * to save cpu time.
1159 */ 1059 */
1160 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1060 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1161 fix_player (otmp); 1061 fix_player (otmp);
1162 1062
1163 if (op->above != NULL) 1063 if (above != NULL)
1164 op->above->below = op->below; 1064 above->below = below;
1165 else 1065 else
1166 op->env->inv = op->below; 1066 env->inv = below;
1167 1067
1168 if (op->below != NULL) 1068 if (below != NULL)
1169 op->below->above = op->above; 1069 below->above = above;
1170 1070
1171 /* we set up values so that it could be inserted into 1071 /* we set up values so that it could be inserted into
1172 * the map, but we don't actually do that - it is up 1072 * the map, but we don't actually do that - it is up
1173 * to the caller to decide what we want to do. 1073 * to the caller to decide what we want to do.
1174 */ 1074 */
1175 op->x = op->env->x, op->y = op->env->y; 1075 x = env->x, y = env->y;
1176 op->map = op->env->map; 1076 map = env->map;
1177 op->above = NULL, op->below = NULL; 1077 above = 0, below = 0;
1178 op->env = NULL; 1078 env = 0;
1179 } 1079 }
1180 else if (op->map) 1080 else if (map)
1181 { 1081 {
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 1082 /* Re did the following section of code - it looks like it had
1202 * lots of logic for things we no longer care about 1083 * lots of logic for things we no longer care about
1203 */ 1084 */
1204 1085
1205 /* link the object above us */ 1086 /* link the object above us */
1206 if (op->above) 1087 if (above)
1207 op->above->below = op->below; 1088 above->below = below;
1208 else 1089 else
1209 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1090 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1210 1091
1211 /* Relink the object below us, if there is one */ 1092 /* Relink the object below us, if there is one */
1212 if (op->below) 1093 if (below)
1213 op->below->above = op->above; 1094 below->above = above;
1214 else 1095 else
1215 { 1096 {
1216 /* Nothing below, which means we need to relink map object for this space 1097 /* Nothing below, which means we need to relink map object for this space
1217 * use translated coordinates in case some oddness with map tiling is 1098 * use translated coordinates in case some oddness with map tiling is
1218 * evident 1099 * evident
1219 */ 1100 */
1220 if (GET_MAP_OB (m, x, y) != op) 1101 if (GET_MAP_OB (map, x, y) != this)
1221 { 1102 {
1222 dump_object (op); 1103 char *dump = dump_object (this);
1223 LOG (llevError, 1104 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); 1105 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1106 free (dump);
1225 dump_object (GET_MAP_OB (m, x, y)); 1107 dump = dump_object (GET_MAP_OB (map, x, y));
1226 LOG (llevError, "%s\n", errmsg); 1108 LOG (llevError, "%s\n", dump);
1109 free (dump);
1227 } 1110 }
1228 1111
1229 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1230 } 1113 }
1231 1114
1232 op->above = 0; 1115 above = 0;
1233 op->below = 0; 1116 below = 0;
1234 1117
1235 if (op->map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1236 return; 1119 return;
1237 1120
1238 tag = op->count;
1239 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1121 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1240 1122
1241 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1123 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1242 { 1124 {
1243 /* No point updating the players look faces if he is the object 1125 /* No point updating the players look faces if he is the object
1244 * being removed. 1126 * being removed.
1245 */ 1127 */
1246 1128
1247 if (tmp->type == PLAYER && tmp != op) 1129 if (tmp->type == PLAYER && tmp != this)
1248 { 1130 {
1249 /* If a container that the player is currently using somehow gets 1131 /* If a container that the player is currently using somehow gets
1250 * removed (most likely destroyed), update the player view 1132 * removed (most likely destroyed), update the player view
1251 * appropriately. 1133 * appropriately.
1252 */ 1134 */
1253 if (tmp->container == op) 1135 if (tmp->container == this)
1254 { 1136 {
1255 CLEAR_FLAG (op, FLAG_APPLIED); 1137 CLEAR_FLAG (this, FLAG_APPLIED);
1256 tmp->container = NULL; 1138 tmp->container = 0;
1257 } 1139 }
1258 1140
1259 tmp->contr->socket.update_look = 1; 1141 tmp->contr->socket->update_look = 1;
1260 } 1142 }
1261 1143
1262 /* See if player moving off should effect something */ 1144 /* 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)) 1145 if (check_walk_off
1146 && ((move_type & tmp->move_off)
1147 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1264 { 1148 {
1265 move_apply (tmp, op, NULL); 1149 move_apply (tmp, this, 0);
1266 1150
1267 if (was_destroyed (op, tag)) 1151 if (destroyed ())
1268 {
1269 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1152 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1270 }
1271 } 1153 }
1272 1154
1273 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1155 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1274 1156
1275 if (tmp->above == tmp) 1157 if (tmp->above == tmp)
1276 tmp->above = NULL; 1158 tmp->above = 0;
1277 1159
1278 last = tmp; 1160 last = tmp;
1279 } 1161 }
1280 1162
1281 /* last == NULL of there are no objects on this space */ 1163 /* last == NULL of there are no objects on this space */
1282 if (last == NULL) 1164 if (!last)
1283 { 1165 {
1284 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1285 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1167 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1286 * those out anyways, and if there are any flags set right now, they won't 1168 * those out anyways, and if there are any flags set right now, they won't
1287 * be correct anyways. 1169 * be correct anyways.
1288 */ 1170 */
1289 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1290 update_position (op->map, op->x, op->y); 1172 update_position (map, x, y);
1291 } 1173 }
1292 else 1174 else
1293 update_object (last, UP_OBJ_REMOVE); 1175 update_object (last, UP_OBJ_REMOVE);
1294 1176
1295 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1296 update_all_los (op->map, op->x, op->y); 1178 update_all_los (map, x, y);
1297 } 1179 }
1298} 1180}
1299 1181
1300/* 1182/*
1301 * merge_ob(op,top): 1183 * merge_ob(op,top):
… …
1316 1198
1317 for (; top != NULL; top = top->below) 1199 for (; top != NULL; top = top->below)
1318 { 1200 {
1319 if (top == op) 1201 if (top == op)
1320 continue; 1202 continue;
1321 if (CAN_MERGE (op, top)) 1203
1204 if (object::can_merge (op, top))
1322 { 1205 {
1323 top->nrof += op->nrof; 1206 top->nrof += op->nrof;
1324 1207
1325/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1208/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1326 op->weight = 0; /* Don't want any adjustements now */ 1209 op->weight = 0; /* Don't want any adjustements now */
1327 remove_ob (op); 1210 op->destroy ();
1328 free_object (op);
1329 return top; 1211 return top;
1330 } 1212 }
1331 } 1213 }
1332 1214
1333 return NULL; 1215 return 0;
1334} 1216}
1335 1217
1336/* 1218/*
1337 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1219 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1338 * job preparing multi-part monsters 1220 * job preparing multi-part monsters
1339 */ 1221 */
1340object * 1222object *
1341insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1223insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342{ 1224{
1343 object *tmp; 1225 object *tmp;
1344 1226
1345 if (op->head) 1227 if (op->head)
1346 op = op->head; 1228 op = op->head;
… …
1374 * NULL if 'op' was destroyed 1256 * NULL if 'op' was destroyed
1375 * just 'op' otherwise 1257 * just 'op' otherwise
1376 */ 1258 */
1377 1259
1378object * 1260object *
1379insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1261insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1380{ 1262{
1381 object *tmp, *top, *floor = NULL; 1263 object *tmp, *top, *floor = NULL;
1382 sint16 x, y; 1264 sint16 x, y;
1383 1265
1384 if (QUERY_FLAG (op, FLAG_FREED)) 1266 if (QUERY_FLAG (op, FLAG_FREED))
… …
1387 return NULL; 1269 return NULL;
1388 } 1270 }
1389 1271
1390 if (m == NULL) 1272 if (m == NULL)
1391 { 1273 {
1392 dump_object (op); 1274 char *dump = dump_object (op);
1393 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1275 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1276 free (dump);
1394 return op; 1277 return op;
1395 } 1278 }
1396 1279
1397 if (out_of_map (m, op->x, op->y)) 1280 if (out_of_map (m, op->x, op->y))
1398 { 1281 {
1399 dump_object (op); 1282 char *dump = dump_object (op);
1400 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1283 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1401#ifdef MANY_CORES 1284#ifdef MANY_CORES
1402 /* Better to catch this here, as otherwise the next use of this object 1285 /* Better to catch this here, as otherwise the next use of this object
1403 * is likely to cause a crash. Better to find out where it is getting 1286 * is likely to cause a crash. Better to find out where it is getting
1404 * improperly inserted. 1287 * improperly inserted.
1405 */ 1288 */
1406 abort (); 1289 abort ();
1407#endif 1290#endif
1291 free (dump);
1408 return op; 1292 return op;
1409 } 1293 }
1410 1294
1411 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1295 if (!QUERY_FLAG (op, FLAG_REMOVED))
1412 { 1296 {
1413 dump_object (op); 1297 char *dump = dump_object (op);
1414 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1298 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1299 free (dump);
1415 return op; 1300 return op;
1416 } 1301 }
1417 1302
1418 if (op->more != NULL) 1303 if (op->more != NULL)
1419 { 1304 {
… …
1457 1342
1458 /* this has to be done after we translate the coordinates. 1343 /* this has to be done after we translate the coordinates.
1459 */ 1344 */
1460 if (op->nrof && !(flag & INS_NO_MERGE)) 1345 if (op->nrof && !(flag & INS_NO_MERGE))
1461 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1346 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1462 if (CAN_MERGE (op, tmp)) 1347 if (object::can_merge (op, tmp))
1463 { 1348 {
1464 op->nrof += tmp->nrof; 1349 op->nrof += tmp->nrof;
1465 remove_ob (tmp); 1350 tmp->destroy ();
1466 free_object (tmp);
1467 } 1351 }
1468 1352
1469 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1470 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1471 1355
… …
1599 * it, so save a few ticks and start from there. 1483 * it, so save a few ticks and start from there.
1600 */ 1484 */
1601 if (!(flag & INS_MAP_LOAD)) 1485 if (!(flag & INS_MAP_LOAD))
1602 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1603 if (tmp->type == PLAYER) 1487 if (tmp->type == PLAYER)
1604 tmp->contr->socket.update_look = 1; 1488 tmp->contr->socket->update_look = 1;
1605 1489
1606 /* If this object glows, it may affect lighting conditions that are 1490 /* If this object glows, it may affect lighting conditions that are
1607 * visible to others on this map. But update_all_los is really 1491 * visible to others on this map. But update_all_los is really
1608 * an inefficient way to do this, as it means los for all players 1492 * an inefficient way to do this, as it means los for all players
1609 * on the map will get recalculated. The players could very well 1493 * on the map will get recalculated. The players could very well
… …
1657 tmp1; 1541 tmp1;
1658 1542
1659 /* first search for itself and remove any old instances */ 1543 /* first search for itself and remove any old instances */
1660 1544
1661 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1662 {
1663 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1664 { 1547 tmp->destroy ();
1665 remove_ob (tmp);
1666 free_object (tmp);
1667 }
1668 }
1669 1548
1670 tmp1 = arch_to_object (find_archetype (arch_string)); 1549 tmp1 = arch_to_object (archetype::find (arch_string));
1671 1550
1672 tmp1->x = op->x; 1551 tmp1->x = op->x;
1673 tmp1->y = op->y; 1552 tmp1->y = op->y;
1674 insert_ob_in_map (tmp1, op->map, op, 0); 1553 insert_ob_in_map (tmp1, op->map, op, 0);
1675} 1554}
… …
1683 */ 1562 */
1684 1563
1685object * 1564object *
1686get_split_ob (object *orig_ob, uint32 nr) 1565get_split_ob (object *orig_ob, uint32 nr)
1687{ 1566{
1688 object * 1567 object *newob;
1689 newob;
1690 int
1691 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1692 1569
1693 if (orig_ob->nrof < nr) 1570 if (orig_ob->nrof < nr)
1694 { 1571 {
1695 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1572 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1696 return NULL; 1573 return NULL;
1697 } 1574 }
1698 1575
1699 newob = object_create_clone (orig_ob); 1576 newob = object_create_clone (orig_ob);
1700 1577
1701 if ((orig_ob->nrof -= nr) < 1) 1578 if ((orig_ob->nrof -= nr) < 1)
1702 { 1579 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) 1580 else if (!is_removed)
1708 { 1581 {
1709 if (orig_ob->env != NULL) 1582 if (orig_ob->env != NULL)
1710 sub_weight (orig_ob->env, orig_ob->weight * nr); 1583 sub_weight (orig_ob->env, orig_ob->weight * nr);
1711 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1584 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1775 esrv_send_item (tmp, op); 1648 esrv_send_item (tmp, op);
1776 } 1649 }
1777 } 1650 }
1778 else 1651 else
1779 { 1652 {
1780 remove_ob (op); 1653 op->remove ();
1781 op->nrof = 0; 1654 op->nrof = 0;
1782 if (tmp) 1655 if (tmp)
1783 { 1656 {
1784 esrv_del_item (tmp->contr, op->count); 1657 esrv_del_item (tmp->contr, op->count);
1785 } 1658 }
… …
1791 1664
1792 if (i < op->nrof) 1665 if (i < op->nrof)
1793 op->nrof -= i; 1666 op->nrof -= i;
1794 else 1667 else
1795 { 1668 {
1796 remove_ob (op); 1669 op->remove ();
1797 op->nrof = 0; 1670 op->nrof = 0;
1798 } 1671 }
1799 1672
1800 /* Since we just removed op, op->above is null */ 1673 /* Since we just removed op, op->above is null */
1801 for (tmp = above; tmp != NULL; tmp = tmp->above) 1674 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1810 1683
1811 if (op->nrof) 1684 if (op->nrof)
1812 return op; 1685 return op;
1813 else 1686 else
1814 { 1687 {
1815 free_object (op); 1688 op->destroy ();
1816 return NULL; 1689 return NULL;
1817 } 1690 }
1818} 1691}
1819 1692
1820/* 1693/*
… …
1833 op->carrying += weight; 1706 op->carrying += weight;
1834 op = op->env; 1707 op = op->env;
1835 } 1708 }
1836} 1709}
1837 1710
1711object *
1712insert_ob_in_ob (object *op, object *where)
1713{
1714 if (!where)
1715 {
1716 char *dump = dump_object (op);
1717 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1718 free (dump);
1719 return op;
1720 }
1721
1722 if (where->head)
1723 {
1724 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1725 where = where->head;
1726 }
1727
1728 return where->insert (op);
1729}
1730
1838/* 1731/*
1839 * insert_ob_in_ob(op,environment): 1732 * env->insert (op)
1840 * This function inserts the object op in the linked list 1733 * This function inserts the object op in the linked list
1841 * inside the object environment. 1734 * inside the object environment.
1842 * 1735 *
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 1736 * The function returns now pointer to inserted item, and return value can
1849 * be != op, if items are merged. -Tero 1737 * be != op, if items are merged. -Tero
1850 */ 1738 */
1851 1739
1852object * 1740object *
1853insert_ob_in_ob (object *op, object *where) 1741object::insert (object *op)
1854{ 1742{
1855 object * 1743 object *tmp, *otmp;
1856 tmp, *
1857 otmp;
1858 1744
1859 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1745 if (!QUERY_FLAG (op, FLAG_REMOVED))
1860 { 1746 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 1747
1879 if (op->more) 1748 if (op->more)
1880 { 1749 {
1881 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1750 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1882 return op; 1751 return op;
… …
1884 1753
1885 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1886 CLEAR_FLAG (op, FLAG_REMOVED); 1755 CLEAR_FLAG (op, FLAG_REMOVED);
1887 if (op->nrof) 1756 if (op->nrof)
1888 { 1757 {
1889 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1758 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1890 if (CAN_MERGE (tmp, op)) 1759 if (object::can_merge (tmp, op))
1891 { 1760 {
1892 /* return the original object and remove inserted object 1761 /* return the original object and remove inserted object
1893 (client needs the original object) */ 1762 (client needs the original object) */
1894 tmp->nrof += op->nrof; 1763 tmp->nrof += op->nrof;
1895 /* Weight handling gets pretty funky. Since we are adding to 1764 /* Weight handling gets pretty funky. Since we are adding to
1896 * tmp->nrof, we need to increase the weight. 1765 * tmp->nrof, we need to increase the weight.
1897 */ 1766 */
1898 add_weight (where, op->weight * op->nrof); 1767 add_weight (this, op->weight * op->nrof);
1899 SET_FLAG (op, FLAG_REMOVED); 1768 SET_FLAG (op, FLAG_REMOVED);
1900 free_object (op); /* free the inserted object */ 1769 op->destroy (); /* free the inserted object */
1901 op = tmp; 1770 op = tmp;
1902 remove_ob (op); /* and fix old object's links */ 1771 op->remove (); /* and fix old object's links */
1903 CLEAR_FLAG (op, FLAG_REMOVED); 1772 CLEAR_FLAG (op, FLAG_REMOVED);
1904 break; 1773 break;
1905 } 1774 }
1906 1775
1907 /* I assume combined objects have no inventory 1776 /* I assume combined objects have no inventory
1908 * We add the weight - this object could have just been removed 1777 * We add the weight - this object could have just been removed
1909 * (if it was possible to merge). calling remove_ob will subtract 1778 * (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 1779 * the weight, so we need to add it in again, since we actually do
1911 * the linking below 1780 * the linking below
1912 */ 1781 */
1913 add_weight (where, op->weight * op->nrof); 1782 add_weight (this, op->weight * op->nrof);
1914 } 1783 }
1915 else 1784 else
1916 add_weight (where, (op->weight + op->carrying)); 1785 add_weight (this, (op->weight + op->carrying));
1917 1786
1918 otmp = is_player_inv (where); 1787 otmp = is_player_inv (this);
1919 if (otmp && otmp->contr != NULL) 1788 if (otmp && otmp->contr)
1920 {
1921 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1922 fix_player (otmp); 1790 fix_player (otmp);
1923 }
1924 1791
1925 op->map = NULL; 1792 op->map = NULL;
1926 op->env = where; 1793 op->env = this;
1927 op->above = NULL; 1794 op->above = NULL;
1928 op->below = NULL; 1795 op->below = NULL;
1929 op->x = 0, op->y = 0; 1796 op->x = 0, op->y = 0;
1930 1797
1931 /* reset the light list and los of the players on the map */ 1798 /* reset the light list and los of the players on the map */
1932 if ((op->glow_radius != 0) && where->map) 1799 if ((op->glow_radius != 0) && map)
1933 { 1800 {
1934#ifdef DEBUG_LIGHTS 1801#ifdef DEBUG_LIGHTS
1935 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1802 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1936#endif /* DEBUG_LIGHTS */ 1803#endif /* DEBUG_LIGHTS */
1937 if (MAP_DARKNESS (where->map)) 1804 if (MAP_DARKNESS (map))
1938 update_all_los (where->map, where->x, where->y); 1805 update_all_los (map, x, y);
1939 } 1806 }
1940 1807
1941 /* Client has no idea of ordering so lets not bother ordering it here. 1808 /* Client has no idea of ordering so lets not bother ordering it here.
1942 * It sure simplifies this function... 1809 * It sure simplifies this function...
1943 */ 1810 */
1944 if (where->inv == NULL) 1811 if (!inv)
1945 where->inv = op; 1812 inv = op;
1946 else 1813 else
1947 { 1814 {
1948 op->below = where->inv; 1815 op->below = inv;
1949 op->below->above = op; 1816 op->below->above = op;
1950 where->inv = op; 1817 inv = op;
1951 } 1818 }
1819
1952 return op; 1820 return op;
1953} 1821}
1954 1822
1955/* 1823/*
1956 * Checks if any objects has a move_type that matches objects 1824 * Checks if any objects has a move_type that matches objects
… …
1974 */ 1842 */
1975 1843
1976int 1844int
1977check_move_on (object *op, object *originator) 1845check_move_on (object *op, object *originator)
1978{ 1846{
1979 object * 1847 object *tmp;
1980 tmp; 1848 maptile *m = op->map;
1981 tag_t
1982 tag;
1983 mapstruct *
1984 m = op->map;
1985 int
1986 x = op->x, y = op->y; 1849 int x = op->x, y = op->y;
1987 1850
1988 MoveType 1851 MoveType move_on, move_slow, move_block;
1989 move_on,
1990 move_slow,
1991 move_block;
1992 1852
1993 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1853 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1994 return 0; 1854 return 0;
1995
1996 tag = op->count;
1997 1855
1998 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1856 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); 1857 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); 1858 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2001 1859
… …
2062 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1920 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)) 1921 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2064 { 1922 {
2065 move_apply (tmp, op, originator); 1923 move_apply (tmp, op, originator);
2066 1924
2067 if (was_destroyed (op, tag)) 1925 if (op->destroyed ())
2068 return 1; 1926 return 1;
2069 1927
2070 /* what the person/creature stepped onto has moved the object 1928 /* what the person/creature stepped onto has moved the object
2071 * someplace new. Don't process any further - if we did, 1929 * someplace new. Don't process any further - if we did,
2072 * have a feeling strange problems would result. 1930 * have a feeling strange problems would result.
… …
2084 * a matching archetype at the given map and coordinates. 1942 * a matching archetype at the given map and coordinates.
2085 * The first matching object is returned, or NULL if none. 1943 * The first matching object is returned, or NULL if none.
2086 */ 1944 */
2087 1945
2088object * 1946object *
2089present_arch (const archetype *at, mapstruct *m, int x, int y) 1947present_arch (const archetype *at, maptile *m, int x, int y)
2090{ 1948{
2091 object * 1949 object *
2092 tmp; 1950 tmp;
2093 1951
2094 if (m == NULL || out_of_map (m, x, y)) 1952 if (m == NULL || out_of_map (m, x, y))
… …
2107 * a matching type variable at the given map and coordinates. 1965 * a matching type variable at the given map and coordinates.
2108 * The first matching object is returned, or NULL if none. 1966 * The first matching object is returned, or NULL if none.
2109 */ 1967 */
2110 1968
2111object * 1969object *
2112present (unsigned char type, mapstruct *m, int x, int y) 1970present (unsigned char type, maptile *m, int x, int y)
2113{ 1971{
2114 object * 1972 object *
2115 tmp; 1973 tmp;
2116 1974
2117 if (out_of_map (m, x, y)) 1975 if (out_of_map (m, x, y))
… …
2257 * the archetype because that isn't correct if the monster has been 2115 * the archetype because that isn't correct if the monster has been
2258 * customized, changed states, etc. 2116 * customized, changed states, etc.
2259 */ 2117 */
2260 2118
2261int 2119int
2262find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2120find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2263{ 2121{
2264 int 2122 int
2265 i, 2123 i,
2266 index = 0, flag; 2124 index = 0, flag;
2267 static int 2125 static int
… …
2288 return -1; 2146 return -1;
2289 return altern[RANDOM () % index]; 2147 return altern[RANDOM () % index];
2290} 2148}
2291 2149
2292/* 2150/*
2293 * find_first_free_spot(archetype, mapstruct, x, y) works like 2151 * find_first_free_spot(archetype, maptile, x, y) works like
2294 * find_free_spot(), but it will search max number of squares. 2152 * find_free_spot(), but it will search max number of squares.
2295 * But it will return the first available spot, not a random choice. 2153 * 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. 2154 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2297 */ 2155 */
2298 2156
2299int 2157int
2300find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2158find_first_free_spot (const object *ob, maptile *m, int x, int y)
2301{ 2159{
2302 int 2160 int
2303 i; 2161 i;
2304 2162
2305 for (i = 0; i < SIZEOFFREE; i++) 2163 for (i = 0; i < SIZEOFFREE; i++)
… …
2369 * because we have to know what movement the thing looking to move 2227 * because we have to know what movement the thing looking to move
2370 * there is capable of. 2228 * there is capable of.
2371 */ 2229 */
2372 2230
2373int 2231int
2374find_dir (mapstruct *m, int x, int y, object *exclude) 2232find_dir (maptile *m, int x, int y, object *exclude)
2375{ 2233{
2376 int 2234 int
2377 i, 2235 i,
2378 max = SIZEOFFREE, mflags; 2236 max = SIZEOFFREE, mflags;
2379 2237
2380 sint16 nx, ny; 2238 sint16 nx, ny;
2381 object * 2239 object *
2382 tmp; 2240 tmp;
2383 mapstruct * 2241 maptile *
2384 mp; 2242 mp;
2385 2243
2386 MoveType blocked, move_type; 2244 MoveType blocked, move_type;
2387 2245
2388 if (exclude && exclude->head) 2246 if (exclude && exclude->head)
… …
2596 * Modified to be map tile aware -.MSW 2454 * Modified to be map tile aware -.MSW
2597 */ 2455 */
2598 2456
2599 2457
2600int 2458int
2601can_see_monsterP (mapstruct *m, int x, int y, int dir) 2459can_see_monsterP (maptile *m, int x, int y, int dir)
2602{ 2460{
2603 sint16 dx, dy; 2461 sint16 dx, dy;
2604 int 2462 int
2605 mflags; 2463 mflags;
2606 2464
… …
2655 * create clone from object to another 2513 * create clone from object to another
2656 */ 2514 */
2657object * 2515object *
2658object_create_clone (object *asrc) 2516object_create_clone (object *asrc)
2659{ 2517{
2660 object *
2661 dst = NULL, *tmp, *src, *part, *prev, *item; 2518 object *dst = 0, *tmp, *src, *part, *prev, *item;
2662 2519
2663 if (!asrc) 2520 if (!asrc)
2664 return NULL; 2521 return 0;
2522
2665 src = asrc; 2523 src = asrc;
2666 if (src->head) 2524 if (src->head)
2667 src = src->head; 2525 src = src->head;
2668 2526
2669 prev = NULL; 2527 prev = 0;
2670 for (part = src; part; part = part->more) 2528 for (part = src; part; part = part->more)
2671 { 2529 {
2672 tmp = get_object (); 2530 tmp = part->clone ();
2673 copy_object (part, tmp);
2674 tmp->x -= src->x; 2531 tmp->x -= src->x;
2675 tmp->y -= src->y; 2532 tmp->y -= src->y;
2533
2676 if (!part->head) 2534 if (!part->head)
2677 { 2535 {
2678 dst = tmp; 2536 dst = tmp;
2679 tmp->head = NULL; 2537 tmp->head = 0;
2680 } 2538 }
2681 else 2539 else
2682 { 2540 {
2683 tmp->head = dst; 2541 tmp->head = dst;
2684 } 2542 }
2543
2685 tmp->more = NULL; 2544 tmp->more = 0;
2545
2686 if (prev) 2546 if (prev)
2687 prev->more = tmp; 2547 prev->more = tmp;
2548
2688 prev = tmp; 2549 prev = tmp;
2689 } 2550 }
2690 2551
2691 /*** copy inventory ***/
2692 for (item = src->inv; item; item = item->below) 2552 for (item = src->inv; item; item = item->below)
2693 {
2694 (void) insert_ob_in_ob (object_create_clone (item), dst); 2553 insert_ob_in_ob (object_create_clone (item), dst);
2695 }
2696 2554
2697 return dst; 2555 return dst;
2698} 2556}
2699 2557
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. */ 2558/* 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 */ 2559/* 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, */ 2560/* 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. */ 2561/* 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. */ 2562/* Remember not to use load_object_str in a time-critical situation. */
2718
2719/* Also remember that multiparts objects are not supported for now. */ 2563/* Also remember that multiparts objects are not supported for now. */
2720 2564
2721object * 2565object *
2722load_object_str (const char *obstr) 2566load_object_str (const char *obstr)
2723{ 2567{
2724 object * 2568 object *op;
2725 op;
2726 char
2727 filename[MAX_BUF]; 2569 char filename[MAX_BUF];
2728 2570
2729 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2571 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2730 2572
2731 FILE *
2732 tempfile = fopen (filename, "w"); 2573 FILE *tempfile = fopen (filename, "w");
2733 2574
2734 if (tempfile == NULL) 2575 if (tempfile == NULL)
2735 { 2576 {
2736 LOG (llevError, "Error - Unable to access load object temp file\n"); 2577 LOG (llevError, "Error - Unable to access load object temp file\n");
2737 return NULL; 2578 return NULL;
2738 } 2579 }
2739 2580
2740 fprintf (tempfile, obstr); 2581 fprintf (tempfile, obstr);
2741 fclose (tempfile); 2582 fclose (tempfile);
2742 2583
2743 op = get_object (); 2584 op = object::create ();
2744 2585
2745 object_thawer thawer (filename); 2586 object_thawer thawer (filename);
2746 2587
2747 if (thawer) 2588 if (thawer)
2748 load_object (thawer, op, 0); 2589 load_object (thawer, op, 0);
… …
2758 * returns NULL if no match. 2599 * returns NULL if no match.
2759 */ 2600 */
2760object * 2601object *
2761find_obj_by_type_subtype (const object *who, int type, int subtype) 2602find_obj_by_type_subtype (const object *who, int type, int subtype)
2762{ 2603{
2763 object * 2604 object *tmp;
2764 tmp;
2765 2605
2766 for (tmp = who->inv; tmp; tmp = tmp->below) 2606 for (tmp = who->inv; tmp; tmp = tmp->below)
2767 if (tmp->type == type && tmp->subtype == subtype) 2607 if (tmp->type == type && tmp->subtype == subtype)
2768 return tmp; 2608 return tmp;
2769 2609
… …
2777 * do the desired thing. 2617 * do the desired thing.
2778 */ 2618 */
2779key_value * 2619key_value *
2780get_ob_key_link (const object *ob, const char *key) 2620get_ob_key_link (const object *ob, const char *key)
2781{ 2621{
2782 key_value * 2622 key_value *link;
2783 link;
2784 2623
2785 for (link = ob->key_values; link != NULL; link = link->next) 2624 for (link = ob->key_values; link != NULL; link = link->next)
2786 {
2787 if (link->key == key) 2625 if (link->key == key)
2788 {
2789 return link; 2626 return link;
2790 }
2791 }
2792 2627
2793 return NULL; 2628 return NULL;
2794} 2629}
2795 2630
2796/* 2631/*

Diff Legend

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