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.46 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
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)
… …
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
224 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225 * being locked in inventory should prevent merging. 228 || ob1->arch != ob2->arch
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) || 229 || ob1->name != ob2->name
234 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
235 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
236 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
237 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
238 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
239 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
240 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
241 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
242 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
243 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
244 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
245 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
246 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
247 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
248 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
249 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
250 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
251 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
252 (ob1->move_on != ob2->move_on) || 248 || 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)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
254 return 0; 252 return 0;
255 253
256 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
257 * check all objects in the inventory. 255 * check all objects in the inventory.
258 */ 256 */
… …
261 /* if one object has inventory but the other doesn't, not equiv */ 259 /* if one object has inventory but the other doesn't, not equiv */
262 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
263 return 0; 261 return 0;
264 262
265 /* Now check to see if the two inventory objects could merge */ 263 /* Now check to see if the two inventory objects could merge */
266 if (!CAN_MERGE (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
267 return 0; 265 return 0;
268 266
269 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
270 * if it is valid. 268 * if it is valid.
271 */ 269 */
… …
375 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 373 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
376 * Some error messages. 374 * Some error messages.
377 * The result of the dump is stored in the static global errmsg array. 375 * The result of the dump is stored in the static global errmsg array.
378 */ 376 */
379 377
380void 378char *
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) 379dump_object (object *op)
436{ 380{
437 if (op == NULL) 381 if (!op)
438 { 382 return strdup ("[NULLOBJ]");
439 strcpy (errmsg, "[NULL pointer]");
440 return;
441 }
442 errmsg[0] = '\0';
443 dump_object2 (op);
444}
445 383
446void 384 object_freezer freezer;
447dump_all_objects (void) 385 save_object (freezer, op, 3);
448{ 386 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} 387}
457 388
458/* 389/*
459 * get_nearest_part(multi-object, object 2) returns the part of the 390 * get_nearest_part(multi-object, object 2) returns the part of the
460 * multi-object 1 which is closest to the second object. 391 * multi-object 1 which is closest to the second object.
… …
480 */ 411 */
481 412
482object * 413object *
483find_object (tag_t i) 414find_object (tag_t i)
484{ 415{
485 object *op;
486
487 for (op = object::first; op != NULL; op = op->next) 416 for (object *op = object::first; op; op = op->next)
488 if (op->count == i) 417 if (op->count == i)
489 break; 418 return op;
419
490 return op; 420 return 0;
491} 421}
492 422
493/* 423/*
494 * Returns the first object which has a name equal to the argument. 424 * Returns the first object which has a name equal to the argument.
495 * Used only by the patch command, but not all that useful. 425 * Used only by the patch command, but not all that useful.
… …
595 525
596 if (settings.casting_time) 526 if (settings.casting_time)
597 casting_time = -1; 527 casting_time = -1;
598} 528}
599 529
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/* 530/*
610 * copy object first frees everything allocated by the second object, 531 * copy_to first frees everything allocated by the dst object,
611 * and then copies the contends of the first object into the second 532 * and then copies the contents of itself into the second
612 * object, allocating what needs to be allocated. Basically, any 533 * object, allocating what needs to be allocated. Basically, any
613 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 534 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
614 * if the first object is freed, the pointers in the new object 535 * if the first object is freed, the pointers in the new object
615 * will point at garbage. 536 * will point at garbage.
616 */ 537 */
617void 538void
618copy_object (object *op2, object *op) 539object::copy_to (object *dst)
619{ 540{
620 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 541 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 542 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622 543
623 op2->clone (op); 544 *(object_copy *)dst = *this;
545 *(object_pod *)dst = *this;
546
547 if (self || cb)
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
624 549
625 if (is_freed) 550 if (is_freed)
626 SET_FLAG (op, FLAG_FREED); 551 SET_FLAG (dst, FLAG_FREED);
552
627 if (is_removed) 553 if (is_removed)
628 SET_FLAG (op, FLAG_REMOVED); 554 SET_FLAG (dst, FLAG_REMOVED);
629 555
630 if (op2->speed < 0) 556 if (speed < 0)
631 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 557 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632 558
633 /* Copy over key_values, if any. */ 559 /* Copy over key_values, if any. */
634 if (op2->key_values) 560 if (key_values)
635 { 561 {
636 key_value *tail = 0; 562 key_value *tail = 0;
637 key_value *i; 563 key_value *i;
638 564
639 op->key_values = 0; 565 dst->key_values = 0;
640 566
641 for (i = op2->key_values; i; i = i->next) 567 for (i = key_values; i; i = i->next)
642 { 568 {
643 key_value *new_link = new key_value; 569 key_value *new_link = new key_value;
644 570
645 new_link->next = 0; 571 new_link->next = 0;
646 new_link->key = i->key; 572 new_link->key = i->key;
647 new_link->value = i->value; 573 new_link->value = i->value;
648 574
649 /* Try and be clever here, too. */ 575 /* Try and be clever here, too. */
650 if (!op->key_values) 576 if (!dst->key_values)
651 { 577 {
652 op->key_values = new_link; 578 dst->key_values = new_link;
653 tail = new_link; 579 tail = new_link;
654 } 580 }
655 else 581 else
656 { 582 {
657 tail->next = new_link; 583 tail->next = new_link;
658 tail = new_link; 584 tail = new_link;
659 } 585 }
660 } 586 }
661 } 587 }
662 588
663 update_ob_speed (op); 589 update_ob_speed (dst);
590}
591
592object *
593object::clone ()
594{
595 object *neu = create ();
596 copy_to (neu);
597 return neu;
664} 598}
665 599
666/* 600/*
667 * If an object with the IS_TURNABLE() flag needs to be turned due 601 * If an object with the IS_TURNABLE() flag needs to be turned due
668 * to the closest player being on the other side, this function can 602 * to the closest player being on the other side, this function can
… …
873 update_now = 1; 807 update_now = 1;
874 808
875 if ((move_slow | op->move_slow) != move_slow) 809 if ((move_slow | op->move_slow) != move_slow)
876 update_now = 1; 810 update_now = 1;
877 } 811 }
812
878 /* if the object is being removed, we can't make intelligent 813 /* if the object is being removed, we can't make intelligent
879 * decisions, because remove_ob can't really pass the object 814 * decisions, because remove_ob can't really pass the object
880 * that is being removed. 815 * that is being removed.
881 */ 816 */
882 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 817 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
… …
908 else 843 else
909 { 844 {
910 delete *i; 845 delete *i;
911 mortals.erase (i); 846 mortals.erase (i);
912 } 847 }
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} 848}
922 849
923object::object () 850object::object ()
924{ 851{
925 SET_FLAG (this, FLAG_REMOVED); 852 SET_FLAG (this, FLAG_REMOVED);
… …
947 object::first = this; 874 object::first = this;
948} 875}
949 876
950void object::unlink () 877void object::unlink ()
951{ 878{
952 //count = 0;//D
953 if (!prev && !next) return;//D
954
955 if (this == object::first) 879 if (this == object::first)
956 object::first = next; 880 object::first = next;
957 881
958 /* Remove this object from the list of used objects */ 882 /* Remove this object from the list of used objects */
959 if (prev) prev->next = next; 883 if (prev) prev->next = next;
… …
975 * it from the list of used objects, and puts it on the list of 899 * it from the list of used objects, and puts it on the list of
976 * free objects. The IS_FREED() flag is set in the object. 900 * free objects. The IS_FREED() flag is set in the object.
977 * The object must have been removed by remove_ob() first for 901 * The object must have been removed by remove_ob() first for
978 * this function to succeed. 902 * this function to succeed.
979 * 903 *
980 * If free_inventory is set, free inventory as well. Else drop items in 904 * If destroy_inventory is set, free inventory as well. Else drop items in
981 * inventory to the ground. 905 * inventory to the ground.
982 */ 906 */
983void object::free (bool free_inventory) 907void object::destroy (bool destroy_inventory)
984{ 908{
985 if (QUERY_FLAG (this, FLAG_FREED)) 909 if (QUERY_FLAG (this, FLAG_FREED))
986 return; 910 return;
987 911
988 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 912 if (QUERY_FLAG (this, FLAG_FRIENDLY))
989 remove_friendly_object (this); 913 remove_friendly_object (this);
990 914
991 if (!QUERY_FLAG (this, FLAG_REMOVED)) 915 if (!QUERY_FLAG (this, FLAG_REMOVED))
992 remove_ob (this); 916 remove ();
993 917
994 SET_FLAG (this, FLAG_FREED); 918 SET_FLAG (this, FLAG_FREED);
995 919
996 if (more) 920 if (more)
997 { 921 {
998 more->free (free_inventory); 922 more->destroy (destroy_inventory);
999 more = 0; 923 more = 0;
1000 } 924 }
1001 925
1002 if (inv) 926 if (inv)
1003 { 927 {
1004 /* Only if the space blocks everything do we not process - 928 /* Only if the space blocks everything do we not process -
1005 * if some form of movement is allowed, let objects 929 * if some form of movement is allowed, let objects
1006 * drop on that space. 930 * drop on that space.
1007 */ 931 */
1008 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 932 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1009 { 933 {
1010 object *op = inv; 934 object *op = inv;
1011 935
1012 while (op) 936 while (op)
1013 { 937 {
1014 object *tmp = op->below; 938 object *tmp = op->below;
1015 op->free (free_inventory); 939 op->destroy (destroy_inventory);
1016 op = tmp; 940 op = tmp;
1017 } 941 }
1018 } 942 }
1019 else 943 else
1020 { /* Put objects in inventory onto this space */ 944 { /* Put objects in inventory onto this space */
… …
1022 946
1023 while (op) 947 while (op)
1024 { 948 {
1025 object *tmp = op->below; 949 object *tmp = op->below;
1026 950
1027 remove_ob (op); 951 op->remove ();
1028 952
1029 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 953 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)) 954 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1031 free_object (op); 955 op->destroy ();
1032 else 956 else
1033 { 957 {
1034 op->x = x; 958 op->x = x;
1035 op->y = y; 959 op->y = y;
1036 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 960 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1039 op = tmp; 963 op = tmp;
1040 } 964 }
1041 } 965 }
1042 } 966 }
1043 967
968 // hack to ensure that freed objects still have a valid map
969 {
970 static maptile *freed_map; // freed objects are moved here to avoid crashes
971
972 if (!freed_map)
973 {
974 freed_map = new maptile;
975
976 freed_map->name = "/internal/freed_objects_map";
977 freed_map->width = 3;
978 freed_map->height = 3;
979
980 freed_map->allocate ();
981 }
982
983 map = freed_map;
984 x = 1;
985 y = 1;
986 }
987
1044 // clear those pointers that likely might have circular references to us 988 // clear those pointers that likely might have circular references to us
1045 owner = 0; 989 owner = 0;
1046 enemy = 0; 990 enemy = 0;
1047 attacked_by = 0; 991 attacked_by = 0;
1048 992
993 // only relevant for players(?), but make sure of it anyways
994 contr = 0;
995
1049 /* Remove object from the active list */ 996 /* Remove object from the active list */
1050 speed = 0; 997 speed = 0;
1051 update_ob_speed (this); 998 update_ob_speed (this);
1052 999
1053 unlink (); 1000 unlink ();
… …
1057 1004
1058/* 1005/*
1059 * sub_weight() recursively (outwards) subtracts a number from the 1006 * sub_weight() recursively (outwards) subtracts a number from the
1060 * weight of an object (and what is carried by it's environment(s)). 1007 * weight of an object (and what is carried by it's environment(s)).
1061 */ 1008 */
1062
1063void 1009void
1064sub_weight (object *op, signed long weight) 1010sub_weight (object *op, signed long weight)
1065{ 1011{
1066 while (op != NULL) 1012 while (op != NULL)
1067 { 1013 {
… …
1071 op->carrying -= weight; 1017 op->carrying -= weight;
1072 op = op->env; 1018 op = op->env;
1073 } 1019 }
1074} 1020}
1075 1021
1076/* remove_ob(op): 1022/* op->remove ():
1077 * This function removes the object op from the linked list of objects 1023 * This function removes the object op from the linked list of objects
1078 * which it is currently tied to. When this function is done, the 1024 * which it is currently tied to. When this function is done, the
1079 * object will have no environment. If the object previously had an 1025 * object will have no environment. If the object previously had an
1080 * environment, the x and y coordinates will be updated to 1026 * environment, the x and y coordinates will be updated to
1081 * the previous environment. 1027 * the previous environment.
1082 * Beware: This function is called from the editor as well! 1028 * Beware: This function is called from the editor as well!
1083 */ 1029 */
1084
1085void 1030void
1086remove_ob (object *op) 1031object::remove ()
1087{ 1032{
1088 object *tmp, *last = 0; 1033 object *tmp, *last = 0;
1089 object *otmp; 1034 object *otmp;
1090 1035
1091 tag_t tag;
1092 int check_walk_off; 1036 int check_walk_off;
1093 mapstruct *m;
1094 1037
1095 sint16 x, y;
1096
1097 if (QUERY_FLAG (op, FLAG_REMOVED)) 1038 if (QUERY_FLAG (this, FLAG_REMOVED))
1098 return; 1039 return;
1099 1040
1100 SET_FLAG (op, FLAG_REMOVED); 1041 SET_FLAG (this, FLAG_REMOVED);
1101 1042
1102 if (op->more != NULL) 1043 if (more)
1103 remove_ob (op->more); 1044 more->remove ();
1104 1045
1105 /* 1046 /*
1106 * In this case, the object to be removed is in someones 1047 * In this case, the object to be removed is in someones
1107 * inventory. 1048 * inventory.
1108 */ 1049 */
1109 if (op->env != NULL) 1050 if (env)
1110 { 1051 {
1111 if (op->nrof) 1052 if (nrof)
1112 sub_weight (op->env, op->weight * op->nrof); 1053 sub_weight (env, weight * nrof);
1113 else 1054 else
1114 sub_weight (op->env, op->weight + op->carrying); 1055 sub_weight (env, weight + carrying);
1115 1056
1116 /* NO_FIX_PLAYER is set when a great many changes are being 1057 /* NO_FIX_PLAYER is set when a great many changes are being
1117 * made to players inventory. If set, avoiding the call 1058 * made to players inventory. If set, avoiding the call
1118 * to save cpu time. 1059 * to save cpu time.
1119 */ 1060 */
1120 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1061 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1121 fix_player (otmp); 1062 fix_player (otmp);
1122 1063
1123 if (op->above != NULL) 1064 if (above != NULL)
1124 op->above->below = op->below; 1065 above->below = below;
1125 else 1066 else
1126 op->env->inv = op->below; 1067 env->inv = below;
1127 1068
1128 if (op->below != NULL) 1069 if (below != NULL)
1129 op->below->above = op->above; 1070 below->above = above;
1130 1071
1131 /* we set up values so that it could be inserted into 1072 /* we set up values so that it could be inserted into
1132 * the map, but we don't actually do that - it is up 1073 * the map, but we don't actually do that - it is up
1133 * to the caller to decide what we want to do. 1074 * to the caller to decide what we want to do.
1134 */ 1075 */
1135 op->x = op->env->x, op->y = op->env->y; 1076 x = env->x, y = env->y;
1136 op->map = op->env->map; 1077 map = env->map;
1137 op->above = NULL, op->below = NULL; 1078 above = 0, below = 0;
1138 op->env = NULL; 1079 env = 0;
1139 } 1080 }
1140 else if (op->map) 1081 else if (map)
1141 { 1082 {
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 1083 /* Re did the following section of code - it looks like it had
1162 * lots of logic for things we no longer care about 1084 * lots of logic for things we no longer care about
1163 */ 1085 */
1164 1086
1165 /* link the object above us */ 1087 /* link the object above us */
1166 if (op->above) 1088 if (above)
1167 op->above->below = op->below; 1089 above->below = below;
1168 else 1090 else
1169 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 1091 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1170 1092
1171 /* Relink the object below us, if there is one */ 1093 /* Relink the object below us, if there is one */
1172 if (op->below) 1094 if (below)
1173 op->below->above = op->above; 1095 below->above = above;
1174 else 1096 else
1175 { 1097 {
1176 /* Nothing below, which means we need to relink map object for this space 1098 /* Nothing below, which means we need to relink map object for this space
1177 * use translated coordinates in case some oddness with map tiling is 1099 * use translated coordinates in case some oddness with map tiling is
1178 * evident 1100 * evident
1179 */ 1101 */
1180 if (GET_MAP_OB (m, x, y) != op) 1102 if (GET_MAP_OB (map, x, y) != this)
1181 { 1103 {
1182 dump_object (op); 1104 char *dump = dump_object (this);
1183 LOG (llevError, 1105 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); 1106 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1107 free (dump);
1185 dump_object (GET_MAP_OB (m, x, y)); 1108 dump = dump_object (GET_MAP_OB (map, x, y));
1186 LOG (llevError, "%s\n", errmsg); 1109 LOG (llevError, "%s\n", dump);
1110 free (dump);
1187 } 1111 }
1188 1112
1189 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1113 SET_MAP_OB (map, x, y, above); /* goes on above it. */
1190 } 1114 }
1191 1115
1192 op->above = 0; 1116 above = 0;
1193 op->below = 0; 1117 below = 0;
1194 1118
1195 if (op->map->in_memory == MAP_SAVING) 1119 if (map->in_memory == MAP_SAVING)
1196 return; 1120 return;
1197 1121
1198 tag = op->count;
1199 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY); 1122 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1200 1123
1201 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1124 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1202 { 1125 {
1203 /* No point updating the players look faces if he is the object 1126 /* No point updating the players look faces if he is the object
1204 * being removed. 1127 * being removed.
1205 */ 1128 */
1206 1129
1207 if (tmp->type == PLAYER && tmp != op) 1130 if (tmp->type == PLAYER && tmp != this)
1208 { 1131 {
1209 /* If a container that the player is currently using somehow gets 1132 /* If a container that the player is currently using somehow gets
1210 * removed (most likely destroyed), update the player view 1133 * removed (most likely destroyed), update the player view
1211 * appropriately. 1134 * appropriately.
1212 */ 1135 */
1213 if (tmp->container == op) 1136 if (tmp->container == this)
1214 { 1137 {
1215 CLEAR_FLAG (op, FLAG_APPLIED); 1138 CLEAR_FLAG (this, FLAG_APPLIED);
1216 tmp->container = NULL; 1139 tmp->container = 0;
1217 } 1140 }
1218 1141
1219 tmp->contr->socket.update_look = 1; 1142 tmp->contr->socket->update_look = 1;
1220 } 1143 }
1221 1144
1222 /* See if player moving off should effect something */ 1145 /* 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)) 1146 if (check_walk_off
1147 && ((move_type & tmp->move_off)
1148 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224 { 1149 {
1225 move_apply (tmp, op, NULL); 1150 move_apply (tmp, this, 0);
1226 1151
1227 if (was_destroyed (op, tag)) 1152 if (destroyed ())
1228 {
1229 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1153 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1230 }
1231 } 1154 }
1232 1155
1233 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1156 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1234 1157
1235 if (tmp->above == tmp) 1158 if (tmp->above == tmp)
1236 tmp->above = NULL; 1159 tmp->above = 0;
1237 1160
1238 last = tmp; 1161 last = tmp;
1239 } 1162 }
1240 1163
1241 /* last == NULL of there are no objects on this space */ 1164 /* last == NULL of there are no objects on this space */
1242 if (last == NULL) 1165 if (!last)
1243 { 1166 {
1244 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1167 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1245 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1168 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1246 * those out anyways, and if there are any flags set right now, they won't 1169 * those out anyways, and if there are any flags set right now, they won't
1247 * be correct anyways. 1170 * be correct anyways.
1248 */ 1171 */
1249 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE); 1172 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1250 update_position (op->map, op->x, op->y); 1173 update_position (map, x, y);
1251 } 1174 }
1252 else 1175 else
1253 update_object (last, UP_OBJ_REMOVE); 1176 update_object (last, UP_OBJ_REMOVE);
1254 1177
1255 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1178 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1256 update_all_los (op->map, op->x, op->y); 1179 update_all_los (map, x, y);
1257 } 1180 }
1258} 1181}
1259 1182
1260/* 1183/*
1261 * merge_ob(op,top): 1184 * merge_ob(op,top):
… …
1276 1199
1277 for (; top != NULL; top = top->below) 1200 for (; top != NULL; top = top->below)
1278 { 1201 {
1279 if (top == op) 1202 if (top == op)
1280 continue; 1203 continue;
1281 if (CAN_MERGE (op, top)) 1204
1205 if (object::can_merge (op, top))
1282 { 1206 {
1283 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1284 1208
1285/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1286 op->weight = 0; /* Don't want any adjustements now */ 1210 op->weight = 0; /* Don't want any adjustements now */
1287 remove_ob (op); 1211 op->destroy ();
1288 free_object (op);
1289 return top; 1212 return top;
1290 } 1213 }
1291 } 1214 }
1292 1215
1293 return 0; 1216 return 0;
… …
1296/* 1219/*
1297 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1220 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1298 * job preparing multi-part monsters 1221 * job preparing multi-part monsters
1299 */ 1222 */
1300object * 1223object *
1301insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1224insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1302{ 1225{
1303 object *tmp; 1226 object *tmp;
1304 1227
1305 if (op->head) 1228 if (op->head)
1306 op = op->head; 1229 op = op->head;
… …
1334 * NULL if 'op' was destroyed 1257 * NULL if 'op' was destroyed
1335 * just 'op' otherwise 1258 * just 'op' otherwise
1336 */ 1259 */
1337 1260
1338object * 1261object *
1339insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1262insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1340{ 1263{
1341 object *tmp, *top, *floor = NULL; 1264 object *tmp, *top, *floor = NULL;
1342 sint16 x, y; 1265 sint16 x, y;
1343 1266
1344 if (QUERY_FLAG (op, FLAG_FREED)) 1267 if (QUERY_FLAG (op, FLAG_FREED))
… …
1347 return NULL; 1270 return NULL;
1348 } 1271 }
1349 1272
1350 if (m == NULL) 1273 if (m == NULL)
1351 { 1274 {
1352 dump_object (op); 1275 char *dump = dump_object (op);
1353 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1276 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1277 free (dump);
1354 return op; 1278 return op;
1355 } 1279 }
1356 1280
1357 if (out_of_map (m, op->x, op->y)) 1281 if (out_of_map (m, op->x, op->y))
1358 { 1282 {
1359 dump_object (op); 1283 char *dump = dump_object (op);
1360 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1284 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1361#ifdef MANY_CORES 1285#ifdef MANY_CORES
1362 /* Better to catch this here, as otherwise the next use of this object 1286 /* Better to catch this here, as otherwise the next use of this object
1363 * is likely to cause a crash. Better to find out where it is getting 1287 * is likely to cause a crash. Better to find out where it is getting
1364 * improperly inserted. 1288 * improperly inserted.
1365 */ 1289 */
1366 abort (); 1290 abort ();
1367#endif 1291#endif
1292 free (dump);
1368 return op; 1293 return op;
1369 } 1294 }
1370 1295
1371 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1296 if (!QUERY_FLAG (op, FLAG_REMOVED))
1372 { 1297 {
1373 dump_object (op); 1298 char *dump = dump_object (op);
1374 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1299 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300 free (dump);
1375 return op; 1301 return op;
1376 } 1302 }
1377 1303
1378 if (op->more != NULL) 1304 if (op->more != NULL)
1379 { 1305 {
… …
1417 1343
1418 /* this has to be done after we translate the coordinates. 1344 /* this has to be done after we translate the coordinates.
1419 */ 1345 */
1420 if (op->nrof && !(flag & INS_NO_MERGE)) 1346 if (op->nrof && !(flag & INS_NO_MERGE))
1421 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1347 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1422 if (CAN_MERGE (op, tmp)) 1348 if (object::can_merge (op, tmp))
1423 { 1349 {
1424 op->nrof += tmp->nrof; 1350 op->nrof += tmp->nrof;
1425 remove_ob (tmp); 1351 tmp->destroy ();
1426 free_object (tmp);
1427 } 1352 }
1428 1353
1429 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1354 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1430 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1355 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1431 1356
… …
1559 * it, so save a few ticks and start from there. 1484 * it, so save a few ticks and start from there.
1560 */ 1485 */
1561 if (!(flag & INS_MAP_LOAD)) 1486 if (!(flag & INS_MAP_LOAD))
1562 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1487 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1563 if (tmp->type == PLAYER) 1488 if (tmp->type == PLAYER)
1564 tmp->contr->socket.update_look = 1; 1489 tmp->contr->socket->update_look = 1;
1565 1490
1566 /* If this object glows, it may affect lighting conditions that are 1491 /* If this object glows, it may affect lighting conditions that are
1567 * visible to others on this map. But update_all_los is really 1492 * visible to others on this map. But update_all_los is really
1568 * an inefficient way to do this, as it means los for all players 1493 * an inefficient way to do this, as it means los for all players
1569 * on the map will get recalculated. The players could very well 1494 * on the map will get recalculated. The players could very well
… …
1617 tmp1; 1542 tmp1;
1618 1543
1619 /* first search for itself and remove any old instances */ 1544 /* first search for itself and remove any old instances */
1620 1545
1621 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1546 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1622 {
1623 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1624 { 1548 tmp->destroy ();
1625 remove_ob (tmp);
1626 free_object (tmp);
1627 }
1628 }
1629 1549
1630 tmp1 = arch_to_object (archetype::find (arch_string)); 1550 tmp1 = arch_to_object (archetype::find (arch_string));
1631 1551
1632 tmp1->x = op->x; 1552 tmp1->x = op->x;
1633 tmp1->y = op->y; 1553 tmp1->y = op->y;
… …
1643 */ 1563 */
1644 1564
1645object * 1565object *
1646get_split_ob (object *orig_ob, uint32 nr) 1566get_split_ob (object *orig_ob, uint32 nr)
1647{ 1567{
1648 object * 1568 object *newob;
1649 newob;
1650 int
1651 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1652 1570
1653 if (orig_ob->nrof < nr) 1571 if (orig_ob->nrof < nr)
1654 { 1572 {
1655 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1573 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1656 return NULL; 1574 return NULL;
1657 } 1575 }
1658 1576
1659 newob = object_create_clone (orig_ob); 1577 newob = object_create_clone (orig_ob);
1660 1578
1661 if ((orig_ob->nrof -= nr) < 1) 1579 if ((orig_ob->nrof -= nr) < 1)
1662 { 1580 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) 1581 else if (!is_removed)
1668 { 1582 {
1669 if (orig_ob->env != NULL) 1583 if (orig_ob->env != NULL)
1670 sub_weight (orig_ob->env, orig_ob->weight * nr); 1584 sub_weight (orig_ob->env, orig_ob->weight * nr);
1671 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1585 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1735 esrv_send_item (tmp, op); 1649 esrv_send_item (tmp, op);
1736 } 1650 }
1737 } 1651 }
1738 else 1652 else
1739 { 1653 {
1740 remove_ob (op); 1654 op->remove ();
1741 op->nrof = 0; 1655 op->nrof = 0;
1742 if (tmp) 1656 if (tmp)
1743 { 1657 {
1744 esrv_del_item (tmp->contr, op->count); 1658 esrv_del_item (tmp->contr, op->count);
1745 } 1659 }
… …
1751 1665
1752 if (i < op->nrof) 1666 if (i < op->nrof)
1753 op->nrof -= i; 1667 op->nrof -= i;
1754 else 1668 else
1755 { 1669 {
1756 remove_ob (op); 1670 op->remove ();
1757 op->nrof = 0; 1671 op->nrof = 0;
1758 } 1672 }
1759 1673
1760 /* Since we just removed op, op->above is null */ 1674 /* Since we just removed op, op->above is null */
1761 for (tmp = above; tmp != NULL; tmp = tmp->above) 1675 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1770 1684
1771 if (op->nrof) 1685 if (op->nrof)
1772 return op; 1686 return op;
1773 else 1687 else
1774 { 1688 {
1775 free_object (op); 1689 op->destroy ();
1776 return NULL; 1690 return NULL;
1777 } 1691 }
1778} 1692}
1779 1693
1780/* 1694/*
… …
1793 op->carrying += weight; 1707 op->carrying += weight;
1794 op = op->env; 1708 op = op->env;
1795 } 1709 }
1796} 1710}
1797 1711
1712object *
1713insert_ob_in_ob (object *op, object *where)
1714{
1715 if (!where)
1716 {
1717 char *dump = dump_object (op);
1718 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1719 free (dump);
1720 return op;
1721 }
1722
1723 if (where->head)
1724 {
1725 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1726 where = where->head;
1727 }
1728
1729 return where->insert (op);
1730}
1731
1798/* 1732/*
1799 * insert_ob_in_ob(op,environment): 1733 * env->insert (op)
1800 * This function inserts the object op in the linked list 1734 * This function inserts the object op in the linked list
1801 * inside the object environment. 1735 * inside the object environment.
1802 * 1736 *
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 1737 * The function returns now pointer to inserted item, and return value can
1809 * be != op, if items are merged. -Tero 1738 * be != op, if items are merged. -Tero
1810 */ 1739 */
1811 1740
1812object * 1741object *
1813insert_ob_in_ob (object *op, object *where) 1742object::insert (object *op)
1814{ 1743{
1815 object * 1744 object *tmp, *otmp;
1816 tmp, *
1817 otmp;
1818 1745
1819 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1746 if (!QUERY_FLAG (op, FLAG_REMOVED))
1820 { 1747 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 1748
1839 if (op->more) 1749 if (op->more)
1840 { 1750 {
1841 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1751 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1842 return op; 1752 return op;
… …
1844 1754
1845 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1755 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1846 CLEAR_FLAG (op, FLAG_REMOVED); 1756 CLEAR_FLAG (op, FLAG_REMOVED);
1847 if (op->nrof) 1757 if (op->nrof)
1848 { 1758 {
1849 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1759 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1850 if (CAN_MERGE (tmp, op)) 1760 if (object::can_merge (tmp, op))
1851 { 1761 {
1852 /* return the original object and remove inserted object 1762 /* return the original object and remove inserted object
1853 (client needs the original object) */ 1763 (client needs the original object) */
1854 tmp->nrof += op->nrof; 1764 tmp->nrof += op->nrof;
1855 /* Weight handling gets pretty funky. Since we are adding to 1765 /* Weight handling gets pretty funky. Since we are adding to
1856 * tmp->nrof, we need to increase the weight. 1766 * tmp->nrof, we need to increase the weight.
1857 */ 1767 */
1858 add_weight (where, op->weight * op->nrof); 1768 add_weight (this, op->weight * op->nrof);
1859 SET_FLAG (op, FLAG_REMOVED); 1769 SET_FLAG (op, FLAG_REMOVED);
1860 free_object (op); /* free the inserted object */ 1770 op->destroy (); /* free the inserted object */
1861 op = tmp; 1771 op = tmp;
1862 remove_ob (op); /* and fix old object's links */ 1772 op->remove (); /* and fix old object's links */
1863 CLEAR_FLAG (op, FLAG_REMOVED); 1773 CLEAR_FLAG (op, FLAG_REMOVED);
1864 break; 1774 break;
1865 } 1775 }
1866 1776
1867 /* I assume combined objects have no inventory 1777 /* I assume combined objects have no inventory
1868 * We add the weight - this object could have just been removed 1778 * We add the weight - this object could have just been removed
1869 * (if it was possible to merge). calling remove_ob will subtract 1779 * (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 1780 * the weight, so we need to add it in again, since we actually do
1871 * the linking below 1781 * the linking below
1872 */ 1782 */
1873 add_weight (where, op->weight * op->nrof); 1783 add_weight (this, op->weight * op->nrof);
1874 } 1784 }
1875 else 1785 else
1876 add_weight (where, (op->weight + op->carrying)); 1786 add_weight (this, (op->weight + op->carrying));
1877 1787
1878 otmp = is_player_inv (where); 1788 otmp = is_player_inv (this);
1879 if (otmp && otmp->contr != NULL) 1789 if (otmp && otmp->contr)
1880 {
1881 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1882 fix_player (otmp); 1791 fix_player (otmp);
1883 }
1884 1792
1885 op->map = NULL; 1793 op->map = NULL;
1886 op->env = where; 1794 op->env = this;
1887 op->above = NULL; 1795 op->above = NULL;
1888 op->below = NULL; 1796 op->below = NULL;
1889 op->x = 0, op->y = 0; 1797 op->x = 0, op->y = 0;
1890 1798
1891 /* reset the light list and los of the players on the map */ 1799 /* reset the light list and los of the players on the map */
1892 if ((op->glow_radius != 0) && where->map) 1800 if ((op->glow_radius != 0) && map)
1893 { 1801 {
1894#ifdef DEBUG_LIGHTS 1802#ifdef DEBUG_LIGHTS
1895 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1803 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1896#endif /* DEBUG_LIGHTS */ 1804#endif /* DEBUG_LIGHTS */
1897 if (MAP_DARKNESS (where->map)) 1805 if (MAP_DARKNESS (map))
1898 update_all_los (where->map, where->x, where->y); 1806 update_all_los (map, x, y);
1899 } 1807 }
1900 1808
1901 /* Client has no idea of ordering so lets not bother ordering it here. 1809 /* Client has no idea of ordering so lets not bother ordering it here.
1902 * It sure simplifies this function... 1810 * It sure simplifies this function...
1903 */ 1811 */
1904 if (where->inv == NULL) 1812 if (!inv)
1905 where->inv = op; 1813 inv = op;
1906 else 1814 else
1907 { 1815 {
1908 op->below = where->inv; 1816 op->below = inv;
1909 op->below->above = op; 1817 op->below->above = op;
1910 where->inv = op; 1818 inv = op;
1911 } 1819 }
1820
1912 return op; 1821 return op;
1913} 1822}
1914 1823
1915/* 1824/*
1916 * Checks if any objects has a move_type that matches objects 1825 * Checks if any objects has a move_type that matches objects
… …
1934 */ 1843 */
1935 1844
1936int 1845int
1937check_move_on (object *op, object *originator) 1846check_move_on (object *op, object *originator)
1938{ 1847{
1939 object * 1848 object *tmp;
1940 tmp; 1849 maptile *m = op->map;
1941 tag_t
1942 tag;
1943 mapstruct *
1944 m = op->map;
1945 int
1946 x = op->x, y = op->y; 1850 int x = op->x, y = op->y;
1947 1851
1948 MoveType 1852 MoveType move_on, move_slow, move_block;
1949 move_on,
1950 move_slow,
1951 move_block;
1952 1853
1953 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1854 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1954 return 0; 1855 return 0;
1955
1956 tag = op->count;
1957 1856
1958 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1857 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1959 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1858 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1960 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1859 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1961 1860
… …
2022 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1921 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)) 1922 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2024 { 1923 {
2025 move_apply (tmp, op, originator); 1924 move_apply (tmp, op, originator);
2026 1925
2027 if (was_destroyed (op, tag)) 1926 if (op->destroyed ())
2028 return 1; 1927 return 1;
2029 1928
2030 /* what the person/creature stepped onto has moved the object 1929 /* what the person/creature stepped onto has moved the object
2031 * someplace new. Don't process any further - if we did, 1930 * someplace new. Don't process any further - if we did,
2032 * have a feeling strange problems would result. 1931 * have a feeling strange problems would result.
… …
2044 * a matching archetype at the given map and coordinates. 1943 * a matching archetype at the given map and coordinates.
2045 * The first matching object is returned, or NULL if none. 1944 * The first matching object is returned, or NULL if none.
2046 */ 1945 */
2047 1946
2048object * 1947object *
2049present_arch (const archetype *at, mapstruct *m, int x, int y) 1948present_arch (const archetype *at, maptile *m, int x, int y)
2050{ 1949{
2051 object * 1950 object *
2052 tmp; 1951 tmp;
2053 1952
2054 if (m == NULL || out_of_map (m, x, y)) 1953 if (m == NULL || out_of_map (m, x, y))
… …
2067 * a matching type variable at the given map and coordinates. 1966 * a matching type variable at the given map and coordinates.
2068 * The first matching object is returned, or NULL if none. 1967 * The first matching object is returned, or NULL if none.
2069 */ 1968 */
2070 1969
2071object * 1970object *
2072present (unsigned char type, mapstruct *m, int x, int y) 1971present (unsigned char type, maptile *m, int x, int y)
2073{ 1972{
2074 object * 1973 object *
2075 tmp; 1974 tmp;
2076 1975
2077 if (out_of_map (m, x, y)) 1976 if (out_of_map (m, x, y))
… …
2217 * the archetype because that isn't correct if the monster has been 2116 * the archetype because that isn't correct if the monster has been
2218 * customized, changed states, etc. 2117 * customized, changed states, etc.
2219 */ 2118 */
2220 2119
2221int 2120int
2222find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 2121find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2223{ 2122{
2224 int 2123 int
2225 i, 2124 i,
2226 index = 0, flag; 2125 index = 0, flag;
2227 static int 2126 static int
… …
2248 return -1; 2147 return -1;
2249 return altern[RANDOM () % index]; 2148 return altern[RANDOM () % index];
2250} 2149}
2251 2150
2252/* 2151/*
2253 * find_first_free_spot(archetype, mapstruct, x, y) works like 2152 * find_first_free_spot(archetype, maptile, x, y) works like
2254 * find_free_spot(), but it will search max number of squares. 2153 * find_free_spot(), but it will search max number of squares.
2255 * But it will return the first available spot, not a random choice. 2154 * But it will return the first available spot, not a random choice.
2256 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2155 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2257 */ 2156 */
2258 2157
2259int 2158int
2260find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2159find_first_free_spot (const object *ob, maptile *m, int x, int y)
2261{ 2160{
2262 int 2161 int
2263 i; 2162 i;
2264 2163
2265 for (i = 0; i < SIZEOFFREE; i++) 2164 for (i = 0; i < SIZEOFFREE; i++)
… …
2329 * because we have to know what movement the thing looking to move 2228 * because we have to know what movement the thing looking to move
2330 * there is capable of. 2229 * there is capable of.
2331 */ 2230 */
2332 2231
2333int 2232int
2334find_dir (mapstruct *m, int x, int y, object *exclude) 2233find_dir (maptile *m, int x, int y, object *exclude)
2335{ 2234{
2336 int 2235 int
2337 i, 2236 i,
2338 max = SIZEOFFREE, mflags; 2237 max = SIZEOFFREE, mflags;
2339 2238
2340 sint16 nx, ny; 2239 sint16 nx, ny;
2341 object * 2240 object *
2342 tmp; 2241 tmp;
2343 mapstruct * 2242 maptile *
2344 mp; 2243 mp;
2345 2244
2346 MoveType blocked, move_type; 2245 MoveType blocked, move_type;
2347 2246
2348 if (exclude && exclude->head) 2247 if (exclude && exclude->head)
… …
2556 * Modified to be map tile aware -.MSW 2455 * Modified to be map tile aware -.MSW
2557 */ 2456 */
2558 2457
2559 2458
2560int 2459int
2561can_see_monsterP (mapstruct *m, int x, int y, int dir) 2460can_see_monsterP (maptile *m, int x, int y, int dir)
2562{ 2461{
2563 sint16 dx, dy; 2462 sint16 dx, dy;
2564 int 2463 int
2565 mflags; 2464 mflags;
2566 2465
… …
2615 * create clone from object to another 2514 * create clone from object to another
2616 */ 2515 */
2617object * 2516object *
2618object_create_clone (object *asrc) 2517object_create_clone (object *asrc)
2619{ 2518{
2620 object *
2621 dst = NULL, *tmp, *src, *part, *prev, *item; 2519 object *dst = 0, *tmp, *src, *part, *prev, *item;
2622 2520
2623 if (!asrc) 2521 if (!asrc)
2624 return NULL; 2522 return 0;
2523
2625 src = asrc; 2524 src = asrc;
2626 if (src->head) 2525 if (src->head)
2627 src = src->head; 2526 src = src->head;
2628 2527
2629 prev = NULL; 2528 prev = 0;
2630 for (part = src; part; part = part->more) 2529 for (part = src; part; part = part->more)
2631 { 2530 {
2632 tmp = get_object (); 2531 tmp = part->clone ();
2633 copy_object (part, tmp);
2634 tmp->x -= src->x; 2532 tmp->x -= src->x;
2635 tmp->y -= src->y; 2533 tmp->y -= src->y;
2534
2636 if (!part->head) 2535 if (!part->head)
2637 { 2536 {
2638 dst = tmp; 2537 dst = tmp;
2639 tmp->head = NULL; 2538 tmp->head = 0;
2640 } 2539 }
2641 else 2540 else
2642 { 2541 {
2643 tmp->head = dst; 2542 tmp->head = dst;
2644 } 2543 }
2544
2645 tmp->more = NULL; 2545 tmp->more = 0;
2546
2646 if (prev) 2547 if (prev)
2647 prev->more = tmp; 2548 prev->more = tmp;
2549
2648 prev = tmp; 2550 prev = tmp;
2649 } 2551 }
2650 2552
2651 /*** copy inventory ***/
2652 for (item = src->inv; item; item = item->below) 2553 for (item = src->inv; item; item = item->below)
2653 {
2654 (void) insert_ob_in_ob (object_create_clone (item), dst); 2554 insert_ob_in_ob (object_create_clone (item), dst);
2655 }
2656 2555
2657 return dst; 2556 return dst;
2658} 2557}
2659 2558
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. */ 2559/* 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 */ 2560/* 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, */ 2561/* 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. */ 2562/* 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. */ 2563/* Remember not to use load_object_str in a time-critical situation. */
2678
2679/* Also remember that multiparts objects are not supported for now. */ 2564/* Also remember that multiparts objects are not supported for now. */
2680 2565
2681object * 2566object *
2682load_object_str (const char *obstr) 2567load_object_str (const char *obstr)
2683{ 2568{
2684 object * 2569 object *op;
2685 op;
2686 char
2687 filename[MAX_BUF]; 2570 char filename[MAX_BUF];
2688 2571
2689 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2572 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2690 2573
2691 FILE *
2692 tempfile = fopen (filename, "w"); 2574 FILE *tempfile = fopen (filename, "w");
2693 2575
2694 if (tempfile == NULL) 2576 if (tempfile == NULL)
2695 { 2577 {
2696 LOG (llevError, "Error - Unable to access load object temp file\n"); 2578 LOG (llevError, "Error - Unable to access load object temp file\n");
2697 return NULL; 2579 return NULL;
2698 } 2580 }
2699 2581
2700 fprintf (tempfile, obstr); 2582 fprintf (tempfile, obstr);
2701 fclose (tempfile); 2583 fclose (tempfile);
2702 2584
2703 op = get_object (); 2585 op = object::create ();
2704 2586
2705 object_thawer thawer (filename); 2587 object_thawer thawer (filename);
2706 2588
2707 if (thawer) 2589 if (thawer)
2708 load_object (thawer, op, 0); 2590 load_object (thawer, op, 0);
… …
2718 * returns NULL if no match. 2600 * returns NULL if no match.
2719 */ 2601 */
2720object * 2602object *
2721find_obj_by_type_subtype (const object *who, int type, int subtype) 2603find_obj_by_type_subtype (const object *who, int type, int subtype)
2722{ 2604{
2723 object * 2605 object *tmp;
2724 tmp;
2725 2606
2726 for (tmp = who->inv; tmp; tmp = tmp->below) 2607 for (tmp = who->inv; tmp; tmp = tmp->below)
2727 if (tmp->type == type && tmp->subtype == subtype) 2608 if (tmp->type == type && tmp->subtype == subtype)
2728 return tmp; 2609 return tmp;
2729 2610
… …
2737 * do the desired thing. 2618 * do the desired thing.
2738 */ 2619 */
2739key_value * 2620key_value *
2740get_ob_key_link (const object *ob, const char *key) 2621get_ob_key_link (const object *ob, const char *key)
2741{ 2622{
2742 key_value * 2623 key_value *link;
2743 link;
2744 2624
2745 for (link = ob->key_values; link != NULL; link = link->next) 2625 for (link = ob->key_values; link != NULL; link = link->next)
2746 {
2747 if (link->key == key) 2626 if (link->key == key)
2748 {
2749 return link; 2627 return link;
2750 }
2751 }
2752 2628
2753 return NULL; 2629 return NULL;
2754} 2630}
2755 2631
2756/* 2632/*

Diff Legend

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