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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.70 by root, Tue Dec 19 05:12:52 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;
834object::vector object::objects; // not yet used
835object *object::first;
923 836
924void object::free_mortals () 837void object::free_mortals ()
925{ 838{
926 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();) 839 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927 if ((*i)->refcnt) 840 if ((*i)->refcnt)
928 ++i; // further delay freeing 841 ++i; // further delay freeing
929 else 842 else
930 { 843 {
931 delete *i; 844 delete *i;
932 mortals.erase (i); 845 mortals.erase (i);
933 } 846 }
934
935 static int lastmortals = 0;//D
936
937 if (mortals.size() != lastmortals)//D
938 {
939 lastmortals = mortals.size ();//D
940 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941 }
942} 847}
943 848
944object::object () 849object::object ()
945{ 850{
946 SET_FLAG (this, FLAG_REMOVED); 851 SET_FLAG (this, FLAG_REMOVED);
947 852
948 expmul = 1.0; 853 expmul = 1.0;
949 face = blank_face; 854 face = blank_face;
950 attacked_by_count = -1;
951} 855}
952 856
953object::~object () 857object::~object ()
954{ 858{
955 free_key_values (this); 859 free_key_values (this);
… …
959{ 863{
960 count = ++ob_count; 864 count = ++ob_count;
961 uuid = gen_uuid (); 865 uuid = gen_uuid ();
962 866
963 prev = 0; 867 prev = 0;
964 next = objects; 868 next = object::first;
965 869
966 if (objects) 870 if (object::first)
967 objects->prev = this; 871 object::first->prev = this;
968 872
969 objects = this; 873 object::first = this;
970} 874}
971 875
972void object::unlink () 876void object::unlink ()
973{ 877{
974 //count = 0;//D
975 if (!prev && !next) return;//D
976
977 if (this == objects) 878 if (this == object::first)
978 objects = next; 879 object::first = next;
979 880
980 /* Remove this object from the list of used objects */ 881 /* Remove this object from the list of used objects */
981 if (prev) prev->next = next; 882 if (prev) prev->next = next;
982 if (next) next->prev = prev; 883 if (next) next->prev = prev;
983 884
… …
997 * 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
998 * free objects. The IS_FREED() flag is set in the object. 899 * free objects. The IS_FREED() flag is set in the object.
999 * The object must have been removed by remove_ob() first for 900 * The object must have been removed by remove_ob() first for
1000 * this function to succeed. 901 * this function to succeed.
1001 * 902 *
1002 * 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
1003 * inventory to the ground. 904 * inventory to the ground.
1004 */ 905 */
1005void object::free (bool free_inventory) 906void object::destroy (bool destroy_inventory)
1006{ 907{
1007 if (QUERY_FLAG (this, FLAG_FREED)) 908 if (QUERY_FLAG (this, FLAG_FREED))
1008 return; 909 return;
1009 910
1010 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 911 if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011 remove_friendly_object (this); 912 remove_friendly_object (this);
1012 913
1013 if (!QUERY_FLAG (this, FLAG_REMOVED)) 914 if (!QUERY_FLAG (this, FLAG_REMOVED))
1014 remove_ob (this); 915 remove ();
1015 916
1016 SET_FLAG (this, FLAG_FREED); 917 SET_FLAG (this, FLAG_FREED);
1017 918
1018 if (more) 919 if (more)
1019 { 920 {
1020 more->free (free_inventory); 921 more->destroy (destroy_inventory);
1021 more = 0; 922 more = 0;
1022 } 923 }
1023 924
1024 if (inv) 925 if (inv)
1025 { 926 {
1026 /* Only if the space blocks everything do we not process - 927 /* Only if the space blocks everything do we not process -
1027 * if some form of movement is allowed, let objects 928 * if some form of movement is allowed, let objects
1028 * drop on that space. 929 * drop on that space.
1029 */ 930 */
1030 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)
1031 { 932 {
1032 object *op = inv; 933 object *op = inv;
1033 934
1034 while (op) 935 while (op)
1035 { 936 {
1036 object *tmp = op->below; 937 object *tmp = op->below;
1037 op->free (free_inventory); 938 op->destroy (destroy_inventory);
1038 op = tmp; 939 op = tmp;
1039 } 940 }
1040 } 941 }
1041 else 942 else
1042 { /* Put objects in inventory onto this space */ 943 { /* Put objects in inventory onto this space */
… …
1044 945
1045 while (op) 946 while (op)
1046 { 947 {
1047 object *tmp = op->below; 948 object *tmp = op->below;
1048 949
1049 remove_ob (op); 950 op->remove ();
1050 951
1051 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 952 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1052 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 953 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1053 free_object (op); 954 op->destroy ();
1054 else 955 else
1055 { 956 {
1056 op->x = x; 957 op->x = x;
1057 op->y = y; 958 op->y = y;
1058 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 */
… …
1061 op = tmp; 962 op = tmp;
1062 } 963 }
1063 } 964 }
1064 } 965 }
1065 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
1066 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;
1067 994
1068 /* Remove object from the active list */ 995 /* Remove object from the active list */
1069 speed = 0; 996 speed = 0;
1070 update_ob_speed (this); 997 update_ob_speed (this);
1071 998
… …
1076 1003
1077/* 1004/*
1078 * sub_weight() recursively (outwards) subtracts a number from the 1005 * sub_weight() recursively (outwards) subtracts a number from the
1079 * 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)).
1080 */ 1007 */
1081
1082void 1008void
1083sub_weight (object *op, signed long weight) 1009sub_weight (object *op, signed long weight)
1084{ 1010{
1085 while (op != NULL) 1011 while (op != NULL)
1086 { 1012 {
1087 if (op->type == CONTAINER) 1013 if (op->type == CONTAINER)
1088 {
1089 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1014 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090 } 1015
1091 op->carrying -= weight; 1016 op->carrying -= weight;
1092 op = op->env; 1017 op = op->env;
1093 } 1018 }
1094} 1019}
1095 1020
1096/* remove_ob(op): 1021/* op->remove ():
1097 * 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
1098 * 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
1099 * object will have no environment. If the object previously had an 1024 * object will have no environment. If the object previously had an
1100 * environment, the x and y coordinates will be updated to 1025 * environment, the x and y coordinates will be updated to
1101 * the previous environment. 1026 * the previous environment.
1102 * Beware: This function is called from the editor as well! 1027 * Beware: This function is called from the editor as well!
1103 */ 1028 */
1104
1105void 1029void
1106remove_ob (object *op) 1030object::remove ()
1107{ 1031{
1032 object *tmp, *last = 0;
1108 object * 1033 object *otmp;
1109 tmp, *
1110 last = NULL;
1111 object *
1112 otmp;
1113 1034
1114 tag_t
1115 tag;
1116 int
1117 check_walk_off; 1035 int check_walk_off;
1118 mapstruct *
1119 m;
1120 1036
1121 sint16
1122 x,
1123 y;
1124
1125 if (QUERY_FLAG (op, FLAG_REMOVED)) 1037 if (QUERY_FLAG (this, FLAG_REMOVED))
1126 return; 1038 return;
1127 1039
1128 SET_FLAG (op, FLAG_REMOVED); 1040 SET_FLAG (this, FLAG_REMOVED);
1129 1041
1130 if (op->more != NULL) 1042 if (more)
1131 remove_ob (op->more); 1043 more->remove ();
1132 1044
1133 /* 1045 /*
1134 * In this case, the object to be removed is in someones 1046 * In this case, the object to be removed is in someones
1135 * inventory. 1047 * inventory.
1136 */ 1048 */
1137 if (op->env != NULL) 1049 if (env)
1138 { 1050 {
1139 if (op->nrof) 1051 if (nrof)
1140 sub_weight (op->env, op->weight * op->nrof); 1052 sub_weight (env, weight * nrof);
1141 else 1053 else
1142 sub_weight (op->env, op->weight + op->carrying); 1054 sub_weight (env, weight + carrying);
1143 1055
1144 /* 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
1145 * made to players inventory. If set, avoiding the call 1057 * made to players inventory. If set, avoiding the call
1146 * to save cpu time. 1058 * to save cpu time.
1147 */ 1059 */
1148 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))
1149 fix_player (otmp); 1061 fix_player (otmp);
1150 1062
1151 if (op->above != NULL) 1063 if (above != NULL)
1152 op->above->below = op->below; 1064 above->below = below;
1153 else 1065 else
1154 op->env->inv = op->below; 1066 env->inv = below;
1155 1067
1156 if (op->below != NULL) 1068 if (below != NULL)
1157 op->below->above = op->above; 1069 below->above = above;
1158 1070
1159 /* we set up values so that it could be inserted into 1071 /* we set up values so that it could be inserted into
1160 * 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
1161 * to the caller to decide what we want to do. 1073 * to the caller to decide what we want to do.
1162 */ 1074 */
1163 op->x = op->env->x, op->y = op->env->y; 1075 x = env->x, y = env->y;
1164 op->map = op->env->map; 1076 map = env->map;
1165 op->above = NULL, op->below = NULL; 1077 above = 0, below = 0;
1166 op->env = NULL; 1078 env = 0;
1167 } 1079 }
1168 else if (op->map) 1080 else if (map)
1169 { 1081 {
1170 x = op->x;
1171 y = op->y;
1172 m = get_map_from_coord (op->map, &x, &y);
1173
1174 if (!m)
1175 {
1176 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177 op->map->path, op->x, op->y);
1178 /* in old days, we used to set x and y to 0 and continue.
1179 * it seems if we get into this case, something is probablye
1180 * screwed up and should be fixed.
1181 */
1182 abort ();
1183 }
1184
1185 if (op->map != m)
1186 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187 op->map->path, m->path, op->x, op->y, x, y);
1188
1189 /* Re did the following section of code - it looks like it had 1082 /* Re did the following section of code - it looks like it had
1190 * lots of logic for things we no longer care about 1083 * lots of logic for things we no longer care about
1191 */ 1084 */
1192 1085
1193 /* link the object above us */ 1086 /* link the object above us */
1194 if (op->above) 1087 if (above)
1195 op->above->below = op->below; 1088 above->below = below;
1196 else 1089 else
1197 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 */
1198 1091
1199 /* Relink the object below us, if there is one */ 1092 /* Relink the object below us, if there is one */
1200 if (op->below) 1093 if (below)
1201 op->below->above = op->above; 1094 below->above = above;
1202 else 1095 else
1203 { 1096 {
1204 /* 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
1205 * use translated coordinates in case some oddness with map tiling is 1098 * use translated coordinates in case some oddness with map tiling is
1206 * evident 1099 * evident
1207 */ 1100 */
1208 if (GET_MAP_OB (m, x, y) != op) 1101 if (GET_MAP_OB (map, x, y) != this)
1209 { 1102 {
1210 dump_object (op); 1103 char *dump = dump_object (this);
1211 LOG (llevError, 1104 LOG (llevError,
1212 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 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);
1213 dump_object (GET_MAP_OB (m, x, y)); 1107 dump = dump_object (GET_MAP_OB (map, x, y));
1214 LOG (llevError, "%s\n", errmsg); 1108 LOG (llevError, "%s\n", dump);
1109 free (dump);
1215 } 1110 }
1216 1111
1217 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1218 } 1113 }
1219 1114
1220 op->above = 0; 1115 above = 0;
1221 op->below = 0; 1116 below = 0;
1222 1117
1223 if (op->map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1224 return; 1119 return;
1225 1120
1226 tag = op->count;
1227 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1121 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228 1122
1229 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)
1230 { 1124 {
1231 /* 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
1232 * being removed. 1126 * being removed.
1233 */ 1127 */
1234 1128
1235 if (tmp->type == PLAYER && tmp != op) 1129 if (tmp->type == PLAYER && tmp != this)
1236 { 1130 {
1237 /* If a container that the player is currently using somehow gets 1131 /* If a container that the player is currently using somehow gets
1238 * removed (most likely destroyed), update the player view 1132 * removed (most likely destroyed), update the player view
1239 * appropriately. 1133 * appropriately.
1240 */ 1134 */
1241 if (tmp->container == op) 1135 if (tmp->container == this)
1242 { 1136 {
1243 CLEAR_FLAG (op, FLAG_APPLIED); 1137 CLEAR_FLAG (this, FLAG_APPLIED);
1244 tmp->container = NULL; 1138 tmp->container = 0;
1245 } 1139 }
1246 1140
1247 tmp->contr->socket.update_look = 1; 1141 tmp->contr->socket->floorbox_update ();
1248 } 1142 }
1249 1143
1250 /* See if player moving off should effect something */ 1144 /* See if player moving off should effect something */
1251 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1145 if (check_walk_off
1146 && ((move_type & tmp->move_off)
1147 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1252 { 1148 {
1253 move_apply (tmp, op, NULL); 1149 move_apply (tmp, this, 0);
1254 1150
1255 if (was_destroyed (op, tag)) 1151 if (destroyed ())
1256 {
1257 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 ());
1258 }
1259 } 1153 }
1260 1154
1261 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1155 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262 1156
1263 if (tmp->above == tmp) 1157 if (tmp->above == tmp)
1264 tmp->above = NULL; 1158 tmp->above = 0;
1265 1159
1266 last = tmp; 1160 last = tmp;
1267 } 1161 }
1268 1162
1269 /* last == NULL of there are no objects on this space */ 1163 /* last == NULL of there are no objects on this space */
1270 if (last == NULL) 1164 if (!last)
1271 { 1165 {
1272 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273 * 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
1274 * 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
1275 * be correct anyways. 1169 * be correct anyways.
1276 */ 1170 */
1277 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1278 update_position (op->map, op->x, op->y); 1172 update_position (map, x, y);
1279 } 1173 }
1280 else 1174 else
1281 update_object (last, UP_OBJ_REMOVE); 1175 update_object (last, UP_OBJ_REMOVE);
1282 1176
1283 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284 update_all_los (op->map, op->x, op->y); 1178 update_all_los (map, x, y);
1285 } 1179 }
1286} 1180}
1287 1181
1288/* 1182/*
1289 * merge_ob(op,top): 1183 * merge_ob(op,top):
… …
1304 1198
1305 for (; top != NULL; top = top->below) 1199 for (; top != NULL; top = top->below)
1306 { 1200 {
1307 if (top == op) 1201 if (top == op)
1308 continue; 1202 continue;
1309 if (CAN_MERGE (op, top)) 1203
1204 if (object::can_merge (op, top))
1310 { 1205 {
1311 top->nrof += op->nrof; 1206 top->nrof += op->nrof;
1312 1207
1313/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1208/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1314 op->weight = 0; /* Don't want any adjustements now */ 1209 op->weight = 0; /* Don't want any adjustements now */
1315 remove_ob (op); 1210 op->destroy ();
1316 free_object (op);
1317 return top; 1211 return top;
1318 } 1212 }
1319 } 1213 }
1320 1214
1321 return NULL; 1215 return 0;
1322} 1216}
1323 1217
1324/* 1218/*
1325 * 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
1326 * job preparing multi-part monsters 1220 * job preparing multi-part monsters
1327 */ 1221 */
1328object * 1222object *
1329insert_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)
1330{ 1224{
1331 object *tmp; 1225 object *tmp;
1332 1226
1333 if (op->head) 1227 if (op->head)
1334 op = op->head; 1228 op = op->head;
… …
1362 * NULL if 'op' was destroyed 1256 * NULL if 'op' was destroyed
1363 * just 'op' otherwise 1257 * just 'op' otherwise
1364 */ 1258 */
1365 1259
1366object * 1260object *
1367insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1261insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1368{ 1262{
1369 object *tmp, *top, *floor = NULL; 1263 object *tmp, *top, *floor = NULL;
1370 sint16 x, y; 1264 sint16 x, y;
1371 1265
1372 if (QUERY_FLAG (op, FLAG_FREED)) 1266 if (QUERY_FLAG (op, FLAG_FREED))
… …
1375 return NULL; 1269 return NULL;
1376 } 1270 }
1377 1271
1378 if (m == NULL) 1272 if (m == NULL)
1379 { 1273 {
1380 dump_object (op); 1274 char *dump = dump_object (op);
1381 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);
1382 return op; 1277 return op;
1383 } 1278 }
1384 1279
1385 if (out_of_map (m, op->x, op->y)) 1280 if (out_of_map (m, op->x, op->y))
1386 { 1281 {
1387 dump_object (op); 1282 char *dump = dump_object (op);
1388 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);
1389#ifdef MANY_CORES 1284#ifdef MANY_CORES
1390 /* 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
1391 * 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
1392 * improperly inserted. 1287 * improperly inserted.
1393 */ 1288 */
1394 abort (); 1289 abort ();
1395#endif 1290#endif
1291 free (dump);
1396 return op; 1292 return op;
1397 } 1293 }
1398 1294
1399 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1295 if (!QUERY_FLAG (op, FLAG_REMOVED))
1400 { 1296 {
1401 dump_object (op); 1297 char *dump = dump_object (op);
1402 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);
1403 return op; 1300 return op;
1404 } 1301 }
1405 1302
1406 if (op->more != NULL) 1303 if (op->more != NULL)
1407 { 1304 {
… …
1445 1342
1446 /* this has to be done after we translate the coordinates. 1343 /* this has to be done after we translate the coordinates.
1447 */ 1344 */
1448 if (op->nrof && !(flag & INS_NO_MERGE)) 1345 if (op->nrof && !(flag & INS_NO_MERGE))
1449 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)
1450 if (CAN_MERGE (op, tmp)) 1347 if (object::can_merge (op, tmp))
1451 { 1348 {
1452 op->nrof += tmp->nrof; 1349 op->nrof += tmp->nrof;
1453 remove_ob (tmp); 1350 tmp->destroy ();
1454 free_object (tmp);
1455 } 1351 }
1456 1352
1457 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 */
1458 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1459 1355
… …
1587 * it, so save a few ticks and start from there. 1483 * it, so save a few ticks and start from there.
1588 */ 1484 */
1589 if (!(flag & INS_MAP_LOAD)) 1485 if (!(flag & INS_MAP_LOAD))
1590 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)
1591 if (tmp->type == PLAYER) 1487 if (tmp->type == PLAYER)
1592 tmp->contr->socket.update_look = 1; 1488 tmp->contr->socket->floorbox_update ();
1593 1489
1594 /* If this object glows, it may affect lighting conditions that are 1490 /* If this object glows, it may affect lighting conditions that are
1595 * 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
1596 * 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
1597 * on the map will get recalculated. The players could very well 1493 * on the map will get recalculated. The players could very well
… …
1605 1501
1606 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1502 /* updates flags (blocked, alive, no magic, etc) for this map space */
1607 update_object (op, UP_OBJ_INSERT); 1503 update_object (op, UP_OBJ_INSERT);
1608 1504
1609 /* Don't know if moving this to the end will break anything. However, 1505 /* Don't know if moving this to the end will break anything. However,
1610 * we want to have update_look set above before calling this. 1506 * we want to have floorbox_update called before calling this.
1611 * 1507 *
1612 * check_move_on() must be after this because code called from 1508 * check_move_on() must be after this because code called from
1613 * check_move_on() depends on correct map flags (so functions like 1509 * check_move_on() depends on correct map flags (so functions like
1614 * blocked() and wall() work properly), and these flags are updated by 1510 * blocked() and wall() work properly), and these flags are updated by
1615 * update_object(). 1511 * update_object().
… …
1645 tmp1; 1541 tmp1;
1646 1542
1647 /* first search for itself and remove any old instances */ 1543 /* first search for itself and remove any old instances */
1648 1544
1649 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)
1650 {
1651 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1652 { 1547 tmp->destroy ();
1653 remove_ob (tmp);
1654 free_object (tmp);
1655 }
1656 }
1657 1548
1658 tmp1 = arch_to_object (find_archetype (arch_string)); 1549 tmp1 = arch_to_object (archetype::find (arch_string));
1659 1550
1660 tmp1->x = op->x; 1551 tmp1->x = op->x;
1661 tmp1->y = op->y; 1552 tmp1->y = op->y;
1662 insert_ob_in_map (tmp1, op->map, op, 0); 1553 insert_ob_in_map (tmp1, op->map, op, 0);
1663} 1554}
… …
1671 */ 1562 */
1672 1563
1673object * 1564object *
1674get_split_ob (object *orig_ob, uint32 nr) 1565get_split_ob (object *orig_ob, uint32 nr)
1675{ 1566{
1676 object * 1567 object *newob;
1677 newob;
1678 int
1679 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1680 1569
1681 if (orig_ob->nrof < nr) 1570 if (orig_ob->nrof < nr)
1682 { 1571 {
1683 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);
1684 return NULL; 1573 return NULL;
1685 } 1574 }
1686 1575
1687 newob = object_create_clone (orig_ob); 1576 newob = object_create_clone (orig_ob);
1688 1577
1689 if ((orig_ob->nrof -= nr) < 1) 1578 if ((orig_ob->nrof -= nr) < 1)
1690 { 1579 orig_ob->destroy (1);
1691 if (!is_removed)
1692 remove_ob (orig_ob);
1693 free_object2 (orig_ob, 1);
1694 }
1695 else if (!is_removed) 1580 else if (!is_removed)
1696 { 1581 {
1697 if (orig_ob->env != NULL) 1582 if (orig_ob->env != NULL)
1698 sub_weight (orig_ob->env, orig_ob->weight * nr); 1583 sub_weight (orig_ob->env, orig_ob->weight * nr);
1699 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)
… …
1763 esrv_send_item (tmp, op); 1648 esrv_send_item (tmp, op);
1764 } 1649 }
1765 } 1650 }
1766 else 1651 else
1767 { 1652 {
1768 remove_ob (op); 1653 op->remove ();
1769 op->nrof = 0; 1654 op->nrof = 0;
1770 if (tmp) 1655 if (tmp)
1771 { 1656 {
1772 esrv_del_item (tmp->contr, op->count); 1657 esrv_del_item (tmp->contr, op->count);
1773 } 1658 }
… …
1779 1664
1780 if (i < op->nrof) 1665 if (i < op->nrof)
1781 op->nrof -= i; 1666 op->nrof -= i;
1782 else 1667 else
1783 { 1668 {
1784 remove_ob (op); 1669 op->remove ();
1785 op->nrof = 0; 1670 op->nrof = 0;
1786 } 1671 }
1787 1672
1788 /* Since we just removed op, op->above is null */ 1673 /* Since we just removed op, op->above is null */
1789 for (tmp = above; tmp != NULL; tmp = tmp->above) 1674 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1798 1683
1799 if (op->nrof) 1684 if (op->nrof)
1800 return op; 1685 return op;
1801 else 1686 else
1802 { 1687 {
1803 free_object (op); 1688 op->destroy ();
1804 return NULL; 1689 return NULL;
1805 } 1690 }
1806} 1691}
1807 1692
1808/* 1693/*
… …
1821 op->carrying += weight; 1706 op->carrying += weight;
1822 op = op->env; 1707 op = op->env;
1823 } 1708 }
1824} 1709}
1825 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
1826/* 1731/*
1827 * insert_ob_in_ob(op,environment): 1732 * env->insert (op)
1828 * This function inserts the object op in the linked list 1733 * This function inserts the object op in the linked list
1829 * inside the object environment. 1734 * inside the object environment.
1830 * 1735 *
1831 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832 * the inventory at the last position or next to other objects of the same
1833 * type.
1834 * Frank: Now sorted by type, archetype and magic!
1835 *
1836 * The function returns now pointer to inserted item, and return value can 1736 * The function returns now pointer to inserted item, and return value can
1837 * be != op, if items are merged. -Tero 1737 * be != op, if items are merged. -Tero
1838 */ 1738 */
1839 1739
1840object * 1740object *
1841insert_ob_in_ob (object *op, object *where) 1741object::insert (object *op)
1842{ 1742{
1843 object * 1743 object *tmp, *otmp;
1844 tmp, *
1845 otmp;
1846 1744
1847 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1745 if (!QUERY_FLAG (op, FLAG_REMOVED))
1848 { 1746 op->remove ();
1849 dump_object (op);
1850 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851 return op;
1852 }
1853
1854 if (where == NULL)
1855 {
1856 dump_object (op);
1857 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858 return op;
1859 }
1860
1861 if (where->head)
1862 {
1863 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864 where = where->head;
1865 }
1866 1747
1867 if (op->more) 1748 if (op->more)
1868 { 1749 {
1869 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);
1870 return op; 1751 return op;
… …
1872 1753
1873 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874 CLEAR_FLAG (op, FLAG_REMOVED); 1755 CLEAR_FLAG (op, FLAG_REMOVED);
1875 if (op->nrof) 1756 if (op->nrof)
1876 { 1757 {
1877 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1758 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878 if (CAN_MERGE (tmp, op)) 1759 if (object::can_merge (tmp, op))
1879 { 1760 {
1880 /* return the original object and remove inserted object 1761 /* return the original object and remove inserted object
1881 (client needs the original object) */ 1762 (client needs the original object) */
1882 tmp->nrof += op->nrof; 1763 tmp->nrof += op->nrof;
1883 /* Weight handling gets pretty funky. Since we are adding to 1764 /* Weight handling gets pretty funky. Since we are adding to
1884 * tmp->nrof, we need to increase the weight. 1765 * tmp->nrof, we need to increase the weight.
1885 */ 1766 */
1886 add_weight (where, op->weight * op->nrof); 1767 add_weight (this, op->weight * op->nrof);
1887 SET_FLAG (op, FLAG_REMOVED); 1768 SET_FLAG (op, FLAG_REMOVED);
1888 free_object (op); /* free the inserted object */ 1769 op->destroy (); /* free the inserted object */
1889 op = tmp; 1770 op = tmp;
1890 remove_ob (op); /* and fix old object's links */ 1771 op->remove (); /* and fix old object's links */
1891 CLEAR_FLAG (op, FLAG_REMOVED); 1772 CLEAR_FLAG (op, FLAG_REMOVED);
1892 break; 1773 break;
1893 } 1774 }
1894 1775
1895 /* I assume combined objects have no inventory 1776 /* I assume combined objects have no inventory
1896 * We add the weight - this object could have just been removed 1777 * We add the weight - this object could have just been removed
1897 * (if it was possible to merge). calling remove_ob will subtract 1778 * (if it was possible to merge). calling remove_ob will subtract
1898 * the weight, so we need to add it in again, since we actually do 1779 * the weight, so we need to add it in again, since we actually do
1899 * the linking below 1780 * the linking below
1900 */ 1781 */
1901 add_weight (where, op->weight * op->nrof); 1782 add_weight (this, op->weight * op->nrof);
1902 } 1783 }
1903 else 1784 else
1904 add_weight (where, (op->weight + op->carrying)); 1785 add_weight (this, (op->weight + op->carrying));
1905 1786
1906 otmp = is_player_inv (where); 1787 otmp = is_player_inv (this);
1907 if (otmp && otmp->contr != NULL) 1788 if (otmp && otmp->contr)
1908 {
1909 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910 fix_player (otmp); 1790 fix_player (otmp);
1911 }
1912 1791
1913 op->map = NULL; 1792 op->map = NULL;
1914 op->env = where; 1793 op->env = this;
1915 op->above = NULL; 1794 op->above = NULL;
1916 op->below = NULL; 1795 op->below = NULL;
1917 op->x = 0, op->y = 0; 1796 op->x = 0, op->y = 0;
1918 1797
1919 /* 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 */
1920 if ((op->glow_radius != 0) && where->map) 1799 if ((op->glow_radius != 0) && map)
1921 { 1800 {
1922#ifdef DEBUG_LIGHTS 1801#ifdef DEBUG_LIGHTS
1923 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);
1924#endif /* DEBUG_LIGHTS */ 1803#endif /* DEBUG_LIGHTS */
1925 if (MAP_DARKNESS (where->map)) 1804 if (MAP_DARKNESS (map))
1926 update_all_los (where->map, where->x, where->y); 1805 update_all_los (map, x, y);
1927 } 1806 }
1928 1807
1929 /* 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.
1930 * It sure simplifies this function... 1809 * It sure simplifies this function...
1931 */ 1810 */
1932 if (where->inv == NULL) 1811 if (!inv)
1933 where->inv = op; 1812 inv = op;
1934 else 1813 else
1935 { 1814 {
1936 op->below = where->inv; 1815 op->below = inv;
1937 op->below->above = op; 1816 op->below->above = op;
1938 where->inv = op; 1817 inv = op;
1939 } 1818 }
1819
1940 return op; 1820 return op;
1941} 1821}
1942 1822
1943/* 1823/*
1944 * Checks if any objects has a move_type that matches objects 1824 * Checks if any objects has a move_type that matches objects
… …
1962 */ 1842 */
1963 1843
1964int 1844int
1965check_move_on (object *op, object *originator) 1845check_move_on (object *op, object *originator)
1966{ 1846{
1967 object * 1847 object *tmp;
1968 tmp; 1848 maptile *m = op->map;
1969 tag_t
1970 tag;
1971 mapstruct *
1972 m = op->map;
1973 int
1974 x = op->x, y = op->y; 1849 int x = op->x, y = op->y;
1975 1850
1976 MoveType 1851 MoveType move_on, move_slow, move_block;
1977 move_on,
1978 move_slow,
1979 move_block;
1980 1852
1981 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1853 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982 return 0; 1854 return 0;
1983
1984 tag = op->count;
1985 1855
1986 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);
1987 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);
1988 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);
1989 1859
… …
2050 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1920 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1921 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2052 { 1922 {
2053 move_apply (tmp, op, originator); 1923 move_apply (tmp, op, originator);
2054 1924
2055 if (was_destroyed (op, tag)) 1925 if (op->destroyed ())
2056 return 1; 1926 return 1;
2057 1927
2058 /* what the person/creature stepped onto has moved the object 1928 /* what the person/creature stepped onto has moved the object
2059 * someplace new. Don't process any further - if we did, 1929 * someplace new. Don't process any further - if we did,
2060 * have a feeling strange problems would result. 1930 * have a feeling strange problems would result.
… …
2072 * a matching archetype at the given map and coordinates. 1942 * a matching archetype at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1943 * The first matching object is returned, or NULL if none.
2074 */ 1944 */
2075 1945
2076object * 1946object *
2077present_arch (const archetype *at, mapstruct *m, int x, int y) 1947present_arch (const archetype *at, maptile *m, int x, int y)
2078{ 1948{
2079 object * 1949 object *
2080 tmp; 1950 tmp;
2081 1951
2082 if (m == NULL || out_of_map (m, x, y)) 1952 if (m == NULL || out_of_map (m, x, y))
… …
2095 * a matching type variable at the given map and coordinates. 1965 * a matching type variable at the given map and coordinates.
2096 * The first matching object is returned, or NULL if none. 1966 * The first matching object is returned, or NULL if none.
2097 */ 1967 */
2098 1968
2099object * 1969object *
2100present (unsigned char type, mapstruct *m, int x, int y) 1970present (unsigned char type, maptile *m, int x, int y)
2101{ 1971{
2102 object * 1972 object *
2103 tmp; 1973 tmp;
2104 1974
2105 if (out_of_map (m, x, y)) 1975 if (out_of_map (m, x, y))
… …
2245 * 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
2246 * customized, changed states, etc. 2116 * customized, changed states, etc.
2247 */ 2117 */
2248 2118
2249int 2119int
2250find_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)
2251{ 2121{
2252 int 2122 int
2253 i, 2123 i,
2254 index = 0, flag; 2124 index = 0, flag;
2255 static int 2125 static int
… …
2276 return -1; 2146 return -1;
2277 return altern[RANDOM () % index]; 2147 return altern[RANDOM () % index];
2278} 2148}
2279 2149
2280/* 2150/*
2281 * find_first_free_spot(archetype, mapstruct, x, y) works like 2151 * find_first_free_spot(archetype, maptile, x, y) works like
2282 * find_free_spot(), but it will search max number of squares. 2152 * find_free_spot(), but it will search max number of squares.
2283 * 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.
2284 * 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.
2285 */ 2155 */
2286 2156
2287int 2157int
2288find_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)
2289{ 2159{
2290 int 2160 int
2291 i; 2161 i;
2292 2162
2293 for (i = 0; i < SIZEOFFREE; i++) 2163 for (i = 0; i < SIZEOFFREE; i++)
… …
2357 * 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
2358 * there is capable of. 2228 * there is capable of.
2359 */ 2229 */
2360 2230
2361int 2231int
2362find_dir (mapstruct *m, int x, int y, object *exclude) 2232find_dir (maptile *m, int x, int y, object *exclude)
2363{ 2233{
2364 int 2234 int
2365 i, 2235 i,
2366 max = SIZEOFFREE, mflags; 2236 max = SIZEOFFREE, mflags;
2367 2237
2368 sint16 nx, ny; 2238 sint16 nx, ny;
2369 object * 2239 object *
2370 tmp; 2240 tmp;
2371 mapstruct * 2241 maptile *
2372 mp; 2242 mp;
2373 2243
2374 MoveType blocked, move_type; 2244 MoveType blocked, move_type;
2375 2245
2376 if (exclude && exclude->head) 2246 if (exclude && exclude->head)
… …
2584 * Modified to be map tile aware -.MSW 2454 * Modified to be map tile aware -.MSW
2585 */ 2455 */
2586 2456
2587 2457
2588int 2458int
2589can_see_monsterP (mapstruct *m, int x, int y, int dir) 2459can_see_monsterP (maptile *m, int x, int y, int dir)
2590{ 2460{
2591 sint16 dx, dy; 2461 sint16 dx, dy;
2592 int 2462 int
2593 mflags; 2463 mflags;
2594 2464
… …
2643 * create clone from object to another 2513 * create clone from object to another
2644 */ 2514 */
2645object * 2515object *
2646object_create_clone (object *asrc) 2516object_create_clone (object *asrc)
2647{ 2517{
2648 object *
2649 dst = NULL, *tmp, *src, *part, *prev, *item; 2518 object *dst = 0, *tmp, *src, *part, *prev, *item;
2650 2519
2651 if (!asrc) 2520 if (!asrc)
2652 return NULL; 2521 return 0;
2522
2653 src = asrc; 2523 src = asrc;
2654 if (src->head) 2524 if (src->head)
2655 src = src->head; 2525 src = src->head;
2656 2526
2657 prev = NULL; 2527 prev = 0;
2658 for (part = src; part; part = part->more) 2528 for (part = src; part; part = part->more)
2659 { 2529 {
2660 tmp = get_object (); 2530 tmp = part->clone ();
2661 copy_object (part, tmp);
2662 tmp->x -= src->x; 2531 tmp->x -= src->x;
2663 tmp->y -= src->y; 2532 tmp->y -= src->y;
2533
2664 if (!part->head) 2534 if (!part->head)
2665 { 2535 {
2666 dst = tmp; 2536 dst = tmp;
2667 tmp->head = NULL; 2537 tmp->head = 0;
2668 } 2538 }
2669 else 2539 else
2670 { 2540 {
2671 tmp->head = dst; 2541 tmp->head = dst;
2672 } 2542 }
2543
2673 tmp->more = NULL; 2544 tmp->more = 0;
2545
2674 if (prev) 2546 if (prev)
2675 prev->more = tmp; 2547 prev->more = tmp;
2548
2676 prev = tmp; 2549 prev = tmp;
2677 } 2550 }
2678 2551
2679 /*** copy inventory ***/
2680 for (item = src->inv; item; item = item->below) 2552 for (item = src->inv; item; item = item->below)
2681 {
2682 (void) insert_ob_in_ob (object_create_clone (item), dst); 2553 insert_ob_in_ob (object_create_clone (item), dst);
2683 }
2684 2554
2685 return dst; 2555 return dst;
2686} 2556}
2687 2557
2688/* return true if the object was destroyed, 0 otherwise */
2689int
2690was_destroyed (const object *op, tag_t old_tag)
2691{
2692 /* checking for FLAG_FREED isn't necessary, but makes this function more
2693 * robust */
2694 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695}
2696
2697/* GROS - Creates an object using a string representing its content. */ 2558/* GROS - Creates an object using a string representing its content. */
2698
2699/* Basically, we save the content of the string to a temp file, then call */ 2559/* Basically, we save the content of the string to a temp file, then call */
2700
2701/* load_object on it. I admit it is a highly inefficient way to make things, */ 2560/* load_object on it. I admit it is a highly inefficient way to make things, */
2702
2703/* but it was simple to make and allows reusing the load_object function. */ 2561/* but it was simple to make and allows reusing the load_object function. */
2704
2705/* Remember not to use load_object_str in a time-critical situation. */ 2562/* Remember not to use load_object_str in a time-critical situation. */
2706
2707/* Also remember that multiparts objects are not supported for now. */ 2563/* Also remember that multiparts objects are not supported for now. */
2708 2564
2709object * 2565object *
2710load_object_str (const char *obstr) 2566load_object_str (const char *obstr)
2711{ 2567{
2712 object * 2568 object *op;
2713 op;
2714 char
2715 filename[MAX_BUF]; 2569 char filename[MAX_BUF];
2716 2570
2717 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2571 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718 2572
2719 FILE *
2720 tempfile = fopen (filename, "w"); 2573 FILE *tempfile = fopen (filename, "w");
2721 2574
2722 if (tempfile == NULL) 2575 if (tempfile == NULL)
2723 { 2576 {
2724 LOG (llevError, "Error - Unable to access load object temp file\n"); 2577 LOG (llevError, "Error - Unable to access load object temp file\n");
2725 return NULL; 2578 return NULL;
2726 } 2579 }
2727 2580
2728 fprintf (tempfile, obstr); 2581 fprintf (tempfile, obstr);
2729 fclose (tempfile); 2582 fclose (tempfile);
2730 2583
2731 op = get_object (); 2584 op = object::create ();
2732 2585
2733 object_thawer thawer (filename); 2586 object_thawer thawer (filename);
2734 2587
2735 if (thawer) 2588 if (thawer)
2736 load_object (thawer, op, 0); 2589 load_object (thawer, op, 0);
… …
2746 * returns NULL if no match. 2599 * returns NULL if no match.
2747 */ 2600 */
2748object * 2601object *
2749find_obj_by_type_subtype (const object *who, int type, int subtype) 2602find_obj_by_type_subtype (const object *who, int type, int subtype)
2750{ 2603{
2751 object * 2604 object *tmp;
2752 tmp;
2753 2605
2754 for (tmp = who->inv; tmp; tmp = tmp->below) 2606 for (tmp = who->inv; tmp; tmp = tmp->below)
2755 if (tmp->type == type && tmp->subtype == subtype) 2607 if (tmp->type == type && tmp->subtype == subtype)
2756 return tmp; 2608 return tmp;
2757 2609
… …
2765 * do the desired thing. 2617 * do the desired thing.
2766 */ 2618 */
2767key_value * 2619key_value *
2768get_ob_key_link (const object *ob, const char *key) 2620get_ob_key_link (const object *ob, const char *key)
2769{ 2621{
2770 key_value * 2622 key_value *link;
2771 link;
2772 2623
2773 for (link = ob->key_values; link != NULL; link = link->next) 2624 for (link = ob->key_values; link != NULL; link = link->next)
2774 {
2775 if (link->key == key) 2625 if (link->key == key)
2776 {
2777 return link; 2626 return link;
2778 }
2779 }
2780 2627
2781 return NULL; 2628 return NULL;
2782} 2629}
2783 2630
2784/* 2631/*

Diff Legend

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