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.294 by root, Thu Nov 5 15:43:21 2009 UTC vs.
Revision 1.326 by root, Thu Apr 15 00:56:40 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
26#include <stdio.h> 26#include <stdio.h>
27#include <sys/types.h> 27#include <sys/types.h>
28#include <sys/uio.h> 28#include <sys/uio.h>
29#include <object.h> 29#include <object.h>
30#include <sproto.h> 30#include <sproto.h>
31#include <loader.h>
32 31
33#include <bitset> 32#include <bitset>
34 33
35UUID UUID::cur; 34UUID UUID::cur;
36static uint64_t seq_next_save; 35static uint64_t seq_next_save;
37static const uint64 UUID_GAP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
38uint32_t mapspace::smellcount = 10000; 37uint32_t mapspace::smellcount = 10000;
39 38
40objectvec objects; 39objectvec objects;
41activevec actives; 40activevec actives;
41
42freelist_item *object::freelist;
43uint32_t object::object_count;
44uint32_t object::free_count;
45uint32_t object::create_count;
46uint32_t object::destroy_count;
42 47
43//+GPL 48//+GPL
44 49
45short freearr_x[SIZEOFFREE] = { 50short freearr_x[SIZEOFFREE] = {
46 0, 51 0,
52 0, 57 0,
53 -1, -1, 0, 1, 1, 1, 0, -1, 58 -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, 59 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
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 60 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
56}; 61};
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,
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
62};
63int freedir[SIZEOFFREE] = { 62int freedir[SIZEOFFREE] = {
64 0, 63 0,
65 1, 2, 3, 4, 5, 6, 7, 8, 64 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, 65 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 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 66 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
68}; 67};
69 68
69static int maxfree[SIZEOFFREE] = {
70 0,
71 9, 10, 13, 14, 17, 18, 21, 22,
72 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
73 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
74};
75
70static void 76static void
71write_uuid (uval64 skip, bool sync) 77write_uuid (uval64 skip, bool sync)
72{ 78{
73 CALL_BEGIN (2); 79 CALL_BEGIN (2);
74 CALL_ARG_SV (newSVval64 (skip)); 80 CALL_ARG_SV (newSVval64 (skip));
76 CALL_CALL ("cf::write_uuid", G_DISCARD); 82 CALL_CALL ("cf::write_uuid", G_DISCARD);
77 CALL_END; 83 CALL_END;
78} 84}
79 85
80static void 86static void
81read_uuid (void) 87read_uuid ()
82{ 88{
83 char filename[MAX_BUF]; 89 char filename[MAX_BUF];
84 90
85 sprintf (filename, "%s/uuid", settings.localdir); 91 sprintf (filename, "%s/uuid", settings.localdir);
86 92
100 106
101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 107 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
102 _exit (1); 108 _exit (1);
103 } 109 }
104 110
105 UUID::BUF buf; 111 char buf [UUID::MAX_LEN];
106 buf[0] = 0; 112 buf[0] = 0;
107 fgets (buf, sizeof (buf), fp); 113 fgets (buf, sizeof (buf), fp);
108 114
109 if (!UUID::cur.parse (buf)) 115 if (!UUID::cur.parse (buf))
110 { 116 {
137 143
138void 144void
139UUID::init () 145UUID::init ()
140{ 146{
141 read_uuid (); 147 read_uuid ();
148}
149
150bool
151UUID::parse (const char *s)
152{
153 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
154 return false;
155
156 seq = 0;
157
158 while (*s != '>')
159 {
160 if (*s < '0')
161 return false;
162
163 // this gives nice branchless code with gcc
164 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
165 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
166
167 seq = (seq << 4) | digit;
168
169 ++s;
170 }
171
172 return true;
173}
174
175char *
176UUID::append (char *buf) const
177{
178 *buf++ = '<';
179 *buf++ = '1';
180 *buf++ = '.';
181
182 uint64_t seq = this->seq;
183 const int bits = 64;
184 char nz = 0;
185 static const char tohex [] = "0123456789abcdef";
186
187 // assert (len >= 3 + bits / 4 + 1 + 1);
188 for (int i = bits / 4; --i; )
189 {
190 uint8_t digit = seq >> (bits - 4);
191
192 *buf = tohex [digit];
193 nz |= digit;
194 buf += nz ? 1 : 0;
195 seq <<= 4;
196 }
197
198 // last digit is special - always emit
199 uint8_t digit = seq >> (bits - 4);
200 *buf++ = tohex [digit];
201
202 *buf++ = '>';
203
204 return buf;
205}
206
207char *
208UUID::c_str () const
209{
210 static char buf [MAX_LEN];
211 *append (buf) = 0;
212 return buf;
142} 213}
143 214
144/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 215/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
145static bool 216static bool
146compare_ob_value_lists_one (const object *wants, const object *has) 217compare_ob_value_lists_one (const object *wants, const object *has)
182 * Improvements made with merge: Better checking on potion, and also 253 * Improvements made with merge: Better checking on potion, and also
183 * check weight 254 * check weight
184 */ 255 */
185bool object::can_merge_slow (object *ob1, object *ob2) 256bool object::can_merge_slow (object *ob1, object *ob2)
186{ 257{
187 /* A couple quicksanity checks */ 258 /* A couple quick sanity checks */
188 if (ob1 == ob2 259 if (ob1 == ob2
189 || ob1->type != ob2->type 260 || ob1->type != ob2->type
190 || ob1->speed != ob2->speed
191 || ob1->value != ob2->value 261 || ob1->value != ob2->value
192 || ob1->name != ob2->name) 262 || ob1->name != ob2->name
263 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
193 return 0; 264 return 0;
194 265
195 /* Do not merge objects if nrof would overflow, assume nrof 266 /* Do not merge objects if nrof would overflow, assume nrof
196 * is always 0 .. 2**31-1 */ 267 * is always 0 .. 2**31-1 */
197 if (ob1->nrof > 0x7fffffff - ob2->nrof) 268 if (ob1->nrof > 0x7fffffff - ob2->nrof)
201 * This is to the comparison of the flags below will be OK. We 272 * This is to the comparison of the flags below will be OK. We
202 * just can't ignore the been applied or identified flags, as they 273 * just can't ignore the been applied or identified flags, as they
203 * are not equal - just if it has been identified, the been_applied 274 * are not equal - just if it has been identified, the been_applied
204 * flags lose any meaning. 275 * flags lose any meaning.
205 */ 276 */
206 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 277 if (ob1->flag [FLAG_IDENTIFIED])
207 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 278 ob1->set_flag (FLAG_BEEN_APPLIED);
208 279
209 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 280 if (ob2->flag [FLAG_IDENTIFIED])
210 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 281 ob2->set_flag (FLAG_BEEN_APPLIED);
211 282
212 if (ob1->arch->archname != ob2->arch->archname 283 if (ob1->arch->archname != ob2->arch->archname
213 || ob1->name != ob2->name 284 || ob1->name != ob2->name
214 || ob1->title != ob2->title 285 || ob1->title != ob2->title
215 || ob1->msg != ob2->msg 286 || ob1->msg != ob2->msg
218 || ob1->magic != ob2->magic 289 || ob1->magic != ob2->magic
219 || ob1->slaying != ob2->slaying 290 || ob1->slaying != ob2->slaying
220 || ob1->skill != ob2->skill 291 || ob1->skill != ob2->skill
221 || ob1->value != ob2->value 292 || ob1->value != ob2->value
222 || ob1->animation_id != ob2->animation_id 293 || ob1->animation_id != ob2->animation_id
223 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 294 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
224 || ob1->client_type != ob2->client_type 295 || ob1->client_type != ob2->client_type
225 || ob1->materialname != ob2->materialname 296 || ob1->material != ob2->material
226 || ob1->lore != ob2->lore 297 || ob1->lore != ob2->lore
227 || ob1->subtype != ob2->subtype 298 || ob1->subtype != ob2->subtype
228 || ob1->move_type != ob2->move_type 299 || ob1->move_type != ob2->move_type
229 || ob1->move_block != ob2->move_block 300 || ob1->move_block != ob2->move_block
230 || ob1->move_allow != ob2->move_allow 301 || ob1->move_allow != ob2->move_allow
231 || ob1->move_on != ob2->move_on 302 || ob1->move_on != ob2->move_on
232 || ob1->move_off != ob2->move_off 303 || ob1->move_off != ob2->move_off
233 || ob1->move_slow != ob2->move_slow 304 || ob1->move_slow != ob2->move_slow
234 || ob1->move_slow_penalty != ob2->move_slow_penalty 305 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
235 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 306 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
236 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 307 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
237 return 0; 308 return 0;
238 309
239 if ((ob1->flag ^ ob2->flag) 310 if ((ob1->flag ^ ob2->flag)
264 335
265 /* Don't merge objects that are applied. With the new 'body' code, 336 /* Don't merge objects that are applied. With the new 'body' code,
266 * it is possible for most any character to have more than one of 337 * it is possible for most any character to have more than one of
267 * some items equipped, and we don't want those to merge. 338 * some items equipped, and we don't want those to merge.
268 */ 339 */
269 if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) 340 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
270 return 0; 341 return 0;
271 342
272 /* Note sure why the following is the case - either the object has to 343 /* Note sure why the following is the case - either the object has to
273 * be animated or have a very low speed. Is this an attempted monster 344 * be animated or have a very low speed. Is this an attempted monster
274 * check? 345 * check?
275 */ 346 */
276 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) 347 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
277 return 0; 348 return 0;
278 349
279 switch (ob1->type) 350 switch (ob1->type)
280 { 351 {
281 case SCROLL: 352 case SCROLL:
412 483
413 sum = weight_adjust_for (this, sum); 484 sum = weight_adjust_for (this, sum);
414 485
415 if (sum != carrying) 486 if (sum != carrying)
416 { 487 {
488 if (carrying != sum)//D
489 LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
490 (long long)sum, (long long)carrying, debug_desc ());
491
417 carrying = sum; 492 carrying = sum;
418 493
419 if (object *pl = visible_to ()) 494 if (object *pl = visible_to ())
420 if (pl != this) // player is handled lazily 495 if (pl != this) // player is handled lazily
421 esrv_update_item (UPD_WEIGHT, pl, this); 496 esrv_update_item (UPD_WEIGHT, pl, this);
441{ 516{
442 return dump_object (this); 517 return dump_object (this);
443} 518}
444 519
445/* 520/*
446 * get_nearest_part(multi-object, object 2) returns the part of the
447 * multi-object 1 which is closest to the second object.
448 * If it's not a multi-object, it is returned.
449 */
450object *
451get_nearest_part (object *op, const object *pl)
452{
453 object *tmp, *closest;
454 int last_dist, i;
455
456 if (!op->more)
457 return op;
458
459 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
460 tmp;
461 tmp = tmp->more)
462 if ((i = distance (tmp, pl)) < last_dist)
463 closest = tmp, last_dist = i;
464
465 return closest;
466}
467
468/*
469 * Returns the object which has the count-variable equal to the argument. 521 * Returns the object which has the count-variable equal to the argument.
470 * VERRRY slow. 522 * VERRRY slow.
471 */ 523 */
472object * 524object *
473find_object (tag_t i) 525find_object (tag_t i)
474{ 526{
475 for_all_objects (op) 527 for_all_objects (op)
476 if (op->count == i) 528 if (op->count == i)
529 return op;
530
531 return 0;
532}
533
534/*
535 * Returns the object which has the uuid equal to the argument.
536 * MOAR VERRRY slow.
537 */
538
539object *
540find_object_uuid (UUID i)
541{
542 for_all_objects (op)
543 if (op->uuid == i)
477 return op; 544 return op;
478 545
479 return 0; 546 return 0;
480} 547}
481 548
515 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); 582 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
516 return; 583 return;
517 } 584 }
518 585
519 this->owner = owner; 586 this->owner = owner;
520}
521
522int
523object::slottype () const
524{
525 if (type == SKILL)
526 {
527 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
528 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
529 }
530 else
531 {
532 if (slot [body_combat].info) return slot_combat;
533 if (slot [body_range ].info) return slot_ranged;
534 }
535
536 return slot_none;
537}
538
539bool
540object::change_weapon (object *ob)
541{
542 if (current_weapon == ob)
543 return true;
544
545 if (chosen_skill)
546 chosen_skill->flag [FLAG_APPLIED] = false;
547
548 current_weapon = ob;
549 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
550
551 if (chosen_skill)
552 chosen_skill->flag [FLAG_APPLIED] = true;
553
554 update_stats ();
555
556 if (ob)
557 {
558 // now check wether any body locations became invalid, in which case
559 // we cannot apply the weapon at the moment.
560 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
561 if (slot[i].used < 0)
562 {
563 current_weapon = chosen_skill = 0;
564 update_stats ();
565
566 new_draw_info_format (NDI_UNIQUE, 0, this,
567 "You try to balance all your items at once, "
568 "but the %s is just too much for your body. "
569 "[You need to unapply some items first - use the 'body' command to see "
570 "how many items you cna wera on a specific body part.]", &ob->name);
571 return false;
572 }
573
574 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
575 }
576 else
577 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
578
579 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
580 {
581 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
582 &name, ob->debug_desc ());
583 return false;
584 }
585
586 return true;
587} 587}
588 588
589/* Zero the key_values on op, decrementing the shared-string 589/* Zero the key_values on op, decrementing the shared-string
590 * refcounts and freeing the links. 590 * refcounts and freeing the links.
591 */ 591 */
644 tail = new_link; 644 tail = new_link;
645 } 645 }
646 } 646 }
647 } 647 }
648 648
649 if (speed < 0)
650 dst->speed_left -= rndm ();
651
652 dst->activate (); 649 dst->activate ();
653} 650}
654 651
655void 652void
656object::instantiate () 653object::instantiate ()
657{ 654{
658 if (!uuid.seq) // HACK 655 if (!uuid.seq) // HACK
659 uuid = UUID::gen (); 656 uuid = UUID::gen ();
660 657
658 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
659 if (flag [FLAG_RANDOM_SPEED] && speed)
660 speed_left = - speed - rndm (); // TODO animation
661 else
661 speed_left = -0.1f; 662 speed_left = -1.;
663
662 /* copy the body_info to the body_used - this is only really 664 /* copy the body_info to the body_used - this is only really
663 * need for monsters, but doesn't hurt to do it for everything. 665 * need for monsters, but doesn't hurt to do it for everything.
664 * by doing so, when a monster is created, it has good starting 666 * by doing so, when a monster is created, it has good starting
665 * values for the body_used info, so when items are created 667 * values for the body_used info, so when items are created
666 * for it, they can be properly equipped. 668 * for it, they can be properly equipped.
674object * 676object *
675object::clone () 677object::clone ()
676{ 678{
677 object *neu = create (); 679 object *neu = create ();
678 copy_to (neu); 680 copy_to (neu);
681
682 // TODO: unclean state changes, should not be done in clone AND instantiate
683 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
684 neu->speed_left = - neu->speed - rndm (); // TODO animation
685
679 neu->map = map; // not copied by copy_to 686 neu->map = map; // not copied by copy_to
680 return neu; 687 return neu;
681} 688}
682 689
683/* 690/*
686 * be called to update the face variable, _and_ how it looks on the map. 693 * be called to update the face variable, _and_ how it looks on the map.
687 */ 694 */
688void 695void
689update_turn_face (object *op) 696update_turn_face (object *op)
690{ 697{
691 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) 698 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
692 return; 699 return;
693 700
694 SET_ANIMATION (op, op->direction); 701 SET_ANIMATION (op, op->direction);
695 update_object (op, UP_OBJ_FACE); 702 update_object (op, UP_OBJ_FACE);
696} 703}
701 * This function needs to be called whenever the speed of an object changes. 708 * This function needs to be called whenever the speed of an object changes.
702 */ 709 */
703void 710void
704object::set_speed (float speed) 711object::set_speed (float speed)
705{ 712{
706 if (flag [FLAG_FREED] && speed)
707 {
708 LOG (llevError, "Object %s is freed but has speed.\n", &name);
709 speed = 0;
710 }
711
712 this->speed = speed; 713 this->speed = speed;
713 714
714 if (has_active_speed ()) 715 if (has_active_speed ())
715 activate (); 716 activate ();
716 else 717 else
766 767
767 if (!(m.flags_ & P_UPTODATE)) 768 if (!(m.flags_ & P_UPTODATE))
768 /* nop */; 769 /* nop */;
769 else if (action == UP_OBJ_INSERT) 770 else if (action == UP_OBJ_INSERT)
770 { 771 {
772#if 0
771 // this is likely overkill, TODO: revisit (schmorp) 773 // this is likely overkill, TODO: revisit (schmorp)
772 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 774 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
773 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 775 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
774 || (op->is_player () && !(m.flags_ & P_PLAYER)) 776 || (op->is_player () && !(m.flags_ & P_PLAYER))
775 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 777 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
776 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 778 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
777 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 779 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
778 || (m.move_on | op->move_on ) != m.move_on 780 || (m.move_on | op->move_on ) != m.move_on
779 || (m.move_off | op->move_off ) != m.move_off 781 || (m.move_off | op->move_off ) != m.move_off
780 || (m.move_slow | op->move_slow) != m.move_slow 782 || (m.move_slow | op->move_slow) != m.move_slow
781 /* This isn't perfect, but I don't expect a lot of objects to 783 /* This isn't perfect, but I don't expect a lot of objects to
782 * have move_allow right now. 784 * have move_allow right now.
783 */ 785 */
784 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 786 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
785 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
786 m.invalidate (); 787 m.invalidate ();
788#else
789 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
790 m.invalidate ();
791#endif
787 } 792 }
788 /* if the object is being removed, we can't make intelligent 793 /* if the object is being removed, we can't make intelligent
789 * decisions, because remove_ob can't really pass the object 794 * decisions, because remove_ob can't really pass the object
790 * that is being removed. 795 * that is being removed.
791 */ 796 */
800 update_object (op->more, action); 805 update_object (op->more, action);
801} 806}
802 807
803object::object () 808object::object ()
804{ 809{
805 SET_FLAG (this, FLAG_REMOVED); 810 this->set_flag (FLAG_REMOVED);
806 811
807 //expmul = 1.0; declared const for the time being 812 //expmul = 1.0; declared const for the time being
808 face = blank_face; 813 face = blank_face;
814 material = MATERIAL_NULL;
809} 815}
810 816
811object::~object () 817object::~object ()
812{ 818{
813 unlink (); 819 unlink ();
814 820
815 free_key_values (this); 821 free_key_values (this);
816} 822}
817
818static int object_count;
819 823
820void object::link () 824void object::link ()
821{ 825{
822 assert (!index);//D 826 assert (!index);//D
823 uuid = UUID::gen (); 827 uuid = UUID::gen ();
824 count = ++object_count;
825 828
826 refcnt_inc (); 829 refcnt_inc ();
827 objects.insert (this); 830 objects.insert (this);
831
832 ++create_count;
833
828} 834}
829 835
830void object::unlink () 836void object::unlink ()
831{ 837{
832 if (!index) 838 if (!index)
833 return; 839 return;
840
841 ++destroy_count;
834 842
835 objects.erase (this); 843 objects.erase (this);
836 refcnt_dec (); 844 refcnt_dec ();
837} 845}
838 846
943 map->insert (op, x, y); 951 map->insert (op, x, y);
944 } 952 }
945 } 953 }
946} 954}
947 955
956/*
957 * Remove and free all objects in the inventory of the given object.
958 * Unlike destroy_inv, this assumes the *this is destroyed as well
959 * well, so we can (and have to!) take shortcuts.
960 */
961void
962object::destroy_inv_fast ()
963{
964 while (object *op = inv)
965 {
966 // remove from object the fast way
967 op->flag [FLAG_REMOVED] = true;
968 op->env = 0;
969 if ((inv = inv->below))
970 inv->above = 0;
971
972 // then destroy
973 op->destroy ();
974 }
975}
976
977void
978object::freelist_free (int count)
979{
980 while (count-- && freelist)
981 {
982 freelist_item *next = freelist->next;
983 // count is being "destroyed"
984
985 sfree ((char *)freelist, sizeof (object));
986
987 freelist = next;
988 --free_count;
989 }
990}
991
992object *
948object *object::create () 993object::create ()
949{ 994{
950 object *op = new object; 995 object *op;
996
997 if (freelist)
998 {
999 freelist_item li = *freelist;
1000 memset (freelist, 0, sizeof (object));
1001
1002 op = new (freelist) object;
1003 op->count = li.count;
1004
1005 freelist = li.next;
1006 --free_count;
1007 }
1008 else
1009 {
1010 void *ni = salloc0<char> (sizeof (object));
1011
1012 op = new(ni) object;
1013
1014 op->count = ++object_count;
1015 }
1016
951 op->link (); 1017 op->link ();
1018
952 return op; 1019 return op;
1020}
1021
1022void
1023object::do_delete ()
1024{
1025 uint32_t count = this->count;
1026
1027 this->~object ();
1028
1029 freelist_item *li = (freelist_item *)this;
1030 li->next = freelist;
1031 li->count = count;
1032
1033 freelist = li;
1034 ++free_count;
953} 1035}
954 1036
955static struct freed_map : maptile 1037static struct freed_map : maptile
956{ 1038{
957 freed_map () 1039 freed_map ()
1022 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1104 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1023 head->destroy (); 1105 head->destroy ();
1024 return; 1106 return;
1025 } 1107 }
1026 1108
1027 destroy_inv (false); 1109 destroy_inv_fast ();
1028 1110
1029 if (is_head ()) 1111 if (is_head ())
1030 if (sound_destroy) 1112 if (sound_destroy)
1031 play_sound (sound_destroy); 1113 play_sound (sound_destroy);
1032 else if (flag [FLAG_MONSTER]) 1114 else if (flag [FLAG_MONSTER])
1084 1166
1085 above = 0; 1167 above = 0;
1086 below = 0; 1168 below = 0;
1087 env = 0; 1169 env = 0;
1088 1170
1089 /* NO_FIX_PLAYER is set when a great many changes are being 1171 if (pl && pl->is_player ())
1090 * made to players inventory. If set, avoiding the call
1091 * to save cpu time.
1092 */ 1172 {
1093 if (pl) 1173 if (expect_false (pl->contr->combat_ob == this))
1094 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1095 { 1174 {
1096 pl->update_stats (); 1175 pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
1176 pl->contr->combat_ob = 0;
1177 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1178 }
1097 1179
1180 if (expect_false (pl->contr->ranged_ob == this))
1181 {
1182 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
1183 pl->contr->ranged_ob = 0;
1184 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1185 }
1186
1187 pl->contr->queue_stats_update ();
1188
1098 if (glow_radius && pl->is_on_map ()) 1189 if (expect_false (glow_radius) && pl->is_on_map ())
1099 update_all_los (pl->map, pl->x, pl->y); 1190 update_all_los (pl->map, pl->x, pl->y);
1100 } 1191 }
1101 } 1192 }
1102 else if (map) 1193 else if (map)
1103 { 1194 {
1104 map->dirty = true; 1195 map->dirty = true;
1105 mapspace &ms = this->ms (); 1196 mapspace &ms = this->ms ();
1123 else if (pl->container_ () == this) 1214 else if (pl->container_ () == this)
1124 { 1215 {
1125 // removing a container should close it 1216 // removing a container should close it
1126 close_container (); 1217 close_container ();
1127 } 1218 }
1128 1219 else
1129 esrv_del_item (pl->contr, count); 1220 esrv_del_item (pl->contr, count);
1130 } 1221 }
1131 1222
1132 /* link the object above us */ 1223 /* link the object above us */
1133 // re-link, make sure compiler can easily use cmove 1224 // re-link, make sure compiler can easily use cmove
1134 *(above ? &above->below : &ms.top) = below; 1225 *(above ? &above->below : &ms.top) = below;
1225 1316
1226 object *prev = this; 1317 object *prev = this;
1227 1318
1228 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1319 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1229 { 1320 {
1230 object *op = arch_to_object (at); 1321 object *op = at->instance ();
1231 1322
1232 op->name = name; 1323 op->name = name;
1233 op->name_pl = name_pl; 1324 op->name_pl = name_pl;
1234 op->title = title; 1325 op->title = title;
1235 1326
1273 * Passing 0 for flag gives proper default values, so flag really only needs 1364 * Passing 0 for flag gives proper default values, so flag really only needs
1274 * to be set if special handling is needed. 1365 * to be set if special handling is needed.
1275 * 1366 *
1276 * Return value: 1367 * Return value:
1277 * new object if 'op' was merged with other object 1368 * new object if 'op' was merged with other object
1278 * NULL if 'op' was destroyed 1369 * NULL if there was an error (destroyed, blocked etc.)
1279 * just 'op' otherwise 1370 * just 'op' otherwise
1280 */ 1371 */
1281object * 1372object *
1282insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1373insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1283{ 1374{
1320 // from here :/ 1411 // from here :/
1321 op->nrof += tmp->nrof; 1412 op->nrof += tmp->nrof;
1322 tmp->destroy (); 1413 tmp->destroy ();
1323 } 1414 }
1324 1415
1325 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1416 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1326 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1417 op->clr_flag (FLAG_INV_LOCKED);
1327 1418
1328 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1419 if (!op->flag [FLAG_ALIVE])
1329 CLEAR_FLAG (op, FLAG_NO_STEAL); 1420 op->clr_flag (FLAG_NO_STEAL);
1330 1421
1331 if (flag & INS_BELOW_ORIGINATOR) 1422 if (flag & INS_BELOW_ORIGINATOR)
1332 { 1423 {
1333 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1424 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1334 { 1425 {
1369 * when lots of spells are cast in one area. Currently, it is presumed 1460 * when lots of spells are cast in one area. Currently, it is presumed
1370 * that flying non pickable objects are spell objects. 1461 * that flying non pickable objects are spell objects.
1371 */ 1462 */
1372 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1463 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1373 { 1464 {
1374 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) 1465 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1375 floor = tmp; 1466 floor = tmp;
1376 1467
1377 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1468 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1378 { 1469 {
1379 /* We insert above top, so we want this object below this */ 1470 /* We insert above top, so we want this object below this */
1380 top = tmp->below; 1471 top = tmp->below;
1381 break; 1472 break;
1382 } 1473 }
1400 && (op->face && !faces [op->face].visibility)) 1491 && (op->face && !faces [op->face].visibility))
1401 { 1492 {
1402 object *last; 1493 object *last;
1403 1494
1404 for (last = top; last != floor; last = last->below) 1495 for (last = top; last != floor; last = last->below)
1405 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1496 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1406 break; 1497 break;
1407 1498
1408 /* Check to see if we found the object that blocks view, 1499 /* Check to see if we found the object that blocks view,
1409 * and make sure we have a below pointer for it so that 1500 * and make sure we have a below pointer for it so that
1410 * we can get inserted below this one, which requires we 1501 * we can get inserted below this one, which requires we
1510 1601
1511 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1602 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1512 if (tmp->arch->archname == archname) /* same archetype */ 1603 if (tmp->arch->archname == archname) /* same archetype */
1513 tmp->destroy (); 1604 tmp->destroy ();
1514 1605
1515 object *tmp = arch_to_object (archetype::find (archname)); 1606 object *tmp = archetype::find (archname)->instance ();
1516 1607
1517 tmp->x = op->x; 1608 tmp->x = op->x;
1518 tmp->y = op->y; 1609 tmp->y = op->y;
1519 1610
1520 insert_ob_in_map (tmp, op->map, op, 0); 1611 insert_ob_in_map (tmp, op->map, op, 0);
1525{ 1616{
1526 if (where->env) 1617 if (where->env)
1527 return where->env->insert (this); 1618 return where->env->insert (this);
1528 else 1619 else
1529 return where->map->insert (this, where->x, where->y, originator, flags); 1620 return where->map->insert (this, where->x, where->y, originator, flags);
1621}
1622
1623// check whether we can put this into the map, respect max_volume, max_items
1624bool
1625object::can_drop_at (maptile *m, int x, int y, object *originator)
1626{
1627 mapspace &ms = m->at (x, y);
1628
1629 int items = ms.items ();
1630
1631 if (!items // testing !items ensures we can drop at least one item
1632 || (items < m->max_items
1633 && ms.volume () < m->max_volume))
1634 return true;
1635
1636 if (originator && originator->is_player ())
1637 originator->contr->failmsgf (
1638 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1639 query_name ()
1640 );
1641
1642 return false;
1530} 1643}
1531 1644
1532/* 1645/*
1533 * decrease(object, number) decreases a specified number from 1646 * decrease(object, number) decreases a specified number from
1534 * the amount of an object. If the amount reaches 0, the object 1647 * the amount of an object. If the amount reaches 0, the object
1674 if (op->glow_radius && is_on_map ()) 1787 if (op->glow_radius && is_on_map ())
1675 { 1788 {
1676 update_stats (); 1789 update_stats ();
1677 update_all_los (map, x, y); 1790 update_all_los (map, x, y);
1678 } 1791 }
1679 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1792 else if (is_player ())
1680 // if this is a player's inventory, update stats 1793 // if this is a player's inventory, update stats
1681 update_stats (); 1794 contr->queue_stats_update ();
1682 1795
1683 INVOKE_OBJECT (INSERT, this); 1796 INVOKE_OBJECT (INSERT, this);
1684 1797
1685 return op; 1798 return op;
1686} 1799}
1706 * on top. 1819 * on top.
1707 */ 1820 */
1708int 1821int
1709check_move_on (object *op, object *originator) 1822check_move_on (object *op, object *originator)
1710{ 1823{
1711 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1824 if (op->flag [FLAG_NO_APPLY])
1712 return 0; 1825 return 0;
1713 1826
1714 object *tmp; 1827 object *tmp;
1715 maptile *m = op->map; 1828 maptile *m = op->map;
1716 int x = op->x, y = op->y; 1829 int x = op->x, y = op->y;
1753 * Second check makes sure that the movement types not being slowed 1866 * Second check makes sure that the movement types not being slowed
1754 * (~slow_move) is not blocked on this space - just because the 1867 * (~slow_move) is not blocked on this space - just because the
1755 * space doesn't slow down swimming (for example), if you can't actually 1868 * space doesn't slow down swimming (for example), if you can't actually
1756 * swim on that space, can't use it to avoid the penalty. 1869 * swim on that space, can't use it to avoid the penalty.
1757 */ 1870 */
1758 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1871 if (!op->flag [FLAG_WIZPASS])
1759 { 1872 {
1760 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1873 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1761 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1874 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1762 { 1875 {
1763 float diff = tmp->move_slow_penalty * fabs (op->speed); 1876 float diff = tmp->move_slow_penalty * fabs (op->speed);
1894void 2007void
1895flag_inv (object *op, int flag) 2008flag_inv (object *op, int flag)
1896{ 2009{
1897 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2010 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1898 { 2011 {
1899 SET_FLAG (tmp, flag); 2012 tmp->set_flag (flag);
1900 flag_inv (tmp, flag); 2013 flag_inv (tmp, flag);
1901 } 2014 }
1902} 2015}
1903 2016
1904/* 2017/*
1907void 2020void
1908unflag_inv (object *op, int flag) 2021unflag_inv (object *op, int flag)
1909{ 2022{
1910 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2023 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1911 { 2024 {
1912 CLEAR_FLAG (tmp, flag); 2025 tmp->clr_flag (flag);
1913 unflag_inv (tmp, flag); 2026 unflag_inv (tmp, flag);
1914 } 2027 }
1915} 2028}
1916 2029
1917/* 2030/*
2173 * This basically means that if direction is 15, then it could either go 2286 * This basically means that if direction is 15, then it could either go
2174 * direction 4, 14, or 16 to get back to where we are. 2287 * direction 4, 14, or 16 to get back to where we are.
2175 * Moved from spell_util.c to object.c with the other related direction 2288 * Moved from spell_util.c to object.c with the other related direction
2176 * functions. 2289 * functions.
2177 */ 2290 */
2178const int reduction_dir[SIZEOFFREE][3] = { 2291static const int reduction_dir[SIZEOFFREE][3] = {
2179 {0, 0, 0}, /* 0 */ 2292 {0, 0, 0}, /* 0 */
2180 {0, 0, 0}, /* 1 */ 2293 {0, 0, 0}, /* 1 */
2181 {0, 0, 0}, /* 2 */ 2294 {0, 0, 0}, /* 2 */
2182 {0, 0, 0}, /* 3 */ 2295 {0, 0, 0}, /* 3 */
2183 {0, 0, 0}, /* 4 */ 2296 {0, 0, 0}, /* 4 */
2277 * Add a check so we can't pick up invisible objects (0.93.8) 2390 * Add a check so we can't pick up invisible objects (0.93.8)
2278 */ 2391 */
2279int 2392int
2280can_pick (const object *who, const object *item) 2393can_pick (const object *who, const object *item)
2281{ 2394{
2282 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2395 return /*who->flag [FLAG_WIZ]|| */
2283 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2396 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2284 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2397 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2285} 2398}
2286 2399
2287/* 2400/*
2288 * create clone from object to another 2401 * create clone from object to another
2289 */ 2402 */
2454{ 2567{
2455 return map ? map->region (x, y) 2568 return map ? map->region (x, y)
2456 : region::default_region (); 2569 : region::default_region ();
2457} 2570}
2458 2571
2459const materialtype_t *
2460object::dominant_material () const
2461{
2462 if (materialtype_t *mt = name_to_material (materialname))
2463 return mt;
2464
2465 return name_to_material (shstr_unknown);
2466}
2467
2468void 2572void
2469object::open_container (object *new_container) 2573object::open_container (object *new_container)
2470{ 2574{
2471 if (container == new_container) 2575 if (container == new_container)
2472 return; 2576 return;
2506 // TODO: this does not seem to serve any purpose anymore? 2610 // TODO: this does not seem to serve any purpose anymore?
2507#if 0 2611#if 0
2508 // insert the "Close Container" object. 2612 // insert the "Close Container" object.
2509 if (archetype *closer = new_container->other_arch) 2613 if (archetype *closer = new_container->other_arch)
2510 { 2614 {
2511 object *closer = arch_to_object (new_container->other_arch); 2615 object *closer = new_container->other_arch->instance ();
2512 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2616 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2513 new_container->insert (closer); 2617 new_container->insert (closer);
2514 } 2618 }
2515#endif 2619#endif
2516 2620
2622 2726
2623 insert (force); 2727 insert (force);
2624 } 2728 }
2625} 2729}
2626 2730
2731void object::change_move_type (MoveType mt)
2732{
2733 if (move_type == mt)
2734 return;
2735
2736 if (is_on_map ())
2737 {
2738 // we are on the map, so handle move_on/off effects
2739 remove ();
2740 move_type = mt;
2741 map->insert (this, x, y, this);
2742 }
2743 else
2744 move_type = mt;
2745}
2746
2747/* object should be a player.
2748 * we return the object the player has marked with the 'mark' command
2749 * below. If no match is found (or object has changed), we return
2750 * NULL. We leave it up to the calling function to print messages if
2751 * nothing is found.
2752 */
2753object *
2754object::mark () const
2755{
2756 if (contr && contr->mark && contr->mark->env == this)
2757 return contr->mark;
2758 else
2759 return 0;
2760}
2761

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines