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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.70 by root, Tue Dec 19 05:12:52 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <loader.h> 33#include <loader.h>
35 34
35#include <bitset>
36
36int nrofallocobjects = 0; 37int nrofallocobjects = 0;
37static UUID uuid; 38static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
39 40
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 41object *active_objects; /* List of active objects that need to be processed */
42 42
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 45};
… …
106 _exit (1); 106 _exit (1);
107 } 107 }
108 108
109 uuid.seq = uid; 109 uuid.seq = uid;
110 write_uuid (); 110 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112 fclose (fp); 112 fclose (fp);
113} 113}
114 114
115UUID 115UUID
116gen_uuid () 116gen_uuid ()
… …
185 * 185 *
186 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
187 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
188 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
189 * 189 *
190 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
191 * 191 *
192 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
193 * check weight 193 * check weight
194 */ 194 */
195 195
196bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
197{ 197{
198 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
199 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
200 return 0; 204 return 0;
201 205
202 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
203 return 0;
204
205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
207 * used to store nrof). 209 * used to store nrof).
208 */ 210 */
209 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
219 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
220 222
221 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223 225
224 226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
226 * being locked in inventory should prevent merging.
227 * 0x4 in flags3 is CLIENT_SENT
228 */
229 if ((ob1->arch != ob2->arch) ||
230 (ob1->flags[0] != ob2->flags[0]) ||
231 (ob1->flags[1] != ob2->flags[1]) ||
232 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
235 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
236 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
237 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
238 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
241 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
242 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
243 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
244 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
245 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
246 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
247 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
248 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
249 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
250 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
251 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
252 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
253 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
254 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
255 return 0; 251 return 0;
256 252
257 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
258 * check all objects in the inventory. 254 * check all objects in the inventory.
259 */ 255 */
… …
262 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0; 260 return 0;
265 261
266 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
268 return 0; 264 return 0;
269 265
270 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 267 * if it is valid.
272 */ 268 */
… …
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 373 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 374 * The result of the dump is stored in the static global errmsg array.
379 */ 375 */
380 376
381void 377char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 378dump_object (object *op)
437{ 379{
438 if (op == NULL) 380 if (!op)
439 { 381 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 382
447void 383 object_freezer freezer;
448dump_all_objects (void) 384 save_object (freezer, op, 3);
449{ 385 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 386}
458 387
459/* 388/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 389 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 390 * multi-object 1 which is closest to the second object.
… …
481 */ 410 */
482 411
483object * 412object *
484find_object (tag_t i) 413find_object (tag_t i)
485{ 414{
486 object *op; 415 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 416 if (op->count == i)
490 break; 417 return op;
418
491 return op; 419 return 0;
492} 420}
493 421
494/* 422/*
495 * Returns the first object which has a name equal to the argument. 423 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 424 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 429find_object_name (const char *str)
502{ 430{
503 shstr_cmp str_ (str); 431 shstr_cmp str_ (str);
504 object *op; 432 object *op;
505 433
506 for (op = objects; op != NULL; op = op->next) 434 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 435 if (op->name == str_)
508 break; 436 break;
509 437
510 return op; 438 return op;
511} 439}
… …
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
987 // clear those pointers that likely might have circular references to us
1043 owner = 0; 988 owner = 0;
989 enemy = 0;
990 attacked_by = 0;
991
992 // only relevant for players(?), but make sure of it anyways
993 contr = 0;
1044 994
1045 /* Remove object from the active list */ 995 /* Remove object from the active list */
1046 speed = 0; 996 speed = 0;
1047 update_ob_speed (this); 997 update_ob_speed (this);
1048 998
… …
1053 1003
1054/* 1004/*
1055 * sub_weight() recursively (outwards) subtracts a number from the 1005 * sub_weight() recursively (outwards) subtracts a number from the
1056 * 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)).
1057 */ 1007 */
1058
1059void 1008void
1060sub_weight (object *op, signed long weight) 1009sub_weight (object *op, signed long weight)
1061{ 1010{
1062 while (op != NULL) 1011 while (op != NULL)
1063 { 1012 {
1064 if (op->type == CONTAINER) 1013 if (op->type == CONTAINER)
1065 {
1066 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 1014 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1067 } 1015
1068 op->carrying -= weight; 1016 op->carrying -= weight;
1069 op = op->env; 1017 op = op->env;
1070 } 1018 }
1071} 1019}
1072 1020
1073/* remove_ob(op): 1021/* op->remove ():
1074 * 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
1075 * 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
1076 * object will have no environment. If the object previously had an 1024 * object will have no environment. If the object previously had an
1077 * environment, the x and y coordinates will be updated to 1025 * environment, the x and y coordinates will be updated to
1078 * the previous environment. 1026 * the previous environment.
1079 * Beware: This function is called from the editor as well! 1027 * Beware: This function is called from the editor as well!
1080 */ 1028 */
1081
1082void 1029void
1083remove_ob (object *op) 1030object::remove ()
1084{ 1031{
1032 object *tmp, *last = 0;
1085 object * 1033 object *otmp;
1086 tmp, *
1087 last = NULL;
1088 object *
1089 otmp;
1090 1034
1091 tag_t
1092 tag;
1093 int
1094 check_walk_off; 1035 int check_walk_off;
1095 mapstruct *
1096 m;
1097 1036
1098 sint16
1099 x,
1100 y;
1101
1102 if (QUERY_FLAG (op, FLAG_REMOVED)) 1037 if (QUERY_FLAG (this, FLAG_REMOVED))
1103 return; 1038 return;
1104 1039
1105 SET_FLAG (op, FLAG_REMOVED); 1040 SET_FLAG (this, FLAG_REMOVED);
1106 1041
1107 if (op->more != NULL) 1042 if (more)
1108 remove_ob (op->more); 1043 more->remove ();
1109 1044
1110 /* 1045 /*
1111 * In this case, the object to be removed is in someones 1046 * In this case, the object to be removed is in someones
1112 * inventory. 1047 * inventory.
1113 */ 1048 */
1114 if (op->env != NULL) 1049 if (env)
1115 { 1050 {
1116 if (op->nrof) 1051 if (nrof)
1117 sub_weight (op->env, op->weight * op->nrof); 1052 sub_weight (env, weight * nrof);
1118 else 1053 else
1119 sub_weight (op->env, op->weight + op->carrying); 1054 sub_weight (env, weight + carrying);
1120 1055
1121 /* 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
1122 * made to players inventory. If set, avoiding the call 1057 * made to players inventory. If set, avoiding the call
1123 * to save cpu time. 1058 * to save cpu time.
1124 */ 1059 */
1125 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))
1126 fix_player (otmp); 1061 fix_player (otmp);
1127 1062
1128 if (op->above != NULL) 1063 if (above != NULL)
1129 op->above->below = op->below; 1064 above->below = below;
1130 else 1065 else
1131 op->env->inv = op->below; 1066 env->inv = below;
1132 1067
1133 if (op->below != NULL) 1068 if (below != NULL)
1134 op->below->above = op->above; 1069 below->above = above;
1135 1070
1136 /* we set up values so that it could be inserted into 1071 /* we set up values so that it could be inserted into
1137 * 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
1138 * to the caller to decide what we want to do. 1073 * to the caller to decide what we want to do.
1139 */ 1074 */
1140 op->x = op->env->x, op->y = op->env->y; 1075 x = env->x, y = env->y;
1141 op->map = op->env->map; 1076 map = env->map;
1142 op->above = NULL, op->below = NULL; 1077 above = 0, below = 0;
1143 op->env = NULL; 1078 env = 0;
1144 } 1079 }
1145 else if (op->map) 1080 else if (map)
1146 { 1081 {
1147 x = op->x;
1148 y = op->y;
1149 m = get_map_from_coord (op->map, &x, &y);
1150
1151 if (!m)
1152 {
1153 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1154 op->map->path, op->x, op->y);
1155 /* in old days, we used to set x and y to 0 and continue.
1156 * it seems if we get into this case, something is probablye
1157 * screwed up and should be fixed.
1158 */
1159 abort ();
1160 }
1161
1162 if (op->map != m)
1163 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1164 op->map->path, m->path, op->x, op->y, x, y);
1165
1166 /* 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
1167 * lots of logic for things we no longer care about 1083 * lots of logic for things we no longer care about
1168 */ 1084 */
1169 1085
1170 /* link the object above us */ 1086 /* link the object above us */
1171 if (op->above) 1087 if (above)
1172 op->above->below = op->below; 1088 above->below = below;
1173 else 1089 else
1174 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 */
1175 1091
1176 /* Relink the object below us, if there is one */ 1092 /* Relink the object below us, if there is one */
1177 if (op->below) 1093 if (below)
1178 op->below->above = op->above; 1094 below->above = above;
1179 else 1095 else
1180 { 1096 {
1181 /* 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
1182 * use translated coordinates in case some oddness with map tiling is 1098 * use translated coordinates in case some oddness with map tiling is
1183 * evident 1099 * evident
1184 */ 1100 */
1185 if (GET_MAP_OB (m, x, y) != op) 1101 if (GET_MAP_OB (map, x, y) != this)
1186 { 1102 {
1187 dump_object (op); 1103 char *dump = dump_object (this);
1188 LOG (llevError, 1104 LOG (llevError,
1189 "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);
1190 dump_object (GET_MAP_OB (m, x, y)); 1107 dump = dump_object (GET_MAP_OB (map, x, y));
1191 LOG (llevError, "%s\n", errmsg); 1108 LOG (llevError, "%s\n", dump);
1109 free (dump);
1192 } 1110 }
1193 1111
1194 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1195 } 1113 }
1196 1114
1197 op->above = 0; 1115 above = 0;
1198 op->below = 0; 1116 below = 0;
1199 1117
1200 if (op->map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1201 return; 1119 return;
1202 1120
1203 tag = op->count;
1204 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1121 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1205 1122
1206 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)
1207 { 1124 {
1208 /* 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
1209 * being removed. 1126 * being removed.
1210 */ 1127 */
1211 1128
1212 if (tmp->type == PLAYER && tmp != op) 1129 if (tmp->type == PLAYER && tmp != this)
1213 { 1130 {
1214 /* If a container that the player is currently using somehow gets 1131 /* If a container that the player is currently using somehow gets
1215 * removed (most likely destroyed), update the player view 1132 * removed (most likely destroyed), update the player view
1216 * appropriately. 1133 * appropriately.
1217 */ 1134 */
1218 if (tmp->container == op) 1135 if (tmp->container == this)
1219 { 1136 {
1220 CLEAR_FLAG (op, FLAG_APPLIED); 1137 CLEAR_FLAG (this, FLAG_APPLIED);
1221 tmp->container = NULL; 1138 tmp->container = 0;
1222 } 1139 }
1223 1140
1224 tmp->contr->socket.update_look = 1; 1141 tmp->contr->socket->floorbox_update ();
1225 } 1142 }
1226 1143
1227 /* See if player moving off should effect something */ 1144 /* See if player moving off should effect something */
1228 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))
1229 { 1148 {
1230 move_apply (tmp, op, NULL); 1149 move_apply (tmp, this, 0);
1231 1150
1232 if (was_destroyed (op, tag)) 1151 if (destroyed ())
1233 {
1234 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 ());
1235 }
1236 } 1153 }
1237 1154
1238 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1155 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239 1156
1240 if (tmp->above == tmp) 1157 if (tmp->above == tmp)
1241 tmp->above = NULL; 1158 tmp->above = 0;
1242 1159
1243 last = tmp; 1160 last = tmp;
1244 } 1161 }
1245 1162
1246 /* last == NULL of there are no objects on this space */ 1163 /* last == NULL of there are no objects on this space */
1247 if (last == NULL) 1164 if (!last)
1248 { 1165 {
1249 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1250 * 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
1251 * 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
1252 * be correct anyways. 1169 * be correct anyways.
1253 */ 1170 */
1254 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1255 update_position (op->map, op->x, op->y); 1172 update_position (map, x, y);
1256 } 1173 }
1257 else 1174 else
1258 update_object (last, UP_OBJ_REMOVE); 1175 update_object (last, UP_OBJ_REMOVE);
1259 1176
1260 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1261 update_all_los (op->map, op->x, op->y); 1178 update_all_los (map, x, y);
1262 } 1179 }
1263} 1180}
1264 1181
1265/* 1182/*
1266 * merge_ob(op,top): 1183 * merge_ob(op,top):
… …
1281 1198
1282 for (; top != NULL; top = top->below) 1199 for (; top != NULL; top = top->below)
1283 { 1200 {
1284 if (top == op) 1201 if (top == op)
1285 continue; 1202 continue;
1286 if (CAN_MERGE (op, top)) 1203
1204 if (object::can_merge (op, top))
1287 { 1205 {
1288 top->nrof += op->nrof; 1206 top->nrof += op->nrof;
1289 1207
1290/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1208/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1291 op->weight = 0; /* Don't want any adjustements now */ 1209 op->weight = 0; /* Don't want any adjustements now */
1292 remove_ob (op); 1210 op->destroy ();
1293 free_object (op);
1294 return top; 1211 return top;
1295 } 1212 }
1296 } 1213 }
1297 1214
1298 return NULL; 1215 return 0;
1299} 1216}
1300 1217
1301/* 1218/*
1302 * 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
1303 * job preparing multi-part monsters 1220 * job preparing multi-part monsters
1304 */ 1221 */
1305object * 1222object *
1306insert_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)
1307{ 1224{
1308 object *tmp; 1225 object *tmp;
1309 1226
1310 if (op->head) 1227 if (op->head)
1311 op = op->head; 1228 op = op->head;
… …
1339 * NULL if 'op' was destroyed 1256 * NULL if 'op' was destroyed
1340 * just 'op' otherwise 1257 * just 'op' otherwise
1341 */ 1258 */
1342 1259
1343object * 1260object *
1344insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1261insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1345{ 1262{
1346 object *tmp, *top, *floor = NULL; 1263 object *tmp, *top, *floor = NULL;
1347 sint16 x, y; 1264 sint16 x, y;
1348 1265
1349 if (QUERY_FLAG (op, FLAG_FREED)) 1266 if (QUERY_FLAG (op, FLAG_FREED))
… …
1352 return NULL; 1269 return NULL;
1353 } 1270 }
1354 1271
1355 if (m == NULL) 1272 if (m == NULL)
1356 { 1273 {
1357 dump_object (op); 1274 char *dump = dump_object (op);
1358 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);
1359 return op; 1277 return op;
1360 } 1278 }
1361 1279
1362 if (out_of_map (m, op->x, op->y)) 1280 if (out_of_map (m, op->x, op->y))
1363 { 1281 {
1364 dump_object (op); 1282 char *dump = dump_object (op);
1365 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);
1366#ifdef MANY_CORES 1284#ifdef MANY_CORES
1367 /* 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
1368 * 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
1369 * improperly inserted. 1287 * improperly inserted.
1370 */ 1288 */
1371 abort (); 1289 abort ();
1372#endif 1290#endif
1291 free (dump);
1373 return op; 1292 return op;
1374 } 1293 }
1375 1294
1376 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1295 if (!QUERY_FLAG (op, FLAG_REMOVED))
1377 { 1296 {
1378 dump_object (op); 1297 char *dump = dump_object (op);
1379 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);
1380 return op; 1300 return op;
1381 } 1301 }
1382 1302
1383 if (op->more != NULL) 1303 if (op->more != NULL)
1384 { 1304 {
… …
1422 1342
1423 /* this has to be done after we translate the coordinates. 1343 /* this has to be done after we translate the coordinates.
1424 */ 1344 */
1425 if (op->nrof && !(flag & INS_NO_MERGE)) 1345 if (op->nrof && !(flag & INS_NO_MERGE))
1426 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)
1427 if (CAN_MERGE (op, tmp)) 1347 if (object::can_merge (op, tmp))
1428 { 1348 {
1429 op->nrof += tmp->nrof; 1349 op->nrof += tmp->nrof;
1430 remove_ob (tmp); 1350 tmp->destroy ();
1431 free_object (tmp);
1432 } 1351 }
1433 1352
1434 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 */
1435 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1436 1355
… …
1564 * it, so save a few ticks and start from there. 1483 * it, so save a few ticks and start from there.
1565 */ 1484 */
1566 if (!(flag & INS_MAP_LOAD)) 1485 if (!(flag & INS_MAP_LOAD))
1567 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)
1568 if (tmp->type == PLAYER) 1487 if (tmp->type == PLAYER)
1569 tmp->contr->socket.update_look = 1; 1488 tmp->contr->socket->floorbox_update ();
1570 1489
1571 /* If this object glows, it may affect lighting conditions that are 1490 /* If this object glows, it may affect lighting conditions that are
1572 * 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
1573 * 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
1574 * on the map will get recalculated. The players could very well 1493 * on the map will get recalculated. The players could very well
… …
1582 1501
1583 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1502 /* updates flags (blocked, alive, no magic, etc) for this map space */
1584 update_object (op, UP_OBJ_INSERT); 1503 update_object (op, UP_OBJ_INSERT);
1585 1504
1586 /* Don't know if moving this to the end will break anything. However, 1505 /* Don't know if moving this to the end will break anything. However,
1587 * we want to have update_look set above before calling this. 1506 * we want to have floorbox_update called before calling this.
1588 * 1507 *
1589 * check_move_on() must be after this because code called from 1508 * check_move_on() must be after this because code called from
1590 * check_move_on() depends on correct map flags (so functions like 1509 * check_move_on() depends on correct map flags (so functions like
1591 * blocked() and wall() work properly), and these flags are updated by 1510 * blocked() and wall() work properly), and these flags are updated by
1592 * update_object(). 1511 * update_object().
… …
1622 tmp1; 1541 tmp1;
1623 1542
1624 /* first search for itself and remove any old instances */ 1543 /* first search for itself and remove any old instances */
1625 1544
1626 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)
1627 {
1628 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1629 { 1547 tmp->destroy ();
1630 remove_ob (tmp);
1631 free_object (tmp);
1632 }
1633 }
1634 1548
1635 tmp1 = arch_to_object (find_archetype (arch_string)); 1549 tmp1 = arch_to_object (archetype::find (arch_string));
1636 1550
1637 tmp1->x = op->x; 1551 tmp1->x = op->x;
1638 tmp1->y = op->y; 1552 tmp1->y = op->y;
1639 insert_ob_in_map (tmp1, op->map, op, 0); 1553 insert_ob_in_map (tmp1, op->map, op, 0);
1640} 1554}
… …
1648 */ 1562 */
1649 1563
1650object * 1564object *
1651get_split_ob (object *orig_ob, uint32 nr) 1565get_split_ob (object *orig_ob, uint32 nr)
1652{ 1566{
1653 object * 1567 object *newob;
1654 newob;
1655 int
1656 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1657 1569
1658 if (orig_ob->nrof < nr) 1570 if (orig_ob->nrof < nr)
1659 { 1571 {
1660 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);
1661 return NULL; 1573 return NULL;
1662 } 1574 }
1663 1575
1664 newob = object_create_clone (orig_ob); 1576 newob = object_create_clone (orig_ob);
1665 1577
1666 if ((orig_ob->nrof -= nr) < 1) 1578 if ((orig_ob->nrof -= nr) < 1)
1667 { 1579 orig_ob->destroy (1);
1668 if (!is_removed)
1669 remove_ob (orig_ob);
1670 free_object2 (orig_ob, 1);
1671 }
1672 else if (!is_removed) 1580 else if (!is_removed)
1673 { 1581 {
1674 if (orig_ob->env != NULL) 1582 if (orig_ob->env != NULL)
1675 sub_weight (orig_ob->env, orig_ob->weight * nr); 1583 sub_weight (orig_ob->env, orig_ob->weight * nr);
1676 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)
… …
1740 esrv_send_item (tmp, op); 1648 esrv_send_item (tmp, op);
1741 } 1649 }
1742 } 1650 }
1743 else 1651 else
1744 { 1652 {
1745 remove_ob (op); 1653 op->remove ();
1746 op->nrof = 0; 1654 op->nrof = 0;
1747 if (tmp) 1655 if (tmp)
1748 { 1656 {
1749 esrv_del_item (tmp->contr, op->count); 1657 esrv_del_item (tmp->contr, op->count);
1750 } 1658 }
… …
1756 1664
1757 if (i < op->nrof) 1665 if (i < op->nrof)
1758 op->nrof -= i; 1666 op->nrof -= i;
1759 else 1667 else
1760 { 1668 {
1761 remove_ob (op); 1669 op->remove ();
1762 op->nrof = 0; 1670 op->nrof = 0;
1763 } 1671 }
1764 1672
1765 /* Since we just removed op, op->above is null */ 1673 /* Since we just removed op, op->above is null */
1766 for (tmp = above; tmp != NULL; tmp = tmp->above) 1674 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1775 1683
1776 if (op->nrof) 1684 if (op->nrof)
1777 return op; 1685 return op;
1778 else 1686 else
1779 { 1687 {
1780 free_object (op); 1688 op->destroy ();
1781 return NULL; 1689 return NULL;
1782 } 1690 }
1783} 1691}
1784 1692
1785/* 1693/*
… …
1798 op->carrying += weight; 1706 op->carrying += weight;
1799 op = op->env; 1707 op = op->env;
1800 } 1708 }
1801} 1709}
1802 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
1803/* 1731/*
1804 * insert_ob_in_ob(op,environment): 1732 * env->insert (op)
1805 * This function inserts the object op in the linked list 1733 * This function inserts the object op in the linked list
1806 * inside the object environment. 1734 * inside the object environment.
1807 * 1735 *
1808 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1809 * the inventory at the last position or next to other objects of the same
1810 * type.
1811 * Frank: Now sorted by type, archetype and magic!
1812 *
1813 * 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
1814 * be != op, if items are merged. -Tero 1737 * be != op, if items are merged. -Tero
1815 */ 1738 */
1816 1739
1817object * 1740object *
1818insert_ob_in_ob (object *op, object *where) 1741object::insert (object *op)
1819{ 1742{
1820 object * 1743 object *tmp, *otmp;
1821 tmp, *
1822 otmp;
1823 1744
1824 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1745 if (!QUERY_FLAG (op, FLAG_REMOVED))
1825 { 1746 op->remove ();
1826 dump_object (op);
1827 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1828 return op;
1829 }
1830
1831 if (where == NULL)
1832 {
1833 dump_object (op);
1834 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1835 return op;
1836 }
1837
1838 if (where->head)
1839 {
1840 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1841 where = where->head;
1842 }
1843 1747
1844 if (op->more) 1748 if (op->more)
1845 { 1749 {
1846 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);
1847 return op; 1751 return op;
… …
1849 1753
1850 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1851 CLEAR_FLAG (op, FLAG_REMOVED); 1755 CLEAR_FLAG (op, FLAG_REMOVED);
1852 if (op->nrof) 1756 if (op->nrof)
1853 { 1757 {
1854 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1758 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1855 if (CAN_MERGE (tmp, op)) 1759 if (object::can_merge (tmp, op))
1856 { 1760 {
1857 /* return the original object and remove inserted object 1761 /* return the original object and remove inserted object
1858 (client needs the original object) */ 1762 (client needs the original object) */
1859 tmp->nrof += op->nrof; 1763 tmp->nrof += op->nrof;
1860 /* Weight handling gets pretty funky. Since we are adding to 1764 /* Weight handling gets pretty funky. Since we are adding to
1861 * tmp->nrof, we need to increase the weight. 1765 * tmp->nrof, we need to increase the weight.
1862 */ 1766 */
1863 add_weight (where, op->weight * op->nrof); 1767 add_weight (this, op->weight * op->nrof);
1864 SET_FLAG (op, FLAG_REMOVED); 1768 SET_FLAG (op, FLAG_REMOVED);
1865 free_object (op); /* free the inserted object */ 1769 op->destroy (); /* free the inserted object */
1866 op = tmp; 1770 op = tmp;
1867 remove_ob (op); /* and fix old object's links */ 1771 op->remove (); /* and fix old object's links */
1868 CLEAR_FLAG (op, FLAG_REMOVED); 1772 CLEAR_FLAG (op, FLAG_REMOVED);
1869 break; 1773 break;
1870 } 1774 }
1871 1775
1872 /* I assume combined objects have no inventory 1776 /* I assume combined objects have no inventory
1873 * We add the weight - this object could have just been removed 1777 * We add the weight - this object could have just been removed
1874 * (if it was possible to merge). calling remove_ob will subtract 1778 * (if it was possible to merge). calling remove_ob will subtract
1875 * 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
1876 * the linking below 1780 * the linking below
1877 */ 1781 */
1878 add_weight (where, op->weight * op->nrof); 1782 add_weight (this, op->weight * op->nrof);
1879 } 1783 }
1880 else 1784 else
1881 add_weight (where, (op->weight + op->carrying)); 1785 add_weight (this, (op->weight + op->carrying));
1882 1786
1883 otmp = is_player_inv (where); 1787 otmp = is_player_inv (this);
1884 if (otmp && otmp->contr != NULL) 1788 if (otmp && otmp->contr)
1885 {
1886 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1887 fix_player (otmp); 1790 fix_player (otmp);
1888 }
1889 1791
1890 op->map = NULL; 1792 op->map = NULL;
1891 op->env = where; 1793 op->env = this;
1892 op->above = NULL; 1794 op->above = NULL;
1893 op->below = NULL; 1795 op->below = NULL;
1894 op->x = 0, op->y = 0; 1796 op->x = 0, op->y = 0;
1895 1797
1896 /* 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 */
1897 if ((op->glow_radius != 0) && where->map) 1799 if ((op->glow_radius != 0) && map)
1898 { 1800 {
1899#ifdef DEBUG_LIGHTS 1801#ifdef DEBUG_LIGHTS
1900 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);
1901#endif /* DEBUG_LIGHTS */ 1803#endif /* DEBUG_LIGHTS */
1902 if (MAP_DARKNESS (where->map)) 1804 if (MAP_DARKNESS (map))
1903 update_all_los (where->map, where->x, where->y); 1805 update_all_los (map, x, y);
1904 } 1806 }
1905 1807
1906 /* 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.
1907 * It sure simplifies this function... 1809 * It sure simplifies this function...
1908 */ 1810 */
1909 if (where->inv == NULL) 1811 if (!inv)
1910 where->inv = op; 1812 inv = op;
1911 else 1813 else
1912 { 1814 {
1913 op->below = where->inv; 1815 op->below = inv;
1914 op->below->above = op; 1816 op->below->above = op;
1915 where->inv = op; 1817 inv = op;
1916 } 1818 }
1819
1917 return op; 1820 return op;
1918} 1821}
1919 1822
1920/* 1823/*
1921 * Checks if any objects has a move_type that matches objects 1824 * Checks if any objects has a move_type that matches objects
… …
1939 */ 1842 */
1940 1843
1941int 1844int
1942check_move_on (object *op, object *originator) 1845check_move_on (object *op, object *originator)
1943{ 1846{
1944 object * 1847 object *tmp;
1945 tmp; 1848 maptile *m = op->map;
1946 tag_t
1947 tag;
1948 mapstruct *
1949 m = op->map;
1950 int
1951 x = op->x, y = op->y; 1849 int x = op->x, y = op->y;
1952 1850
1953 MoveType 1851 MoveType move_on, move_slow, move_block;
1954 move_on,
1955 move_slow,
1956 move_block;
1957 1852
1958 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1853 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959 return 0; 1854 return 0;
1960
1961 tag = op->count;
1962 1855
1963 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);
1964 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);
1965 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);
1966 1859
… …
2027 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1920 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2028 ((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))
2029 { 1922 {
2030 move_apply (tmp, op, originator); 1923 move_apply (tmp, op, originator);
2031 1924
2032 if (was_destroyed (op, tag)) 1925 if (op->destroyed ())
2033 return 1; 1926 return 1;
2034 1927
2035 /* what the person/creature stepped onto has moved the object 1928 /* what the person/creature stepped onto has moved the object
2036 * someplace new. Don't process any further - if we did, 1929 * someplace new. Don't process any further - if we did,
2037 * have a feeling strange problems would result. 1930 * have a feeling strange problems would result.
… …
2049 * a matching archetype at the given map and coordinates. 1942 * a matching archetype at the given map and coordinates.
2050 * The first matching object is returned, or NULL if none. 1943 * The first matching object is returned, or NULL if none.
2051 */ 1944 */
2052 1945
2053object * 1946object *
2054present_arch (const archetype *at, mapstruct *m, int x, int y) 1947present_arch (const archetype *at, maptile *m, int x, int y)
2055{ 1948{
2056 object * 1949 object *
2057 tmp; 1950 tmp;
2058 1951
2059 if (m == NULL || out_of_map (m, x, y)) 1952 if (m == NULL || out_of_map (m, x, y))
… …
2072 * a matching type variable at the given map and coordinates. 1965 * a matching type variable at the given map and coordinates.
2073 * The first matching object is returned, or NULL if none. 1966 * The first matching object is returned, or NULL if none.
2074 */ 1967 */
2075 1968
2076object * 1969object *
2077present (unsigned char type, mapstruct *m, int x, int y) 1970present (unsigned char type, maptile *m, int x, int y)
2078{ 1971{
2079 object * 1972 object *
2080 tmp; 1973 tmp;
2081 1974
2082 if (out_of_map (m, x, y)) 1975 if (out_of_map (m, x, y))
… …
2222 * 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
2223 * customized, changed states, etc. 2116 * customized, changed states, etc.
2224 */ 2117 */
2225 2118
2226int 2119int
2227find_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)
2228{ 2121{
2229 int 2122 int
2230 i, 2123 i,
2231 index = 0, flag; 2124 index = 0, flag;
2232 static int 2125 static int
… …
2253 return -1; 2146 return -1;
2254 return altern[RANDOM () % index]; 2147 return altern[RANDOM () % index];
2255} 2148}
2256 2149
2257/* 2150/*
2258 * find_first_free_spot(archetype, mapstruct, x, y) works like 2151 * find_first_free_spot(archetype, maptile, x, y) works like
2259 * find_free_spot(), but it will search max number of squares. 2152 * find_free_spot(), but it will search max number of squares.
2260 * 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.
2261 * 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.
2262 */ 2155 */
2263 2156
2264int 2157int
2265find_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)
2266{ 2159{
2267 int 2160 int
2268 i; 2161 i;
2269 2162
2270 for (i = 0; i < SIZEOFFREE; i++) 2163 for (i = 0; i < SIZEOFFREE; i++)
… …
2334 * 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
2335 * there is capable of. 2228 * there is capable of.
2336 */ 2229 */
2337 2230
2338int 2231int
2339find_dir (mapstruct *m, int x, int y, object *exclude) 2232find_dir (maptile *m, int x, int y, object *exclude)
2340{ 2233{
2341 int 2234 int
2342 i, 2235 i,
2343 max = SIZEOFFREE, mflags; 2236 max = SIZEOFFREE, mflags;
2344 2237
2345 sint16 nx, ny; 2238 sint16 nx, ny;
2346 object * 2239 object *
2347 tmp; 2240 tmp;
2348 mapstruct * 2241 maptile *
2349 mp; 2242 mp;
2350 2243
2351 MoveType blocked, move_type; 2244 MoveType blocked, move_type;
2352 2245
2353 if (exclude && exclude->head) 2246 if (exclude && exclude->head)
… …
2561 * Modified to be map tile aware -.MSW 2454 * Modified to be map tile aware -.MSW
2562 */ 2455 */
2563 2456
2564 2457
2565int 2458int
2566can_see_monsterP (mapstruct *m, int x, int y, int dir) 2459can_see_monsterP (maptile *m, int x, int y, int dir)
2567{ 2460{
2568 sint16 dx, dy; 2461 sint16 dx, dy;
2569 int 2462 int
2570 mflags; 2463 mflags;
2571 2464
… …
2620 * create clone from object to another 2513 * create clone from object to another
2621 */ 2514 */
2622object * 2515object *
2623object_create_clone (object *asrc) 2516object_create_clone (object *asrc)
2624{ 2517{
2625 object *
2626 dst = NULL, *tmp, *src, *part, *prev, *item; 2518 object *dst = 0, *tmp, *src, *part, *prev, *item;
2627 2519
2628 if (!asrc) 2520 if (!asrc)
2629 return NULL; 2521 return 0;
2522
2630 src = asrc; 2523 src = asrc;
2631 if (src->head) 2524 if (src->head)
2632 src = src->head; 2525 src = src->head;
2633 2526
2634 prev = NULL; 2527 prev = 0;
2635 for (part = src; part; part = part->more) 2528 for (part = src; part; part = part->more)
2636 { 2529 {
2637 tmp = get_object (); 2530 tmp = part->clone ();
2638 copy_object (part, tmp);
2639 tmp->x -= src->x; 2531 tmp->x -= src->x;
2640 tmp->y -= src->y; 2532 tmp->y -= src->y;
2533
2641 if (!part->head) 2534 if (!part->head)
2642 { 2535 {
2643 dst = tmp; 2536 dst = tmp;
2644 tmp->head = NULL; 2537 tmp->head = 0;
2645 } 2538 }
2646 else 2539 else
2647 { 2540 {
2648 tmp->head = dst; 2541 tmp->head = dst;
2649 } 2542 }
2543
2650 tmp->more = NULL; 2544 tmp->more = 0;
2545
2651 if (prev) 2546 if (prev)
2652 prev->more = tmp; 2547 prev->more = tmp;
2548
2653 prev = tmp; 2549 prev = tmp;
2654 } 2550 }
2655 2551
2656 /*** copy inventory ***/
2657 for (item = src->inv; item; item = item->below) 2552 for (item = src->inv; item; item = item->below)
2658 {
2659 (void) insert_ob_in_ob (object_create_clone (item), dst); 2553 insert_ob_in_ob (object_create_clone (item), dst);
2660 }
2661 2554
2662 return dst; 2555 return dst;
2663} 2556}
2664 2557
2665/* return true if the object was destroyed, 0 otherwise */
2666int
2667was_destroyed (const object *op, tag_t old_tag)
2668{
2669 /* checking for FLAG_FREED isn't necessary, but makes this function more
2670 * robust */
2671 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2672}
2673
2674/* GROS - Creates an object using a string representing its content. */ 2558/* GROS - Creates an object using a string representing its content. */
2675
2676/* 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 */
2677
2678/* 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, */
2679
2680/* 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. */
2681
2682/* 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. */
2683
2684/* Also remember that multiparts objects are not supported for now. */ 2563/* Also remember that multiparts objects are not supported for now. */
2685 2564
2686object * 2565object *
2687load_object_str (const char *obstr) 2566load_object_str (const char *obstr)
2688{ 2567{
2689 object * 2568 object *op;
2690 op;
2691 char
2692 filename[MAX_BUF]; 2569 char filename[MAX_BUF];
2693 2570
2694 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2571 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695 2572
2696 FILE *
2697 tempfile = fopen (filename, "w"); 2573 FILE *tempfile = fopen (filename, "w");
2698 2574
2699 if (tempfile == NULL) 2575 if (tempfile == NULL)
2700 { 2576 {
2701 LOG (llevError, "Error - Unable to access load object temp file\n"); 2577 LOG (llevError, "Error - Unable to access load object temp file\n");
2702 return NULL; 2578 return NULL;
2703 } 2579 }
2704 2580
2705 fprintf (tempfile, obstr); 2581 fprintf (tempfile, obstr);
2706 fclose (tempfile); 2582 fclose (tempfile);
2707 2583
2708 op = get_object (); 2584 op = object::create ();
2709 2585
2710 object_thawer thawer (filename); 2586 object_thawer thawer (filename);
2711 2587
2712 if (thawer) 2588 if (thawer)
2713 load_object (thawer, op, 0); 2589 load_object (thawer, op, 0);
… …
2723 * returns NULL if no match. 2599 * returns NULL if no match.
2724 */ 2600 */
2725object * 2601object *
2726find_obj_by_type_subtype (const object *who, int type, int subtype) 2602find_obj_by_type_subtype (const object *who, int type, int subtype)
2727{ 2603{
2728 object * 2604 object *tmp;
2729 tmp;
2730 2605
2731 for (tmp = who->inv; tmp; tmp = tmp->below) 2606 for (tmp = who->inv; tmp; tmp = tmp->below)
2732 if (tmp->type == type && tmp->subtype == subtype) 2607 if (tmp->type == type && tmp->subtype == subtype)
2733 return tmp; 2608 return tmp;
2734 2609
… …
2742 * do the desired thing. 2617 * do the desired thing.
2743 */ 2618 */
2744key_value * 2619key_value *
2745get_ob_key_link (const object *ob, const char *key) 2620get_ob_key_link (const object *ob, const char *key)
2746{ 2621{
2747 key_value * 2622 key_value *link;
2748 link;
2749 2623
2750 for (link = ob->key_values; link != NULL; link = link->next) 2624 for (link = ob->key_values; link != NULL; link = link->next)
2751 {
2752 if (link->key == key) 2625 if (link->key == key)
2753 {
2754 return link; 2626 return link;
2755 }
2756 }
2757 2627
2758 return NULL; 2628 return NULL;
2759} 2629}
2760 2630
2761/* 2631/*

Diff Legend

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