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.45 by root, Thu Sep 14 18:13:01 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. */
… …
30#include <sys/types.h> 29#include <sys/types.h>
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>
34
35#include <bitset>
35 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
… …
105 _exit (1); 106 _exit (1);
106 } 107 }
107 108
108 uuid.seq = uid; 109 uuid.seq = uid;
109 write_uuid (); 110 write_uuid ();
110 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
111 fclose (fp); 112 fclose (fp);
112} 113}
113 114
114UUID 115UUID
115gen_uuid () 116gen_uuid ()
… …
184 * 185 *
185 * 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
186 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
187 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
188 * 189 *
189 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
190 * 191 *
191 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
192 * check weight 193 * check weight
193 */ 194 */
194 195
195bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
196{ 197{
197 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
198 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)
199 return 0; 204 return 0;
200 205
201 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
202 return 0;
203
204 /* 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
205 * 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
206 * used to store nrof). 209 * used to store nrof).
207 */ 210 */
208 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
218 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
219 222
220 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
221 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
222 225
223 226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
224 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
225 * being locked in inventory should prevent merging.
226 * 0x4 in flags3 is CLIENT_SENT
227 */
228 if ((ob1->arch != ob2->arch) ||
229 (ob1->flags[0] != ob2->flags[0]) ||
230 (ob1->flags[1] != ob2->flags[1]) ||
231 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
232 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
233 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
234 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
235 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
236 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
237 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
238 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
239 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
240 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
241 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
242 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
243 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
244 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
245 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
246 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
247 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
248 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
249 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
250 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
251 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
252 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
253 (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)
254 return 0; 251 return 0;
255 252
256 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
257 * check all objects in the inventory. 254 * check all objects in the inventory.
258 */ 255 */
… …
261 /* 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 */
262 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
263 return 0; 260 return 0;
264 261
265 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
266 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
267 return 0; 264 return 0;
268 265
269 /* 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
270 * if it is valid. 267 * if it is valid.
271 */ 268 */
… …
375 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 372 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
376 * Some error messages. 373 * Some error messages.
377 * 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.
378 */ 375 */
379 376
380void 377char *
381dump_object2 (object *op)
382{
383 errmsg[0] = 0;
384 return;
385 //TODO//D#d#
386#if 0
387 char *cp;
388
389/* object *tmp;*/
390
391 if (op->arch != NULL)
392 {
393 strcat (errmsg, "arch ");
394 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
395 strcat (errmsg, "\n");
396 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
397 strcat (errmsg, cp);
398# if 0
399 /* Don't dump player diffs - they are too long, mostly meaningless, and
400 * will overflow the buffer.
401 * Changed so that we don't dump inventory either. This may
402 * also overflow the buffer.
403 */
404 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
405 strcat (errmsg, cp);
406 for (tmp = op->inv; tmp; tmp = tmp->below)
407 dump_object2 (tmp);
408# endif
409 strcat (errmsg, "end\n");
410 }
411 else
412 {
413 strcat (errmsg, "Object ");
414 if (op->name == NULL)
415 strcat (errmsg, "(null)");
416 else
417 strcat (errmsg, op->name);
418 strcat (errmsg, "\n");
419# if 0
420 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
421 strcat (errmsg, cp);
422 for (tmp = op->inv; tmp; tmp = tmp->below)
423 dump_object2 (tmp);
424# endif
425 strcat (errmsg, "end\n");
426 }
427#endif
428}
429
430/*
431 * Dumps an object. Returns output in the static global errmsg array.
432 */
433
434void
435dump_object (object *op) 378dump_object (object *op)
436{ 379{
437 if (op == NULL) 380 if (!op)
438 { 381 return strdup ("[NULLOBJ]");
439 strcpy (errmsg, "[NULL pointer]");
440 return;
441 }
442 errmsg[0] = '\0';
443 dump_object2 (op);
444}
445 382
446void 383 object_freezer freezer;
447dump_all_objects (void) 384 save_object (freezer, op, 3);
448{ 385 return freezer.as_string ();
449 object *op;
450
451 for (op = object::first; op != NULL; op = op->next)
452 {
453 dump_object (op);
454 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
455 }
456} 386}
457 387
458/* 388/*
459 * 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
460 * multi-object 1 which is closest to the second object. 390 * multi-object 1 which is closest to the second object.
… …
480 */ 410 */
481 411
482object * 412object *
483find_object (tag_t i) 413find_object (tag_t i)
484{ 414{
485 object *op;
486
487 for (op = object::first; op != NULL; op = op->next) 415 for (object *op = object::first; op; op = op->next)
488 if (op->count == i) 416 if (op->count == i)
489 break; 417 return op;
418
490 return op; 419 return 0;
491} 420}
492 421
493/* 422/*
494 * 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.
495 * Used only by the patch command, but not all that useful. 424 * Used only by the patch command, but not all that useful.
… …
595 524
596 if (settings.casting_time) 525 if (settings.casting_time)
597 casting_time = -1; 526 casting_time = -1;
598} 527}
599 528
600void object::clone (object *destination)
601{
602 *(object_copy *)destination = *this;
603 *(object_pod *)destination = *this;
604
605 if (self || cb)
606 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
607}
608
609/* 529/*
610 * copy object first frees everything allocated by the second object, 530 * copy_to first frees everything allocated by the dst object,
611 * and then copies the contends of the first object into the second 531 * and then copies the contents of itself into the second
612 * object, allocating what needs to be allocated. Basically, any 532 * object, allocating what needs to be allocated. Basically, any
613 * 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,
614 * 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
615 * will point at garbage. 535 * will point at garbage.
616 */ 536 */
617void 537void
618copy_object (object *op2, object *op) 538object::copy_to (object *dst)
619{ 539{
620 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 540 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 541 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622 542
623 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));
624 548
625 if (is_freed) 549 if (is_freed)
626 SET_FLAG (op, FLAG_FREED); 550 SET_FLAG (dst, FLAG_FREED);
551
627 if (is_removed) 552 if (is_removed)
628 SET_FLAG (op, FLAG_REMOVED); 553 SET_FLAG (dst, FLAG_REMOVED);
629 554
630 if (op2->speed < 0) 555 if (speed < 0)
631 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 556 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632 557
633 /* Copy over key_values, if any. */ 558 /* Copy over key_values, if any. */
634 if (op2->key_values) 559 if (key_values)
635 { 560 {
636 key_value *tail = 0; 561 key_value *tail = 0;
637 key_value *i; 562 key_value *i;
638 563
639 op->key_values = 0; 564 dst->key_values = 0;
640 565
641 for (i = op2->key_values; i; i = i->next) 566 for (i = key_values; i; i = i->next)
642 { 567 {
643 key_value *new_link = new key_value; 568 key_value *new_link = new key_value;
644 569
645 new_link->next = 0; 570 new_link->next = 0;
646 new_link->key = i->key; 571 new_link->key = i->key;
647 new_link->value = i->value; 572 new_link->value = i->value;
648 573
649 /* Try and be clever here, too. */ 574 /* Try and be clever here, too. */
650 if (!op->key_values) 575 if (!dst->key_values)
651 { 576 {
652 op->key_values = new_link; 577 dst->key_values = new_link;
653 tail = new_link; 578 tail = new_link;
654 } 579 }
655 else 580 else
656 { 581 {
657 tail->next = new_link; 582 tail->next = new_link;
658 tail = new_link; 583 tail = new_link;
659 } 584 }
660 } 585 }
661 } 586 }
662 587
663 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;
664} 597}
665 598
666/* 599/*
667 * 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
668 * 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
… …
873 update_now = 1; 806 update_now = 1;
874 807
875 if ((move_slow | op->move_slow) != move_slow) 808 if ((move_slow | op->move_slow) != move_slow)
876 update_now = 1; 809 update_now = 1;
877 } 810 }
811
878 /* if the object is being removed, we can't make intelligent 812 /* if the object is being removed, we can't make intelligent
879 * decisions, because remove_ob can't really pass the object 813 * decisions, because remove_ob can't really pass the object
880 * that is being removed. 814 * that is being removed.
881 */ 815 */
882 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 816 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
908 else 842 else
909 { 843 {
910 delete *i; 844 delete *i;
911 mortals.erase (i); 845 mortals.erase (i);
912 } 846 }
913
914 static int lastmortals = 0;//D
915
916 if (mortals.size() != lastmortals)//D
917 {
918 lastmortals = mortals.size ();//D
919 LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920 }
921} 847}
922 848
923object::object () 849object::object ()
924{ 850{
925 SET_FLAG (this, FLAG_REMOVED); 851 SET_FLAG (this, FLAG_REMOVED);
… …
947 object::first = this; 873 object::first = this;
948} 874}
949 875
950void object::unlink () 876void object::unlink ()
951{ 877{
952 //count = 0;//D
953 if (!prev && !next) return;//D
954
955 if (this == object::first) 878 if (this == object::first)
956 object::first = next; 879 object::first = next;
957 880
958 /* Remove this object from the list of used objects */ 881 /* Remove this object from the list of used objects */
959 if (prev) prev->next = next; 882 if (prev) prev->next = next;
… …
975 * 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
976 * free objects. The IS_FREED() flag is set in the object. 899 * free objects. The IS_FREED() flag is set in the object.
977 * The object must have been removed by remove_ob() first for 900 * The object must have been removed by remove_ob() first for
978 * this function to succeed. 901 * this function to succeed.
979 * 902 *
980 * 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
981 * inventory to the ground. 904 * inventory to the ground.
982 */ 905 */
983void object::free (bool free_inventory) 906void object::destroy (bool destroy_inventory)
984{ 907{
985 if (QUERY_FLAG (this, FLAG_FREED)) 908 if (QUERY_FLAG (this, FLAG_FREED))
986 return; 909 return;
987 910
988 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 911 if (QUERY_FLAG (this, FLAG_FRIENDLY))
989 remove_friendly_object (this); 912 remove_friendly_object (this);
990 913
991 if (!QUERY_FLAG (this, FLAG_REMOVED)) 914 if (!QUERY_FLAG (this, FLAG_REMOVED))
992 remove_ob (this); 915 remove ();
993 916
994 SET_FLAG (this, FLAG_FREED); 917 SET_FLAG (this, FLAG_FREED);
995 918
996 if (more) 919 if (more)
997 { 920 {
998 more->free (free_inventory); 921 more->destroy (destroy_inventory);
999 more = 0; 922 more = 0;
1000 } 923 }
1001 924
1002 if (inv) 925 if (inv)
1003 { 926 {
1004 /* Only if the space blocks everything do we not process - 927 /* Only if the space blocks everything do we not process -
1005 * if some form of movement is allowed, let objects 928 * if some form of movement is allowed, let objects
1006 * drop on that space. 929 * drop on that space.
1007 */ 930 */
1008 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)
1009 { 932 {
1010 object *op = inv; 933 object *op = inv;
1011 934
1012 while (op) 935 while (op)
1013 { 936 {
1014 object *tmp = op->below; 937 object *tmp = op->below;
1015 op->free (free_inventory); 938 op->destroy (destroy_inventory);
1016 op = tmp; 939 op = tmp;
1017 } 940 }
1018 } 941 }
1019 else 942 else
1020 { /* Put objects in inventory onto this space */ 943 { /* Put objects in inventory onto this space */
… …
1022 945
1023 while (op) 946 while (op)
1024 { 947 {
1025 object *tmp = op->below; 948 object *tmp = op->below;
1026 949
1027 remove_ob (op); 950 op->remove ();
1028 951
1029 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 952 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1030 || 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))
1031 free_object (op); 954 op->destroy ();
1032 else 955 else
1033 { 956 {
1034 op->x = x; 957 op->x = x;
1035 op->y = y; 958 op->y = y;
1036 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 */
… …
1039 op = tmp; 962 op = tmp;
1040 } 963 }
1041 } 964 }
1042 } 965 }
1043 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
1044 // clear those pointers that likely might have circular references to us 987 // clear those pointers that likely might have circular references to us
1045 owner = 0; 988 owner = 0;
1046 enemy = 0; 989 enemy = 0;
1047 attacked_by = 0; 990 attacked_by = 0;
1048 991
992 // only relevant for players(?), but make sure of it anyways
993 contr = 0;
994
1049 /* Remove object from the active list */ 995 /* Remove object from the active list */
1050 speed = 0; 996 speed = 0;
1051 update_ob_speed (this); 997 update_ob_speed (this);
1052 998
1053 unlink (); 999 unlink ();
… …
1057 1003
1058/* 1004/*
1059 * sub_weight() recursively (outwards) subtracts a number from the 1005 * sub_weight() recursively (outwards) subtracts a number from the
1060 * 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)).
1061 */ 1007 */
1062
1063void 1008void
1064sub_weight (object *op, signed long weight) 1009sub_weight (object *op, signed long weight)
1065{ 1010{
1066 while (op != NULL) 1011 while (op != NULL)
1067 { 1012 {
… …
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{
1088 object *tmp, *last = 0; 1032 object *tmp, *last = 0;
1089 object *otmp; 1033 object *otmp;
1090 1034
1091 tag_t tag;
1092 int check_walk_off; 1035 int check_walk_off;
1093 mapstruct *m;
1094 1036
1095 sint16 x, y;
1096
1097 if (QUERY_FLAG (op, FLAG_REMOVED)) 1037 if (QUERY_FLAG (this, FLAG_REMOVED))
1098 return; 1038 return;
1099 1039
1100 SET_FLAG (op, FLAG_REMOVED); 1040 SET_FLAG (this, FLAG_REMOVED);
1101 1041
1102 if (op->more != NULL) 1042 if (more)
1103 remove_ob (op->more); 1043 more->remove ();
1104 1044
1105 /* 1045 /*
1106 * In this case, the object to be removed is in someones 1046 * In this case, the object to be removed is in someones
1107 * inventory. 1047 * inventory.
1108 */ 1048 */
1109 if (op->env != NULL) 1049 if (env)
1110 { 1050 {
1111 if (op->nrof) 1051 if (nrof)
1112 sub_weight (op->env, op->weight * op->nrof); 1052 sub_weight (env, weight * nrof);
1113 else 1053 else
1114 sub_weight (op->env, op->weight + op->carrying); 1054 sub_weight (env, weight + carrying);
1115 1055
1116 /* 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
1117 * made to players inventory. If set, avoiding the call 1057 * made to players inventory. If set, avoiding the call
1118 * to save cpu time. 1058 * to save cpu time.
1119 */ 1059 */
1120 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))
1121 fix_player (otmp); 1061 fix_player (otmp);
1122 1062
1123 if (op->above != NULL) 1063 if (above != NULL)
1124 op->above->below = op->below; 1064 above->below = below;
1125 else 1065 else
1126 op->env->inv = op->below; 1066 env->inv = below;
1127 1067
1128 if (op->below != NULL) 1068 if (below != NULL)
1129 op->below->above = op->above; 1069 below->above = above;
1130 1070
1131 /* we set up values so that it could be inserted into 1071 /* we set up values so that it could be inserted into
1132 * 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
1133 * to the caller to decide what we want to do. 1073 * to the caller to decide what we want to do.
1134 */ 1074 */
1135 op->x = op->env->x, op->y = op->env->y; 1075 x = env->x, y = env->y;
1136 op->map = op->env->map; 1076 map = env->map;
1137 op->above = NULL, op->below = NULL; 1077 above = 0, below = 0;
1138 op->env = NULL; 1078 env = 0;
1139 } 1079 }
1140 else if (op->map) 1080 else if (map)
1141 { 1081 {
1142 x = op->x;
1143 y = op->y;
1144 m = get_map_from_coord (op->map, &x, &y);
1145
1146 if (!m)
1147 {
1148 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1149 op->map->path, op->x, op->y);
1150 /* in old days, we used to set x and y to 0 and continue.
1151 * it seems if we get into this case, something is probablye
1152 * screwed up and should be fixed.
1153 */
1154 abort ();
1155 }
1156
1157 if (op->map != m)
1158 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1159 op->map->path, m->path, op->x, op->y, x, y);
1160
1161 /* 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
1162 * lots of logic for things we no longer care about 1083 * lots of logic for things we no longer care about
1163 */ 1084 */
1164 1085
1165 /* link the object above us */ 1086 /* link the object above us */
1166 if (op->above) 1087 if (above)
1167 op->above->below = op->below; 1088 above->below = below;
1168 else 1089 else
1169 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 */
1170 1091
1171 /* Relink the object below us, if there is one */ 1092 /* Relink the object below us, if there is one */
1172 if (op->below) 1093 if (below)
1173 op->below->above = op->above; 1094 below->above = above;
1174 else 1095 else
1175 { 1096 {
1176 /* 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
1177 * use translated coordinates in case some oddness with map tiling is 1098 * use translated coordinates in case some oddness with map tiling is
1178 * evident 1099 * evident
1179 */ 1100 */
1180 if (GET_MAP_OB (m, x, y) != op) 1101 if (GET_MAP_OB (map, x, y) != this)
1181 { 1102 {
1182 dump_object (op); 1103 char *dump = dump_object (this);
1183 LOG (llevError, 1104 LOG (llevError,
1184 "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);
1185 dump_object (GET_MAP_OB (m, x, y)); 1107 dump = dump_object (GET_MAP_OB (map, x, y));
1186 LOG (llevError, "%s\n", errmsg); 1108 LOG (llevError, "%s\n", dump);
1109 free (dump);
1187 } 1110 }
1188 1111
1189 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1112 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1190 } 1113 }
1191 1114
1192 op->above = 0; 1115 above = 0;
1193 op->below = 0; 1116 below = 0;
1194 1117
1195 if (op->map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1196 return; 1119 return;
1197 1120
1198 tag = op->count;
1199 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1121 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1200 1122
1201 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)
1202 { 1124 {
1203 /* 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
1204 * being removed. 1126 * being removed.
1205 */ 1127 */
1206 1128
1207 if (tmp->type == PLAYER && tmp != op) 1129 if (tmp->type == PLAYER && tmp != this)
1208 { 1130 {
1209 /* If a container that the player is currently using somehow gets 1131 /* If a container that the player is currently using somehow gets
1210 * removed (most likely destroyed), update the player view 1132 * removed (most likely destroyed), update the player view
1211 * appropriately. 1133 * appropriately.
1212 */ 1134 */
1213 if (tmp->container == op) 1135 if (tmp->container == this)
1214 { 1136 {
1215 CLEAR_FLAG (op, FLAG_APPLIED); 1137 CLEAR_FLAG (this, FLAG_APPLIED);
1216 tmp->container = NULL; 1138 tmp->container = 0;
1217 } 1139 }
1218 1140
1219 tmp->contr->socket.update_look = 1; 1141 tmp->contr->socket->floorbox_update ();
1220 } 1142 }
1221 1143
1222 /* See if player moving off should effect something */ 1144 /* See if player moving off should effect something */
1223 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))
1224 { 1148 {
1225 move_apply (tmp, op, NULL); 1149 move_apply (tmp, this, 0);
1226 1150
1227 if (was_destroyed (op, tag)) 1151 if (destroyed ())
1228 {
1229 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 ());
1230 }
1231 } 1153 }
1232 1154
1233 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1155 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1234 1156
1235 if (tmp->above == tmp) 1157 if (tmp->above == tmp)
1236 tmp->above = NULL; 1158 tmp->above = 0;
1237 1159
1238 last = tmp; 1160 last = tmp;
1239 } 1161 }
1240 1162
1241 /* last == NULL of there are no objects on this space */ 1163 /* last == NULL of there are no objects on this space */
1242 if (last == NULL) 1164 if (!last)
1243 { 1165 {
1244 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1166 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1245 * 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
1246 * 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
1247 * be correct anyways. 1169 * be correct anyways.
1248 */ 1170 */
1249 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1171 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1250 update_position (op->map, op->x, op->y); 1172 update_position (map, x, y);
1251 } 1173 }
1252 else 1174 else
1253 update_object (last, UP_OBJ_REMOVE); 1175 update_object (last, UP_OBJ_REMOVE);
1254 1176
1255 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1177 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1256 update_all_los (op->map, op->x, op->y); 1178 update_all_los (map, x, y);
1257 } 1179 }
1258} 1180}
1259 1181
1260/* 1182/*
1261 * merge_ob(op,top): 1183 * merge_ob(op,top):
… …
1276 1198
1277 for (; top != NULL; top = top->below) 1199 for (; top != NULL; top = top->below)
1278 { 1200 {
1279 if (top == op) 1201 if (top == op)
1280 continue; 1202 continue;
1281 if (CAN_MERGE (op, top)) 1203
1204 if (object::can_merge (op, top))
1282 { 1205 {
1283 top->nrof += op->nrof; 1206 top->nrof += op->nrof;
1284 1207
1285/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1208/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1286 op->weight = 0; /* Don't want any adjustements now */ 1209 op->weight = 0; /* Don't want any adjustements now */
1287 remove_ob (op); 1210 op->destroy ();
1288 free_object (op);
1289 return top; 1211 return top;
1290 } 1212 }
1291 } 1213 }
1292 1214
1293 return 0; 1215 return 0;
… …
1296/* 1218/*
1297 * 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
1298 * job preparing multi-part monsters 1220 * job preparing multi-part monsters
1299 */ 1221 */
1300object * 1222object *
1301insert_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)
1302{ 1224{
1303 object *tmp; 1225 object *tmp;
1304 1226
1305 if (op->head) 1227 if (op->head)
1306 op = op->head; 1228 op = op->head;
… …
1334 * NULL if 'op' was destroyed 1256 * NULL if 'op' was destroyed
1335 * just 'op' otherwise 1257 * just 'op' otherwise
1336 */ 1258 */
1337 1259
1338object * 1260object *
1339insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1261insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1340{ 1262{
1341 object *tmp, *top, *floor = NULL; 1263 object *tmp, *top, *floor = NULL;
1342 sint16 x, y; 1264 sint16 x, y;
1343 1265
1344 if (QUERY_FLAG (op, FLAG_FREED)) 1266 if (QUERY_FLAG (op, FLAG_FREED))
… …
1347 return NULL; 1269 return NULL;
1348 } 1270 }
1349 1271
1350 if (m == NULL) 1272 if (m == NULL)
1351 { 1273 {
1352 dump_object (op); 1274 char *dump = dump_object (op);
1353 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);
1354 return op; 1277 return op;
1355 } 1278 }
1356 1279
1357 if (out_of_map (m, op->x, op->y)) 1280 if (out_of_map (m, op->x, op->y))
1358 { 1281 {
1359 dump_object (op); 1282 char *dump = dump_object (op);
1360 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);
1361#ifdef MANY_CORES 1284#ifdef MANY_CORES
1362 /* 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
1363 * 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
1364 * improperly inserted. 1287 * improperly inserted.
1365 */ 1288 */
1366 abort (); 1289 abort ();
1367#endif 1290#endif
1291 free (dump);
1368 return op; 1292 return op;
1369 } 1293 }
1370 1294
1371 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1295 if (!QUERY_FLAG (op, FLAG_REMOVED))
1372 { 1296 {
1373 dump_object (op); 1297 char *dump = dump_object (op);
1374 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);
1375 return op; 1300 return op;
1376 } 1301 }
1377 1302
1378 if (op->more != NULL) 1303 if (op->more != NULL)
1379 { 1304 {
… …
1417 1342
1418 /* this has to be done after we translate the coordinates. 1343 /* this has to be done after we translate the coordinates.
1419 */ 1344 */
1420 if (op->nrof && !(flag & INS_NO_MERGE)) 1345 if (op->nrof && !(flag & INS_NO_MERGE))
1421 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)
1422 if (CAN_MERGE (op, tmp)) 1347 if (object::can_merge (op, tmp))
1423 { 1348 {
1424 op->nrof += tmp->nrof; 1349 op->nrof += tmp->nrof;
1425 remove_ob (tmp); 1350 tmp->destroy ();
1426 free_object (tmp);
1427 } 1351 }
1428 1352
1429 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 */
1430 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1431 1355
… …
1559 * it, so save a few ticks and start from there. 1483 * it, so save a few ticks and start from there.
1560 */ 1484 */
1561 if (!(flag & INS_MAP_LOAD)) 1485 if (!(flag & INS_MAP_LOAD))
1562 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)
1563 if (tmp->type == PLAYER) 1487 if (tmp->type == PLAYER)
1564 tmp->contr->socket.update_look = 1; 1488 tmp->contr->socket->floorbox_update ();
1565 1489
1566 /* If this object glows, it may affect lighting conditions that are 1490 /* If this object glows, it may affect lighting conditions that are
1567 * 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
1568 * 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
1569 * on the map will get recalculated. The players could very well 1493 * on the map will get recalculated. The players could very well
… …
1577 1501
1578 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1502 /* updates flags (blocked, alive, no magic, etc) for this map space */
1579 update_object (op, UP_OBJ_INSERT); 1503 update_object (op, UP_OBJ_INSERT);
1580 1504
1581 /* 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,
1582 * we want to have update_look set above before calling this. 1506 * we want to have floorbox_update called before calling this.
1583 * 1507 *
1584 * check_move_on() must be after this because code called from 1508 * check_move_on() must be after this because code called from
1585 * check_move_on() depends on correct map flags (so functions like 1509 * check_move_on() depends on correct map flags (so functions like
1586 * blocked() and wall() work properly), and these flags are updated by 1510 * blocked() and wall() work properly), and these flags are updated by
1587 * update_object(). 1511 * update_object().
… …
1617 tmp1; 1541 tmp1;
1618 1542
1619 /* first search for itself and remove any old instances */ 1543 /* first search for itself and remove any old instances */
1620 1544
1621 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)
1622 {
1623 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1624 { 1547 tmp->destroy ();
1625 remove_ob (tmp);
1626 free_object (tmp);
1627 }
1628 }
1629 1548
1630 tmp1 = arch_to_object (find_archetype (arch_string)); 1549 tmp1 = arch_to_object (archetype::find (arch_string));
1631 1550
1632 tmp1->x = op->x; 1551 tmp1->x = op->x;
1633 tmp1->y = op->y; 1552 tmp1->y = op->y;
1634 insert_ob_in_map (tmp1, op->map, op, 0); 1553 insert_ob_in_map (tmp1, op->map, op, 0);
1635} 1554}
… …
1643 */ 1562 */
1644 1563
1645object * 1564object *
1646get_split_ob (object *orig_ob, uint32 nr) 1565get_split_ob (object *orig_ob, uint32 nr)
1647{ 1566{
1648 object * 1567 object *newob;
1649 newob;
1650 int
1651 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1652 1569
1653 if (orig_ob->nrof < nr) 1570 if (orig_ob->nrof < nr)
1654 { 1571 {
1655 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);
1656 return NULL; 1573 return NULL;
1657 } 1574 }
1658 1575
1659 newob = object_create_clone (orig_ob); 1576 newob = object_create_clone (orig_ob);
1660 1577
1661 if ((orig_ob->nrof -= nr) < 1) 1578 if ((orig_ob->nrof -= nr) < 1)
1662 { 1579 orig_ob->destroy (1);
1663 if (!is_removed)
1664 remove_ob (orig_ob);
1665 free_object2 (orig_ob, 1);
1666 }
1667 else if (!is_removed) 1580 else if (!is_removed)
1668 { 1581 {
1669 if (orig_ob->env != NULL) 1582 if (orig_ob->env != NULL)
1670 sub_weight (orig_ob->env, orig_ob->weight * nr); 1583 sub_weight (orig_ob->env, orig_ob->weight * nr);
1671 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)
… …
1735 esrv_send_item (tmp, op); 1648 esrv_send_item (tmp, op);
1736 } 1649 }
1737 } 1650 }
1738 else 1651 else
1739 { 1652 {
1740 remove_ob (op); 1653 op->remove ();
1741 op->nrof = 0; 1654 op->nrof = 0;
1742 if (tmp) 1655 if (tmp)
1743 { 1656 {
1744 esrv_del_item (tmp->contr, op->count); 1657 esrv_del_item (tmp->contr, op->count);
1745 } 1658 }
… …
1751 1664
1752 if (i < op->nrof) 1665 if (i < op->nrof)
1753 op->nrof -= i; 1666 op->nrof -= i;
1754 else 1667 else
1755 { 1668 {
1756 remove_ob (op); 1669 op->remove ();
1757 op->nrof = 0; 1670 op->nrof = 0;
1758 } 1671 }
1759 1672
1760 /* Since we just removed op, op->above is null */ 1673 /* Since we just removed op, op->above is null */
1761 for (tmp = above; tmp != NULL; tmp = tmp->above) 1674 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1770 1683
1771 if (op->nrof) 1684 if (op->nrof)
1772 return op; 1685 return op;
1773 else 1686 else
1774 { 1687 {
1775 free_object (op); 1688 op->destroy ();
1776 return NULL; 1689 return NULL;
1777 } 1690 }
1778} 1691}
1779 1692
1780/* 1693/*
… …
1793 op->carrying += weight; 1706 op->carrying += weight;
1794 op = op->env; 1707 op = op->env;
1795 } 1708 }
1796} 1709}
1797 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
1798/* 1731/*
1799 * insert_ob_in_ob(op,environment): 1732 * env->insert (op)
1800 * This function inserts the object op in the linked list 1733 * This function inserts the object op in the linked list
1801 * inside the object environment. 1734 * inside the object environment.
1802 * 1735 *
1803 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1804 * the inventory at the last position or next to other objects of the same
1805 * type.
1806 * Frank: Now sorted by type, archetype and magic!
1807 *
1808 * 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
1809 * be != op, if items are merged. -Tero 1737 * be != op, if items are merged. -Tero
1810 */ 1738 */
1811 1739
1812object * 1740object *
1813insert_ob_in_ob (object *op, object *where) 1741object::insert (object *op)
1814{ 1742{
1815 object * 1743 object *tmp, *otmp;
1816 tmp, *
1817 otmp;
1818 1744
1819 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1745 if (!QUERY_FLAG (op, FLAG_REMOVED))
1820 { 1746 op->remove ();
1821 dump_object (op);
1822 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1823 return op;
1824 }
1825
1826 if (where == NULL)
1827 {
1828 dump_object (op);
1829 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1830 return op;
1831 }
1832
1833 if (where->head)
1834 {
1835 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1836 where = where->head;
1837 }
1838 1747
1839 if (op->more) 1748 if (op->more)
1840 { 1749 {
1841 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);
1842 return op; 1751 return op;
… …
1844 1753
1845 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1846 CLEAR_FLAG (op, FLAG_REMOVED); 1755 CLEAR_FLAG (op, FLAG_REMOVED);
1847 if (op->nrof) 1756 if (op->nrof)
1848 { 1757 {
1849 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1758 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1850 if (CAN_MERGE (tmp, op)) 1759 if (object::can_merge (tmp, op))
1851 { 1760 {
1852 /* return the original object and remove inserted object 1761 /* return the original object and remove inserted object
1853 (client needs the original object) */ 1762 (client needs the original object) */
1854 tmp->nrof += op->nrof; 1763 tmp->nrof += op->nrof;
1855 /* Weight handling gets pretty funky. Since we are adding to 1764 /* Weight handling gets pretty funky. Since we are adding to
1856 * tmp->nrof, we need to increase the weight. 1765 * tmp->nrof, we need to increase the weight.
1857 */ 1766 */
1858 add_weight (where, op->weight * op->nrof); 1767 add_weight (this, op->weight * op->nrof);
1859 SET_FLAG (op, FLAG_REMOVED); 1768 SET_FLAG (op, FLAG_REMOVED);
1860 free_object (op); /* free the inserted object */ 1769 op->destroy (); /* free the inserted object */
1861 op = tmp; 1770 op = tmp;
1862 remove_ob (op); /* and fix old object's links */ 1771 op->remove (); /* and fix old object's links */
1863 CLEAR_FLAG (op, FLAG_REMOVED); 1772 CLEAR_FLAG (op, FLAG_REMOVED);
1864 break; 1773 break;
1865 } 1774 }
1866 1775
1867 /* I assume combined objects have no inventory 1776 /* I assume combined objects have no inventory
1868 * We add the weight - this object could have just been removed 1777 * We add the weight - this object could have just been removed
1869 * (if it was possible to merge). calling remove_ob will subtract 1778 * (if it was possible to merge). calling remove_ob will subtract
1870 * 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
1871 * the linking below 1780 * the linking below
1872 */ 1781 */
1873 add_weight (where, op->weight * op->nrof); 1782 add_weight (this, op->weight * op->nrof);
1874 } 1783 }
1875 else 1784 else
1876 add_weight (where, (op->weight + op->carrying)); 1785 add_weight (this, (op->weight + op->carrying));
1877 1786
1878 otmp = is_player_inv (where); 1787 otmp = is_player_inv (this);
1879 if (otmp && otmp->contr != NULL) 1788 if (otmp && otmp->contr)
1880 {
1881 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1789 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1882 fix_player (otmp); 1790 fix_player (otmp);
1883 }
1884 1791
1885 op->map = NULL; 1792 op->map = NULL;
1886 op->env = where; 1793 op->env = this;
1887 op->above = NULL; 1794 op->above = NULL;
1888 op->below = NULL; 1795 op->below = NULL;
1889 op->x = 0, op->y = 0; 1796 op->x = 0, op->y = 0;
1890 1797
1891 /* 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 */
1892 if ((op->glow_radius != 0) && where->map) 1799 if ((op->glow_radius != 0) && map)
1893 { 1800 {
1894#ifdef DEBUG_LIGHTS 1801#ifdef DEBUG_LIGHTS
1895 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);
1896#endif /* DEBUG_LIGHTS */ 1803#endif /* DEBUG_LIGHTS */
1897 if (MAP_DARKNESS (where->map)) 1804 if (MAP_DARKNESS (map))
1898 update_all_los (where->map, where->x, where->y); 1805 update_all_los (map, x, y);
1899 } 1806 }
1900 1807
1901 /* 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.
1902 * It sure simplifies this function... 1809 * It sure simplifies this function...
1903 */ 1810 */
1904 if (where->inv == NULL) 1811 if (!inv)
1905 where->inv = op; 1812 inv = op;
1906 else 1813 else
1907 { 1814 {
1908 op->below = where->inv; 1815 op->below = inv;
1909 op->below->above = op; 1816 op->below->above = op;
1910 where->inv = op; 1817 inv = op;
1911 } 1818 }
1819
1912 return op; 1820 return op;
1913} 1821}
1914 1822
1915/* 1823/*
1916 * Checks if any objects has a move_type that matches objects 1824 * Checks if any objects has a move_type that matches objects
… …
1934 */ 1842 */
1935 1843
1936int 1844int
1937check_move_on (object *op, object *originator) 1845check_move_on (object *op, object *originator)
1938{ 1846{
1939 object * 1847 object *tmp;
1940 tmp; 1848 maptile *m = op->map;
1941 tag_t
1942 tag;
1943 mapstruct *
1944 m = op->map;
1945 int
1946 x = op->x, y = op->y; 1849 int x = op->x, y = op->y;
1947 1850
1948 MoveType 1851 MoveType move_on, move_slow, move_block;
1949 move_on,
1950 move_slow,
1951 move_block;
1952 1852
1953 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1853 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1954 return 0; 1854 return 0;
1955
1956 tag = op->count;
1957 1855
1958 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);
1959 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);
1960 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);
1961 1859
… …
2022 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1920 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2023 ((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))
2024 { 1922 {
2025 move_apply (tmp, op, originator); 1923 move_apply (tmp, op, originator);
2026 1924
2027 if (was_destroyed (op, tag)) 1925 if (op->destroyed ())
2028 return 1; 1926 return 1;
2029 1927
2030 /* what the person/creature stepped onto has moved the object 1928 /* what the person/creature stepped onto has moved the object
2031 * someplace new. Don't process any further - if we did, 1929 * someplace new. Don't process any further - if we did,
2032 * have a feeling strange problems would result. 1930 * have a feeling strange problems would result.
… …
2044 * a matching archetype at the given map and coordinates. 1942 * a matching archetype at the given map and coordinates.
2045 * The first matching object is returned, or NULL if none. 1943 * The first matching object is returned, or NULL if none.
2046 */ 1944 */
2047 1945
2048object * 1946object *
2049present_arch (const archetype *at, mapstruct *m, int x, int y) 1947present_arch (const archetype *at, maptile *m, int x, int y)
2050{ 1948{
2051 object * 1949 object *
2052 tmp; 1950 tmp;
2053 1951
2054 if (m == NULL || out_of_map (m, x, y)) 1952 if (m == NULL || out_of_map (m, x, y))
… …
2067 * a matching type variable at the given map and coordinates. 1965 * a matching type variable at the given map and coordinates.
2068 * The first matching object is returned, or NULL if none. 1966 * The first matching object is returned, or NULL if none.
2069 */ 1967 */
2070 1968
2071object * 1969object *
2072present (unsigned char type, mapstruct *m, int x, int y) 1970present (unsigned char type, maptile *m, int x, int y)
2073{ 1971{
2074 object * 1972 object *
2075 tmp; 1973 tmp;
2076 1974
2077 if (out_of_map (m, x, y)) 1975 if (out_of_map (m, x, y))
… …
2217 * 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
2218 * customized, changed states, etc. 2116 * customized, changed states, etc.
2219 */ 2117 */
2220 2118
2221int 2119int
2222find_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)
2223{ 2121{
2224 int 2122 int
2225 i, 2123 i,
2226 index = 0, flag; 2124 index = 0, flag;
2227 static int 2125 static int
… …
2248 return -1; 2146 return -1;
2249 return altern[RANDOM () % index]; 2147 return altern[RANDOM () % index];
2250} 2148}
2251 2149
2252/* 2150/*
2253 * find_first_free_spot(archetype, mapstruct, x, y) works like 2151 * find_first_free_spot(archetype, maptile, x, y) works like
2254 * find_free_spot(), but it will search max number of squares. 2152 * find_free_spot(), but it will search max number of squares.
2255 * 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.
2256 * 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.
2257 */ 2155 */
2258 2156
2259int 2157int
2260find_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)
2261{ 2159{
2262 int 2160 int
2263 i; 2161 i;
2264 2162
2265 for (i = 0; i < SIZEOFFREE; i++) 2163 for (i = 0; i < SIZEOFFREE; i++)
… …
2329 * 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
2330 * there is capable of. 2228 * there is capable of.
2331 */ 2229 */
2332 2230
2333int 2231int
2334find_dir (mapstruct *m, int x, int y, object *exclude) 2232find_dir (maptile *m, int x, int y, object *exclude)
2335{ 2233{
2336 int 2234 int
2337 i, 2235 i,
2338 max = SIZEOFFREE, mflags; 2236 max = SIZEOFFREE, mflags;
2339 2237
2340 sint16 nx, ny; 2238 sint16 nx, ny;
2341 object * 2239 object *
2342 tmp; 2240 tmp;
2343 mapstruct * 2241 maptile *
2344 mp; 2242 mp;
2345 2243
2346 MoveType blocked, move_type; 2244 MoveType blocked, move_type;
2347 2245
2348 if (exclude && exclude->head) 2246 if (exclude && exclude->head)
… …
2556 * Modified to be map tile aware -.MSW 2454 * Modified to be map tile aware -.MSW
2557 */ 2455 */
2558 2456
2559 2457
2560int 2458int
2561can_see_monsterP (mapstruct *m, int x, int y, int dir) 2459can_see_monsterP (maptile *m, int x, int y, int dir)
2562{ 2460{
2563 sint16 dx, dy; 2461 sint16 dx, dy;
2564 int 2462 int
2565 mflags; 2463 mflags;
2566 2464
… …
2615 * create clone from object to another 2513 * create clone from object to another
2616 */ 2514 */
2617object * 2515object *
2618object_create_clone (object *asrc) 2516object_create_clone (object *asrc)
2619{ 2517{
2620 object *
2621 dst = NULL, *tmp, *src, *part, *prev, *item; 2518 object *dst = 0, *tmp, *src, *part, *prev, *item;
2622 2519
2623 if (!asrc) 2520 if (!asrc)
2624 return NULL; 2521 return 0;
2522
2625 src = asrc; 2523 src = asrc;
2626 if (src->head) 2524 if (src->head)
2627 src = src->head; 2525 src = src->head;
2628 2526
2629 prev = NULL; 2527 prev = 0;
2630 for (part = src; part; part = part->more) 2528 for (part = src; part; part = part->more)
2631 { 2529 {
2632 tmp = get_object (); 2530 tmp = part->clone ();
2633 copy_object (part, tmp);
2634 tmp->x -= src->x; 2531 tmp->x -= src->x;
2635 tmp->y -= src->y; 2532 tmp->y -= src->y;
2533
2636 if (!part->head) 2534 if (!part->head)
2637 { 2535 {
2638 dst = tmp; 2536 dst = tmp;
2639 tmp->head = NULL; 2537 tmp->head = 0;
2640 } 2538 }
2641 else 2539 else
2642 { 2540 {
2643 tmp->head = dst; 2541 tmp->head = dst;
2644 } 2542 }
2543
2645 tmp->more = NULL; 2544 tmp->more = 0;
2545
2646 if (prev) 2546 if (prev)
2647 prev->more = tmp; 2547 prev->more = tmp;
2548
2648 prev = tmp; 2549 prev = tmp;
2649 } 2550 }
2650 2551
2651 /*** copy inventory ***/
2652 for (item = src->inv; item; item = item->below) 2552 for (item = src->inv; item; item = item->below)
2653 {
2654 (void) insert_ob_in_ob (object_create_clone (item), dst); 2553 insert_ob_in_ob (object_create_clone (item), dst);
2655 }
2656 2554
2657 return dst; 2555 return dst;
2658} 2556}
2659 2557
2660/* return true if the object was destroyed, 0 otherwise */
2661int
2662was_destroyed (const object *op, tag_t old_tag)
2663{
2664 /* checking for FLAG_FREED isn't necessary, but makes this function more
2665 * robust */
2666 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2667}
2668
2669/* GROS - Creates an object using a string representing its content. */ 2558/* GROS - Creates an object using a string representing its content. */
2670
2671/* 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 */
2672
2673/* 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, */
2674
2675/* 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. */
2676
2677/* 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. */
2678
2679/* Also remember that multiparts objects are not supported for now. */ 2563/* Also remember that multiparts objects are not supported for now. */
2680 2564
2681object * 2565object *
2682load_object_str (const char *obstr) 2566load_object_str (const char *obstr)
2683{ 2567{
2684 object * 2568 object *op;
2685 op;
2686 char
2687 filename[MAX_BUF]; 2569 char filename[MAX_BUF];
2688 2570
2689 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2571 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2690 2572
2691 FILE *
2692 tempfile = fopen (filename, "w"); 2573 FILE *tempfile = fopen (filename, "w");
2693 2574
2694 if (tempfile == NULL) 2575 if (tempfile == NULL)
2695 { 2576 {
2696 LOG (llevError, "Error - Unable to access load object temp file\n"); 2577 LOG (llevError, "Error - Unable to access load object temp file\n");
2697 return NULL; 2578 return NULL;
2698 } 2579 }
2699 2580
2700 fprintf (tempfile, obstr); 2581 fprintf (tempfile, obstr);
2701 fclose (tempfile); 2582 fclose (tempfile);
2702 2583
2703 op = get_object (); 2584 op = object::create ();
2704 2585
2705 object_thawer thawer (filename); 2586 object_thawer thawer (filename);
2706 2587
2707 if (thawer) 2588 if (thawer)
2708 load_object (thawer, op, 0); 2589 load_object (thawer, op, 0);
… …
2718 * returns NULL if no match. 2599 * returns NULL if no match.
2719 */ 2600 */
2720object * 2601object *
2721find_obj_by_type_subtype (const object *who, int type, int subtype) 2602find_obj_by_type_subtype (const object *who, int type, int subtype)
2722{ 2603{
2723 object * 2604 object *tmp;
2724 tmp;
2725 2605
2726 for (tmp = who->inv; tmp; tmp = tmp->below) 2606 for (tmp = who->inv; tmp; tmp = tmp->below)
2727 if (tmp->type == type && tmp->subtype == subtype) 2607 if (tmp->type == type && tmp->subtype == subtype)
2728 return tmp; 2608 return tmp;
2729 2609
… …
2737 * do the desired thing. 2617 * do the desired thing.
2738 */ 2618 */
2739key_value * 2619key_value *
2740get_ob_key_link (const object *ob, const char *key) 2620get_ob_key_link (const object *ob, const char *key)
2741{ 2621{
2742 key_value * 2622 key_value *link;
2743 link;
2744 2623
2745 for (link = ob->key_values; link != NULL; link = link->next) 2624 for (link = ob->key_values; link != NULL; link = link->next)
2746 {
2747 if (link->key == key) 2625 if (link->key == key)
2748 {
2749 return link; 2626 return link;
2750 }
2751 }
2752 2627
2753 return NULL; 2628 return NULL;
2754} 2629}
2755 2630
2756/* 2631/*

Diff Legend

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