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.69 by root, Mon Dec 18 03:00:02 2006 UTC

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

Diff Legend

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