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.110 by root, Sun Jan 7 23:12:03 2007 UTC vs.
Revision 1.179 by root, Wed Aug 15 04:57:48 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <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. */
28#include <global.h> 27#include <global.h>
29#include <stdio.h> 28#include <stdio.h>
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>
33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38int nrofallocobjects = 0;
… …
299 return 0; 299 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 301 return 0;
302 } 302 }
303 303
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
306 { 305 {
307 ob1->optimise (); 306 ob1->optimise ();
308 ob2->optimise (); 307 ob2->optimise ();
309 308
310 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 311 return 0;
312 } 312 }
313 313
314 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
315 return 1; 315 return 1;
316} 316}
… …
324sum_weight (object *op) 324sum_weight (object *op)
325{ 325{
326 long sum; 326 long sum;
327 object *inv; 327 object *inv;
328 328
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 330 {
331 if (inv->inv) 331 if (inv->inv)
332 sum_weight (inv); 332 sum_weight (inv);
333
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 335 }
335 336
336 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
… …
357/* 358/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 360 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 361 * The result of the dump is stored in the static global errmsg array.
361 */ 362 */
362
363char * 363char *
364dump_object (object *op) 364dump_object (object *op)
365{ 365{
366 if (!op) 366 if (!op)
367 return strdup ("[NULLOBJ]"); 367 return strdup ("[NULLOBJ]");
368 368
369 object_freezer freezer; 369 object_freezer freezer;
370 save_object (freezer, op, 1); 370 op->write (freezer);
371 return freezer.as_string (); 371 return freezer.as_string ();
372} 372}
373 373
374/* 374/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
… …
395 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
396 */ 396 */
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 return ((unsigned int)i) < objects.size () 400 for_all_objects (op)
401 ? objects [i] 401 if (op->count == i)
402 : 0; 402 return op;
403
404 return 0;
403} 405}
404 406
405/* 407/*
406 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
447 owner = owner->owner; 449 owner = owner->owner;
448 450
449 this->owner = owner; 451 this->owner = owner;
450} 452}
451 453
454int
455object::slottype () const
456{
457 if (type == SKILL)
458 {
459 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
460 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
461 }
462 else
463 {
464 if (slot [body_combat].info) return slot_combat;
465 if (slot [body_range ].info) return slot_ranged;
466 }
467
468 return slot_none;
469}
470
471bool
472object::change_weapon (object *ob)
473{
474 if (current_weapon == ob)
475 return true;
476
477 if (chosen_skill)
478 chosen_skill->flag [FLAG_APPLIED] = false;
479
480 current_weapon = ob;
481 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
482
483 if (chosen_skill)
484 chosen_skill->flag [FLAG_APPLIED] = true;
485
486 update_stats ();
487
488 if (ob)
489 {
490 // now check wether any body locations became invalid, in which case
491 // we cannot apply the weapon at the moment.
492 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
493 if (slot[i].used < 0)
494 {
495 current_weapon = chosen_skill = 0;
496 update_stats ();
497
498 new_draw_info_format (NDI_UNIQUE, 0, this,
499 "You try to balance all your items at once, "
500 "but the %s is just too much for your body. "
501 "[You need to unapply some items first.]", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
511 {
512 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
513 &name, ob->debug_desc ());
514 return false;
515 }
516
517 return true;
518}
519
452/* Zero the key_values on op, decrementing the shared-string 520/* Zero the key_values on op, decrementing the shared-string
453 * refcounts and freeing the links. 521 * refcounts and freeing the links.
454 */ 522 */
455static void 523static void
456free_key_values (object *op) 524free_key_values (object *op)
457{ 525{
458 for (key_value *i = op->key_values; i != 0;) 526 for (key_value *i = op->key_values; i; )
459 { 527 {
460 key_value *next = i->next; 528 key_value *next = i->next;
461 delete i; 529 delete i;
462 530
463 i = next; 531 i = next;
464 } 532 }
465 533
466 op->key_values = 0; 534 op->key_values = 0;
467} 535}
468 536
469/* 537object &
470 * copy_to first frees everything allocated by the dst object, 538object::operator =(const object &src)
471 * and then copies the contents of itself into the second
472 * object, allocating what needs to be allocated. Basically, any
473 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
474 * if the first object is freed, the pointers in the new object
475 * will point at garbage.
476 */
477void
478object::copy_to (object *dst)
479{ 539{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 540 bool is_freed = flag [FLAG_FREED];
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 541 bool is_removed = flag [FLAG_REMOVED];
482 542
483 *(object_copy *)dst = *this; 543 *(object_copy *)this = src;
484 544
485 if (is_freed) 545 flag [FLAG_FREED] = is_freed;
486 SET_FLAG (dst, FLAG_FREED); 546 flag [FLAG_REMOVED] = is_removed;
487
488 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED);
490
491 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493 547
494 /* Copy over key_values, if any. */ 548 /* Copy over key_values, if any. */
495 if (key_values) 549 if (src.key_values)
496 { 550 {
497 key_value *tail = 0; 551 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 552 key_values = 0;
501 553
502 for (i = key_values; i; i = i->next) 554 for (key_value *i = src.key_values; i; i = i->next)
503 { 555 {
504 key_value *new_link = new key_value; 556 key_value *new_link = new key_value;
505 557
506 new_link->next = 0; 558 new_link->next = 0;
507 new_link->key = i->key; 559 new_link->key = i->key;
508 new_link->value = i->value; 560 new_link->value = i->value;
509 561
510 /* Try and be clever here, too. */ 562 /* Try and be clever here, too. */
511 if (!dst->key_values) 563 if (!key_values)
512 { 564 {
513 dst->key_values = new_link; 565 key_values = new_link;
514 tail = new_link; 566 tail = new_link;
515 } 567 }
516 else 568 else
517 { 569 {
518 tail->next = new_link; 570 tail->next = new_link;
519 tail = new_link; 571 tail = new_link;
520 } 572 }
521 } 573 }
522 } 574 }
575}
576
577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589
590 if (speed < 0)
591 dst->speed_left = speed_left - rndm ();
523 592
524 dst->set_speed (dst->speed); 593 dst->set_speed (dst->speed);
594}
595
596void
597object::instantiate ()
598{
599 if (!uuid.seq) // HACK
600 uuid = gen_uuid ();
601
602 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting
606 * values for the body_used info, so when items are created
607 * for it, they can be properly equipped.
608 */
609 for (int i = NUM_BODY_LOCATIONS; i--; )
610 slot[i].used = slot[i].info;
611
612 attachable::instantiate ();
525} 613}
526 614
527object * 615object *
528object::clone () 616object::clone ()
529{ 617{
… …
587 * UP_OBJ_FACE: only the objects face has changed. 675 * UP_OBJ_FACE: only the objects face has changed.
588 */ 676 */
589void 677void
590update_object (object *op, int action) 678update_object (object *op, int action)
591{ 679{
592 MoveType move_on, move_off, move_block, move_slow;
593
594 if (op == NULL) 680 if (op == NULL)
595 { 681 {
596 /* this should never happen */ 682 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 683 LOG (llevDebug, "update_object() called for NULL object.\n");
598 return; 684 return;
… …
658 744
659 if (op->more) 745 if (op->more)
660 update_object (op->more, action); 746 update_object (op->more, action);
661} 747}
662 748
663object *object::first;
664
665object::object () 749object::object ()
666{ 750{
667 SET_FLAG (this, FLAG_REMOVED); 751 SET_FLAG (this, FLAG_REMOVED);
668 752
669 expmul = 1.0; 753 expmul = 1.0;
670 face = blank_face; 754 face = blank_face;
671} 755}
672 756
673object::~object () 757object::~object ()
674{ 758{
759 unlink ();
760
675 free_key_values (this); 761 free_key_values (this);
676} 762}
677 763
764static int object_count;
765
678void object::link () 766void object::link ()
679{ 767{
768 assert (!index);//D
680 uuid = gen_uuid (); 769 uuid = gen_uuid ();
770 count = ++object_count;
681 771
682 refcnt_inc (); 772 refcnt_inc ();
683 objects.insert (this); 773 objects.insert (this);
684} 774}
685 775
686void object::unlink () 776void object::unlink ()
687{ 777{
778 if (!index)
779 return;
780
688 objects.erase (this); 781 objects.erase (this);
689 refcnt_dec (); 782 refcnt_dec ();
690} 783}
691 784
692void 785void
… …
766 * drop on that space. 859 * drop on that space.
767 */ 860 */
768 if (!drop_to_ground 861 if (!drop_to_ground
769 || !map 862 || !map
770 || map->in_memory != MAP_IN_MEMORY 863 || map->in_memory != MAP_IN_MEMORY
864 || map->nodrop
771 || ms ().move_block == MOVE_ALL) 865 || ms ().move_block == MOVE_ALL)
772 { 866 {
773 while (inv) 867 while (inv)
774 { 868 {
775 inv->destroy_inv (drop_to_ground); 869 inv->destroy_inv (drop_to_ground);
… …
803} 897}
804 898
805void 899void
806object::do_destroy () 900object::do_destroy ()
807{ 901{
902 attachable::do_destroy ();
903
808 if (flag [FLAG_IS_LINKED]) 904 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this); 905 remove_button_link (this);
810 906
811 if (flag [FLAG_FRIENDLY]) 907 if (flag [FLAG_FRIENDLY])
812 remove_friendly_object (this); 908 remove_friendly_object (this);
813 909
814 if (!flag [FLAG_REMOVED]) 910 if (!flag [FLAG_REMOVED])
815 remove (); 911 remove ();
816 912
817 if (flag [FLAG_FREED]) 913 destroy_inv (true);
818 return;
819 914
820 set_speed (0); 915 deactivate ();
916 unlink ();
821 917
822 flag [FLAG_FREED] = 1; 918 flag [FLAG_FREED] = 1;
823
824 attachable::do_destroy ();
825
826 destroy_inv (true);
827 unlink ();
828 919
829 // hack to ensure that freed objects still have a valid map 920 // hack to ensure that freed objects still have a valid map
830 { 921 {
831 static maptile *freed_map; // freed objects are moved here to avoid crashes 922 static maptile *freed_map; // freed objects are moved here to avoid crashes
832 923
… …
845 map = freed_map; 936 map = freed_map;
846 x = 1; 937 x = 1;
847 y = 1; 938 y = 1;
848 } 939 }
849 940
850 head = 0;
851
852 if (more) 941 if (more)
853 { 942 {
854 more->destroy (); 943 more->destroy ();
855 more = 0; 944 more = 0;
856 } 945 }
857 946
947 head = 0;
948
858 // clear those pointers that likely might have circular references to us 949 // clear those pointers that likely might cause circular references
859 owner = 0; 950 owner = 0;
860 enemy = 0; 951 enemy = 0;
861 attacked_by = 0; 952 attacked_by = 0;
953 current_weapon = 0;
862} 954}
863 955
864void 956void
865object::destroy (bool destroy_inventory) 957object::destroy (bool destroy_inventory)
866{ 958{
867 if (destroyed ()) 959 if (destroyed ())
868 return; 960 return;
869 961
870 if (destroy_inventory) 962 if (destroy_inventory)
871 destroy_inv (false); 963 destroy_inv (false);
964
965 if (is_head ())
966 if (sound_destroy)
967 play_sound (sound_destroy);
968 else if (flag [FLAG_MONSTER])
969 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
872 970
873 attachable::destroy (); 971 attachable::destroy ();
874} 972}
875 973
876/* 974/*
… …
894 * This function removes the object op from the linked list of objects 992 * This function removes the object op from the linked list of objects
895 * which it is currently tied to. When this function is done, the 993 * which it is currently tied to. When this function is done, the
896 * object will have no environment. If the object previously had an 994 * object will have no environment. If the object previously had an
897 * environment, the x and y coordinates will be updated to 995 * environment, the x and y coordinates will be updated to
898 * the previous environment. 996 * the previous environment.
899 * Beware: This function is called from the editor as well!
900 */ 997 */
901void 998void
902object::remove () 999object::do_remove ()
903{ 1000{
904 object *tmp, *last = 0; 1001 object *tmp, *last = 0;
905 object *otmp; 1002 object *otmp;
906 1003
907 if (QUERY_FLAG (this, FLAG_REMOVED)) 1004 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
950 } 1047 }
951 else if (map) 1048 else if (map)
952 { 1049 {
953 if (type == PLAYER) 1050 if (type == PLAYER)
954 { 1051 {
1052 // leaving a spot always closes any open container on the ground
1053 if (container && !container->env)
1054 // this causes spurious floorbox updates, but it ensures
1055 // that the CLOSE event is being sent.
1056 close_container ();
1057
955 --map->players; 1058 --map->players;
956 map->touch (); 1059 map->touch ();
957 } 1060 }
958 1061
959 map->dirty = true; 1062 map->dirty = true;
1063 mapspace &ms = this->ms ();
960 1064
961 /* link the object above us */ 1065 /* link the object above us */
962 if (above) 1066 if (above)
963 above->below = below; 1067 above->below = below;
964 else 1068 else
965 map->at (x, y).top = below; /* we were top, set new top */ 1069 ms.top = below; /* we were top, set new top */
966 1070
967 /* Relink the object below us, if there is one */ 1071 /* Relink the object below us, if there is one */
968 if (below) 1072 if (below)
969 below->above = above; 1073 below->above = above;
970 else 1074 else
… …
972 /* Nothing below, which means we need to relink map object for this space 1076 /* Nothing below, which means we need to relink map object for this space
973 * use translated coordinates in case some oddness with map tiling is 1077 * use translated coordinates in case some oddness with map tiling is
974 * evident 1078 * evident
975 */ 1079 */
976 if (GET_MAP_OB (map, x, y) != this) 1080 if (GET_MAP_OB (map, x, y) != this)
977 {
978 char *dump = dump_object (this);
979 LOG (llevError,
980 "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); 1081 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
981 free (dump);
982 dump = dump_object (GET_MAP_OB (map, x, y));
983 LOG (llevError, "%s\n", dump);
984 free (dump);
985 }
986 1082
987 map->at (x, y).bot = above; /* goes on above it. */ 1083 ms.bot = above; /* goes on above it. */
988 } 1084 }
989 1085
990 above = 0; 1086 above = 0;
991 below = 0; 1087 below = 0;
992 1088
993 if (map->in_memory == MAP_SAVING) 1089 if (map->in_memory == MAP_SAVING)
994 return; 1090 return;
995 1091
996 int check_walk_off = !flag [FLAG_NO_APPLY]; 1092 int check_walk_off = !flag [FLAG_NO_APPLY];
997 1093
1094 if (object *pl = ms.player ())
1095 {
1096 if (pl->container == this)
1097 /* If a container that the player is currently using somehow gets
1098 * removed (most likely destroyed), update the player view
1099 * appropriately.
1100 */
1101 pl->close_container ();
1102
1103 pl->contr->ns->floorbox_update ();
1104 }
1105
998 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1106 for (tmp = ms.bot; tmp; tmp = tmp->above)
999 { 1107 {
1000 /* No point updating the players look faces if he is the object 1108 /* No point updating the players look faces if he is the object
1001 * being removed. 1109 * being removed.
1002 */ 1110 */
1003
1004 if (tmp->type == PLAYER && tmp != this)
1005 {
1006 /* If a container that the player is currently using somehow gets
1007 * removed (most likely destroyed), update the player view
1008 * appropriately.
1009 */
1010 if (tmp->container == this)
1011 {
1012 flag [FLAG_APPLIED] = 0;
1013 tmp->container = 0;
1014 }
1015
1016 if (tmp->contr->ns)
1017 tmp->contr->ns->floorbox_update ();
1018 }
1019 1111
1020 /* See if object moving off should effect something */ 1112 /* See if object moving off should effect something */
1021 if (check_walk_off 1113 if (check_walk_off
1022 && ((move_type & tmp->move_off) 1114 && ((move_type & tmp->move_off)
1023 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1115 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1026 1118
1027 if (destroyed ()) 1119 if (destroyed ())
1028 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1120 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1029 } 1121 }
1030 1122
1031 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1032 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1033 if (tmp->above == tmp)
1034 tmp->above = 0;
1035
1036 last = tmp; 1123 last = tmp;
1037 } 1124 }
1038 1125
1039 /* last == NULL if there are no objects on this space */ 1126 /* last == NULL if there are no objects on this space */
1040 //TODO: this makes little sense, why only update the topmost object? 1127 //TODO: this makes little sense, why only update the topmost object?
… …
1083 } 1170 }
1084 1171
1085 return 0; 1172 return 0;
1086} 1173}
1087 1174
1175void
1176object::expand_tail ()
1177{
1178 if (more)
1179 return;
1180
1181 object *prev = this;
1182
1183 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1184 {
1185 object *op = arch_to_object (at);
1186
1187 op->name = name;
1188 op->name_pl = name_pl;
1189 op->title = title;
1190
1191 op->head = this;
1192 prev->more = op;
1193
1194 prev = op;
1195 }
1196}
1197
1088/* 1198/*
1089 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1199 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1090 * job preparing multi-part monsters 1200 * job preparing multi-part monsters.
1091 */ 1201 */
1092object * 1202object *
1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1203insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1094{ 1204{
1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1205 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1096 { 1206 {
1097 tmp->x = x + tmp->arch->clone.x; 1207 tmp->x = x + tmp->arch->x;
1098 tmp->y = y + tmp->arch->clone.y; 1208 tmp->y = y + tmp->arch->y;
1099 } 1209 }
1100 1210
1101 return insert_ob_in_map (op, m, originator, flag); 1211 return insert_ob_in_map (op, m, originator, flag);
1102} 1212}
1103 1213
… …
1122 * just 'op' otherwise 1232 * just 'op' otherwise
1123 */ 1233 */
1124object * 1234object *
1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1126{ 1236{
1237 assert (!op->flag [FLAG_FREED]);
1238
1127 object *tmp, *top, *floor = NULL; 1239 object *top, *floor = NULL;
1128 sint16 x, y;
1129 1240
1130 if (QUERY_FLAG (op, FLAG_FREED)) 1241 op->remove ();
1131 {
1132 LOG (llevError, "Trying to insert freed object!\n");
1133 return NULL;
1134 }
1135
1136 if (!m)
1137 {
1138 char *dump = dump_object (op);
1139 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1140 free (dump);
1141 return op;
1142 }
1143 1242
1144 if (out_of_map (m, op->x, op->y)) 1243 if (out_of_map (m, op->x, op->y))
1145 { 1244 {
1146 char *dump = dump_object (op);
1147 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1245 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1148#ifdef MANY_CORES 1246#ifdef MANY_CORES
1149 /* Better to catch this here, as otherwise the next use of this object 1247 /* Better to catch this here, as otherwise the next use of this object
1150 * is likely to cause a crash. Better to find out where it is getting 1248 * is likely to cause a crash. Better to find out where it is getting
1151 * improperly inserted. 1249 * improperly inserted.
1152 */ 1250 */
1153 abort (); 1251 abort ();
1154#endif 1252#endif
1155 free (dump);
1156 return op; 1253 return op;
1157 } 1254 }
1158 1255
1159 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1256 if (object *more = op->more)
1160 { 1257 if (!insert_ob_in_map (more, m, originator, flag))
1161 char *dump = dump_object (op);
1162 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1163 free (dump);
1164 return op; 1258 return 0;
1165 }
1166
1167 if (op->more)
1168 {
1169 /* The part may be on a different map. */
1170
1171 object *more = op->more;
1172
1173 /* We really need the caller to normalise coordinates - if
1174 * we set the map, that doesn't work if the location is within
1175 * a map and this is straddling an edge. So only if coordinate
1176 * is clear wrong do we normalise it.
1177 */
1178 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1179 more->map = get_map_from_coord (m, &more->x, &more->y);
1180 else if (!more->map)
1181 {
1182 /* For backwards compatibility - when not dealing with tiled maps,
1183 * more->map should always point to the parent.
1184 */
1185 more->map = m;
1186 }
1187
1188 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1189 {
1190 if (!op->head)
1191 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1192
1193 return 0;
1194 }
1195 }
1196 1259
1197 CLEAR_FLAG (op, FLAG_REMOVED); 1260 CLEAR_FLAG (op, FLAG_REMOVED);
1198 1261
1199 /* Ideally, the caller figures this out. However, it complicates a lot 1262 /* Ideally, the caller figures this out. However, it complicates a lot
1200 * of areas of callers (eg, anything that uses find_free_spot would now 1263 * of areas of callers (eg, anything that uses find_free_spot would now
1201 * need extra work 1264 * need extra work
1202 */ 1265 */
1203 op->map = get_map_from_coord (m, &op->x, &op->y); 1266 if (!xy_normalise (m, op->x, op->y))
1204 x = op->x; 1267 return 0;
1205 y = op->y; 1268
1269 op->map = m;
1270 mapspace &ms = op->ms ();
1206 1271
1207 /* this has to be done after we translate the coordinates. 1272 /* this has to be done after we translate the coordinates.
1208 */ 1273 */
1209 if (op->nrof && !(flag & INS_NO_MERGE)) 1274 if (op->nrof && !(flag & INS_NO_MERGE))
1210 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1275 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1211 if (object::can_merge (op, tmp)) 1276 if (object::can_merge (op, tmp))
1212 { 1277 {
1213 op->nrof += tmp->nrof; 1278 op->nrof += tmp->nrof;
1214 tmp->destroy (); 1279 tmp->destroy ();
1215 } 1280 }
… …
1232 op->below = originator->below; 1297 op->below = originator->below;
1233 1298
1234 if (op->below) 1299 if (op->below)
1235 op->below->above = op; 1300 op->below->above = op;
1236 else 1301 else
1237 op->ms ().bot = op; 1302 ms.bot = op;
1238 1303
1239 /* since *below* originator, no need to update top */ 1304 /* since *below* originator, no need to update top */
1240 originator->below = op; 1305 originator->below = op;
1241 } 1306 }
1242 else 1307 else
1243 { 1308 {
1309 top = ms.bot;
1310
1244 /* If there are other objects, then */ 1311 /* If there are other objects, then */
1245 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1312 if ((!(flag & INS_MAP_LOAD)) && top)
1246 { 1313 {
1247 object *last = 0; 1314 object *last = 0;
1248 1315
1249 /* 1316 /*
1250 * If there are multiple objects on this space, we do some trickier handling. 1317 * If there are multiple objects on this space, we do some trickier handling.
… …
1256 * once we get to them. This reduces the need to traverse over all of 1323 * once we get to them. This reduces the need to traverse over all of
1257 * them when adding another one - this saves quite a bit of cpu time 1324 * them when adding another one - this saves quite a bit of cpu time
1258 * when lots of spells are cast in one area. Currently, it is presumed 1325 * when lots of spells are cast in one area. Currently, it is presumed
1259 * that flying non pickable objects are spell objects. 1326 * that flying non pickable objects are spell objects.
1260 */ 1327 */
1261 while (top) 1328 for (top = ms.bot; top; top = top->above)
1262 { 1329 {
1263 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1330 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1264 floor = top; 1331 floor = top;
1265 1332
1266 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1333 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1269 top = top->below; 1336 top = top->below;
1270 break; 1337 break;
1271 } 1338 }
1272 1339
1273 last = top; 1340 last = top;
1274 top = top->above;
1275 } 1341 }
1276 1342
1277 /* Don't want top to be NULL, so set it to the last valid object */ 1343 /* Don't want top to be NULL, so set it to the last valid object */
1278 top = last; 1344 top = last;
1279 1345
… …
1281 * looks like instead of lots of conditions here. 1347 * looks like instead of lots of conditions here.
1282 * makes things faster, and effectively the same result. 1348 * makes things faster, and effectively the same result.
1283 */ 1349 */
1284 1350
1285 /* Have object 'fall below' other objects that block view. 1351 /* Have object 'fall below' other objects that block view.
1286 * Unless those objects are exits, type 66 1352 * Unless those objects are exits.
1287 * If INS_ON_TOP is used, don't do this processing 1353 * If INS_ON_TOP is used, don't do this processing
1288 * Need to find the object that in fact blocks view, otherwise 1354 * Need to find the object that in fact blocks view, otherwise
1289 * stacking is a bit odd. 1355 * stacking is a bit odd.
1290 */ 1356 */
1291 if (!(flag & INS_ON_TOP) && 1357 if (!(flag & INS_ON_TOP)
1292 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1358 && ms.flags () & P_BLOCKSVIEW
1359 && (op->face && !faces [op->face].visibility))
1293 { 1360 {
1294 for (last = top; last != floor; last = last->below) 1361 for (last = top; last != floor; last = last->below)
1295 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1362 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1296 break; 1363 break;
1364
1297 /* Check to see if we found the object that blocks view, 1365 /* Check to see if we found the object that blocks view,
1298 * and make sure we have a below pointer for it so that 1366 * and make sure we have a below pointer for it so that
1299 * we can get inserted below this one, which requires we 1367 * we can get inserted below this one, which requires we
1300 * set top to the object below us. 1368 * set top to the object below us.
1301 */ 1369 */
1302 if (last && last->below && last != floor) 1370 if (last && last->below && last != floor)
1303 top = last->below; 1371 top = last->below;
1304 } 1372 }
1305 } /* If objects on this space */ 1373 } /* If objects on this space */
1306
1307 if (flag & INS_MAP_LOAD) 1374 if (flag & INS_MAP_LOAD)
1308 top = GET_MAP_TOP (op->map, op->x, op->y); 1375 top = ms.top;
1309 1376
1310 if (flag & INS_ABOVE_FLOOR_ONLY) 1377 if (flag & INS_ABOVE_FLOOR_ONLY)
1311 top = floor; 1378 top = floor;
1312 1379
1313 /* Top is the object that our object (op) is going to get inserted above. 1380 /* Top is the object that our object (op) is going to get inserted above.
1314 */ 1381 */
1315 1382
1316 /* First object on this space */ 1383 /* First object on this space */
1317 if (!top) 1384 if (!top)
1318 { 1385 {
1319 op->above = GET_MAP_OB (op->map, op->x, op->y); 1386 op->above = ms.bot;
1320 1387
1321 if (op->above) 1388 if (op->above)
1322 op->above->below = op; 1389 op->above->below = op;
1323 1390
1324 op->below = 0; 1391 op->below = 0;
1325 op->ms ().bot = op; 1392 ms.bot = op;
1326 } 1393 }
1327 else 1394 else
1328 { /* get inserted into the stack above top */ 1395 { /* get inserted into the stack above top */
1329 op->above = top->above; 1396 op->above = top->above;
1330 1397
… …
1334 op->below = top; 1401 op->below = top;
1335 top->above = op; 1402 top->above = op;
1336 } 1403 }
1337 1404
1338 if (!op->above) 1405 if (!op->above)
1339 op->ms ().top = op; 1406 ms.top = op;
1340 } /* else not INS_BELOW_ORIGINATOR */ 1407 } /* else not INS_BELOW_ORIGINATOR */
1341 1408
1342 if (op->type == PLAYER) 1409 if (op->type == PLAYER)
1343 { 1410 {
1344 op->contr->do_los = 1; 1411 op->contr->do_los = 1;
… …
1350 1417
1351 /* If we have a floor, we know the player, if any, will be above 1418 /* If we have a floor, we know the player, if any, will be above
1352 * it, so save a few ticks and start from there. 1419 * it, so save a few ticks and start from there.
1353 */ 1420 */
1354 if (!(flag & INS_MAP_LOAD)) 1421 if (!(flag & INS_MAP_LOAD))
1355 if (object *pl = op->ms ().player ()) 1422 if (object *pl = ms.player ())
1356 if (pl->contr->ns)
1357 pl->contr->ns->floorbox_update (); 1423 pl->contr->ns->floorbox_update ();
1358 1424
1359 /* If this object glows, it may affect lighting conditions that are 1425 /* If this object glows, it may affect lighting conditions that are
1360 * visible to others on this map. But update_all_los is really 1426 * visible to others on this map. But update_all_los is really
1361 * an inefficient way to do this, as it means los for all players 1427 * an inefficient way to do this, as it means los for all players
1362 * on the map will get recalculated. The players could very well 1428 * on the map will get recalculated. The players could very well
… …
1381 * blocked() and wall() work properly), and these flags are updated by 1447 * blocked() and wall() work properly), and these flags are updated by
1382 * update_object(). 1448 * update_object().
1383 */ 1449 */
1384 1450
1385 /* if this is not the head or flag has been passed, don't check walk on status */ 1451 /* if this is not the head or flag has been passed, don't check walk on status */
1386 if (!(flag & INS_NO_WALK_ON) && !op->head) 1452 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1387 { 1453 {
1388 if (check_move_on (op, originator)) 1454 if (check_move_on (op, originator))
1389 return 0; 1455 return 0;
1390 1456
1391 /* If we are a multi part object, lets work our way through the check 1457 /* If we are a multi part object, lets work our way through the check
1392 * walk on's. 1458 * walk on's.
1393 */ 1459 */
1394 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1460 for (object *tmp = op->more; tmp; tmp = tmp->more)
1395 if (check_move_on (tmp, originator)) 1461 if (check_move_on (tmp, originator))
1396 return 0; 1462 return 0;
1397 } 1463 }
1398 1464
1399 return op; 1465 return op;
… …
1409 object *tmp, *tmp1; 1475 object *tmp, *tmp1;
1410 1476
1411 /* first search for itself and remove any old instances */ 1477 /* first search for itself and remove any old instances */
1412 1478
1413 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1479 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1414 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1480 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1415 tmp->destroy (); 1481 tmp->destroy ();
1416 1482
1417 tmp1 = arch_to_object (archetype::find (arch_string)); 1483 tmp1 = arch_to_object (archetype::find (arch_string));
1418 1484
1419 tmp1->x = op->x; 1485 tmp1->x = op->x;
… …
1422} 1488}
1423 1489
1424object * 1490object *
1425object::insert_at (object *where, object *originator, int flags) 1491object::insert_at (object *where, object *originator, int flags)
1426{ 1492{
1427 where->map->insert (this, where->x, where->y, originator, flags); 1493 return where->map->insert (this, where->x, where->y, originator, flags);
1428} 1494}
1429 1495
1430/* 1496/*
1431 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1497 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1432 * is returned contains nr objects, and the remaining parts contains 1498 * is returned contains nr objects, and the remaining parts contains
… …
1472 * the amount of an object. If the amount reaches 0, the object 1538 * the amount of an object. If the amount reaches 0, the object
1473 * is subsequently removed and freed. 1539 * is subsequently removed and freed.
1474 * 1540 *
1475 * Return value: 'op' if something is left, NULL if the amount reached 0 1541 * Return value: 'op' if something is left, NULL if the amount reached 0
1476 */ 1542 */
1477
1478object * 1543object *
1479decrease_ob_nr (object *op, uint32 i) 1544decrease_ob_nr (object *op, uint32 i)
1480{ 1545{
1481 object *tmp; 1546 object *tmp;
1482 1547
… …
1557 1622
1558/* 1623/*
1559 * add_weight(object, weight) adds the specified weight to an object, 1624 * add_weight(object, weight) adds the specified weight to an object,
1560 * and also updates how much the environment(s) is/are carrying. 1625 * and also updates how much the environment(s) is/are carrying.
1561 */ 1626 */
1562
1563void 1627void
1564add_weight (object *op, signed long weight) 1628add_weight (object *op, signed long weight)
1565{ 1629{
1566 while (op != NULL) 1630 while (op != NULL)
1567 { 1631 {
… …
1582 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1646 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1583 free (dump); 1647 free (dump);
1584 return op; 1648 return op;
1585 } 1649 }
1586 1650
1587 if (where->head) 1651 if (where->head_ () != where)
1588 { 1652 {
1589 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1653 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1590 where = where->head; 1654 where = where->head;
1591 } 1655 }
1592 1656
1593 return where->insert (op); 1657 return where->insert (op);
1594} 1658}
… …
1599 * inside the object environment. 1663 * inside the object environment.
1600 * 1664 *
1601 * The function returns now pointer to inserted item, and return value can 1665 * The function returns now pointer to inserted item, and return value can
1602 * be != op, if items are merged. -Tero 1666 * be != op, if items are merged. -Tero
1603 */ 1667 */
1604
1605object * 1668object *
1606object::insert (object *op) 1669object::insert (object *op)
1607{ 1670{
1608 object *tmp, *otmp; 1671 object *tmp, *otmp;
1609 1672
… …
1769 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1832 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1770 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1833 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1771 { 1834 {
1772 1835
1773 float 1836 float
1774 diff = tmp->move_slow_penalty * FABS (op->speed); 1837 diff = tmp->move_slow_penalty * fabs (op->speed);
1775 1838
1776 if (op->type == PLAYER) 1839 if (op->type == PLAYER)
1777 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1840 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1778 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1841 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1779 diff /= 4.0; 1842 diff /= 4.0;
… …
1923 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1986 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1924 { 1987 {
1925 CLEAR_FLAG (tmp, flag); 1988 CLEAR_FLAG (tmp, flag);
1926 unflag_inv (tmp, flag); 1989 unflag_inv (tmp, flag);
1927 } 1990 }
1928}
1929
1930/*
1931 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1932 * all it's inventory (recursively).
1933 * If checksums are used, a player will get set_cheat called for
1934 * him/her-self and all object carried by a call to this function.
1935 */
1936void
1937set_cheat (object *op)
1938{
1939 SET_FLAG (op, FLAG_WAS_WIZ);
1940 flag_inv (op, FLAG_WAS_WIZ);
1941} 1991}
1942 1992
1943/* 1993/*
1944 * find_free_spot(object, map, x, y, start, stop) will search for 1994 * find_free_spot(object, map, x, y, start, stop) will search for
1945 * a spot at the given map and coordinates which will be able to contain 1995 * a spot at the given map and coordinates which will be able to contain
… …
1986 } 2036 }
1987 2037
1988 if (!index) 2038 if (!index)
1989 return -1; 2039 return -1;
1990 2040
1991 return altern[RANDOM () % index]; 2041 return altern [rndm (index)];
1992} 2042}
1993 2043
1994/* 2044/*
1995 * find_first_free_spot(archetype, maptile, x, y) works like 2045 * find_first_free_spot(archetype, maptile, x, y) works like
1996 * find_free_spot(), but it will search max number of squares. 2046 * find_free_spot(), but it will search max number of squares.
… …
2017{ 2067{
2018 arr += begin; 2068 arr += begin;
2019 end -= begin; 2069 end -= begin;
2020 2070
2021 while (--end) 2071 while (--end)
2022 swap (arr [end], arr [RANDOM () % (end + 1)]); 2072 swap (arr [end], arr [rndm (end + 1)]);
2023} 2073}
2024 2074
2025/* new function to make monster searching more efficient, and effective! 2075/* new function to make monster searching more efficient, and effective!
2026 * This basically returns a randomized array (in the passed pointer) of 2076 * This basically returns a randomized array (in the passed pointer) of
2027 * the spaces to find monsters. In this way, it won't always look for 2077 * the spaces to find monsters. In this way, it won't always look for
… …
2063 object *tmp; 2113 object *tmp;
2064 maptile *mp; 2114 maptile *mp;
2065 2115
2066 MoveType blocked, move_type; 2116 MoveType blocked, move_type;
2067 2117
2068 if (exclude && exclude->head) 2118 if (exclude && exclude->head_ () != exclude)
2069 { 2119 {
2070 exclude = exclude->head; 2120 exclude = exclude->head;
2071 move_type = exclude->move_type; 2121 move_type = exclude->move_type;
2072 } 2122 }
2073 else 2123 else
… …
2096 max = maxfree[i]; 2146 max = maxfree[i];
2097 else if (mflags & P_IS_ALIVE) 2147 else if (mflags & P_IS_ALIVE)
2098 { 2148 {
2099 for (tmp = ms.bot; tmp; tmp = tmp->above) 2149 for (tmp = ms.bot; tmp; tmp = tmp->above)
2100 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2150 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2101 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2151 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102 break; 2152 break;
2103 2153
2104 if (tmp) 2154 if (tmp)
2105 return freedir[i]; 2155 return freedir[i];
2106 } 2156 }
… …
2161 2211
2162 return 3; 2212 return 3;
2163} 2213}
2164 2214
2165/* 2215/*
2166 * absdir(int): Returns a number between 1 and 8, which represent
2167 * the "absolute" direction of a number (it actually takes care of
2168 * "overflow" in previous calculations of a direction).
2169 */
2170
2171int
2172absdir (int d)
2173{
2174 while (d < 1)
2175 d += 8;
2176
2177 while (d > 8)
2178 d -= 8;
2179
2180 return d;
2181}
2182
2183/*
2184 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2216 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2185 * between two directions (which are expected to be absolute (see absdir()) 2217 * between two directions (which are expected to be absolute (see absdir())
2186 */ 2218 */
2187
2188int 2219int
2189dirdiff (int dir1, int dir2) 2220dirdiff (int dir1, int dir2)
2190{ 2221{
2191 int d; 2222 int d;
2192 2223
… …
2305 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2336 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2306 * core dumps if they do. 2337 * core dumps if they do.
2307 * 2338 *
2308 * Add a check so we can't pick up invisible objects (0.93.8) 2339 * Add a check so we can't pick up invisible objects (0.93.8)
2309 */ 2340 */
2310
2311int 2341int
2312can_pick (const object *who, const object *item) 2342can_pick (const object *who, const object *item)
2313{ 2343{
2314 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2344 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2315 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2345 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2320 * create clone from object to another 2350 * create clone from object to another
2321 */ 2351 */
2322object * 2352object *
2323object_create_clone (object *asrc) 2353object_create_clone (object *asrc)
2324{ 2354{
2325 object *dst = 0, *tmp, *src, *part, *prev, *item; 2355 object *dst = 0, *tmp, *src, *prev, *item;
2326 2356
2327 if (!asrc) 2357 if (!asrc)
2328 return 0; 2358 return 0;
2329 2359
2330 src = asrc;
2331 if (src->head)
2332 src = src->head; 2360 src = asrc->head_ ();
2333 2361
2334 prev = 0; 2362 prev = 0;
2335 for (part = src; part; part = part->more) 2363 for (object *part = src; part; part = part->more)
2336 { 2364 {
2337 tmp = part->clone (); 2365 tmp = part->clone ();
2338 tmp->x -= src->x; 2366 tmp->x -= src->x;
2339 tmp->y -= src->y; 2367 tmp->y -= src->y;
2340 2368
… …
2358 insert_ob_in_ob (object_create_clone (item), dst); 2386 insert_ob_in_ob (object_create_clone (item), dst);
2359 2387
2360 return dst; 2388 return dst;
2361} 2389}
2362 2390
2363/* GROS - Creates an object using a string representing its content. */
2364/* Basically, we save the content of the string to a temp file, then call */
2365/* load_object on it. I admit it is a highly inefficient way to make things, */
2366/* but it was simple to make and allows reusing the load_object function. */
2367/* Remember not to use load_object_str in a time-critical situation. */
2368/* Also remember that multiparts objects are not supported for now. */
2369object *
2370load_object_str (const char *obstr)
2371{
2372 object *op;
2373 char filename[MAX_BUF];
2374
2375 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2376
2377 FILE *tempfile = fopen (filename, "w");
2378
2379 if (tempfile == NULL)
2380 {
2381 LOG (llevError, "Error - Unable to access load object temp file\n");
2382 return NULL;
2383 }
2384
2385 fprintf (tempfile, obstr);
2386 fclose (tempfile);
2387
2388 op = object::create ();
2389
2390 object_thawer thawer (filename);
2391
2392 if (thawer)
2393 load_object (thawer, op, 0);
2394
2395 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2396 CLEAR_FLAG (op, FLAG_REMOVED);
2397
2398 return op;
2399}
2400
2401/* This returns the first object in who's inventory that 2391/* This returns the first object in who's inventory that
2402 * has the same type and subtype match. 2392 * has the same type and subtype match.
2403 * returns NULL if no match. 2393 * returns NULL if no match.
2404 */ 2394 */
2405object * 2395object *
… …
2458 if (link->key == canonical_key) 2448 if (link->key == canonical_key)
2459 return link->value; 2449 return link->value;
2460 2450
2461 return 0; 2451 return 0;
2462} 2452}
2463
2464 2453
2465/* 2454/*
2466 * Updates the canonical_key in op to value. 2455 * Updates the canonical_key in op to value.
2467 * 2456 *
2468 * canonical_key is a shared string (value doesn't have to be). 2457 * canonical_key is a shared string (value doesn't have to be).
… …
2492 /* Basically, if the archetype has this key set, 2481 /* Basically, if the archetype has this key set,
2493 * we need to store the null value so when we save 2482 * we need to store the null value so when we save
2494 * it, we save the empty value so that when we load, 2483 * it, we save the empty value so that when we load,
2495 * we get this value back again. 2484 * we get this value back again.
2496 */ 2485 */
2497 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2486 if (get_ob_key_link (op->arch, canonical_key))
2498 field->value = 0; 2487 field->value = 0;
2499 else 2488 else
2500 { 2489 {
2501 if (last) 2490 if (last)
2502 last->next = field->next; 2491 last->next = field->next;
… …
2571 } 2560 }
2572 else 2561 else
2573 item = item->env; 2562 item = item->env;
2574} 2563}
2575 2564
2576
2577const char * 2565const char *
2578object::flag_desc (char *desc, int len) const 2566object::flag_desc (char *desc, int len) const
2579{ 2567{
2580 char *p = desc; 2568 char *p = desc;
2581 bool first = true; 2569 bool first = true;
… …
2608{ 2596{
2609 char flagdesc[512]; 2597 char flagdesc[512];
2610 char info2[256 * 4]; 2598 char info2[256 * 4];
2611 char *p = info; 2599 char *p = info;
2612 2600
2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2601 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614 count, uuid.seq, 2602 count, uuid.seq,
2615 &name, 2603 &name,
2616 title ? "\",title:" : "", 2604 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "", 2605 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type); 2606 flag_desc (flagdesc, 512), type);
2619 2607
2620 if (env) 2608 if (env)
2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2609 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2627} 2615}
2628 2616
2629const char * 2617const char *
2630object::debug_desc () const 2618object::debug_desc () const
2631{ 2619{
2632 static char info[256 * 4]; 2620 static char info[3][256 * 4];
2621 static int info_idx;
2622
2633 return debug_desc (info); 2623 return debug_desc (info [++info_idx % 3]);
2634} 2624}
2635 2625
2626struct region *
2627object::region () const
2628{
2629 return map ? map->region (x, y)
2630 : region::default_region ();
2631}
2632
2633const materialtype_t *
2634object::dominant_material () const
2635{
2636 if (materialtype_t *mt = name_to_material (materialname))
2637 return mt;
2638
2639 return name_to_material (shstr_unknown);
2640}
2641
2642void
2643object::open_container (object *new_container)
2644{
2645 if (container == new_container)
2646 return;
2647
2648 if (object *old_container = container)
2649 {
2650 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2651 return;
2652
2653#if 0
2654 // remove the "Close old_container" object.
2655 if (object *closer = old_container->inv)
2656 if (closer->type == CLOSE_CON)
2657 closer->destroy ();
2658#endif
2659
2660 old_container->flag [FLAG_APPLIED] = 0;
2661 container = 0;
2662
2663 esrv_update_item (UPD_FLAGS, this, old_container);
2664 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2665 play_sound (sound_find ("chest_close"));
2666 }
2667
2668 if (new_container)
2669 {
2670 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2671 return;
2672
2673 // TODO: this does not seem to serve any purpose anymore?
2674#if 0
2675 // insert the "Close Container" object.
2676 if (archetype *closer = new_container->other_arch)
2677 {
2678 object *closer = arch_to_object (new_container->other_arch);
2679 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2680 new_container->insert (closer);
2681 }
2682#endif
2683
2684 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2685
2686 new_container->flag [FLAG_APPLIED] = 1;
2687 container = new_container;
2688
2689 esrv_update_item (UPD_FLAGS, this, new_container);
2690 esrv_send_inventory (this, new_container);
2691 play_sound (sound_find ("chest_open"));
2692 }
2693}
2694
2695object *
2696object::force_find (const shstr name)
2697{
2698 /* cycle through his inventory to look for the MARK we want to
2699 * place
2700 */
2701 for (object *tmp = inv; tmp; tmp = tmp->below)
2702 if (tmp->type == FORCE && tmp->slaying == name)
2703 return splay (tmp);
2704
2705 return 0;
2706}
2707
2708void
2709object::force_add (const shstr name, int duration)
2710{
2711 if (object *force = force_find (name))
2712 force->destroy ();
2713
2714 object *force = get_archetype (FORCE_NAME);
2715
2716 force->slaying = name;
2717 force->stats.food = 1;
2718 force->speed_left = -1.f;
2719
2720 force->set_speed (duration ? 1.f / duration : 0.f);
2721 force->flag [FLAG_IS_USED_UP] = true;
2722 force->flag [FLAG_APPLIED] = true;
2723
2724 insert (force);
2725}
2726
2727void
2728object::play_sound (faceidx sound) const
2729{
2730 if (!sound)
2731 return;
2732
2733 if (flag [FLAG_REMOVED])
2734 return;
2735
2736 if (env)
2737 {
2738 if (object *pl = in_player ())
2739 pl->contr->play_sound (sound);
2740 }
2741 else
2742 map->play_sound (sound, x, y);
2743}
2744

Diff Legend

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