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

Diff Legend

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