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.39 by root, Wed Sep 13 02:05:19 2006 UTC vs.
Revision 1.87 by root, Tue Dec 26 08:54:59 2006 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
4 3
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
17 16
18 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 20
22 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22*/
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
34#include <loader.h> 33#include <loader.h>
35 34
35#include <bitset>
36
36int nrofallocobjects = 0; 37int nrofallocobjects = 0;
37static UUID uuid; 38static UUID uuid;
38const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
39 40
40object *objects; /* Pointer to the list of used objects */
41object *active_objects; /* List of active objects that need to be processed */ 41object *active_objects; /* List of active objects that need to be processed */
42 42
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, 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,
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 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
45}; 45};
… …
106 _exit (1); 106 _exit (1);
107 } 107 }
108 108
109 uuid.seq = uid; 109 uuid.seq = uid;
110 write_uuid (); 110 write_uuid ();
111 LOG (llevDebug, "read UID: %lld\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112 fclose (fp); 112 fclose (fp);
113} 113}
114 114
115UUID 115UUID
116gen_uuid () 116gen_uuid ()
… …
141 * objects with lists are rare, and lists stay short. If not, use a 141 * objects with lists are rare, and lists stay short. If not, use a
142 * different structure or at least keep the lists sorted... 142 * different structure or at least keep the lists sorted...
143 */ 143 */
144 144
145 /* For each field in wants, */ 145 /* For each field in wants, */
146 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 146 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147 { 147 {
148 key_value *has_field; 148 key_value *has_field;
149 149
150 /* Look for a field in has with the same key. */ 150 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 151 has_field = get_ob_key_link (has, wants_field->key);
… …
185 * 185 *
186 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
187 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
188 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
189 * 189 *
190 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
191 * 191 *
192 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
193 * check weight 193 * check weight
194 */ 194 */
195 195
196bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
197{ 197{
198 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
199 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
200 return 0; 204 return 0;
201 205
202 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
203 return 0;
204
205 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
207 * used to store nrof). 209 * used to store nrof).
208 */ 210 */
209 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
219 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
220 222
221 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223 225
224 226 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
226 * being locked in inventory should prevent merging.
227 * 0x4 in flags3 is CLIENT_SENT
228 */
229 if ((ob1->arch != ob2->arch) ||
230 (ob1->flags[0] != ob2->flags[0]) ||
231 (ob1->flags[1] != ob2->flags[1]) ||
232 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
235 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
236 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
237 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
238 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
241 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
242 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
243 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
244 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
245 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
246 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
247 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
248 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
249 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
250 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
251 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
252 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
253 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
254 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
255 return 0; 251 return 0;
256 252
257 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
258 * check all objects in the inventory. 254 * check all objects in the inventory.
259 */ 255 */
… …
262 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
263 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264 return 0; 260 return 0;
265 261
266 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
267 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
268 return 0; 264 return 0;
269 265
270 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
271 * if it is valid. 267 * if it is valid.
272 */ 268 */
… …
356 op = op->env; 352 op = op->env;
357 return op; 353 return op;
358} 354}
359 355
360/* 356/*
361 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
362 * a better check. We basically keeping traversing up until we can't
363 * or find a player.
364 */
365
366object *
367is_player_inv (object *op)
368{
369 for (; op != NULL && op->type != PLAYER; op = op->env)
370 if (op->env == op)
371 op->env = NULL;
372 return op;
373}
374
375/*
376 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 357 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377 * Some error messages. 358 * Some error messages.
378 * The result of the dump is stored in the static global errmsg array. 359 * The result of the dump is stored in the static global errmsg array.
379 */ 360 */
380 361
381void 362char *
382dump_object2 (object *op)
383{
384 errmsg[0] = 0;
385 return;
386 //TODO//D#d#
387#if 0
388 char *cp;
389
390/* object *tmp;*/
391
392 if (op->arch != NULL)
393 {
394 strcat (errmsg, "arch ");
395 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396 strcat (errmsg, "\n");
397 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398 strcat (errmsg, cp);
399# if 0
400 /* Don't dump player diffs - they are too long, mostly meaningless, and
401 * will overflow the buffer.
402 * Changed so that we don't dump inventory either. This may
403 * also overflow the buffer.
404 */
405 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406 strcat (errmsg, cp);
407 for (tmp = op->inv; tmp; tmp = tmp->below)
408 dump_object2 (tmp);
409# endif
410 strcat (errmsg, "end\n");
411 }
412 else
413 {
414 strcat (errmsg, "Object ");
415 if (op->name == NULL)
416 strcat (errmsg, "(null)");
417 else
418 strcat (errmsg, op->name);
419 strcat (errmsg, "\n");
420# if 0
421 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422 strcat (errmsg, cp);
423 for (tmp = op->inv; tmp; tmp = tmp->below)
424 dump_object2 (tmp);
425# endif
426 strcat (errmsg, "end\n");
427 }
428#endif
429}
430
431/*
432 * Dumps an object. Returns output in the static global errmsg array.
433 */
434
435void
436dump_object (object *op) 363dump_object (object *op)
437{ 364{
438 if (op == NULL) 365 if (!op)
439 { 366 return strdup ("[NULLOBJ]");
440 strcpy (errmsg, "[NULL pointer]");
441 return;
442 }
443 errmsg[0] = '\0';
444 dump_object2 (op);
445}
446 367
447void 368 object_freezer freezer;
448dump_all_objects (void) 369 save_object (freezer, op, 1);
449{ 370 return freezer.as_string ();
450 object *op;
451
452 for (op = objects; op != NULL; op = op->next)
453 {
454 dump_object (op);
455 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456 }
457} 371}
458 372
459/* 373/*
460 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
461 * multi-object 1 which is closest to the second object. 375 * multi-object 1 which is closest to the second object.
… …
481 */ 395 */
482 396
483object * 397object *
484find_object (tag_t i) 398find_object (tag_t i)
485{ 399{
486 object *op; 400 for (object *op = object::first; op; op = op->next)
487
488 for (op = objects; op != NULL; op = op->next)
489 if (op->count == i) 401 if (op->count == i)
490 break; 402 return op;
403
491 return op; 404 return 0;
492} 405}
493 406
494/* 407/*
495 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
496 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
… …
501find_object_name (const char *str) 414find_object_name (const char *str)
502{ 415{
503 shstr_cmp str_ (str); 416 shstr_cmp str_ (str);
504 object *op; 417 object *op;
505 418
506 for (op = objects; op != NULL; op = op->next) 419 for (op = object::first; op != NULL; op = op->next)
507 if (op->name == str_) 420 if (op->name == str_)
508 break; 421 break;
509 422
510 return op; 423 return op;
511} 424}
512 425
513void 426void
514free_all_object_data () 427free_all_object_data ()
515{ 428{
516 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517}
518
519/*
520 * Returns the object which this object marks as being the owner.
521 * A id-scheme is used to avoid pointing to objects which have been
522 * freed and are now reused. If this is detected, the owner is
523 * set to NULL, and NULL is returned.
524 * Changed 2004-02-12 - if the player is setting at the play again
525 * prompt, he is removed, and we don't want to treat him as an owner of
526 * anything, so check removed flag. I don't expect that this should break
527 * anything - once an object is removed, it is basically dead anyways.
528 */
529object *
530object::get_owner ()
531{
532 if (!owner
533 || QUERY_FLAG (owner, FLAG_FREED)
534 || QUERY_FLAG (owner, FLAG_REMOVED))
535 owner = 0;
536
537 return owner;
538} 430}
539 431
540/* 432/*
541 * Sets the owner and sets the skill and exp pointers to owner's current 433 * Sets the owner and sets the skill and exp pointers to owner's current
542 * skill and experience objects. 434 * skill and experience objects.
… …
575 } 467 }
576 468
577 op->key_values = 0; 469 op->key_values = 0;
578} 470}
579 471
580void object::clear ()
581{
582 attachable_base::clear ();
583
584 free_key_values (this);
585
586 owner = 0;
587 name = 0;
588 name_pl = 0;
589 title = 0;
590 race = 0;
591 slaying = 0;
592 skill = 0;
593 msg = 0;
594 lore = 0;
595 custom_name = 0;
596 materialname = 0;
597 contr = 0;
598 below = 0;
599 above = 0;
600 inv = 0;
601 container = 0;
602 env = 0;
603 more = 0;
604 head = 0;
605 map = 0;
606 active_next = 0;
607 active_prev = 0;
608
609 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
610
611 SET_FLAG (this, FLAG_REMOVED);
612
613 /* What is not cleared is next, prev, and count */
614
615 expmul = 1.0;
616 face = blank_face;
617 attacked_by_count = -1;
618
619 if (settings.casting_time)
620 casting_time = -1;
621}
622
623void object::clone (object *destination)
624{
625 *(object_copy *)destination = *this;
626 *(object_pod *)destination = *this;
627
628 if (self || cb)
629 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
630}
631
632/* 472/*
633 * copy object first frees everything allocated by the second object, 473 * copy_to first frees everything allocated by the dst object,
634 * and then copies the contends of the first object into the second 474 * and then copies the contents of itself into the second
635 * object, allocating what needs to be allocated. Basically, any 475 * object, allocating what needs to be allocated. Basically, any
636 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 476 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
637 * if the first object is freed, the pointers in the new object 477 * if the first object is freed, the pointers in the new object
638 * will point at garbage. 478 * will point at garbage.
639 */ 479 */
640void 480void
641copy_object (object *op2, object *op) 481object::copy_to (object *dst)
642{ 482{
643 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 483 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 484 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645 485
646 op2->clone (op); 486 *(object_copy *)dst = *this;
647 487
648 if (is_freed) 488 if (is_freed)
649 SET_FLAG (op, FLAG_FREED); 489 SET_FLAG (dst, FLAG_FREED);
490
650 if (is_removed) 491 if (is_removed)
651 SET_FLAG (op, FLAG_REMOVED); 492 SET_FLAG (dst, FLAG_REMOVED);
652 493
653 if (op2->speed < 0) 494 if (speed < 0)
654 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 495 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655 496
656 /* Copy over key_values, if any. */ 497 /* Copy over key_values, if any. */
657 if (op2->key_values) 498 if (key_values)
658 { 499 {
659 key_value *tail = 0; 500 key_value *tail = 0;
660 key_value *i; 501 key_value *i;
661 502
662 op->key_values = 0; 503 dst->key_values = 0;
663 504
664 for (i = op2->key_values; i; i = i->next) 505 for (i = key_values; i; i = i->next)
665 { 506 {
666 key_value *new_link = new key_value; 507 key_value *new_link = new key_value;
667 508
668 new_link->next = 0; 509 new_link->next = 0;
669 new_link->key = i->key; 510 new_link->key = i->key;
670 new_link->value = i->value; 511 new_link->value = i->value;
671 512
672 /* Try and be clever here, too. */ 513 /* Try and be clever here, too. */
673 if (!op->key_values) 514 if (!dst->key_values)
674 { 515 {
675 op->key_values = new_link; 516 dst->key_values = new_link;
676 tail = new_link; 517 tail = new_link;
677 } 518 }
678 else 519 else
679 { 520 {
680 tail->next = new_link; 521 tail->next = new_link;
681 tail = new_link; 522 tail = new_link;
682 } 523 }
683 } 524 }
684 } 525 }
685 526
686 update_ob_speed (op); 527 dst->set_speed (dst->speed);
528}
529
530object *
531object::clone ()
532{
533 object *neu = create ();
534 copy_to (neu);
535 return neu;
687} 536}
688 537
689/* 538/*
690 * If an object with the IS_TURNABLE() flag needs to be turned due 539 * If an object with the IS_TURNABLE() flag needs to be turned due
691 * to the closest player being on the other side, this function can 540 * to the closest player being on the other side, this function can
… …
705 * Updates the speed of an object. If the speed changes from 0 to another 554 * Updates the speed of an object. If the speed changes from 0 to another
706 * value, or vice versa, then add/remove the object from the active list. 555 * value, or vice versa, then add/remove the object from the active list.
707 * This function needs to be called whenever the speed of an object changes. 556 * This function needs to be called whenever the speed of an object changes.
708 */ 557 */
709void 558void
710update_ob_speed (object *op) 559object::set_speed (float speed)
711{ 560{
712 extern int arch_init; 561 extern int arch_init;
713 562
714 /* No reason putting the archetypes objects on the speed list, 563 /* No reason putting the archetypes objects on the speed list,
715 * since they never really need to be updated. 564 * since they never really need to be updated.
716 */ 565 */
717 566 if (flag [FLAG_FREED] && speed)
718 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
719 { 567 {
720 LOG (llevError, "Object %s is freed but has speed.\n", &op->name); 568 LOG (llevError, "Object %s is freed but has speed.\n", &name);
721#ifdef MANY_CORES
722 abort ();
723#else
724 op->speed = 0; 569 speed = 0;
725#endif
726 } 570 }
571
572 this->speed = speed;
727 573
728 if (arch_init) 574 if (arch_init)
729 return; 575 return;
730 576
731 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 577 if (FABS (speed) > MIN_ACTIVE_SPEED)
732 { 578 {
733 /* If already on active list, don't do anything */ 579 /* If already on active list, don't do anything */
734 if (op->active_next || op->active_prev || op == active_objects) 580 if (active_next || active_prev || this == active_objects)
735 return; 581 return;
736 582
737 /* process_events() expects us to insert the object at the beginning 583 /* process_events() expects us to insert the object at the beginning
738 * of the list. */ 584 * of the list. */
739 op->active_next = active_objects; 585 active_next = active_objects;
740 586
741 if (op->active_next != NULL) 587 if (active_next)
742 op->active_next->active_prev = op; 588 active_next->active_prev = this;
743 589
744 active_objects = op; 590 active_objects = this;
745 } 591 }
746 else 592 else
747 { 593 {
748 /* If not on the active list, nothing needs to be done */ 594 /* If not on the active list, nothing needs to be done */
749 if (!op->active_next && !op->active_prev && op != active_objects) 595 if (!active_next && !active_prev && this != active_objects)
750 return; 596 return;
751 597
752 if (op->active_prev == NULL) 598 if (!active_prev)
753 { 599 {
754 active_objects = op->active_next; 600 active_objects = active_next;
755 601
756 if (op->active_next != NULL) 602 if (active_next)
757 op->active_next->active_prev = NULL; 603 active_next->active_prev = 0;
758 } 604 }
759 else 605 else
760 { 606 {
761 op->active_prev->active_next = op->active_next; 607 active_prev->active_next = active_next;
762 608
763 if (op->active_next) 609 if (active_next)
764 op->active_next->active_prev = op->active_prev; 610 active_next->active_prev = active_prev;
765 } 611 }
766 612
767 op->active_next = NULL; 613 active_next = 0;
768 op->active_prev = NULL; 614 active_prev = 0;
769 } 615 }
770} 616}
771 617
772/* This function removes object 'op' from the list of active 618/* This function removes object 'op' from the list of active
773 * objects. 619 * objects.
… …
799 op->active_next = NULL; 645 op->active_next = NULL;
800 op->active_prev = NULL; 646 op->active_prev = NULL;
801} 647}
802 648
803/* 649/*
804 * update_object() updates the array which represents the map. 650 * update_object() updates the the map.
805 * It takes into account invisible objects (and represent squares covered 651 * It takes into account invisible objects (and represent squares covered
806 * by invisible objects by whatever is below them (unless it's another 652 * by invisible objects by whatever is below them (unless it's another
807 * invisible object, etc...) 653 * invisible object, etc...)
808 * If the object being updated is beneath a player, the look-window 654 * If the object being updated is beneath a player, the look-window
809 * of that player is updated (this might be a suboptimal way of 655 * of that player is updated (this might be a suboptimal way of
810 * updating that window, though, since update_object() is called _often_) 656 * updating that window, though, since update_object() is called _often_)
811 * 657 *
812 * action is a hint of what the caller believes need to be done. 658 * action is a hint of what the caller believes need to be done.
813 * For example, if the only thing that has changed is the face (due to
814 * an animation), we don't need to call update_position until that actually
815 * comes into view of a player. OTOH, many other things, like addition/removal
816 * of walls or living creatures may need us to update the flags now.
817 * current action are: 659 * current action are:
818 * UP_OBJ_INSERT: op was inserted 660 * UP_OBJ_INSERT: op was inserted
819 * UP_OBJ_REMOVE: op was removed 661 * UP_OBJ_REMOVE: op was removed
820 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 662 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
821 * as that is easier than trying to look at what may have changed. 663 * as that is easier than trying to look at what may have changed.
822 * UP_OBJ_FACE: only the objects face has changed. 664 * UP_OBJ_FACE: only the objects face has changed.
823 */ 665 */
824
825void 666void
826update_object (object *op, int action) 667update_object (object *op, int action)
827{ 668{
828 int update_now = 0, flags;
829 MoveType move_on, move_off, move_block, move_slow; 669 MoveType move_on, move_off, move_block, move_slow;
830 670
831 if (op == NULL) 671 if (op == NULL)
832 { 672 {
833 /* this should never happen */ 673 /* this should never happen */
834 LOG (llevDebug, "update_object() called for NULL object.\n"); 674 LOG (llevDebug, "update_object() called for NULL object.\n");
835 return; 675 return;
836 } 676 }
837 677
838 if (op->env != NULL) 678 if (op->env)
839 { 679 {
840 /* Animation is currently handled by client, so nothing 680 /* Animation is currently handled by client, so nothing
841 * to do in this case. 681 * to do in this case.
842 */ 682 */
843 return; 683 return;
… …
848 */ 688 */
849 if (!op->map || op->map->in_memory == MAP_SAVING) 689 if (!op->map || op->map->in_memory == MAP_SAVING)
850 return; 690 return;
851 691
852 /* make sure the object is within map boundaries */ 692 /* make sure the object is within map boundaries */
853 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 693 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
854 { 694 {
855 LOG (llevError, "update_object() called for object out of map!\n"); 695 LOG (llevError, "update_object() called for object out of map!\n");
856#ifdef MANY_CORES 696#ifdef MANY_CORES
857 abort (); 697 abort ();
858#endif 698#endif
859 return; 699 return;
860 } 700 }
861 701
862 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 702 mapspace &m = op->ms ();
863 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
864 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
865 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
866 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
867 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
868 703
704 if (m.flags_ & P_NEED_UPDATE)
705 /* nop */;
869 if (action == UP_OBJ_INSERT) 706 else if (action == UP_OBJ_INSERT)
870 { 707 {
708 // this is likely overkill, TODO: revisit (schmorp)
871 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
872 update_now = 1;
873
874 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 710 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
875 update_now = 1; 711 || (op->type == PLAYER && !(m.flags_ & P_PLAYER))
876 712 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
713 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
877 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 714 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
878 update_now = 1;
879
880 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
881 update_now = 1;
882
883 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
884 update_now = 1;
885
886 if ((move_on | op->move_on) != move_on) 715 || (m.move_on | op->move_on ) != m.move_on
887 update_now = 1;
888
889 if ((move_off | op->move_off) != move_off) 716 || (m.move_off | op->move_off ) != m.move_off
890 update_now = 1; 717 || (m.move_slow | op->move_slow) != m.move_slow
891
892 /* This isn't perfect, but I don't expect a lot of objects to 718 /* This isn't perfect, but I don't expect a lot of objects to
893 * to have move_allow right now. 719 * to have move_allow right now.
894 */ 720 */
895 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
896 update_now = 1; 722 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
897 723 m.flags_ = P_NEED_UPDATE;
898 if ((move_slow | op->move_slow) != move_slow)
899 update_now = 1;
900 } 724 }
901 /* if the object is being removed, we can't make intelligent 725 /* if the object is being removed, we can't make intelligent
902 * decisions, because remove_ob can't really pass the object 726 * decisions, because remove_ob can't really pass the object
903 * that is being removed. 727 * that is being removed.
904 */ 728 */
905 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
906 update_now = 1; 730 m.flags_ = P_NEED_UPDATE;
907 else if (action == UP_OBJ_FACE) 731 else if (action == UP_OBJ_FACE)
908 /* Nothing to do for that case */ ; 732 /* Nothing to do for that case */ ;
909 else 733 else
910 LOG (llevError, "update_object called with invalid action: %d\n", action); 734 LOG (llevError, "update_object called with invalid action: %d\n", action);
911 735
912 if (update_now)
913 {
914 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
915 update_position (op->map, op->x, op->y);
916 }
917
918 if (op->more != NULL) 736 if (op->more)
919 update_object (op->more, action); 737 update_object (op->more, action);
920} 738}
921 739
922static unordered_vector<object *> mortals; 740object::vector object::objects; // not yet used
923static std::vector<object *, slice_allocator <object *> > freed; 741object *object::first;
924
925void object::free_mortals ()
926{
927 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
928 if ((*i)->refcnt)
929 ++i; // further delay freeing
930 else
931 {
932 freed.push_back (*i);//D
933 //delete *i;
934 mortals.erase (i);
935 }
936
937 if (mortals.size() && 0)//D
938 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
939}
940 742
941object::object () 743object::object ()
942{ 744{
943 SET_FLAG (this, FLAG_REMOVED); 745 SET_FLAG (this, FLAG_REMOVED);
944 746
945 expmul = 1.0; 747 expmul = 1.0;
946 face = blank_face; 748 face = blank_face;
947 attacked_by_count = -1;
948} 749}
949 750
950object::~object () 751object::~object ()
951{ 752{
952 free_key_values (this); 753 free_key_values (this);
953} 754}
954 755
955void object::link () 756void object::link ()
956{ 757{
957 count = ++ob_count; 758 count = ++ob_count;
759 uuid = gen_uuid ();
958 760
959 prev = 0; 761 prev = 0;
960 next = objects; 762 next = object::first;
961 763
962 if (objects) 764 if (object::first)
963 objects->prev = this; 765 object::first->prev = this;
964 766
965 objects = this; 767 object::first = this;
966} 768}
967 769
968void object::unlink () 770void object::unlink ()
969{ 771{
970 count = 0;
971 uuid = gen_uuid ();
972
973 if (this == objects) 772 if (this == object::first)
974 objects = next; 773 object::first = next;
975 774
976 /* Remove this object from the list of used objects */ 775 /* Remove this object from the list of used objects */
977 if (prev)
978 {
979 prev->next = next; 776 if (prev) prev->next = next;
777 if (next) next->prev = prev;
778
980 prev = 0; 779 prev = 0;
981 }
982
983 if (next)
984 {
985 next->prev = prev;
986 next = 0; 780 next = 0;
987 }
988} 781}
989 782
990object *object::create () 783object *object::create ()
991{ 784{
992 object *op;
993
994 if (freed.empty ())
995 op = new object; 785 object *op = new object;
996 else
997 {
998 // highly annoying, but the only way to get it stable right now
999 op = freed.back ();
1000 freed.pop_back ();
1001 op->~object ();
1002 new ((void *) op) object;
1003 }
1004
1005 op->link (); 786 op->link ();
1006 return op; 787 return op;
1007} 788}
1008 789
1009/* 790void
1010 * free_object() frees everything allocated by an object, removes 791object::do_destroy ()
1011 * it from the list of used objects, and puts it on the list of
1012 * free objects. The IS_FREED() flag is set in the object.
1013 * The object must have been removed by remove_ob() first for
1014 * this function to succeed.
1015 *
1016 * If free_inventory is set, free inventory as well. Else drop items in
1017 * inventory to the ground.
1018 */
1019void object::free (bool free_inventory)
1020{ 792{
1021 if (QUERY_FLAG (this, FLAG_FREED)) 793 attachable::do_destroy ();
794
795 if (flag [FLAG_IS_LINKED])
796 remove_button_link (this);
797
798 if (flag [FLAG_FRIENDLY])
799 remove_friendly_object (this);
800
801 if (!flag [FLAG_REMOVED])
802 remove ();
803
804 if (flag [FLAG_FREED])
1022 return; 805 return;
1023 806
1024 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 807 flag [FLAG_FREED] = 1;
1025 remove_friendly_object (this);
1026 808
1027 if (!QUERY_FLAG (this, FLAG_REMOVED)) 809 // hack to ensure that freed objects still have a valid map
1028 remove_ob (this); 810 {
811 static maptile *freed_map; // freed objects are moved here to avoid crashes
1029 812
1030 SET_FLAG (this, FLAG_FREED); 813 if (!freed_map)
1031
1032 if (more)
1033 { 814 {
1034 more->free (free_inventory); 815 freed_map = new maptile;
816
817 freed_map->name = "/internal/freed_objects_map";
818 freed_map->width = 3;
819 freed_map->height = 3;
820
821 freed_map->allocate ();
822 }
823
824 map = freed_map;
825 x = 1;
826 y = 1;
827 }
828
1035 more = 0; 829 more = 0;
1036 } 830 head = 0;
831 inv = 0;
1037 832
833 // clear those pointers that likely might have circular references to us
834 owner = 0;
835 enemy = 0;
836 attacked_by = 0;
837
838 // only relevant for players(?), but make sure of it anyways
839 contr = 0;
840
841 /* Remove object from the active list */
842 set_speed (0);
843
844 unlink ();
845}
846
847/*
848 * Remove and free all objects in the inventory of the given object.
849 * object.c ?
850 */
851void
852object::destroy_inv (bool drop_to_ground)
853{
1038 if (inv) 854 if (!inv)
1039 { 855 return;
856
1040 /* Only if the space blocks everything do we not process - 857 /* Only if the space blocks everything do we not process -
1041 * if some form of movement is allowed, let objects 858 * if some form of movement is allowed, let objects
1042 * drop on that space. 859 * drop on that space.
1043 */ 860 */
1044 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 861 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
862 {
863 while (inv)
864 {
865 inv->destroy_inv (drop_to_ground);
866 inv->destroy ();
867 }
868 }
869 else
870 { /* Put objects in inventory onto this space */
871 while (inv)
1045 { 872 {
1046 object *op = inv; 873 object *op = inv;
1047 874
1048 while (op) 875 if (op->flag [FLAG_STARTEQUIP]
876 || op->flag [FLAG_NO_DROP]
877 || op->type == RUNE
878 || op->type == TRAP
879 || op->flag [FLAG_IS_A_TEMPLATE])
880 op->destroy ();
881 else
1049 { 882 {
1050 object *tmp = op->below; 883 op->remove ();
1051 op->free (free_inventory);
1052 op = tmp; 884 op->x = x;
885 op->y = y;
886 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1053 } 887 }
1054 } 888 }
1055 else 889 }
1056 { /* Put objects in inventory onto this space */ 890}
1057 object *op = inv;
1058 891
1059 while (op) 892void
1060 { 893object::destroy (bool destroy_inventory)
1061 object *tmp = op->below; 894{
895 if (destroyed ())
896 return;
1062 897
1063 remove_ob (op); 898 if (more)
1064
1065 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1066 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1067 free_object (op);
1068 else
1069 {
1070 op->x = x;
1071 op->y = y;
1072 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1073 }
1074
1075 op = tmp;
1076 }
1077 }
1078 } 899 {
900 //TODO: non-head objects must not have inventory
901 more->destroy (destroy_inventory);
902 more = 0;
903 }
1079 904
1080 owner = 0; 905 if (destroy_inventory)
906 destroy_inv (true);
1081 907
1082 /* Remove object from the active list */ 908 attachable::destroy ();
1083 speed = 0;
1084 update_ob_speed (this);
1085
1086 unlink ();
1087
1088 mortals.push_back (this);
1089} 909}
1090 910
1091/* 911/*
1092 * sub_weight() recursively (outwards) subtracts a number from the 912 * sub_weight() recursively (outwards) subtracts a number from the
1093 * weight of an object (and what is carried by it's environment(s)). 913 * weight of an object (and what is carried by it's environment(s)).
1094 */ 914 */
1095
1096void 915void
1097sub_weight (object *op, signed long weight) 916sub_weight (object *op, signed long weight)
1098{ 917{
1099 while (op != NULL) 918 while (op != NULL)
1100 { 919 {
1101 if (op->type == CONTAINER) 920 if (op->type == CONTAINER)
1102 {
1103 weight = (signed long) (weight * (100 - op->stats.Str) / 100); 921 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104 } 922
1105 op->carrying -= weight; 923 op->carrying -= weight;
1106 op = op->env; 924 op = op->env;
1107 } 925 }
1108} 926}
1109 927
1110/* remove_ob(op): 928/* op->remove ():
1111 * This function removes the object op from the linked list of objects 929 * This function removes the object op from the linked list of objects
1112 * which it is currently tied to. When this function is done, the 930 * which it is currently tied to. When this function is done, the
1113 * object will have no environment. If the object previously had an 931 * object will have no environment. If the object previously had an
1114 * environment, the x and y coordinates will be updated to 932 * environment, the x and y coordinates will be updated to
1115 * the previous environment. 933 * the previous environment.
1116 * Beware: This function is called from the editor as well! 934 * Beware: This function is called from the editor as well!
1117 */ 935 */
1118
1119void 936void
1120remove_ob (object *op) 937object::remove ()
1121{ 938{
939 object *tmp, *last = 0;
1122 object * 940 object *otmp;
1123 tmp, *
1124 last = NULL;
1125 object *
1126 otmp;
1127 941
1128 tag_t
1129 tag;
1130 int
1131 check_walk_off;
1132 mapstruct *
1133 m;
1134
1135 sint16
1136 x,
1137 y;
1138
1139 if (QUERY_FLAG (op, FLAG_REMOVED)) 942 if (QUERY_FLAG (this, FLAG_REMOVED))
1140 return; 943 return;
1141 944
1142 SET_FLAG (op, FLAG_REMOVED); 945 SET_FLAG (this, FLAG_REMOVED);
946 INVOKE_OBJECT (REMOVE, this);
1143 947
1144 if (op->more != NULL) 948 if (more)
1145 remove_ob (op->more); 949 more->remove ();
1146 950
1147 /* 951 /*
1148 * In this case, the object to be removed is in someones 952 * In this case, the object to be removed is in someones
1149 * inventory. 953 * inventory.
1150 */ 954 */
1151 if (op->env != NULL) 955 if (env)
1152 { 956 {
1153 if (op->nrof) 957 if (nrof)
1154 sub_weight (op->env, op->weight * op->nrof); 958 sub_weight (env, weight * nrof);
1155 else 959 else
1156 sub_weight (op->env, op->weight + op->carrying); 960 sub_weight (env, weight + carrying);
1157 961
1158 /* NO_FIX_PLAYER is set when a great many changes are being 962 /* NO_FIX_PLAYER is set when a great many changes are being
1159 * made to players inventory. If set, avoiding the call 963 * made to players inventory. If set, avoiding the call
1160 * to save cpu time. 964 * to save cpu time.
1161 */ 965 */
1162 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163 fix_player (otmp); 967 otmp->update_stats ();
1164 968
1165 if (op->above != NULL) 969 if (above != NULL)
1166 op->above->below = op->below; 970 above->below = below;
1167 else 971 else
1168 op->env->inv = op->below; 972 env->inv = below;
1169 973
1170 if (op->below != NULL) 974 if (below != NULL)
1171 op->below->above = op->above; 975 below->above = above;
1172 976
1173 /* we set up values so that it could be inserted into 977 /* we set up values so that it could be inserted into
1174 * the map, but we don't actually do that - it is up 978 * the map, but we don't actually do that - it is up
1175 * to the caller to decide what we want to do. 979 * to the caller to decide what we want to do.
1176 */ 980 */
1177 op->x = op->env->x, op->y = op->env->y; 981 x = env->x, y = env->y;
1178 op->map = op->env->map; 982 map = env->map;
1179 op->above = NULL, op->below = NULL; 983 above = 0, below = 0;
1180 op->env = NULL; 984 env = 0;
1181 } 985 }
1182 else if (op->map) 986 else if (map)
1183 { 987 {
1184 x = op->x;
1185 y = op->y;
1186 m = get_map_from_coord (op->map, &x, &y);
1187
1188 if (!m)
1189 {
1190 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1191 op->map->path, op->x, op->y);
1192 /* in old days, we used to set x and y to 0 and continue.
1193 * it seems if we get into this case, something is probablye
1194 * screwed up and should be fixed.
1195 */
1196 abort ();
1197 }
1198
1199 if (op->map != m)
1200 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1201 op->map->path, m->path, op->x, op->y, x, y);
1202
1203 /* Re did the following section of code - it looks like it had 988 /* Re did the following section of code - it looks like it had
1204 * lots of logic for things we no longer care about 989 * lots of logic for things we no longer care about
1205 */ 990 */
1206 991
1207 /* link the object above us */ 992 /* link the object above us */
1208 if (op->above) 993 if (above)
1209 op->above->below = op->below; 994 above->below = below;
1210 else 995 else
1211 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */ 996 map->at (x, y).top = below; /* we were top, set new top */
1212 997
1213 /* Relink the object below us, if there is one */ 998 /* Relink the object below us, if there is one */
1214 if (op->below) 999 if (below)
1215 op->below->above = op->above; 1000 below->above = above;
1216 else 1001 else
1217 { 1002 {
1218 /* Nothing below, which means we need to relink map object for this space 1003 /* Nothing below, which means we need to relink map object for this space
1219 * use translated coordinates in case some oddness with map tiling is 1004 * use translated coordinates in case some oddness with map tiling is
1220 * evident 1005 * evident
1221 */ 1006 */
1222 if (GET_MAP_OB (m, x, y) != op) 1007 if (GET_MAP_OB (map, x, y) != this)
1223 { 1008 {
1224 dump_object (op); 1009 char *dump = dump_object (this);
1225 LOG (llevError, 1010 LOG (llevError,
1226 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg); 1011 "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);
1012 free (dump);
1227 dump_object (GET_MAP_OB (m, x, y)); 1013 dump = dump_object (GET_MAP_OB (map, x, y));
1228 LOG (llevError, "%s\n", errmsg); 1014 LOG (llevError, "%s\n", dump);
1015 free (dump);
1229 } 1016 }
1230 1017
1231 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1018 map->at (x, y).bot = above; /* goes on above it. */
1232 } 1019 }
1233 1020
1234 op->above = 0; 1021 above = 0;
1235 op->below = 0; 1022 below = 0;
1236 1023
1237 if (op->map->in_memory == MAP_SAVING) 1024 if (map->in_memory == MAP_SAVING)
1238 return; 1025 return;
1239 1026
1240 tag = op->count; 1027 int check_walk_off = !flag [FLAG_NO_APPLY];
1241 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1242 1028
1243 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1029 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1244 { 1030 {
1245 /* No point updating the players look faces if he is the object 1031 /* No point updating the players look faces if he is the object
1246 * being removed. 1032 * being removed.
1247 */ 1033 */
1248 1034
1249 if (tmp->type == PLAYER && tmp != op) 1035 if (tmp->type == PLAYER && tmp != this)
1250 { 1036 {
1251 /* If a container that the player is currently using somehow gets 1037 /* If a container that the player is currently using somehow gets
1252 * removed (most likely destroyed), update the player view 1038 * removed (most likely destroyed), update the player view
1253 * appropriately. 1039 * appropriately.
1254 */ 1040 */
1255 if (tmp->container == op) 1041 if (tmp->container == this)
1256 { 1042 {
1257 CLEAR_FLAG (op, FLAG_APPLIED); 1043 flag [FLAG_APPLIED] = 0;
1258 tmp->container = NULL; 1044 tmp->container = 0;
1259 } 1045 }
1260 1046
1261 tmp->contr->socket.update_look = 1; 1047 if (tmp->contr->ns)
1048 tmp->contr->ns->floorbox_update ();
1262 } 1049 }
1263 1050
1264 /* See if player moving off should effect something */ 1051 /* See if player moving off should effect something */
1265 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1052 if (check_walk_off
1053 && ((move_type & tmp->move_off)
1054 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1266 { 1055 {
1267 move_apply (tmp, op, NULL); 1056 move_apply (tmp, this, 0);
1268 1057
1269 if (was_destroyed (op, tag)) 1058 if (destroyed ())
1270 {
1271 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1059 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1272 }
1273 } 1060 }
1274 1061
1275 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1062 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276 1063
1277 if (tmp->above == tmp) 1064 if (tmp->above == tmp)
1278 tmp->above = NULL; 1065 tmp->above = 0;
1279 1066
1280 last = tmp; 1067 last = tmp;
1281 } 1068 }
1282 1069
1283 /* last == NULL of there are no objects on this space */ 1070 /* last == NULL of there are no objects on this space */
1284 if (last == NULL) 1071 if (!last)
1285 { 1072 map->at (x, y).flags_ = P_NEED_UPDATE;
1286 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288 * those out anyways, and if there are any flags set right now, they won't
1289 * be correct anyways.
1290 */
1291 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292 update_position (op->map, op->x, op->y);
1293 }
1294 else 1073 else
1295 update_object (last, UP_OBJ_REMOVE); 1074 update_object (last, UP_OBJ_REMOVE);
1296 1075
1297 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0)) 1076 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1298 update_all_los (op->map, op->x, op->y); 1077 update_all_los (map, x, y);
1299 } 1078 }
1300} 1079}
1301 1080
1302/* 1081/*
1303 * merge_ob(op,top): 1082 * merge_ob(op,top):
… …
1311merge_ob (object *op, object *top) 1090merge_ob (object *op, object *top)
1312{ 1091{
1313 if (!op->nrof) 1092 if (!op->nrof)
1314 return 0; 1093 return 0;
1315 1094
1316 if (top == NULL) 1095 if (top)
1317 for (top = op; top != NULL && top->above != NULL; top = top->above); 1096 for (top = op; top && top->above; top = top->above)
1097 ;
1318 1098
1319 for (; top != NULL; top = top->below) 1099 for (; top; top = top->below)
1320 { 1100 {
1321 if (top == op) 1101 if (top == op)
1322 continue; 1102 continue;
1323 if (CAN_MERGE (op, top)) 1103
1104 if (object::can_merge (op, top))
1324 { 1105 {
1325 top->nrof += op->nrof; 1106 top->nrof += op->nrof;
1326 1107
1327/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1108/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1328 op->weight = 0; /* Don't want any adjustements now */ 1109 op->weight = 0; /* Don't want any adjustements now */
1329 remove_ob (op); 1110 op->destroy ();
1330 free_object (op);
1331 return top; 1111 return top;
1332 } 1112 }
1333 } 1113 }
1334 1114
1335 return NULL; 1115 return 0;
1336} 1116}
1337 1117
1338/* 1118/*
1339 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1119 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1340 * job preparing multi-part monsters 1120 * job preparing multi-part monsters
1341 */ 1121 */
1342object * 1122object *
1343insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1123insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1344{ 1124{
1345 object *tmp; 1125 object *tmp;
1346 1126
1347 if (op->head) 1127 if (op->head)
1348 op = op->head; 1128 op = op->head;
… …
1374 * Return value: 1154 * Return value:
1375 * new object if 'op' was merged with other object 1155 * new object if 'op' was merged with other object
1376 * NULL if 'op' was destroyed 1156 * NULL if 'op' was destroyed
1377 * just 'op' otherwise 1157 * just 'op' otherwise
1378 */ 1158 */
1379
1380object * 1159object *
1381insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382{ 1161{
1383 object *tmp, *top, *floor = NULL; 1162 object *tmp, *top, *floor = NULL;
1384 sint16 x, y; 1163 sint16 x, y;
1385 1164
1386 if (QUERY_FLAG (op, FLAG_FREED)) 1165 if (QUERY_FLAG (op, FLAG_FREED))
… …
1389 return NULL; 1168 return NULL;
1390 } 1169 }
1391 1170
1392 if (m == NULL) 1171 if (m == NULL)
1393 { 1172 {
1394 dump_object (op); 1173 char *dump = dump_object (op);
1395 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg); 1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1175 free (dump);
1396 return op; 1176 return op;
1397 } 1177 }
1398 1178
1399 if (out_of_map (m, op->x, op->y)) 1179 if (out_of_map (m, op->x, op->y))
1400 { 1180 {
1401 dump_object (op); 1181 char *dump = dump_object (op);
1402 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg); 1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403#ifdef MANY_CORES 1183#ifdef MANY_CORES
1404 /* Better to catch this here, as otherwise the next use of this object 1184 /* Better to catch this here, as otherwise the next use of this object
1405 * is likely to cause a crash. Better to find out where it is getting 1185 * is likely to cause a crash. Better to find out where it is getting
1406 * improperly inserted. 1186 * improperly inserted.
1407 */ 1187 */
1408 abort (); 1188 abort ();
1409#endif 1189#endif
1190 free (dump);
1410 return op; 1191 return op;
1411 } 1192 }
1412 1193
1413 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1194 if (!QUERY_FLAG (op, FLAG_REMOVED))
1414 { 1195 {
1415 dump_object (op); 1196 char *dump = dump_object (op);
1416 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg); 1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198 free (dump);
1417 return op; 1199 return op;
1418 } 1200 }
1419 1201
1420 if (op->more != NULL) 1202 if (op->more)
1421 { 1203 {
1422 /* The part may be on a different map. */ 1204 /* The part may be on a different map. */
1423 1205
1424 object *more = op->more; 1206 object *more = op->more;
1425 1207
… …
1441 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1442 { 1224 {
1443 if (!op->head) 1225 if (!op->head)
1444 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1445 1227
1446 return NULL; 1228 return 0;
1447 } 1229 }
1448 } 1230 }
1449 1231
1450 CLEAR_FLAG (op, FLAG_REMOVED); 1232 CLEAR_FLAG (op, FLAG_REMOVED);
1451 1233
… …
1459 1241
1460 /* this has to be done after we translate the coordinates. 1242 /* this has to be done after we translate the coordinates.
1461 */ 1243 */
1462 if (op->nrof && !(flag & INS_NO_MERGE)) 1244 if (op->nrof && !(flag & INS_NO_MERGE))
1463 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464 if (CAN_MERGE (op, tmp)) 1246 if (object::can_merge (op, tmp))
1465 { 1247 {
1466 op->nrof += tmp->nrof; 1248 op->nrof += tmp->nrof;
1467 remove_ob (tmp); 1249 tmp->destroy ();
1468 free_object (tmp);
1469 } 1250 }
1470 1251
1471 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1252 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1472 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1253 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1473 1254
… …
1486 op->below = originator->below; 1267 op->below = originator->below;
1487 1268
1488 if (op->below) 1269 if (op->below)
1489 op->below->above = op; 1270 op->below->above = op;
1490 else 1271 else
1491 SET_MAP_OB (op->map, op->x, op->y, op); 1272 op->ms ().bot = op;
1492 1273
1493 /* since *below* originator, no need to update top */ 1274 /* since *below* originator, no need to update top */
1494 originator->below = op; 1275 originator->below = op;
1495 } 1276 }
1496 else 1277 else
… …
1542 * If INS_ON_TOP is used, don't do this processing 1323 * If INS_ON_TOP is used, don't do this processing
1543 * Need to find the object that in fact blocks view, otherwise 1324 * Need to find the object that in fact blocks view, otherwise
1544 * stacking is a bit odd. 1325 * stacking is a bit odd.
1545 */ 1326 */
1546 if (!(flag & INS_ON_TOP) && 1327 if (!(flag & INS_ON_TOP) &&
1547 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1328 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1548 { 1329 {
1549 for (last = top; last != floor; last = last->below) 1330 for (last = top; last != floor; last = last->below)
1550 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1331 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1551 break; 1332 break;
1552 /* Check to see if we found the object that blocks view, 1333 /* Check to see if we found the object that blocks view,
… …
1575 1356
1576 if (op->above) 1357 if (op->above)
1577 op->above->below = op; 1358 op->above->below = op;
1578 1359
1579 op->below = NULL; 1360 op->below = NULL;
1580 SET_MAP_OB (op->map, op->x, op->y, op); 1361 op->ms ().bot = op;
1581 } 1362 }
1582 else 1363 else
1583 { /* get inserted into the stack above top */ 1364 { /* get inserted into the stack above top */
1584 op->above = top->above; 1365 op->above = top->above;
1585 1366
… …
1589 op->below = top; 1370 op->below = top;
1590 top->above = op; 1371 top->above = op;
1591 } 1372 }
1592 1373
1593 if (op->above == NULL) 1374 if (op->above == NULL)
1594 SET_MAP_TOP (op->map, op->x, op->y, op); 1375 op->ms ().top = op;
1595 } /* else not INS_BELOW_ORIGINATOR */ 1376 } /* else not INS_BELOW_ORIGINATOR */
1596 1377
1597 if (op->type == PLAYER) 1378 if (op->type == PLAYER)
1598 op->contr->do_los = 1; 1379 op->contr->do_los = 1;
1599 1380
1600 /* If we have a floor, we know the player, if any, will be above 1381 /* If we have a floor, we know the player, if any, will be above
1601 * it, so save a few ticks and start from there. 1382 * it, so save a few ticks and start from there.
1602 */ 1383 */
1603 if (!(flag & INS_MAP_LOAD)) 1384 if (!(flag & INS_MAP_LOAD))
1604 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1385 if (object *pl = op->ms ().player ())
1605 if (tmp->type == PLAYER) 1386 if (pl->contr->ns)
1606 tmp->contr->socket.update_look = 1; 1387 pl->contr->ns->floorbox_update ();
1607 1388
1608 /* If this object glows, it may affect lighting conditions that are 1389 /* If this object glows, it may affect lighting conditions that are
1609 * visible to others on this map. But update_all_los is really 1390 * visible to others on this map. But update_all_los is really
1610 * an inefficient way to do this, as it means los for all players 1391 * an inefficient way to do this, as it means los for all players
1611 * on the map will get recalculated. The players could very well 1392 * on the map will get recalculated. The players could very well
1612 * be far away from this change and not affected in any way - 1393 * be far away from this change and not affected in any way -
1613 * this should get redone to only look for players within range, 1394 * this should get redone to only look for players within range,
1614 * or just updating the P_NEED_UPDATE for spaces within this area 1395 * or just updating the P_NEED_UPDATE for spaces within this area
1615 * of effect may be sufficient. 1396 * of effect may be sufficient.
1616 */ 1397 */
1617 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1398 if (op->map->darkness && (op->glow_radius != 0))
1618 update_all_los (op->map, op->x, op->y); 1399 update_all_los (op->map, op->x, op->y);
1619 1400
1620 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1401 /* updates flags (blocked, alive, no magic, etc) for this map space */
1621 update_object (op, UP_OBJ_INSERT); 1402 update_object (op, UP_OBJ_INSERT);
1622 1403
1404 INVOKE_OBJECT (INSERT, op);
1405
1623 /* Don't know if moving this to the end will break anything. However, 1406 /* Don't know if moving this to the end will break anything. However,
1624 * we want to have update_look set above before calling this. 1407 * we want to have floorbox_update called before calling this.
1625 * 1408 *
1626 * check_move_on() must be after this because code called from 1409 * check_move_on() must be after this because code called from
1627 * check_move_on() depends on correct map flags (so functions like 1410 * check_move_on() depends on correct map flags (so functions like
1628 * blocked() and wall() work properly), and these flags are updated by 1411 * blocked() and wall() work properly), and these flags are updated by
1629 * update_object(). 1412 * update_object().
… …
1631 1414
1632 /* if this is not the head or flag has been passed, don't check walk on status */ 1415 /* if this is not the head or flag has been passed, don't check walk on status */
1633 if (!(flag & INS_NO_WALK_ON) && !op->head) 1416 if (!(flag & INS_NO_WALK_ON) && !op->head)
1634 { 1417 {
1635 if (check_move_on (op, originator)) 1418 if (check_move_on (op, originator))
1636 return NULL; 1419 return 0;
1637 1420
1638 /* If we are a multi part object, lets work our way through the check 1421 /* If we are a multi part object, lets work our way through the check
1639 * walk on's. 1422 * walk on's.
1640 */ 1423 */
1641 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1424 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1642 if (check_move_on (tmp, originator)) 1425 if (check_move_on (tmp, originator))
1643 return NULL; 1426 return 0;
1644 } 1427 }
1645 1428
1646 return op; 1429 return op;
1647} 1430}
1648 1431
1649/* this function inserts an object in the map, but if it 1432/* this function inserts an object in the map, but if it
1650 * finds an object of its own type, it'll remove that one first. 1433 * finds an object of its own type, it'll remove that one first.
1651 * op is the object to insert it under: supplies x and the map. 1434 * op is the object to insert it under: supplies x and the map.
1652 */ 1435 */
1653void 1436void
1654replace_insert_ob_in_map (const char *arch_string, object *op) 1437replace_insert_ob_in_map (const char *arch_string, object *op)
1655{ 1438{
1656 object * 1439 object *tmp, *tmp1;
1657 tmp;
1658 object *
1659 tmp1;
1660 1440
1661 /* first search for itself and remove any old instances */ 1441 /* first search for itself and remove any old instances */
1662 1442
1663 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1443 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1664 {
1665 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1444 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1666 { 1445 tmp->destroy ();
1667 remove_ob (tmp);
1668 free_object (tmp);
1669 }
1670 }
1671 1446
1672 tmp1 = arch_to_object (find_archetype (arch_string)); 1447 tmp1 = arch_to_object (archetype::find (arch_string));
1673 1448
1674 tmp1->x = op->x; 1449 tmp1->x = op->x;
1675 tmp1->y = op->y; 1450 tmp1->y = op->y;
1676 insert_ob_in_map (tmp1, op->map, op, 0); 1451 insert_ob_in_map (tmp1, op->map, op, 0);
1677} 1452}
… …
1685 */ 1460 */
1686 1461
1687object * 1462object *
1688get_split_ob (object *orig_ob, uint32 nr) 1463get_split_ob (object *orig_ob, uint32 nr)
1689{ 1464{
1690 object * 1465 object *newob;
1691 newob;
1692 int
1693 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1466 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1694 1467
1695 if (orig_ob->nrof < nr) 1468 if (orig_ob->nrof < nr)
1696 { 1469 {
1697 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1470 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1698 return NULL; 1471 return NULL;
1699 } 1472 }
1700 1473
1701 newob = object_create_clone (orig_ob); 1474 newob = object_create_clone (orig_ob);
1702 1475
1703 if ((orig_ob->nrof -= nr) < 1) 1476 if ((orig_ob->nrof -= nr) < 1)
1704 { 1477 orig_ob->destroy (1);
1705 if (!is_removed)
1706 remove_ob (orig_ob);
1707 free_object2 (orig_ob, 1);
1708 }
1709 else if (!is_removed) 1478 else if (!is_removed)
1710 { 1479 {
1711 if (orig_ob->env != NULL) 1480 if (orig_ob->env != NULL)
1712 sub_weight (orig_ob->env, orig_ob->weight * nr); 1481 sub_weight (orig_ob->env, orig_ob->weight * nr);
1713 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1482 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1733 1502
1734object * 1503object *
1735decrease_ob_nr (object *op, uint32 i) 1504decrease_ob_nr (object *op, uint32 i)
1736{ 1505{
1737 object *tmp; 1506 object *tmp;
1738 player *pl;
1739 1507
1740 if (i == 0) /* objects with op->nrof require this check */ 1508 if (i == 0) /* objects with op->nrof require this check */
1741 return op; 1509 return op;
1742 1510
1743 if (i > op->nrof) 1511 if (i > op->nrof)
1744 i = op->nrof; 1512 i = op->nrof;
1745 1513
1746 if (QUERY_FLAG (op, FLAG_REMOVED)) 1514 if (QUERY_FLAG (op, FLAG_REMOVED))
1747 op->nrof -= i; 1515 op->nrof -= i;
1748 else if (op->env != NULL) 1516 else if (op->env)
1749 { 1517 {
1750 /* is this object in the players inventory, or sub container 1518 /* is this object in the players inventory, or sub container
1751 * therein? 1519 * therein?
1752 */ 1520 */
1753 tmp = is_player_inv (op->env); 1521 tmp = op->in_player ();
1754 /* nope. Is this a container the player has opened? 1522 /* nope. Is this a container the player has opened?
1755 * If so, set tmp to that player. 1523 * If so, set tmp to that player.
1756 * IMO, searching through all the players will mostly 1524 * IMO, searching through all the players will mostly
1757 * likely be quicker than following op->env to the map, 1525 * likely be quicker than following op->env to the map,
1758 * and then searching the map for a player. 1526 * and then searching the map for a player.
1759 */ 1527 */
1760 if (!tmp) 1528 if (!tmp)
1761 { 1529 for_all_players (pl)
1762 for (pl = first_player; pl; pl = pl->next)
1763 if (pl->ob->container == op->env) 1530 if (pl->ob->container == op->env)
1531 {
1532 tmp = pl->ob;
1764 break; 1533 break;
1765 if (pl)
1766 tmp = pl->ob;
1767 else
1768 tmp = NULL;
1769 } 1534 }
1770 1535
1771 if (i < op->nrof) 1536 if (i < op->nrof)
1772 { 1537 {
1773 sub_weight (op->env, op->weight * i); 1538 sub_weight (op->env, op->weight * i);
1774 op->nrof -= i; 1539 op->nrof -= i;
1775 if (tmp) 1540 if (tmp)
1776 {
1777 esrv_send_item (tmp, op); 1541 esrv_send_item (tmp, op);
1778 }
1779 } 1542 }
1780 else 1543 else
1781 { 1544 {
1782 remove_ob (op); 1545 op->remove ();
1783 op->nrof = 0; 1546 op->nrof = 0;
1784 if (tmp) 1547 if (tmp)
1785 {
1786 esrv_del_item (tmp->contr, op->count); 1548 esrv_del_item (tmp->contr, op->count);
1787 }
1788 } 1549 }
1789 } 1550 }
1790 else 1551 else
1791 { 1552 {
1792 object *above = op->above; 1553 object *above = op->above;
1793 1554
1794 if (i < op->nrof) 1555 if (i < op->nrof)
1795 op->nrof -= i; 1556 op->nrof -= i;
1796 else 1557 else
1797 { 1558 {
1798 remove_ob (op); 1559 op->remove ();
1799 op->nrof = 0; 1560 op->nrof = 0;
1800 } 1561 }
1801 1562
1802 /* Since we just removed op, op->above is null */ 1563 /* Since we just removed op, op->above is null */
1803 for (tmp = above; tmp != NULL; tmp = tmp->above) 1564 for (tmp = above; tmp; tmp = tmp->above)
1804 if (tmp->type == PLAYER) 1565 if (tmp->type == PLAYER)
1805 { 1566 {
1806 if (op->nrof) 1567 if (op->nrof)
1807 esrv_send_item (tmp, op); 1568 esrv_send_item (tmp, op);
1808 else 1569 else
… …
1812 1573
1813 if (op->nrof) 1574 if (op->nrof)
1814 return op; 1575 return op;
1815 else 1576 else
1816 { 1577 {
1817 free_object (op); 1578 op->destroy ();
1818 return NULL; 1579 return 0;
1819 } 1580 }
1820} 1581}
1821 1582
1822/* 1583/*
1823 * add_weight(object, weight) adds the specified weight to an object, 1584 * add_weight(object, weight) adds the specified weight to an object,
… …
1835 op->carrying += weight; 1596 op->carrying += weight;
1836 op = op->env; 1597 op = op->env;
1837 } 1598 }
1838} 1599}
1839 1600
1601object *
1602insert_ob_in_ob (object *op, object *where)
1603{
1604 if (!where)
1605 {
1606 char *dump = dump_object (op);
1607 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1608 free (dump);
1609 return op;
1610 }
1611
1612 if (where->head)
1613 {
1614 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1615 where = where->head;
1616 }
1617
1618 return where->insert (op);
1619}
1620
1840/* 1621/*
1841 * insert_ob_in_ob(op,environment): 1622 * env->insert (op)
1842 * This function inserts the object op in the linked list 1623 * This function inserts the object op in the linked list
1843 * inside the object environment. 1624 * inside the object environment.
1844 * 1625 *
1845 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1846 * the inventory at the last position or next to other objects of the same
1847 * type.
1848 * Frank: Now sorted by type, archetype and magic!
1849 *
1850 * The function returns now pointer to inserted item, and return value can 1626 * The function returns now pointer to inserted item, and return value can
1851 * be != op, if items are merged. -Tero 1627 * be != op, if items are merged. -Tero
1852 */ 1628 */
1853 1629
1854object * 1630object *
1855insert_ob_in_ob (object *op, object *where) 1631object::insert (object *op)
1856{ 1632{
1857 object * 1633 object *tmp, *otmp;
1858 tmp, *
1859 otmp;
1860 1634
1861 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1635 if (!QUERY_FLAG (op, FLAG_REMOVED))
1862 { 1636 op->remove ();
1863 dump_object (op);
1864 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1865 return op;
1866 }
1867
1868 if (where == NULL)
1869 {
1870 dump_object (op);
1871 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1872 return op;
1873 }
1874
1875 if (where->head)
1876 {
1877 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1878 where = where->head;
1879 }
1880 1637
1881 if (op->more) 1638 if (op->more)
1882 { 1639 {
1883 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1640 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1884 return op; 1641 return op;
… …
1886 1643
1887 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1644 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1888 CLEAR_FLAG (op, FLAG_REMOVED); 1645 CLEAR_FLAG (op, FLAG_REMOVED);
1889 if (op->nrof) 1646 if (op->nrof)
1890 { 1647 {
1891 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1648 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1892 if (CAN_MERGE (tmp, op)) 1649 if (object::can_merge (tmp, op))
1893 { 1650 {
1894 /* return the original object and remove inserted object 1651 /* return the original object and remove inserted object
1895 (client needs the original object) */ 1652 (client needs the original object) */
1896 tmp->nrof += op->nrof; 1653 tmp->nrof += op->nrof;
1897 /* Weight handling gets pretty funky. Since we are adding to 1654 /* Weight handling gets pretty funky. Since we are adding to
1898 * tmp->nrof, we need to increase the weight. 1655 * tmp->nrof, we need to increase the weight.
1899 */ 1656 */
1900 add_weight (where, op->weight * op->nrof); 1657 add_weight (this, op->weight * op->nrof);
1901 SET_FLAG (op, FLAG_REMOVED); 1658 SET_FLAG (op, FLAG_REMOVED);
1902 free_object (op); /* free the inserted object */ 1659 op->destroy (); /* free the inserted object */
1903 op = tmp; 1660 op = tmp;
1904 remove_ob (op); /* and fix old object's links */ 1661 op->remove (); /* and fix old object's links */
1905 CLEAR_FLAG (op, FLAG_REMOVED); 1662 CLEAR_FLAG (op, FLAG_REMOVED);
1906 break; 1663 break;
1907 } 1664 }
1908 1665
1909 /* I assume combined objects have no inventory 1666 /* I assume combined objects have no inventory
1910 * We add the weight - this object could have just been removed 1667 * We add the weight - this object could have just been removed
1911 * (if it was possible to merge). calling remove_ob will subtract 1668 * (if it was possible to merge). calling remove_ob will subtract
1912 * the weight, so we need to add it in again, since we actually do 1669 * the weight, so we need to add it in again, since we actually do
1913 * the linking below 1670 * the linking below
1914 */ 1671 */
1915 add_weight (where, op->weight * op->nrof); 1672 add_weight (this, op->weight * op->nrof);
1916 } 1673 }
1917 else 1674 else
1918 add_weight (where, (op->weight + op->carrying)); 1675 add_weight (this, (op->weight + op->carrying));
1919 1676
1920 otmp = is_player_inv (where); 1677 otmp = this->in_player ();
1921 if (otmp && otmp->contr != NULL) 1678 if (otmp && otmp->contr)
1922 {
1923 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1679 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1924 fix_player (otmp); 1680 otmp->update_stats ();
1925 }
1926 1681
1927 op->map = NULL; 1682 op->map = 0;
1928 op->env = where; 1683 op->env = this;
1929 op->above = NULL; 1684 op->above = 0;
1930 op->below = NULL; 1685 op->below = 0;
1931 op->x = 0, op->y = 0; 1686 op->x = 0, op->y = 0;
1932 1687
1933 /* reset the light list and los of the players on the map */ 1688 /* reset the light list and los of the players on the map */
1934 if ((op->glow_radius != 0) && where->map) 1689 if ((op->glow_radius != 0) && map)
1935 { 1690 {
1936#ifdef DEBUG_LIGHTS 1691#ifdef DEBUG_LIGHTS
1937 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1692 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1938#endif /* DEBUG_LIGHTS */ 1693#endif /* DEBUG_LIGHTS */
1939 if (MAP_DARKNESS (where->map)) 1694 if (map->darkness)
1940 update_all_los (where->map, where->x, where->y); 1695 update_all_los (map, x, y);
1941 } 1696 }
1942 1697
1943 /* Client has no idea of ordering so lets not bother ordering it here. 1698 /* Client has no idea of ordering so lets not bother ordering it here.
1944 * It sure simplifies this function... 1699 * It sure simplifies this function...
1945 */ 1700 */
1946 if (where->inv == NULL) 1701 if (!inv)
1947 where->inv = op; 1702 inv = op;
1948 else 1703 else
1949 { 1704 {
1950 op->below = where->inv; 1705 op->below = inv;
1951 op->below->above = op; 1706 op->below->above = op;
1952 where->inv = op; 1707 inv = op;
1953 } 1708 }
1709
1710 INVOKE_OBJECT (INSERT, this);
1711
1954 return op; 1712 return op;
1955} 1713}
1956 1714
1957/* 1715/*
1958 * Checks if any objects has a move_type that matches objects 1716 * Checks if any objects has a move_type that matches objects
… …
1976 */ 1734 */
1977 1735
1978int 1736int
1979check_move_on (object *op, object *originator) 1737check_move_on (object *op, object *originator)
1980{ 1738{
1981 object * 1739 object *tmp;
1982 tmp; 1740 maptile *m = op->map;
1983 tag_t
1984 tag;
1985 mapstruct *
1986 m = op->map;
1987 int
1988 x = op->x, y = op->y; 1741 int x = op->x, y = op->y;
1989 1742
1990 MoveType 1743 MoveType move_on, move_slow, move_block;
1991 move_on,
1992 move_slow,
1993 move_block;
1994 1744
1995 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1745 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996 return 0; 1746 return 0;
1997
1998 tag = op->count;
1999 1747
2000 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1748 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2001 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1749 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2002 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1750 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2003 1751
… …
2019 1767
2020 /* The objects have to be checked from top to bottom. 1768 /* The objects have to be checked from top to bottom.
2021 * Hence, we first go to the top: 1769 * Hence, we first go to the top:
2022 */ 1770 */
2023 1771
2024 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above) 1772 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
2025 { 1773 {
2026 /* Trim the search when we find the first other spell effect 1774 /* Trim the search when we find the first other spell effect
2027 * this helps performance so that if a space has 50 spell objects, 1775 * this helps performance so that if a space has 50 spell objects,
2028 * we don't need to check all of them. 1776 * we don't need to check all of them.
2029 */ 1777 */
… …
2064 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1812 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2065 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1813 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2066 { 1814 {
2067 move_apply (tmp, op, originator); 1815 move_apply (tmp, op, originator);
2068 1816
2069 if (was_destroyed (op, tag)) 1817 if (op->destroyed ())
2070 return 1; 1818 return 1;
2071 1819
2072 /* what the person/creature stepped onto has moved the object 1820 /* what the person/creature stepped onto has moved the object
2073 * someplace new. Don't process any further - if we did, 1821 * someplace new. Don't process any further - if we did,
2074 * have a feeling strange problems would result. 1822 * have a feeling strange problems would result.
… …
2084/* 1832/*
2085 * present_arch(arch, map, x, y) searches for any objects with 1833 * present_arch(arch, map, x, y) searches for any objects with
2086 * a matching archetype at the given map and coordinates. 1834 * a matching archetype at the given map and coordinates.
2087 * The first matching object is returned, or NULL if none. 1835 * The first matching object is returned, or NULL if none.
2088 */ 1836 */
2089
2090object * 1837object *
2091present_arch (const archetype *at, mapstruct *m, int x, int y) 1838present_arch (const archetype *at, maptile *m, int x, int y)
2092{ 1839{
2093 object *
2094 tmp;
2095
2096 if (m == NULL || out_of_map (m, x, y)) 1840 if (m == NULL || out_of_map (m, x, y))
2097 { 1841 {
2098 LOG (llevError, "Present_arch called outside map.\n"); 1842 LOG (llevError, "Present_arch called outside map.\n");
2099 return NULL; 1843 return NULL;
2100 } 1844 }
1845
2101 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1846 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2102 if (tmp->arch == at) 1847 if (tmp->arch == at)
2103 return tmp; 1848 return tmp;
1849
2104 return NULL; 1850 return NULL;
2105} 1851}
2106 1852
2107/* 1853/*
2108 * present(type, map, x, y) searches for any objects with 1854 * present(type, map, x, y) searches for any objects with
2109 * a matching type variable at the given map and coordinates. 1855 * a matching type variable at the given map and coordinates.
2110 * The first matching object is returned, or NULL if none. 1856 * The first matching object is returned, or NULL if none.
2111 */ 1857 */
2112
2113object * 1858object *
2114present (unsigned char type, mapstruct *m, int x, int y) 1859present (unsigned char type, maptile *m, int x, int y)
2115{ 1860{
2116 object *
2117 tmp;
2118
2119 if (out_of_map (m, x, y)) 1861 if (out_of_map (m, x, y))
2120 { 1862 {
2121 LOG (llevError, "Present called outside map.\n"); 1863 LOG (llevError, "Present called outside map.\n");
2122 return NULL; 1864 return NULL;
2123 } 1865 }
1866
2124 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1867 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2125 if (tmp->type == type) 1868 if (tmp->type == type)
2126 return tmp; 1869 return tmp;
1870
2127 return NULL; 1871 return NULL;
2128} 1872}
2129 1873
2130/* 1874/*
2131 * present_in_ob(type, object) searches for any objects with 1875 * present_in_ob(type, object) searches for any objects with
2132 * a matching type variable in the inventory of the given object. 1876 * a matching type variable in the inventory of the given object.
2133 * The first matching object is returned, or NULL if none. 1877 * The first matching object is returned, or NULL if none.
2134 */ 1878 */
2135
2136object * 1879object *
2137present_in_ob (unsigned char type, const object *op) 1880present_in_ob (unsigned char type, const object *op)
2138{ 1881{
2139 object *
2140 tmp;
2141
2142 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1882 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2143 if (tmp->type == type) 1883 if (tmp->type == type)
2144 return tmp; 1884 return tmp;
1885
2145 return NULL; 1886 return NULL;
2146} 1887}
2147 1888
2148/* 1889/*
2149 * present_in_ob (type, str, object) searches for any objects with 1890 * present_in_ob (type, str, object) searches for any objects with
… …
2157 * str is the string to match against. Note that we match against 1898 * str is the string to match against. Note that we match against
2158 * the object name, not the archetype name. this is so that the 1899 * the object name, not the archetype name. this is so that the
2159 * spell code can use one object type (force), but change it's name 1900 * spell code can use one object type (force), but change it's name
2160 * to be unique. 1901 * to be unique.
2161 */ 1902 */
2162
2163object * 1903object *
2164present_in_ob_by_name (int type, const char *str, const object *op) 1904present_in_ob_by_name (int type, const char *str, const object *op)
2165{ 1905{
2166 object *
2167 tmp;
2168
2169 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1906 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2170 {
2171 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1907 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2172 return tmp; 1908 return tmp;
2173 } 1909
2174 return NULL; 1910 return 0;
2175} 1911}
2176 1912
2177/* 1913/*
2178 * present_arch_in_ob(archetype, object) searches for any objects with 1914 * present_arch_in_ob(archetype, object) searches for any objects with
2179 * a matching archetype in the inventory of the given object. 1915 * a matching archetype in the inventory of the given object.
2180 * The first matching object is returned, or NULL if none. 1916 * The first matching object is returned, or NULL if none.
2181 */ 1917 */
2182
2183object * 1918object *
2184present_arch_in_ob (const archetype *at, const object *op) 1919present_arch_in_ob (const archetype *at, const object *op)
2185{ 1920{
2186 object *
2187 tmp;
2188
2189 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1921 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2190 if (tmp->arch == at) 1922 if (tmp->arch == at)
2191 return tmp; 1923 return tmp;
1924
2192 return NULL; 1925 return NULL;
2193} 1926}
2194 1927
2195/* 1928/*
2196 * activate recursively a flag on an object inventory 1929 * activate recursively a flag on an object inventory
2197 */ 1930 */
2198void 1931void
2199flag_inv (object *op, int flag) 1932flag_inv (object *op, int flag)
2200{ 1933{
2201 object *
2202 tmp;
2203
2204 if (op->inv) 1934 if (op->inv)
2205 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1935 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2206 { 1936 {
2207 SET_FLAG (tmp, flag); 1937 SET_FLAG (tmp, flag);
2208 flag_inv (tmp, flag); 1938 flag_inv (tmp, flag);
2209 } 1939 }
2210} /* 1940}
1941
1942/*
2211 * desactivate recursively a flag on an object inventory 1943 * deactivate recursively a flag on an object inventory
2212 */ 1944 */
2213void 1945void
2214unflag_inv (object *op, int flag) 1946unflag_inv (object *op, int flag)
2215{ 1947{
2216 object *
2217 tmp;
2218
2219 if (op->inv) 1948 if (op->inv)
2220 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1949 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2221 { 1950 {
2222 CLEAR_FLAG (tmp, flag); 1951 CLEAR_FLAG (tmp, flag);
2223 unflag_inv (tmp, flag); 1952 unflag_inv (tmp, flag);
2224 } 1953 }
2225} 1954}
… …
2228 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 1957 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2229 * all it's inventory (recursively). 1958 * all it's inventory (recursively).
2230 * If checksums are used, a player will get set_cheat called for 1959 * If checksums are used, a player will get set_cheat called for
2231 * him/her-self and all object carried by a call to this function. 1960 * him/her-self and all object carried by a call to this function.
2232 */ 1961 */
2233
2234void 1962void
2235set_cheat (object *op) 1963set_cheat (object *op)
2236{ 1964{
2237 SET_FLAG (op, FLAG_WAS_WIZ); 1965 SET_FLAG (op, FLAG_WAS_WIZ);
2238 flag_inv (op, FLAG_WAS_WIZ); 1966 flag_inv (op, FLAG_WAS_WIZ);
… …
2257 * because arch_blocked (now ob_blocked) needs to know the movement type 1985 * because arch_blocked (now ob_blocked) needs to know the movement type
2258 * to know if the space in question will block the object. We can't use 1986 * to know if the space in question will block the object. We can't use
2259 * the archetype because that isn't correct if the monster has been 1987 * the archetype because that isn't correct if the monster has been
2260 * customized, changed states, etc. 1988 * customized, changed states, etc.
2261 */ 1989 */
2262
2263int 1990int
2264find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 1991find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2265{ 1992{
2266 int
2267 i,
2268 index = 0, flag; 1993 int index = 0, flag;
2269 static int
2270 altern[SIZEOFFREE]; 1994 int altern[SIZEOFFREE];
2271 1995
2272 for (i = start; i < stop; i++) 1996 for (int i = start; i < stop; i++)
2273 { 1997 {
2274 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1998 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2275 if (!flag) 1999 if (!flag)
2276 altern[index++] = i; 2000 altern [index++] = i;
2277 2001
2278 /* Basically, if we find a wall on a space, we cut down the search size. 2002 /* Basically, if we find a wall on a space, we cut down the search size.
2279 * In this way, we won't return spaces that are on another side of a wall. 2003 * In this way, we won't return spaces that are on another side of a wall.
2280 * This mostly work, but it cuts down the search size in all directions - 2004 * This mostly work, but it cuts down the search size in all directions -
2281 * if the space being examined only has a wall to the north and empty 2005 * if the space being examined only has a wall to the north and empty
2282 * spaces in all the other directions, this will reduce the search space 2006 * spaces in all the other directions, this will reduce the search space
2283 * to only the spaces immediately surrounding the target area, and 2007 * to only the spaces immediately surrounding the target area, and
2284 * won't look 2 spaces south of the target space. 2008 * won't look 2 spaces south of the target space.
2285 */ 2009 */
2286 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 2010 else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2287 stop = maxfree[i]; 2011 stop = maxfree[i];
2288 } 2012 }
2013
2289 if (!index) 2014 if (!index)
2290 return -1; 2015 return -1;
2016
2291 return altern[RANDOM () % index]; 2017 return altern[RANDOM () % index];
2292} 2018}
2293 2019
2294/* 2020/*
2295 * find_first_free_spot(archetype, mapstruct, x, y) works like 2021 * find_first_free_spot(archetype, maptile, x, y) works like
2296 * find_free_spot(), but it will search max number of squares. 2022 * find_free_spot(), but it will search max number of squares.
2297 * But it will return the first available spot, not a random choice. 2023 * But it will return the first available spot, not a random choice.
2298 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2024 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2299 */ 2025 */
2300
2301int 2026int
2302find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2027find_first_free_spot (const object *ob, maptile *m, int x, int y)
2303{ 2028{
2304 int
2305 i;
2306
2307 for (i = 0; i < SIZEOFFREE; i++) 2029 for (int i = 0; i < SIZEOFFREE; i++)
2308 {
2309 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2030 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2310 return i; 2031 return i;
2311 } 2032
2312 return -1; 2033 return -1;
2313} 2034}
2314 2035
2315/* 2036/*
2316 * The function permute(arr, begin, end) randomly reorders the array 2037 * The function permute(arr, begin, end) randomly reorders the array
2317 * arr[begin..end-1]. 2038 * arr[begin..end-1].
2039 * now uses a fisher-yates shuffle, old permute was broken
2318 */ 2040 */
2319static void 2041static void
2320permute (int *arr, int begin, int end) 2042permute (int *arr, int begin, int end)
2321{ 2043{
2322 int 2044 arr += begin;
2323 i,
2324 j,
2325 tmp,
2326 len;
2327
2328 len = end - begin; 2045 end -= begin;
2329 for (i = begin; i < end; i++)
2330 {
2331 j = begin + RANDOM () % len;
2332 2046
2333 tmp = arr[i]; 2047 while (--end)
2334 arr[i] = arr[j]; 2048 swap (arr [end], arr [RANDOM () % (end + 1)]);
2335 arr[j] = tmp;
2336 }
2337} 2049}
2338 2050
2339/* new function to make monster searching more efficient, and effective! 2051/* new function to make monster searching more efficient, and effective!
2340 * This basically returns a randomized array (in the passed pointer) of 2052 * This basically returns a randomized array (in the passed pointer) of
2341 * the spaces to find monsters. In this way, it won't always look for 2053 * the spaces to find monsters. In this way, it won't always look for
… …
2344 * the 3x3 area will be searched, just not in a predictable order. 2056 * the 3x3 area will be searched, just not in a predictable order.
2345 */ 2057 */
2346void 2058void
2347get_search_arr (int *search_arr) 2059get_search_arr (int *search_arr)
2348{ 2060{
2349 int 2061 int i;
2350 i;
2351 2062
2352 for (i = 0; i < SIZEOFFREE; i++) 2063 for (i = 0; i < SIZEOFFREE; i++)
2353 {
2354 search_arr[i] = i; 2064 search_arr[i] = i;
2355 }
2356 2065
2357 permute (search_arr, 1, SIZEOFFREE1 + 1); 2066 permute (search_arr, 1, SIZEOFFREE1 + 1);
2358 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2067 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2359 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2068 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2360} 2069}
… …
2369 * Perhaps incorrectly, but I'm making the assumption that exclude 2078 * Perhaps incorrectly, but I'm making the assumption that exclude
2370 * is actually want is going to try and move there. We need this info 2079 * is actually want is going to try and move there. We need this info
2371 * because we have to know what movement the thing looking to move 2080 * because we have to know what movement the thing looking to move
2372 * there is capable of. 2081 * there is capable of.
2373 */ 2082 */
2374
2375int 2083int
2376find_dir (mapstruct *m, int x, int y, object *exclude) 2084find_dir (maptile *m, int x, int y, object *exclude)
2377{ 2085{
2378 int
2379 i,
2380 max = SIZEOFFREE, mflags; 2086 int i, max = SIZEOFFREE, mflags;
2381 2087
2382 sint16 nx, ny; 2088 sint16 nx, ny;
2383 object * 2089 object *tmp;
2384 tmp; 2090 maptile *mp;
2385 mapstruct *
2386 mp;
2387 2091
2388 MoveType blocked, move_type; 2092 MoveType blocked, move_type;
2389 2093
2390 if (exclude && exclude->head) 2094 if (exclude && exclude->head)
2391 { 2095 {
… …
2403 mp = m; 2107 mp = m;
2404 nx = x + freearr_x[i]; 2108 nx = x + freearr_x[i];
2405 ny = y + freearr_y[i]; 2109 ny = y + freearr_y[i];
2406 2110
2407 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2111 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2112
2408 if (mflags & P_OUT_OF_MAP) 2113 if (mflags & P_OUT_OF_MAP)
2409 {
2410 max = maxfree[i]; 2114 max = maxfree[i];
2411 }
2412 else 2115 else
2413 { 2116 {
2414 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2117 mapspace &ms = mp->at (nx, ny);
2118
2119 blocked = ms.move_block;
2415 2120
2416 if ((move_type & blocked) == move_type) 2121 if ((move_type & blocked) == move_type)
2417 {
2418 max = maxfree[i]; 2122 max = maxfree[i];
2419 }
2420 else if (mflags & P_IS_ALIVE) 2123 else if (mflags & P_IS_ALIVE)
2421 { 2124 {
2422 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above) 2125 for (tmp = ms.bot; tmp; tmp = tmp->above)
2423 { 2126 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2424 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2127 && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2425 {
2426 break; 2128 break;
2427 } 2129
2428 }
2429 if (tmp) 2130 if (tmp)
2430 {
2431 return freedir[i]; 2131 return freedir[i];
2432 }
2433 } 2132 }
2434 } 2133 }
2435 } 2134 }
2135
2436 return 0; 2136 return 0;
2437} 2137}
2438 2138
2439/* 2139/*
2440 * distance(object 1, object 2) will return the square of the 2140 * distance(object 1, object 2) will return the square of the
2441 * distance between the two given objects. 2141 * distance between the two given objects.
2442 */ 2142 */
2443
2444int 2143int
2445distance (const object *ob1, const object *ob2) 2144distance (const object *ob1, const object *ob2)
2446{ 2145{
2447 int
2448 i;
2449
2450 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2146 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2451 return i;
2452} 2147}
2453 2148
2454/* 2149/*
2455 * find_dir_2(delta-x,delta-y) will return a direction in which 2150 * find_dir_2(delta-x,delta-y) will return a direction in which
2456 * an object which has subtracted the x and y coordinates of another 2151 * an object which has subtracted the x and y coordinates of another
2457 * object, needs to travel toward it. 2152 * object, needs to travel toward it.
2458 */ 2153 */
2459
2460int 2154int
2461find_dir_2 (int x, int y) 2155find_dir_2 (int x, int y)
2462{ 2156{
2463 int 2157 int q;
2464 q;
2465 2158
2466 if (y) 2159 if (y)
2467 q = x * 100 / y; 2160 q = x * 100 / y;
2468 else if (x) 2161 else if (x)
2469 q = -300 * x; 2162 q = -300 * x;
… …
2504int 2197int
2505absdir (int d) 2198absdir (int d)
2506{ 2199{
2507 while (d < 1) 2200 while (d < 1)
2508 d += 8; 2201 d += 8;
2202
2509 while (d > 8) 2203 while (d > 8)
2510 d -= 8; 2204 d -= 8;
2205
2511 return d; 2206 return d;
2512} 2207}
2513 2208
2514/* 2209/*
2515 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2210 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
… …
2517 */ 2212 */
2518 2213
2519int 2214int
2520dirdiff (int dir1, int dir2) 2215dirdiff (int dir1, int dir2)
2521{ 2216{
2522 int 2217 int d;
2523 d;
2524 2218
2525 d = abs (dir1 - dir2); 2219 d = abs (dir1 - dir2);
2526 if (d > 4) 2220 if (d > 4)
2527 d = 8 - d; 2221 d = 8 - d;
2222
2528 return d; 2223 return d;
2529} 2224}
2530 2225
2531/* peterm: 2226/* peterm:
2532 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2227 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
… …
2535 * This basically means that if direction is 15, then it could either go 2230 * This basically means that if direction is 15, then it could either go
2536 * direction 4, 14, or 16 to get back to where we are. 2231 * direction 4, 14, or 16 to get back to where we are.
2537 * Moved from spell_util.c to object.c with the other related direction 2232 * Moved from spell_util.c to object.c with the other related direction
2538 * functions. 2233 * functions.
2539 */ 2234 */
2540
2541int
2542 reduction_dir[SIZEOFFREE][3] = { 2235int reduction_dir[SIZEOFFREE][3] = {
2543 {0, 0, 0}, /* 0 */ 2236 {0, 0, 0}, /* 0 */
2544 {0, 0, 0}, /* 1 */ 2237 {0, 0, 0}, /* 1 */
2545 {0, 0, 0}, /* 2 */ 2238 {0, 0, 0}, /* 2 */
2546 {0, 0, 0}, /* 3 */ 2239 {0, 0, 0}, /* 3 */
2547 {0, 0, 0}, /* 4 */ 2240 {0, 0, 0}, /* 4 */
… …
2595 * find a path to that monster that we found. If not, 2288 * find a path to that monster that we found. If not,
2596 * we don't bother going toward it. Returns 1 if we 2289 * we don't bother going toward it. Returns 1 if we
2597 * can see a direct way to get it 2290 * can see a direct way to get it
2598 * Modified to be map tile aware -.MSW 2291 * Modified to be map tile aware -.MSW
2599 */ 2292 */
2600
2601
2602int 2293int
2603can_see_monsterP (mapstruct *m, int x, int y, int dir) 2294can_see_monsterP (maptile *m, int x, int y, int dir)
2604{ 2295{
2605 sint16 dx, dy; 2296 sint16 dx, dy;
2606 int
2607 mflags; 2297 int mflags;
2608 2298
2609 if (dir < 0) 2299 if (dir < 0)
2610 return 0; /* exit condition: invalid direction */ 2300 return 0; /* exit condition: invalid direction */
2611 2301
2612 dx = x + freearr_x[dir]; 2302 dx = x + freearr_x[dir];
… …
2625 return 0; 2315 return 0;
2626 2316
2627 /* yes, can see. */ 2317 /* yes, can see. */
2628 if (dir < 9) 2318 if (dir < 9)
2629 return 1; 2319 return 1;
2320
2630 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2321 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2631 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2322 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2323 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2632} 2324}
2633
2634
2635 2325
2636/* 2326/*
2637 * can_pick(picker, item): finds out if an object is possible to be 2327 * can_pick(picker, item): finds out if an object is possible to be
2638 * picked up by the picker. Returnes 1 if it can be 2328 * picked up by the picker. Returnes 1 if it can be
2639 * picked up, otherwise 0. 2329 * picked up, otherwise 0.
… …
2650 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2340 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2651 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2341 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2652 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2342 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2653} 2343}
2654 2344
2655
2656/* 2345/*
2657 * create clone from object to another 2346 * create clone from object to another
2658 */ 2347 */
2659object * 2348object *
2660object_create_clone (object *asrc) 2349object_create_clone (object *asrc)
2661{ 2350{
2662 object *
2663 dst = NULL, *tmp, *src, *part, *prev, *item; 2351 object *dst = 0, *tmp, *src, *part, *prev, *item;
2664 2352
2665 if (!asrc) 2353 if (!asrc)
2666 return NULL; 2354 return 0;
2355
2667 src = asrc; 2356 src = asrc;
2668 if (src->head) 2357 if (src->head)
2669 src = src->head; 2358 src = src->head;
2670 2359
2671 prev = NULL; 2360 prev = 0;
2672 for (part = src; part; part = part->more) 2361 for (part = src; part; part = part->more)
2673 { 2362 {
2674 tmp = get_object (); 2363 tmp = part->clone ();
2675 copy_object (part, tmp);
2676 tmp->x -= src->x; 2364 tmp->x -= src->x;
2677 tmp->y -= src->y; 2365 tmp->y -= src->y;
2366
2678 if (!part->head) 2367 if (!part->head)
2679 { 2368 {
2680 dst = tmp; 2369 dst = tmp;
2681 tmp->head = NULL; 2370 tmp->head = 0;
2682 } 2371 }
2683 else 2372 else
2684 {
2685 tmp->head = dst; 2373 tmp->head = dst;
2686 } 2374
2687 tmp->more = NULL; 2375 tmp->more = 0;
2376
2688 if (prev) 2377 if (prev)
2689 prev->more = tmp; 2378 prev->more = tmp;
2379
2690 prev = tmp; 2380 prev = tmp;
2691 } 2381 }
2692 2382
2693 /*** copy inventory ***/
2694 for (item = src->inv; item; item = item->below) 2383 for (item = src->inv; item; item = item->below)
2695 {
2696 (void) insert_ob_in_ob (object_create_clone (item), dst); 2384 insert_ob_in_ob (object_create_clone (item), dst);
2697 }
2698 2385
2699 return dst; 2386 return dst;
2700} 2387}
2701 2388
2702/* return true if the object was destroyed, 0 otherwise */
2703int
2704was_destroyed (const object *op, tag_t old_tag)
2705{
2706 /* checking for FLAG_FREED isn't necessary, but makes this function more
2707 * robust */
2708 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709}
2710
2711/* GROS - Creates an object using a string representing its content. */ 2389/* GROS - Creates an object using a string representing its content. */
2712
2713/* Basically, we save the content of the string to a temp file, then call */ 2390/* Basically, we save the content of the string to a temp file, then call */
2714
2715/* load_object on it. I admit it is a highly inefficient way to make things, */ 2391/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717/* but it was simple to make and allows reusing the load_object function. */ 2392/* but it was simple to make and allows reusing the load_object function. */
2718
2719/* Remember not to use load_object_str in a time-critical situation. */ 2393/* Remember not to use load_object_str in a time-critical situation. */
2720
2721/* Also remember that multiparts objects are not supported for now. */ 2394/* Also remember that multiparts objects are not supported for now. */
2722
2723object * 2395object *
2724load_object_str (const char *obstr) 2396load_object_str (const char *obstr)
2725{ 2397{
2726 object * 2398 object *op;
2727 op;
2728 char
2729 filename[MAX_BUF]; 2399 char filename[MAX_BUF];
2730 2400
2731 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir); 2401 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732 2402
2733 FILE *
2734 tempfile = fopen (filename, "w"); 2403 FILE *tempfile = fopen (filename, "w");
2735 2404
2736 if (tempfile == NULL) 2405 if (tempfile == NULL)
2737 { 2406 {
2738 LOG (llevError, "Error - Unable to access load object temp file\n"); 2407 LOG (llevError, "Error - Unable to access load object temp file\n");
2739 return NULL; 2408 return NULL;
2740 }; 2409 }
2410
2741 fprintf (tempfile, obstr); 2411 fprintf (tempfile, obstr);
2742 fclose (tempfile); 2412 fclose (tempfile);
2743 2413
2744 op = get_object (); 2414 op = object::create ();
2745 2415
2746 object_thawer thawer (filename); 2416 object_thawer thawer (filename);
2747 2417
2748 if (thawer) 2418 if (thawer)
2749 load_object (thawer, op, 0); 2419 load_object (thawer, op, 0);
… …
2759 * returns NULL if no match. 2429 * returns NULL if no match.
2760 */ 2430 */
2761object * 2431object *
2762find_obj_by_type_subtype (const object *who, int type, int subtype) 2432find_obj_by_type_subtype (const object *who, int type, int subtype)
2763{ 2433{
2764 object *
2765 tmp;
2766
2767 for (tmp = who->inv; tmp; tmp = tmp->below) 2434 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2768 if (tmp->type == type && tmp->subtype == subtype) 2435 if (tmp->type == type && tmp->subtype == subtype)
2769 return tmp; 2436 return tmp;
2770 2437
2771 return NULL; 2438 return 0;
2772} 2439}
2773 2440
2774/* If ob has a field named key, return the link from the list, 2441/* If ob has a field named key, return the link from the list,
2775 * otherwise return NULL. 2442 * otherwise return NULL.
2776 * 2443 *
… …
2778 * do the desired thing. 2445 * do the desired thing.
2779 */ 2446 */
2780key_value * 2447key_value *
2781get_ob_key_link (const object *ob, const char *key) 2448get_ob_key_link (const object *ob, const char *key)
2782{ 2449{
2783 key_value *
2784 link;
2785
2786 for (link = ob->key_values; link != NULL; link = link->next) 2450 for (key_value *link = ob->key_values; link; link = link->next)
2787 {
2788 if (link->key == key) 2451 if (link->key == key)
2789 {
2790 return link; 2452 return link;
2791 }
2792 }
2793 2453
2794 return NULL; 2454 return 0;
2795} 2455}
2796 2456
2797/* 2457/*
2798 * Returns the value of op has an extra_field for key, or NULL. 2458 * Returns the value of op has an extra_field for key, or NULL.
2799 * 2459 *
… …
2839 * Returns TRUE on success. 2499 * Returns TRUE on success.
2840 */ 2500 */
2841int 2501int
2842set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) 2502set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2843{ 2503{
2844 key_value *
2845 field = NULL, *last = NULL; 2504 key_value *field = NULL, *last = NULL;
2846 2505
2847 for (field = op->key_values; field != NULL; field = field->next) 2506 for (field = op->key_values; field != NULL; field = field->next)
2848 { 2507 {
2849 if (field->key != canonical_key) 2508 if (field->key != canonical_key)
2850 { 2509 {
… …
2878 /* IF we get here, key doesn't exist */ 2537 /* IF we get here, key doesn't exist */
2879 2538
2880 /* No field, we'll have to add it. */ 2539 /* No field, we'll have to add it. */
2881 2540
2882 if (!add_key) 2541 if (!add_key)
2883 {
2884 return FALSE; 2542 return FALSE;
2885 } 2543
2886 /* There isn't any good reason to store a null 2544 /* There isn't any good reason to store a null
2887 * value in the key/value list. If the archetype has 2545 * value in the key/value list. If the archetype has
2888 * this key, then we should also have it, so shouldn't 2546 * this key, then we should also have it, so shouldn't
2889 * be here. If user wants to store empty strings, 2547 * be here. If user wants to store empty strings,
2890 * should pass in "" 2548 * should pass in ""

Diff Legend

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