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.44 by root, Thu Sep 14 17:29:27 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 2006 UTC

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

Diff Legend

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