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.298 by root, Sun Nov 8 00:01:33 2009 UTC vs.
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 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,2011 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,
66 9, 10, 13, 14, 17, 18, 21, 22, 71 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, 72 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 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
69}; 74};
70 75
76const char *wall_suffix[16] = {
77 "0",
78 "1_3",
79 "1_4",
80 "2_1_2",
81 "1_2",
82 "2_2_4",
83 "2_2_1",
84 "3_1",
85 "1_1",
86 "2_2_3",
87 "2_2_2",
88 "3_3",
89 "2_1_1",
90 "3_4",
91 "3_2",
92 "4"
93};
94
71static void 95static void
72write_uuid (uval64 skip, bool sync) 96write_uuid (uval64 skip, bool sync)
73{ 97{
74 CALL_BEGIN (2); 98 CALL_BEGIN (2);
75 CALL_ARG_SV (newSVval64 (skip)); 99 CALL_ARG_SV (newSVval64 (skip));
77 CALL_CALL ("cf::write_uuid", G_DISCARD); 101 CALL_CALL ("cf::write_uuid", G_DISCARD);
78 CALL_END; 102 CALL_END;
79} 103}
80 104
81static void 105static void
82read_uuid (void) 106read_uuid ()
83{ 107{
84 char filename[MAX_BUF]; 108 char filename[MAX_BUF];
85 109
86 sprintf (filename, "%s/uuid", settings.localdir); 110 sprintf (filename, "%s/uuid", settings.localdir);
87 111
101 125
102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 126 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
103 _exit (1); 127 _exit (1);
104 } 128 }
105 129
106 UUID::BUF buf; 130 char buf [UUID::MAX_LEN];
107 buf[0] = 0; 131 buf[0] = 0;
108 fgets (buf, sizeof (buf), fp); 132 fgets (buf, sizeof (buf), fp);
109 133
110 if (!UUID::cur.parse (buf)) 134 if (!UUID::cur.parse (buf))
111 { 135 {
138 162
139void 163void
140UUID::init () 164UUID::init ()
141{ 165{
142 read_uuid (); 166 read_uuid ();
167}
168
169bool
170UUID::parse (const char *s)
171{
172 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
173 return false;
174
175 seq = 0;
176
177 while (*s != '>')
178 {
179 if (*s < '0')
180 return false;
181
182 // this gives nice branchless code with gcc
183 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
184 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
185
186 seq = (seq << 4) | digit;
187
188 ++s;
189 }
190
191 return true;
192}
193
194char *
195UUID::append (char *buf) const
196{
197 *buf++ = '<';
198 *buf++ = '1';
199 *buf++ = '.';
200
201 uint64_t seq = this->seq;
202 const int bits = 64;
203 char nz = 0;
204 static const char tohex [] = "0123456789abcdef";
205
206 // assert (len >= 3 + bits / 4 + 1 + 1);
207 for (int i = bits / 4; --i; )
208 {
209 uint8_t digit = seq >> (bits - 4);
210
211 *buf = tohex [digit];
212 nz |= digit;
213 buf += nz ? 1 : 0;
214 seq <<= 4;
215 }
216
217 // last digit is special - always emit
218 uint8_t digit = seq >> (bits - 4);
219 *buf++ = tohex [digit];
220
221 *buf++ = '>';
222
223 return buf;
224}
225
226char *
227UUID::c_str () const
228{
229 static char buf [MAX_LEN];
230 *append (buf) = 0;
231 return buf;
143} 232}
144 233
145/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 234/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
146static bool 235static bool
147compare_ob_value_lists_one (const object *wants, const object *has) 236compare_ob_value_lists_one (const object *wants, const object *has)
183 * Improvements made with merge: Better checking on potion, and also 272 * Improvements made with merge: Better checking on potion, and also
184 * check weight 273 * check weight
185 */ 274 */
186bool object::can_merge_slow (object *ob1, object *ob2) 275bool object::can_merge_slow (object *ob1, object *ob2)
187{ 276{
188 /* A couple quicksanity checks */ 277 /* A couple quick sanity checks */
189 if (ob1 == ob2 278 if (ob1 == ob2
190 || ob1->type != ob2->type 279 || ob1->type != ob2->type
280 || ob1->value != ob2->value
281 || ob1->name != ob2->name
282 || ob1->custom_name != ob2->custom_name
191 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED 283 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
192 || ob1->value != ob2->value
193 || ob1->name != ob2->name)
194 return 0; 284 return 0;
195 285
196 /* Do not merge objects if nrof would overflow, assume nrof 286 /* Do not merge objects if nrof would overflow, assume nrof
197 * is always 0 .. 2**31-1 */ 287 * is always 0 .. 2**31-1 */
198 if (ob1->nrof > 0x7fffffff - ob2->nrof) 288 if (ob1->nrof > 0x7fffffff - ob2->nrof)
202 * This is to the comparison of the flags below will be OK. We 292 * This is to the comparison of the flags below will be OK. We
203 * just can't ignore the been applied or identified flags, as they 293 * just can't ignore the been applied or identified flags, as they
204 * are not equal - just if it has been identified, the been_applied 294 * are not equal - just if it has been identified, the been_applied
205 * flags lose any meaning. 295 * flags lose any meaning.
206 */ 296 */
207 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 297 if (ob1->flag [FLAG_IDENTIFIED])
208 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 298 ob1->set_flag (FLAG_BEEN_APPLIED);
209 299
210 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 300 if (ob2->flag [FLAG_IDENTIFIED])
211 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 301 ob2->set_flag (FLAG_BEEN_APPLIED);
212 302
213 if (ob1->arch->archname != ob2->arch->archname 303 if (ob1->arch->archname != ob2->arch->archname
214 || ob1->name != ob2->name 304 || ob1->name != ob2->name
215 || ob1->title != ob2->title 305 || ob1->title != ob2->title
216 || ob1->msg != ob2->msg 306 || ob1->msg != ob2->msg
219 || ob1->magic != ob2->magic 309 || ob1->magic != ob2->magic
220 || ob1->slaying != ob2->slaying 310 || ob1->slaying != ob2->slaying
221 || ob1->skill != ob2->skill 311 || ob1->skill != ob2->skill
222 || ob1->value != ob2->value 312 || ob1->value != ob2->value
223 || ob1->animation_id != ob2->animation_id 313 || ob1->animation_id != ob2->animation_id
224 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 314 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
225 || ob1->client_type != ob2->client_type 315 || ob1->client_type != ob2->client_type
226 || ob1->materialname != ob2->materialname 316 || ob1->material != ob2->material
227 || ob1->lore != ob2->lore 317 || ob1->lore != ob2->lore
228 || ob1->subtype != ob2->subtype 318 || ob1->subtype != ob2->subtype
229 || ob1->move_type != ob2->move_type 319 || ob1->move_type != ob2->move_type
230 || ob1->move_block != ob2->move_block 320 || ob1->move_block != ob2->move_block
231 || ob1->move_allow != ob2->move_allow 321 || ob1->move_allow != ob2->move_allow
265 355
266 /* Don't merge objects that are applied. With the new 'body' code, 356 /* Don't merge objects that are applied. With the new 'body' code,
267 * it is possible for most any character to have more than one of 357 * it is possible for most any character to have more than one of
268 * some items equipped, and we don't want those to merge. 358 * some items equipped, and we don't want those to merge.
269 */ 359 */
270 if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) 360 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
271 return 0; 361 return 0;
272 362
273 /* Note sure why the following is the case - either the object has to 363 /* Note sure why the following is the case - either the object has to
274 * be animated or have a very low speed. Is this an attempted monster 364 * be animated or have a very low speed. Is this an attempted monster
275 * check? 365 * check?
276 */ 366 */
277 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) 367 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
278 return 0; 368 return 0;
279 369
280 switch (ob1->type) 370 switch (ob1->type)
281 { 371 {
282 case SCROLL: 372 case SCROLL:
356 446
357 return 0; 447 return 0;
358} 448}
359 449
360// adjust weight per container type ("of holding") 450// adjust weight per container type ("of holding")
361static sint32 451static uint32
362weight_adjust_for (object *op, sint32 weight) 452weight_adjust_for (object *op, uint32 weight)
363{ 453{
364 return op->type == CONTAINER 454 return op->type == CONTAINER
365 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 455 ? weight - weight * op->stats.Str / 100
366 : weight; 456 : weight;
367} 457}
368 458
369/* 459/*
370 * adjust_weight(object, weight) adds the specified weight to an object, 460 * subtracts, then adds, the specified weight to an object,
371 * and also updates how much the environment(s) is/are carrying. 461 * and also updates how much the environment(s) is/are carrying.
372 */ 462 */
373static void 463static void
374adjust_weight (object *op, sint32 weight) 464adjust_weight (object *op, sint32 sub, sint32 add)
375{ 465{
376 while (op) 466 while (op)
377 { 467 {
378 // adjust by actual difference to account for rounding errors 468 sint32 ocarrying = op->carrying;
379 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
380 weight = weight_adjust_for (op, op->carrying)
381 - weight_adjust_for (op, op->carrying - weight);
382 469
383 if (!weight) 470 op->carrying -= weight_adjust_for (op, sub);
384 return; 471 op->carrying += weight_adjust_for (op, add);
385
386 op->carrying += weight;
387 472
388 if (object *pl = op->visible_to ()) 473 if (object *pl = op->visible_to ())
389 if (pl != op) // player is handled lazily 474 if (pl != op) // player is handled lazily
390 esrv_update_item (UPD_WEIGHT, pl, op); 475 esrv_update_item (UPD_WEIGHT, pl, op);
391 476
477 sub = ocarrying;
478 add = op->carrying;
479
392 op = op->env; 480 op = op->env;
393 } 481 }
394} 482}
395 483
396/* 484/*
403{ 491{
404 sint32 sum = 0; 492 sint32 sum = 0;
405 493
406 for (object *op = inv; op; op = op->below) 494 for (object *op = inv; op; op = op->below)
407 { 495 {
408 if (op->inv)
409 op->update_weight (); 496 op->update_weight ();
410 497
411 sum += op->total_weight (); 498 sum += weight_adjust_for (this, op->total_weight ());
412 } 499 }
413
414 sum = weight_adjust_for (this, sum);
415 500
416 if (sum != carrying) 501 if (sum != carrying)
417 { 502 {
503 if (carrying != sum && carrying)//D
504 LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
505 (long long)sum, (long long)carrying, debug_desc ());
506
418 carrying = sum; 507 carrying = sum;
419 508
420 if (object *pl = visible_to ()) 509 if (object *pl = visible_to ())
421 if (pl != this) // player is handled lazily 510 if (pl != this) // player is handled lazily
422 esrv_update_item (UPD_WEIGHT, pl, this); 511 esrv_update_item (UPD_WEIGHT, pl, this);
450object * 539object *
451find_object (tag_t i) 540find_object (tag_t i)
452{ 541{
453 for_all_objects (op) 542 for_all_objects (op)
454 if (op->count == i) 543 if (op->count == i)
544 return op;
545
546 return 0;
547}
548
549/*
550 * Returns the object which has the uuid equal to the argument.
551 * MOAR VERRRY slow.
552 */
553
554object *
555find_object_uuid (UUID i)
556{
557 for_all_objects (op)
558 if (op->uuid == i)
455 return op; 559 return op;
456 560
457 return 0; 561 return 0;
458} 562}
459 563
493 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); 597 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
494 return; 598 return;
495 } 599 }
496 600
497 this->owner = owner; 601 this->owner = owner;
498}
499
500int
501object::slottype () const
502{
503 if (type == SKILL)
504 {
505 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
506 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
507 }
508 else
509 {
510 if (slot [body_combat].info) return slot_combat;
511 if (slot [body_range ].info) return slot_ranged;
512 }
513
514 return slot_none;
515}
516
517bool
518object::change_weapon (object *ob)
519{
520 if (current_weapon == ob)
521 return true;
522
523 if (chosen_skill)
524 chosen_skill->flag [FLAG_APPLIED] = false;
525
526 current_weapon = ob;
527 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
528
529 if (chosen_skill)
530 chosen_skill->flag [FLAG_APPLIED] = true;
531
532 update_stats ();
533
534 if (ob)
535 {
536 // now check wether any body locations became invalid, in which case
537 // we cannot apply the weapon at the moment.
538 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
539 if (slot[i].used < 0)
540 {
541 current_weapon = chosen_skill = 0;
542 update_stats ();
543
544 new_draw_info_format (NDI_UNIQUE, 0, this,
545 "You try to balance all your items at once, "
546 "but the %s is just too much for your body. "
547 "[You need to unapply some items first - use the 'body' command to see "
548 "how many items you cna wera on a specific body part.]", &ob->name);
549 return false;
550 }
551
552 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
553 }
554 else
555 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
556
557 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
558 {
559 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
560 &name, ob->debug_desc ());
561 return false;
562 }
563
564 return true;
565} 602}
566 603
567/* Zero the key_values on op, decrementing the shared-string 604/* Zero the key_values on op, decrementing the shared-string
568 * refcounts and freeing the links. 605 * refcounts and freeing the links.
569 */ 606 */
622 tail = new_link; 659 tail = new_link;
623 } 660 }
624 } 661 }
625 } 662 }
626 663
627 if (speed < 0)
628 dst->speed_left -= rndm ();
629
630 dst->activate (); 664 dst->activate ();
631} 665}
632 666
633void 667void
634object::instantiate () 668object::instantiate ()
635{ 669{
636 if (!uuid.seq) // HACK 670 if (!uuid.seq) // HACK
637 uuid = UUID::gen (); 671 uuid = UUID::gen ();
638 672
673 // TODO: unclean state changes, should not be done in copy_to AND instantiate
674 if (flag [FLAG_RANDOM_SPEED] && speed)
675 speed_left = - speed - rndm (); // TODO animation
676 else
639 speed_left = -0.1f; 677 speed_left = -1.;
678
640 /* copy the body_info to the body_used - this is only really 679 /* copy the body_info to the body_used - this is only really
641 * need for monsters, but doesn't hurt to do it for everything. 680 * need for monsters, but doesn't hurt to do it for everything.
642 * by doing so, when a monster is created, it has good starting 681 * by doing so, when a monster is created, it has good starting
643 * values for the body_used info, so when items are created 682 * values for the body_used info, so when items are created
644 * for it, they can be properly equipped. 683 * for it, they can be properly equipped.
652object * 691object *
653object::clone () 692object::clone ()
654{ 693{
655 object *neu = create (); 694 object *neu = create ();
656 copy_to (neu); 695 copy_to (neu);
696
697 // TODO: unclean state changes, should not be done in clone AND instantiate
698 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
699 neu->speed_left = - neu->speed - rndm (); // TODO animation
700
657 neu->map = map; // not copied by copy_to 701 neu->map = map; // not copied by copy_to
658 return neu; 702 return neu;
659} 703}
660 704
661/* 705/*
664 * be called to update the face variable, _and_ how it looks on the map. 708 * be called to update the face variable, _and_ how it looks on the map.
665 */ 709 */
666void 710void
667update_turn_face (object *op) 711update_turn_face (object *op)
668{ 712{
669 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) 713 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
670 return; 714 return;
671 715
672 SET_ANIMATION (op, op->direction); 716 SET_ANIMATION (op, op->direction);
673 update_object (op, UP_OBJ_FACE); 717 update_object (op, UP_OBJ_FACE);
674} 718}
740 /* nop */; 784 /* nop */;
741 else if (action == UP_OBJ_INSERT) 785 else if (action == UP_OBJ_INSERT)
742 { 786 {
743#if 0 787#if 0
744 // this is likely overkill, TODO: revisit (schmorp) 788 // this is likely overkill, TODO: revisit (schmorp)
745 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 789 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
746 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 790 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
747 || (op->is_player () && !(m.flags_ & P_PLAYER)) 791 || (op->is_player () && !(m.flags_ & P_PLAYER))
748 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 792 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
749 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 793 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
750 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 794 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
751 || (m.move_on | op->move_on ) != m.move_on 795 || (m.move_on | op->move_on ) != m.move_on
752 || (m.move_off | op->move_off ) != m.move_off 796 || (m.move_off | op->move_off ) != m.move_off
753 || (m.move_slow | op->move_slow) != m.move_slow 797 || (m.move_slow | op->move_slow) != m.move_slow
754 /* This isn't perfect, but I don't expect a lot of objects to 798 /* This isn't perfect, but I don't expect a lot of objects to
755 * have move_allow right now. 799 * have move_allow right now.
776 update_object (op->more, action); 820 update_object (op->more, action);
777} 821}
778 822
779object::object () 823object::object ()
780{ 824{
781 SET_FLAG (this, FLAG_REMOVED); 825 this->set_flag (FLAG_REMOVED);
782 826
783 //expmul = 1.0; declared const for the time being 827 //expmul = 1.0; declared const for the time being
784 face = blank_face; 828 face = blank_face;
829 material = MATERIAL_NULL;
785} 830}
786 831
787object::~object () 832object::~object ()
788{ 833{
789 unlink (); 834 unlink ();
790 835
791 free_key_values (this); 836 free_key_values (this);
792} 837}
793
794static int object_count;
795 838
796void object::link () 839void object::link ()
797{ 840{
798 assert (!index);//D 841 assert (!index);//D
799 uuid = UUID::gen (); 842 uuid = UUID::gen ();
800 count = ++object_count;
801 843
802 refcnt_inc (); 844 refcnt_inc ();
803 objects.insert (this); 845 objects.insert (this);
846
847 ++create_count;
848
804} 849}
805 850
806void object::unlink () 851void object::unlink ()
807{ 852{
808 if (!index) 853 if (!index)
809 return; 854 return;
855
856 ++destroy_count;
810 857
811 objects.erase (this); 858 objects.erase (this);
812 refcnt_dec (); 859 refcnt_dec ();
813} 860}
814 861
919 map->insert (op, x, y); 966 map->insert (op, x, y);
920 } 967 }
921 } 968 }
922} 969}
923 970
971/*
972 * Remove and free all objects in the inventory of the given object.
973 * Unlike destroy_inv, this assumes the *this is destroyed as well
974 * well, so we can (and have to!) take shortcuts.
975 */
976void
977object::destroy_inv_fast ()
978{
979 while (object *op = inv)
980 {
981 // remove from object the fast way
982 op->flag [FLAG_REMOVED] = true;
983 op->env = 0;
984 if ((inv = inv->below))
985 inv->above = 0;
986
987 // then destroy
988 op->destroy ();
989 }
990}
991
992void
993object::freelist_free (int count)
994{
995 while (count-- && freelist)
996 {
997 freelist_item *next = freelist->next;
998 // count is being "destroyed"
999
1000 sfree ((char *)freelist, sizeof (object));
1001
1002 freelist = next;
1003 --free_count;
1004 }
1005}
1006
1007object *
924object *object::create () 1008object::create ()
925{ 1009{
926 object *op = new object; 1010 object *op;
1011
1012 if (freelist)
1013 {
1014 freelist_item li = *freelist;
1015 memset (freelist, 0, sizeof (object));
1016
1017 op = new (freelist) object;
1018 op->count = li.count;
1019
1020 freelist = li.next;
1021 --free_count;
1022 }
1023 else
1024 {
1025 void *ni = salloc0<char> (sizeof (object));
1026
1027 op = new(ni) object;
1028
1029 op->count = ++object_count;
1030 }
1031
927 op->link (); 1032 op->link ();
1033
928 return op; 1034 return op;
929} 1035}
930 1036
1037void
1038object::do_delete ()
1039{
1040 uint32_t count = this->count;
1041
1042 this->~object ();
1043
1044 freelist_item *li = (freelist_item *)this;
1045 li->next = freelist;
1046 li->count = count;
1047
1048 freelist = li;
1049 ++free_count;
1050}
1051
931static struct freed_map : maptile 1052static struct freed_map : maptile
932{ 1053{
933 freed_map () 1054 freed_map ()
1055 : maptile (3, 3)
934 { 1056 {
935 path = "<freed objects map>"; 1057 path = "<freed objects map>";
936 name = "/internal/freed_objects_map"; 1058 name = "/internal/freed_objects_map";
937 width = 3;
938 height = 3;
939 no_drop = 1; 1059 no_drop = 1;
940 no_reset = 1; 1060 no_reset = 1;
941 1061
942 alloc ();
943 in_memory = MAP_ACTIVE; 1062 in_memory = MAP_ACTIVE;
944 } 1063 }
945 1064
946 ~freed_map () 1065 ~freed_map ()
947 { 1066 {
998 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1117 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
999 head->destroy (); 1118 head->destroy ();
1000 return; 1119 return;
1001 } 1120 }
1002 1121
1003 destroy_inv (false); 1122 destroy_inv_fast ();
1004 1123
1005 if (is_head ()) 1124 if (is_head ())
1006 if (sound_destroy) 1125 if (sound_destroy)
1007 play_sound (sound_destroy); 1126 play_sound (sound_destroy);
1008 else if (flag [FLAG_MONSTER]) 1127 else if (flag [FLAG_MONSTER])
1040 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed 1159 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1041 if (object *pl = visible_to ()) 1160 if (object *pl = visible_to ())
1042 esrv_del_item (pl->contr, count); 1161 esrv_del_item (pl->contr, count);
1043 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1162 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1044 1163
1045 adjust_weight (env, -total_weight ()); 1164 adjust_weight (env, total_weight (), 0);
1046 1165
1047 object *pl = in_player (); 1166 object *pl = in_player ();
1048 1167
1049 /* we set up values so that it could be inserted into 1168 /* we set up values so that it could be inserted into
1050 * the map, but we don't actually do that - it is up 1169 * the map, but we don't actually do that - it is up
1060 1179
1061 above = 0; 1180 above = 0;
1062 below = 0; 1181 below = 0;
1063 env = 0; 1182 env = 0;
1064 1183
1065 /* NO_FIX_PLAYER is set when a great many changes are being 1184 if (pl && pl->is_player ())
1066 * made to players inventory. If set, avoiding the call
1067 * to save cpu time.
1068 */ 1185 {
1069 if (pl) 1186 if (expect_false (pl->contr->combat_ob == this))
1070 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1071 { 1187 {
1072 pl->update_stats (); 1188 pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1189 pl->contr->combat_ob = 0;
1190 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1191 }
1073 1192
1193 if (expect_false (pl->contr->ranged_ob == this))
1194 {
1195 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1196 pl->contr->ranged_ob = 0;
1197 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1198 }
1199
1200 pl->contr->queue_stats_update ();
1201
1074 if (glow_radius && pl->is_on_map ()) 1202 if (expect_false (glow_radius) && pl->is_on_map ())
1075 update_all_los (pl->map, pl->x, pl->y); 1203 update_all_los (pl->map, pl->x, pl->y);
1076 } 1204 }
1077 } 1205 }
1078 else if (map) 1206 else if (map)
1079 { 1207 {
1080 map->dirty = true; 1208 map->dirty = true;
1081 mapspace &ms = this->ms (); 1209 mapspace &ms = this->ms ();
1099 else if (pl->container_ () == this) 1227 else if (pl->container_ () == this)
1100 { 1228 {
1101 // removing a container should close it 1229 // removing a container should close it
1102 close_container (); 1230 close_container ();
1103 } 1231 }
1104 1232 else
1105 esrv_del_item (pl->contr, count); 1233 esrv_del_item (pl->contr, count);
1106 } 1234 }
1107 1235
1108 /* link the object above us */ 1236 /* link the object above us */
1109 // re-link, make sure compiler can easily use cmove 1237 // re-link, make sure compiler can easily use cmove
1110 *(above ? &above->below : &ms.top) = below; 1238 *(above ? &above->below : &ms.top) = below;
1201 1329
1202 object *prev = this; 1330 object *prev = this;
1203 1331
1204 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1332 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1205 { 1333 {
1206 object *op = arch_to_object (at); 1334 object *op = at->instance ();
1207 1335
1208 op->name = name; 1336 op->name = name;
1209 op->name_pl = name_pl; 1337 op->name_pl = name_pl;
1210 op->title = title; 1338 op->title = title;
1211 1339
1249 * Passing 0 for flag gives proper default values, so flag really only needs 1377 * Passing 0 for flag gives proper default values, so flag really only needs
1250 * to be set if special handling is needed. 1378 * to be set if special handling is needed.
1251 * 1379 *
1252 * Return value: 1380 * Return value:
1253 * new object if 'op' was merged with other object 1381 * new object if 'op' was merged with other object
1254 * NULL if 'op' was destroyed 1382 * NULL if there was an error (destroyed, blocked etc.)
1255 * just 'op' otherwise 1383 * just 'op' otherwise
1256 */ 1384 */
1257object * 1385object *
1258insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1386insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1259{ 1387{
1296 // from here :/ 1424 // from here :/
1297 op->nrof += tmp->nrof; 1425 op->nrof += tmp->nrof;
1298 tmp->destroy (); 1426 tmp->destroy ();
1299 } 1427 }
1300 1428
1301 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1429 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1302 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1430 op->clr_flag (FLAG_INV_LOCKED);
1303 1431
1304 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1432 if (!op->flag [FLAG_ALIVE])
1305 CLEAR_FLAG (op, FLAG_NO_STEAL); 1433 op->clr_flag (FLAG_NO_STEAL);
1306 1434
1307 if (flag & INS_BELOW_ORIGINATOR) 1435 if (flag & INS_BELOW_ORIGINATOR)
1308 { 1436 {
1309 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1437 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1310 { 1438 {
1345 * when lots of spells are cast in one area. Currently, it is presumed 1473 * when lots of spells are cast in one area. Currently, it is presumed
1346 * that flying non pickable objects are spell objects. 1474 * that flying non pickable objects are spell objects.
1347 */ 1475 */
1348 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1476 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1349 { 1477 {
1350 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) 1478 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1351 floor = tmp; 1479 floor = tmp;
1352 1480
1353 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1481 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1354 { 1482 {
1355 /* We insert above top, so we want this object below this */ 1483 /* We insert above top, so we want this object below this */
1356 top = tmp->below; 1484 top = tmp->below;
1357 break; 1485 break;
1358 } 1486 }
1376 && (op->face && !faces [op->face].visibility)) 1504 && (op->face && !faces [op->face].visibility))
1377 { 1505 {
1378 object *last; 1506 object *last;
1379 1507
1380 for (last = top; last != floor; last = last->below) 1508 for (last = top; last != floor; last = last->below)
1381 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1509 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1382 break; 1510 break;
1383 1511
1384 /* Check to see if we found the object that blocks view, 1512 /* Check to see if we found the object that blocks view,
1385 * and make sure we have a below pointer for it so that 1513 * and make sure we have a below pointer for it so that
1386 * we can get inserted below this one, which requires we 1514 * we can get inserted below this one, which requires we
1459 */ 1587 */
1460 1588
1461 /* if this is not the head or flag has been passed, don't check walk on status */ 1589 /* if this is not the head or flag has been passed, don't check walk on status */
1462 if (!(flag & INS_NO_WALK_ON) && op->is_head ()) 1590 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1463 { 1591 {
1464 if (check_move_on (op, originator)) 1592 if (check_move_on (op, originator, flag))
1465 return 0; 1593 return 0;
1466 1594
1467 /* If we are a multi part object, lets work our way through the check 1595 /* If we are a multi part object, let's work our way through the check
1468 * walk on's. 1596 * walk on's.
1469 */ 1597 */
1470 for (object *tmp = op->more; tmp; tmp = tmp->more) 1598 for (object *tmp = op->more; tmp; tmp = tmp->more)
1471 if (check_move_on (tmp, originator)) 1599 if (check_move_on (tmp, originator, flag))
1472 return 0; 1600 return 0;
1473 } 1601 }
1474 1602
1475 return op; 1603 return op;
1476} 1604}
1486 1614
1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1615 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488 if (tmp->arch->archname == archname) /* same archetype */ 1616 if (tmp->arch->archname == archname) /* same archetype */
1489 tmp->destroy (); 1617 tmp->destroy ();
1490 1618
1491 object *tmp = arch_to_object (archetype::find (archname)); 1619 object *tmp = archetype::find (archname)->instance ();
1492 1620
1493 tmp->x = op->x; 1621 tmp->x = op->x;
1494 tmp->y = op->y; 1622 tmp->y = op->y;
1495 1623
1496 insert_ob_in_map (tmp, op->map, op, 0); 1624 insert_ob_in_map (tmp, op->map, op, 0);
1501{ 1629{
1502 if (where->env) 1630 if (where->env)
1503 return where->env->insert (this); 1631 return where->env->insert (this);
1504 else 1632 else
1505 return where->map->insert (this, where->x, where->y, originator, flags); 1633 return where->map->insert (this, where->x, where->y, originator, flags);
1634}
1635
1636// check whether we can put this into the map, respect max_volume, max_items
1637bool
1638object::can_drop_at (maptile *m, int x, int y, object *originator)
1639{
1640 mapspace &ms = m->at (x, y);
1641
1642 int items = ms.items ();
1643
1644 if (!items // testing !items ensures we can drop at least one item
1645 || (items < m->max_items
1646 && ms.volume () < m->max_volume))
1647 return true;
1648
1649 if (originator && originator->is_player ())
1650 originator->contr->failmsgf (
1651 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1652 query_name ()
1653 );
1654
1655 return false;
1506} 1656}
1507 1657
1508/* 1658/*
1509 * decrease(object, number) decreases a specified number from 1659 * decrease(object, number) decreases a specified number from
1510 * the amount of an object. If the amount reaches 0, the object 1660 * the amount of an object. If the amount reaches 0, the object
1520 1670
1521 nr = min (nr, nrof); 1671 nr = min (nr, nrof);
1522 1672
1523 if (nrof > nr) 1673 if (nrof > nr)
1524 { 1674 {
1675 sint64 oweight = total_weight ();
1676
1525 nrof -= nr; 1677 nrof -= nr;
1526 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1527 1678
1528 if (object *pl = visible_to ()) 1679 if (object *pl = visible_to ())
1529 esrv_update_item (UPD_NROF, pl, this); 1680 esrv_update_item (UPD_NROF, pl, this);
1681
1682 adjust_weight (env, oweight, total_weight ());
1530 1683
1531 return true; 1684 return true;
1532 } 1685 }
1533 else 1686 else
1534 { 1687 {
1609 if (op->nrof) 1762 if (op->nrof)
1610 for (object *tmp = inv; tmp; tmp = tmp->below) 1763 for (object *tmp = inv; tmp; tmp = tmp->below)
1611 if (object::can_merge (tmp, op)) 1764 if (object::can_merge (tmp, op))
1612 { 1765 {
1613 /* return the original object and remove inserted object 1766 /* return the original object and remove inserted object
1614 (client needs the original object) */ 1767 (client prefers the original object) */
1768
1769 // carring must be 0 for mergable objects
1770 sint64 oweight = tmp->weight * tmp->nrof;
1771
1615 tmp->nrof += op->nrof; 1772 tmp->nrof += op->nrof;
1616 1773
1617 if (object *pl = tmp->visible_to ()) 1774 if (object *pl = tmp->visible_to ())
1618 esrv_update_item (UPD_NROF, pl, tmp); 1775 esrv_update_item (UPD_NROF, pl, tmp);
1619 1776
1620 adjust_weight (this, op->total_weight ()); 1777 adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1621 1778
1622 op->destroy (); 1779 op->destroy ();
1623 op = tmp; 1780 op = tmp;
1624 goto inserted; 1781 goto inserted;
1625 } 1782 }
1641 op->flag [FLAG_REMOVED] = 0; 1798 op->flag [FLAG_REMOVED] = 0;
1642 1799
1643 if (object *pl = op->visible_to ()) 1800 if (object *pl = op->visible_to ())
1644 esrv_send_item (pl, op); 1801 esrv_send_item (pl, op);
1645 1802
1646 adjust_weight (this, op->total_weight ()); 1803 adjust_weight (this, 0, op->total_weight ());
1647 1804
1648inserted: 1805inserted:
1649 /* reset the light list and los of the players on the map */ 1806 /* reset the light list and los of the players on the map */
1650 if (op->glow_radius && is_on_map ()) 1807 if (op->glow_radius && is_on_map ())
1651 { 1808 {
1652 update_stats (); 1809 update_stats ();
1653 update_all_los (map, x, y); 1810 update_all_los (map, x, y);
1654 } 1811 }
1655 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1812 else if (is_player ())
1656 // if this is a player's inventory, update stats 1813 // if this is a player's inventory, update stats
1657 update_stats (); 1814 contr->queue_stats_update ();
1658 1815
1659 INVOKE_OBJECT (INSERT, this); 1816 INVOKE_OBJECT (INSERT, this);
1660 1817
1661 return op; 1818 return op;
1662} 1819}
1680 * MSW 2001-07-08: Check all objects on space, not just those below 1837 * MSW 2001-07-08: Check all objects on space, not just those below
1681 * object being inserted. insert_ob_in_map may not put new objects 1838 * object being inserted. insert_ob_in_map may not put new objects
1682 * on top. 1839 * on top.
1683 */ 1840 */
1684int 1841int
1685check_move_on (object *op, object *originator) 1842check_move_on (object *op, object *originator, int flags)
1686{ 1843{
1687 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1844 if (op->flag [FLAG_NO_APPLY])
1688 return 0; 1845 return 0;
1689 1846
1690 object *tmp; 1847 object *tmp;
1691 maptile *m = op->map; 1848 maptile *m = op->map;
1692 int x = op->x, y = op->y; 1849 int x = op->x, y = op->y;
1729 * Second check makes sure that the movement types not being slowed 1886 * Second check makes sure that the movement types not being slowed
1730 * (~slow_move) is not blocked on this space - just because the 1887 * (~slow_move) is not blocked on this space - just because the
1731 * space doesn't slow down swimming (for example), if you can't actually 1888 * space doesn't slow down swimming (for example), if you can't actually
1732 * swim on that space, can't use it to avoid the penalty. 1889 * swim on that space, can't use it to avoid the penalty.
1733 */ 1890 */
1734 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1891 if (!op->flag [FLAG_WIZPASS])
1735 { 1892 {
1736 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1893 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1737 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1894 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1738 { 1895 {
1739 float diff = tmp->move_slow_penalty * fabs (op->speed); 1896 float diff = tmp->move_slow_penalty * fabs (op->speed);
1749 1906
1750 /* Basically same logic as above, except now for actual apply. */ 1907 /* Basically same logic as above, except now for actual apply. */
1751 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1908 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1752 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1909 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1753 { 1910 {
1911 if ((flags & INS_NO_AUTO_EXIT)
1912 && (tmp->type == EXIT || tmp->type == TELEPORTER
1913 || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
1914 continue;
1915
1754 move_apply (tmp, op, originator); 1916 move_apply (tmp, op, originator);
1755 1917
1756 if (op->destroyed ()) 1918 if (op->destroyed ())
1757 return 1; 1919 return 1;
1758 1920
1870void 2032void
1871flag_inv (object *op, int flag) 2033flag_inv (object *op, int flag)
1872{ 2034{
1873 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2035 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1874 { 2036 {
1875 SET_FLAG (tmp, flag); 2037 tmp->set_flag (flag);
1876 flag_inv (tmp, flag); 2038 flag_inv (tmp, flag);
1877 } 2039 }
1878} 2040}
1879 2041
1880/* 2042/*
1883void 2045void
1884unflag_inv (object *op, int flag) 2046unflag_inv (object *op, int flag)
1885{ 2047{
1886 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2048 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1887 { 2049 {
1888 CLEAR_FLAG (tmp, flag); 2050 tmp->clr_flag (flag);
1889 unflag_inv (tmp, flag); 2051 unflag_inv (tmp, flag);
1890 } 2052 }
1891} 2053}
1892 2054
1893/* 2055/*
2083{ 2245{
2084 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2246 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2085} 2247}
2086 2248
2087/* 2249/*
2088 * find_dir_2(delta-x,delta-y) will return a direction in which 2250 * find_dir_2(delta-x,delta-y) will return a direction value
2089 * an object which has subtracted the x and y coordinates of another 2251 * for running into direct [dx, dy].
2090 * object, needs to travel toward it. 2252 * (the opposite of crossfire's find_dir_2!)
2091 */ 2253 */
2092int 2254int
2093find_dir_2 (int x, int y) 2255find_dir_2 (int x, int y)
2094{ 2256{
2257#if 1 // new algorithm
2258 // this works by putting x, y into 16 sectors, which
2259 // are not equal sized, but are a better approximation
2260 // then the old algorithm, and then using a mapping
2261 // table to map it into a direction value.
2262 // basically, it maps these comparisons to each bit
2263 // bit #3: x < 0
2264 // bit #2: y < 0
2265 // bit #1: x > y
2266 // bit #0: x > 2y
2267
2268 static const uint8 dir[16] = {
2269 4, 5, 4, 3,
2270 2, 1, 2, 3,
2271 6, 5, 6, 7,
2272 8, 1, 8, 7,
2273 };
2274 int sector = 0;
2275
2276 // this is a bit ugly, but more likely to result in branchless code
2277 sector |= x < 0 ? 8 : 0;
2278 x = x < 0 ? -x : x; // abs
2279
2280 sector |= y < 0 ? 4 : 0;
2281 y = y < 0 ? -y : y; // abs
2282
2283 if (x > y)
2284 {
2285 sector |= 2;
2286
2287 if (x > y * 2)
2288 sector |= 1;
2289 }
2290 else
2291 {
2292 if (y > x * 2)
2293 sector |= 1;
2294 else if (!y)
2295 return 0; // x == 0 here
2296 }
2297
2298 return dir [sector];
2299#else // old algorithm
2095 int q; 2300 int q;
2096 2301
2097 if (y) 2302 if (y)
2098 q = x * 100 / y; 2303 q = 128 * x / y;
2099 else if (x) 2304 else if (x)
2100 q = -300 * x; 2305 q = -512 * x; // to make it > 309
2101 else 2306 else
2102 return 0; 2307 return 0;
2103 2308
2104 if (y > 0) 2309 if (y > 0)
2105 { 2310 {
2106 if (q < -242) 2311 if (q < -309) return 7;
2312 if (q < -52) return 6;
2313 if (q < 52) return 5;
2314 if (q < 309) return 4;
2315
2107 return 3; 2316 return 3;
2108 if (q < -41) 2317 }
2109 return 2; 2318 else
2110 if (q < 41) 2319 {
2111 return 1; 2320 if (q < -309) return 3;
2112 if (q < 242) 2321 if (q < -52) return 2;
2113 return 8; 2322 if (q < 52) return 1;
2323 if (q < 309) return 8;
2324
2114 return 7; 2325 return 7;
2115 } 2326 }
2116 2327#endif
2117 if (q < -242)
2118 return 7;
2119 if (q < -41)
2120 return 6;
2121 if (q < 41)
2122 return 5;
2123 if (q < 242)
2124 return 4;
2125
2126 return 3;
2127} 2328}
2128 2329
2129/* 2330/*
2130 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2331 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2131 * between two directions (which are expected to be absolute (see absdir()) 2332 * between two directions (which are expected to be absolute (see absdir())
2132 */ 2333 */
2133int 2334int
2134dirdiff (int dir1, int dir2) 2335dirdiff (int dir1, int dir2)
2135{ 2336{
2136 int d;
2137
2138 d = abs (dir1 - dir2); 2337 int d = abs (dir1 - dir2);
2139 if (d > 4)
2140 d = 8 - d;
2141 2338
2142 return d; 2339 return d > 4 ? 8 - d : d;
2143} 2340}
2144 2341
2145/* peterm: 2342/* peterm:
2146 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2343 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2147 * Basically, this is a table of directions, and what directions 2344 * Basically, this is a table of directions, and what directions
2253 * Add a check so we can't pick up invisible objects (0.93.8) 2450 * Add a check so we can't pick up invisible objects (0.93.8)
2254 */ 2451 */
2255int 2452int
2256can_pick (const object *who, const object *item) 2453can_pick (const object *who, const object *item)
2257{ 2454{
2258 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2455 return /*who->flag [FLAG_WIZ]|| */
2259 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2456 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2260 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2457 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2261} 2458}
2262 2459
2263/* 2460/*
2264 * create clone from object to another 2461 * create clone from object to another
2265 */ 2462 */
2430{ 2627{
2431 return map ? map->region (x, y) 2628 return map ? map->region (x, y)
2432 : region::default_region (); 2629 : region::default_region ();
2433} 2630}
2434 2631
2435const materialtype_t *
2436object::dominant_material () const
2437{
2438 if (materialtype_t *mt = name_to_material (materialname))
2439 return mt;
2440
2441 return name_to_material (shstr_unknown);
2442}
2443
2444void 2632void
2445object::open_container (object *new_container) 2633object::open_container (object *new_container)
2446{ 2634{
2447 if (container == new_container) 2635 if (container == new_container)
2448 return; 2636 return;
2482 // TODO: this does not seem to serve any purpose anymore? 2670 // TODO: this does not seem to serve any purpose anymore?
2483#if 0 2671#if 0
2484 // insert the "Close Container" object. 2672 // insert the "Close Container" object.
2485 if (archetype *closer = new_container->other_arch) 2673 if (archetype *closer = new_container->other_arch)
2486 { 2674 {
2487 object *closer = arch_to_object (new_container->other_arch); 2675 object *closer = new_container->other_arch->instance ();
2488 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2676 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2489 new_container->insert (closer); 2677 new_container->insert (closer);
2490 } 2678 }
2491#endif 2679#endif
2492 2680
2598 2786
2599 insert (force); 2787 insert (force);
2600 } 2788 }
2601} 2789}
2602 2790
2791void object::change_move_type (MoveType mt)
2792{
2793 if (move_type == mt)
2794 return;
2795
2796 if (is_on_map ())
2797 {
2798 // we are on the map, so handle move_on/off effects
2799 remove ();
2800 move_type = mt;
2801 map->insert (this, x, y, this);
2802 }
2803 else
2804 move_type = mt;
2805}
2806
2807/* object should be a player.
2808 * we return the object the player has marked with the 'mark' command
2809 * below. If no match is found (or object has changed), we return
2810 * NULL. We leave it up to the calling function to print messages if
2811 * nothing is found.
2812 */
2813object *
2814object::mark () const
2815{
2816 if (contr && contr->mark && contr->mark->env == this)
2817 return contr->mark;
2818 else
2819 return 0;
2820}
2821
2822// put marked object first in the inventory
2823// this is used by identify-like spells so players can influence
2824// the order a bit.
2825void
2826object::splay_marked ()
2827{
2828 if (object *marked = mark ())
2829 splay (marked);
2830}
2831

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines