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.68 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
28#include <stdio.h> 29#include <stdio.h>
29#include <sys/types.h> 30#include <sys/types.h>
30#include <sys/uio.h> 31#include <sys/uio.h>
31#include <object.h> 32#include <object.h>
32#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
33#include <loader.h> 35#include <loader.h>
34 36
35#include <bitset> 37#include <bitset>
36 38
37int nrofallocobjects = 0; 39int nrofallocobjects = 0;
38static UUID uuid; 40static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 41const uint64 UUID_SKIP = 1<<19;
40 42
41object *active_objects; /* List of active objects that need to be processed */ 43objectvec objects;
44activevec actives;
42 45
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 46short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 48};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
… …
141 * objects with lists are rare, and lists stay short. If not, use a 144 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 145 * different structure or at least keep the lists sorted...
143 */ 146 */
144 147
145 /* For each field in wants, */ 148 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 149 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 150 {
148 key_value *has_field; 151 key_value *has_field;
149 152
150 /* Look for a field in has with the same key. */ 153 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 154 has_field = get_ob_key_link (has, wants_field->key);
… …
190 * Check nrof variable *before* calling can_merge() 193 * Check nrof variable *before* calling can_merge()
191 * 194 *
192 * Improvements made with merge: Better checking on potion, and also 195 * Improvements made with merge: Better checking on potion, and also
193 * check weight 196 * check weight
194 */ 197 */
195
196bool object::can_merge_slow (object *ob1, object *ob2) 198bool object::can_merge_slow (object *ob1, object *ob2)
197{ 199{
198 /* A couple quicksanity checks */ 200 /* A couple quicksanity checks */
199 if (ob1 == ob2 201 if (ob1 == ob2
200 || ob1->type != ob2->type 202 || ob1->type != ob2->type
… …
221 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222 224
223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 225 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 226 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225 227
226
227 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 228 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
228 || ob1->arch != ob2->arch 229 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 230 || ob1->name != ob2->name
230 || ob1->title != ob2->title 231 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 232 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 233 || ob1->weight != ob2->weight
… …
278 279
279 /* Note sure why the following is the case - either the object has to 280 /* Note sure why the following is the case - either the object has to
280 * be animated or have a very low speed. Is this an attempted monster 281 * be animated or have a very low speed. Is this an attempted monster
281 * check? 282 * check?
282 */ 283 */
283 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 284 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
284 return 0; 285 return 0;
285 286
286 switch (ob1->type) 287 switch (ob1->type)
287 { 288 {
288 case SCROLL: 289 case SCROLL:
… …
324sum_weight (object *op) 325sum_weight (object *op)
325{ 326{
326 long sum; 327 long sum;
327 object *inv; 328 object *inv;
328 329
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 331 {
331 if (inv->inv) 332 if (inv->inv)
332 sum_weight (inv); 333 sum_weight (inv);
334
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 336 }
335 337
336 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
… …
353 op = op->env; 355 op = op->env;
354 return op; 356 return op;
355} 357}
356 358
357/* 359/*
358 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
359 * a better check. We basically keeping traversing up until we can't
360 * or find a player.
361 */
362
363object *
364is_player_inv (object *op)
365{
366 for (; op != NULL && op->type != PLAYER; op = op->env)
367 if (op->env == op)
368 op->env = NULL;
369 return op;
370}
371
372/*
373 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
374 * Some error messages. 361 * Some error messages.
375 * The result of the dump is stored in the static global errmsg array. 362 * The result of the dump is stored in the static global errmsg array.
376 */ 363 */
377
378char * 364char *
379dump_object (object *op) 365dump_object (object *op)
380{ 366{
381 if (!op) 367 if (!op)
382 return strdup ("[NULLOBJ]"); 368 return strdup ("[NULLOBJ]");
383 369
384 object_freezer freezer; 370 object_freezer freezer;
385 save_object (freezer, op, 3); 371 op->write (freezer);
386 return freezer.as_string (); 372 return freezer.as_string ();
387} 373}
388 374
389/* 375/*
390 * get_nearest_part(multi-object, object 2) returns the part of the 376 * get_nearest_part(multi-object, object 2) returns the part of the
… …
407} 393}
408 394
409/* 395/*
410 * Returns the object which has the count-variable equal to the argument. 396 * Returns the object which has the count-variable equal to the argument.
411 */ 397 */
412
413object * 398object *
414find_object (tag_t i) 399find_object (tag_t i)
415{ 400{
416 for (object *op = object::first; op; op = op->next) 401 for_all_objects (op)
417 if (op->count == i) 402 if (op->count == i)
418 return op; 403 return op;
419 404
420 return 0; 405 return 0;
421} 406}
422 407
423/* 408/*
424 * Returns the first object which has a name equal to the argument. 409 * Returns the first object which has a name equal to the argument.
425 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
426 * Enables features like "patch <name-of-other-player> food 999" 411 * Enables features like "patch <name-of-other-player> food 999"
427 */ 412 */
428
429object * 413object *
430find_object_name (const char *str) 414find_object_name (const char *str)
431{ 415{
432 shstr_cmp str_ (str); 416 shstr_cmp str_ (str);
433 object *op; 417 object *op;
434 418
435 for (op = object::first; op != NULL; op = op->next) 419 for_all_objects (op)
436 if (op->name == str_) 420 if (op->name == str_)
437 break; 421 break;
438 422
439 return op; 423 return op;
440} 424}
… …
466 owner = owner->owner; 450 owner = owner->owner;
467 451
468 this->owner = owner; 452 this->owner = owner;
469} 453}
470 454
455bool
456object::change_weapon (object *ob)
457{
458 if (current_weapon == ob)
459 return true;
460
461 if (chosen_skill)
462 chosen_skill->flag [FLAG_APPLIED] = false;
463
464 current_weapon = ob;
465 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
466
467 if (chosen_skill)
468 chosen_skill->flag [FLAG_APPLIED] = true;
469
470 update_stats ();
471
472 if (ob)
473 {
474 // now check wether any body locations became invalid, in which case
475 // we cannot apply the weapon at the moment.
476 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
477 if (slot[i].used < 0)
478 {
479 current_weapon = chosen_skill = 0;
480 update_stats ();
481
482 new_draw_info_format (NDI_UNIQUE, 0, this,
483 "You try to balance your applied items all at once, but the %s is too much. "
484 "You need to unapply some items first.", &ob->name);
485 return false;
486 }
487
488 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
489 }
490 else
491 new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
492
493 return true;
494}
495
471/* Zero the key_values on op, decrementing the shared-string 496/* Zero the key_values on op, decrementing the shared-string
472 * refcounts and freeing the links. 497 * refcounts and freeing the links.
473 */ 498 */
474static void 499static void
475free_key_values (object *op) 500free_key_values (object *op)
476{ 501{
477 for (key_value *i = op->key_values; i != 0;) 502 for (key_value *i = op->key_values; i; )
478 { 503 {
479 key_value *next = i->next; 504 key_value *next = i->next;
480 delete i; 505 delete i;
481 506
482 i = next; 507 i = next;
483 } 508 }
484 509
485 op->key_values = 0; 510 op->key_values = 0;
486} 511}
487 512
488void object::clear () 513object &
514object::operator =(const object &src)
489{ 515{
490 attachable_base::clear (); 516 bool is_freed = flag [FLAG_FREED];
517 bool is_removed = flag [FLAG_REMOVED];
491 518
492 free_key_values (this);
493
494 owner = 0;
495 name = 0;
496 name_pl = 0;
497 title = 0;
498 race = 0;
499 slaying = 0;
500 skill = 0;
501 msg = 0;
502 lore = 0;
503 custom_name = 0;
504 materialname = 0;
505 contr = 0;
506 below = 0;
507 above = 0;
508 inv = 0;
509 container = 0;
510 env = 0;
511 more = 0;
512 head = 0;
513 map = 0;
514 active_next = 0;
515 active_prev = 0;
516
517 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
518
519 SET_FLAG (this, FLAG_REMOVED);
520
521 /* What is not cleared is next, prev, and count */
522
523 expmul = 1.0;
524 face = blank_face;
525
526 if (settings.casting_time)
527 casting_time = -1;
528}
529
530/*
531 * copy_to first frees everything allocated by the dst object,
532 * and then copies the contents of itself into the second
533 * object, allocating what needs to be allocated. Basically, any
534 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
535 * if the first object is freed, the pointers in the new object
536 * will point at garbage.
537 */
538void
539object::copy_to (object *dst)
540{
541 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
542 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
543
544 *(object_copy *)dst = *this; 519 *(object_copy *)this = src;
545 *(object_pod *)dst = *this;
546 520
547 if (self || cb) 521 flag [FLAG_FREED] = is_freed;
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 522 flag [FLAG_REMOVED] = is_removed;
549
550 if (is_freed)
551 SET_FLAG (dst, FLAG_FREED);
552
553 if (is_removed)
554 SET_FLAG (dst, FLAG_REMOVED);
555
556 if (speed < 0)
557 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
558 523
559 /* Copy over key_values, if any. */ 524 /* Copy over key_values, if any. */
560 if (key_values) 525 if (src.key_values)
561 { 526 {
562 key_value *tail = 0; 527 key_value *tail = 0;
563 key_value *i;
564
565 dst->key_values = 0; 528 key_values = 0;
566 529
567 for (i = key_values; i; i = i->next) 530 for (key_value *i = src.key_values; i; i = i->next)
568 { 531 {
569 key_value *new_link = new key_value; 532 key_value *new_link = new key_value;
570 533
571 new_link->next = 0; 534 new_link->next = 0;
572 new_link->key = i->key; 535 new_link->key = i->key;
573 new_link->value = i->value; 536 new_link->value = i->value;
574 537
575 /* Try and be clever here, too. */ 538 /* Try and be clever here, too. */
576 if (!dst->key_values) 539 if (!key_values)
577 { 540 {
578 dst->key_values = new_link; 541 key_values = new_link;
579 tail = new_link; 542 tail = new_link;
580 } 543 }
581 else 544 else
582 { 545 {
583 tail->next = new_link; 546 tail->next = new_link;
584 tail = new_link; 547 tail = new_link;
585 } 548 }
586 } 549 }
587 } 550 }
551}
588 552
589 update_ob_speed (dst); 553/*
554 * copy_to first frees everything allocated by the dst object,
555 * and then copies the contents of itself into the second
556 * object, allocating what needs to be allocated. Basically, any
557 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
558 * if the first object is freed, the pointers in the new object
559 * will point at garbage.
560 */
561void
562object::copy_to (object *dst)
563{
564 *dst = *this;
565
566 if (speed < 0)
567 dst->speed_left = speed_left - rndm ();
568
569 dst->set_speed (dst->speed);
570}
571
572void
573object::instantiate ()
574{
575 if (!uuid.seq) // HACK
576 uuid = gen_uuid ();
577
578 speed_left = -0.1f;
579 /* copy the body_info to the body_used - this is only really
580 * need for monsters, but doesn't hurt to do it for everything.
581 * by doing so, when a monster is created, it has good starting
582 * values for the body_used info, so when items are created
583 * for it, they can be properly equipped.
584 */
585 for (int i = NUM_BODY_LOCATIONS; i--; )
586 slot[i].used = slot[i].info;
587
588 attachable::instantiate ();
590} 589}
591 590
592object * 591object *
593object::clone () 592object::clone ()
594{ 593{
… …
600/* 599/*
601 * If an object with the IS_TURNABLE() flag needs to be turned due 600 * If an object with the IS_TURNABLE() flag needs to be turned due
602 * to the closest player being on the other side, this function can 601 * to the closest player being on the other side, this function can
603 * be called to update the face variable, _and_ how it looks on the map. 602 * be called to update the face variable, _and_ how it looks on the map.
604 */ 603 */
605
606void 604void
607update_turn_face (object *op) 605update_turn_face (object *op)
608{ 606{
609 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 607 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
610 return; 608 return;
609
611 SET_ANIMATION (op, op->direction); 610 SET_ANIMATION (op, op->direction);
612 update_object (op, UP_OBJ_FACE); 611 update_object (op, UP_OBJ_FACE);
613} 612}
614 613
615/* 614/*
616 * Updates the speed of an object. If the speed changes from 0 to another 615 * Updates the speed of an object. If the speed changes from 0 to another
617 * value, or vice versa, then add/remove the object from the active list. 616 * value, or vice versa, then add/remove the object from the active list.
618 * This function needs to be called whenever the speed of an object changes. 617 * This function needs to be called whenever the speed of an object changes.
619 */ 618 */
620void 619void
621update_ob_speed (object *op) 620object::set_speed (float speed)
622{ 621{
623 extern int arch_init; 622 if (flag [FLAG_FREED] && speed)
624
625 /* No reason putting the archetypes objects on the speed list,
626 * since they never really need to be updated.
627 */
628
629 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
630 { 623 {
631 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 624 LOG (llevError, "Object %s is freed but has speed.\n", &name);
632#ifdef MANY_CORES
633 abort ();
634#else
635 op->speed = 0; 625 speed = 0;
636#endif
637 }
638
639 if (arch_init)
640 return;
641
642 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
643 { 626 }
644 /* If already on active list, don't do anything */
645 if (op->active_next || op->active_prev || op == active_objects)
646 return;
647 627
648 /* process_events() expects us to insert the object at the beginning 628 this->speed = speed;
649 * of the list. */
650 op->active_next = active_objects;
651 629
652 if (op->active_next != NULL) 630 if (has_active_speed ())
653 op->active_next->active_prev = op; 631 activate ();
654
655 active_objects = op;
656 }
657 else 632 else
658 { 633 deactivate ();
659 /* If not on the active list, nothing needs to be done */
660 if (!op->active_next && !op->active_prev && op != active_objects)
661 return;
662
663 if (op->active_prev == NULL)
664 {
665 active_objects = op->active_next;
666
667 if (op->active_next != NULL)
668 op->active_next->active_prev = NULL;
669 }
670 else
671 {
672 op->active_prev->active_next = op->active_next;
673
674 if (op->active_next)
675 op->active_next->active_prev = op->active_prev;
676 }
677
678 op->active_next = NULL;
679 op->active_prev = NULL;
680 }
681} 634}
682 635
683/* This function removes object 'op' from the list of active
684 * objects.
685 * This should only be used for style maps or other such
686 * reference maps where you don't want an object that isn't
687 * in play chewing up cpu time getting processed.
688 * The reverse of this is to call update_ob_speed, which
689 * will do the right thing based on the speed of the object.
690 */
691void
692remove_from_active_list (object *op)
693{
694 /* If not on the active list, nothing needs to be done */
695 if (!op->active_next && !op->active_prev && op != active_objects)
696 return;
697
698 if (op->active_prev == NULL)
699 {
700 active_objects = op->active_next;
701 if (op->active_next != NULL)
702 op->active_next->active_prev = NULL;
703 }
704 else
705 {
706 op->active_prev->active_next = op->active_next;
707 if (op->active_next)
708 op->active_next->active_prev = op->active_prev;
709 }
710 op->active_next = NULL;
711 op->active_prev = NULL;
712}
713
714/* 636/*
715 * update_object() updates the array which represents the map. 637 * update_object() updates the the map.
716 * It takes into account invisible objects (and represent squares covered 638 * It takes into account invisible objects (and represent squares covered
717 * by invisible objects by whatever is below them (unless it's another 639 * by invisible objects by whatever is below them (unless it's another
718 * invisible object, etc...) 640 * invisible object, etc...)
719 * If the object being updated is beneath a player, the look-window 641 * If the object being updated is beneath a player, the look-window
720 * of that player is updated (this might be a suboptimal way of 642 * of that player is updated (this might be a suboptimal way of
721 * updating that window, though, since update_object() is called _often_) 643 * updating that window, though, since update_object() is called _often_)
722 * 644 *
723 * action is a hint of what the caller believes need to be done. 645 * action is a hint of what the caller believes need to be done.
724 * For example, if the only thing that has changed is the face (due to
725 * an animation), we don't need to call update_position until that actually
726 * comes into view of a player. OTOH, many other things, like addition/removal
727 * of walls or living creatures may need us to update the flags now.
728 * current action are: 646 * current action are:
729 * UP_OBJ_INSERT: op was inserted 647 * UP_OBJ_INSERT: op was inserted
730 * UP_OBJ_REMOVE: op was removed 648 * UP_OBJ_REMOVE: op was removed
731 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 649 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
732 * as that is easier than trying to look at what may have changed. 650 * as that is easier than trying to look at what may have changed.
733 * UP_OBJ_FACE: only the objects face has changed. 651 * UP_OBJ_FACE: only the objects face has changed.
734 */ 652 */
735
736void 653void
737update_object (object *op, int action) 654update_object (object *op, int action)
738{ 655{
739 int update_now = 0, flags;
740 MoveType move_on, move_off, move_block, move_slow;
741
742 if (op == NULL) 656 if (op == NULL)
743 { 657 {
744 /* this should never happen */ 658 /* this should never happen */
745 LOG (llevDebug, "update_object() called for NULL object.\n"); 659 LOG (llevDebug, "update_object() called for NULL object.\n");
746 return; 660 return;
747 } 661 }
748 662
749 if (op->env != NULL) 663 if (op->env)
750 { 664 {
751 /* Animation is currently handled by client, so nothing 665 /* Animation is currently handled by client, so nothing
752 * to do in this case. 666 * to do in this case.
753 */ 667 */
754 return; 668 return;
… …
759 */ 673 */
760 if (!op->map || op->map->in_memory == MAP_SAVING) 674 if (!op->map || op->map->in_memory == MAP_SAVING)
761 return; 675 return;
762 676
763 /* make sure the object is within map boundaries */ 677 /* make sure the object is within map boundaries */
764 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 678 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
765 { 679 {
766 LOG (llevError, "update_object() called for object out of map!\n"); 680 LOG (llevError, "update_object() called for object out of map!\n");
767#ifdef MANY_CORES 681#ifdef MANY_CORES
768 abort (); 682 abort ();
769#endif 683#endif
770 return; 684 return;
771 } 685 }
772 686
773 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 687 mapspace &m = op->ms ();
774 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
775 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
776 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
777 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
778 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
779 688
689 if (!(m.flags_ & P_UPTODATE))
690 /* nop */;
780 if (action == UP_OBJ_INSERT) 691 else if (action == UP_OBJ_INSERT)
781 { 692 {
693 // this is likely overkill, TODO: revisit (schmorp)
782 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 694 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
783 update_now = 1;
784
785 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 695 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
786 update_now = 1; 696 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
787 697 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
698 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
788 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 699 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
789 update_now = 1;
790
791 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
792 update_now = 1;
793
794 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
795 update_now = 1;
796
797 if ((move_on | op->move_on) != move_on) 700 || (m.move_on | op->move_on ) != m.move_on
798 update_now = 1;
799
800 if ((move_off | op->move_off) != move_off) 701 || (m.move_off | op->move_off ) != m.move_off
801 update_now = 1; 702 || (m.move_slow | op->move_slow) != m.move_slow
802
803 /* This isn't perfect, but I don't expect a lot of objects to 703 /* This isn't perfect, but I don't expect a lot of objects to
804 * to have move_allow right now. 704 * to have move_allow right now.
805 */ 705 */
806 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 706 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
807 update_now = 1; 707 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
808 708 m.flags_ = 0;
809 if ((move_slow | op->move_slow) != move_slow)
810 update_now = 1;
811 } 709 }
812
813 /* if the object is being removed, we can't make intelligent 710 /* if the object is being removed, we can't make intelligent
814 * decisions, because remove_ob can't really pass the object 711 * decisions, because remove_ob can't really pass the object
815 * that is being removed. 712 * that is being removed.
816 */ 713 */
817 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 714 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
818 update_now = 1; 715 m.flags_ = 0;
819 else if (action == UP_OBJ_FACE) 716 else if (action == UP_OBJ_FACE)
820 /* Nothing to do for that case */ ; 717 /* Nothing to do for that case */ ;
821 else 718 else
822 LOG (llevError, "update_object called with invalid action: %d\n", action); 719 LOG (llevError, "update_object called with invalid action: %d\n", action);
823 720
824 if (update_now)
825 {
826 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
827 update_position (op->map, op->x, op->y);
828 }
829
830 if (op->more != NULL) 721 if (op->more)
831 update_object (op->more, action); 722 update_object (op->more, action);
832}
833
834object::vector object::mortals;
835object::vector object::objects; // not yet used
836object *object::first;
837
838void object::free_mortals ()
839{
840 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
841 if ((*i)->refcnt)
842 ++i; // further delay freeing
843 else
844 {
845 delete *i;
846 mortals.erase (i);
847 }
848} 723}
849 724
850object::object () 725object::object ()
851{ 726{
852 SET_FLAG (this, FLAG_REMOVED); 727 SET_FLAG (this, FLAG_REMOVED);
… …
855 face = blank_face; 730 face = blank_face;
856} 731}
857 732
858object::~object () 733object::~object ()
859{ 734{
735 unlink ();
736
860 free_key_values (this); 737 free_key_values (this);
861} 738}
862 739
740static int object_count;
741
863void object::link () 742void object::link ()
864{ 743{
865 count = ++ob_count; 744 assert (!index);//D
866 uuid = gen_uuid (); 745 uuid = gen_uuid ();
746 count = ++object_count;
867 747
868 prev = 0; 748 refcnt_inc ();
869 next = object::first; 749 objects.insert (this);
870
871 if (object::first)
872 object::first->prev = this;
873
874 object::first = this;
875} 750}
876 751
877void object::unlink () 752void object::unlink ()
878{ 753{
879 if (this == object::first) 754 if (!index)
880 object::first = next; 755 return;
881 756
882 /* Remove this object from the list of used objects */ 757 objects.erase (this);
883 if (prev) prev->next = next; 758 refcnt_dec ();
884 if (next) next->prev = prev; 759}
885 760
886 prev = 0; 761void
887 next = 0; 762object::activate ()
763{
764 /* If already on active list, don't do anything */
765 if (active)
766 return;
767
768 if (has_active_speed ())
769 actives.insert (this);
770}
771
772void
773object::activate_recursive ()
774{
775 activate ();
776
777 for (object *op = inv; op; op = op->below)
778 op->activate_recursive ();
779}
780
781/* This function removes object 'op' from the list of active
782 * objects.
783 * This should only be used for style maps or other such
784 * reference maps where you don't want an object that isn't
785 * in play chewing up cpu time getting processed.
786 * The reverse of this is to call update_ob_speed, which
787 * will do the right thing based on the speed of the object.
788 */
789void
790object::deactivate ()
791{
792 /* If not on the active list, nothing needs to be done */
793 if (!active)
794 return;
795
796 actives.erase (this);
797}
798
799void
800object::deactivate_recursive ()
801{
802 for (object *op = inv; op; op = op->below)
803 op->deactivate_recursive ();
804
805 deactivate ();
806}
807
808void
809object::set_flag_inv (int flag, int value)
810{
811 for (object *op = inv; op; op = op->below)
812 {
813 op->flag [flag] = value;
814 op->set_flag_inv (flag, value);
815 }
816}
817
818/*
819 * Remove and free all objects in the inventory of the given object.
820 * object.c ?
821 */
822void
823object::destroy_inv (bool drop_to_ground)
824{
825 // need to check first, because the checks below might segfault
826 // as we might be on an invalid mapspace and crossfire code
827 // is too buggy to ensure that the inventory is empty.
828 // corollary: if you create arrows etc. with stuff in tis inventory,
829 // cf will crash below with off-map x and y
830 if (!inv)
831 return;
832
833 /* Only if the space blocks everything do we not process -
834 * if some form of movement is allowed, let objects
835 * drop on that space.
836 */
837 if (!drop_to_ground
838 || !map
839 || map->in_memory != MAP_IN_MEMORY
840 || map->nodrop
841 || ms ().move_block == MOVE_ALL)
842 {
843 while (inv)
844 {
845 inv->destroy_inv (drop_to_ground);
846 inv->destroy ();
847 }
848 }
849 else
850 { /* Put objects in inventory onto this space */
851 while (inv)
852 {
853 object *op = inv;
854
855 if (op->flag [FLAG_STARTEQUIP]
856 || op->flag [FLAG_NO_DROP]
857 || op->type == RUNE
858 || op->type == TRAP
859 || op->flag [FLAG_IS_A_TEMPLATE]
860 || op->flag [FLAG_DESTROY_ON_DEATH])
861 op->destroy ();
862 else
863 map->insert (op, x, y);
864 }
865 }
888} 866}
889 867
890object *object::create () 868object *object::create ()
891{ 869{
892 object *op = new object; 870 object *op = new object;
893 op->link (); 871 op->link ();
894 return op; 872 return op;
895} 873}
896 874
897/* 875void
898 * free_object() frees everything allocated by an object, removes 876object::do_destroy ()
899 * it from the list of used objects, and puts it on the list of
900 * free objects. The IS_FREED() flag is set in the object.
901 * The object must have been removed by remove_ob() first for
902 * this function to succeed.
903 *
904 * If destroy_inventory is set, free inventory as well. Else drop items in
905 * inventory to the ground.
906 */
907void object::destroy (bool destroy_inventory)
908{ 877{
909 if (QUERY_FLAG (this, FLAG_FREED)) 878 attachable::do_destroy ();
910 return;
911 879
912 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 880 if (flag [FLAG_IS_LINKED])
881 remove_button_link (this);
882
883 if (flag [FLAG_FRIENDLY])
913 remove_friendly_object (this); 884 remove_friendly_object (this);
914 885
915 if (!QUERY_FLAG (this, FLAG_REMOVED)) 886 if (!flag [FLAG_REMOVED])
916 remove (); 887 remove ();
917 888
918 SET_FLAG (this, FLAG_FREED); 889 destroy_inv (true);
919 890
920 if (more) 891 deactivate ();
921 { 892 unlink ();
922 more->destroy (destroy_inventory);
923 more = 0;
924 }
925 893
926 if (inv) 894 flag [FLAG_FREED] = 1;
927 {
928 /* Only if the space blocks everything do we not process -
929 * if some form of movement is allowed, let objects
930 * drop on that space.
931 */
932 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
933 {
934 object *op = inv;
935
936 while (op)
937 {
938 object *tmp = op->below;
939 op->destroy (destroy_inventory);
940 op = tmp;
941 }
942 }
943 else
944 { /* Put objects in inventory onto this space */
945 object *op = inv;
946
947 while (op)
948 {
949 object *tmp = op->below;
950
951 op->remove ();
952
953 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
954 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
955 op->destroy ();
956 else
957 {
958 op->x = x;
959 op->y = y;
960 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
961 }
962
963 op = tmp;
964 }
965 }
966 }
967 895
968 // hack to ensure that freed objects still have a valid map 896 // hack to ensure that freed objects still have a valid map
969 { 897 {
970 static maptile *freed_map; // freed objects are moved here to avoid crashes 898 static maptile *freed_map; // freed objects are moved here to avoid crashes
971 899
… …
975 903
976 freed_map->name = "/internal/freed_objects_map"; 904 freed_map->name = "/internal/freed_objects_map";
977 freed_map->width = 3; 905 freed_map->width = 3;
978 freed_map->height = 3; 906 freed_map->height = 3;
979 907
980 freed_map->allocate (); 908 freed_map->alloc ();
909 freed_map->in_memory = MAP_IN_MEMORY;
981 } 910 }
982 911
983 map = freed_map; 912 map = freed_map;
984 x = 1; 913 x = 1;
985 y = 1; 914 y = 1;
986 } 915 }
987 916
917 head = 0;
918
919 if (more)
920 {
921 more->destroy ();
922 more = 0;
923 }
924
988 // clear those pointers that likely might have circular references to us 925 // clear those pointers that likely might have circular references to us
989 owner = 0; 926 owner = 0;
990 enemy = 0; 927 enemy = 0;
991 attacked_by = 0; 928 attacked_by = 0;
929}
992 930
993 // only relevant for players(?), but make sure of it anyways 931void
994 contr = 0; 932object::destroy (bool destroy_inventory)
933{
934 if (destroyed ())
935 return;
995 936
996 /* Remove object from the active list */ 937 if (destroy_inventory)
997 speed = 0; 938 destroy_inv (false);
998 update_ob_speed (this);
999 939
1000 unlink (); 940 attachable::destroy ();
1001
1002 mortals.push_back (this);
1003} 941}
1004 942
1005/* 943/*
1006 * sub_weight() recursively (outwards) subtracts a number from the 944 * sub_weight() recursively (outwards) subtracts a number from the
1007 * weight of an object (and what is carried by it's environment(s)). 945 * weight of an object (and what is carried by it's environment(s)).
… …
1023 * This function removes the object op from the linked list of objects 961 * This function removes the object op from the linked list of objects
1024 * which it is currently tied to. When this function is done, the 962 * which it is currently tied to. When this function is done, the
1025 * object will have no environment. If the object previously had an 963 * object will have no environment. If the object previously had an
1026 * environment, the x and y coordinates will be updated to 964 * environment, the x and y coordinates will be updated to
1027 * the previous environment. 965 * the previous environment.
1028 * Beware: This function is called from the editor as well!
1029 */ 966 */
1030void 967void
1031object::remove () 968object::do_remove ()
1032{ 969{
1033 object *tmp, *last = 0; 970 object *tmp, *last = 0;
1034 object *otmp; 971 object *otmp;
1035 972
1036 int check_walk_off;
1037
1038 if (QUERY_FLAG (this, FLAG_REMOVED)) 973 if (QUERY_FLAG (this, FLAG_REMOVED))
1039 return; 974 return;
1040 975
1041 SET_FLAG (this, FLAG_REMOVED); 976 SET_FLAG (this, FLAG_REMOVED);
977 INVOKE_OBJECT (REMOVE, this);
1042 978
1043 if (more) 979 if (more)
1044 more->remove (); 980 more->remove ();
1045 981
1046 /* 982 /*
… …
1056 992
1057 /* NO_FIX_PLAYER is set when a great many changes are being 993 /* NO_FIX_PLAYER is set when a great many changes are being
1058 * made to players inventory. If set, avoiding the call 994 * made to players inventory. If set, avoiding the call
1059 * to save cpu time. 995 * to save cpu time.
1060 */ 996 */
1061 if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 997 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1062 fix_player (otmp); 998 otmp->update_stats ();
1063 999
1064 if (above != NULL) 1000 if (above)
1065 above->below = below; 1001 above->below = below;
1066 else 1002 else
1067 env->inv = below; 1003 env->inv = below;
1068 1004
1069 if (below != NULL) 1005 if (below)
1070 below->above = above; 1006 below->above = above;
1071 1007
1072 /* we set up values so that it could be inserted into 1008 /* we set up values so that it could be inserted into
1073 * the map, but we don't actually do that - it is up 1009 * the map, but we don't actually do that - it is up
1074 * to the caller to decide what we want to do. 1010 * to the caller to decide what we want to do.
… …
1078 above = 0, below = 0; 1014 above = 0, below = 0;
1079 env = 0; 1015 env = 0;
1080 } 1016 }
1081 else if (map) 1017 else if (map)
1082 { 1018 {
1083 /* Re did the following section of code - it looks like it had 1019 if (type == PLAYER)
1084 * lots of logic for things we no longer care about
1085 */ 1020 {
1021 // leaving a spot always closes any open container on the ground
1022 if (container && !container->env)
1023 // this causes spurious floorbox updates, but it ensures
1024 // that the CLOSE event is being sent.
1025 close_container ();
1026
1027 --map->players;
1028 map->touch ();
1029 }
1030
1031 map->dirty = true;
1032 mapspace &ms = this->ms ();
1086 1033
1087 /* link the object above us */ 1034 /* link the object above us */
1088 if (above) 1035 if (above)
1089 above->below = below; 1036 above->below = below;
1090 else 1037 else
1091 SET_MAP_TOP (map, x, y, below); /* we were top, set new top */ 1038 ms.top = below; /* we were top, set new top */
1092 1039
1093 /* Relink the object below us, if there is one */ 1040 /* Relink the object below us, if there is one */
1094 if (below) 1041 if (below)
1095 below->above = above; 1042 below->above = above;
1096 else 1043 else
… …
1098 /* Nothing below, which means we need to relink map object for this space 1045 /* Nothing below, which means we need to relink map object for this space
1099 * use translated coordinates in case some oddness with map tiling is 1046 * use translated coordinates in case some oddness with map tiling is
1100 * evident 1047 * evident
1101 */ 1048 */
1102 if (GET_MAP_OB (map, x, y) != this) 1049 if (GET_MAP_OB (map, x, y) != this)
1103 {
1104 char *dump = dump_object (this);
1105 LOG (llevError,
1106 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1050 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1107 free (dump);
1108 dump = dump_object (GET_MAP_OB (map, x, y));
1109 LOG (llevError, "%s\n", dump);
1110 free (dump);
1111 }
1112 1051
1113 SET_MAP_OB (map, x, y, above); /* goes on above it. */ 1052 ms.bot = above; /* goes on above it. */
1114 } 1053 }
1115 1054
1116 above = 0; 1055 above = 0;
1117 below = 0; 1056 below = 0;
1118 1057
1119 if (map->in_memory == MAP_SAVING) 1058 if (map->in_memory == MAP_SAVING)
1120 return; 1059 return;
1121 1060
1122 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1061 int check_walk_off = !flag [FLAG_NO_APPLY];
1123 1062
1124 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1063 for (tmp = ms.bot; tmp; tmp = tmp->above)
1125 { 1064 {
1126 /* No point updating the players look faces if he is the object 1065 /* No point updating the players look faces if he is the object
1127 * being removed. 1066 * being removed.
1128 */ 1067 */
1129 1068
… …
1133 * removed (most likely destroyed), update the player view 1072 * removed (most likely destroyed), update the player view
1134 * appropriately. 1073 * appropriately.
1135 */ 1074 */
1136 if (tmp->container == this) 1075 if (tmp->container == this)
1137 { 1076 {
1138 CLEAR_FLAG (this, FLAG_APPLIED); 1077 flag [FLAG_APPLIED] = 0;
1139 tmp->container = 0; 1078 tmp->container = 0;
1140 } 1079 }
1141 1080
1142 tmp->contr->socket->update_look = 1; 1081 if (tmp->contr->ns)
1082 tmp->contr->ns->floorbox_update ();
1143 } 1083 }
1144 1084
1145 /* See if player moving off should effect something */ 1085 /* See if object moving off should effect something */
1146 if (check_walk_off 1086 if (check_walk_off
1147 && ((move_type & tmp->move_off) 1087 && ((move_type & tmp->move_off)
1148 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1088 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1149 { 1089 {
1150 move_apply (tmp, this, 0); 1090 move_apply (tmp, this, 0);
… …
1152 if (destroyed ()) 1092 if (destroyed ())
1153 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1093 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1154 } 1094 }
1155 1095
1156 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1096 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1157 1097 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1158 if (tmp->above == tmp) 1098 if (tmp->above == tmp)
1159 tmp->above = 0; 1099 tmp->above = 0;
1160 1100
1161 last = tmp; 1101 last = tmp;
1162 } 1102 }
1163 1103
1164 /* last == NULL of there are no objects on this space */ 1104 /* last == NULL if there are no objects on this space */
1105 //TODO: this makes little sense, why only update the topmost object?
1165 if (!last) 1106 if (!last)
1166 { 1107 map->at (x, y).flags_ = 0;
1167 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1168 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1169 * those out anyways, and if there are any flags set right now, they won't
1170 * be correct anyways.
1171 */
1172 SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1173 update_position (map, x, y);
1174 }
1175 else 1108 else
1176 update_object (last, UP_OBJ_REMOVE); 1109 update_object (last, UP_OBJ_REMOVE);
1177 1110
1178 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius) 1111 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1179 update_all_los (map, x, y); 1112 update_all_los (map, x, y);
1180 } 1113 }
1181} 1114}
1182 1115
1183/* 1116/*
… …
1192merge_ob (object *op, object *top) 1125merge_ob (object *op, object *top)
1193{ 1126{
1194 if (!op->nrof) 1127 if (!op->nrof)
1195 return 0; 1128 return 0;
1196 1129
1197 if (top == NULL) 1130 if (top)
1198 for (top = op; top != NULL && top->above != NULL; top = top->above); 1131 for (top = op; top && top->above; top = top->above)
1132 ;
1199 1133
1200 for (; top != NULL; top = top->below) 1134 for (; top; top = top->below)
1201 { 1135 {
1202 if (top == op) 1136 if (top == op)
1203 continue; 1137 continue;
1204 1138
1205 if (object::can_merge (op, top)) 1139 if (object::can_merge (op, top))
… …
1214 } 1148 }
1215 1149
1216 return 0; 1150 return 0;
1217} 1151}
1218 1152
1153void
1154object::expand_tail ()
1155{
1156 if (more)
1157 return;
1158
1159 object *prev = this;
1160
1161 for (archetype *at = arch->more; at; at = at->more)
1162 {
1163 object *op = arch_to_object (at);
1164
1165 op->name = name;
1166 op->name_pl = name_pl;
1167 op->title = title;
1168
1169 op->head = this;
1170 prev->more = op;
1171
1172 prev = op;
1173 }
1174}
1175
1219/* 1176/*
1220 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1177 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1221 * job preparing multi-part monsters 1178 * job preparing multi-part monsters.
1222 */ 1179 */
1223object * 1180object *
1224insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1181insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1225{ 1182{
1226 object *tmp;
1227
1228 if (op->head)
1229 op = op->head;
1230
1231 for (tmp = op; tmp; tmp = tmp->more) 1183 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1232 { 1184 {
1233 tmp->x = x + tmp->arch->clone.x; 1185 tmp->x = x + tmp->arch->clone.x;
1234 tmp->y = y + tmp->arch->clone.y; 1186 tmp->y = y + tmp->arch->clone.y;
1235 } 1187 }
1236 1188
… …
1255 * Return value: 1207 * Return value:
1256 * new object if 'op' was merged with other object 1208 * new object if 'op' was merged with other object
1257 * NULL if 'op' was destroyed 1209 * NULL if 'op' was destroyed
1258 * just 'op' otherwise 1210 * just 'op' otherwise
1259 */ 1211 */
1260
1261object * 1212object *
1262insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1213insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1263{ 1214{
1215 assert (!op->flag [FLAG_FREED]);
1216
1264 object *tmp, *top, *floor = NULL; 1217 object *tmp, *top, *floor = NULL;
1265 sint16 x, y;
1266 1218
1267 if (QUERY_FLAG (op, FLAG_FREED)) 1219 op->remove ();
1268 {
1269 LOG (llevError, "Trying to insert freed object!\n");
1270 return NULL;
1271 }
1272 1220
1273 if (m == NULL) 1221#if 0
1274 { 1222 if (!m->active != !op->active)
1275 char *dump = dump_object (op); 1223 if (m->active)
1276 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1224 op->activate_recursive ();
1277 free (dump); 1225 else
1278 return op; 1226 op->deactivate_recursive ();
1279 } 1227#endif
1280 1228
1281 if (out_of_map (m, op->x, op->y)) 1229 if (out_of_map (m, op->x, op->y))
1282 { 1230 {
1283 char *dump = dump_object (op);
1284 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1231 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1285#ifdef MANY_CORES 1232#ifdef MANY_CORES
1286 /* Better to catch this here, as otherwise the next use of this object 1233 /* Better to catch this here, as otherwise the next use of this object
1287 * is likely to cause a crash. Better to find out where it is getting 1234 * is likely to cause a crash. Better to find out where it is getting
1288 * improperly inserted. 1235 * improperly inserted.
1289 */ 1236 */
1290 abort (); 1237 abort ();
1291#endif 1238#endif
1292 free (dump);
1293 return op; 1239 return op;
1294 } 1240 }
1295 1241
1296 if (!QUERY_FLAG (op, FLAG_REMOVED))
1297 {
1298 char *dump = dump_object (op);
1299 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300 free (dump);
1301 return op;
1302 }
1303
1304 if (op->more != NULL)
1305 {
1306 /* The part may be on a different map. */
1307
1308 object *more = op->more; 1242 if (object *more = op->more)
1309 1243 {
1310 /* We really need the caller to normalize coordinates - if
1311 * we set the map, that doesn't work if the location is within
1312 * a map and this is straddling an edge. So only if coordinate
1313 * is clear wrong do we normalize it.
1314 */
1315 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1316 more->map = get_map_from_coord (m, &more->x, &more->y);
1317 else if (!more->map)
1318 {
1319 /* For backwards compatibility - when not dealing with tiled maps,
1320 * more->map should always point to the parent.
1321 */
1322 more->map = m;
1323 }
1324
1325 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1244 if (!insert_ob_in_map (more, m, originator, flag))
1326 { 1245 {
1327 if (!op->head) 1246 if (!op->head)
1328 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1247 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1329 1248
1330 return NULL; 1249 return 0;
1331 } 1250 }
1332 } 1251 }
1333 1252
1334 CLEAR_FLAG (op, FLAG_REMOVED); 1253 CLEAR_FLAG (op, FLAG_REMOVED);
1335 1254
1336 /* Ideally, the caller figures this out. However, it complicates a lot 1255 /* Ideally, the caller figures this out. However, it complicates a lot
1337 * of areas of callers (eg, anything that uses find_free_spot would now 1256 * of areas of callers (eg, anything that uses find_free_spot would now
1338 * need extra work 1257 * need extra work
1339 */ 1258 */
1340 op->map = get_map_from_coord (m, &op->x, &op->y); 1259 if (!xy_normalise (m, op->x, op->y))
1341 x = op->x; 1260 return 0;
1342 y = op->y; 1261
1262 op->map = m;
1263 mapspace &ms = op->ms ();
1343 1264
1344 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
1345 */ 1266 */
1346 if (op->nrof && !(flag & INS_NO_MERGE)) 1267 if (op->nrof && !(flag & INS_NO_MERGE))
1347 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1268 for (tmp = ms.bot; tmp; tmp = tmp->above)
1348 if (object::can_merge (op, tmp)) 1269 if (object::can_merge (op, tmp))
1349 { 1270 {
1350 op->nrof += tmp->nrof; 1271 op->nrof += tmp->nrof;
1351 tmp->destroy (); 1272 tmp->destroy ();
1352 } 1273 }
… …
1369 op->below = originator->below; 1290 op->below = originator->below;
1370 1291
1371 if (op->below) 1292 if (op->below)
1372 op->below->above = op; 1293 op->below->above = op;
1373 else 1294 else
1374 SET_MAP_OB (op->map, op->x, op->y, op); 1295 ms.bot = op;
1375 1296
1376 /* since *below* originator, no need to update top */ 1297 /* since *below* originator, no need to update top */
1377 originator->below = op; 1298 originator->below = op;
1378 } 1299 }
1379 else 1300 else
1380 { 1301 {
1302 top = ms.bot;
1303
1381 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1382 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1305 if ((!(flag & INS_MAP_LOAD)) && top)
1383 { 1306 {
1384 object *last = NULL; 1307 object *last = 0;
1385 1308
1386 /* 1309 /*
1387 * If there are multiple objects on this space, we do some trickier handling. 1310 * If there are multiple objects on this space, we do some trickier handling.
1388 * We've already dealt with merging if appropriate. 1311 * We've already dealt with merging if appropriate.
1389 * Generally, we want to put the new object on top. But if 1312 * Generally, we want to put the new object on top. But if
… …
1393 * once we get to them. This reduces the need to traverse over all of 1316 * once we get to them. This reduces the need to traverse over all of
1394 * them when adding another one - this saves quite a bit of cpu time 1317 * them when adding another one - this saves quite a bit of cpu time
1395 * when lots of spells are cast in one area. Currently, it is presumed 1318 * when lots of spells are cast in one area. Currently, it is presumed
1396 * that flying non pickable objects are spell objects. 1319 * that flying non pickable objects are spell objects.
1397 */ 1320 */
1398 1321 for (top = ms.bot; top; top = top->above)
1399 while (top != NULL)
1400 { 1322 {
1401 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1323 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1402 floor = top; 1324 floor = top;
1403 1325
1404 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1326 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1407 top = top->below; 1329 top = top->below;
1408 break; 1330 break;
1409 } 1331 }
1410 1332
1411 last = top; 1333 last = top;
1412 top = top->above;
1413 } 1334 }
1414 1335
1415 /* Don't want top to be NULL, so set it to the last valid object */ 1336 /* Don't want top to be NULL, so set it to the last valid object */
1416 top = last; 1337 top = last;
1417 1338
… …
1419 * looks like instead of lots of conditions here. 1340 * looks like instead of lots of conditions here.
1420 * makes things faster, and effectively the same result. 1341 * makes things faster, and effectively the same result.
1421 */ 1342 */
1422 1343
1423 /* Have object 'fall below' other objects that block view. 1344 /* Have object 'fall below' other objects that block view.
1424 * Unless those objects are exits, type 66 1345 * Unless those objects are exits.
1425 * If INS_ON_TOP is used, don't do this processing 1346 * If INS_ON_TOP is used, don't do this processing
1426 * Need to find the object that in fact blocks view, otherwise 1347 * Need to find the object that in fact blocks view, otherwise
1427 * stacking is a bit odd. 1348 * stacking is a bit odd.
1428 */ 1349 */
1429 if (!(flag & INS_ON_TOP) && 1350 if (!(flag & INS_ON_TOP)
1430 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1351 && ms.flags () & P_BLOCKSVIEW
1352 && (op->face && !faces [op->face].visibility))
1431 { 1353 {
1432 for (last = top; last != floor; last = last->below) 1354 for (last = top; last != floor; last = last->below)
1433 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1355 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1434 break; 1356 break;
1357
1435 /* Check to see if we found the object that blocks view, 1358 /* Check to see if we found the object that blocks view,
1436 * and make sure we have a below pointer for it so that 1359 * and make sure we have a below pointer for it so that
1437 * we can get inserted below this one, which requires we 1360 * we can get inserted below this one, which requires we
1438 * set top to the object below us. 1361 * set top to the object below us.
1439 */ 1362 */
… …
1441 top = last->below; 1364 top = last->below;
1442 } 1365 }
1443 } /* If objects on this space */ 1366 } /* If objects on this space */
1444 1367
1445 if (flag & INS_MAP_LOAD) 1368 if (flag & INS_MAP_LOAD)
1446 top = GET_MAP_TOP (op->map, op->x, op->y); 1369 top = ms.top;
1447 1370
1448 if (flag & INS_ABOVE_FLOOR_ONLY) 1371 if (flag & INS_ABOVE_FLOOR_ONLY)
1449 top = floor; 1372 top = floor;
1450 1373
1451 /* Top is the object that our object (op) is going to get inserted above. 1374 /* Top is the object that our object (op) is going to get inserted above.
1452 */ 1375 */
1453 1376
1454 /* First object on this space */ 1377 /* First object on this space */
1455 if (!top) 1378 if (!top)
1456 { 1379 {
1457 op->above = GET_MAP_OB (op->map, op->x, op->y); 1380 op->above = ms.bot;
1458 1381
1459 if (op->above) 1382 if (op->above)
1460 op->above->below = op; 1383 op->above->below = op;
1461 1384
1462 op->below = NULL; 1385 op->below = 0;
1463 SET_MAP_OB (op->map, op->x, op->y, op); 1386 ms.bot = op;
1464 } 1387 }
1465 else 1388 else
1466 { /* get inserted into the stack above top */ 1389 { /* get inserted into the stack above top */
1467 op->above = top->above; 1390 op->above = top->above;
1468 1391
… …
1471 1394
1472 op->below = top; 1395 op->below = top;
1473 top->above = op; 1396 top->above = op;
1474 } 1397 }
1475 1398
1476 if (op->above == NULL) 1399 if (!op->above)
1477 SET_MAP_TOP (op->map, op->x, op->y, op); 1400 ms.top = op;
1478 } /* else not INS_BELOW_ORIGINATOR */ 1401 } /* else not INS_BELOW_ORIGINATOR */
1479 1402
1480 if (op->type == PLAYER) 1403 if (op->type == PLAYER)
1404 {
1481 op->contr->do_los = 1; 1405 op->contr->do_los = 1;
1406 ++op->map->players;
1407 op->map->touch ();
1408 }
1409
1410 op->map->dirty = true;
1482 1411
1483 /* If we have a floor, we know the player, if any, will be above 1412 /* If we have a floor, we know the player, if any, will be above
1484 * it, so save a few ticks and start from there. 1413 * it, so save a few ticks and start from there.
1485 */ 1414 */
1486 if (!(flag & INS_MAP_LOAD)) 1415 if (!(flag & INS_MAP_LOAD))
1487 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1416 if (object *pl = ms.player ())
1488 if (tmp->type == PLAYER) 1417 if (pl->contr->ns)
1489 tmp->contr->socket->update_look = 1; 1418 pl->contr->ns->floorbox_update ();
1490 1419
1491 /* If this object glows, it may affect lighting conditions that are 1420 /* If this object glows, it may affect lighting conditions that are
1492 * visible to others on this map. But update_all_los is really 1421 * visible to others on this map. But update_all_los is really
1493 * an inefficient way to do this, as it means los for all players 1422 * an inefficient way to do this, as it means los for all players
1494 * on the map will get recalculated. The players could very well 1423 * on the map will get recalculated. The players could very well
1495 * be far away from this change and not affected in any way - 1424 * be far away from this change and not affected in any way -
1496 * this should get redone to only look for players within range, 1425 * this should get redone to only look for players within range,
1497 * or just updating the P_NEED_UPDATE for spaces within this area 1426 * or just updating the P_UPTODATE for spaces within this area
1498 * of effect may be sufficient. 1427 * of effect may be sufficient.
1499 */ 1428 */
1500 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1429 if (op->map->darkness && (op->glow_radius != 0))
1501 update_all_los (op->map, op->x, op->y); 1430 update_all_los (op->map, op->x, op->y);
1502 1431
1503 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1432 /* updates flags (blocked, alive, no magic, etc) for this map space */
1504 update_object (op, UP_OBJ_INSERT); 1433 update_object (op, UP_OBJ_INSERT);
1505 1434
1435 INVOKE_OBJECT (INSERT, op);
1436
1506 /* Don't know if moving this to the end will break anything. However, 1437 /* Don't know if moving this to the end will break anything. However,
1507 * we want to have update_look set above before calling this. 1438 * we want to have floorbox_update called before calling this.
1508 * 1439 *
1509 * check_move_on() must be after this because code called from 1440 * check_move_on() must be after this because code called from
1510 * check_move_on() depends on correct map flags (so functions like 1441 * check_move_on() depends on correct map flags (so functions like
1511 * blocked() and wall() work properly), and these flags are updated by 1442 * blocked() and wall() work properly), and these flags are updated by
1512 * update_object(). 1443 * update_object().
… …
1514 1445
1515 /* if this is not the head or flag has been passed, don't check walk on status */ 1446 /* if this is not the head or flag has been passed, don't check walk on status */
1516 if (!(flag & INS_NO_WALK_ON) && !op->head) 1447 if (!(flag & INS_NO_WALK_ON) && !op->head)
1517 { 1448 {
1518 if (check_move_on (op, originator)) 1449 if (check_move_on (op, originator))
1519 return NULL; 1450 return 0;
1520 1451
1521 /* If we are a multi part object, lets work our way through the check 1452 /* If we are a multi part object, lets work our way through the check
1522 * walk on's. 1453 * walk on's.
1523 */ 1454 */
1524 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1455 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1525 if (check_move_on (tmp, originator)) 1456 if (check_move_on (tmp, originator))
1526 return NULL; 1457 return 0;
1527 } 1458 }
1528 1459
1529 return op; 1460 return op;
1530} 1461}
1531 1462
1532/* this function inserts an object in the map, but if it 1463/* this function inserts an object in the map, but if it
1533 * finds an object of its own type, it'll remove that one first. 1464 * finds an object of its own type, it'll remove that one first.
1534 * op is the object to insert it under: supplies x and the map. 1465 * op is the object to insert it under: supplies x and the map.
1535 */ 1466 */
1536void 1467void
1537replace_insert_ob_in_map (const char *arch_string, object *op) 1468replace_insert_ob_in_map (const char *arch_string, object *op)
1538{ 1469{
1539 object * 1470 object *tmp, *tmp1;
1540 tmp;
1541 object *
1542 tmp1;
1543 1471
1544 /* first search for itself and remove any old instances */ 1472 /* first search for itself and remove any old instances */
1545 1473
1546 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1474 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1475 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548 tmp->destroy (); 1476 tmp->destroy ();
1549 1477
1550 tmp1 = arch_to_object (archetype::find (arch_string)); 1478 tmp1 = arch_to_object (archetype::find (arch_string));
1551 1479
1552 tmp1->x = op->x; 1480 tmp1->x = op->x;
1553 tmp1->y = op->y; 1481 tmp1->y = op->y;
1554 insert_ob_in_map (tmp1, op->map, op, 0); 1482 insert_ob_in_map (tmp1, op->map, op, 0);
1483}
1484
1485object *
1486object::insert_at (object *where, object *originator, int flags)
1487{
1488 return where->map->insert (this, where->x, where->y, originator, flags);
1555} 1489}
1556 1490
1557/* 1491/*
1558 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1492 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1559 * is returned contains nr objects, and the remaining parts contains 1493 * is returned contains nr objects, and the remaining parts contains
1560 * the rest (or is removed and freed if that number is 0). 1494 * the rest (or is removed and freed if that number is 0).
1561 * On failure, NULL is returned, and the reason put into the 1495 * On failure, NULL is returned, and the reason put into the
1562 * global static errmsg array. 1496 * global static errmsg array.
1563 */ 1497 */
1564
1565object * 1498object *
1566get_split_ob (object *orig_ob, uint32 nr) 1499get_split_ob (object *orig_ob, uint32 nr)
1567{ 1500{
1568 object *newob; 1501 object *newob;
1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1502 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
… …
1600 * the amount of an object. If the amount reaches 0, the object 1533 * the amount of an object. If the amount reaches 0, the object
1601 * is subsequently removed and freed. 1534 * is subsequently removed and freed.
1602 * 1535 *
1603 * Return value: 'op' if something is left, NULL if the amount reached 0 1536 * Return value: 'op' if something is left, NULL if the amount reached 0
1604 */ 1537 */
1605
1606object * 1538object *
1607decrease_ob_nr (object *op, uint32 i) 1539decrease_ob_nr (object *op, uint32 i)
1608{ 1540{
1609 object *tmp; 1541 object *tmp;
1610 player *pl;
1611 1542
1612 if (i == 0) /* objects with op->nrof require this check */ 1543 if (i == 0) /* objects with op->nrof require this check */
1613 return op; 1544 return op;
1614 1545
1615 if (i > op->nrof) 1546 if (i > op->nrof)
1616 i = op->nrof; 1547 i = op->nrof;
1617 1548
1618 if (QUERY_FLAG (op, FLAG_REMOVED)) 1549 if (QUERY_FLAG (op, FLAG_REMOVED))
1619 op->nrof -= i; 1550 op->nrof -= i;
1620 else if (op->env != NULL) 1551 else if (op->env)
1621 { 1552 {
1622 /* is this object in the players inventory, or sub container 1553 /* is this object in the players inventory, or sub container
1623 * therein? 1554 * therein?
1624 */ 1555 */
1625 tmp = is_player_inv (op->env); 1556 tmp = op->in_player ();
1626 /* nope. Is this a container the player has opened? 1557 /* nope. Is this a container the player has opened?
1627 * If so, set tmp to that player. 1558 * If so, set tmp to that player.
1628 * IMO, searching through all the players will mostly 1559 * IMO, searching through all the players will mostly
1629 * likely be quicker than following op->env to the map, 1560 * likely be quicker than following op->env to the map,
1630 * and then searching the map for a player. 1561 * and then searching the map for a player.
1631 */ 1562 */
1632 if (!tmp) 1563 if (!tmp)
1633 { 1564 for_all_players (pl)
1634 for (pl = first_player; pl; pl = pl->next)
1635 if (pl->ob->container == op->env) 1565 if (pl->ob->container == op->env)
1566 {
1567 tmp = pl->ob;
1636 break; 1568 break;
1637 if (pl)
1638 tmp = pl->ob;
1639 else
1640 tmp = NULL;
1641 } 1569 }
1642 1570
1643 if (i < op->nrof) 1571 if (i < op->nrof)
1644 { 1572 {
1645 sub_weight (op->env, op->weight * i); 1573 sub_weight (op->env, op->weight * i);
1646 op->nrof -= i; 1574 op->nrof -= i;
1647 if (tmp) 1575 if (tmp)
1648 {
1649 esrv_send_item (tmp, op); 1576 esrv_send_item (tmp, op);
1650 }
1651 } 1577 }
1652 else 1578 else
1653 { 1579 {
1654 op->remove (); 1580 op->remove ();
1655 op->nrof = 0; 1581 op->nrof = 0;
1656 if (tmp) 1582 if (tmp)
1657 {
1658 esrv_del_item (tmp->contr, op->count); 1583 esrv_del_item (tmp->contr, op->count);
1659 }
1660 } 1584 }
1661 } 1585 }
1662 else 1586 else
1663 { 1587 {
1664 object *above = op->above; 1588 object *above = op->above;
… …
1670 op->remove (); 1594 op->remove ();
1671 op->nrof = 0; 1595 op->nrof = 0;
1672 } 1596 }
1673 1597
1674 /* Since we just removed op, op->above is null */ 1598 /* Since we just removed op, op->above is null */
1675 for (tmp = above; tmp != NULL; tmp = tmp->above) 1599 for (tmp = above; tmp; tmp = tmp->above)
1676 if (tmp->type == PLAYER) 1600 if (tmp->type == PLAYER)
1677 { 1601 {
1678 if (op->nrof) 1602 if (op->nrof)
1679 esrv_send_item (tmp, op); 1603 esrv_send_item (tmp, op);
1680 else 1604 else
… …
1685 if (op->nrof) 1609 if (op->nrof)
1686 return op; 1610 return op;
1687 else 1611 else
1688 { 1612 {
1689 op->destroy (); 1613 op->destroy ();
1690 return NULL; 1614 return 0;
1691 } 1615 }
1692} 1616}
1693 1617
1694/* 1618/*
1695 * add_weight(object, weight) adds the specified weight to an object, 1619 * add_weight(object, weight) adds the specified weight to an object,
1696 * and also updates how much the environment(s) is/are carrying. 1620 * and also updates how much the environment(s) is/are carrying.
1697 */ 1621 */
1698
1699void 1622void
1700add_weight (object *op, signed long weight) 1623add_weight (object *op, signed long weight)
1701{ 1624{
1702 while (op != NULL) 1625 while (op != NULL)
1703 { 1626 {
… …
1735 * inside the object environment. 1658 * inside the object environment.
1736 * 1659 *
1737 * The function returns now pointer to inserted item, and return value can 1660 * The function returns now pointer to inserted item, and return value can
1738 * be != op, if items are merged. -Tero 1661 * be != op, if items are merged. -Tero
1739 */ 1662 */
1740
1741object * 1663object *
1742object::insert (object *op) 1664object::insert (object *op)
1743{ 1665{
1744 object *tmp, *otmp; 1666 object *tmp, *otmp;
1745 1667
… …
1783 add_weight (this, op->weight * op->nrof); 1705 add_weight (this, op->weight * op->nrof);
1784 } 1706 }
1785 else 1707 else
1786 add_weight (this, (op->weight + op->carrying)); 1708 add_weight (this, (op->weight + op->carrying));
1787 1709
1788 otmp = is_player_inv (this); 1710 otmp = this->in_player ();
1789 if (otmp && otmp->contr) 1711 if (otmp && otmp->contr)
1790 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1712 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1791 fix_player (otmp); 1713 otmp->update_stats ();
1792 1714
1793 op->map = NULL; 1715 op->map = 0;
1794 op->env = this; 1716 op->env = this;
1795 op->above = NULL; 1717 op->above = 0;
1796 op->below = NULL; 1718 op->below = 0;
1797 op->x = 0, op->y = 0; 1719 op->x = 0, op->y = 0;
1798 1720
1799 /* reset the light list and los of the players on the map */ 1721 /* reset the light list and los of the players on the map */
1800 if ((op->glow_radius != 0) && map) 1722 if ((op->glow_radius != 0) && map)
1801 { 1723 {
1802#ifdef DEBUG_LIGHTS 1724#ifdef DEBUG_LIGHTS
1803 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1725 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1804#endif /* DEBUG_LIGHTS */ 1726#endif /* DEBUG_LIGHTS */
1805 if (MAP_DARKNESS (map)) 1727 if (map->darkness)
1806 update_all_los (map, x, y); 1728 update_all_los (map, x, y);
1807 } 1729 }
1808 1730
1809 /* Client has no idea of ordering so lets not bother ordering it here. 1731 /* Client has no idea of ordering so lets not bother ordering it here.
1810 * It sure simplifies this function... 1732 * It sure simplifies this function...
… …
1815 { 1737 {
1816 op->below = inv; 1738 op->below = inv;
1817 op->below->above = op; 1739 op->below->above = op;
1818 inv = op; 1740 inv = op;
1819 } 1741 }
1742
1743 INVOKE_OBJECT (INSERT, this);
1820 1744
1821 return op; 1745 return op;
1822} 1746}
1823 1747
1824/* 1748/*
… …
1839 * 1763 *
1840 * MSW 2001-07-08: Check all objects on space, not just those below 1764 * MSW 2001-07-08: Check all objects on space, not just those below
1841 * object being inserted. insert_ob_in_map may not put new objects 1765 * object being inserted. insert_ob_in_map may not put new objects
1842 * on top. 1766 * on top.
1843 */ 1767 */
1844
1845int 1768int
1846check_move_on (object *op, object *originator) 1769check_move_on (object *op, object *originator)
1847{ 1770{
1848 object *tmp; 1771 object *tmp;
1849 maptile *m = op->map; 1772 maptile *m = op->map;
… …
1876 1799
1877 /* The objects have to be checked from top to bottom. 1800 /* The objects have to be checked from top to bottom.
1878 * Hence, we first go to the top: 1801 * Hence, we first go to the top:
1879 */ 1802 */
1880 1803
1881 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1804 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1882 { 1805 {
1883 /* Trim the search when we find the first other spell effect 1806 /* Trim the search when we find the first other spell effect
1884 * this helps performance so that if a space has 50 spell objects, 1807 * this helps performance so that if a space has 50 spell objects,
1885 * we don't need to check all of them. 1808 * we don't need to check all of them.
1886 */ 1809 */
… …
1904 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1827 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1905 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1828 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1906 { 1829 {
1907 1830
1908 float 1831 float
1909 diff = tmp->move_slow_penalty * FABS (op->speed); 1832 diff = tmp->move_slow_penalty * fabs (op->speed);
1910 1833
1911 if (op->type == PLAYER) 1834 if (op->type == PLAYER)
1912 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1835 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1913 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1836 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1914 diff /= 4.0; 1837 diff /= 4.0;
… …
1941/* 1864/*
1942 * present_arch(arch, map, x, y) searches for any objects with 1865 * present_arch(arch, map, x, y) searches for any objects with
1943 * a matching archetype at the given map and coordinates. 1866 * a matching archetype at the given map and coordinates.
1944 * The first matching object is returned, or NULL if none. 1867 * The first matching object is returned, or NULL if none.
1945 */ 1868 */
1946
1947object * 1869object *
1948present_arch (const archetype *at, maptile *m, int x, int y) 1870present_arch (const archetype *at, maptile *m, int x, int y)
1949{ 1871{
1950 object *
1951 tmp;
1952
1953 if (m == NULL || out_of_map (m, x, y)) 1872 if (!m || out_of_map (m, x, y))
1954 { 1873 {
1955 LOG (llevError, "Present_arch called outside map.\n"); 1874 LOG (llevError, "Present_arch called outside map.\n");
1956 return NULL; 1875 return NULL;
1957 } 1876 }
1958 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1877
1878 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1959 if (tmp->arch == at) 1879 if (tmp->arch == at)
1960 return tmp; 1880 return tmp;
1881
1961 return NULL; 1882 return NULL;
1962} 1883}
1963 1884
1964/* 1885/*
1965 * present(type, map, x, y) searches for any objects with 1886 * present(type, map, x, y) searches for any objects with
1966 * a matching type variable at the given map and coordinates. 1887 * a matching type variable at the given map and coordinates.
1967 * The first matching object is returned, or NULL if none. 1888 * The first matching object is returned, or NULL if none.
1968 */ 1889 */
1969
1970object * 1890object *
1971present (unsigned char type, maptile *m, int x, int y) 1891present (unsigned char type, maptile *m, int x, int y)
1972{ 1892{
1973 object *
1974 tmp;
1975
1976 if (out_of_map (m, x, y)) 1893 if (out_of_map (m, x, y))
1977 { 1894 {
1978 LOG (llevError, "Present called outside map.\n"); 1895 LOG (llevError, "Present called outside map.\n");
1979 return NULL; 1896 return NULL;
1980 } 1897 }
1981 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1898
1899 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1982 if (tmp->type == type) 1900 if (tmp->type == type)
1983 return tmp; 1901 return tmp;
1902
1984 return NULL; 1903 return NULL;
1985} 1904}
1986 1905
1987/* 1906/*
1988 * present_in_ob(type, object) searches for any objects with 1907 * present_in_ob(type, object) searches for any objects with
1989 * a matching type variable in the inventory of the given object. 1908 * a matching type variable in the inventory of the given object.
1990 * The first matching object is returned, or NULL if none. 1909 * The first matching object is returned, or NULL if none.
1991 */ 1910 */
1992
1993object * 1911object *
1994present_in_ob (unsigned char type, const object *op) 1912present_in_ob (unsigned char type, const object *op)
1995{ 1913{
1996 object *
1997 tmp;
1998
1999 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1914 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2000 if (tmp->type == type) 1915 if (tmp->type == type)
2001 return tmp; 1916 return tmp;
1917
2002 return NULL; 1918 return NULL;
2003} 1919}
2004 1920
2005/* 1921/*
2006 * present_in_ob (type, str, object) searches for any objects with 1922 * present_in_ob (type, str, object) searches for any objects with
… …
2014 * str is the string to match against. Note that we match against 1930 * str is the string to match against. Note that we match against
2015 * the object name, not the archetype name. this is so that the 1931 * the object name, not the archetype name. this is so that the
2016 * spell code can use one object type (force), but change it's name 1932 * spell code can use one object type (force), but change it's name
2017 * to be unique. 1933 * to be unique.
2018 */ 1934 */
2019
2020object * 1935object *
2021present_in_ob_by_name (int type, const char *str, const object *op) 1936present_in_ob_by_name (int type, const char *str, const object *op)
2022{ 1937{
2023 object *
2024 tmp;
2025
2026 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1938 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2027 {
2028 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1939 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2029 return tmp; 1940 return tmp;
2030 } 1941
2031 return NULL; 1942 return 0;
2032} 1943}
2033 1944
2034/* 1945/*
2035 * present_arch_in_ob(archetype, object) searches for any objects with 1946 * present_arch_in_ob(archetype, object) searches for any objects with
2036 * a matching archetype in the inventory of the given object. 1947 * a matching archetype in the inventory of the given object.
2037 * The first matching object is returned, or NULL if none. 1948 * The first matching object is returned, or NULL if none.
2038 */ 1949 */
2039
2040object * 1950object *
2041present_arch_in_ob (const archetype *at, const object *op) 1951present_arch_in_ob (const archetype *at, const object *op)
2042{ 1952{
2043 object *
2044 tmp;
2045
2046 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1953 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047 if (tmp->arch == at) 1954 if (tmp->arch == at)
2048 return tmp; 1955 return tmp;
1956
2049 return NULL; 1957 return NULL;
2050} 1958}
2051 1959
2052/* 1960/*
2053 * activate recursively a flag on an object inventory 1961 * activate recursively a flag on an object inventory
2054 */ 1962 */
2055void 1963void
2056flag_inv (object *op, int flag) 1964flag_inv (object *op, int flag)
2057{ 1965{
2058 object *
2059 tmp;
2060
2061 if (op->inv) 1966 if (op->inv)
2062 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1967 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063 { 1968 {
2064 SET_FLAG (tmp, flag); 1969 SET_FLAG (tmp, flag);
2065 flag_inv (tmp, flag); 1970 flag_inv (tmp, flag);
2066 } 1971 }
2067} /* 1972}
1973
1974/*
2068 * desactivate recursively a flag on an object inventory 1975 * deactivate recursively a flag on an object inventory
2069 */ 1976 */
2070void 1977void
2071unflag_inv (object *op, int flag) 1978unflag_inv (object *op, int flag)
2072{ 1979{
2073 object *
2074 tmp;
2075
2076 if (op->inv) 1980 if (op->inv)
2077 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1981 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2078 { 1982 {
2079 CLEAR_FLAG (tmp, flag); 1983 CLEAR_FLAG (tmp, flag);
2080 unflag_inv (tmp, flag); 1984 unflag_inv (tmp, flag);
2081 } 1985 }
2082} 1986}
… …
2085 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1989 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2086 * all it's inventory (recursively). 1990 * all it's inventory (recursively).
2087 * If checksums are used, a player will get set_cheat called for 1991 * If checksums are used, a player will get set_cheat called for
2088 * him/her-self and all object carried by a call to this function. 1992 * him/her-self and all object carried by a call to this function.
2089 */ 1993 */
2090
2091void 1994void
2092set_cheat (object *op) 1995set_cheat (object *op)
2093{ 1996{
2094 SET_FLAG (op, FLAG_WAS_WIZ); 1997 SET_FLAG (op, FLAG_WAS_WIZ);
2095 flag_inv (op, FLAG_WAS_WIZ); 1998 flag_inv (op, FLAG_WAS_WIZ);
… …
2114 * because arch_blocked (now ob_blocked) needs to know the movement type 2017 * because arch_blocked (now ob_blocked) needs to know the movement type
2115 * to know if the space in question will block the object. We can't use 2018 * to know if the space in question will block the object. We can't use
2116 * the archetype because that isn't correct if the monster has been 2019 * the archetype because that isn't correct if the monster has been
2117 * customized, changed states, etc. 2020 * customized, changed states, etc.
2118 */ 2021 */
2119
2120int 2022int
2121find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2023find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2122{ 2024{
2123 int
2124 i,
2125 index = 0, flag; 2025 int index = 0, flag;
2126 static int
2127 altern[SIZEOFFREE]; 2026 int altern[SIZEOFFREE];
2128 2027
2129 for (i = start; i < stop; i++) 2028 for (int i = start; i < stop; i++)
2130 { 2029 {
2131 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2030 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2132 if (!flag) 2031 if (!flag)
2133 altern[index++] = i; 2032 altern [index++] = i;
2134 2033
2135 /* Basically, if we find a wall on a space, we cut down the search size. 2034 /* Basically, if we find a wall on a space, we cut down the search size.
2136 * In this way, we won't return spaces that are on another side of a wall. 2035 * In this way, we won't return spaces that are on another side of a wall.
2137 * This mostly work, but it cuts down the search size in all directions - 2036 * This mostly work, but it cuts down the search size in all directions -
2138 * if the space being examined only has a wall to the north and empty 2037 * if the space being examined only has a wall to the north and empty
2139 * spaces in all the other directions, this will reduce the search space 2038 * spaces in all the other directions, this will reduce the search space
2140 * to only the spaces immediately surrounding the target area, and 2039 * to only the spaces immediately surrounding the target area, and
2141 * won't look 2 spaces south of the target space. 2040 * won't look 2 spaces south of the target space.
2142 */ 2041 */
2143 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2144 stop = maxfree[i]; 2043 stop = maxfree[i];
2145 } 2044 }
2045
2146 if (!index) 2046 if (!index)
2147 return -1; 2047 return -1;
2048
2148 return altern[RANDOM () % index]; 2049 return altern [rndm (index)];
2149} 2050}
2150 2051
2151/* 2052/*
2152 * find_first_free_spot(archetype, maptile, x, y) works like 2053 * find_first_free_spot(archetype, maptile, x, y) works like
2153 * find_free_spot(), but it will search max number of squares. 2054 * find_free_spot(), but it will search max number of squares.
2154 * But it will return the first available spot, not a random choice. 2055 * But it will return the first available spot, not a random choice.
2155 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2056 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2156 */ 2057 */
2157
2158int 2058int
2159find_first_free_spot (const object *ob, maptile *m, int x, int y) 2059find_first_free_spot (const object *ob, maptile *m, int x, int y)
2160{ 2060{
2161 int
2162 i;
2163
2164 for (i = 0; i < SIZEOFFREE; i++) 2061 for (int i = 0; i < SIZEOFFREE; i++)
2165 {
2166 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2062 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2167 return i; 2063 return i;
2168 } 2064
2169 return -1; 2065 return -1;
2170} 2066}
2171 2067
2172/* 2068/*
2173 * The function permute(arr, begin, end) randomly reorders the array 2069 * The function permute(arr, begin, end) randomly reorders the array
2174 * arr[begin..end-1]. 2070 * arr[begin..end-1].
2071 * now uses a fisher-yates shuffle, old permute was broken
2175 */ 2072 */
2176static void 2073static void
2177permute (int *arr, int begin, int end) 2074permute (int *arr, int begin, int end)
2178{ 2075{
2179 int 2076 arr += begin;
2180 i,
2181 j,
2182 tmp,
2183 len;
2184
2185 len = end - begin; 2077 end -= begin;
2186 for (i = begin; i < end; i++)
2187 {
2188 j = begin + RANDOM () % len;
2189 2078
2190 tmp = arr[i]; 2079 while (--end)
2191 arr[i] = arr[j]; 2080 swap (arr [end], arr [rndm (end + 1)]);
2192 arr[j] = tmp;
2193 }
2194} 2081}
2195 2082
2196/* new function to make monster searching more efficient, and effective! 2083/* new function to make monster searching more efficient, and effective!
2197 * This basically returns a randomized array (in the passed pointer) of 2084 * This basically returns a randomized array (in the passed pointer) of
2198 * the spaces to find monsters. In this way, it won't always look for 2085 * the spaces to find monsters. In this way, it won't always look for
… …
2201 * the 3x3 area will be searched, just not in a predictable order. 2088 * the 3x3 area will be searched, just not in a predictable order.
2202 */ 2089 */
2203void 2090void
2204get_search_arr (int *search_arr) 2091get_search_arr (int *search_arr)
2205{ 2092{
2206 int 2093 int i;
2207 i;
2208 2094
2209 for (i = 0; i < SIZEOFFREE; i++) 2095 for (i = 0; i < SIZEOFFREE; i++)
2210 {
2211 search_arr[i] = i; 2096 search_arr[i] = i;
2212 }
2213 2097
2214 permute (search_arr, 1, SIZEOFFREE1 + 1); 2098 permute (search_arr, 1, SIZEOFFREE1 + 1);
2215 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2099 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2216 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2100 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2217} 2101}
… …
2226 * Perhaps incorrectly, but I'm making the assumption that exclude 2110 * Perhaps incorrectly, but I'm making the assumption that exclude
2227 * is actually want is going to try and move there. We need this info 2111 * is actually want is going to try and move there. We need this info
2228 * because we have to know what movement the thing looking to move 2112 * because we have to know what movement the thing looking to move
2229 * there is capable of. 2113 * there is capable of.
2230 */ 2114 */
2231
2232int 2115int
2233find_dir (maptile *m, int x, int y, object *exclude) 2116find_dir (maptile *m, int x, int y, object *exclude)
2234{ 2117{
2235 int
2236 i,
2237 max = SIZEOFFREE, mflags; 2118 int i, max = SIZEOFFREE, mflags;
2238 2119
2239 sint16 nx, ny; 2120 sint16 nx, ny;
2240 object * 2121 object *tmp;
2241 tmp;
2242 maptile * 2122 maptile *mp;
2243 mp;
2244 2123
2245 MoveType blocked, move_type; 2124 MoveType blocked, move_type;
2246 2125
2247 if (exclude && exclude->head) 2126 if (exclude && exclude->head)
2248 { 2127 {
… …
2260 mp = m; 2139 mp = m;
2261 nx = x + freearr_x[i]; 2140 nx = x + freearr_x[i];
2262 ny = y + freearr_y[i]; 2141 ny = y + freearr_y[i];
2263 2142
2264 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2143 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2144
2265 if (mflags & P_OUT_OF_MAP) 2145 if (mflags & P_OUT_OF_MAP)
2266 {
2267 max = maxfree[i]; 2146 max = maxfree[i];
2268 }
2269 else 2147 else
2270 { 2148 {
2271 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2149 mapspace &ms = mp->at (nx, ny);
2150
2151 blocked = ms.move_block;
2272 2152
2273 if ((move_type & blocked) == move_type) 2153 if ((move_type & blocked) == move_type)
2274 {
2275 max = maxfree[i]; 2154 max = maxfree[i];
2276 }
2277 else if (mflags & P_IS_ALIVE) 2155 else if (mflags & P_IS_ALIVE)
2278 { 2156 {
2279 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2157 for (tmp = ms.bot; tmp; tmp = tmp->above)
2280 { 2158 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2281 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2159 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2282 {
2283 break; 2160 break;
2284 } 2161
2285 }
2286 if (tmp) 2162 if (tmp)
2287 {
2288 return freedir[i]; 2163 return freedir[i];
2289 }
2290 } 2164 }
2291 } 2165 }
2292 } 2166 }
2167
2293 return 0; 2168 return 0;
2294} 2169}
2295 2170
2296/* 2171/*
2297 * distance(object 1, object 2) will return the square of the 2172 * distance(object 1, object 2) will return the square of the
2298 * distance between the two given objects. 2173 * distance between the two given objects.
2299 */ 2174 */
2300
2301int 2175int
2302distance (const object *ob1, const object *ob2) 2176distance (const object *ob1, const object *ob2)
2303{ 2177{
2304 int
2305 i;
2306
2307 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2178 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2308 return i;
2309} 2179}
2310 2180
2311/* 2181/*
2312 * find_dir_2(delta-x,delta-y) will return a direction in which 2182 * find_dir_2(delta-x,delta-y) will return a direction in which
2313 * an object which has subtracted the x and y coordinates of another 2183 * an object which has subtracted the x and y coordinates of another
2314 * object, needs to travel toward it. 2184 * object, needs to travel toward it.
2315 */ 2185 */
2316
2317int 2186int
2318find_dir_2 (int x, int y) 2187find_dir_2 (int x, int y)
2319{ 2188{
2320 int 2189 int q;
2321 q;
2322 2190
2323 if (y) 2191 if (y)
2324 q = x * 100 / y; 2192 q = x * 100 / y;
2325 else if (x) 2193 else if (x)
2326 q = -300 * x; 2194 q = -300 * x;
… …
2351 2219
2352 return 3; 2220 return 3;
2353} 2221}
2354 2222
2355/* 2223/*
2356 * absdir(int): Returns a number between 1 and 8, which represent
2357 * the "absolute" direction of a number (it actually takes care of
2358 * "overflow" in previous calculations of a direction).
2359 */
2360
2361int
2362absdir (int d)
2363{
2364 while (d < 1)
2365 d += 8;
2366 while (d > 8)
2367 d -= 8;
2368 return d;
2369}
2370
2371/*
2372 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2224 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2373 * between two directions (which are expected to be absolute (see absdir()) 2225 * between two directions (which are expected to be absolute (see absdir())
2374 */ 2226 */
2375
2376int 2227int
2377dirdiff (int dir1, int dir2) 2228dirdiff (int dir1, int dir2)
2378{ 2229{
2379 int 2230 int d;
2380 d;
2381 2231
2382 d = abs (dir1 - dir2); 2232 d = abs (dir1 - dir2);
2383 if (d > 4) 2233 if (d > 4)
2384 d = 8 - d; 2234 d = 8 - d;
2235
2385 return d; 2236 return d;
2386} 2237}
2387 2238
2388/* peterm: 2239/* peterm:
2389 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2240 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2392 * This basically means that if direction is 15, then it could either go 2243 * This basically means that if direction is 15, then it could either go
2393 * direction 4, 14, or 16 to get back to where we are. 2244 * direction 4, 14, or 16 to get back to where we are.
2394 * Moved from spell_util.c to object.c with the other related direction 2245 * Moved from spell_util.c to object.c with the other related direction
2395 * functions. 2246 * functions.
2396 */ 2247 */
2397
2398int
2399 reduction_dir[SIZEOFFREE][3] = { 2248int reduction_dir[SIZEOFFREE][3] = {
2400 {0, 0, 0}, /* 0 */ 2249 {0, 0, 0}, /* 0 */
2401 {0, 0, 0}, /* 1 */ 2250 {0, 0, 0}, /* 1 */
2402 {0, 0, 0}, /* 2 */ 2251 {0, 0, 0}, /* 2 */
2403 {0, 0, 0}, /* 3 */ 2252 {0, 0, 0}, /* 3 */
2404 {0, 0, 0}, /* 4 */ 2253 {0, 0, 0}, /* 4 */
… …
2452 * find a path to that monster that we found. If not, 2301 * find a path to that monster that we found. If not,
2453 * we don't bother going toward it. Returns 1 if we 2302 * we don't bother going toward it. Returns 1 if we
2454 * can see a direct way to get it 2303 * can see a direct way to get it
2455 * Modified to be map tile aware -.MSW 2304 * Modified to be map tile aware -.MSW
2456 */ 2305 */
2457
2458
2459int 2306int
2460can_see_monsterP (maptile *m, int x, int y, int dir) 2307can_see_monsterP (maptile *m, int x, int y, int dir)
2461{ 2308{
2462 sint16 dx, dy; 2309 sint16 dx, dy;
2463 int
2464 mflags; 2310 int mflags;
2465 2311
2466 if (dir < 0) 2312 if (dir < 0)
2467 return 0; /* exit condition: invalid direction */ 2313 return 0; /* exit condition: invalid direction */
2468 2314
2469 dx = x + freearr_x[dir]; 2315 dx = x + freearr_x[dir];
… …
2482 return 0; 2328 return 0;
2483 2329
2484 /* yes, can see. */ 2330 /* yes, can see. */
2485 if (dir < 9) 2331 if (dir < 9)
2486 return 1; 2332 return 1;
2333
2487 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2334 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2488 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2335 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2336 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2489} 2337}
2490
2491
2492 2338
2493/* 2339/*
2494 * can_pick(picker, item): finds out if an object is possible to be 2340 * can_pick(picker, item): finds out if an object is possible to be
2495 * picked up by the picker. Returnes 1 if it can be 2341 * picked up by the picker. Returnes 1 if it can be
2496 * picked up, otherwise 0. 2342 * picked up, otherwise 0.
… …
2507 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2353 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2508 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2354 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2509 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2355 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2510} 2356}
2511 2357
2512
2513/* 2358/*
2514 * create clone from object to another 2359 * create clone from object to another
2515 */ 2360 */
2516object * 2361object *
2517object_create_clone (object *asrc) 2362object_create_clone (object *asrc)
… …
2536 { 2381 {
2537 dst = tmp; 2382 dst = tmp;
2538 tmp->head = 0; 2383 tmp->head = 0;
2539 } 2384 }
2540 else 2385 else
2541 {
2542 tmp->head = dst; 2386 tmp->head = dst;
2543 }
2544 2387
2545 tmp->more = 0; 2388 tmp->more = 0;
2546 2389
2547 if (prev) 2390 if (prev)
2548 prev->more = tmp; 2391 prev->more = tmp;
… …
2552 2395
2553 for (item = src->inv; item; item = item->below) 2396 for (item = src->inv; item; item = item->below)
2554 insert_ob_in_ob (object_create_clone (item), dst); 2397 insert_ob_in_ob (object_create_clone (item), dst);
2555 2398
2556 return dst; 2399 return dst;
2557}
2558
2559/* GROS - Creates an object using a string representing its content. */
2560/* Basically, we save the content of the string to a temp file, then call */
2561/* load_object on it. I admit it is a highly inefficient way to make things, */
2562/* but it was simple to make and allows reusing the load_object function. */
2563/* Remember not to use load_object_str in a time-critical situation. */
2564/* Also remember that multiparts objects are not supported for now. */
2565
2566object *
2567load_object_str (const char *obstr)
2568{
2569 object *op;
2570 char filename[MAX_BUF];
2571
2572 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2573
2574 FILE *tempfile = fopen (filename, "w");
2575
2576 if (tempfile == NULL)
2577 {
2578 LOG (llevError, "Error - Unable to access load object temp file\n");
2579 return NULL;
2580 }
2581
2582 fprintf (tempfile, obstr);
2583 fclose (tempfile);
2584
2585 op = object::create ();
2586
2587 object_thawer thawer (filename);
2588
2589 if (thawer)
2590 load_object (thawer, op, 0);
2591
2592 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2593 CLEAR_FLAG (op, FLAG_REMOVED);
2594
2595 return op;
2596} 2400}
2597 2401
2598/* This returns the first object in who's inventory that 2402/* This returns the first object in who's inventory that
2599 * has the same type and subtype match. 2403 * has the same type and subtype match.
2600 * returns NULL if no match. 2404 * returns NULL if no match.
2601 */ 2405 */
2602object * 2406object *
2603find_obj_by_type_subtype (const object *who, int type, int subtype) 2407find_obj_by_type_subtype (const object *who, int type, int subtype)
2604{ 2408{
2605 object *tmp;
2606
2607 for (tmp = who->inv; tmp; tmp = tmp->below) 2409 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2608 if (tmp->type == type && tmp->subtype == subtype) 2410 if (tmp->type == type && tmp->subtype == subtype)
2609 return tmp; 2411 return tmp;
2610 2412
2611 return NULL; 2413 return 0;
2612} 2414}
2613 2415
2614/* If ob has a field named key, return the link from the list, 2416/* If ob has a field named key, return the link from the list,
2615 * otherwise return NULL. 2417 * otherwise return NULL.
2616 * 2418 *
… …
2618 * do the desired thing. 2420 * do the desired thing.
2619 */ 2421 */
2620key_value * 2422key_value *
2621get_ob_key_link (const object *ob, const char *key) 2423get_ob_key_link (const object *ob, const char *key)
2622{ 2424{
2623 key_value *link;
2624
2625 for (link = ob->key_values; link != NULL; link = link->next) 2425 for (key_value *link = ob->key_values; link; link = link->next)
2626 if (link->key == key) 2426 if (link->key == key)
2627 return link; 2427 return link;
2628 2428
2629 return NULL; 2429 return 0;
2630} 2430}
2631 2431
2632/* 2432/*
2633 * Returns the value of op has an extra_field for key, or NULL. 2433 * Returns the value of op has an extra_field for key, or NULL.
2634 * 2434 *
… …
2659 if (link->key == canonical_key) 2459 if (link->key == canonical_key)
2660 return link->value; 2460 return link->value;
2661 2461
2662 return 0; 2462 return 0;
2663} 2463}
2664
2665 2464
2666/* 2465/*
2667 * Updates the canonical_key in op to value. 2466 * Updates the canonical_key in op to value.
2668 * 2467 *
2669 * canonical_key is a shared string (value doesn't have to be). 2468 * canonical_key is a shared string (value doesn't have to be).
… …
2674 * Returns TRUE on success. 2473 * Returns TRUE on success.
2675 */ 2474 */
2676int 2475int
2677set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2476set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2678{ 2477{
2679 key_value *
2680 field = NULL, *last = NULL; 2478 key_value *field = NULL, *last = NULL;
2681 2479
2682 for (field = op->key_values; field != NULL; field = field->next) 2480 for (field = op->key_values; field != NULL; field = field->next)
2683 { 2481 {
2684 if (field->key != canonical_key) 2482 if (field->key != canonical_key)
2685 { 2483 {
… …
2713 /* IF we get here, key doesn't exist */ 2511 /* IF we get here, key doesn't exist */
2714 2512
2715 /* No field, we'll have to add it. */ 2513 /* No field, we'll have to add it. */
2716 2514
2717 if (!add_key) 2515 if (!add_key)
2718 {
2719 return FALSE; 2516 return FALSE;
2720 } 2517
2721 /* There isn't any good reason to store a null 2518 /* There isn't any good reason to store a null
2722 * value in the key/value list. If the archetype has 2519 * value in the key/value list. If the archetype has
2723 * this key, then we should also have it, so shouldn't 2520 * this key, then we should also have it, so shouldn't
2724 * be here. If user wants to store empty strings, 2521 * be here. If user wants to store empty strings,
2725 * should pass in "" 2522 * should pass in ""
… …
2774 } 2571 }
2775 else 2572 else
2776 item = item->env; 2573 item = item->env;
2777} 2574}
2778 2575
2576
2577const char *
2578object::flag_desc (char *desc, int len) const
2579{
2580 char *p = desc;
2581 bool first = true;
2582
2583 *p = 0;
2584
2585 for (int i = 0; i < NUM_FLAGS; i++)
2586 {
2587 if (len <= 10) // magic constant!
2588 {
2589 snprintf (p, len, ",...");
2590 break;
2591 }
2592
2593 if (flag [i])
2594 {
2595 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2596 len -= cnt;
2597 p += cnt;
2598 first = false;
2599 }
2600 }
2601
2602 return desc;
2603}
2604
2779// return a suitable string describing an objetc in enough detail to find it 2605// return a suitable string describing an object in enough detail to find it
2780const char * 2606const char *
2781object::debug_desc (char *info) const 2607object::debug_desc (char *info) const
2782{ 2608{
2609 char flagdesc[512];
2783 char info2[256 * 3]; 2610 char info2[256 * 4];
2784 char *p = info; 2611 char *p = info;
2785 2612
2786 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2787 count, 2614 count, uuid.seq,
2788 &name, 2615 &name,
2789 title ? " " : "", 2616 title ? "\",title:\"" : "",
2790 title ? (const char *)title : ""); 2617 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type);
2791 2619
2792 if (env) 2620 if (env)
2793 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2794 2622
2795 if (map) 2623 if (map)
2796 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2797 2625
2798 return info; 2626 return info;
2799} 2627}
2800 2628
2801const char * 2629const char *
2802object::debug_desc () const 2630object::debug_desc () const
2803{ 2631{
2804 static char info[256 * 3]; 2632 static char info[3][256 * 4];
2633 static int info_idx;
2634
2805 return debug_desc (info); 2635 return debug_desc (info [++info_idx % 3]);
2806} 2636}
2807 2637
2638struct region *
2639object::region () const
2640{
2641 return map ? map->region (x, y)
2642 : region::default_region ();
2643}
2644
2645const materialtype_t *
2646object::dominant_material () const
2647{
2648 if (materialtype_t *mat = name_to_material (materialname))
2649 return mat;
2650
2651 // omfg this is slow, this has to be temporary :)
2652 shstr unknown ("unknown");
2653
2654 return name_to_material (unknown);
2655}
2656
2657void
2658object::open_container (object *new_container)
2659{
2660 if (container == new_container)
2661 return;
2662
2663 if (object *old_container = container)
2664 {
2665 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2666 return;
2667
2668#if 0
2669 // remove the "Close old_container" object.
2670 if (object *closer = old_container->inv)
2671 if (closer->type == CLOSE_CON)
2672 closer->destroy ();
2673#endif
2674
2675 old_container->flag [FLAG_APPLIED] = 0;
2676 container = 0;
2677
2678 esrv_update_item (UPD_FLAGS, this, old_container);
2679 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2680 }
2681
2682 if (new_container)
2683 {
2684 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2685 return;
2686
2687 // TODO: this does not seem to serve any purpose anymore?
2688#if 0
2689 // insert the "Close Container" object.
2690 if (archetype *closer = new_container->other_arch)
2691 {
2692 object *closer = arch_to_object (new_container->other_arch);
2693 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2694 new_container->insert (closer);
2695 }
2696#endif
2697
2698 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2699
2700 new_container->flag [FLAG_APPLIED] = 1;
2701 container = new_container;
2702
2703 esrv_update_item (UPD_FLAGS, this, new_container);
2704 esrv_send_inventory (this, new_container);
2705 }
2706}
2707
2708

Diff Legend

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