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.304 by root, Tue Nov 10 16:29:20 2009 UTC vs.
Revision 1.360 by root, Wed Nov 16 23:41:59 2016 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,2012,2013,2014,2015,2016 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.
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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
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
209 233
210/* 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. */
211static bool 235static bool
212compare_ob_value_lists_one (const object *wants, const object *has) 236compare_ob_value_lists_one (const object *wants, const object *has)
213{ 237{
214 /* n-squared behaviour (see kv_get), but I'm hoping both 238 /* n-squared behaviour (see kv.get), but I'm hoping both
215 * objects with lists are rare, and lists stay short. If not, use a 239 * objects with lists are rare, and lists stay short. If not, use a
216 * different structure or at least keep the lists sorted... 240 * different structure or at least keep the lists sorted...
217 */ 241 */
218 242
219 /* For each field in wants, */ 243 /* For each field in wants, */
220 for (key_value *kv = wants->key_values; kv; kv = kv->next) 244 for (key_value *kv = wants->kv.first; kv; kv = kv->next)
221 if (has->kv_get (kv->key) != kv->value) 245 if (has->kv.get (kv->key) != kv->value)
222 return false; 246 return false;
223 247
224 /* If we get here, every field in wants has a matching field in has. */ 248 /* If we get here, every field in wants has a matching field in has. */
225 return true; 249 return true;
226} 250}
248 * Improvements made with merge: Better checking on potion, and also 272 * Improvements made with merge: Better checking on potion, and also
249 * check weight 273 * check weight
250 */ 274 */
251bool object::can_merge_slow (object *ob1, object *ob2) 275bool object::can_merge_slow (object *ob1, object *ob2)
252{ 276{
253 /* A couple quicksanity checks */ 277 /* A couple quick sanity checks */
254 if (ob1 == ob2 278 if (ob1 == ob2
255 || 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
256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED 283 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
257 || ob1->value != ob2->value
258 || ob1->name != ob2->name)
259 return 0; 284 return 0;
260 285
261 /* Do not merge objects if nrof would overflow, assume nrof 286 /* Do not merge objects if nrof would overflow, assume nrof
262 * is always 0 .. 2**31-1 */ 287 * is always 0 .. 2**31-1 */
263 if (ob1->nrof > 0x7fffffff - ob2->nrof) 288 if (ob1->nrof > 0x7fffffff - ob2->nrof)
267 * 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
268 * 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
269 * 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
270 * flags lose any meaning. 295 * flags lose any meaning.
271 */ 296 */
272 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 297 if (ob1->flag [FLAG_IDENTIFIED])
273 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 298 ob1->set_flag (FLAG_BEEN_APPLIED);
274 299
275 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 300 if (ob2->flag [FLAG_IDENTIFIED])
276 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 301 ob2->set_flag (FLAG_BEEN_APPLIED);
277 302
278 if (ob1->arch->archname != ob2->arch->archname 303 if (ob1->arch->archname != ob2->arch->archname
279 || ob1->name != ob2->name 304 || ob1->name != ob2->name
280 || ob1->title != ob2->title 305 || ob1->title != ob2->title
281 || ob1->msg != ob2->msg 306 || ob1->msg != ob2->msg
284 || ob1->magic != ob2->magic 309 || ob1->magic != ob2->magic
285 || ob1->slaying != ob2->slaying 310 || ob1->slaying != ob2->slaying
286 || ob1->skill != ob2->skill 311 || ob1->skill != ob2->skill
287 || ob1->value != ob2->value 312 || ob1->value != ob2->value
288 || ob1->animation_id != ob2->animation_id 313 || ob1->animation_id != ob2->animation_id
289 || (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
290 || ob1->client_type != ob2->client_type 315 || ob1->client_type != ob2->client_type
291 || ob1->material != ob2->material 316 || ob1->material != ob2->material
292 || ob1->lore != ob2->lore 317 || ob1->lore != ob2->lore
293 || ob1->subtype != ob2->subtype 318 || ob1->subtype != ob2->subtype
294 || ob1->move_type != ob2->move_type 319 || ob1->move_type != ob2->move_type
326 /* inventory ok - still need to check rest of this object to see 351 /* inventory ok - still need to check rest of this object to see
327 * if it is valid. 352 * if it is valid.
328 */ 353 */
329 } 354 }
330 355
331 /* 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,
332 * 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
333 * some items equipped, and we don't want those to merge. 358 * some items equipped, and we don't want those to merge.
334 */ 359 */
335 if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) 360 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
336 return 0; 361 return 0;
337 362
338 /* Note sure why the following is the case - either the object has to 363 /* Not sure why the following is the case - either the object has to
339 * 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
340 * check? 365 * check?
341 */ 366 */
342 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) 367 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
343 return 0; 368 return 0;
344 369
345 switch (ob1->type) 370 switch (ob1->type)
346 { 371 {
347 case SCROLL: 372 case SCROLL:
348 if (ob1->level != ob2->level) 373 if (ob1->level != ob2->level)
349 return 0; 374 return 0;
350 break; 375 break;
351 } 376 }
352 377
353 if (ob1->key_values || ob2->key_values) 378 if (!ob1->kv.empty () || !ob2->kv.empty ())
354 { 379 {
355 /* At least one of these has key_values. */ 380 /* At least one of these has key_values. */
356 if ((!ob1->key_values) != (!ob2->key_values)) 381 if (ob1->kv.empty () != ob2->kv.empty ())
357 return 0; /* One has fields, but the other one doesn't. */ 382 return 0; /* One has fields, but the other one doesn't. */
358 383
359 if (!compare_ob_value_lists (ob1, ob2)) 384 if (!compare_ob_value_lists (ob1, ob2))
360 return 0; 385 return 0;
361 } 386 }
421 446
422 return 0; 447 return 0;
423} 448}
424 449
425// adjust weight per container type ("of holding") 450// adjust weight per container type ("of holding")
426static sint32 451static weight_t
427weight_adjust_for (object *op, sint32 weight) 452weight_adjust_for (object *op, weight_t weight)
428{ 453{
429 return op->type == CONTAINER 454 if (op->type == CONTAINER)
430 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 455 weight -= weight * op->stats.Str / 100;
431 : weight;
432}
433 456
457 return weight;
458}
459
434/* 460/*
435 * adjust_weight(object, weight) adds the specified weight to an object, 461 * subtracts, then adds, the specified weight to an object,
436 * and also updates how much the environment(s) is/are carrying. 462 * and also updates how much the environment(s) is/are carrying.
437 */ 463 */
438static void 464static void
439adjust_weight (object *op, sint32 weight) 465adjust_weight (object *op, weight_t sub, weight_t add)
440{ 466{
441 while (op) 467 while (op)
442 { 468 {
443 // adjust by actual difference to account for rounding errors 469 weight_t carrying = (weight_t)op->carrying
444 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct 470 - weight_adjust_for (op, sub)
445 weight = weight_adjust_for (op, op->carrying) 471 + weight_adjust_for (op, add);
446 - weight_adjust_for (op, op->carrying - weight);
447 472
448 if (!weight) 473 sub = op->carrying;
449 return;
450
451 op->carrying += weight; 474 op->carrying = carrying;
475 add = op->carrying;
452 476
453 if (object *pl = op->visible_to ()) 477 if (object *pl = op->visible_to ())
454 if (pl != op) // player is handled lazily 478 if (pl != op) // player is handled lazily
455 esrv_update_item (UPD_WEIGHT, pl, op); 479 esrv_update_item (UPD_WEIGHT, pl, op);
456 480
464 * containers are carrying, and sums it up. 488 * containers are carrying, and sums it up.
465 */ 489 */
466void 490void
467object::update_weight () 491object::update_weight ()
468{ 492{
469 sint32 sum = 0; 493 weight_t sum = 0;
470 494
471 for (object *op = inv; op; op = op->below) 495 for (object *op = inv; op; op = op->below)
472 { 496 {
473 if (op->inv)
474 op->update_weight (); 497 op->update_weight ();
475 498
476 sum += op->total_weight (); 499 sum += weight_adjust_for (this, op->total_weight ());
477 } 500 }
478
479 sum = weight_adjust_for (this, sum);
480 501
481 if (sum != carrying) 502 if (sum != carrying)
482 { 503 {
504 if (carrying != sum && carrying)//D
505 LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
506 (long long)sum, (long long)carrying, debug_desc ());
507
483 carrying = sum; 508 carrying = sum;
484 509
485 if (object *pl = visible_to ()) 510 if (object *pl = visible_to ())
486 if (pl != this) // player is handled lazily 511 if (pl != this) // player is handled lazily
487 esrv_update_item (UPD_WEIGHT, pl, this); 512 esrv_update_item (UPD_WEIGHT, pl, this);
515object * 540object *
516find_object (tag_t i) 541find_object (tag_t i)
517{ 542{
518 for_all_objects (op) 543 for_all_objects (op)
519 if (op->count == i) 544 if (op->count == i)
545 return op;
546
547 return 0;
548}
549
550/*
551 * Returns the object which has the uuid equal to the argument.
552 * MOAR VERRRY slow.
553 */
554
555object *
556find_object_uuid (UUID i)
557{
558 for_all_objects (op)
559 if (op->uuid == i)
520 return op; 560 return op;
521 561
522 return 0; 562 return 0;
523} 563}
524 564
558 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); 598 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
559 return; 599 return;
560 } 600 }
561 601
562 this->owner = owner; 602 this->owner = owner;
563}
564
565int
566object::slottype () const
567{
568 if (type == SKILL)
569 {
570 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
571 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
572 }
573 else
574 {
575 if (slot [body_combat].info) return slot_combat;
576 if (slot [body_range ].info) return slot_ranged;
577 }
578
579 return slot_none;
580}
581
582bool
583object::change_weapon (object *ob)
584{
585 if (current_weapon == ob)
586 return true;
587
588 if (chosen_skill)
589 chosen_skill->flag [FLAG_APPLIED] = false;
590
591 current_weapon = ob;
592 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
593
594 if (chosen_skill)
595 chosen_skill->flag [FLAG_APPLIED] = true;
596
597 update_stats ();
598
599 if (ob)
600 {
601 // now check wether any body locations became invalid, in which case
602 // we cannot apply the weapon at the moment.
603 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
604 if (slot[i].used < 0)
605 {
606 current_weapon = chosen_skill = 0;
607 update_stats ();
608
609 new_draw_info_format (NDI_UNIQUE, 0, this,
610 "You try to balance all your items at once, "
611 "but the %s is just too much for your body. "
612 "[You need to unapply some items first - use the 'body' command to see "
613 "how many items you cna wera on a specific body part.]", &ob->name);
614 return false;
615 }
616
617 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
618 }
619 else
620 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
621
622 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
623 {
624 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
625 &name, ob->debug_desc ());
626 return false;
627 }
628
629 return true;
630}
631
632/* Zero the key_values on op, decrementing the shared-string
633 * refcounts and freeing the links.
634 */
635static void
636free_key_values (object *op)
637{
638 for (key_value *i = op->key_values; i; )
639 {
640 key_value *next = i->next;
641 delete i;
642
643 i = next;
644 }
645
646 op->key_values = 0;
647} 603}
648 604
649/* 605/*
650 * copy_to first frees everything allocated by the dst object, 606 * copy_to first frees everything allocated by the dst object,
651 * and then copies the contents of itself into the second 607 * and then copies the contents of itself into the second
657void 613void
658object::copy_to (object *dst) 614object::copy_to (object *dst)
659{ 615{
660 dst->remove (); 616 dst->remove ();
661 *(object_copy *)dst = *this; 617 *(object_copy *)dst = *this;
618
619 // maybe move to object_copy?
620 dst->kv = kv;
621
662 dst->flag [FLAG_REMOVED] = true; 622 dst->flag [FLAG_REMOVED] = true;
663
664 /* Copy over key_values, if any. */
665 if (key_values)
666 {
667 key_value *tail = 0;
668 dst->key_values = 0;
669
670 for (key_value *i = key_values; i; i = i->next)
671 {
672 key_value *new_link = new key_value;
673
674 new_link->next = 0;
675 new_link->key = i->key;
676 new_link->value = i->value;
677
678 /* Try and be clever here, too. */
679 if (!dst->key_values)
680 {
681 dst->key_values = new_link;
682 tail = new_link;
683 }
684 else
685 {
686 tail->next = new_link;
687 tail = new_link;
688 }
689 }
690 }
691
692 if (speed < 0)
693 dst->speed_left -= rndm ();
694
695 dst->activate (); 623 dst->activate ();
696} 624}
697 625
698void 626void
699object::instantiate () 627object::instantiate ()
700{ 628{
701 if (!uuid.seq) // HACK 629 if (!uuid.seq) // HACK
702 uuid = UUID::gen (); 630 uuid = UUID::gen ();
703 631
632 // TODO: unclean state changes, should not be done in copy_to AND instantiate
633 if (flag [FLAG_RANDOM_SPEED] && speed)
634 speed_left = - speed - rndm (); // TODO animation
635 else
704 speed_left = -0.1f; 636 speed_left = -1.;
637
705 /* copy the body_info to the body_used - this is only really 638 /* copy the body_info to the body_used - this is only really
706 * need for monsters, but doesn't hurt to do it for everything. 639 * need for monsters, but doesn't hurt to do it for everything.
707 * by doing so, when a monster is created, it has good starting 640 * by doing so, when a monster is created, it has good starting
708 * values for the body_used info, so when items are created 641 * values for the body_used info, so when items are created
709 * for it, they can be properly equipped. 642 * for it, they can be properly equipped.
710 */ 643 */
711 for (int i = NUM_BODY_LOCATIONS; i--; ) 644 for (int i = NUM_BODY_LOCATIONS; i--; )
712 slot[i].used = slot[i].info; 645 slot[i].used = slot[i].info;
713 646
717object * 650object *
718object::clone () 651object::clone ()
719{ 652{
720 object *neu = create (); 653 object *neu = create ();
721 copy_to (neu); 654 copy_to (neu);
655
656 // TODO: unclean state changes, should not be done in clone AND instantiate
657 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
658 neu->speed_left = - neu->speed - rndm (); // TODO animation
659
722 neu->map = map; // not copied by copy_to 660 neu->map = map; // not copied by copy_to
723 return neu; 661 return neu;
724} 662}
725 663
726/* 664/*
729 * be called to update the face variable, _and_ how it looks on the map. 667 * be called to update the face variable, _and_ how it looks on the map.
730 */ 668 */
731void 669void
732update_turn_face (object *op) 670update_turn_face (object *op)
733{ 671{
734 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) 672 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
735 return; 673 return;
736 674
737 SET_ANIMATION (op, op->direction); 675 SET_ANIMATION (op, op->direction);
738 update_object (op, UP_OBJ_FACE); 676 update_object (op, UP_OBJ_FACE);
739} 677}
800 } 738 }
801 739
802 mapspace &m = op->ms (); 740 mapspace &m = op->ms ();
803 741
804 if (!(m.flags_ & P_UPTODATE)) 742 if (!(m.flags_ & P_UPTODATE))
805 /* nop */; 743 m.update_up (); // nothing to do except copy up
806 else if (action == UP_OBJ_INSERT) 744 else if (action == UP_OBJ_INSERT)
807 { 745 {
808#if 0 746#if 0
809 // this is likely overkill, TODO: revisit (schmorp) 747 // this is likely overkill, TODO: revisit (schmorp)
810 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 748 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
811 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 749 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
812 || (op->is_player () && !(m.flags_ & P_PLAYER)) 750 || (op->is_player () && !(m.flags_ & P_PLAYER))
813 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 751 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
814 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 752 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
815 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 753 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
816 || (m.move_on | op->move_on ) != m.move_on 754 || (m.move_on | op->move_on ) != m.move_on
817 || (m.move_off | op->move_off ) != m.move_off 755 || (m.move_off | op->move_off ) != m.move_off
818 || (m.move_slow | op->move_slow) != m.move_slow 756 || (m.move_slow | op->move_slow) != m.move_slow
819 /* This isn't perfect, but I don't expect a lot of objects to 757 /* This isn't perfect, but I don't expect a lot of objects to
820 * have move_allow right now. 758 * have move_allow right now.
831 * that is being removed. 769 * that is being removed.
832 */ 770 */
833 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 771 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
834 m.invalidate (); 772 m.invalidate ();
835 else if (action == UP_OBJ_FACE) 773 else if (action == UP_OBJ_FACE)
836 /* Nothing to do for that case */ ; 774 m.update_up (); // nothing to do for that case, except copy up
837 else 775 else
838 LOG (llevError, "update_object called with invalid action: %d\n", action); 776 LOG (llevError, "update_object called with invalid action: %d\n", action);
839 777
840 if (op->more) 778 if (op->more)
841 update_object (op->more, action); 779 update_object (op->more, action);
842} 780}
843 781
844object::object () 782object::object ()
845{ 783{
846 SET_FLAG (this, FLAG_REMOVED); 784 this->set_flag (FLAG_REMOVED);
847 785
848 //expmul = 1.0; declared const for the time being 786 //expmul = 1.0; declared const for the time being
849 face = blank_face; 787 face = blank_face;
850 material = MATERIAL_NULL; 788 material = MATERIAL_NULL;
851} 789}
852 790
853object::~object () 791object::~object ()
854{ 792{
855 unlink (); 793 unlink ();
856 794
857 free_key_values (this); 795 kv.clear ();
858} 796}
859
860static int object_count;
861 797
862void object::link () 798void object::link ()
863{ 799{
864 assert (!index);//D 800 assert (!index);//D
865 uuid = UUID::gen (); 801 uuid = UUID::gen ();
866 count = ++object_count;
867 802
868 refcnt_inc (); 803 refcnt_inc ();
869 objects.insert (this); 804 objects.insert (this);
805
806 ++create_count;
807
870} 808}
871 809
872void object::unlink () 810void object::unlink ()
873{ 811{
874 if (!index) 812 if (!index)
875 return; 813 return;
814
815 ++destroy_count;
876 816
877 objects.erase (this); 817 objects.erase (this);
878 refcnt_dec (); 818 refcnt_dec ();
879} 819}
880 820
959 * if some form of movement is allowed, let objects 899 * if some form of movement is allowed, let objects
960 * drop on that space. 900 * drop on that space.
961 */ 901 */
962 if (!drop_to_ground 902 if (!drop_to_ground
963 || !map 903 || !map
964 || map->in_memory != MAP_ACTIVE 904 || !map->linkable ()
965 || map->no_drop 905 || map->no_drop
966 || ms ().move_block == MOVE_ALL) 906 || ms ().move_block == MOVE_ALL)
967 { 907 {
968 while (inv) 908 while (inv)
969 inv->destroy (); 909 inv->destroy ();
985 map->insert (op, x, y); 925 map->insert (op, x, y);
986 } 926 }
987 } 927 }
988} 928}
989 929
930/*
931 * Remove and free all objects in the inventory of the given object.
932 * Unlike destroy_inv, this assumes the *this is destroyed as well
933 * well, so we can (and have to!) take shortcuts.
934 */
935void
936object::destroy_inv_fast ()
937{
938 while (object *op = inv)
939 {
940 // remove from object the fast way
941 op->flag [FLAG_REMOVED] = true;
942 op->env = 0;
943 if ((inv = inv->below))
944 inv->above = 0;
945
946 // then destroy
947 op->destroy ();
948 }
949}
950
951void
952object::freelist_free (int count)
953{
954 while (count-- && freelist)
955 {
956 freelist_item *next = freelist->next;
957 // count is being "destroyed"
958
959 sfree ((char *)freelist, sizeof (object));
960
961 freelist = next;
962 --free_count;
963 }
964}
965
966object *
990object *object::create () 967object::create ()
991{ 968{
992 object *op = new object; 969 object *op;
970
971 if (freelist)
972 {
973 freelist_item li = *freelist;
974 memset (freelist, 0, sizeof (object));
975
976 op = new (freelist) object;
977 op->count = li.count;
978
979 freelist = li.next;
980 --free_count;
981 }
982 else
983 {
984 void *ni = salloc0<char> (sizeof (object));
985
986 op = new(ni) object;
987
988 op->count = ++object_count;
989 }
990
993 op->link (); 991 op->link ();
992
994 return op; 993 return op;
995} 994}
996 995
997static struct freed_map : maptile 996void
997object::do_delete ()
998{ 998{
999 freed_map () 999 uint32_t count = this->count;
1000 {
1001 path = "<freed objects map>";
1002 name = "/internal/freed_objects_map";
1003 width = 3;
1004 height = 3;
1005 no_drop = 1;
1006 no_reset = 1;
1007 1000
1008 alloc (); 1001 this->~object ();
1009 in_memory = MAP_ACTIVE;
1010 }
1011 1002
1012 ~freed_map () 1003 freelist_item *li = (freelist_item *)this;
1013 { 1004 li->next = freelist;
1014 destroy (); 1005 li->count = count;
1015 } 1006
1016} freed_map; // freed objects are moved here to avoid crashes 1007 freelist = li;
1008 ++free_count;
1009}
1017 1010
1018void 1011void
1019object::do_destroy () 1012object::do_destroy ()
1020{ 1013{
1021 if (flag [FLAG_IS_LINKED]) 1014 if (flag [FLAG_IS_LINKED])
1064 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1057 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1065 head->destroy (); 1058 head->destroy ();
1066 return; 1059 return;
1067 } 1060 }
1068 1061
1069 destroy_inv (false); 1062 destroy_inv_fast ();
1070 1063
1071 if (is_head ()) 1064 if (is_head ())
1072 if (sound_destroy) 1065 if (sound_destroy)
1073 play_sound (sound_destroy); 1066 play_sound (sound_destroy);
1074 else if (flag [FLAG_MONSTER]) 1067 else if (flag [FLAG_MONSTER])
1106 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed 1099 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1107 if (object *pl = visible_to ()) 1100 if (object *pl = visible_to ())
1108 esrv_del_item (pl->contr, count); 1101 esrv_del_item (pl->contr, count);
1109 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1102 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1110 1103
1111 adjust_weight (env, -total_weight ()); 1104 adjust_weight (env, total_weight (), 0);
1112 1105
1113 object *pl = in_player (); 1106 object *pl = in_player ();
1114 1107
1115 /* we set up values so that it could be inserted into 1108 /* we set up values so that it could be inserted into
1116 * the map, but we don't actually do that - it is up 1109 * the map, but we don't actually do that - it is up
1126 1119
1127 above = 0; 1120 above = 0;
1128 below = 0; 1121 below = 0;
1129 env = 0; 1122 env = 0;
1130 1123
1131 /* NO_FIX_PLAYER is set when a great many changes are being 1124 if (pl && pl->is_player ())
1132 * made to players inventory. If set, avoiding the call
1133 * to save cpu time.
1134 */ 1125 {
1135 if (pl) 1126 if (expect_false (pl->contr->combat_ob == this))
1136 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1137 { 1127 {
1138 pl->update_stats (); 1128 pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1129 pl->contr->combat_ob = 0;
1130 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1131 }
1139 1132
1133 if (expect_false (pl->contr->ranged_ob == this))
1134 {
1135 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1136 pl->contr->ranged_ob = 0;
1137 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1138 }
1139
1140 pl->contr->queue_stats_update ();
1141
1140 if (glow_radius && pl->is_on_map ()) 1142 if (expect_false (glow_radius) && pl->is_on_map ())
1141 update_all_los (pl->map, pl->x, pl->y); 1143 update_all_los (pl->map, pl->x, pl->y);
1142 } 1144 }
1143 } 1145 }
1144 else if (map) 1146 else if (map)
1145 { 1147 {
1146 map->dirty = true; 1148 map->dirty = true;
1147 mapspace &ms = this->ms (); 1149 mapspace &ms = this->ms ();
1165 else if (pl->container_ () == this) 1167 else if (pl->container_ () == this)
1166 { 1168 {
1167 // removing a container should close it 1169 // removing a container should close it
1168 close_container (); 1170 close_container ();
1169 } 1171 }
1170 1172 else
1171 esrv_del_item (pl->contr, count); 1173 esrv_del_item (pl->contr, count);
1172 } 1174 }
1173 1175
1174 /* link the object above us */ 1176 /* link the object above us */
1175 // re-link, make sure compiler can easily use cmove 1177 // re-link, make sure compiler can easily use cmove
1176 *(above ? &above->below : &ms.top) = below; 1178 *(above ? &above->below : &ms.top) = below;
1178 1180
1179 above = 0; 1181 above = 0;
1180 below = 0; 1182 below = 0;
1181 1183
1182 ms.invalidate (); 1184 ms.invalidate ();
1183
1184 if (map->in_memory == MAP_SAVING)
1185 return;
1186 1185
1187 int check_walk_off = !flag [FLAG_NO_APPLY]; 1186 int check_walk_off = !flag [FLAG_NO_APPLY];
1188 1187
1189 if (object *pl = ms.player ()) 1188 if (object *pl = ms.player ())
1190 { 1189 {
1267 1266
1268 object *prev = this; 1267 object *prev = this;
1269 1268
1270 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1269 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1271 { 1270 {
1272 object *op = arch_to_object (at); 1271 object *op = at->instance ();
1273 1272
1274 op->name = name; 1273 op->name = name;
1275 op->name_pl = name_pl; 1274 op->name_pl = name_pl;
1276 op->title = title; 1275 op->title = title;
1277 1276
1315 * Passing 0 for flag gives proper default values, so flag really only needs 1314 * Passing 0 for flag gives proper default values, so flag really only needs
1316 * to be set if special handling is needed. 1315 * to be set if special handling is needed.
1317 * 1316 *
1318 * Return value: 1317 * Return value:
1319 * new object if 'op' was merged with other object 1318 * new object if 'op' was merged with other object
1320 * NULL if 'op' was destroyed 1319 * NULL if there was an error (destroyed, blocked etc.)
1321 * just 'op' otherwise 1320 * just 'op' otherwise
1322 */ 1321 */
1323object * 1322object *
1324insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1323insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1325{ 1324{
1326 op->remove (); 1325 op->remove ();
1327 1326
1328 if (m == &freed_map)//D TODO: remove soon 1327 if (m == &freed_map)//D TODO: remove soon
1329 {//D 1328 {//D
1330 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D 1329 LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1331 }//D 1330 }//D
1332 1331
1333 /* Ideally, the caller figures this out. However, it complicates a lot 1332 /* Ideally, the caller figures this out. However, it complicates a lot
1334 * of areas of callers (eg, anything that uses find_free_spot would now 1333 * of areas of callers (eg, anything that uses find_free_spot would now
1335 * need extra work 1334 * need extra work
1362 // from here :/ 1361 // from here :/
1363 op->nrof += tmp->nrof; 1362 op->nrof += tmp->nrof;
1364 tmp->destroy (); 1363 tmp->destroy ();
1365 } 1364 }
1366 1365
1367 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1366 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1368 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1367 op->clr_flag (FLAG_INV_LOCKED);
1369 1368
1370 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1369 if (!op->flag [FLAG_ALIVE])
1371 CLEAR_FLAG (op, FLAG_NO_STEAL); 1370 op->clr_flag (FLAG_NO_STEAL);
1372 1371
1373 if (flag & INS_BELOW_ORIGINATOR) 1372 if (flag & INS_BELOW_ORIGINATOR)
1374 { 1373 {
1375 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1374 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1376 { 1375 {
1411 * when lots of spells are cast in one area. Currently, it is presumed 1410 * when lots of spells are cast in one area. Currently, it is presumed
1412 * that flying non pickable objects are spell objects. 1411 * that flying non pickable objects are spell objects.
1413 */ 1412 */
1414 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1413 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1415 { 1414 {
1416 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) 1415 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1417 floor = tmp; 1416 floor = tmp;
1418 1417
1419 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1418 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1420 { 1419 {
1421 /* We insert above top, so we want this object below this */ 1420 /* We insert above top, so we want this object below this */
1422 top = tmp->below; 1421 top = tmp->below;
1423 break; 1422 break;
1424 } 1423 }
1442 && (op->face && !faces [op->face].visibility)) 1441 && (op->face && !faces [op->face].visibility))
1443 { 1442 {
1444 object *last; 1443 object *last;
1445 1444
1446 for (last = top; last != floor; last = last->below) 1445 for (last = top; last != floor; last = last->below)
1447 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1446 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1448 break; 1447 break;
1449 1448
1450 /* Check to see if we found the object that blocks view, 1449 /* Check to see if we found the object that blocks view,
1451 * and make sure we have a below pointer for it so that 1450 * and make sure we have a below pointer for it so that
1452 * we can get inserted below this one, which requires we 1451 * we can get inserted below this one, which requires we
1525 */ 1524 */
1526 1525
1527 /* if this is not the head or flag has been passed, don't check walk on status */ 1526 /* if this is not the head or flag has been passed, don't check walk on status */
1528 if (!(flag & INS_NO_WALK_ON) && op->is_head ()) 1527 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1529 { 1528 {
1530 if (check_move_on (op, originator)) 1529 if (check_move_on (op, originator, flag))
1531 return 0; 1530 return 0;
1532 1531
1533 /* If we are a multi part object, lets work our way through the check 1532 /* If we are a multi part object, let's work our way through the check
1534 * walk on's. 1533 * walk on's.
1535 */ 1534 */
1536 for (object *tmp = op->more; tmp; tmp = tmp->more) 1535 for (object *tmp = op->more; tmp; tmp = tmp->more)
1537 if (check_move_on (tmp, originator)) 1536 if (check_move_on (tmp, originator, flag))
1538 return 0; 1537 return 0;
1539 } 1538 }
1540 1539
1541 return op; 1540 return op;
1542} 1541}
1552 1551
1553 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1552 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1554 if (tmp->arch->archname == archname) /* same archetype */ 1553 if (tmp->arch->archname == archname) /* same archetype */
1555 tmp->destroy (); 1554 tmp->destroy ();
1556 1555
1557 object *tmp = arch_to_object (archetype::find (archname)); 1556 object *tmp = archetype::find (archname)->instance ();
1558 1557
1559 tmp->x = op->x; 1558 tmp->x = op->x;
1560 tmp->y = op->y; 1559 tmp->y = op->y;
1561 1560
1562 insert_ob_in_map (tmp, op->map, op, 0); 1561 insert_ob_in_map (tmp, op->map, op, 0);
1582 if (!items // testing !items ensures we can drop at least one item 1581 if (!items // testing !items ensures we can drop at least one item
1583 || (items < m->max_items 1582 || (items < m->max_items
1584 && ms.volume () < m->max_volume)) 1583 && ms.volume () < m->max_volume))
1585 return true; 1584 return true;
1586 1585
1587 if (originator && originator->is_player ()) 1586 if (originator)
1588 originator->contr->failmsg (format ( 1587 originator->failmsgf (
1589 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", 1588 "No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
1590 query_name () 1589 query_name ()
1591 )); 1590 );
1592 1591
1593 return false; 1592 return false;
1594} 1593}
1595 1594
1596/* 1595/*
1608 1607
1609 nr = min (nr, nrof); 1608 nr = min (nr, nrof);
1610 1609
1611 if (nrof > nr) 1610 if (nrof > nr)
1612 { 1611 {
1612 weight_t oweight = total_weight ();
1613
1613 nrof -= nr; 1614 nrof -= nr;
1614 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1615 1615
1616 if (object *pl = visible_to ()) 1616 if (object *pl = visible_to ())
1617 esrv_update_item (UPD_NROF, pl, this); 1617 esrv_update_item (UPD_NROF, pl, this);
1618
1619 adjust_weight (env, oweight, total_weight ());
1618 1620
1619 return true; 1621 return true;
1620 } 1622 }
1621 else 1623 else
1622 { 1624 {
1697 if (op->nrof) 1699 if (op->nrof)
1698 for (object *tmp = inv; tmp; tmp = tmp->below) 1700 for (object *tmp = inv; tmp; tmp = tmp->below)
1699 if (object::can_merge (tmp, op)) 1701 if (object::can_merge (tmp, op))
1700 { 1702 {
1701 /* return the original object and remove inserted object 1703 /* return the original object and remove inserted object
1702 (client needs the original object) */ 1704 (client prefers the original object) */
1705
1706 // carrying must be 0 for mergable objects
1707 weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
1708
1703 tmp->nrof += op->nrof; 1709 tmp->nrof += op->nrof;
1704 1710
1705 if (object *pl = tmp->visible_to ()) 1711 if (object *pl = tmp->visible_to ())
1706 esrv_update_item (UPD_NROF, pl, tmp); 1712 esrv_update_item (UPD_NROF, pl, tmp);
1707 1713
1708 adjust_weight (this, op->total_weight ()); 1714 adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1709 1715
1710 op->destroy (); 1716 op->destroy ();
1711 op = tmp; 1717 op = tmp;
1712 goto inserted; 1718 goto inserted;
1713 } 1719 }
1729 op->flag [FLAG_REMOVED] = 0; 1735 op->flag [FLAG_REMOVED] = 0;
1730 1736
1731 if (object *pl = op->visible_to ()) 1737 if (object *pl = op->visible_to ())
1732 esrv_send_item (pl, op); 1738 esrv_send_item (pl, op);
1733 1739
1734 adjust_weight (this, op->total_weight ()); 1740 adjust_weight (this, 0, op->total_weight ());
1735 1741
1736inserted: 1742inserted:
1737 /* reset the light list and los of the players on the map */ 1743 /* reset the light list and los of the players on the map */
1738 if (op->glow_radius && is_on_map ()) 1744 if (op->glow_radius && is_on_map ())
1739 { 1745 {
1740 update_stats (); 1746 update_stats ();
1741 update_all_los (map, x, y); 1747 update_all_los (map, x, y);
1742 } 1748 }
1743 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1749 else if (is_player ())
1744 // if this is a player's inventory, update stats 1750 // if this is a player's inventory, update stats
1745 update_stats (); 1751 contr->queue_stats_update ();
1746 1752
1747 INVOKE_OBJECT (INSERT, this); 1753 INVOKE_OBJECT (INSERT, this);
1748 1754
1749 return op; 1755 return op;
1750} 1756}
1768 * MSW 2001-07-08: Check all objects on space, not just those below 1774 * MSW 2001-07-08: Check all objects on space, not just those below
1769 * object being inserted. insert_ob_in_map may not put new objects 1775 * object being inserted. insert_ob_in_map may not put new objects
1770 * on top. 1776 * on top.
1771 */ 1777 */
1772int 1778int
1773check_move_on (object *op, object *originator) 1779check_move_on (object *op, object *originator, int flags)
1774{ 1780{
1775 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1781 if (op->flag [FLAG_NO_APPLY])
1776 return 0; 1782 return 0;
1777 1783
1778 object *tmp; 1784 object *tmp;
1779 maptile *m = op->map; 1785 maptile *m = op->map;
1780 int x = op->x, y = op->y; 1786 int x = op->x, y = op->y;
1817 * Second check makes sure that the movement types not being slowed 1823 * Second check makes sure that the movement types not being slowed
1818 * (~slow_move) is not blocked on this space - just because the 1824 * (~slow_move) is not blocked on this space - just because the
1819 * space doesn't slow down swimming (for example), if you can't actually 1825 * space doesn't slow down swimming (for example), if you can't actually
1820 * swim on that space, can't use it to avoid the penalty. 1826 * swim on that space, can't use it to avoid the penalty.
1821 */ 1827 */
1822 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1828 if (!op->flag [FLAG_WIZPASS])
1823 { 1829 {
1824 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1830 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1825 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1831 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1826 { 1832 {
1827 float diff = tmp->move_slow_penalty * fabs (op->speed); 1833 float diff = tmp->move_slow_penalty * fabs (op->speed);
1837 1843
1838 /* Basically same logic as above, except now for actual apply. */ 1844 /* Basically same logic as above, except now for actual apply. */
1839 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1845 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1840 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1846 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1841 { 1847 {
1848 if ((flags & INS_NO_AUTO_EXIT)
1849 && (tmp->type == EXIT || tmp->type == TELEPORTER
1850 || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
1851 continue;
1852
1842 move_apply (tmp, op, originator); 1853 move_apply (tmp, op, originator);
1843 1854
1844 if (op->destroyed ()) 1855 if (op->destroyed ())
1845 return 1; 1856 return 1;
1846 1857
1958void 1969void
1959flag_inv (object *op, int flag) 1970flag_inv (object *op, int flag)
1960{ 1971{
1961 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1972 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1962 { 1973 {
1963 SET_FLAG (tmp, flag); 1974 tmp->set_flag (flag);
1964 flag_inv (tmp, flag); 1975 flag_inv (tmp, flag);
1965 } 1976 }
1966} 1977}
1967 1978
1968/* 1979/*
1971void 1982void
1972unflag_inv (object *op, int flag) 1983unflag_inv (object *op, int flag)
1973{ 1984{
1974 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1985 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1975 { 1986 {
1976 CLEAR_FLAG (tmp, flag); 1987 tmp->clr_flag (flag);
1977 unflag_inv (tmp, flag); 1988 unflag_inv (tmp, flag);
1978 } 1989 }
1979} 1990}
1980 1991
1981/* 1992/*
1998 */ 2009 */
1999int 2010int
2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2011find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2001{ 2012{
2002 int altern[SIZEOFFREE]; 2013 int altern[SIZEOFFREE];
2003 int index = 0, flag; 2014 int index = 0;
2004 2015
2005 for (int i = start; i < stop; i++) 2016 for (int i = start; i < stop; i++)
2006 { 2017 {
2007 mapxy pos (m, x, y); pos.move (i); 2018 mapxy pos (m, x, y); pos.move (i);
2008 2019
2120 * there is capable of. 2131 * there is capable of.
2121 */ 2132 */
2122int 2133int
2123find_dir (maptile *m, int x, int y, object *exclude) 2134find_dir (maptile *m, int x, int y, object *exclude)
2124{ 2135{
2125 int max = SIZEOFFREE, mflags; 2136 int max = SIZEOFFREE;
2126 MoveType move_type; 2137 MoveType move_type;
2127 2138
2128 if (exclude && exclude->head_ () != exclude) 2139 if (exclude && exclude->head_ () != exclude)
2129 { 2140 {
2130 exclude = exclude->head; 2141 exclude = exclude->head;
2171{ 2182{
2172 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2183 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2173} 2184}
2174 2185
2175/* 2186/*
2176 * find_dir_2(delta-x,delta-y) will return a direction in which 2187 * find_dir_2(delta-x,delta-y) will return a direction value
2177 * an object which has subtracted the x and y coordinates of another 2188 * for running into direct [dx, dy].
2178 * object, needs to travel toward it. 2189 * (the opposite of crossfire's find_dir_2!)
2179 */ 2190 */
2180int 2191int
2181find_dir_2 (int x, int y) 2192find_dir_2 (int x, int y)
2182{ 2193{
2194#if 1 // new algorithm
2195 // this works by putting x, y into 16 sectors, which
2196 // are not equal sized, but are a better approximation
2197 // then the old algorithm, and then using a mapping
2198 // table to map it into a direction value.
2199 // basically, it maps these comparisons to each bit
2200 // bit #3: x < 0
2201 // bit #2: y < 0
2202 // bit #1: x > y
2203 // bit #0: x > 2y
2204
2205 static const uint8 dir[16] = {
2206 4, 5, 4, 3,
2207 2, 1, 2, 3,
2208 6, 5, 6, 7,
2209 8, 1, 8, 7,
2210 };
2211 int sector = 0;
2212
2213 // this is a bit ugly, but more likely to result in branchless code
2214 sector |= x < 0 ? 8 : 0;
2215 x = x < 0 ? -x : x; // abs
2216
2217 sector |= y < 0 ? 4 : 0;
2218 y = y < 0 ? -y : y; // abs
2219
2220 if (x > y)
2221 {
2222 sector |= 2;
2223
2224 if (x > y * 2)
2225 sector |= 1;
2226 }
2227 else
2228 {
2229 if (y > x * 2)
2230 sector |= 1;
2231 else if (!y)
2232 return 0; // x == 0 here
2233 }
2234
2235 return dir [sector];
2236#else // old algorithm
2183 int q; 2237 int q;
2184 2238
2185 if (y) 2239 if (y)
2186 q = x * 100 / y; 2240 q = 128 * x / y;
2187 else if (x) 2241 else if (x)
2188 q = -300 * x; 2242 q = -512 * x; // to make it > 309
2189 else 2243 else
2190 return 0; 2244 return 0;
2191 2245
2192 if (y > 0) 2246 if (y > 0)
2193 { 2247 {
2194 if (q < -242) 2248 if (q < -309) return 7;
2249 if (q < -52) return 6;
2250 if (q < 52) return 5;
2251 if (q < 309) return 4;
2252
2195 return 3; 2253 return 3;
2196 if (q < -41) 2254 }
2197 return 2; 2255 else
2198 if (q < 41) 2256 {
2199 return 1; 2257 if (q < -309) return 3;
2200 if (q < 242) 2258 if (q < -52) return 2;
2201 return 8; 2259 if (q < 52) return 1;
2260 if (q < 309) return 8;
2261
2202 return 7; 2262 return 7;
2203 } 2263 }
2204 2264#endif
2205 if (q < -242)
2206 return 7;
2207 if (q < -41)
2208 return 6;
2209 if (q < 41)
2210 return 5;
2211 if (q < 242)
2212 return 4;
2213
2214 return 3;
2215} 2265}
2216 2266
2217/* 2267/*
2218 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2268 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2219 * between two directions (which are expected to be absolute (see absdir()) 2269 * between two directions (which are expected to be absolute (see absdir())
2220 */ 2270 */
2221int 2271int
2222dirdiff (int dir1, int dir2) 2272dirdiff (int dir1, int dir2)
2223{ 2273{
2224 int d;
2225
2226 d = abs (dir1 - dir2); 2274 int d = abs (dir1 - dir2);
2227 if (d > 4)
2228 d = 8 - d;
2229 2275
2230 return d; 2276 return d > 4 ? 8 - d : d;
2231} 2277}
2232 2278
2233/* peterm: 2279/* peterm:
2234 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2280 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2235 * Basically, this is a table of directions, and what directions 2281 * Basically, this is a table of directions, and what directions
2341 * Add a check so we can't pick up invisible objects (0.93.8) 2387 * Add a check so we can't pick up invisible objects (0.93.8)
2342 */ 2388 */
2343int 2389int
2344can_pick (const object *who, const object *item) 2390can_pick (const object *who, const object *item)
2345{ 2391{
2346 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2392 return /*who->flag [FLAG_WIZ]|| */
2347 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2393 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2348 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); 2394 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2349} 2395}
2396
2397//-GPL
2350 2398
2351/* 2399/*
2352 * create clone from object to another 2400 * create clone from object to another
2353 */ 2401 */
2354object * 2402object *
2385 return tmp; 2433 return tmp;
2386 2434
2387 return 0; 2435 return 0;
2388} 2436}
2389 2437
2438/* Zero the key_values on op, decrementing the shared-string
2439 * refcounts and freeing the links.
2440 */
2441void
2442key_values::clear ()
2443{
2444 for (key_value *kvp = first; kvp; )
2445 {
2446 key_value *next = kvp->next;
2447 delete kvp;
2448 kvp = next;
2449 }
2450
2451 first = 0;
2452}
2453
2390shstr_tmp 2454shstr_tmp
2391object::kv_get (shstr_tmp key) const 2455key_values::get (shstr_tmp key) const
2392{ 2456{
2393 for (key_value *kv = key_values; kv; kv = kv->next) 2457 for (key_value *kv = first; kv; kv = kv->next)
2394 if (kv->key == key) 2458 if (kv->key == key)
2395 return kv->value; 2459 return kv->value;
2396 2460
2397 return shstr (); 2461 return shstr ();
2398} 2462}
2399 2463
2400void 2464void
2465key_values::add (shstr_tmp key, shstr_tmp value)
2466{
2467 key_value *kv = new key_value;
2468
2469 kv->next = first;
2470 kv->key = key;
2471 kv->value = value;
2472
2473 first = kv;
2474}
2475
2476void
2401object::kv_set (shstr_tmp key, shstr_tmp value) 2477key_values::set (shstr_tmp key, shstr_tmp value)
2402{ 2478{
2403 for (key_value *kv = key_values; kv; kv = kv->next) 2479 for (key_value *kv = first; kv; kv = kv->next)
2404 if (kv->key == key) 2480 if (kv->key == key)
2405 { 2481 {
2406 kv->value = value; 2482 kv->value = value;
2407 return; 2483 return;
2408 } 2484 }
2409 2485
2410 key_value *kv = new key_value; 2486 add (key, value);
2411
2412 kv->next = key_values;
2413 kv->key = key;
2414 kv->value = value;
2415
2416 key_values = kv;
2417} 2487}
2418 2488
2419void 2489void
2420object::kv_del (shstr_tmp key) 2490key_values::del (shstr_tmp key)
2421{ 2491{
2422 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2492 for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2423 if ((*kvp)->key == key) 2493 if ((*kvp)->key == key)
2424 { 2494 {
2425 key_value *kv = *kvp; 2495 key_value *kv = *kvp;
2426 *kvp = (*kvp)->next; 2496 *kvp = (*kvp)->next;
2427 delete kv; 2497 delete kv;
2428 return; 2498 return;
2429 } 2499 }
2500}
2501
2502void
2503key_values::reverse ()
2504{
2505 key_value *prev = 0;
2506 key_value *head = first;
2507
2508 while (head)
2509 {
2510 key_value *node = head;
2511 head = head->next;
2512 node->next = prev;
2513 prev = node;
2514 }
2515
2516 first = prev;
2517}
2518
2519key_values &
2520key_values::operator =(const key_values &kv)
2521{
2522 clear ();
2523
2524 for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
2525 add (kvp->key, kvp->value);
2526
2527 reverse ();
2430} 2528}
2431 2529
2432object::depth_iterator::depth_iterator (object *container) 2530object::depth_iterator::depth_iterator (object *container)
2433: iterator_base (container) 2531: iterator_base (container)
2434{ 2532{
2518{ 2616{
2519 return map ? map->region (x, y) 2617 return map ? map->region (x, y)
2520 : region::default_region (); 2618 : region::default_region ();
2521} 2619}
2522 2620
2621//+GPL
2622
2523void 2623void
2524object::open_container (object *new_container) 2624object::open_container (object *new_container)
2525{ 2625{
2526 if (container == new_container) 2626 if (container == new_container)
2527 return; 2627 return;
2561 // TODO: this does not seem to serve any purpose anymore? 2661 // TODO: this does not seem to serve any purpose anymore?
2562#if 0 2662#if 0
2563 // insert the "Close Container" object. 2663 // insert the "Close Container" object.
2564 if (archetype *closer = new_container->other_arch) 2664 if (archetype *closer = new_container->other_arch)
2565 { 2665 {
2566 object *closer = arch_to_object (new_container->other_arch); 2666 object *closer = new_container->other_arch->instance ();
2567 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2667 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2568 new_container->insert (closer); 2668 new_container->insert (closer);
2569 } 2669 }
2570#endif 2670#endif
2571 2671
2583 play_sound (sound_find ("chest_open")); 2683 play_sound (sound_find ("chest_open"));
2584 } 2684 }
2585// else if (!old_container->env && contr && contr->ns) 2685// else if (!old_container->env && contr && contr->ns)
2586// contr->ns->floorbox_reset (); 2686// contr->ns->floorbox_reset ();
2587} 2687}
2688
2689//-GPL
2690
2691// prefetch some flat area around the player
2692static void
2693prefetch_surrounding_area (object *op, maptile *map, int range)
2694{
2695 for (maprect *rect = map->split_to_tiles (mapwalk_buf,
2696 op->x - range , op->y - range ,
2697 op->x + range + 1, op->y + range + 1);
2698 rect->m;
2699 ++rect)
2700 {
2701 rect->m->touch ();
2702 rect->m->activate ();
2703 }
2704}
2705
2706// prefetch a generous area around the player, also up and down
2707void
2708object::prefetch_surrounding_maps ()
2709{
2710 prefetch_surrounding_area (this, map, 40);
2711
2712 if (maptile *m = map->tile_available (TILE_DOWN))
2713 prefetch_surrounding_area (this, m, 20);
2714
2715 if (maptile *m = map->tile_available (TILE_UP))
2716 prefetch_surrounding_area (this, m, 20);
2717}
2718
2719//+GPL
2588 2720
2589object * 2721object *
2590object::force_find (shstr_tmp name) 2722object::force_find (shstr_tmp name)
2591{ 2723{
2592 /* cycle through his inventory to look for the MARK we want to 2724 /* cycle through his inventory to look for the MARK we want to
2597 return splay (tmp); 2729 return splay (tmp);
2598 2730
2599 return 0; 2731 return 0;
2600} 2732}
2601 2733
2602//-GPL
2603
2604void 2734void
2605object::force_set_timer (int duration) 2735object::force_set_timer (int duration)
2606{ 2736{
2607 this->duration = 1; 2737 this->duration = 1;
2608 this->speed_left = -1.f; 2738 this->speed_left = -1.f;
2614object::force_add (shstr_tmp name, int duration) 2744object::force_add (shstr_tmp name, int duration)
2615{ 2745{
2616 if (object *force = force_find (name)) 2746 if (object *force = force_find (name))
2617 force->destroy (); 2747 force->destroy ();
2618 2748
2619 object *force = get_archetype (FORCE_NAME); 2749 object *force = archetype::get (FORCE_NAME);
2620 2750
2621 force->slaying = name; 2751 force->slaying = name;
2622 force->force_set_timer (duration); 2752 force->force_set_timer (duration);
2623 force->flag [FLAG_APPLIED] = true; 2753 force->flag [FLAG_APPLIED] = true;
2624 2754
2677 2807
2678 insert (force); 2808 insert (force);
2679 } 2809 }
2680} 2810}
2681 2811
2812void object::change_move_type (MoveType mt)
2813{
2814 if (move_type == mt)
2815 return;
2816
2817 if (is_on_map ())
2818 {
2819 // we are on the map, so handle move_on/off effects
2820 remove ();
2821 move_type = mt;
2822 map->insert (this, x, y, this);
2823 }
2824 else
2825 move_type = mt;
2826}
2827
2828/* object should be a player.
2829 * we return the object the player has marked with the 'mark' command
2830 * below. If no match is found (or object has changed), we return
2831 * NULL. We leave it up to the calling function to print messages if
2832 * nothing is found.
2833 */
2834object *
2835object::mark () const
2836{
2837 if (contr && contr->mark && contr->mark->env == this)
2838 return contr->mark;
2839 else
2840 return 0;
2841}
2842
2843// put marked object first in the inventory
2844// this is used by identify-like spells so players can influence
2845// the order a bit.
2846void
2847object::splay_marked ()
2848{
2849 if (object *marked = mark ())
2850 splay (marked);
2851}
2852

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines