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.145 by root, Mon May 7 03:05:58 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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; 38UUID UUID::cur;
39static UUID uuid; 39static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 40static const uint64 UUID_GAP = 1<<19;
41 41
42objectvec objects; 42objectvec objects;
43activevec actives; 43activevec actives;
44 44
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 50};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50}; 56};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 57int maxfree[SIZEOFFREE] = {
58 0,
59 9, 10, 13, 14, 17, 18, 21, 22,
60 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 62};
54int freedir[SIZEOFFREE] = { 63int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 64 0,
65 1, 2, 3, 4, 5, 6, 7, 8,
66 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 67 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 68};
58 69
59static void 70static void
60write_uuid (void) 71write_uuid (uval64 skip, bool sync)
61{ 72{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 73 CALL_BEGIN (2);
63 74 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 75 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 77 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 78}
79 79
80static void 80static void
81read_uuid (void) 81read_uuid (void)
82{ 82{
83 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
84 84
85 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
86 86
87 seq_next_save = 0;
88
87 FILE *fp; 89 FILE *fp;
88 90
89 if (!(fp = fopen (filename, "r"))) 91 if (!(fp = fopen (filename, "r")))
90 { 92 {
91 if (errno == ENOENT) 93 if (errno == ENOENT)
92 { 94 {
93 LOG (llevInfo, "RESET uid to 1\n"); 95 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 96 UUID::cur.seq = 0;
95 write_uuid (); 97 write_uuid (UUID_GAP, true);
96 return; 98 return;
97 } 99 }
98 100
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 102 _exit (1);
101 } 103 }
102 104
103 int version; 105 UUID::BUF buf;
104 unsigned long long uid; 106 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
106 { 110 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 112 _exit (1);
109 } 113 }
110 114
111 uuid.seq = uid; 115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 116
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 117 write_uuid (UUID_GAP, true);
114 fclose (fp); 118 fclose (fp);
115} 119}
116 120
117UUID 121UUID
118gen_uuid () 122UUID::gen ()
119{ 123{
120 UUID uid; 124 UUID uid;
121 125
122 uid.seq = ++uuid.seq; 126 uid.seq = ++cur.seq;
123 127
124 if (!(uuid.seq & (UUID_SKIP - 1))) 128 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
126 134
127 return uid; 135 return uid;
128} 136}
129 137
130void 138void
131init_uuid () 139UUID::init ()
132{ 140{
133 read_uuid (); 141 read_uuid ();
134} 142}
135 143
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 144/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
… …
254 /* This is really a spellbook check - really, we should 262 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 263 * check all objects in the inventory.
256 */ 264 */
257 if (ob1->inv || ob2->inv) 265 if (ob1->inv || ob2->inv)
258 { 266 {
259 /* if one object has inventory but the other doesn't, not equiv */ 267 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 268 return 0; /* inventories differ in length */
261 return 0;
262 269
263 /* Now check to see if the two inventory objects could merge */ 270 if (ob1->inv->below || ob2->inv->below)
271 return 0; /* more than one object in inv */
272
264 if (!object::can_merge (ob1->inv, ob2->inv)) 273 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 274 return 0; /* inventory objexts differ */
266 275
267 /* inventory ok - still need to check rest of this object to see 276 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 277 * if it is valid.
269 */ 278 */
270 } 279 }
… …
299 return 0; 308 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 309 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 310 return 0;
302 } 311 }
303 312
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 313 if (ob1->self || ob2->self)
306 { 314 {
307 ob1->optimise (); 315 ob1->optimise ();
308 ob2->optimise (); 316 ob2->optimise ();
309 317
310 if (ob1->self || ob2->self) 318 if (ob1->self || ob2->self)
319 {
320 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322
323 if (k1 != k2)
311 return 0; 324 return 0;
325 else if (k1 == 0)
326 return 1;
327 else if (!cfperl_can_merge (ob1, ob2))
328 return 0;
329 }
312 } 330 }
313 331
314 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
315 return 1; 333 return 1;
316} 334}
… …
374/* 392/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 393 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 394 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 395 * If it's not a multi-object, it is returned.
378 */ 396 */
379
380object * 397object *
381get_nearest_part (object *op, const object *pl) 398get_nearest_part (object *op, const object *pl)
382{ 399{
383 object *tmp, *closest; 400 object *tmp, *closest;
384 int last_dist, i; 401 int last_dist, i;
… …
420 break; 437 break;
421 438
422 return op; 439 return op;
423} 440}
424 441
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 442/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 443 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 444 * skill and experience objects.
445 * ACTUALLY NO! investigate! TODO
434 */ 446 */
435void 447void
436object::set_owner (object *owner) 448object::set_owner (object *owner)
437{ 449{
450 // allow objects which own objects
438 if (!owner) 451 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) 452 while (owner->owner)
449 owner = owner->owner; 453 owner = owner->owner;
454
455 if (flag [FLAG_FREED])
456 {
457 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
458 return;
459 }
450 460
451 this->owner = owner; 461 this->owner = owner;
452} 462}
453 463
454void 464int
465object::slottype () const
466{
467 if (type == SKILL)
468 {
469 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
470 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
471 }
472 else
473 {
474 if (slot [body_combat].info) return slot_combat;
475 if (slot [body_range ].info) return slot_ranged;
476 }
477
478 return slot_none;
479}
480
481bool
455object::set_weapon (object *ob) 482object::change_weapon (object *ob)
456{ 483{
457 if (current_weapon == ob) 484 if (current_weapon == ob)
458 return; 485 return true;
486
487 if (chosen_skill)
488 chosen_skill->flag [FLAG_APPLIED] = false;
459 489
460 current_weapon = ob; 490 current_weapon = ob;
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 491 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
492
493 if (chosen_skill)
494 chosen_skill->flag [FLAG_APPLIED] = true;
495
462 update_stats (); 496 update_stats ();
497
498 if (ob)
499 {
500 // now check wether any body locations became invalid, in which case
501 // we cannot apply the weapon at the moment.
502 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
503 if (slot[i].used < 0)
504 {
505 current_weapon = chosen_skill = 0;
506 update_stats ();
507
508 new_draw_info_format (NDI_UNIQUE, 0, this,
509 "You try to balance all your items at once, "
510 "but the %s is just too much for your body. "
511 "[You need to unapply some items first.]", &ob->name);
512 return false;
513 }
514
515 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
516 }
517 else
518 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
519
520 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
521 {
522 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
523 &name, ob->debug_desc ());
524 return false;
525 }
526
527 return true;
463} 528}
464 529
465/* Zero the key_values on op, decrementing the shared-string 530/* Zero the key_values on op, decrementing the shared-string
466 * refcounts and freeing the links. 531 * refcounts and freeing the links.
467 */ 532 */
… …
531object::copy_to (object *dst) 596object::copy_to (object *dst)
532{ 597{
533 *dst = *this; 598 *dst = *this;
534 599
535 if (speed < 0) 600 if (speed < 0)
536 dst->speed_left = speed_left - rndm (); 601 dst->speed_left -= rndm ();
537 602
538 dst->set_speed (dst->speed); 603 dst->set_speed (dst->speed);
539} 604}
540 605
541void 606void
542object::instantiate () 607object::instantiate ()
543{ 608{
544 if (!uuid.seq) // HACK 609 if (!uuid.seq) // HACK
545 uuid = gen_uuid (); 610 uuid = UUID::gen ();
546 611
547 speed_left = -0.1f; 612 speed_left = -0.1f;
548 /* copy the body_info to the body_used - this is only really 613 /* copy the body_info to the body_used - this is only really
549 * need for monsters, but doesn't hurt to do it for everything. 614 * need for monsters, but doesn't hurt to do it for everything.
550 * by doing so, when a monster is created, it has good starting 615 * by doing so, when a monster is created, it has good starting
… …
709static int object_count; 774static int object_count;
710 775
711void object::link () 776void object::link ()
712{ 777{
713 assert (!index);//D 778 assert (!index);//D
714 uuid = gen_uuid (); 779 uuid = UUID::gen ();
715 count = ++object_count; 780 count = ++object_count;
716 781
717 refcnt_inc (); 782 refcnt_inc ();
718 objects.insert (this); 783 objects.insert (this);
719} 784}
… …
868 933
869 if (!freed_map) 934 if (!freed_map)
870 { 935 {
871 freed_map = new maptile; 936 freed_map = new maptile;
872 937
938 freed_map->path = "<freed objects map>";
873 freed_map->name = "/internal/freed_objects_map"; 939 freed_map->name = "/internal/freed_objects_map";
874 freed_map->width = 3; 940 freed_map->width = 3;
875 freed_map->height = 3; 941 freed_map->height = 3;
942 freed_map->nodrop = 1;
876 943
877 freed_map->alloc (); 944 freed_map->alloc ();
878 freed_map->in_memory = MAP_IN_MEMORY; 945 freed_map->in_memory = MAP_IN_MEMORY;
879 } 946 }
880 947
881 map = freed_map; 948 map = freed_map;
882 x = 1; 949 x = 1;
883 y = 1; 950 y = 1;
884 } 951 }
885 952
886 head = 0;
887
888 if (more) 953 if (more)
889 { 954 {
890 more->destroy (); 955 more->destroy ();
891 more = 0; 956 more = 0;
892 } 957 }
893 958
959 head = 0;
960
894 // clear those pointers that likely might have circular references to us 961 // clear those pointers that likely might cause circular references
895 owner = 0; 962 owner = 0;
896 enemy = 0; 963 enemy = 0;
897 attacked_by = 0; 964 attacked_by = 0;
965 current_weapon = 0;
898} 966}
899 967
900void 968void
901object::destroy (bool destroy_inventory) 969object::destroy (bool destroy_inventory)
902{ 970{
903 if (destroyed ()) 971 if (destroyed ())
904 return; 972 return;
905 973
906 if (destroy_inventory) 974 if (destroy_inventory)
907 destroy_inv (false); 975 destroy_inv (false);
976
977 if (is_head ())
978 if (sound_destroy)
979 play_sound (sound_destroy);
980 else if (flag [FLAG_MONSTER])
981 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
908 982
909 attachable::destroy (); 983 attachable::destroy ();
910} 984}
911 985
912/* 986/*
… …
1027 if (map->in_memory == MAP_SAVING) 1101 if (map->in_memory == MAP_SAVING)
1028 return; 1102 return;
1029 1103
1030 int check_walk_off = !flag [FLAG_NO_APPLY]; 1104 int check_walk_off = !flag [FLAG_NO_APPLY];
1031 1105
1106 if (object *pl = ms.player ())
1107 {
1108 if (pl->container == this)
1109 /* If a container that the player is currently using somehow gets
1110 * removed (most likely destroyed), update the player view
1111 * appropriately.
1112 */
1113 pl->close_container ();
1114
1115 pl->contr->ns->floorbox_update ();
1116 }
1117
1032 for (tmp = ms.bot; tmp; tmp = tmp->above) 1118 for (tmp = ms.bot; tmp; tmp = tmp->above)
1033 { 1119 {
1034 /* No point updating the players look faces if he is the object 1120 /* No point updating the players look faces if he is the object
1035 * being removed. 1121 * being removed.
1036 */ 1122 */
1037
1038 if (tmp->type == PLAYER && tmp != this)
1039 {
1040 /* If a container that the player is currently using somehow gets
1041 * removed (most likely destroyed), update the player view
1042 * appropriately.
1043 */
1044 if (tmp->container == this)
1045 {
1046 flag [FLAG_APPLIED] = 0;
1047 tmp->container = 0;
1048 }
1049
1050 if (tmp->contr->ns)
1051 tmp->contr->ns->floorbox_update ();
1052 }
1053 1123
1054 /* See if object moving off should effect something */ 1124 /* See if object moving off should effect something */
1055 if (check_walk_off 1125 if (check_walk_off
1056 && ((move_type & tmp->move_off) 1126 && ((move_type & tmp->move_off)
1057 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1127 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1060 1130
1061 if (destroyed ()) 1131 if (destroyed ())
1062 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1132 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1063 } 1133 }
1064 1134
1065 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1066 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1067 if (tmp->above == tmp)
1068 tmp->above = 0;
1069
1070 last = tmp; 1135 last = tmp;
1071 } 1136 }
1072 1137
1073 /* last == NULL if there are no objects on this space */ 1138 /* last == NULL if there are no objects on this space */
1074 //TODO: this makes little sense, why only update the topmost object? 1139 //TODO: this makes little sense, why only update the topmost object?
… …
1094merge_ob (object *op, object *top) 1159merge_ob (object *op, object *top)
1095{ 1160{
1096 if (!op->nrof) 1161 if (!op->nrof)
1097 return 0; 1162 return 0;
1098 1163
1099 if (top) 1164 if (!top)
1100 for (top = op; top && top->above; top = top->above) 1165 for (top = op; top && top->above; top = top->above)
1101 ; 1166 ;
1102 1167
1103 for (; top; top = top->below) 1168 for (; top; top = top->below)
1104 { 1169 {
… …
1125 if (more) 1190 if (more)
1126 return; 1191 return;
1127 1192
1128 object *prev = this; 1193 object *prev = this;
1129 1194
1130 for (archetype *at = arch->more; at; at = at->more) 1195 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1131 { 1196 {
1132 object *op = arch_to_object (at); 1197 object *op = arch_to_object (at);
1133 1198
1134 op->name = name; 1199 op->name = name;
1135 op->name_pl = name_pl; 1200 op->name_pl = name_pl;
… …
1149object * 1214object *
1150insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1215insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1151{ 1216{
1152 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1217 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1153 { 1218 {
1154 tmp->x = x + tmp->arch->clone.x; 1219 tmp->x = x + tmp->arch->x;
1155 tmp->y = y + tmp->arch->clone.y; 1220 tmp->y = y + tmp->arch->y;
1156 } 1221 }
1157 1222
1158 return insert_ob_in_map (op, m, originator, flag); 1223 return insert_ob_in_map (op, m, originator, flag);
1159} 1224}
1160 1225
… …
1181object * 1246object *
1182insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1247insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1183{ 1248{
1184 assert (!op->flag [FLAG_FREED]); 1249 assert (!op->flag [FLAG_FREED]);
1185 1250
1186 object *tmp, *top, *floor = NULL; 1251 object *top, *floor = NULL;
1187 1252
1188 op->remove (); 1253 op->remove ();
1189
1190#if 0
1191 if (!m->active != !op->active)
1192 if (m->active)
1193 op->activate_recursive ();
1194 else
1195 op->deactivate_recursive ();
1196#endif
1197
1198 if (out_of_map (m, op->x, op->y))
1199 {
1200 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1201#ifdef MANY_CORES
1202 /* Better to catch this here, as otherwise the next use of this object
1203 * is likely to cause a crash. Better to find out where it is getting
1204 * improperly inserted.
1205 */
1206 abort ();
1207#endif
1208 return op;
1209 }
1210
1211 if (object *more = op->more)
1212 {
1213 if (!insert_ob_in_map (more, m, originator, flag))
1214 {
1215 if (!op->head)
1216 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1217
1218 return 0;
1219 }
1220 }
1221
1222 CLEAR_FLAG (op, FLAG_REMOVED);
1223 1254
1224 /* Ideally, the caller figures this out. However, it complicates a lot 1255 /* Ideally, the caller figures this out. However, it complicates a lot
1225 * of areas of callers (eg, anything that uses find_free_spot would now 1256 * of areas of callers (eg, anything that uses find_free_spot would now
1226 * need extra work 1257 * need extra work
1227 */ 1258 */
1228 if (!xy_normalise (m, op->x, op->y)) 1259 if (!xy_normalise (m, op->x, op->y))
1260 {
1261 op->destroy ();
1229 return 0; 1262 return 0;
1263 }
1264
1265 if (object *more = op->more)
1266 if (!insert_ob_in_map (more, m, originator, flag))
1267 return 0;
1268
1269 CLEAR_FLAG (op, FLAG_REMOVED);
1230 1270
1231 op->map = m; 1271 op->map = m;
1232 mapspace &ms = op->ms (); 1272 mapspace &ms = op->ms ();
1233 1273
1234 /* this has to be done after we translate the coordinates. 1274 /* this has to be done after we translate the coordinates.
1235 */ 1275 */
1236 if (op->nrof && !(flag & INS_NO_MERGE)) 1276 if (op->nrof && !(flag & INS_NO_MERGE))
1237 for (tmp = ms.bot; tmp; tmp = tmp->above) 1277 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1238 if (object::can_merge (op, tmp)) 1278 if (object::can_merge (op, tmp))
1239 { 1279 {
1240 op->nrof += tmp->nrof; 1280 op->nrof += tmp->nrof;
1241 tmp->destroy (); 1281 tmp->destroy ();
1242 } 1282 }
… …
1269 else 1309 else
1270 { 1310 {
1271 top = ms.bot; 1311 top = ms.bot;
1272 1312
1273 /* If there are other objects, then */ 1313 /* If there are other objects, then */
1274 if ((!(flag & INS_MAP_LOAD)) && top) 1314 if (top)
1275 { 1315 {
1276 object *last = 0; 1316 object *last = 0;
1277 1317
1278 /* 1318 /*
1279 * If there are multiple objects on this space, we do some trickier handling. 1319 * If there are multiple objects on this space, we do some trickier handling.
… …
1332 if (last && last->below && last != floor) 1372 if (last && last->below && last != floor)
1333 top = last->below; 1373 top = last->below;
1334 } 1374 }
1335 } /* If objects on this space */ 1375 } /* If objects on this space */
1336 1376
1337 if (flag & INS_MAP_LOAD)
1338 top = ms.top;
1339
1340 if (flag & INS_ABOVE_FLOOR_ONLY) 1377 if (flag & INS_ABOVE_FLOOR_ONLY)
1341 top = floor; 1378 top = floor;
1342 1379
1343 /* 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.
1344 */ 1381 */
… …
1376 op->map->touch (); 1413 op->map->touch ();
1377 } 1414 }
1378 1415
1379 op->map->dirty = true; 1416 op->map->dirty = true;
1380 1417
1381 /* If we have a floor, we know the player, if any, will be above
1382 * it, so save a few ticks and start from there.
1383 */
1384 if (!(flag & INS_MAP_LOAD))
1385 if (object *pl = ms.player ()) 1418 if (object *pl = ms.player ())
1386 if (pl->contr->ns)
1387 pl->contr->ns->floorbox_update (); 1419 pl->contr->ns->floorbox_update ();
1388 1420
1389 /* If this object glows, it may affect lighting conditions that are 1421 /* If this object glows, it may affect lighting conditions that are
1390 * visible to others on this map. But update_all_los is really 1422 * visible to others on this map. But update_all_los is really
1391 * an inefficient way to do this, as it means los for all players 1423 * an inefficient way to do this, as it means los for all players
1392 * on the map will get recalculated. The players could very well 1424 * on the map will get recalculated. The players could very well
… …
1411 * blocked() and wall() work properly), and these flags are updated by 1443 * blocked() and wall() work properly), and these flags are updated by
1412 * update_object(). 1444 * update_object().
1413 */ 1445 */
1414 1446
1415 /* if this is not the head or flag has been passed, don't check walk on status */ 1447 /* if this is not the head or flag has been passed, don't check walk on status */
1416 if (!(flag & INS_NO_WALK_ON) && !op->head) 1448 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1417 { 1449 {
1418 if (check_move_on (op, originator)) 1450 if (check_move_on (op, originator))
1419 return 0; 1451 return 0;
1420 1452
1421 /* If we are a multi part object, lets work our way through the check 1453 /* If we are a multi part object, lets work our way through the check
1422 * walk on's. 1454 * walk on's.
1423 */ 1455 */
1424 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1456 for (object *tmp = op->more; tmp; tmp = tmp->more)
1425 if (check_move_on (tmp, originator)) 1457 if (check_move_on (tmp, originator))
1426 return 0; 1458 return 0;
1427 } 1459 }
1428 1460
1429 return op; 1461 return op;
… …
1439 object *tmp, *tmp1; 1471 object *tmp, *tmp1;
1440 1472
1441 /* first search for itself and remove any old instances */ 1473 /* first search for itself and remove any old instances */
1442 1474
1443 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1475 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1444 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1476 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1445 tmp->destroy (); 1477 tmp->destroy ();
1446 1478
1447 tmp1 = arch_to_object (archetype::find (arch_string)); 1479 tmp1 = arch_to_object (archetype::find (arch_string));
1448 1480
1449 tmp1->x = op->x; 1481 tmp1->x = op->x;
… …
1610 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1642 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1611 free (dump); 1643 free (dump);
1612 return op; 1644 return op;
1613 } 1645 }
1614 1646
1615 if (where->head) 1647 if (where->head_ () != where)
1616 { 1648 {
1617 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1649 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1618 where = where->head; 1650 where = where->head;
1619 } 1651 }
1620 1652
1621 return where->insert (op); 1653 return where->insert (op);
1622} 1654}
… …
1630 * be != op, if items are merged. -Tero 1662 * be != op, if items are merged. -Tero
1631 */ 1663 */
1632object * 1664object *
1633object::insert (object *op) 1665object::insert (object *op)
1634{ 1666{
1635 object *tmp, *otmp;
1636
1637 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1667 if (!QUERY_FLAG (op, FLAG_REMOVED))
1638 op->remove (); 1668 op->remove ();
1639 1669
1640 if (op->more) 1670 if (op->more)
1641 { 1671 {
… …
1643 return op; 1673 return op;
1644 } 1674 }
1645 1675
1646 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1676 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1647 CLEAR_FLAG (op, FLAG_REMOVED); 1677 CLEAR_FLAG (op, FLAG_REMOVED);
1678
1648 if (op->nrof) 1679 if (op->nrof)
1649 { 1680 {
1650 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1681 for (object *tmp = inv; tmp; tmp = tmp->below)
1651 if (object::can_merge (tmp, op)) 1682 if (object::can_merge (tmp, op))
1652 { 1683 {
1653 /* return the original object and remove inserted object 1684 /* return the original object and remove inserted object
1654 (client needs the original object) */ 1685 (client needs the original object) */
1655 tmp->nrof += op->nrof; 1686 tmp->nrof += op->nrof;
… …
1674 add_weight (this, op->weight * op->nrof); 1705 add_weight (this, op->weight * op->nrof);
1675 } 1706 }
1676 else 1707 else
1677 add_weight (this, (op->weight + op->carrying)); 1708 add_weight (this, (op->weight + op->carrying));
1678 1709
1679 otmp = this->in_player (); 1710 if (object *otmp = this->in_player ())
1680 if (otmp && otmp->contr)
1681 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1711 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1682 otmp->update_stats (); 1712 otmp->update_stats ();
1683 1713
1714 op->owner = 0; // its his/hers now. period.
1684 op->map = 0; 1715 op->map = 0;
1685 op->env = this; 1716 op->env = this;
1686 op->above = 0; 1717 op->above = 0;
1687 op->below = 0; 1718 op->below = 0;
1688 op->x = 0, op->y = 0; 1719 op->x = op->y = 0;
1689 1720
1690 /* reset the light list and los of the players on the map */ 1721 /* reset the light list and los of the players on the map */
1691 if ((op->glow_radius != 0) && map) 1722 if (op->glow_radius && map)
1692 { 1723 {
1693#ifdef DEBUG_LIGHTS 1724#ifdef DEBUG_LIGHTS
1694 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1725 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1695#endif /* DEBUG_LIGHTS */ 1726#endif /* DEBUG_LIGHTS */
1696 if (map->darkness) 1727 if (map->darkness)
… …
1930 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
1931 */ 1962 */
1932void 1963void
1933flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
1934{ 1965{
1935 if (op->inv)
1936 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1966 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1937 { 1967 {
1938 SET_FLAG (tmp, flag); 1968 SET_FLAG (tmp, flag);
1939 flag_inv (tmp, flag); 1969 flag_inv (tmp, flag);
1940 } 1970 }
1941} 1971}
1942 1972
1943/* 1973/*
1944 * deactivate recursively a flag on an object inventory 1974 * deactivate recursively a flag on an object inventory
1945 */ 1975 */
1946void 1976void
1947unflag_inv (object *op, int flag) 1977unflag_inv (object *op, int flag)
1948{ 1978{
1949 if (op->inv)
1950 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1979 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1951 { 1980 {
1952 CLEAR_FLAG (tmp, flag); 1981 CLEAR_FLAG (tmp, flag);
1953 unflag_inv (tmp, flag); 1982 unflag_inv (tmp, flag);
1954 } 1983 }
1955}
1956
1957/*
1958 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1959 * all it's inventory (recursively).
1960 * If checksums are used, a player will get set_cheat called for
1961 * him/her-self and all object carried by a call to this function.
1962 */
1963void
1964set_cheat (object *op)
1965{
1966 SET_FLAG (op, FLAG_WAS_WIZ);
1967 flag_inv (op, FLAG_WAS_WIZ);
1968} 1984}
1969 1985
1970/* 1986/*
1971 * find_free_spot(object, map, x, y, start, stop) will search for 1987 * find_free_spot(object, map, x, y, start, stop) will search for
1972 * a spot at the given map and coordinates which will be able to contain 1988 * a spot at the given map and coordinates which will be able to contain
… …
1974 * to search (see the freearr_x/y[] definition). 1990 * to search (see the freearr_x/y[] definition).
1975 * It returns a random choice among the alternatives found. 1991 * It returns a random choice among the alternatives found.
1976 * start and stop are where to start relative to the free_arr array (1,9 1992 * start and stop are where to start relative to the free_arr array (1,9
1977 * does all 4 immediate directions). This returns the index into the 1993 * does all 4 immediate directions). This returns the index into the
1978 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1994 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1979 * Note - this only checks to see if there is space for the head of the
1980 * object - if it is a multispace object, this should be called for all
1981 * pieces.
1982 * Note2: This function does correctly handle tiled maps, but does not 1995 * Note: This function does correctly handle tiled maps, but does not
1983 * inform the caller. However, insert_ob_in_map will update as 1996 * inform the caller. However, insert_ob_in_map will update as
1984 * necessary, so the caller shouldn't need to do any special work. 1997 * necessary, so the caller shouldn't need to do any special work.
1985 * Note - updated to take an object instead of archetype - this is necessary 1998 * Note - updated to take an object instead of archetype - this is necessary
1986 * because arch_blocked (now ob_blocked) needs to know the movement type 1999 * because arch_blocked (now ob_blocked) needs to know the movement type
1987 * to know if the space in question will block the object. We can't use 2000 * to know if the space in question will block the object. We can't use
… …
1989 * customized, changed states, etc. 2002 * customized, changed states, etc.
1990 */ 2003 */
1991int 2004int
1992find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2005find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1993{ 2006{
2007 int altern[SIZEOFFREE];
1994 int index = 0, flag; 2008 int index = 0, flag;
1995 int altern[SIZEOFFREE];
1996 2009
1997 for (int i = start; i < stop; i++) 2010 for (int i = start; i < stop; i++)
1998 { 2011 {
1999 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2012 mapxy pos (m, x, y); pos.move (i);
2000 if (!flag) 2013
2014 if (!pos.normalise ())
2015 continue;
2016
2017 mapspace &ms = *pos;
2018
2019 if (ms.flags () & P_IS_ALIVE)
2020 continue;
2021
2022 /* However, often
2023 * ob doesn't have any move type (when used to place exits)
2024 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2025 */
2026 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2027 {
2001 altern [index++] = i; 2028 altern [index++] = i;
2029 continue;
2030 }
2002 2031
2003 /* Basically, if we find a wall on a space, we cut down the search size. 2032 /* Basically, if we find a wall on a space, we cut down the search size.
2004 * In this way, we won't return spaces that are on another side of a wall. 2033 * In this way, we won't return spaces that are on another side of a wall.
2005 * This mostly work, but it cuts down the search size in all directions - 2034 * This mostly work, but it cuts down the search size in all directions -
2006 * if the space being examined only has a wall to the north and empty 2035 * if the space being examined only has a wall to the north and empty
2007 * spaces in all the other directions, this will reduce the search space 2036 * spaces in all the other directions, this will reduce the search space
2008 * to only the spaces immediately surrounding the target area, and 2037 * to only the spaces immediately surrounding the target area, and
2009 * won't look 2 spaces south of the target space. 2038 * won't look 2 spaces south of the target space.
2010 */ 2039 */
2011 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2040 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2041 {
2012 stop = maxfree[i]; 2042 stop = maxfree[i];
2043 continue;
2044 }
2045
2046 /* Note it is intentional that we check ob - the movement type of the
2047 * head of the object should correspond for the entire object.
2048 */
2049 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2050 continue;
2051
2052 if (ob->blocked (m, pos.x, pos.y))
2053 continue;
2054
2055 altern [index++] = i;
2013 } 2056 }
2014 2057
2015 if (!index) 2058 if (!index)
2016 return -1; 2059 return -1;
2017 2060
… …
2026 */ 2069 */
2027int 2070int
2028find_first_free_spot (const object *ob, maptile *m, int x, int y) 2071find_first_free_spot (const object *ob, maptile *m, int x, int y)
2029{ 2072{
2030 for (int i = 0; i < SIZEOFFREE; i++) 2073 for (int i = 0; i < SIZEOFFREE; i++)
2031 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2074 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2032 return i; 2075 return i;
2033 2076
2034 return -1; 2077 return -1;
2035} 2078}
2036 2079
… …
2090 object *tmp; 2133 object *tmp;
2091 maptile *mp; 2134 maptile *mp;
2092 2135
2093 MoveType blocked, move_type; 2136 MoveType blocked, move_type;
2094 2137
2095 if (exclude && exclude->head) 2138 if (exclude && exclude->head_ () != exclude)
2096 { 2139 {
2097 exclude = exclude->head; 2140 exclude = exclude->head;
2098 move_type = exclude->move_type; 2141 move_type = exclude->move_type;
2099 } 2142 }
2100 else 2143 else
… …
2123 max = maxfree[i]; 2166 max = maxfree[i];
2124 else if (mflags & P_IS_ALIVE) 2167 else if (mflags & P_IS_ALIVE)
2125 { 2168 {
2126 for (tmp = ms.bot; tmp; tmp = tmp->above) 2169 for (tmp = ms.bot; tmp; tmp = tmp->above)
2127 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2170 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2128 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2171 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2129 break; 2172 break;
2130 2173
2131 if (tmp) 2174 if (tmp)
2132 return freedir[i]; 2175 return freedir[i];
2133 } 2176 }
… …
2313 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2356 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2314 * core dumps if they do. 2357 * core dumps if they do.
2315 * 2358 *
2316 * Add a check so we can't pick up invisible objects (0.93.8) 2359 * Add a check so we can't pick up invisible objects (0.93.8)
2317 */ 2360 */
2318
2319int 2361int
2320can_pick (const object *who, const object *item) 2362can_pick (const object *who, const object *item)
2321{ 2363{
2322 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2323 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2328 * create clone from object to another 2370 * create clone from object to another
2329 */ 2371 */
2330object * 2372object *
2331object_create_clone (object *asrc) 2373object_create_clone (object *asrc)
2332{ 2374{
2333 object *dst = 0, *tmp, *src, *part, *prev, *item; 2375 object *dst = 0, *tmp, *src, *prev, *item;
2334 2376
2335 if (!asrc) 2377 if (!asrc)
2336 return 0; 2378 return 0;
2337 2379
2338 src = asrc;
2339 if (src->head)
2340 src = src->head; 2380 src = asrc->head_ ();
2341 2381
2342 prev = 0; 2382 prev = 0;
2343 for (part = src; part; part = part->more) 2383 for (object *part = src; part; part = part->more)
2344 { 2384 {
2345 tmp = part->clone (); 2385 tmp = part->clone ();
2346 tmp->x -= src->x; 2386 tmp->x -= src->x;
2347 tmp->y -= src->y; 2387 tmp->y -= src->y;
2348 2388
… …
2461 /* Basically, if the archetype has this key set, 2501 /* Basically, if the archetype has this key set,
2462 * we need to store the null value so when we save 2502 * we need to store the null value so when we save
2463 * it, we save the empty value so that when we load, 2503 * it, we save the empty value so that when we load,
2464 * we get this value back again. 2504 * we get this value back again.
2465 */ 2505 */
2466 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2506 if (get_ob_key_link (op->arch, canonical_key))
2467 field->value = 0; 2507 field->value = 0;
2468 else 2508 else
2469 { 2509 {
2470 if (last) 2510 if (last)
2471 last->next = field->next; 2511 last->next = field->next;
… …
2540 } 2580 }
2541 else 2581 else
2542 item = item->env; 2582 item = item->env;
2543} 2583}
2544 2584
2545
2546const char * 2585const char *
2547object::flag_desc (char *desc, int len) const 2586object::flag_desc (char *desc, int len) const
2548{ 2587{
2549 char *p = desc; 2588 char *p = desc;
2550 bool first = true; 2589 bool first = true;
… …
2577{ 2616{
2578 char flagdesc[512]; 2617 char flagdesc[512];
2579 char info2[256 * 4]; 2618 char info2[256 * 4];
2580 char *p = info; 2619 char *p = info;
2581 2620
2582 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2621 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2583 count, uuid.seq, 2622 count,
2623 uuid.c_str (),
2584 &name, 2624 &name,
2585 title ? "\",title:\"" : "", 2625 title ? "\",title:\"" : "",
2586 title ? (const char *)title : "", 2626 title ? (const char *)title : "",
2587 flag_desc (flagdesc, 512), type); 2627 flag_desc (flagdesc, 512), type);
2588 2628
2589 if (env) 2629 if (!this->flag[FLAG_REMOVED] && env)
2590 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2630 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2591 2631
2592 if (map) 2632 if (map)
2593 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2633 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2594 2634
… …
2612} 2652}
2613 2653
2614const materialtype_t * 2654const materialtype_t *
2615object::dominant_material () const 2655object::dominant_material () const
2616{ 2656{
2617 if (materialtype_t *mat = name_to_material (materialname)) 2657 if (materialtype_t *mt = name_to_material (materialname))
2618 return mat; 2658 return mt;
2619 2659
2620 // omfg this is slow, this has to be temporary :)
2621 shstr unknown ("unknown");
2622
2623 return name_to_material (unknown); 2660 return name_to_material (shstr_unknown);
2624} 2661}
2625 2662
2626void 2663void
2627object::open_container (object *new_container) 2664object::open_container (object *new_container)
2628{ 2665{
… …
2644 old_container->flag [FLAG_APPLIED] = 0; 2681 old_container->flag [FLAG_APPLIED] = 0;
2645 container = 0; 2682 container = 0;
2646 2683
2647 esrv_update_item (UPD_FLAGS, this, old_container); 2684 esrv_update_item (UPD_FLAGS, this, old_container);
2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2685 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2686 play_sound (sound_find ("chest_close"));
2649 } 2687 }
2650 2688
2651 if (new_container) 2689 if (new_container)
2652 { 2690 {
2653 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2691 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2669 new_container->flag [FLAG_APPLIED] = 1; 2707 new_container->flag [FLAG_APPLIED] = 1;
2670 container = new_container; 2708 container = new_container;
2671 2709
2672 esrv_update_item (UPD_FLAGS, this, new_container); 2710 esrv_update_item (UPD_FLAGS, this, new_container);
2673 esrv_send_inventory (this, new_container); 2711 esrv_send_inventory (this, new_container);
2712 play_sound (sound_find ("chest_open"));
2713 }
2714}
2715
2716object *
2717object::force_find (const shstr name)
2718{
2719 /* cycle through his inventory to look for the MARK we want to
2720 * place
2721 */
2722 for (object *tmp = inv; tmp; tmp = tmp->below)
2723 if (tmp->type == FORCE && tmp->slaying == name)
2724 return splay (tmp);
2725
2726 return 0;
2727}
2728
2729void
2730object::force_add (const shstr name, int duration)
2731{
2732 if (object *force = force_find (name))
2733 force->destroy ();
2734
2735 object *force = get_archetype (FORCE_NAME);
2736
2737 force->slaying = name;
2738 force->stats.food = 1;
2739 force->speed_left = -1.f;
2740
2741 force->set_speed (duration ? 1.f / duration : 0.f);
2742 force->flag [FLAG_IS_USED_UP] = true;
2743 force->flag [FLAG_APPLIED] = true;
2744
2745 insert (force);
2746}
2747
2748void
2749object::play_sound (faceidx sound) const
2750{
2751 if (!sound)
2752 return;
2753
2754 if (flag [FLAG_REMOVED])
2755 return;
2756
2757 if (env)
2674 } 2758 {
2759 if (object *pl = in_player ())
2760 pl->contr->play_sound (sound);
2761 }
2762 else
2763 map->play_sound (sound, x, y);
2675} 2764}
2676 2765
2677

Diff Legend

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