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.119 by root, Fri Jan 19 18:06:51 2007 UTC vs.
Revision 1.195 by root, Wed Oct 17 19:08:12 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.
21 * 20 *
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. */
… …
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;
… …
254 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 255 * check all objects in the inventory.
256 */ 256 */
257 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
258 { 258 {
259 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
261 return 0;
262 261
263 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
264 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 266 return 0; /* inventory objexts differ */
266 267
267 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 269 * if it is valid.
269 */ 270 */
270 } 271 }
… …
299 return 0; 300 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 301 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 302 return 0;
302 } 303 }
303 304
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 305 if (ob1->self || ob2->self)
306 { 306 {
307 ob1->optimise (); 307 ob1->optimise ();
308 ob2->optimise (); 308 ob2->optimise ();
309 309
310 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314
315 if (k1 != k2)
311 return 0; 316 return 0;
317 else if (k1 == 0)
318 return 1;
319 else if (!cfperl_can_merge (ob1, ob2))
320 return 0;
321 }
312 } 322 }
313 323
314 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
315 return 1; 325 return 1;
316} 326}
… …
324sum_weight (object *op) 334sum_weight (object *op)
325{ 335{
326 long sum; 336 long sum;
327 object *inv; 337 object *inv;
328 338
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 339 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 340 {
331 if (inv->inv) 341 if (inv->inv)
332 sum_weight (inv); 342 sum_weight (inv);
343
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 344 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 345 }
335 346
336 if (op->type == CONTAINER && op->stats.Str) 347 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 348 sum = (sum * (100 - op->stats.Str)) / 100;
… …
357/* 368/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 369 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 370 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 371 * The result of the dump is stored in the static global errmsg array.
361 */ 372 */
362
363char * 373char *
364dump_object (object *op) 374dump_object (object *op)
365{ 375{
366 if (!op) 376 if (!op)
367 return strdup ("[NULLOBJ]"); 377 return strdup ("[NULLOBJ]");
368 378
369 object_freezer freezer; 379 object_freezer freezer;
370 save_object (freezer, op, 1); 380 op->write (freezer);
371 return freezer.as_string (); 381 return freezer.as_string ();
372} 382}
373 383
374/* 384/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 385 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
378 */ 388 */
379
380object * 389object *
381get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
382{ 391{
383 object *tmp, *closest; 392 object *tmp, *closest;
384 int last_dist, i; 393 int last_dist, i;
… …
429} 438}
430 439
431/* 440/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 441 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
434 */ 444 */
435void 445void
436object::set_owner (object *owner) 446object::set_owner (object *owner)
437{ 447{
448 // allow objects which own objects
438 if (!owner) 449 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 450 while (owner->owner)
449 owner = owner->owner; 451 owner = owner->owner;
450 452
451 this->owner = owner; 453 this->owner = owner;
454}
455
456int
457object::slottype () const
458{
459 if (type == SKILL)
460 {
461 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
462 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
463 }
464 else
465 {
466 if (slot [body_combat].info) return slot_combat;
467 if (slot [body_range ].info) return slot_ranged;
468 }
469
470 return slot_none;
471}
472
473bool
474object::change_weapon (object *ob)
475{
476 if (current_weapon == ob)
477 return true;
478
479 if (chosen_skill)
480 chosen_skill->flag [FLAG_APPLIED] = false;
481
482 current_weapon = ob;
483 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
484
485 if (chosen_skill)
486 chosen_skill->flag [FLAG_APPLIED] = true;
487
488 update_stats ();
489
490 if (ob)
491 {
492 // now check wether any body locations became invalid, in which case
493 // we cannot apply the weapon at the moment.
494 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
495 if (slot[i].used < 0)
496 {
497 current_weapon = chosen_skill = 0;
498 update_stats ();
499
500 new_draw_info_format (NDI_UNIQUE, 0, this,
501 "You try to balance all your items at once, "
502 "but the %s is just too much for your body. "
503 "[You need to unapply some items first.]", &ob->name);
504 return false;
505 }
506
507 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
508 }
509 else
510 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
511
512 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
513 {
514 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
515 &name, ob->debug_desc ());
516 return false;
517 }
518
519 return true;
452} 520}
453 521
454/* Zero the key_values on op, decrementing the shared-string 522/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 523 * refcounts and freeing the links.
456 */ 524 */
457static void 525static void
458free_key_values (object *op) 526free_key_values (object *op)
459{ 527{
460 for (key_value *i = op->key_values; i != 0;) 528 for (key_value *i = op->key_values; i; )
461 { 529 {
462 key_value *next = i->next; 530 key_value *next = i->next;
463 delete i; 531 delete i;
464 532
465 i = next; 533 i = next;
466 } 534 }
467 535
468 op->key_values = 0; 536 op->key_values = 0;
469} 537}
470 538
471/* 539object &
472 * copy_to first frees everything allocated by the dst object, 540object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 541{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 542 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 543 bool is_removed = flag [FLAG_REMOVED];
484 544
485 *(object_copy *)dst = *this; 545 *(object_copy *)this = src;
486 546
487 if (is_freed) 547 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 548 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - rndm ();
495 549
496 /* Copy over key_values, if any. */ 550 /* Copy over key_values, if any. */
497 if (key_values) 551 if (src.key_values)
498 { 552 {
499 key_value *tail = 0; 553 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 554 key_values = 0;
503 555
504 for (i = key_values; i; i = i->next) 556 for (key_value *i = src.key_values; i; i = i->next)
505 { 557 {
506 key_value *new_link = new key_value; 558 key_value *new_link = new key_value;
507 559
508 new_link->next = 0; 560 new_link->next = 0;
509 new_link->key = i->key; 561 new_link->key = i->key;
510 new_link->value = i->value; 562 new_link->value = i->value;
511 563
512 /* Try and be clever here, too. */ 564 /* Try and be clever here, too. */
513 if (!dst->key_values) 565 if (!key_values)
514 { 566 {
515 dst->key_values = new_link; 567 key_values = new_link;
516 tail = new_link; 568 tail = new_link;
517 } 569 }
518 else 570 else
519 { 571 {
520 tail->next = new_link; 572 tail->next = new_link;
521 tail = new_link; 573 tail = new_link;
522 } 574 }
523 } 575 }
524 } 576 }
577}
578
579/*
580 * copy_to first frees everything allocated by the dst object,
581 * and then copies the contents of itself into the second
582 * object, allocating what needs to be allocated. Basically, any
583 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
584 * if the first object is freed, the pointers in the new object
585 * will point at garbage.
586 */
587void
588object::copy_to (object *dst)
589{
590 *dst = *this;
591
592 if (speed < 0)
593 dst->speed_left -= rndm ();
525 594
526 dst->set_speed (dst->speed); 595 dst->set_speed (dst->speed);
596}
597
598void
599object::instantiate ()
600{
601 if (!uuid.seq) // HACK
602 uuid = gen_uuid ();
603
604 speed_left = -0.1f;
605 /* copy the body_info to the body_used - this is only really
606 * need for monsters, but doesn't hurt to do it for everything.
607 * by doing so, when a monster is created, it has good starting
608 * values for the body_used info, so when items are created
609 * for it, they can be properly equipped.
610 */
611 for (int i = NUM_BODY_LOCATIONS; i--; )
612 slot[i].used = slot[i].info;
613
614 attachable::instantiate ();
527} 615}
528 616
529object * 617object *
530object::clone () 618object::clone ()
531{ 619{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 677 * UP_OBJ_FACE: only the objects face has changed.
590 */ 678 */
591void 679void
592update_object (object *op, int action) 680update_object (object *op, int action)
593{ 681{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 682 if (op == NULL)
597 { 683 {
598 /* this should never happen */ 684 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 685 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 686 return;
… …
670 face = blank_face; 756 face = blank_face;
671} 757}
672 758
673object::~object () 759object::~object ()
674{ 760{
675 if (index)
676 unlink (); 761 unlink ();
677 762
678 free_key_values (this); 763 free_key_values (this);
679} 764}
680 765
681static int object_count; 766static int object_count;
… …
690 objects.insert (this); 775 objects.insert (this);
691} 776}
692 777
693void object::unlink () 778void object::unlink ()
694{ 779{
695 assert (index);//D 780 if (!index)
781 return;
782
696 objects.erase (this); 783 objects.erase (this);
697 refcnt_dec (); 784 refcnt_dec ();
698} 785}
699 786
700void 787void
… …
774 * drop on that space. 861 * drop on that space.
775 */ 862 */
776 if (!drop_to_ground 863 if (!drop_to_ground
777 || !map 864 || !map
778 || map->in_memory != MAP_IN_MEMORY 865 || map->in_memory != MAP_IN_MEMORY
866 || map->nodrop
779 || ms ().move_block == MOVE_ALL) 867 || ms ().move_block == MOVE_ALL)
780 { 868 {
781 while (inv) 869 while (inv)
782 { 870 {
783 inv->destroy_inv (drop_to_ground); 871 inv->destroy_inv (drop_to_ground);
… …
837 925
838 if (!freed_map) 926 if (!freed_map)
839 { 927 {
840 freed_map = new maptile; 928 freed_map = new maptile;
841 929
930 freed_map->path = "<freed objects map>";
842 freed_map->name = "/internal/freed_objects_map"; 931 freed_map->name = "/internal/freed_objects_map";
843 freed_map->width = 3; 932 freed_map->width = 3;
844 freed_map->height = 3; 933 freed_map->height = 3;
845 934
846 freed_map->alloc (); 935 freed_map->alloc ();
… …
850 map = freed_map; 939 map = freed_map;
851 x = 1; 940 x = 1;
852 y = 1; 941 y = 1;
853 } 942 }
854 943
855 head = 0;
856
857 if (more) 944 if (more)
858 { 945 {
859 more->destroy (); 946 more->destroy ();
860 more = 0; 947 more = 0;
861 } 948 }
862 949
950 head = 0;
951
863 // clear those pointers that likely might have circular references to us 952 // clear those pointers that likely might cause circular references
864 owner = 0; 953 owner = 0;
865 enemy = 0; 954 enemy = 0;
866 attacked_by = 0; 955 attacked_by = 0;
956 current_weapon = 0;
867} 957}
868 958
869void 959void
870object::destroy (bool destroy_inventory) 960object::destroy (bool destroy_inventory)
871{ 961{
872 if (destroyed ()) 962 if (destroyed ())
873 return; 963 return;
874 964
875 if (destroy_inventory) 965 if (destroy_inventory)
876 destroy_inv (false); 966 destroy_inv (false);
967
968 if (is_head ())
969 if (sound_destroy)
970 play_sound (sound_destroy);
971 else if (flag [FLAG_MONSTER])
972 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
877 973
878 attachable::destroy (); 974 attachable::destroy ();
879} 975}
880 976
881/* 977/*
… …
899 * This function removes the object op from the linked list of objects 995 * This function removes the object op from the linked list of objects
900 * which it is currently tied to. When this function is done, the 996 * which it is currently tied to. When this function is done, the
901 * object will have no environment. If the object previously had an 997 * object will have no environment. If the object previously had an
902 * environment, the x and y coordinates will be updated to 998 * environment, the x and y coordinates will be updated to
903 * the previous environment. 999 * the previous environment.
904 * Beware: This function is called from the editor as well!
905 */ 1000 */
906void 1001void
907object::remove_slow () 1002object::do_remove ()
908{ 1003{
909 object *tmp, *last = 0; 1004 object *tmp, *last = 0;
910 object *otmp; 1005 object *otmp;
911 1006
912 if (QUERY_FLAG (this, FLAG_REMOVED)) 1007 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
955 } 1050 }
956 else if (map) 1051 else if (map)
957 { 1052 {
958 if (type == PLAYER) 1053 if (type == PLAYER)
959 { 1054 {
1055 // leaving a spot always closes any open container on the ground
1056 if (container && !container->env)
1057 // this causes spurious floorbox updates, but it ensures
1058 // that the CLOSE event is being sent.
1059 close_container ();
1060
960 --map->players; 1061 --map->players;
961 map->touch (); 1062 map->touch ();
962 } 1063 }
963 1064
964 map->dirty = true; 1065 map->dirty = true;
… …
991 if (map->in_memory == MAP_SAVING) 1092 if (map->in_memory == MAP_SAVING)
992 return; 1093 return;
993 1094
994 int check_walk_off = !flag [FLAG_NO_APPLY]; 1095 int check_walk_off = !flag [FLAG_NO_APPLY];
995 1096
1097 if (object *pl = ms.player ())
1098 {
1099 if (pl->container == this)
1100 /* If a container that the player is currently using somehow gets
1101 * removed (most likely destroyed), update the player view
1102 * appropriately.
1103 */
1104 pl->close_container ();
1105
1106 pl->contr->ns->floorbox_update ();
1107 }
1108
996 for (tmp = ms.bot; tmp; tmp = tmp->above) 1109 for (tmp = ms.bot; tmp; tmp = tmp->above)
997 { 1110 {
998 /* No point updating the players look faces if he is the object 1111 /* No point updating the players look faces if he is the object
999 * being removed. 1112 * being removed.
1000 */ 1113 */
1001
1002 if (tmp->type == PLAYER && tmp != this)
1003 {
1004 /* If a container that the player is currently using somehow gets
1005 * removed (most likely destroyed), update the player view
1006 * appropriately.
1007 */
1008 if (tmp->container == this)
1009 {
1010 flag [FLAG_APPLIED] = 0;
1011 tmp->container = 0;
1012 }
1013
1014 if (tmp->contr->ns)
1015 tmp->contr->ns->floorbox_update ();
1016 }
1017 1114
1018 /* See if object moving off should effect something */ 1115 /* See if object moving off should effect something */
1019 if (check_walk_off 1116 if (check_walk_off
1020 && ((move_type & tmp->move_off) 1117 && ((move_type & tmp->move_off)
1021 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1118 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1024 1121
1025 if (destroyed ()) 1122 if (destroyed ())
1026 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1123 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1027 } 1124 }
1028 1125
1029 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1030 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1031 if (tmp->above == tmp)
1032 tmp->above = 0;
1033
1034 last = tmp; 1126 last = tmp;
1035 } 1127 }
1036 1128
1037 /* last == NULL if there are no objects on this space */ 1129 /* last == NULL if there are no objects on this space */
1038 //TODO: this makes little sense, why only update the topmost object? 1130 //TODO: this makes little sense, why only update the topmost object?
… …
1058merge_ob (object *op, object *top) 1150merge_ob (object *op, object *top)
1059{ 1151{
1060 if (!op->nrof) 1152 if (!op->nrof)
1061 return 0; 1153 return 0;
1062 1154
1063 if (top) 1155 if (!top)
1064 for (top = op; top && top->above; top = top->above) 1156 for (top = op; top && top->above; top = top->above)
1065 ; 1157 ;
1066 1158
1067 for (; top; top = top->below) 1159 for (; top; top = top->below)
1068 { 1160 {
… …
1081 } 1173 }
1082 1174
1083 return 0; 1175 return 0;
1084} 1176}
1085 1177
1178void
1179object::expand_tail ()
1180{
1181 if (more)
1182 return;
1183
1184 object *prev = this;
1185
1186 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1187 {
1188 object *op = arch_to_object (at);
1189
1190 op->name = name;
1191 op->name_pl = name_pl;
1192 op->title = title;
1193
1194 op->head = this;
1195 prev->more = op;
1196
1197 prev = op;
1198 }
1199}
1200
1086/* 1201/*
1087 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1202 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1088 * job preparing multi-part monsters. 1203 * job preparing multi-part monsters.
1089 */ 1204 */
1090object * 1205object *
1091insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1206insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1092{ 1207{
1093 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1094 { 1209 {
1095 tmp->x = x + tmp->arch->clone.x; 1210 tmp->x = x + tmp->arch->x;
1096 tmp->y = y + tmp->arch->clone.y; 1211 tmp->y = y + tmp->arch->y;
1097 } 1212 }
1098 1213
1099 return insert_ob_in_map (op, m, originator, flag); 1214 return insert_ob_in_map (op, m, originator, flag);
1100} 1215}
1101 1216
… …
1120 * just 'op' otherwise 1235 * just 'op' otherwise
1121 */ 1236 */
1122object * 1237object *
1123insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1238insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1124{ 1239{
1240 assert (!op->flag [FLAG_FREED]);
1241
1125 object *tmp, *top, *floor = NULL; 1242 object *top, *floor = NULL;
1126
1127 if (QUERY_FLAG (op, FLAG_FREED))
1128 {
1129 LOG (llevError, "Trying to insert freed object!\n");
1130 return NULL;
1131 }
1132
1133 if (!QUERY_FLAG (op, FLAG_REMOVED))
1134 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1135 1243
1136 op->remove (); 1244 op->remove ();
1137
1138 if (!m)
1139 {
1140 char *dump = dump_object (op);
1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1142 free (dump);
1143 return op;
1144 }
1145
1146 if (out_of_map (m, op->x, op->y))
1147 {
1148 char *dump = dump_object (op);
1149 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1150#ifdef MANY_CORES
1151 /* Better to catch this here, as otherwise the next use of this object
1152 * is likely to cause a crash. Better to find out where it is getting
1153 * improperly inserted.
1154 */
1155 abort ();
1156#endif
1157 free (dump);
1158 return op;
1159 }
1160
1161 if (object *more = op->more)
1162 {
1163 if (!insert_ob_in_map (more, m, originator, flag))
1164 {
1165 if (!op->head)
1166 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1167
1168 return 0;
1169 }
1170 }
1171
1172 CLEAR_FLAG (op, FLAG_REMOVED);
1173 1245
1174 /* Ideally, the caller figures this out. However, it complicates a lot 1246 /* Ideally, the caller figures this out. However, it complicates a lot
1175 * of areas of callers (eg, anything that uses find_free_spot would now 1247 * of areas of callers (eg, anything that uses find_free_spot would now
1176 * need extra work 1248 * need extra work
1177 */ 1249 */
1178 if (!xy_normalise (m, op->x, op->y)) 1250 if (!xy_normalise (m, op->x, op->y))
1251 {
1252 op->destroy ();
1179 return 0; 1253 return 0;
1254 }
1255
1256 if (object *more = op->more)
1257 if (!insert_ob_in_map (more, m, originator, flag))
1258 return 0;
1259
1260 CLEAR_FLAG (op, FLAG_REMOVED);
1180 1261
1181 op->map = m; 1262 op->map = m;
1182 mapspace &ms = op->ms (); 1263 mapspace &ms = op->ms ();
1183 1264
1184 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
1185 */ 1266 */
1186 if (op->nrof && !(flag & INS_NO_MERGE)) 1267 if (op->nrof && !(flag & INS_NO_MERGE))
1187 for (tmp = ms.bot; tmp; tmp = tmp->above) 1268 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1188 if (object::can_merge (op, tmp)) 1269 if (object::can_merge (op, tmp))
1189 { 1270 {
1190 op->nrof += tmp->nrof; 1271 op->nrof += tmp->nrof;
1191 tmp->destroy (); 1272 tmp->destroy ();
1192 } 1273 }
… …
1219 else 1300 else
1220 { 1301 {
1221 top = ms.bot; 1302 top = ms.bot;
1222 1303
1223 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1224 if ((!(flag & INS_MAP_LOAD)) && top) 1305 if (top)
1225 { 1306 {
1226 object *last = 0; 1307 object *last = 0;
1227 1308
1228 /* 1309 /*
1229 * If there are multiple objects on this space, we do some trickier handling. 1310 * If there are multiple objects on this space, we do some trickier handling.
… …
1259 * looks like instead of lots of conditions here. 1340 * looks like instead of lots of conditions here.
1260 * makes things faster, and effectively the same result. 1341 * makes things faster, and effectively the same result.
1261 */ 1342 */
1262 1343
1263 /* Have object 'fall below' other objects that block view. 1344 /* Have object 'fall below' other objects that block view.
1264 * Unless those objects are exits, type 66 1345 * Unless those objects are exits.
1265 * If INS_ON_TOP is used, don't do this processing 1346 * If INS_ON_TOP is used, don't do this processing
1266 * Need to find the object that in fact blocks view, otherwise 1347 * Need to find the object that in fact blocks view, otherwise
1267 * stacking is a bit odd. 1348 * stacking is a bit odd.
1268 */ 1349 */
1269 if (!(flag & INS_ON_TOP) 1350 if (!(flag & INS_ON_TOP)
1270 && ms.flags () & P_BLOCKSVIEW 1351 && ms.flags () & P_BLOCKSVIEW
1271 && (op->face && !op->face->visibility)) 1352 && (op->face && !faces [op->face].visibility))
1272 { 1353 {
1273 for (last = top; last != floor; last = last->below) 1354 for (last = top; last != floor; last = last->below)
1274 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1355 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1275 break; 1356 break;
1276 1357
… …
1282 if (last && last->below && last != floor) 1363 if (last && last->below && last != floor)
1283 top = last->below; 1364 top = last->below;
1284 } 1365 }
1285 } /* If objects on this space */ 1366 } /* If objects on this space */
1286 1367
1287 if (flag & INS_MAP_LOAD)
1288 top = ms.top;
1289
1290 if (flag & INS_ABOVE_FLOOR_ONLY) 1368 if (flag & INS_ABOVE_FLOOR_ONLY)
1291 top = floor; 1369 top = floor;
1292 1370
1293 /* Top is the object that our object (op) is going to get inserted above. 1371 /* Top is the object that our object (op) is going to get inserted above.
1294 */ 1372 */
… …
1326 op->map->touch (); 1404 op->map->touch ();
1327 } 1405 }
1328 1406
1329 op->map->dirty = true; 1407 op->map->dirty = true;
1330 1408
1331 /* If we have a floor, we know the player, if any, will be above
1332 * it, so save a few ticks and start from there.
1333 */
1334 if (!(flag & INS_MAP_LOAD))
1335 if (object *pl = ms.player ()) 1409 if (object *pl = ms.player ())
1336 if (pl->contr->ns)
1337 pl->contr->ns->floorbox_update (); 1410 pl->contr->ns->floorbox_update ();
1338 1411
1339 /* If this object glows, it may affect lighting conditions that are 1412 /* If this object glows, it may affect lighting conditions that are
1340 * visible to others on this map. But update_all_los is really 1413 * visible to others on this map. But update_all_los is really
1341 * an inefficient way to do this, as it means los for all players 1414 * an inefficient way to do this, as it means los for all players
1342 * on the map will get recalculated. The players could very well 1415 * on the map will get recalculated. The players could very well
… …
1361 * blocked() and wall() work properly), and these flags are updated by 1434 * blocked() and wall() work properly), and these flags are updated by
1362 * update_object(). 1435 * update_object().
1363 */ 1436 */
1364 1437
1365 /* if this is not the head or flag has been passed, don't check walk on status */ 1438 /* if this is not the head or flag has been passed, don't check walk on status */
1366 if (!(flag & INS_NO_WALK_ON) && !op->head) 1439 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1367 { 1440 {
1368 if (check_move_on (op, originator)) 1441 if (check_move_on (op, originator))
1369 return 0; 1442 return 0;
1370 1443
1371 /* If we are a multi part object, lets work our way through the check 1444 /* If we are a multi part object, lets work our way through the check
1372 * walk on's. 1445 * walk on's.
1373 */ 1446 */
1374 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1447 for (object *tmp = op->more; tmp; tmp = tmp->more)
1375 if (check_move_on (tmp, originator)) 1448 if (check_move_on (tmp, originator))
1376 return 0; 1449 return 0;
1377 } 1450 }
1378 1451
1379 return op; 1452 return op;
… …
1389 object *tmp, *tmp1; 1462 object *tmp, *tmp1;
1390 1463
1391 /* first search for itself and remove any old instances */ 1464 /* first search for itself and remove any old instances */
1392 1465
1393 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1466 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1394 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1467 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1395 tmp->destroy (); 1468 tmp->destroy ();
1396 1469
1397 tmp1 = arch_to_object (archetype::find (arch_string)); 1470 tmp1 = arch_to_object (archetype::find (arch_string));
1398 1471
1399 tmp1->x = op->x; 1472 tmp1->x = op->x;
… …
1402} 1475}
1403 1476
1404object * 1477object *
1405object::insert_at (object *where, object *originator, int flags) 1478object::insert_at (object *where, object *originator, int flags)
1406{ 1479{
1407 where->map->insert (this, where->x, where->y, originator, flags); 1480 return where->map->insert (this, where->x, where->y, originator, flags);
1408} 1481}
1409 1482
1410/* 1483/*
1411 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1484 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1412 * is returned contains nr objects, and the remaining parts contains 1485 * is returned contains nr objects, and the remaining parts contains
… …
1452 * the amount of an object. If the amount reaches 0, the object 1525 * the amount of an object. If the amount reaches 0, the object
1453 * is subsequently removed and freed. 1526 * is subsequently removed and freed.
1454 * 1527 *
1455 * Return value: 'op' if something is left, NULL if the amount reached 0 1528 * Return value: 'op' if something is left, NULL if the amount reached 0
1456 */ 1529 */
1457
1458object * 1530object *
1459decrease_ob_nr (object *op, uint32 i) 1531decrease_ob_nr (object *op, uint32 i)
1460{ 1532{
1461 object *tmp; 1533 object *tmp;
1462 1534
… …
1537 1609
1538/* 1610/*
1539 * add_weight(object, weight) adds the specified weight to an object, 1611 * add_weight(object, weight) adds the specified weight to an object,
1540 * and also updates how much the environment(s) is/are carrying. 1612 * and also updates how much the environment(s) is/are carrying.
1541 */ 1613 */
1542
1543void 1614void
1544add_weight (object *op, signed long weight) 1615add_weight (object *op, signed long weight)
1545{ 1616{
1546 while (op != NULL) 1617 while (op != NULL)
1547 { 1618 {
… …
1562 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1633 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1563 free (dump); 1634 free (dump);
1564 return op; 1635 return op;
1565 } 1636 }
1566 1637
1567 if (where->head) 1638 if (where->head_ () != where)
1568 { 1639 {
1569 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1640 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1570 where = where->head; 1641 where = where->head;
1571 } 1642 }
1572 1643
1573 return where->insert (op); 1644 return where->insert (op);
1574} 1645}
… …
1579 * inside the object environment. 1650 * inside the object environment.
1580 * 1651 *
1581 * The function returns now pointer to inserted item, and return value can 1652 * The function returns now pointer to inserted item, and return value can
1582 * be != op, if items are merged. -Tero 1653 * be != op, if items are merged. -Tero
1583 */ 1654 */
1584
1585object * 1655object *
1586object::insert (object *op) 1656object::insert (object *op)
1587{ 1657{
1588 object *tmp, *otmp;
1589
1590 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1658 if (!QUERY_FLAG (op, FLAG_REMOVED))
1591 op->remove (); 1659 op->remove ();
1592 1660
1593 if (op->more) 1661 if (op->more)
1594 { 1662 {
… …
1596 return op; 1664 return op;
1597 } 1665 }
1598 1666
1599 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1667 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1600 CLEAR_FLAG (op, FLAG_REMOVED); 1668 CLEAR_FLAG (op, FLAG_REMOVED);
1669
1601 if (op->nrof) 1670 if (op->nrof)
1602 { 1671 {
1603 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1672 for (object *tmp = inv; tmp; tmp = tmp->below)
1604 if (object::can_merge (tmp, op)) 1673 if (object::can_merge (tmp, op))
1605 { 1674 {
1606 /* return the original object and remove inserted object 1675 /* return the original object and remove inserted object
1607 (client needs the original object) */ 1676 (client needs the original object) */
1608 tmp->nrof += op->nrof; 1677 tmp->nrof += op->nrof;
… …
1627 add_weight (this, op->weight * op->nrof); 1696 add_weight (this, op->weight * op->nrof);
1628 } 1697 }
1629 else 1698 else
1630 add_weight (this, (op->weight + op->carrying)); 1699 add_weight (this, (op->weight + op->carrying));
1631 1700
1632 otmp = this->in_player (); 1701 if (object *otmp = this->in_player ())
1633 if (otmp && otmp->contr)
1634 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1702 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1635 otmp->update_stats (); 1703 otmp->update_stats ();
1636 1704
1705 op->owner = 0; // its his/hers now. period.
1637 op->map = 0; 1706 op->map = 0;
1638 op->env = this; 1707 op->env = this;
1639 op->above = 0; 1708 op->above = 0;
1640 op->below = 0; 1709 op->below = 0;
1641 op->x = 0, op->y = 0; 1710 op->x = op->y = 0;
1642 1711
1643 /* reset the light list and los of the players on the map */ 1712 /* reset the light list and los of the players on the map */
1644 if ((op->glow_radius != 0) && map) 1713 if (op->glow_radius && map)
1645 { 1714 {
1646#ifdef DEBUG_LIGHTS 1715#ifdef DEBUG_LIGHTS
1647 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1716 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1648#endif /* DEBUG_LIGHTS */ 1717#endif /* DEBUG_LIGHTS */
1649 if (map->darkness) 1718 if (map->darkness)
… …
1749 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1818 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1750 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1819 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1751 { 1820 {
1752 1821
1753 float 1822 float
1754 diff = tmp->move_slow_penalty * FABS (op->speed); 1823 diff = tmp->move_slow_penalty * fabs (op->speed);
1755 1824
1756 if (op->type == PLAYER) 1825 if (op->type == PLAYER)
1757 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1826 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1758 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1827 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1759 diff /= 4.0; 1828 diff /= 4.0;
… …
1903 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1972 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1904 { 1973 {
1905 CLEAR_FLAG (tmp, flag); 1974 CLEAR_FLAG (tmp, flag);
1906 unflag_inv (tmp, flag); 1975 unflag_inv (tmp, flag);
1907 } 1976 }
1908}
1909
1910/*
1911 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1912 * all it's inventory (recursively).
1913 * If checksums are used, a player will get set_cheat called for
1914 * him/her-self and all object carried by a call to this function.
1915 */
1916void
1917set_cheat (object *op)
1918{
1919 SET_FLAG (op, FLAG_WAS_WIZ);
1920 flag_inv (op, FLAG_WAS_WIZ);
1921} 1977}
1922 1978
1923/* 1979/*
1924 * find_free_spot(object, map, x, y, start, stop) will search for 1980 * find_free_spot(object, map, x, y, start, stop) will search for
1925 * a spot at the given map and coordinates which will be able to contain 1981 * a spot at the given map and coordinates which will be able to contain
… …
1942 * customized, changed states, etc. 1998 * customized, changed states, etc.
1943 */ 1999 */
1944int 2000int
1945find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2001find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1946{ 2002{
2003 int altern[SIZEOFFREE];
1947 int index = 0, flag; 2004 int index = 0, flag;
1948 int altern[SIZEOFFREE];
1949 2005
1950 for (int i = start; i < stop; i++) 2006 for (int i = start; i < stop; i++)
1951 { 2007 {
1952 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2008 mapxy pos (m, x, y); pos.move (i);
1953 if (!flag) 2009
2010 if (!pos.normalise ())
2011 continue;
2012
2013 mapspace &ms = *pos;
2014
2015 if (ms.flags () & P_IS_ALIVE)
2016 continue;
2017
2018 /* However, often
2019 * ob doesn't have any move type (when used to place exits)
2020 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2021 */
2022 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2023 {
1954 altern [index++] = i; 2024 altern [index++] = i;
2025 continue;
2026 }
1955 2027
1956 /* Basically, if we find a wall on a space, we cut down the search size. 2028 /* Basically, if we find a wall on a space, we cut down the search size.
1957 * In this way, we won't return spaces that are on another side of a wall. 2029 * In this way, we won't return spaces that are on another side of a wall.
1958 * This mostly work, but it cuts down the search size in all directions - 2030 * This mostly work, but it cuts down the search size in all directions -
1959 * if the space being examined only has a wall to the north and empty 2031 * if the space being examined only has a wall to the north and empty
1960 * spaces in all the other directions, this will reduce the search space 2032 * spaces in all the other directions, this will reduce the search space
1961 * to only the spaces immediately surrounding the target area, and 2033 * to only the spaces immediately surrounding the target area, and
1962 * won't look 2 spaces south of the target space. 2034 * won't look 2 spaces south of the target space.
1963 */ 2035 */
1964 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2036 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2037 {
1965 stop = maxfree[i]; 2038 stop = maxfree[i];
2039 continue;
2040 }
2041
2042 /* Note it is intentional that we check ob - the movement type of the
2043 * head of the object should correspond for the entire object.
2044 */
2045 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2046 continue;
2047
2048 altern [index++] = i;
1966 } 2049 }
1967 2050
1968 if (!index) 2051 if (!index)
1969 return -1; 2052 return -1;
1970 2053
1971 return altern[RANDOM () % index]; 2054 return altern [rndm (index)];
1972} 2055}
1973 2056
1974/* 2057/*
1975 * find_first_free_spot(archetype, maptile, x, y) works like 2058 * find_first_free_spot(archetype, maptile, x, y) works like
1976 * find_free_spot(), but it will search max number of squares. 2059 * find_free_spot(), but it will search max number of squares.
… …
1979 */ 2062 */
1980int 2063int
1981find_first_free_spot (const object *ob, maptile *m, int x, int y) 2064find_first_free_spot (const object *ob, maptile *m, int x, int y)
1982{ 2065{
1983 for (int i = 0; i < SIZEOFFREE; i++) 2066 for (int i = 0; i < SIZEOFFREE; i++)
1984 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2067 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
1985 return i; 2068 return i;
1986 2069
1987 return -1; 2070 return -1;
1988} 2071}
1989 2072
… …
1997{ 2080{
1998 arr += begin; 2081 arr += begin;
1999 end -= begin; 2082 end -= begin;
2000 2083
2001 while (--end) 2084 while (--end)
2002 swap (arr [end], arr [RANDOM () % (end + 1)]); 2085 swap (arr [end], arr [rndm (end + 1)]);
2003} 2086}
2004 2087
2005/* new function to make monster searching more efficient, and effective! 2088/* new function to make monster searching more efficient, and effective!
2006 * This basically returns a randomized array (in the passed pointer) of 2089 * This basically returns a randomized array (in the passed pointer) of
2007 * the spaces to find monsters. In this way, it won't always look for 2090 * the spaces to find monsters. In this way, it won't always look for
… …
2043 object *tmp; 2126 object *tmp;
2044 maptile *mp; 2127 maptile *mp;
2045 2128
2046 MoveType blocked, move_type; 2129 MoveType blocked, move_type;
2047 2130
2048 if (exclude && exclude->head) 2131 if (exclude && exclude->head_ () != exclude)
2049 { 2132 {
2050 exclude = exclude->head; 2133 exclude = exclude->head;
2051 move_type = exclude->move_type; 2134 move_type = exclude->move_type;
2052 } 2135 }
2053 else 2136 else
… …
2076 max = maxfree[i]; 2159 max = maxfree[i];
2077 else if (mflags & P_IS_ALIVE) 2160 else if (mflags & P_IS_ALIVE)
2078 { 2161 {
2079 for (tmp = ms.bot; tmp; tmp = tmp->above) 2162 for (tmp = ms.bot; tmp; tmp = tmp->above)
2080 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2163 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2081 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2164 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2082 break; 2165 break;
2083 2166
2084 if (tmp) 2167 if (tmp)
2085 return freedir[i]; 2168 return freedir[i];
2086 } 2169 }
… …
2266 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2349 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2267 * core dumps if they do. 2350 * core dumps if they do.
2268 * 2351 *
2269 * Add a check so we can't pick up invisible objects (0.93.8) 2352 * Add a check so we can't pick up invisible objects (0.93.8)
2270 */ 2353 */
2271
2272int 2354int
2273can_pick (const object *who, const object *item) 2355can_pick (const object *who, const object *item)
2274{ 2356{
2275 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2357 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2276 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2358 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2281 * create clone from object to another 2363 * create clone from object to another
2282 */ 2364 */
2283object * 2365object *
2284object_create_clone (object *asrc) 2366object_create_clone (object *asrc)
2285{ 2367{
2286 object *dst = 0, *tmp, *src, *part, *prev, *item; 2368 object *dst = 0, *tmp, *src, *prev, *item;
2287 2369
2288 if (!asrc) 2370 if (!asrc)
2289 return 0; 2371 return 0;
2290 2372
2291 src = asrc;
2292 if (src->head)
2293 src = src->head; 2373 src = asrc->head_ ();
2294 2374
2295 prev = 0; 2375 prev = 0;
2296 for (part = src; part; part = part->more) 2376 for (object *part = src; part; part = part->more)
2297 { 2377 {
2298 tmp = part->clone (); 2378 tmp = part->clone ();
2299 tmp->x -= src->x; 2379 tmp->x -= src->x;
2300 tmp->y -= src->y; 2380 tmp->y -= src->y;
2301 2381
… …
2317 2397
2318 for (item = src->inv; item; item = item->below) 2398 for (item = src->inv; item; item = item->below)
2319 insert_ob_in_ob (object_create_clone (item), dst); 2399 insert_ob_in_ob (object_create_clone (item), dst);
2320 2400
2321 return dst; 2401 return dst;
2322}
2323
2324/* GROS - Creates an object using a string representing its content. */
2325/* Basically, we save the content of the string to a temp file, then call */
2326/* load_object on it. I admit it is a highly inefficient way to make things, */
2327/* but it was simple to make and allows reusing the load_object function. */
2328/* Remember not to use load_object_str in a time-critical situation. */
2329/* Also remember that multiparts objects are not supported for now. */
2330object *
2331load_object_str (const char *obstr)
2332{
2333 object *op;
2334 char filename[MAX_BUF];
2335
2336 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2337
2338 FILE *tempfile = fopen (filename, "w");
2339
2340 if (tempfile == NULL)
2341 {
2342 LOG (llevError, "Error - Unable to access load object temp file\n");
2343 return NULL;
2344 }
2345
2346 fprintf (tempfile, obstr);
2347 fclose (tempfile);
2348
2349 op = object::create ();
2350
2351 object_thawer thawer (filename);
2352
2353 if (thawer)
2354 load_object (thawer, op, 0);
2355
2356 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2357 CLEAR_FLAG (op, FLAG_REMOVED);
2358
2359 return op;
2360} 2402}
2361 2403
2362/* This returns the first object in who's inventory that 2404/* This returns the first object in who's inventory that
2363 * has the same type and subtype match. 2405 * has the same type and subtype match.
2364 * returns NULL if no match. 2406 * returns NULL if no match.
… …
2419 if (link->key == canonical_key) 2461 if (link->key == canonical_key)
2420 return link->value; 2462 return link->value;
2421 2463
2422 return 0; 2464 return 0;
2423} 2465}
2424
2425 2466
2426/* 2467/*
2427 * Updates the canonical_key in op to value. 2468 * Updates the canonical_key in op to value.
2428 * 2469 *
2429 * canonical_key is a shared string (value doesn't have to be). 2470 * canonical_key is a shared string (value doesn't have to be).
… …
2453 /* Basically, if the archetype has this key set, 2494 /* Basically, if the archetype has this key set,
2454 * we need to store the null value so when we save 2495 * we need to store the null value so when we save
2455 * it, we save the empty value so that when we load, 2496 * it, we save the empty value so that when we load,
2456 * we get this value back again. 2497 * we get this value back again.
2457 */ 2498 */
2458 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2499 if (get_ob_key_link (op->arch, canonical_key))
2459 field->value = 0; 2500 field->value = 0;
2460 else 2501 else
2461 { 2502 {
2462 if (last) 2503 if (last)
2463 last->next = field->next; 2504 last->next = field->next;
… …
2532 } 2573 }
2533 else 2574 else
2534 item = item->env; 2575 item = item->env;
2535} 2576}
2536 2577
2537
2538const char * 2578const char *
2539object::flag_desc (char *desc, int len) const 2579object::flag_desc (char *desc, int len) const
2540{ 2580{
2541 char *p = desc; 2581 char *p = desc;
2542 bool first = true; 2582 bool first = true;
… …
2569{ 2609{
2570 char flagdesc[512]; 2610 char flagdesc[512];
2571 char info2[256 * 4]; 2611 char info2[256 * 4];
2572 char *p = info; 2612 char *p = info;
2573 2613
2574 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2614 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2575 count, uuid.seq, 2615 count, uuid.seq,
2576 &name, 2616 &name,
2577 title ? "\",title:\"" : "", 2617 title ? "\",title:\"" : "",
2578 title ? (const char *)title : "", 2618 title ? (const char *)title : "",
2579 flag_desc (flagdesc, 512), type); 2619 flag_desc (flagdesc, 512), type);
2580 2620
2581 if (env) 2621 if (!this->flag[FLAG_REMOVED] && env)
2582 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2622 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2583 2623
2584 if (map) 2624 if (map)
2585 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2625 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2586 2626
… …
2588} 2628}
2589 2629
2590const char * 2630const char *
2591object::debug_desc () const 2631object::debug_desc () const
2592{ 2632{
2593 static char info[256 * 4]; 2633 static char info[3][256 * 4];
2634 static int info_idx;
2635
2594 return debug_desc (info); 2636 return debug_desc (info [++info_idx % 3]);
2595} 2637}
2596 2638
2597const char * 2639struct region *
2598object::debug_desc2 () const 2640object::region () const
2599{ 2641{
2600 static char info[256 * 4]; 2642 return map ? map->region (x, y)
2601 return debug_desc (info); 2643 : region::default_region ();
2602} 2644}
2603 2645
2646const materialtype_t *
2647object::dominant_material () const
2648{
2649 if (materialtype_t *mt = name_to_material (materialname))
2650 return mt;
2651
2652 return name_to_material (shstr_unknown);
2653}
2654
2655void
2656object::open_container (object *new_container)
2657{
2658 if (container == new_container)
2659 return;
2660
2661 if (object *old_container = container)
2662 {
2663 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2664 return;
2665
2666#if 0
2667 // remove the "Close old_container" object.
2668 if (object *closer = old_container->inv)
2669 if (closer->type == CLOSE_CON)
2670 closer->destroy ();
2671#endif
2672
2673 old_container->flag [FLAG_APPLIED] = 0;
2674 container = 0;
2675
2676 esrv_update_item (UPD_FLAGS, this, old_container);
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2678 play_sound (sound_find ("chest_close"));
2679 }
2680
2681 if (new_container)
2682 {
2683 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2684 return;
2685
2686 // TODO: this does not seem to serve any purpose anymore?
2687#if 0
2688 // insert the "Close Container" object.
2689 if (archetype *closer = new_container->other_arch)
2690 {
2691 object *closer = arch_to_object (new_container->other_arch);
2692 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2693 new_container->insert (closer);
2694 }
2695#endif
2696
2697 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2698
2699 new_container->flag [FLAG_APPLIED] = 1;
2700 container = new_container;
2701
2702 esrv_update_item (UPD_FLAGS, this, new_container);
2703 esrv_send_inventory (this, new_container);
2704 play_sound (sound_find ("chest_open"));
2705 }
2706}
2707
2708object *
2709object::force_find (const shstr name)
2710{
2711 /* cycle through his inventory to look for the MARK we want to
2712 * place
2713 */
2714 for (object *tmp = inv; tmp; tmp = tmp->below)
2715 if (tmp->type == FORCE && tmp->slaying == name)
2716 return splay (tmp);
2717
2718 return 0;
2719}
2720
2721void
2722object::force_add (const shstr name, int duration)
2723{
2724 if (object *force = force_find (name))
2725 force->destroy ();
2726
2727 object *force = get_archetype (FORCE_NAME);
2728
2729 force->slaying = name;
2730 force->stats.food = 1;
2731 force->speed_left = -1.f;
2732
2733 force->set_speed (duration ? 1.f / duration : 0.f);
2734 force->flag [FLAG_IS_USED_UP] = true;
2735 force->flag [FLAG_APPLIED] = true;
2736
2737 insert (force);
2738}
2739
2740void
2741object::play_sound (faceidx sound) const
2742{
2743 if (!sound)
2744 return;
2745
2746 if (flag [FLAG_REMOVED])
2747 return;
2748
2749 if (env)
2750 {
2751 if (object *pl = in_player ())
2752 pl->contr->play_sound (sound);
2753 }
2754 else
2755 map->play_sound (sound, x, y);
2756}
2757

Diff Legend

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